diff --git a/Compile.html b/Compile.html
index 4471278cb..2e7b0dc43 100644
--- a/Compile.html
+++ b/Compile.html
@@ -3,13 +3,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
 <title>Building DFHACK</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7614 2013-02-21 15:55:51Z milde $
+:Id: $Id: html4css1.css 7056 2011-06-17 10:50:48Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
@@ -77,7 +77,7 @@ div.tip p.admonition-title {
 
 div.attention p.admonition-title, div.caution p.admonition-title,
 div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
+div.warning p.admonition-title {
   color: red ;
   font-weight: bold ;
   font-family: sans-serif }
@@ -249,19 +249,10 @@ pre.address {
   margin-top: 0 ;
   font: inherit }
 
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
+pre.literal-block, pre.doctest-block, pre.math {
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
-pre.code, code { background-color: #eeeeee }
-pre.code .comment, code .comment { color: #5C6576 }
-pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
 span.classifier {
   font-family: sans-serif ;
   font-style: oblique }
@@ -313,21 +304,6 @@ table.docutils th.field-name, table.docinfo th.docinfo-name {
   white-space: nowrap ;
   padding-left: 0 }
 
-/* "booktabs" style (no vertical lines) */
-table.docutils.booktabs {
-  border: 0px;
-  border-top: 2px solid;
-  border-bottom: 2px solid;
-  border-collapse: collapse;
-}
-table.docutils.booktabs * {
-  border: 0px;
-}
-table.docutils.booktabs th {
-  border-bottom: thin solid;
-  text-align: left;
-}
-
 h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
 h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
   font-size: 100% }
@@ -396,11 +372,14 @@ git submodule update
 <h2><a class="toc-backref" href="#id6">Dependencies</a></h2>
 <p>DFHack is meant to be installed into an existing DF folder, so get one ready.</p>
 <p>For building, you need a 32-bit version of GCC. For example, to build DFHack on
-a 64-bit distribution like Arch, you'll need the multilib development tools and libraries.</p>
+a 64-bit distribution like Arch, you'll need the multilib development tools and libraries.
+Alternatively, you might be able to use <tt class="docutils literal">lxc</tt> to
+<a class="reference external" href="http://www.bay12forums.com/smf/index.php?topic=139553.msg5435310#msg5435310">create a virtual 32-bit environment</a>.</p>
 <p>Before you can build anything, you'll also need <tt class="docutils literal">cmake</tt>. It is advisable to also get
 <tt class="docutils literal">ccmake</tt> on distributions that split the cmake package into multiple parts.</p>
 <p>For the code generation parts, you need perl and the XML::LibXML and XML::LibXSLT perl packages.
 You should be able to find them in your distro repositories (on Arch linux 'perl-xml-libxml' and 'perl-xml-libxslt').</p>
+<p>To build Stonesense, you'll also need OpenGL headers.</p>
 </div>
 <div class="section" id="build">
 <h2><a class="toc-backref" href="#id7">Build</a></h2>
@@ -489,7 +468,7 @@ process. Just stick with the defaults for everything and you'll be fine.</p>
 </li>
 <li><p class="first">Get the dfhack source:</p>
 <pre class="literal-block">
-git clone https://github.com/danaris/dfhack.git
+git clone git://github.com/DFHack/dfhack.git
 cd dfhack
 git submodule init
 git submodule update
diff --git a/Lua API.html b/Lua API.html
index 1a2888eb0..49505e65b 100644
--- a/Lua API.html	
+++ b/Lua API.html	
@@ -3,13 +3,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
 <title>DFHack Lua API</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7614 2013-02-21 15:55:51Z milde $
+:Id: $Id: html4css1.css 7056 2011-06-17 10:50:48Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
@@ -77,7 +77,7 @@ div.tip p.admonition-title {
 
 div.attention p.admonition-title, div.caution p.admonition-title,
 div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
+div.warning p.admonition-title {
   color: red ;
   font-weight: bold ;
   font-family: sans-serif }
@@ -249,19 +249,10 @@ pre.address {
   margin-top: 0 ;
   font: inherit }
 
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
+pre.literal-block, pre.doctest-block, pre.math {
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
-pre.code, code { background-color: #eeeeee }
-pre.code .comment, code .comment { color: #5C6576 }
-pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
 span.classifier {
   font-family: sans-serif ;
   font-style: oblique }
@@ -313,21 +304,6 @@ table.docutils th.field-name, table.docinfo th.docinfo-name {
   white-space: nowrap ;
   padding-left: 0 }
 
-/* "booktabs" style (no vertical lines) */
-table.docutils.booktabs {
-  border: 0px;
-  border-top: 2px solid;
-  border-bottom: 2px solid;
-  border-collapse: collapse;
-}
-table.docutils.booktabs * {
-  border: 0px;
-}
-table.docutils.booktabs th {
-  border-bottom: thin solid;
-  text-align: left;
-}
-
 h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
 h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
   font-size: 100% }
@@ -1757,6 +1733,15 @@ functions in this section, this may be used at any time.</p>
 <p>Returns the string that should be used to represent the given
 logical keybinding on the screen in texts like &quot;press Key to ...&quot;.</p>
 </li>
+<li><p class="first"><tt class="docutils literal">dfhack.screen.keyToChar(key)</tt></p>
+<p>Returns the integer character code of the string input
+character represented by the given logical keybinding,
+or <em>nil</em> if not a string input key.</p>
+</li>
+<li><p class="first"><tt class="docutils literal">dfhack.screen.charToKey(charcode)</tt></p>
+<p>Returns the keybinding representing the given string input
+character, or <em>nil</em> if impossible.</p>
+</li>
 </ul>
 <p>The &quot;pen&quot; argument used by functions above may be represented by
 a table with the following possible fields:</p>
@@ -3230,6 +3215,18 @@ tweaking (e.g. adding custom reactions)</p>
 <li><p class="first"><tt class="docutils literal">onInventoryChange(unit_id,item_id,old_equip,new_equip)</tt></p>
 <p>Gets called when someone picks up an item, puts one down, or changes the way they are holding it. If an item is picked up, old_equip will be null. If an item is dropped, new_equip will be null. If an item is re-equipped in a new way, then neither will be null. You absolutely must NOT alter either old_equip or new_equip or you might break other plugins.</p>
 </li>
+<li><p class="first"><tt class="docutils literal">onReport(reportId)</tt></p>
+<p>Gets called when a report happens. This happens more often than you probably think, even if it doesn't show up in the announcements.</p>
+</li>
+<li><p class="first"><tt class="docutils literal">onUnitAttack(attackerId, defenderId, woundId)</tt></p>
+<p>Called when a unit wounds another with a weapon. Is NOT called if blocked, dodged, deflected, or parried.</p>
+</li>
+<li><p class="first"><tt class="docutils literal">onUnload()</tt></p>
+<p>A convenience event in case you don't want to register for every onStateChange event.</p>
+</li>
+<li><p class="first"><tt class="docutils literal">onInteraction(attackVerb, defendVerb, attackerId, defenderId, attackReportId, defendReportId)</tt></p>
+<p>Called when a unit uses an interaction on another.</p>
+</li>
 </ol>
 </div>
 <div class="section" id="functions">
diff --git a/Readme.html b/Readme.html
index 4b476b142..ca3194d6c 100644
--- a/Readme.html
+++ b/Readme.html
@@ -3,13 +3,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
 <title>DFHack Readme</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7614 2013-02-21 15:55:51Z milde $
+:Id: $Id: html4css1.css 7056 2011-06-17 10:50:48Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
@@ -77,7 +77,7 @@ div.tip p.admonition-title {
 
 div.attention p.admonition-title, div.caution p.admonition-title,
 div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
+div.warning p.admonition-title {
   color: red ;
   font-weight: bold ;
   font-family: sans-serif }
@@ -249,19 +249,10 @@ pre.address {
   margin-top: 0 ;
   font: inherit }
 
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
+pre.literal-block, pre.doctest-block, pre.math {
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
-pre.code, code { background-color: #eeeeee }
-pre.code .comment, code .comment { color: #5C6576 }
-pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
 span.classifier {
   font-family: sans-serif ;
   font-style: oblique }
@@ -313,21 +304,6 @@ table.docutils th.field-name, table.docinfo th.docinfo-name {
   white-space: nowrap ;
   padding-left: 0 }
 
-/* "booktabs" style (no vertical lines) */
-table.docutils.booktabs {
-  border: 0px;
-  border-top: 2px solid;
-  border-bottom: 2px solid;
-  border-collapse: collapse;
-}
-table.docutils.booktabs * {
-  border: 0px;
-}
-table.docutils.booktabs th {
-  border-bottom: thin solid;
-  text-align: left;
-}
-
 h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
 h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
   font-size: 100% }
@@ -431,169 +407,159 @@ access DF memory and allow for easier development of new tools.</p>
 <li><a class="reference internal" href="#showmood" id="id62">showmood</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#mod-interaction" id="id63">Mod Interaction</a><ul>
-<li><a class="reference internal" href="#autosyndrome" id="id64">autoSyndrome</a></li>
-<li><a class="reference internal" href="#outsideonly" id="id65">outsideOnly</a></li>
-<li><a class="reference internal" href="#syndrometrigger" id="id66">syndromeTrigger</a><ul>
-<li><a class="reference internal" href="#true-transformation" id="id67">True Transformation</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a class="reference internal" href="#designations" id="id68">Designations</a><ul>
-<li><a class="reference internal" href="#burrow" id="id69">burrow</a></li>
-<li><a class="reference internal" href="#digv" id="id70">digv</a></li>
-<li><a class="reference internal" href="#digvx" id="id71">digvx</a></li>
-<li><a class="reference internal" href="#digl" id="id72">digl</a></li>
-<li><a class="reference internal" href="#diglx" id="id73">diglx</a></li>
-<li><a class="reference internal" href="#digexp" id="id74">digexp</a></li>
-<li><a class="reference internal" href="#digcircle" id="id75">digcircle</a></li>
-<li><a class="reference internal" href="#digtype" id="id76">digtype</a></li>
-<li><a class="reference internal" href="#digflood" id="id77">digFlood</a></li>
-<li><a class="reference internal" href="#filltraffic" id="id78">filltraffic</a></li>
-<li><a class="reference internal" href="#alltraffic" id="id79">alltraffic</a></li>
-<li><a class="reference internal" href="#restrictliquid" id="id80">restrictliquid</a></li>
-<li><a class="reference internal" href="#restrictice" id="id81">restrictice</a></li>
-<li><a class="reference internal" href="#getplants" id="id82">getplants</a></li>
+<li><a class="reference internal" href="#designations" id="id63">Designations</a><ul>
+<li><a class="reference internal" href="#burrow" id="id64">burrow</a></li>
+<li><a class="reference internal" href="#digv" id="id65">digv</a></li>
+<li><a class="reference internal" href="#digvx" id="id66">digvx</a></li>
+<li><a class="reference internal" href="#digl" id="id67">digl</a></li>
+<li><a class="reference internal" href="#diglx" id="id68">diglx</a></li>
+<li><a class="reference internal" href="#digexp" id="id69">digexp</a></li>
+<li><a class="reference internal" href="#digcircle" id="id70">digcircle</a></li>
+<li><a class="reference internal" href="#digtype" id="id71">digtype</a></li>
+<li><a class="reference internal" href="#digflood" id="id72">digFlood</a></li>
+<li><a class="reference internal" href="#filltraffic" id="id73">filltraffic</a></li>
+<li><a class="reference internal" href="#alltraffic" id="id74">alltraffic</a></li>
+<li><a class="reference internal" href="#restrictliquid" id="id75">restrictliquid</a></li>
+<li><a class="reference internal" href="#restrictice" id="id76">restrictice</a></li>
+<li><a class="reference internal" href="#getplants" id="id77">getplants</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#cleanup-and-garbage-disposal" id="id83">Cleanup and garbage disposal</a><ul>
-<li><a class="reference internal" href="#clean" id="id84">clean</a></li>
-<li><a class="reference internal" href="#spotclean" id="id85">spotclean</a></li>
-<li><a class="reference internal" href="#autodump" id="id86">autodump</a></li>
-<li><a class="reference internal" href="#autodump-destroy-here" id="id87">autodump-destroy-here</a></li>
-<li><a class="reference internal" href="#autodump-destroy-item" id="id88">autodump-destroy-item</a></li>
-<li><a class="reference internal" href="#cleanowned" id="id89">cleanowned</a></li>
+<li><a class="reference internal" href="#cleanup-and-garbage-disposal" id="id78">Cleanup and garbage disposal</a><ul>
+<li><a class="reference internal" href="#clean" id="id79">clean</a></li>
+<li><a class="reference internal" href="#spotclean" id="id80">spotclean</a></li>
+<li><a class="reference internal" href="#autodump" id="id81">autodump</a></li>
+<li><a class="reference internal" href="#autodump-destroy-here" id="id82">autodump-destroy-here</a></li>
+<li><a class="reference internal" href="#autodump-destroy-item" id="id83">autodump-destroy-item</a></li>
+<li><a class="reference internal" href="#cleanowned" id="id84">cleanowned</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bugfixes" id="id90">Bugfixes</a><ul>
-<li><a class="reference internal" href="#drybuckets" id="id91">drybuckets</a></li>
-<li><a class="reference internal" href="#fixdiplomats" id="id92">fixdiplomats</a></li>
-<li><a class="reference internal" href="#fixmerchants" id="id93">fixmerchants</a></li>
-<li><a class="reference internal" href="#fixveins" id="id94">fixveins</a></li>
-<li><a class="reference internal" href="#tweak" id="id95">tweak</a></li>
-<li><a class="reference internal" href="#fix-armory" id="id96">fix-armory</a></li>
+<li><a class="reference internal" href="#bugfixes" id="id85">Bugfixes</a><ul>
+<li><a class="reference internal" href="#drybuckets" id="id86">drybuckets</a></li>
+<li><a class="reference internal" href="#fixdiplomats" id="id87">fixdiplomats</a></li>
+<li><a class="reference internal" href="#fixmerchants" id="id88">fixmerchants</a></li>
+<li><a class="reference internal" href="#fixveins" id="id89">fixveins</a></li>
+<li><a class="reference internal" href="#tweak" id="id90">tweak</a></li>
+<li><a class="reference internal" href="#fix-armory" id="id91">fix-armory</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#mode-switch-and-reclaim" id="id97">Mode switch and reclaim</a><ul>
-<li><a class="reference internal" href="#lair" id="id98">lair</a></li>
-<li><a class="reference internal" href="#mode" id="id99">mode</a></li>
+<li><a class="reference internal" href="#mode-switch-and-reclaim" id="id92">Mode switch and reclaim</a><ul>
+<li><a class="reference internal" href="#lair" id="id93">lair</a></li>
+<li><a class="reference internal" href="#mode" id="id94">mode</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#visualizer-and-data-export" id="id100">Visualizer and data export</a><ul>
-<li><a class="reference internal" href="#ssense-stonesense" id="id101">ssense / stonesense</a></li>
-<li><a class="reference internal" href="#mapexport" id="id102">mapexport</a></li>
-<li><a class="reference internal" href="#dwarfexport" id="id103">dwarfexport</a></li>
-<li><a class="reference internal" href="#exportlegends" id="id104">exportlegends</a></li>
+<li><a class="reference internal" href="#visualizer-and-data-export" id="id95">Visualizer and data export</a><ul>
+<li><a class="reference internal" href="#ssense-stonesense" id="id96">ssense / stonesense</a></li>
+<li><a class="reference internal" href="#mapexport" id="id97">mapexport</a></li>
+<li><a class="reference internal" href="#dwarfexport" id="id98">dwarfexport</a></li>
+<li><a class="reference internal" href="#exportlegends" id="id99">exportlegends</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#job-management" id="id105">Job management</a><ul>
-<li><a class="reference internal" href="#job" id="id106">job</a></li>
-<li><a class="reference internal" href="#job-material" id="id107">job-material</a></li>
-<li><a class="reference internal" href="#job-duplicate" id="id108">job-duplicate</a></li>
-<li><a class="reference internal" href="#stockflow" id="id109">stockflow</a></li>
-<li><a class="reference internal" href="#workflow" id="id110">workflow</a><ul>
-<li><a class="reference internal" href="#function" id="id111">Function</a></li>
-<li><a class="reference internal" href="#constraint-format" id="id112">Constraint format</a></li>
-<li><a class="reference internal" href="#constraint-examples" id="id113">Constraint examples</a></li>
+<li><a class="reference internal" href="#job-management" id="id100">Job management</a><ul>
+<li><a class="reference internal" href="#job" id="id101">job</a></li>
+<li><a class="reference internal" href="#job-material" id="id102">job-material</a></li>
+<li><a class="reference internal" href="#job-duplicate" id="id103">job-duplicate</a></li>
+<li><a class="reference internal" href="#stockflow" id="id104">stockflow</a></li>
+<li><a class="reference internal" href="#workflow" id="id105">workflow</a><ul>
+<li><a class="reference internal" href="#function" id="id106">Function</a></li>
+<li><a class="reference internal" href="#constraint-format" id="id107">Constraint format</a></li>
+<li><a class="reference internal" href="#constraint-examples" id="id108">Constraint examples</a></li>
 </ul>
 </li>
 </ul>
 </li>
-<li><a class="reference internal" href="#fortress-activity-management" id="id114">Fortress activity management</a><ul>
-<li><a class="reference internal" href="#seedwatch" id="id115">seedwatch</a></li>
-<li><a class="reference internal" href="#zone" id="id116">zone</a><ul>
-<li><a class="reference internal" href="#usage-with-single-units" id="id117">Usage with single units</a></li>
-<li><a class="reference internal" href="#usage-with-filters" id="id118">Usage with filters</a></li>
-<li><a class="reference internal" href="#mass-renaming" id="id119">Mass-renaming</a></li>
-<li><a class="reference internal" href="#cage-zones" id="id120">Cage zones</a></li>
-<li><a class="reference internal" href="#examples" id="id121">Examples</a></li>
+<li><a class="reference internal" href="#fortress-activity-management" id="id109">Fortress activity management</a><ul>
+<li><a class="reference internal" href="#seedwatch" id="id110">seedwatch</a></li>
+<li><a class="reference internal" href="#zone" id="id111">zone</a><ul>
+<li><a class="reference internal" href="#usage-with-single-units" id="id112">Usage with single units</a></li>
+<li><a class="reference internal" href="#usage-with-filters" id="id113">Usage with filters</a></li>
+<li><a class="reference internal" href="#mass-renaming" id="id114">Mass-renaming</a></li>
+<li><a class="reference internal" href="#cage-zones" id="id115">Cage zones</a></li>
+<li><a class="reference internal" href="#examples" id="id116">Examples</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#autonestbox" id="id122">autonestbox</a></li>
-<li><a class="reference internal" href="#autobutcher" id="id123">autobutcher</a></li>
-<li><a class="reference internal" href="#autochop" id="id124">autochop</a></li>
-<li><a class="reference internal" href="#autolabor" id="id125">autolabor</a></li>
+<li><a class="reference internal" href="#autonestbox" id="id117">autonestbox</a></li>
+<li><a class="reference internal" href="#autobutcher" id="id118">autobutcher</a></li>
+<li><a class="reference internal" href="#autochop" id="id119">autochop</a></li>
+<li><a class="reference internal" href="#autolabor" id="id120">autolabor</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#other" id="id126">Other</a><ul>
-<li><a class="reference internal" href="#catsplosion" id="id127">catsplosion</a></li>
-<li><a class="reference internal" href="#dfusion" id="id128">dfusion</a></li>
-<li><a class="reference internal" href="#embark-tools" id="id129">embark-tools</a></li>
-<li><a class="reference internal" href="#petcapremover" id="id130">petcapRemover</a></li>
-<li><a class="reference internal" href="#misery" id="id131">misery</a></li>
-<li><a class="reference internal" href="#strangemood" id="id132">strangemood</a></li>
-<li><a class="reference internal" href="#log-region" id="id133">log-region</a></li>
+<li><a class="reference internal" href="#other" id="id121">Other</a><ul>
+<li><a class="reference internal" href="#catsplosion" id="id122">catsplosion</a></li>
+<li><a class="reference internal" href="#dfusion" id="id123">dfusion</a></li>
+<li><a class="reference internal" href="#embark-tools" id="id124">embark-tools</a></li>
+<li><a class="reference internal" href="#petcapremover" id="id125">petcapRemover</a></li>
+<li><a class="reference internal" href="#misery" id="id126">misery</a></li>
+<li><a class="reference internal" href="#strangemood" id="id127">strangemood</a></li>
+<li><a class="reference internal" href="#log-region" id="id128">log-region</a></li>
 </ul>
 </li>
 </ul>
 </li>
-<li><a class="reference internal" href="#scripts" id="id134">Scripts</a><ul>
-<li><a class="reference internal" href="#fix" id="id135">fix/*</a></li>
-<li><a class="reference internal" href="#gui" id="id136">gui/*</a></li>
-<li><a class="reference internal" href="#binpatch" id="id137">binpatch</a></li>
-<li><a class="reference internal" href="#quicksave" id="id138">quicksave</a></li>
-<li><a class="reference internal" href="#setfps" id="id139">setfps</a></li>
-<li><a class="reference internal" href="#siren" id="id140">siren</a></li>
-<li><a class="reference internal" href="#growcrops" id="id141">growcrops</a></li>
-<li><a class="reference internal" href="#removebadthoughts" id="id142">removebadthoughts</a></li>
-<li><a class="reference internal" href="#exterminate" id="id143">exterminate</a></li>
-<li><a class="reference internal" href="#source" id="id144">source</a></li>
-<li><a class="reference internal" href="#masspit" id="id145">masspit</a></li>
-<li><a class="reference internal" href="#digfort" id="id146">digfort</a></li>
-<li><a class="reference internal" href="#invasion-now" id="id147">invasion-now</a></li>
-<li><a class="reference internal" href="#digmat" id="id148">digmat</a></li>
-<li><a class="reference internal" href="#superdwarf" id="id149">superdwarf</a></li>
-<li><a class="reference internal" href="#drainaquifer" id="id150">drainaquifer</a></li>
-<li><a class="reference internal" href="#deathcause" id="id151">deathcause</a></li>
-<li><a class="reference internal" href="#lua" id="id152">lua</a></li>
-<li><a class="reference internal" href="#embark" id="id153">embark</a></li>
-<li><a class="reference internal" href="#lever" id="id154">lever</a></li>
-<li><a class="reference internal" href="#stripcaged" id="id155">stripcaged</a></li>
-<li><a class="reference internal" href="#undump-buildings" id="id156">undump-buildings</a></li>
-<li><a class="reference internal" href="#create-items" id="id157">create-items</a></li>
-<li><a class="reference internal" href="#locate-ore" id="id158">locate-ore</a></li>
-<li><a class="reference internal" href="#soundsense-season" id="id159">soundsense-season</a></li>
-<li><a class="reference internal" href="#multicmd" id="id160">multicmd</a></li>
-<li><a class="reference internal" href="#dfstatus" id="id161">dfstatus</a></li>
+<li><a class="reference internal" href="#scripts" id="id129">Scripts</a><ul>
+<li><a class="reference internal" href="#fix" id="id130">fix/*</a></li>
+<li><a class="reference internal" href="#gui" id="id131">gui/*</a></li>
+<li><a class="reference internal" href="#binpatch" id="id132">binpatch</a></li>
+<li><a class="reference internal" href="#create-items" id="id133">create-items</a></li>
+<li><a class="reference internal" href="#digfort" id="id134">digfort</a></li>
+<li><a class="reference internal" href="#drainaquifer" id="id135">drainaquifer</a></li>
+<li><a class="reference internal" href="#deathcause" id="id136">deathcause</a></li>
+<li><a class="reference internal" href="#dfstatus" id="id137">dfstatus</a></li>
+<li><a class="reference internal" href="#embark" id="id138">embark</a></li>
+<li><a class="reference internal" href="#exterminate" id="id139">exterminate</a></li>
+<li><a class="reference internal" href="#growcrops" id="id140">growcrops</a></li>
+<li><a class="reference internal" href="#lever" id="id141">lever</a></li>
+<li><a class="reference internal" href="#locate-ore" id="id142">locate-ore</a></li>
+<li><a class="reference internal" href="#lua" id="id143">lua</a></li>
+<li><a class="reference internal" href="#masspit" id="id144">masspit</a></li>
+<li><a class="reference internal" href="#multicmd" id="id145">multicmd</a></li>
+<li><a class="reference internal" href="#quicksave" id="id146">quicksave</a></li>
+<li><a class="reference internal" href="#removebadthoughts" id="id147">removebadthoughts</a></li>
+<li><a class="reference internal" href="#setfps" id="id148">setfps</a></li>
+<li><a class="reference internal" href="#siren" id="id149">siren</a></li>
+<li><a class="reference internal" href="#soundsense-season" id="id150">soundsense-season</a></li>
+<li><a class="reference internal" href="#source" id="id151">source</a></li>
+<li><a class="reference internal" href="#superdwarf" id="id152">superdwarf</a></li>
+<li><a class="reference internal" href="#stripcaged" id="id153">stripcaged</a></li>
+<li><a class="reference internal" href="#undump-buildings" id="id154">undump-buildings</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#in-game-interface-tools" id="id162">In-game interface tools</a><ul>
-<li><a class="reference internal" href="#dwarf-manipulator" id="id163">Dwarf Manipulator</a></li>
-<li><a class="reference internal" href="#search" id="id164">Search</a></li>
-<li><a class="reference internal" href="#automaterial" id="id165">AutoMaterial</a></li>
+<li><a class="reference internal" href="#modtools" id="id155">modtools</a></li>
+<li><a class="reference internal" href="#in-game-interface-tools" id="id156">In-game interface tools</a><ul>
+<li><a class="reference internal" href="#dwarf-manipulator" id="id157">Dwarf Manipulator</a></li>
+<li><a class="reference internal" href="#search" id="id158">Search</a></li>
+<li><a class="reference internal" href="#automaterial" id="id159">AutoMaterial</a></li>
+<li><a class="reference internal" href="#gui-advfort" id="id160">gui/advfort</a></li>
+<li><a class="reference internal" href="#gui-assign-rack" id="id161">gui/assign-rack</a></li>
+<li><a class="reference internal" href="#gui-choose-weapons" id="id162">gui/choose-weapons</a></li>
+<li><a class="reference internal" href="#gui-clone-uniform" id="id163">gui/clone-uniform</a></li>
+<li><a class="reference internal" href="#gui-companion-order" id="id164">gui/companion-order</a></li>
+<li><a class="reference internal" href="#gui-gm-editor" id="id165">gui/gm-editor</a></li>
 <li><a class="reference internal" href="#gui-liquids" id="id166">gui/liquids</a></li>
 <li><a class="reference internal" href="#gui-mechanisms" id="id167">gui/mechanisms</a></li>
-<li><a class="reference internal" href="#gui-rename" id="id168">gui/rename</a></li>
-<li><a class="reference internal" href="#gui-room-list" id="id169">gui/room-list</a></li>
-<li><a class="reference internal" href="#gui-choose-weapons" id="id170">gui/choose-weapons</a></li>
-<li><a class="reference internal" href="#gui-clone-uniform" id="id171">gui/clone-uniform</a></li>
-<li><a class="reference internal" href="#gui-guide-path" id="id172">gui/guide-path</a></li>
+<li><a class="reference internal" href="#gui-mod-manager" id="id168">gui/mod-manager</a></li>
+<li><a class="reference internal" href="#gui-rename" id="id169">gui/rename</a></li>
+<li><a class="reference internal" href="#gui-room-list" id="id170">gui/room-list</a></li>
+<li><a class="reference internal" href="#gui-guide-path" id="id171">gui/guide-path</a></li>
+<li><a class="reference internal" href="#gui-workflow" id="id172">gui/workflow</a></li>
 <li><a class="reference internal" href="#gui-workshop-job" id="id173">gui/workshop-job</a></li>
-<li><a class="reference internal" href="#gui-workflow" id="id174">gui/workflow</a></li>
-<li><a class="reference internal" href="#gui-assign-rack" id="id175">gui/assign-rack</a></li>
-<li><a class="reference internal" href="#gui-advfort" id="id176">gui/advfort</a></li>
-<li><a class="reference internal" href="#gui-companion-order" id="id177">gui/companion-order</a></li>
-<li><a class="reference internal" href="#gui-gm-editor" id="id178">gui/gm-editor</a></li>
-<li><a class="reference internal" href="#gui-mod-manager" id="id179">gui/mod-manager</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#behavior-mods" id="id180">Behavior Mods</a><ul>
-<li><a class="reference internal" href="#siege-engine" id="id181">Siege Engine</a><ul>
-<li><a class="reference internal" href="#rationale" id="id182">Rationale</a></li>
-<li><a class="reference internal" href="#configuration-ui" id="id183">Configuration UI</a></li>
+<li><a class="reference internal" href="#behavior-mods" id="id174">Behavior Mods</a><ul>
+<li><a class="reference internal" href="#siege-engine" id="id175">Siege Engine</a><ul>
+<li><a class="reference internal" href="#rationale" id="id176">Rationale</a></li>
+<li><a class="reference internal" href="#configuration-ui" id="id177">Configuration UI</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#power-meter" id="id184">Power Meter</a></li>
-<li><a class="reference internal" href="#steam-engine" id="id185">Steam Engine</a><ul>
-<li><a class="reference internal" href="#id1" id="id186">Rationale</a></li>
-<li><a class="reference internal" href="#construction" id="id187">Construction</a></li>
-<li><a class="reference internal" href="#operation" id="id188">Operation</a></li>
-<li><a class="reference internal" href="#explosions" id="id189">Explosions</a></li>
-<li><a class="reference internal" href="#save-files" id="id190">Save files</a></li>
+<li><a class="reference internal" href="#power-meter" id="id178">Power Meter</a></li>
+<li><a class="reference internal" href="#steam-engine" id="id179">Steam Engine</a><ul>
+<li><a class="reference internal" href="#id1" id="id180">Rationale</a></li>
+<li><a class="reference internal" href="#construction" id="id181">Construction</a></li>
+<li><a class="reference internal" href="#operation" id="id182">Operation</a></li>
+<li><a class="reference internal" href="#explosions" id="id183">Explosions</a></li>
+<li><a class="reference internal" href="#save-files" id="id184">Save files</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#add-spatter" id="id191">Add Spatter</a></li>
+<li><a class="reference internal" href="#add-spatter" id="id185">Add Spatter</a></li>
 </ul>
 </li>
 </ul>
@@ -602,15 +568,16 @@ access DF memory and allow for easier development of new tools.</p>
 <div class="section" id="getting-dfhack">
 <h1><a class="toc-backref" href="#id3">Getting DFHack</a></h1>
 <p>The project is currently hosted on <a class="reference external" href="http://www.github.com/">github</a>
-at <a class="reference external" href="http://github.com/peterix/dfhack">http://github.com/peterix/dfhack</a></p>
-<p>Releases can be downloaded from here: <a class="reference external" href="http://dethware.org/dfhack/download">http://dethware.org/dfhack/download</a></p>
-<p>All new releases are announced in the bay12 thread: <a class="reference external" href="http://tinyurl.com/dfhack-ng">http://tinyurl.com/dfhack-ng</a></p>
+at <a class="reference external" href="http://github.com/DFHack/dfhack">http://github.com/DFHack/dfhack</a></p>
+<p>Older releases can be downloaded from here: <a class="reference external" href="http://dethware.org/dfhack/download">http://dethware.org/dfhack/download</a></p>
+<p>All new releases are announced in the bay12 thread:
+<a class="reference external" href="http://www.bay12forums.com/smf/index.php?topic=139553.0">http://www.bay12forums.com/smf/index.php?topic=139553.0</a></p>
 </div>
 <div class="section" id="compatibility">
 <h1><a class="toc-backref" href="#id4">Compatibility</a></h1>
 <p>DFHack works on Windows XP, Vista, 7, any modern Linux distribution, or OS X
 10.6.8-10.9.</p>
-<p>Currently, version 0.34.11 is supported (and tested). If you need DFHack
+<p>Currently, version 0.40.08 is supported (and tested). If you need DFHack
 for older versions, look for older releases.</p>
 <p>On Windows, you have to use the SDL version of DF.</p>
 <p>It is also possible to use the Windows DFHack with Wine under Linux and OS X.</p>
@@ -619,20 +586,16 @@ for older versions, look for older releases.</p>
 <h1><a class="toc-backref" href="#id5">Installation/Removal</a></h1>
 <p>Installing DFhack involves copying files into your DF folder.
 Copy the files from a release archive so that:</p>
-<blockquote>
 <ul class="simple">
 <li>On Windows, SDL.dll is replaced</li>
 <li>On Linux, the 'dfhack' script is placed in the same folder as the 'df' script</li>
 </ul>
-</blockquote>
 <p>Uninstalling is basically the same, in reverse:</p>
-<blockquote>
 <ul class="simple">
 <li>On Windows, first delete SDL.dll and rename SDLreal.dll to SDL.dll. Then
 remove the other DFHack files</li>
 <li>On Linux, Remove the DFHack files.</li>
 </ul>
-</blockquote>
 <p>The stonesense plugin might require some additional libraries on Linux.</p>
 <p>If any of the plugins or dfhack itself refuses to load, check the stderr.log
 file created in your DF folder.</p>
@@ -693,19 +656,14 @@ DFHack prints an error there if it does not recognize the hash.</p>
 <p>DFHack includes a small stand-alone utility for applying and removing
 binary patches from the game executable. Use it from the regular operating
 system console:</p>
-<blockquote>
-<ul>
-<li><p class="first"><tt class="docutils literal">binpatch check &quot;Dwarf Fortress.exe&quot; patch.dif</tt></p>
-<p>Checks and prints if the patch is currently applied.</p>
-</li>
-<li><p class="first"><tt class="docutils literal">binpatch apply &quot;Dwarf Fortress.exe&quot; patch.dif</tt></p>
-<p>Applies the patch, unless it is already applied or in conflict.</p>
-</li>
-<li><p class="first"><tt class="docutils literal">binpatch remove &quot;Dwarf Fortress.exe&quot; patch.dif</tt></p>
-<p>Removes the patch, unless it is already removed.</p>
-</li>
-</ul>
-</blockquote>
+<dl class="docutils">
+<dt><tt class="docutils literal">binpatch check &quot;Dwarf Fortress.exe&quot; patch.dif</tt></dt>
+<dd>Checks and prints if the patch is currently applied.</dd>
+<dt><tt class="docutils literal">binpatch apply &quot;Dwarf Fortress.exe&quot; patch.dif</tt></dt>
+<dd>Applies the patch, unless it is already applied or in conflict.</dd>
+<dt><tt class="docutils literal">binpatch remove &quot;Dwarf Fortress.exe&quot; patch.dif</tt></dt>
+<dd>Removes the patch, unless it is already removed.</dd>
+</dl>
 <p>The patches are expected to be encoded in text format used by IDA.</p>
 <div class="section" id="live-patching">
 <h3><a class="toc-backref" href="#id9">Live patching</a></h3>
@@ -730,6 +688,7 @@ the issues tracker on github, contact me (<a class="reference external" href="ma
 every time you start DF. This allows setting up keybindings. An example file
 is provided as <tt class="docutils literal"><span class="pre">dfhack.init-example</span></tt> - you can tweak it and rename to dfhack.init
 if you want to use this functionality.</p>
+<p>When a savegame is loaded, the <tt class="docutils literal">onLoad.init</tt> file in its raw folder is run. It works the same way as <tt class="docutils literal">dfhack.init</tt>. It is recommended that modders use this to improve mobility of save games.</p>
 <div class="section" id="setting-keybindings">
 <h2><a class="toc-backref" href="#id12">Setting keybindings</a></h2>
 <p>To set keybindings, use the built-in <tt class="docutils literal">keybinding</tt> command. Like any other
@@ -737,26 +696,16 @@ command it can be used at any time from the console, but it is also meaningful
 in the DFHack init file.</p>
 <p>Currently it supports any combination of Ctrl/Alt/Shift with F1-F9, or A-Z.</p>
 <p>Possible ways to call the command:</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field"><th class="field-name" colspan="2">keybinding list &lt;key&gt;:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">List bindings active for the key combination.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">keybinding clear &lt;key&gt; &lt;key&gt;...:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Remove bindings for the specified keys.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">keybinding add &lt;key&gt; &quot;cmdline&quot; &quot;cmdline&quot;...:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Add bindings for the specified
-key.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">keybinding set &lt;key&gt; &quot;cmdline&quot; &quot;cmdline&quot;...:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Clear, and then add bindings for
-the specified key.</td>
-</tr>
-</tbody>
-</table>
+<dl class="docutils">
+<dt><tt class="docutils literal">keybinding list &lt;key&gt;</tt></dt>
+<dd>List bindings active for the key combination.</dd>
+<dt><tt class="docutils literal">keybinding clear &lt;key&gt; <span class="pre">&lt;key&gt;...</span></tt></dt>
+<dd>Remove bindings for the specified keys.</dd>
+<dt><tt class="docutils literal">keybinding add &lt;key&gt; &quot;cmdline&quot; <span class="pre">&quot;cmdline&quot;...</span></tt></dt>
+<dd>Add bindings for the specified key.</dd>
+<dt><tt class="docutils literal">keybinding set &lt;key&gt; &quot;cmdline&quot; <span class="pre">&quot;cmdline&quot;...</span></tt></dt>
+<dd>Clear, and then add bindings for the specified key.</dd>
+</dl>
 <p>The <em>&lt;key&gt;</em> parameter above has the following <em>case-sensitive</em> syntax:</p>
 <pre class="literal-block">
 [Ctrl-][Alt-][Shift-]KEY[&#64;context]
@@ -804,12 +753,10 @@ alternative mode: first, non-whitespace characters immediately following the <tt
 are used as the command name; the remaining part of the line, starting with the first
 non-whitespace character <em>after</em> the command name, is used verbatim as the first argument.
 The following two command lines are exactly equivalent:</p>
-<blockquote>
 <ul class="simple">
 <li><tt class="docutils literal">:foo a b &quot;c d&quot; e f</tt></li>
 <li><tt class="docutils literal">foo &quot;a b \&quot;c d\&quot; e f&quot;</tt></li>
 </ul>
-</blockquote>
 <p>This is intended for commands like <tt class="docutils literal">rb_eval</tt> that evaluate script language statements.</p>
 <p>Almost all the commands support using the 'help &lt;command-name&gt;' built-in command
 to retrieve further help without having to look at this document. Alternatively,
@@ -824,12 +771,10 @@ some accept a 'help'/'?' option on their command line.</p>
 <h3><a class="toc-backref" href="#id17">forcepause</a></h3>
 <p>Forces DF to pause. This is useful when your FPS drops below 1 and you lose
 control of the game.</p>
-<blockquote>
 <ul class="simple">
 <li>Activate with 'forcepause 1'</li>
 <li>Deactivate with 'forcepause 0'</li>
 </ul>
-</blockquote>
 </div>
 <div class="section" id="nopause">
 <h3><a class="toc-backref" href="#id18">nopause</a></h3>
@@ -839,7 +784,6 @@ by 'reveal hell'. This is nice for digging under rivers.</p>
 <div class="section" id="fastdwarf">
 <h3><a class="toc-backref" href="#id19">fastdwarf</a></h3>
 <p>Controls speedydwarf and teledwarf. Speedydwarf makes dwarves move quickly and perform tasks quickly. Teledwarf makes dwarves move instantaneously, but do jobs at the same speed.</p>
-<blockquote>
 <ul class="simple">
 <li>'fastdwarf 0 0' disables both</li>
 <li>'fastdwarf 0 1' disables speedydwarf and enables teledwarf</li>
@@ -850,7 +794,6 @@ by 'reveal hell'. This is nice for digging under rivers.</p>
 <li>'fastdwarf 2 ...' sets a native debug flag in the game memory
 that implements an even more aggressive version of speedydwarf.</li>
 </ul>
-</blockquote>
 </div>
 </div>
 <div class="section" id="game-interface">
@@ -879,34 +822,21 @@ allowing you to copy/paste stockpiles easily.</p>
 <h3><a class="toc-backref" href="#id25">rename</a></h3>
 <p>Allows renaming various things.</p>
 <p>Options:</p>
-<blockquote>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field"><th class="field-name" colspan="2">rename squad &lt;index&gt; &quot;name&quot;:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Rename squad by index to 'name'.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">rename hotkey &lt;index&gt; &quot;name&quot;:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Rename hotkey by index. This allows assigning
-longer commands to the DF hotkeys.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">rename unit &quot;nickname&quot;:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Rename a unit/creature highlighted in the DF user
-interface.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">rename unit-profession &quot;custom profession&quot;:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Change proffession name of the
-highlighted unit/creature.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">rename building &quot;name&quot;:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Set a custom name for the selected building.
+<dl class="docutils">
+<dt><tt class="docutils literal">rename squad &lt;index&gt; &quot;name&quot;</tt></dt>
+<dd>Rename squad by index to 'name'.</dd>
+<dt><tt class="docutils literal">rename hotkey &lt;index&gt; \&quot;name\&quot;</tt></dt>
+<dd>Rename hotkey by index. This allows assigning
+longer commands to the DF hotkeys.</dd>
+<dt><tt class="docutils literal">rename unit &quot;nickname&quot;</tt></dt>
+<dd>Rename a unit/creature highlighted in the DF user interface.</dd>
+<dt><tt class="docutils literal">rename <span class="pre">unit-profession</span> &quot;custom profession&quot;</tt></dt>
+<dd>Change proffession name of the highlighted unit/creature.</dd>
+<dt><tt class="docutils literal">rename building &quot;name&quot;</tt></dt>
+<dd>Set a custom name for the selected building.
 The building must be one of stockpile, workshop, furnace, trap,
-siege engine or an activity zone.</td>
-</tr>
-</tbody>
-</table>
-</blockquote>
+siege engine or an activity zone.</dd>
+</dl>
 </div>
 <div class="section" id="command-prompt">
 <h3><a class="toc-backref" href="#id26">command-prompt</a></h3>
@@ -921,32 +851,20 @@ that pre-filled.</p>
 black color in palette to non totally black. For more info see thread in forums:
 <a class="reference external" href="http://www.bay12forums.com/smf/index.php?topic=128487.0">http://www.bay12forums.com/smf/index.php?topic=128487.0</a></p>
 <p>Options:</p>
-<blockquote>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field"><th class="field-name" colspan="2">rendermax trippy:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Randomizes each tiles color. Used for fun mainly.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">rendermax light:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Enable lighting engine.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">rendermax light reload:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Reload the settings file.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">rendermax light sun &lt;x&gt;|cycle:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Set time to &lt;x&gt; (in hours) or set it to df time cycle.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">rendermax occlusionON|occlusionOFF:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Show debug occlusion info.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">rendermax disable:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Disable any filter that is enabled.</td>
-</tr>
-</tbody>
-</table>
-</blockquote>
+<dl class="docutils">
+<dt><tt class="docutils literal">rendermax trippy</tt></dt>
+<dd>Randomizes each tiles color. Used for fun mainly.</dd>
+<dt><tt class="docutils literal">rendermax light</tt></dt>
+<dd>Enable lighting engine.</dd>
+<dt><tt class="docutils literal">rendermax light reload</tt></dt>
+<dd>Reload the settings file.</dd>
+<dt><tt class="docutils literal">rendermax light sun <span class="pre">&lt;x&gt;|cycle</span></tt></dt>
+<dd>Set time to &lt;x&gt; (in hours) or set it to df time cycle.</dd>
+<dt><tt class="docutils literal">rendermax occlusionON|occlusionOFF</tt></dt>
+<dd>Show debug occlusion info.</dd>
+<dt><tt class="docutils literal">rendermax disable</tt></dt>
+<dd>Disable any filter that is enabled.</dd>
+</dl>
 <p>An image showing lava and dragon breath. Not pictured here: sunlight, shining items/plants,
 materials that color the light etc...</p>
 <img alt="images/rendermax.png" src="images/rendermax.png" />
@@ -960,34 +878,24 @@ materials that color the light etc...</p>
 mode. For example, you can make them pick up new arms and armor and equip them
 properly.</p>
 <p>Usage:</p>
-<blockquote>
 <ul class="simple">
 <li>When viewing unit details, body-swaps into that unit.</li>
 <li>In the main adventure mode screen, reverts transient swap.</li>
 </ul>
-</blockquote>
 </div>
 <div class="section" id="advtools">
 <h3><a class="toc-backref" href="#id30">advtools</a></h3>
 <p>A package of different adventure mode tools (currently just one)</p>
 <p>Usage:</p>
-<blockquote>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field"><th class="field-name" colspan="2">list-equipped [all]:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">List armor and weapons equipped by your companions.
-If all is specified, also lists non-metal clothing.</td>
-</tr>
-<tr class="field"><th class="field-name" colspan="2">metal-detector [all-types] [non-trader]:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Reveal metal armor and weapons in
+<dl class="docutils">
+<dt><tt class="docutils literal"><span class="pre">list-equipped</span> [all]</tt></dt>
+<dd>List armor and weapons equipped by your companions.
+If all is specified, also lists non-metal clothing.</dd>
+<dt><tt class="docutils literal"><span class="pre">metal-detector</span> <span class="pre">[all-types]</span> <span class="pre">[non-trader]</span></tt></dt>
+<dd>Reveal metal armor and weapons in
 shops. The options disable the checks
-on item type and being in shop.</td>
-</tr>
-</tbody>
-</table>
-</blockquote>
+on item type and being in shop.</dd>
+</dl>
 </div>
 </div>
 <div class="section" id="map-modification">
@@ -1001,7 +909,7 @@ the command for the second time should produce no change. It is best to
 run it just once immediately after embark.</p>
 <p>This command is intended as only a cosmetic change, so it takes
 care to exactly preserve the mineral counts reported by <tt class="docutils literal">prospect all</tt>.
-The amounts of different layer stone may slightly change in some cases
+The amounts of different layer stones may slightly change in some cases
 if vein mass shifts between Z layers.</p>
 <p>This command is very unlikely to work on maps generated before version 0.34.08.</p>
 <p>Note that there is no undo option other than restoring from backup.</p>
@@ -1019,7 +927,6 @@ as well, though. Mineral veins and gem clusters will stay on the map. Use
 <p>tl;dr: You will end up with changing quite big areas in one go, especially if
 you use it in lower z levels. Use with care.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1051,9 +958,7 @@ soil.</td>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Examples:</p>
-<blockquote>
 <dl class="docutils">
 <dt><tt class="docutils literal">changelayer GRANITE</tt></dt>
 <dd>Convert layer at cursor position into granite.</dd>
@@ -1062,7 +967,6 @@ soil.</td>
 <dt><tt class="docutils literal">changelayer MARBLE all_biomes all_layers</tt></dt>
 <dd>Convert all layers of all biomes which are not soil into marble.</dd>
 </dl>
-</blockquote>
 <div class="note">
 <p class="first admonition-title">Note</p>
 <ul class="last simple">
@@ -1087,12 +991,10 @@ You did save your game, right?</li>
 material. Only affects tiles within the current 16x16 block - for veins and
 large clusters, you will need to use this command multiple times.</p>
 <p>Example:</p>
-<blockquote>
 <dl class="docutils">
 <dt><tt class="docutils literal">changevein NATIVE_PLATINUM</tt></dt>
 <dd>Convert vein at cursor position into platinum ore.</dd>
 </dl>
-</blockquote>
 </div>
 <div class="section" id="changeitem">
 <h3><a class="toc-backref" href="#id35">changeitem</a></h3>
@@ -1106,7 +1008,6 @@ in weirdness. To get an idea how the RAW id should look like, check some items
 with 'info'. Using 'force' might create items which are not touched by
 crafters/haulers.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1123,22 +1024,18 @@ crafters/haulers.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Examples:</p>
-<blockquote>
 <dl class="docutils">
 <dt><tt class="docutils literal">changeitem m INORGANIC:GRANITE here</tt></dt>
 <dd>Change material of all items under the cursor to granite.</dd>
 <dt><tt class="docutils literal">changeitem q 5</tt></dt>
 <dd>Change currently selected item to masterpiece quality.</dd>
 </dl>
-</blockquote>
 </div>
 <div class="section" id="colonies">
 <h3><a class="toc-backref" href="#id36">colonies</a></h3>
 <p>Allows listing all the vermin colonies on the map and optionally turning them into honey bee colonies.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1147,20 +1044,20 @@ crafters/haulers.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 <div class="section" id="createitem">
 <h3><a class="toc-backref" href="#id37">createitem</a></h3>
 <p>Allows creating new items of arbitrary types and made of arbitrary materials.
 By default, items created are spawned at the feet of the selected unit.</p>
-<p>Specify the item and material information as you would indicate them in custom reaction raws, with the following differences:
-* Separate the item and material with a space rather than a colon
-* If the item has no subtype, omit the :NONE
-* If the item is REMAINS, FISH, FISH_RAW, VERMIN, PET, or EGG, specify a CREATURE:CASTE pair instead of a material token.</p>
+<p>Specify the item and material information as you would indicate them in custom reaction raws, with the following differences:</p>
+<ul class="simple">
+<li>Separate the item and material with a space rather than a colon</li>
+<li>If the item has no subtype, omit the :NONE</li>
+<li>If the item is REMAINS, FISH, FISH_RAW, VERMIN, PET, or EGG, specify a CREATURE:CASTE pair instead of a material token.</li>
+</ul>
 <p>Corpses, body parts, and prepared meals cannot be created using this tool.</p>
+<p>Examples:</p>
 <dl class="docutils">
-<dt>Examples:</dt>
-<dd><dl class="first last docutils">
 <dt><tt class="docutils literal">createitem GLOVES:ITEM_GLOVES_GAUNTLETS INORGANIC:STEEL 2</tt></dt>
 <dd>Create 2 pairs of steel gauntlets.</dd>
 <dt><tt class="docutils literal">createitem WOOD PLANT_MAT:TOWER_CAP:WOOD</tt></dt>
@@ -1168,12 +1065,9 @@ By default, items created are spawned at the feet of the selected unit.</p>
 <dt><tt class="docutils literal">createitem FISH FISH_SHAD:MALE 5</tt></dt>
 <dd>Create a stack of 5 cleaned shad, ready to eat.</dd>
 </dl>
-</dd>
-</dl>
 <p>To change where new items are placed, first run the command with a destination type while an appropriate destination is selected.</p>
-<dl class="docutils">
-<dt>Options:</dt>
-<dd><table class="first last docutils field-list" frame="void" rules="none">
+<p>Options:</p>
+<table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
@@ -1185,8 +1079,6 @@ By default, items created are spawned at the feet of the selected unit.</p>
 </tr>
 </tbody>
 </table>
-</dd>
-</dl>
 </div>
 <div class="section" id="deramp-by-zilpin">
 <h3><a class="toc-backref" href="#id38">deramp (by zilpin)</a></h3>
@@ -1203,7 +1095,6 @@ underground structure) permits magma workshops and furnaces to be built.</li>
 that cavern to grow within your fortress.</li>
 </ul>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1216,18 +1107,18 @@ that cavern to grow within your fortress.</li>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 <div class="section" id="infinitesky">
 <h3><a class="toc-backref" href="#id40">infiniteSky</a></h3>
 <p>Automatically allocates new z-levels of sky at the top of the map as you build up, or on request allocates many levels all at once.</p>
+<p>Examples:</p>
 <dl class="docutils">
-<dt>Examples:</dt>
-<dd><tt class="docutils literal">infiniteSky n</tt>
-Raise the sky by n z-levels.
-<tt class="docutils literal">infiniteSky enable/disable</tt>
-Enables/disables monitoring of constructions. If you build anything in the second to highest z-level, it will allocate one more sky level. This is so you can continue to build stairs upward.</dd>
+<dt><tt class="docutils literal">infiniteSky n</tt></dt>
+<dd>Raise the sky by n z-levels.</dd>
+<dt><tt class="docutils literal">infiniteSky enable/disable</tt></dt>
+<dd>Enables/disables monitoring of constructions. If you build anything in the second to highest z-level, it will allocate one more sky level. This is so you can continue to build stairs upward.</dd>
 </dl>
+<p>Bugs have been reported with this version of the plugin, so be careful. It is possible that new z-levels will suddenly disappear and possibly cause cave-ins. Saving and loading after creating new z-levels should fix the problem.</p>
 </div>
 <div class="section" id="liquids">
 <h3><a class="toc-backref" href="#id41">liquids</a></h3>
@@ -1310,16 +1201,13 @@ filter material any
 filter shape any
 filter any
 </pre>
-<dl class="docutils">
-<dt>You can use several different brushes for painting tiles:</dt>
-<dd><ul class="first last simple">
+<p>You can use several different brushes for painting tiles:</p>
+<ul class="simple">
 <li>Point. (point)</li>
 <li>Rectangular range. (range)</li>
 <li>A column ranging from current cursor to the first solid tile above. (column)</li>
 <li>DF map block - 16x16 tiles, in a regular grid. (block)</li>
 </ul>
-</dd>
-</dl>
 <p>Example:</p>
 <pre class="literal-block">
 range 10 10 1
@@ -1348,9 +1236,8 @@ tile. Can be used from a hotkey.</p>
 <h3><a class="toc-backref" href="#id47">tubefill</a></h3>
 <p>Fills all the adamantine veins again. Veins that were hollow will be left
 alone.</p>
-<dl class="docutils">
-<dt>Options:</dt>
-<dd><table class="first last docutils field-list" frame="void" rules="none">
+<p>Options:</p>
+<table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
@@ -1358,17 +1245,14 @@ alone.</p>
 </tr>
 </tbody>
 </table>
-</dd>
-</dl>
 <p>Beware that filling in hollow veins will trigger a demon invasion on top of
 your miner when you dig into the region that used to be hollow.</p>
 </div>
 <div class="section" id="plant">
 <h3><a class="toc-backref" href="#id48">plant</a></h3>
 <p>A tool for creating shrubs, growing, or getting rid of them.</p>
-<dl class="docutils">
-<dt>Subcommands:</dt>
-<dd><table class="first last docutils field-list" frame="void" rules="none">
+<p>Subcommands:</p>
+<table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
@@ -1382,17 +1266,14 @@ your miner when you dig into the region that used to be hollow.</p>
 </tr>
 </tbody>
 </table>
-</dd>
-</dl>
 <p><tt class="docutils literal">create</tt> creates a new sapling under the cursor. Takes a raw ID as
 argument (e.g. TOWER_CAP). The cursor must be located on a dirt or grass
 floor tile.</p>
 <p><tt class="docutils literal">grow</tt> works on the sapling under the cursor, and turns it into a tree.
 Works on all shrubs of the map if the cursor is hidden.</p>
 <p><tt class="docutils literal">extirpate</tt> and <tt class="docutils literal">immolate</tt> work only on the plant under the cursor.</p>
-<dl class="docutils">
-<dt>For mass effects, use one of the additional options:</dt>
-<dd><table class="first last docutils field-list" frame="void" rules="none">
+<p>For mass effects, use one of the additional options:</p>
+<table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
@@ -1404,8 +1285,6 @@ Works on all shrubs of the map if the cursor is hidden.</p>
 </tr>
 </tbody>
 </table>
-</dd>
-</dl>
 </div>
 <div class="section" id="regrass">
 <h3><a class="toc-backref" href="#id49">regrass</a></h3>
@@ -1416,7 +1295,6 @@ Works on all shrubs of the map if the cursor is hidden.</p>
 <p>Prints the current weather map by default.</p>
 <p>Also lets you change the current weather to 'clear sky', 'rainy' or 'snowing'.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1429,7 +1307,6 @@ Works on all shrubs of the map if the cursor is hidden.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 </div>
 <div class="section" id="map-inspection">
@@ -1447,7 +1324,6 @@ Undead skeletons, corpses, bodyparts and the like are all thrown into the curse
 category &quot;zombie&quot;. Anonymous zombies and resurrected body parts will show
 as &quot;unnamed creature&quot;.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1465,9 +1341,7 @@ long list after having FUN with necromancers).</td>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Examples:</p>
-<blockquote>
 <dl class="docutils">
 <dt><tt class="docutils literal">cursecheck detail all</tt></dt>
 <dd>Give detailed info about all cursed creatures including deceased ones (no
@@ -1476,7 +1350,6 @@ in-game cursor).</dd>
 <dd>Give a nickname all living/active cursed creatures on the map(no in-game
 cursor).</dd>
 </dl>
-</blockquote>
 <div class="note">
 <p class="first admonition-title">Note</p>
 <ul class="last simple">
@@ -1504,7 +1377,6 @@ revealing the map.</p>
 <p>Prints a big list of all the present minerals and plants. By default, only
 the visible part of the map is scanned.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1517,7 +1389,6 @@ the visible part of the map is scanned.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <div class="section" id="pre-embark-estimate">
 <h4><a class="toc-backref" href="#id56">Pre-embark estimate</a></h4>
 <p>If prospect is called during the embark selection screen, it displays an estimate of
@@ -1531,7 +1402,6 @@ will be in a given embark tile, so it can report a whole extra layer, or omit on
 that is actually present.</p>
 </div>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1540,7 +1410,6 @@ that is actually present.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 </div>
 <div class="section" id="reveal">
@@ -1577,85 +1446,13 @@ you abandoned with the fort revealed and no longer want the data.</p>
 <p>Shows all items needed for the currently active strange mood.</p>
 </div>
 </div>
-<div class="section" id="mod-interaction">
-<h2><a class="toc-backref" href="#id63">Mod Interaction</a></h2>
-<p>This section describes plugins that interact with information in the raw files to add new features that cannot be achieved by only changing raw files.</p>
-<div class="section" id="autosyndrome">
-<h3><a class="toc-backref" href="#id64">autoSyndrome</a></h3>
-<p>This plugin replaces &quot;boiling rock&quot; syndromes. Without this plugin, it is possible to add a syndrome to a unit by making the unit perform a custom reaction. First, add the syndrome to a rock which boils at room temperature. Make sure that the syndrome is spread by inhaling. Then, add a custom reaction which creates that rock. When the reaction is performed, the rock will be created, then boil. Hopefully, the dwarf will inhale the gas and become afflicted with the syndrome. This has disadvantages.</p>
-<ol class="arabic simple">
-<li>The creating unit might not inhale the gas. This makes it difficult to balance gameplay, as it is hard to measure this probability.</li>
-<li>A different unit might inhale the gas. Pets or children might inhale the gas, which may be undesired.</li>
-</ol>
-<p>To fix this problem, you can use autoSyndrome. The plugin monitors when custom reactions are completed within dwarf mode. If certain conditions are met, then the syndrome is immediately applied. The conditions are described below in priority order. If multiple products are created by the reaction, each one is considered independently in order. If a rock has multiple syndromes, each one is considered independently. If the conditions are all met, then the appropriate target will be instantly afficted with the appropriate syndrome, and the syndrome will behave just like any other.</p>
-<ol class="arabic simple">
-<li>The recently completed reaction must be a custom reaction, not a built-in one.</li>
-<li>The product must be an inorganic boulder. Its boiling temperature is ignored.</li>
-<li>The syndrome must have <tt class="docutils literal"><span class="pre">[SYN_CLASS:\AUTO_SYNDROME]</span></tt>.</li>
-<li>If the syndrome has <tt class="docutils literal"><span class="pre">[SYN_CLASS:\ALLOW_MULTIPLE_TARGETS]</span></tt> then an unbounded number of units can be targetted by the syndrome. If absent, at most one will be affected, and the worker will be considered first.</li>
-<li>If the syndrome has <tt class="docutils literal"><span class="pre">[SYN_CLASS:\ALLOW_NONWORKER_TARGETS]</span></tt> then units that are in the building might be targetted. If absent, only the worker will be targetted. Even if present, the worker will be considered first.</li>
-<li>If the syndrome has <tt class="docutils literal"><span class="pre">[SYN_CLASS:\PRESERVE_ROCK]</span></tt> then the stone or stones created will not be destroyed. If absent, they will be. Leaving this out ensures that gasses from boiling rocks will not sidestep the plugin, affecting nearby units using existing gameplay mechanics (because said gasses will never get a chance to be created).</li>
-<li>If there are no <tt class="docutils literal">SYN_IMMUNE_CREATURE</tt>, <tt class="docutils literal">SYN_AFFECTED_CREATURE</tt>, <tt class="docutils literal">SYN_IMMUNE_CLASS</tt>, or <tt class="docutils literal">SYN_AFFECTED_CLASS</tt> then any creature can be targetted, if it meets the above restrictions.</li>
-<li>If the target creature is specified as <tt class="docutils literal">SYN_IMMUNE_CREATURE</tt> in the syndrome tags, then it will not be affected.</li>
-<li>If it is specified as <tt class="docutils literal">SYN_AFFECTED_CREATURE</tt> then it will be affected.</li>
-<li>If it has <tt class="docutils literal">SYN_IMMUNE_CLASS</tt> it will not be affected.</li>
-<li>It it has <tt class="docutils literal">SYN_AFFECTED_CLASS</tt> it will be affected.</li>
-</ol>
-<p>Note that tags like <tt class="docutils literal">[SYN_INHALED]</tt> are ignored.</p>
-<p>The plugin will work for transformations, but doesn't seem to properly apply CE_BLEEDING, for example. Further testing is required.</p>
-<p>If the reaction is run twice, by default, a second instance of the syndrome is added. This behavior can be customized. With <tt class="docutils literal"><span class="pre">[SYN_CLASS:\RESET_POLICY</span> DoNothing]</tt>, units already afflicted with the syndrome will not be considered for syndrome application. With <tt class="docutils literal"><span class="pre">[SYN_CLASS:\RESET_POLICY</span> ResetDuration]</tt> the existing syndrome timer is reset. With <tt class="docutils literal"><span class="pre">[SYN_CLASS:\RESET_POLICY</span> AddDuration]</tt> the duration of the longest effect in the syndrome is added to the remaining duration of the existing syndrome. The tag <tt class="docutils literal"><span class="pre">[SYN_CLASS:\RESET_POLICY</span> NewInstance]</tt> re-establishes the default behavior. If more than one such tag is present, the last one takes priority.</p>
-<p>It is also possible to directly trigger dfhack plugins and scripts using autoSyndrome. If a syndrome has <tt class="docutils literal"><span class="pre">[SYN_CLASS:\COMMAND]</span></tt> then all following <tt class="docutils literal">SYN_CLASS</tt> tags will be used to create a console command. The command will behave exactly as if the user had typed it in to the dfhack console. For example</p>
-<p><tt class="docutils literal"><span class="pre">[SYN_CLASS:\COMMAND]</span></tt>
-<tt class="docutils literal">[SYN_CLASS:prospect]</tt>
-<tt class="docutils literal">[SYN_CLASS:all]</tt></p>
-<p>would run the command &quot;prospect all&quot; whenever the given rock is created. The <tt class="docutils literal">\AUTO_SYNDROME</tt> tag IS required for commands to execute. Note that since all <tt class="docutils literal">SYN_CLASS</tt> tags after the <tt class="docutils literal">\COMMAND</tt> tag are interpreted as part of the command, tags like <tt class="docutils literal">\WORKER_ONLY</tt> must be placed before <tt class="docutils literal">\COMMAND</tt>, or not at all in order to work.</p>
-<p>There are also certain &quot;special&quot; arguments that can be passed.</p>
-<ol class="arabic simple">
-<li><tt class="docutils literal">\LOCATION</tt>: pass the x, y, and z coordinates of the work tile of the building which completed the job as separate arguments.</li>
-<li><tt class="docutils literal">\WORKER_ID</tt>: pass the unit id of the unit that finished the job as an argument.</li>
-<li><tt class="docutils literal">\REACTION_INDEX</tt>: pass the id of the completed reaction as an argument.</li>
-</ol>
-<p>A note on spaces: when a plugin command executes in dfhack, it always has a list of arguments. Arguments are strings which tell the plugin what the user wants it to do. When the user types in a command, arguments will be separated by whitespace. However, if autoSyndrome is given a tag like <tt class="docutils literal">[SYN_CLASS:123 abcde]</tt> after a <tt class="docutils literal"><span class="pre">[SYN_CLASS:\COMMAND]</span></tt> tag, this will still be treated as ONE argument. This may or may not cause problems, depending on the command in question. To be safe, never include spaces in as an argument to a command.</p>
-<p>For example, suppose a reaction creates a rock which has a syndrome with the <tt class="docutils literal">SYN_CLASS</tt> tags <tt class="docutils literal">\AUTO_SYNDROME</tt>, <tt class="docutils literal">\COMMAND</tt>, <tt class="docutils literal">printArgs</tt>, <tt class="docutils literal">id_comes_next</tt>, <tt class="docutils literal">\WORKER_ID</tt>, <tt class="docutils literal">location_comes_next</tt>, <tt class="docutils literal">\LOCATION</tt> in that order. Suppose the reaction is done at <tt class="docutils literal">(35,96,112)</tt> by unit number 15. This would be equivalent to typing <tt class="docutils literal">printArgs id_comes_next 15 location_comes_next 35 96 112</tt> into the DFHack console and pressing enter.</p>
-<p>Other syndrome classes that occur before <tt class="docutils literal">\COMMAND</tt> (or in absence of any <tt class="docutils literal">\COMMAND</tt> synclass) are ignored.</p>
-<p>It is not currently possible to execute more than one command per syndrome. Instead, use multiple syndromes to achieve the same effect. Note that it is possible to have multiple syndromes on the same stone.</p>
-<p>Again, note that plugins AND scripts can be executed this way, and arguments will be passed according to the same rules.</p>
-</div>
-<div class="section" id="outsideonly">
-<h3><a class="toc-backref" href="#id65">outsideOnly</a></h3>
-<p>This plugin makes it so that buildings whose names begin with <tt class="docutils literal">OUTSIDE_ONLY</tt> cannot be built inside. If the player attempts to do so, the building will automatically be deconstructed.</p>
-</div>
-<div class="section" id="syndrometrigger">
-<h3><a class="toc-backref" href="#id66">syndromeTrigger</a></h3>
-<p>This plugin allows DFHack commands to be executed whenever a unit becomes afflicted with a syndrome. This can happen due to a boiling rock, an interaction, autoSyndrome, etc. Regardless of the cause, if the appropriate <tt class="docutils literal">SYN_CLASS</tt> tags are present, the command will execute.</p>
-<p>The syntax is very similar to autoSyndrome. If the syndrome has the <tt class="docutils literal">\COMMAND</tt> tag, every subsequent <tt class="docutils literal">SYN_CLASS</tt> tag will be used to create a console command. The following tags are &quot;special&quot;:</p>
-<ol class="arabic simple">
-<li><tt class="docutils literal">\LOCATION</tt>: this will be replaced by three arguments, one for each coordinate of the location of the unit.</li>
-<li><tt class="docutils literal">\UNIT_ID</tt>: this will be replaced by the identifier of the unit afllicted with the syndrome.</li>
-<li><tt class="docutils literal">\SYNDROME_ID</tt>: this will be replaced by the identifier of the syndrome in question.</li>
-</ol>
-<p>If there is a <tt class="docutils literal"><span class="pre">[SYN_CLASS:\AUTO_SYNDROME]</span></tt> tag, then the command, if any, will NOT be executed by syndromeTrigger, because it should already have been executed by autoSyndrome.</p>
-<div class="section" id="true-transformation">
-<h4><a class="toc-backref" href="#id67">True Transformation</a></h4>
-<p>The syndromeTrigger plugin also allows true, permanent transformations. In vanilla DF, if syndrome A transforms dwarves into goblins permanently, and syndrome B transforms goblins into dragons permanently, then syndrome B would NOT properly transform goblins that had been transformed from dwarves. True transformations can be achieved with this plugin.</p>
-<p>True transformations work differently. First, the unit transforms into a temporary, distinct, intermediate form. While transformed, this plugin overwrites their &quot;original&quot; unit type with the desired type. When the transformation wears off, they will turn &quot;back&quot; into the new unit type. Once truly transformed, units will function as if they had always been the new unit type. Equipment may be dropped on transformation, but relationships and experience should be maintained.</p>
-<p>Suppose you want to transform dwarves into goblins. First, make a syndrome that turns dwarves into ducks for 1 tick (start:0:end:1). It should work with <tt class="docutils literal">END:1</tt>, but if it doesn't, try <tt class="docutils literal">END:5</tt>. You MUST use <tt class="docutils literal">START:0</tt>. Setting the end time very high will make the intermediate form take longer, and should have no other influence on the behavior of this plugin. The intermediate form must NOT be the same as the original form, and it must NOT be the same as the final form, or the game will crash. Add the following tags:</p>
-<p><tt class="docutils literal"><span class="pre">[SYN_CLASS:\PERMANENT]</span></tt>
-<tt class="docutils literal">[SYN_CLASS:GOBLIN]</tt>
-<tt class="docutils literal">[SYN_CLASS:MALE]</tt></p>
-<p>Note that you must use the &quot;official&quot; (usually allcaps) name of the target creature/caste, not necessarily the name used in game. For example, you would use <tt class="docutils literal">BIRD_DUCK</tt>, <tt class="docutils literal">MALE</tt>, instead of <tt class="docutils literal">drake</tt>.</p>
-<p>It is perfectly fine to use syndromeTrigger along with autoSyndrome. This means that you can, for example, trigger a true transformation using a reaction. It is also possible to trigger a true transformation using an interaction, or another plugin that adds syndromes, so long as that other plugin does not interfere with the tags required for this one to work properly.</p>
-</div>
-</div>
-</div>
 <div class="section" id="designations">
-<h2><a class="toc-backref" href="#id68">Designations</a></h2>
+<h2><a class="toc-backref" href="#id63">Designations</a></h2>
 <div class="section" id="burrow">
-<h3><a class="toc-backref" href="#id69">burrow</a></h3>
+<h3><a class="toc-backref" href="#id64">burrow</a></h3>
 <p>Miscellaneous burrow control. Allows manipulating burrows and automated burrow
 expansion while digging.</p>
 <p>Options:</p>
-<blockquote>
 <dl class="docutils">
 <dt><strong>enable feature ...</strong></dt>
 <dd>Enable features of the plugin.</dd>
@@ -1682,9 +1479,7 @@ possible to use one of the following keywords: ABOVE_GROUND,
 SUBTERRANEAN, INSIDE, OUTSIDE, LIGHT, DARK, HIDDEN, REVEALED</p>
 </dd>
 </dl>
-</blockquote>
 <p>Features:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1696,20 +1491,19 @@ Digging 1-wide corridors with the miner inside the burrow is SLOW.</td>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 <div class="section" id="digv">
-<h3><a class="toc-backref" href="#id70">digv</a></h3>
+<h3><a class="toc-backref" href="#id65">digv</a></h3>
 <p>Designates a whole vein for digging. Requires an active in-game cursor placed
 over a vein tile. With the 'x' option, it will traverse z-levels (putting stairs
 between the same-material tiles).</p>
 </div>
 <div class="section" id="digvx">
-<h3><a class="toc-backref" href="#id71">digvx</a></h3>
+<h3><a class="toc-backref" href="#id66">digvx</a></h3>
 <p>A permanent alias for 'digv x'.</p>
 </div>
 <div class="section" id="digl">
-<h3><a class="toc-backref" href="#id72">digl</a></h3>
+<h3><a class="toc-backref" href="#id67">digl</a></h3>
 <p>Designates layer stone for digging. Requires an active in-game cursor placed
 over a layer stone tile. With the 'x' option, it will traverse z-levels
 (putting stairs between the same-material tiles). With the 'undo' option it
@@ -1717,16 +1511,15 @@ will remove the dig designation instead (if you realize that digging out a 50
 z-level deep layer was not such a good idea after all).</p>
 </div>
 <div class="section" id="diglx">
-<h3><a class="toc-backref" href="#id73">diglx</a></h3>
+<h3><a class="toc-backref" href="#id68">diglx</a></h3>
 <p>A permanent alias for 'digl x'.</p>
 </div>
 <div class="section" id="digexp">
-<h3><a class="toc-backref" href="#id74">digexp</a></h3>
+<h3><a class="toc-backref" href="#id69">digexp</a></h3>
 <p>This command can be used for exploratory mining.</p>
 <p>See: <a class="reference external" href="http://df.magmawiki.com/index.php/DF2010:Exploratory_mining">http://df.magmawiki.com/index.php/DF2010:Exploratory_mining</a></p>
 <p>There are two variables that can be set: pattern and filter.</p>
 <p>Patterns:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1745,9 +1538,7 @@ z-level deep layer was not such a good idea after all).</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Filters:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1760,35 +1551,22 @@ z-level deep layer was not such a good idea after all).</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>After you have a pattern set, you can use 'expdig' to apply it again.</p>
 <p>Examples:</p>
-<blockquote>
 <dl class="docutils">
-<dt>designate the diagonal 5 patter over all hidden tiles:</dt>
-<dd><ul class="first last simple">
-<li>expdig diag5 hidden</li>
-</ul>
-</dd>
-<dt>apply last used pattern and filter:</dt>
-<dd><ul class="first last simple">
-<li>expdig</li>
-</ul>
-</dd>
-<dt>Take current designations and replace them with the ladder pattern:</dt>
-<dd><ul class="first last simple">
-<li>expdig ladder designated</li>
-</ul>
-</dd>
+<dt><tt class="docutils literal">expdig diag5 hidden</tt></dt>
+<dd>Designate the diagonal 5 patter over all hidden tiles</dd>
+<dt><tt class="docutils literal">expdig</tt></dt>
+<dd>Apply last used pattern and filter</dd>
+<dt><tt class="docutils literal">expdig ladder designated</tt></dt>
+<dd>Take current designations and replace them with the ladder pattern</dd>
 </dl>
-</blockquote>
 </div>
 <div class="section" id="digcircle">
-<h3><a class="toc-backref" href="#id75">digcircle</a></h3>
+<h3><a class="toc-backref" href="#id70">digcircle</a></h3>
 <p>A command for easy designation of filled and hollow circles.
 It has several types of options.</p>
 <p>Shape:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1801,9 +1579,7 @@ It has several types of options.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Action:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1816,9 +1592,7 @@ It has several types of options.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Designation types:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1837,7 +1611,6 @@ It has several types of options.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>After you have set the options, the command called with no options
 repeats with the last selected parameters.</p>
 <p>Examples:</p>
@@ -1847,11 +1620,10 @@ repeats with the last selected parameters.</p>
 </ul>
 </div>
 <div class="section" id="digtype">
-<h3><a class="toc-backref" href="#id76">digtype</a></h3>
+<h3><a class="toc-backref" href="#id71">digtype</a></h3>
 <p>For every tile on the map of the same vein type as the selected tile, this command designates it to have the same designation as the selected tile. If the selected tile has no designation, they will be dig designated.
 If an argument is given, the designation of the selected tile is ignored, and all appropriate tiles are set to the specified designation.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1872,10 +1644,9 @@ If an argument is given, the designation of the selected tile is ignored, and al
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 <div class="section" id="digflood">
-<h3><a class="toc-backref" href="#id77">digFlood</a></h3>
+<h3><a class="toc-backref" href="#id72">digFlood</a></h3>
 <p>Automatically digs out specified veins as they are discovered. It runs once every time a dwarf finishes a dig job. It will only dig out appropriate tiles that are adjacent to the finished dig job. To add a vein type, use <cite>digFlood 1 [type]</cite>. This will also enable the plugin. To remove a vein type, use <cite>digFlood 0 [type] 1</cite> to disable, then remove, then re-enable.</p>
 <p><cite>digFlood 0</cite> disable</p>
 <p><cite>digFlood 1</cite> enable</p>
@@ -1886,10 +1657,9 @@ If an argument is given, the designation of the selected tile is ignored, and al
 <p>See <cite>help digFlood</cite> for details.</p>
 </div>
 <div class="section" id="filltraffic">
-<h3><a class="toc-backref" href="#id78">filltraffic</a></h3>
+<h3><a class="toc-backref" href="#id73">filltraffic</a></h3>
 <p>Set traffic designations using flood-fill starting at the cursor.</p>
 <p>Traffic Type Codes:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1904,9 +1674,7 @@ If an argument is given, the designation of the selected tile is ignored, and al
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Other Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1919,16 +1687,16 @@ If an argument is given, the designation of the selected tile is ignored, and al
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Example:</p>
-<blockquote>
-'filltraffic H' - When used in a room with doors, it will set traffic to HIGH in just that room.</blockquote>
+<dl class="docutils">
+<dt><tt class="docutils literal">filltraffic H</tt></dt>
+<dd>When used in a room with doors, it will set traffic to HIGH in just that room.</dd>
+</dl>
 </div>
 <div class="section" id="alltraffic">
-<h3><a class="toc-backref" href="#id79">alltraffic</a></h3>
+<h3><a class="toc-backref" href="#id74">alltraffic</a></h3>
 <p>Set traffic designations for every single tile of the map (useful for resetting traffic designations).</p>
 <p>Traffic Type Codes:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1943,26 +1711,26 @@ If an argument is given, the designation of the selected tile is ignored, and al
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Example:</p>
-<blockquote>
-'alltraffic N' - Set traffic to 'normal' for all tiles.</blockquote>
+<dl class="docutils">
+<dt><tt class="docutils literal">alltraffic N</tt></dt>
+<dd>Set traffic to 'normal' for all tiles.</dd>
+</dl>
 </div>
 <div class="section" id="restrictliquid">
-<h3><a class="toc-backref" href="#id80">restrictliquid</a></h3>
+<h3><a class="toc-backref" href="#id75">restrictliquid</a></h3>
 <p>Restrict traffic on all visible tiles with liquid.</p>
 </div>
 <div class="section" id="restrictice">
-<h3><a class="toc-backref" href="#id81">restrictice</a></h3>
+<h3><a class="toc-backref" href="#id76">restrictice</a></h3>
 <p>Restrict traffic on all tiles on top of visible ice.</p>
 </div>
 <div class="section" id="getplants">
-<h3><a class="toc-backref" href="#id82">getplants</a></h3>
+<h3><a class="toc-backref" href="#id77">getplants</a></h3>
 <p>This tool allows plant gathering and tree cutting by RAW ID. Specify the types
 of trees to cut down and/or shrubs to gather by their plant names, separated
 by spaces.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1978,20 +1746,18 @@ selection)</td>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Specifying both -t and -s will have no effect. If no plant IDs are specified,
 all valid plant IDs will be listed.</p>
 </div>
 </div>
 <div class="section" id="cleanup-and-garbage-disposal">
-<h2><a class="toc-backref" href="#id83">Cleanup and garbage disposal</a></h2>
+<h2><a class="toc-backref" href="#id78">Cleanup and garbage disposal</a></h2>
 <div class="section" id="clean">
-<h3><a class="toc-backref" href="#id84">clean</a></h3>
+<h3><a class="toc-backref" href="#id79">clean</a></h3>
 <p>Cleans all the splatter that get scattered all over the map, items and
 creatures. In an old fortress, this can significantly reduce FPS lag. It can
 also spoil your !!FUN!!, so think before you use it.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2004,9 +1770,7 @@ also spoil your !!FUN!!, so think before you use it.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Extra options for 'map':</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2017,22 +1781,20 @@ also spoil your !!FUN!!, so think before you use it.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 <div class="section" id="spotclean">
-<h3><a class="toc-backref" href="#id85">spotclean</a></h3>
+<h3><a class="toc-backref" href="#id80">spotclean</a></h3>
 <p>Works like 'clean map snow mud', but only for the tile under the cursor. Ideal
 if you want to keep that bloody entrance 'clean map' would clean up.</p>
 </div>
 <div class="section" id="autodump">
-<h3><a class="toc-backref" href="#id86">autodump</a></h3>
+<h3><a class="toc-backref" href="#id81">autodump</a></h3>
 <p>This utility lets you quickly move all items designated to be dumped.
 Items are instantly moved to the cursor position, the dump flag is unset,
 and the forbid flag is set, as if it had been dumped normally.
 Be aware that any active dump item tasks still point at the item.</p>
 <p>Cursor must be placed on a floor tile so the items can be dumped there.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2049,24 +1811,22 @@ Be aware that any active dump item tasks still point at the item.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 <div class="section" id="autodump-destroy-here">
-<h3><a class="toc-backref" href="#id87">autodump-destroy-here</a></h3>
+<h3><a class="toc-backref" href="#id82">autodump-destroy-here</a></h3>
 <p>Destroy items marked for dumping under cursor. Identical to autodump
 destroy-here, but intended for use as keybinding.</p>
 </div>
 <div class="section" id="autodump-destroy-item">
-<h3><a class="toc-backref" href="#id88">autodump-destroy-item</a></h3>
+<h3><a class="toc-backref" href="#id83">autodump-destroy-item</a></h3>
 <p>Destroy the selected item. The item may be selected in the 'k' list, or inside
 a container. If called again before the game is resumed, cancels destroy.</p>
 </div>
 <div class="section" id="cleanowned">
-<h3><a class="toc-backref" href="#id89">cleanowned</a></h3>
+<h3><a class="toc-backref" href="#id84">cleanowned</a></h3>
 <p>Confiscates items owned by dwarfs. By default, owned food on the floor
 and rotten items are confistacted and dumped.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2084,25 +1844,22 @@ without it actually happening.</td>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Example:</p>
-<blockquote>
 <dl class="docutils">
 <dt><tt class="docutils literal">cleanowned scattered X</tt></dt>
 <dd>This will confiscate rotten and dropped food, garbage on the floors and any
 worn items with 'X' damage and above.</dd>
 </dl>
-</blockquote>
 </div>
 </div>
 <div class="section" id="bugfixes">
-<h2><a class="toc-backref" href="#id90">Bugfixes</a></h2>
+<h2><a class="toc-backref" href="#id85">Bugfixes</a></h2>
 <div class="section" id="drybuckets">
-<h3><a class="toc-backref" href="#id91">drybuckets</a></h3>
+<h3><a class="toc-backref" href="#id86">drybuckets</a></h3>
 <p>This utility removes water from all buckets in your fortress, allowing them to be safely used for making lye.</p>
 </div>
 <div class="section" id="fixdiplomats">
-<h3><a class="toc-backref" href="#id92">fixdiplomats</a></h3>
+<h3><a class="toc-backref" href="#id87">fixdiplomats</a></h3>
 <p>Up to version 0.31.12, Elves only sent Diplomats to your fortress to propose
 tree cutting quotas due to a bug; once that bug was fixed, Elves stopped caring
 about excess tree cutting. This command adds a Diplomat position to all Elven
@@ -2111,19 +1868,19 @@ to violate them and potentially start wars) in case you haven't already modified
 your raws accordingly.</p>
 </div>
 <div class="section" id="fixmerchants">
-<h3><a class="toc-backref" href="#id93">fixmerchants</a></h3>
+<h3><a class="toc-backref" href="#id88">fixmerchants</a></h3>
 <p>This command adds the Guild Representative position to all Human civilizations,
 allowing them to make trade agreements (just as they did back in 0.28.181.40d
 and earlier) in case you haven't already modified your raws accordingly.</p>
 </div>
 <div class="section" id="fixveins">
-<h3><a class="toc-backref" href="#id94">fixveins</a></h3>
+<h3><a class="toc-backref" href="#id89">fixveins</a></h3>
 <p>Removes invalid references to mineral inclusions and restores missing ones.
 Use this if you broke your embark with tools like tiletypes, or if you
 accidentally placed a construction on top of a valuable mineral floor.</p>
 </div>
 <div class="section" id="tweak">
-<h3><a class="toc-backref" href="#id95">tweak</a></h3>
+<h3><a class="toc-backref" href="#id90">tweak</a></h3>
 <p>Contains various tweaks for minor bugs.</p>
 <p>One-shot subcommands:</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -2175,11 +1932,6 @@ they are scuttled.</td>
 Does NOT fix the problem when soldiers go off-duty (i.e. civilian).</p>
 </td>
 </tr>
-<tr class="field"><th class="field-name" colspan="2">readable-build-plate:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body"><p class="first">Fixes rendering of creature weight limits in pressure plate build menu.</p>
-<img alt="images/tweak-plate.png" src="images/tweak-plate.png" />
-</td>
-</tr>
 <tr class="field"><th class="field-name">stable-temp:</th><td class="field-body"><p class="first">Fixes performance bug 6012 by squashing jitter in temperature updates.
 In very item-heavy forts with big stockpiles this can improve FPS by 50-100%</p>
 </td>
@@ -2190,11 +1942,6 @@ when updating from the environment temperature. This reduces the time it
 takes for stable-temp to stop updates again when equilibrium is disturbed.</p>
 </td>
 </tr>
-<tr class="field"><th class="field-name">fix-dimensions:</th><td class="field-body"><p class="first">Fixes subtracting small amount of thread/cloth/liquid from a stack
-by splitting the stack and subtracting from the remaining single item.
-This is a necessary addition to the binary patch in bug 808.</p>
-</td>
-</tr>
 <tr class="field"><th class="field-name" colspan="2">advmode-contained:</th></tr>
 <tr class="field"><td>&nbsp;</td><td class="field-body"><p class="first">Works around bug 6202, i.e. custom reactions with container inputs
 in advmode. The issue is that the screen tries to force you to select
@@ -2218,17 +1965,6 @@ to make them stand out more in the list.</p>
 <img alt="images/tweak-mil-color.png" src="images/tweak-mil-color.png" />
 </td>
 </tr>
-<tr class="field"><th class="field-name" colspan="2">military-training:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body"><p class="first">Speeds up melee squad training by removing an almost certainly
-unintended inverse dependency of training speed on unit count
-(i.e. the more units you have, the slower it becomes), and making
-the units spar more.</p>
-</td>
-</tr>
-<tr class="field"><th class="field-name">hive-crash:</th><td class="field-body"><p class="first">The hive code crashes if there are ungathered products in a hive without bees (bug 6368).
-This tweak prevents it by auto-gathering the products if this happens.</p>
-</td>
-</tr>
 <tr class="field"><th class="field-name">craft-age-wear:</th><td class="field-body"><p class="first">Fixes the behavior of crafted items wearing out over time (bug 6003).
 With this tweak, items made from cloth and leather will gain a level of wear every 20 years.</p>
 </td>
@@ -2244,7 +1980,7 @@ With this tweak, items made from cloth and leather will gain a level of wear eve
 </table>
 </div>
 <div class="section" id="fix-armory">
-<h3><a class="toc-backref" href="#id96">fix-armory</a></h3>
+<h3><a class="toc-backref" href="#id91">fix-armory</a></h3>
 <p>Enables a fix for storage of squad equipment in barracks.</p>
 <p>Specifically, it prevents your haulers from moving squad equipment
 to stockpiles, and instead queues jobs to store it on weapon racks,
@@ -2298,15 +2034,14 @@ these rules is intended by Toady; the rest are invented by this plugin.</p>
 </div>
 </div>
 <div class="section" id="mode-switch-and-reclaim">
-<h2><a class="toc-backref" href="#id97">Mode switch and reclaim</a></h2>
+<h2><a class="toc-backref" href="#id92">Mode switch and reclaim</a></h2>
 <div class="section" id="lair">
-<h3><a class="toc-backref" href="#id98">lair</a></h3>
+<h3><a class="toc-backref" href="#id93">lair</a></h3>
 <p>This command allows you to mark the map as 'monster lair', preventing item
 scatter on abandon. When invoked as 'lair reset', it does the opposite.</p>
 <p>Unlike reveal, this command doesn't save the information about tiles - you
 won't be able to restore state of real monster lairs using 'lair reset'.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2317,10 +2052,9 @@ won't be able to restore state of real monster lairs using 'lair reset'.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 <div class="section" id="mode">
-<h3><a class="toc-backref" href="#id99">mode</a></h3>
+<h3><a class="toc-backref" href="#id94">mode</a></h3>
 <p>This command lets you see and change the game mode directly.
 Not all combinations are good for every situation and most of them will
 produce undesirable results. There are a few good ones though.</p>
@@ -2340,9 +2074,9 @@ You just created a returnable mountain home and gained an adventurer.</p>
 </div>
 </div>
 <div class="section" id="visualizer-and-data-export">
-<h2><a class="toc-backref" href="#id100">Visualizer and data export</a></h2>
+<h2><a class="toc-backref" href="#id95">Visualizer and data export</a></h2>
 <div class="section" id="ssense-stonesense">
-<h3><a class="toc-backref" href="#id101">ssense / stonesense</a></h3>
+<h3><a class="toc-backref" href="#id96">ssense / stonesense</a></h3>
 <p>An isometric visualizer that runs in a second window. This requires working
 graphics acceleration and at least a dual core CPU (otherwise it will slow
 down DF).</p>
@@ -2355,19 +2089,18 @@ thread: <a class="reference external" href="http://www.bay12forums.com/smf/index
 <a class="reference external" href="http://df.magmawiki.com/index.php/Utility:Stonesense/Content_repository">http://df.magmawiki.com/index.php/Utility:Stonesense/Content_repository</a></p>
 </div>
 <div class="section" id="mapexport">
-<h3><a class="toc-backref" href="#id102">mapexport</a></h3>
+<h3><a class="toc-backref" href="#id97">mapexport</a></h3>
 <p>Export the current loaded map as a file. This will be eventually usable
 with visualizers.</p>
 </div>
 <div class="section" id="dwarfexport">
-<h3><a class="toc-backref" href="#id103">dwarfexport</a></h3>
+<h3><a class="toc-backref" href="#id98">dwarfexport</a></h3>
 <p>Export dwarves to RuneSmith-compatible XML.</p>
 </div>
 <div class="section" id="exportlegends">
-<h3><a class="toc-backref" href="#id104">exportlegends</a></h3>
+<h3><a class="toc-backref" href="#id99">exportlegends</a></h3>
 <p>Exports data from legends mode; allowing a set-and-forget export of large worlds.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2378,17 +2111,15 @@ with visualizers.</p>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 </div>
 <div class="section" id="job-management">
-<h2><a class="toc-backref" href="#id105">Job management</a></h2>
+<h2><a class="toc-backref" href="#id100">Job management</a></h2>
 <div class="section" id="job">
-<h3><a class="toc-backref" href="#id106">job</a></h3>
+<h3><a class="toc-backref" href="#id101">job</a></h3>
 <p>Command for general job query and manipulation.</p>
+<p>Options:</p>
 <dl class="docutils">
-<dt>Options:</dt>
-<dd><dl class="first last docutils">
 <dt><em>no extra options</em></dt>
 <dd>Print details of the current job. The job can be selected
 in a workshop, or the unit/jobs screen.</dd>
@@ -2399,18 +2130,15 @@ in a workshop, or the unit/jobs screen.</dd>
 <dt><strong>item-type &lt;item-idx&gt; &lt;type[:subtype]&gt;</strong></dt>
 <dd>Replace the exact item type id in the job item.</dd>
 </dl>
-</dd>
-</dl>
 </div>
 <div class="section" id="job-material">
-<h3><a class="toc-backref" href="#id107">job-material</a></h3>
+<h3><a class="toc-backref" href="#id102">job-material</a></h3>
 <p>Alter the material of the selected job.</p>
 <p>Invoked as:</p>
 <pre class="literal-block">
 job-material &lt;inorganic-token&gt;
 </pre>
 <p>Intended to be used as a keybinding:</p>
-<blockquote>
 <ul class="simple">
 <li>In 'q' mode, when a job is highlighted within a workshop or furnace,
 changes the material of the job. Only inorganic materials can be used
@@ -2418,53 +2146,47 @@ in this mode.</li>
 <li>In 'b' mode, during selection of building components positions the cursor
 over the first available choice with the matching material.</li>
 </ul>
-</blockquote>
 </div>
 <div class="section" id="job-duplicate">
-<h3><a class="toc-backref" href="#id108">job-duplicate</a></h3>
-<dl class="docutils">
-<dt>Duplicate the selected job in a workshop:</dt>
-<dd><ul class="first last simple">
+<h3><a class="toc-backref" href="#id103">job-duplicate</a></h3>
+<p>Duplicate the selected job in a workshop:</p>
+<ul class="simple">
 <li>In 'q' mode, when a job is highlighted within a workshop or furnace building,
 instantly duplicates the job.</li>
 </ul>
-</dd>
-</dl>
 </div>
 <div class="section" id="stockflow">
-<h3><a class="toc-backref" href="#id109">stockflow</a></h3>
+<h3><a class="toc-backref" href="#id104">stockflow</a></h3>
 <p>Allows the fortress bookkeeper to queue jobs through the manager,
 based on space or items available in stockpiles.</p>
 <p>Usage:</p>
-<blockquote>
 <dl class="docutils">
 <dt><tt class="docutils literal">stockflow enable</tt></dt>
 <dd>Enable the plugin.</dd>
 <dt><tt class="docutils literal">stockflow disable</tt></dt>
 <dd>Disable the plugin.</dd>
+<dt><tt class="docutils literal">stockflow fast</tt></dt>
+<dd>Enable the plugin in fast mode.</dd>
 <dt><tt class="docutils literal">stockflow list</tt></dt>
 <dd>List any work order settings for your stockpiles.</dd>
 <dt><tt class="docutils literal">stockflow status</tt></dt>
 <dd>Display whether the plugin is enabled.</dd>
 </dl>
-</blockquote>
-<dl class="docutils">
-<dt>While enabled, the 'q' menu of each stockpile will have two new options:</dt>
-<dd><ul class="first last simple">
+<p>While enabled, the 'q' menu of each stockpile will have two new options:</p>
+<ul class="simple">
 <li>j: Select a job to order, from an interface like the manager's screen.</li>
 <li>J: Cycle between several options for how many such jobs to order.</li>
 </ul>
-</dd>
-</dl>
 <p>Whenever the bookkeeper updates stockpile records, new work orders will
 be placed on the manager's queue for each such selection, reduced by the
 number of identical orders already in the queue.</p>
+<p>In fast mode, new work orders will be enqueued once per day, instead of
+waiting for the bookkeeper.</p>
 </div>
 <div class="section" id="workflow">
-<h3><a class="toc-backref" href="#id110">workflow</a></h3>
+<h3><a class="toc-backref" href="#id105">workflow</a></h3>
 <p>Manage control of repeat jobs.</p>
 <p>Usage:</p>
-<blockquote>
 <dl class="docutils">
 <dt><tt class="docutils literal">workflow enable <span class="pre">[option...],</span> workflow disable <span class="pre">[option...]</span></tt></dt>
 <dd><p class="first">If no options are specified, enables or disables the plugin.
@@ -2491,9 +2213,8 @@ this list can be copied to a file, and then reloaded using the
 <dt><tt class="docutils literal">workflow <span class="pre">unlimit-all</span></tt></dt>
 <dd>Delete all constraints.</dd>
 </dl>
-</blockquote>
 <div class="section" id="function">
-<h4><a class="toc-backref" href="#id111">Function</a></h4>
+<h4><a class="toc-backref" href="#id106">Function</a></h4>
 <p>When the plugin is enabled, it protects all repeat jobs from removal.
 If they do disappear due to any cause, they are immediately re-added to their
 workshop and suspended.</p>
@@ -2506,7 +2227,7 @@ the frequency of jobs being toggled.</p>
 in the game UI.</p>
 </div>
 <div class="section" id="constraint-format">
-<h4><a class="toc-backref" href="#id112">Constraint format</a></h4>
+<h4><a class="toc-backref" href="#id107">Constraint format</a></h4>
 <p>The contstraint spec consists of 4 parts, separated with '/' characters:</p>
 <pre class="literal-block">
 ITEM[:SUBTYPE]/[GENERIC_MAT,...]/[SPECIFIC_MAT:...]/[LOCAL,&lt;quality&gt;]
@@ -2535,38 +2256,38 @@ be used to ignore imported items or items below a certain quality.</p>
 </ul>
 </div>
 <div class="section" id="constraint-examples">
-<h4><a class="toc-backref" href="#id113">Constraint examples</a></h4>
-<p>Keep metal bolts within 900-1000, and wood/bone within 150-200.</p>
+<h4><a class="toc-backref" href="#id108">Constraint examples</a></h4>
+<p>Keep metal bolts within 900-1000, and wood/bone within 150-200:</p>
 <pre class="literal-block">
 workflow amount AMMO:ITEM_AMMO_BOLTS/METAL 1000 100
 workflow amount AMMO:ITEM_AMMO_BOLTS/WOOD,BONE 200 50
 </pre>
-<p>Keep the number of prepared food &amp; drink stacks between 90 and 120</p>
+<p>Keep the number of prepared food &amp; drink stacks between 90 and 120:</p>
 <pre class="literal-block">
 workflow count FOOD 120 30
 workflow count DRINK 120 30
 </pre>
-<p>Make sure there are always 25-30 empty bins/barrels/bags.</p>
+<p>Make sure there are always 25-30 empty bins/barrels/bags:</p>
 <pre class="literal-block">
 workflow count BIN 30
 workflow count BARREL 30
 workflow count BOX/CLOTH,SILK,YARN 30
 </pre>
-<p>Make sure there are always 15-20 coal and 25-30 copper bars.</p>
+<p>Make sure there are always 15-20 coal and 25-30 copper bars:</p>
 <pre class="literal-block">
 workflow count BAR//COAL 20
 workflow count BAR//COPPER 30
 </pre>
-<p>Produce 15-20 gold crafts.</p>
+<p>Produce 15-20 gold crafts:</p>
 <pre class="literal-block">
 workflow count CRAFTS//GOLD 20
 </pre>
-<p>Collect 15-20 sand bags and clay boulders.</p>
+<p>Collect 15-20 sand bags and clay boulders:</p>
 <pre class="literal-block">
 workflow count POWDER_MISC/SAND 20
 workflow count BOULDER/CLAY 20
 </pre>
-<p>Make sure there are always 80-100 units of dimple dye.</p>
+<p>Make sure there are always 80-100 units of dimple dye:</p>
 <pre class="literal-block">
 workflow amount POWDER_MISC//MUSHROOM_CUP_DIMPLE:MILL 100 20
 </pre>
@@ -2576,7 +2297,7 @@ workflow amount POWDER_MISC//MUSHROOM_CUP_DIMPLE:MILL 100 20
 on the Mill Plants job to MUSHROOM_CUP_DIMPLE using the 'job item-material'
 command. Otherwise the plugin won't be able to deduce the output material.</p>
 </div>
-<p>Maintain 10-100 locally-made crafts of exceptional quality.</p>
+<p>Maintain 10-100 locally-made crafts of exceptional quality:</p>
 <pre class="literal-block">
 workflow count CRAFTS///LOCAL,EXCEPTIONAL 100 90
 </pre>
@@ -2584,18 +2305,17 @@ workflow count CRAFTS///LOCAL,EXCEPTIONAL 100 90
 </div>
 </div>
 <div class="section" id="fortress-activity-management">
-<h2><a class="toc-backref" href="#id114">Fortress activity management</a></h2>
+<h2><a class="toc-backref" href="#id109">Fortress activity management</a></h2>
 <div class="section" id="seedwatch">
-<h3><a class="toc-backref" href="#id115">seedwatch</a></h3>
+<h3><a class="toc-backref" href="#id110">seedwatch</a></h3>
 <p>Tool for turning cooking of seeds and plants on/off depending on how much you
 have of them.</p>
 <p>See 'seedwatch help' for detailed description.</p>
 </div>
 <div class="section" id="zone">
-<h3><a class="toc-backref" href="#id116">zone</a></h3>
+<h3><a class="toc-backref" href="#id111">zone</a></h3>
 <p>Helps a bit with managing activity zones (pens, pastures and pits) and cages.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2632,9 +2352,7 @@ the cursor are listed.</td>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Filters:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2689,9 +2407,8 @@ for war/hunt). Negatable.</td>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <div class="section" id="usage-with-single-units">
-<h4><a class="toc-backref" href="#id117">Usage with single units</a></h4>
+<h4><a class="toc-backref" href="#id112">Usage with single units</a></h4>
 <p>One convenient way to use the zone tool is to bind the command 'zone assign' to
 a hotkey, maybe also the command 'zone set'. Place the in-game cursor over
 a pen/pasture or pit, use 'zone set' to mark it. Then you can select units
@@ -2700,7 +2417,7 @@ and use 'zone assign' to assign them to their new home. Allows pitting your
 own dwarves, by the way.</p>
 </div>
 <div class="section" id="usage-with-filters">
-<h4><a class="toc-backref" href="#id118">Usage with filters</a></h4>
+<h4><a class="toc-backref" href="#id113">Usage with filters</a></h4>
 <p>All filters can be used together with the 'assign' command.</p>
 <p>Restrictions: It's not possible to assign units who are inside built cages
 or chained because in most cases that won't be desirable anyways.
@@ -2718,14 +2435,14 @@ are not properly added to your own stocks; slaughtering them should work).</p>
 <p>Most filters can be negated (e.g. 'not grazer' -&gt; race is not a grazer).</p>
 </div>
 <div class="section" id="mass-renaming">
-<h4><a class="toc-backref" href="#id119">Mass-renaming</a></h4>
+<h4><a class="toc-backref" href="#id114">Mass-renaming</a></h4>
 <p>Using the 'nick' command you can set the same nickname for multiple units.
 If used without 'assign', 'all' or 'count' it will rename all units in the
 current default target zone. Combined with 'assign', 'all' or 'count' (and
 further optional filters) it will rename units matching the filter conditions.</p>
 </div>
 <div class="section" id="cage-zones">
-<h4><a class="toc-backref" href="#id120">Cage zones</a></h4>
+<h4><a class="toc-backref" href="#id115">Cage zones</a></h4>
 <p>Using the 'tocages' command you can assign units to a set of cages, for example
 a room next to your butcher shop(s). They will be spread evenly among available
 cages to optimize hauling to and butchering from them. For this to work you need
@@ -2736,7 +2453,7 @@ would make no sense, but can be used together with 'nick' or 'remnick' and all
 the usual filters.</p>
 </div>
 <div class="section" id="examples">
-<h4><a class="toc-backref" href="#id121">Examples</a></h4>
+<h4><a class="toc-backref" href="#id116">Examples</a></h4>
 <dl class="docutils">
 <dt><tt class="docutils literal">zone assign all own ALPACA minage 3 maxage 10</tt></dt>
 <dd>Assign all own alpacas who are between 3 and 10 years old to the selected
@@ -2762,7 +2479,7 @@ on the current default zone.</dd>
 </div>
 </div>
 <div class="section" id="autonestbox">
-<h3><a class="toc-backref" href="#id122">autonestbox</a></h3>
+<h3><a class="toc-backref" href="#id117">autonestbox</a></h3>
 <p>Assigns unpastured female egg-layers to nestbox zones. Requires that you create
 pen/pasture zones above nestboxes. If the pen is bigger than 1x1 the nestbox
 must be in the top left corner. Only 1 unit will be assigned per pen, regardless
@@ -2773,7 +2490,6 @@ processed since pasturing half-trained wild egglayers could destroy your neat
 nestbox zones when they revert to wild. When called without options autonestbox
 will instantly run once.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2788,10 +2504,9 @@ frames between runs.</td>
 </tr>
 </tbody>
 </table>
-</blockquote>
 </div>
 <div class="section" id="autobutcher">
-<h3><a class="toc-backref" href="#id123">autobutcher</a></h3>
+<h3><a class="toc-backref" href="#id118">autobutcher</a></h3>
 <p>Assigns lifestock for slaughter once it reaches a specific count. Requires that
 you add the target race(s) to a watch list. Only tame units will be processed.</p>
 <p>Named units will be completely ignored (to protect specific animals from
@@ -2805,7 +2520,6 @@ Once you have too much kids, the youngest will be butchered first.
 If you don't set any target count the following default will be used:
 1 male kid, 5 female kids, 1 male adult, 5 female adults.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2856,7 +2570,6 @@ for future entries.</td>
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Examples:</p>
 <p>You want to keep max 7 kids (4 female, 3 male) and max 3 adults (2 female,
 1 male) of the race alpaca. Once the kids grow up the oldest adults will get
@@ -2899,7 +2612,7 @@ autobutcher.bat
 </pre>
 </div>
 <div class="section" id="autochop">
-<h3><a class="toc-backref" href="#id124">autochop</a></h3>
+<h3><a class="toc-backref" href="#id119">autochop</a></h3>
 <p>Automatically manage tree cutting designation to keep available logs withing given
 quotas.</p>
 <p>Open the dashboard by running:</p>
@@ -2917,7 +2630,7 @@ enable getplants
 menu.</p>
 </div>
 <div class="section" id="autolabor">
-<h3><a class="toc-backref" href="#id125">autolabor</a></h3>
+<h3><a class="toc-backref" href="#id120">autolabor</a></h3>
 <p>Automatically manage dwarf labors.</p>
 <p>When enabled, autolabor periodically checks your dwarves and enables or
 disables labors. It tries to keep as many dwarves as possible busy but
@@ -2932,17 +2645,16 @@ while it is enabled.</p>
 </div>
 </div>
 <div class="section" id="other">
-<h2><a class="toc-backref" href="#id126">Other</a></h2>
+<h2><a class="toc-backref" href="#id121">Other</a></h2>
 <div class="section" id="catsplosion">
-<h3><a class="toc-backref" href="#id127">catsplosion</a></h3>
+<h3><a class="toc-backref" href="#id122">catsplosion</a></h3>
 <p>Makes cats just <em>multiply</em>. It is not a good idea to run this more than once or
 twice.</p>
 </div>
 <div class="section" id="dfusion">
-<h3><a class="toc-backref" href="#id128">dfusion</a></h3>
-<dl class="docutils">
-<dt>This is the DFusion lua plugin system by Warmist, running as a DFHack plugin. There are two parts to this plugin: an interactive script that shows a text based menu and lua modules. Some of the functionality of is intentionaly left out of the menu:</dt>
-<dd><table class="first last docutils field-list" frame="void" rules="none">
+<h3><a class="toc-backref" href="#id123">dfusion</a></h3>
+<p>This is the DFusion lua plugin system by Warmist, running as a DFHack plugin. There are two parts to this plugin: an interactive script that shows a text based menu and lua modules. Some of the functionality of is intentionaly left out of the menu:</p>
+<table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
@@ -2952,8 +2664,6 @@ twice.</p>
 </tr>
 </tbody>
 </table>
-</dd>
-</dl>
 <p>See the bay12 thread for details: <a class="reference external" href="http://www.bay12forums.com/smf/index.php?topic=93317.0">http://www.bay12forums.com/smf/index.php?topic=93317.0</a></p>
 <div class="note">
 <p class="first admonition-title">Note</p>
@@ -2964,7 +2674,7 @@ twice.</p>
 </div>
 </div>
 <div class="section" id="embark-tools">
-<h3><a class="toc-backref" href="#id129">embark-tools</a></h3>
+<h3><a class="toc-backref" href="#id124">embark-tools</a></h3>
 <p>A collection of embark-related tools.</p>
 <p>Usage:</p>
 <pre class="literal-block">
@@ -2979,7 +2689,7 @@ embark-tools enable/disable tool [tool]...
 </ul>
 </div>
 <div class="section" id="petcapremover">
-<h3><a class="toc-backref" href="#id130">petcapRemover</a></h3>
+<h3><a class="toc-backref" href="#id125">petcapRemover</a></h3>
 <p>This plugin allows you to remove or raise the pet population cap. 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 allows removing the second restriction and removing or raising the first. Pets still require PET or PET_EXOTIC tags in order to reproduce. Type help petcapRemover for exact usage. In order to make population more stable and avoid sudden population booms as you go below the raised population cap, this plugin counts pregnancies toward the new population cap. It can still go over, but only in the case of multiple births.</p>
 <dl class="docutils">
 <dt><cite>petcapRemover</cite></dt>
@@ -2993,7 +2703,7 @@ embark-tools enable/disable tool [tool]...
 </dl>
 </div>
 <div class="section" id="misery">
-<h3><a class="toc-backref" href="#id131">misery</a></h3>
+<h3><a class="toc-backref" href="#id126">misery</a></h3>
 <p>When enabled, every new negative dwarven thought will be multiplied by a factor (2 by default).</p>
 <p>Usage:</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -3015,10 +2725,9 @@ embark-tools enable/disable tool [tool]...
 </table>
 </div>
 <div class="section" id="strangemood">
-<h3><a class="toc-backref" href="#id132">strangemood</a></h3>
+<h3><a class="toc-backref" href="#id127">strangemood</a></h3>
 <p>Creates a strange mood job the same way the game itself normally does it.</p>
 <p>Options:</p>
-<blockquote>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -3035,17 +2744,16 @@ Valid values are &quot;miner&quot;, &quot;carpenter&quot;, &quot;engraver&quot;,
 </tr>
 </tbody>
 </table>
-</blockquote>
 <p>Known limitations: if the selected unit is currently performing a job, the mood will not be started.</p>
 </div>
 <div class="section" id="log-region">
-<h3><a class="toc-backref" href="#id133">log-region</a></h3>
+<h3><a class="toc-backref" href="#id128">log-region</a></h3>
 <p>When enabled in dfhack.init, each time a fort is loaded identifying information will be written to the gamelog.  Assists in parsing the file if you switch between forts, and adds information for story-building.</p>
 </div>
 </div>
 </div>
 <div class="section" id="scripts">
-<h1><a class="toc-backref" href="#id134">Scripts</a></h1>
+<h1><a class="toc-backref" href="#id129">Scripts</a></h1>
 <p>Lua or ruby scripts placed in the hack/scripts/ directory are considered for
 execution as if they were native DFHack commands. They are listed at the end
 of the 'ls' command output.</p>
@@ -3054,14 +2762,38 @@ only be listed by ls if called as 'ls -a'. This is intended as a way to hide
 scripts that are obscure, developer-oriented, or should be used as keybindings.</p>
 <p>Some notable scripts:</p>
 <div class="section" id="fix">
-<h2><a class="toc-backref" href="#id135">fix/*</a></h2>
+<h2><a class="toc-backref" href="#id130">fix/*</a></h2>
 <p>Scripts in this subdirectory fix various bugs and issues, some of them obscure.</p>
 <ul>
+<li><p class="first">fix/blood-del</p>
+<p>Makes it so that future caravans won't bring barrels full of blood, ichor, or goo.</p>
+</li>
+<li><p class="first">fix/build-location</p>
+<p>Fixes construction jobs that are stuck trying to build a wall while standing
+on the same exact tile (bug 5991), designates the tile restricted traffic to
+hopefully avoid jamming it again, and unsuspends them.</p>
+</li>
+<li><p class="first">fix/cloth-stockpile</p>
+<p>Fixes erratic behavior of cloth stockpiles by scanning material objects
+in memory and patching up some invalid reference fields. Needs to be run
+every time a save game is loaded; putting <tt class="docutils literal"><span class="pre">fix/cloth-stockpile</span> enable</tt>
+in <tt class="docutils literal">dfhack.init</tt> makes it run automatically.</p>
+</li>
 <li><p class="first">fix/dead-units</p>
 <p>Removes uninteresting dead units from the unit list. Doesn't seem to give any
 noticeable performance gain, but migrants normally stop if the unit list grows
 to around 3000 units, and this script reduces it back.</p>
 </li>
+<li><p class="first">fix/feeding-timers</p>
+<p>Reset the GiveWater and GiveFood timers of all units as appropriate.</p>
+</li>
+<li><p class="first">fix/growth-bug</p>
+<p>Fixes locally born units such that they will grow larger than their birth size. Note that this bug was fixed in DF version 0.40.02.</p>
+</li>
+<li><p class="first">fix/item-occupancy</p>
+<p>Diagnoses and fixes issues with nonexistant 'items occupying site', usually
+caused by autodump bugs or other hacking mishaps.</p>
+</li>
 <li><p class="first">fix/population-cap</p>
 <p>Run this after every migrant wave to ensure your population cap is not exceeded.
 The issue with the cap is that it is compared to the population number reported
@@ -3073,30 +2805,20 @@ until that number is updated again.</p>
 the environment and stops temperature updates. In order to maintain this efficient
 state however, use <tt class="docutils literal">tweak <span class="pre">stable-temp</span></tt> and <tt class="docutils literal">tweak <span class="pre">fast-heat</span></tt>.</p>
 </li>
-<li><p class="first">fix/item-occupancy</p>
-<p>Diagnoses and fixes issues with nonexistant 'items occupying site', usually
-caused by autodump bugs or other hacking mishaps.</p>
-</li>
-<li><p class="first">fix/cloth-stockpile</p>
-<p>Fixes erratic behavior of cloth stockpiles by scanning material objects
-in memory and patching up some invalid reference fields. Needs to be run
-every time a save game is loaded; putting <tt class="docutils literal"><span class="pre">fix/cloth-stockpile</span> enable</tt>
-in <tt class="docutils literal">dfhack.init</tt> makes it run automatically.</p>
-</li>
-<li><p class="first">fix/build-location</p>
-<p>Fixes construction jobs that are stuck trying to build a wall while standing
-on the same exact tile (bug 5991), designates the tile restricted traffic to
-hopefully avoid jamming it again, and unsuspends them.</p>
-</li>
 </ul>
 </div>
 <div class="section" id="gui">
-<h2><a class="toc-backref" href="#id136">gui/*</a></h2>
+<h2><a class="toc-backref" href="#id131">gui/*</a></h2>
 <p>Scripts that implement dialogs inserted into the main game window are put in this
 directory.</p>
+<ul>
+<li><p class="first">gui/hack-wish</p>
+<p>A graphical interface for creating items.</p>
+</li>
+</ul>
 </div>
 <div class="section" id="binpatch">
-<h2><a class="toc-backref" href="#id137">binpatch</a></h2>
+<h2><a class="toc-backref" href="#id132">binpatch</a></h2>
 <p>Checks, applies or removes binary patches directly in memory at runtime:</p>
 <pre class="literal-block">
 binpatch check/apply/remove &lt;patchname&gt;
@@ -3105,52 +2827,70 @@ binpatch check/apply/remove &lt;patchname&gt;
 script uses <tt class="docutils literal"><span class="pre">hack/patches/&lt;df-version&gt;/&lt;name&gt;.dif</span></tt>, thus auto-selecting
 the version appropriate for the currently loaded executable.</p>
 </div>
-<div class="section" id="quicksave">
-<h2><a class="toc-backref" href="#id138">quicksave</a></h2>
-<p>If called in dwarf mode, makes DF immediately auto-save the game by setting a flag
-normally used in seasonal auto-save.</p>
-</div>
-<div class="section" id="setfps">
-<h2><a class="toc-backref" href="#id139">setfps</a></h2>
-<p>Run <tt class="docutils literal">setfps &lt;number&gt;</tt> to set the FPS cap at runtime, in case you want to watch
-combat in slow motion or something :)</p>
-</div>
-<div class="section" id="siren">
-<h2><a class="toc-backref" href="#id140">siren</a></h2>
-<p>Wakes up sleeping units, cancels breaks and stops parties either everywhere,
-or in the burrows given as arguments. In return, adds bad thoughts about
-noise, tiredness and lack of protection. Also, the units with interrupted
-breaks will go on break again a lot sooner. The script is intended for
-emergencies, e.g. when a siege appears, and all your military is partying.</p>
+<div class="section" id="create-items">
+<h2><a class="toc-backref" href="#id133">create-items</a></h2>
+<p>Spawn arbitrary items under the cursor.</p>
+<p>The first argument gives the item category, the second gives the material,
+and the optionnal third gives the number of items to create (defaults to 20).</p>
+<p>Currently supported item categories: <tt class="docutils literal">boulder</tt>, <tt class="docutils literal">bar</tt>, <tt class="docutils literal">plant</tt>, <tt class="docutils literal">log</tt>,
+<tt class="docutils literal">web</tt>.</p>
+<p>Instead of material, using <tt class="docutils literal">list</tt> makes the script list eligible materials.</p>
+<p>The <tt class="docutils literal">web</tt> item category will create an uncollected cobweb on the floor.</p>
+<p>Note that the script does not enforce anything, and will let you create
+boulders of toad blood and stuff like that.
+However the <tt class="docutils literal">list</tt> mode will only show 'normal' materials.</p>
+<p>Examples:</p>
+<pre class="literal-block">
+create-items boulders COAL_BITUMINOUS 12
+create-items plant tail_pig
+create-items log list
+create-items web CREATURE:SPIDER_CAVE_GIANT:SILK
+create-items bar CREATURE:CAT:SOAP
+create-items bar adamantine
+</pre>
 </div>
-<div class="section" id="growcrops">
-<h2><a class="toc-backref" href="#id141">growcrops</a></h2>
-<p>Instantly grow seeds inside farming plots.</p>
-<p>With no argument, this command list the various seed types currently in
-use in your farming plots.
-With a seed type, the script will grow 100 of these seeds, ready to be
-harvested. You can change the number with a 2nd argument.</p>
-<p>For example, to grow 40 plump helmet spawn:</p>
+<div class="section" id="digfort">
+<h2><a class="toc-backref" href="#id134">digfort</a></h2>
+<p>A script to designate an area for digging according to a plan in csv format.</p>
+<p>This script, inspired from quickfort, can designate an area for digging.
+Your plan should be stored in a .csv file like this:</p>
 <pre class="literal-block">
-growcrops plump 40
+# this is a comment
+d;d;u;d;d;skip this tile;d
+d;d;d;i
 </pre>
+<p>Available tile shapes are named after the 'dig' menu shortcuts:
+<tt class="docutils literal">d</tt> for dig, <tt class="docutils literal">u</tt> for upstairs, <tt class="docutils literal">d</tt> downstairs, <tt class="docutils literal">i</tt> updown,
+<tt class="docutils literal">h</tt> channel, <tt class="docutils literal">r</tt> upward ramp, <tt class="docutils literal">x</tt> remove designation.
+Unrecognized characters are ignored (eg the 'skip this tile' in the sample).</p>
+<p>Empty lines and data after a <tt class="docutils literal">#</tt> are ignored as comments.
+To skip a row in your design, use a single <tt class="docutils literal">;</tt>.</p>
+<p>One comment in the file may contain the phrase <tt class="docutils literal">start(3,5)</tt>. It is interpreted
+as an offset for the pattern: instead of starting at the cursor, it will start
+3 tiles left and 5 tiles up from the cursor.</p>
+<p>The script takes the plan filename, starting from the root df folder (where
+Dwarf Fortress.exe is found).</p>
 </div>
-<div class="section" id="removebadthoughts">
-<h2><a class="toc-backref" href="#id142">removebadthoughts</a></h2>
-<p>This script remove negative thoughts from your dwarves. Very useful against
-tantrum spirals.</p>
-<p>The script can target a single creature, when used with the <tt class="docutils literal">him</tt> argument,
-or the whole fort population, with <tt class="docutils literal">all</tt>.</p>
-<p>To show every bad thought present without actually removing them, run the
-script with the <tt class="docutils literal"><span class="pre">-n</span></tt> or <tt class="docutils literal"><span class="pre">--dry-run</span></tt> argument. This can give a quick
-hint on what bothers your dwarves the most.</p>
-<p>Individual dwarf happiness may not increase right after this command is run,
-but in the short term your dwarves will get much more joyful.</p>
-<p>Internals: the thoughts are set to be very old, so that the game remove them
-quickly after you unpause.</p>
+<div class="section" id="drainaquifer">
+<h2><a class="toc-backref" href="#id135">drainaquifer</a></h2>
+<p>Remove all 'aquifer' tag from the map blocks. Irreversible.</p>
+</div>
+<div class="section" id="deathcause">
+<h2><a class="toc-backref" href="#id136">deathcause</a></h2>
+<p>Focus a body part ingame, and this script will display the cause of death of
+the creature.
+Also works when selecting units from the 'u'nitlist viewscreen.</p>
+</div>
+<div class="section" id="dfstatus">
+<h2><a class="toc-backref" href="#id137">dfstatus</a></h2>
+<p>Show a quick overview of critical stock quantities, including food, dirnks, wood, and various bars.</p>
+</div>
+<div class="section" id="embark">
+<h2><a class="toc-backref" href="#id138">embark</a></h2>
+<p>Allows to embark anywhere. Currently windows only.</p>
 </div>
 <div class="section" id="exterminate">
-<h2><a class="toc-backref" href="#id143">exterminate</a></h2>
+<h2><a class="toc-backref" href="#id139">exterminate</a></h2>
 <p>Kills any unit of a given race.</p>
 <p>With no argument, lists the available races and count eligible targets.</p>
 <p>With the special argument <tt class="docutils literal">him</tt>, targets only the selected creature.</p>
@@ -3181,96 +2921,47 @@ exterminate him
 exterminate elve magma
 </pre>
 </div>
-<div class="section" id="source">
-<h2><a class="toc-backref" href="#id144">source</a></h2>
-<p>Create an infinite magma or water source or drain on a tile.</p>
-<p>This script registers a map tile as a liquid source, and every 12 game ticks
-that tile receives or remove 1 new unit of flow based on the configuration.</p>
-<p>Place the game cursor where you want to create the source (must be a
-flow-passable tile, and not too high in the sky) and call:</p>
+<div class="section" id="growcrops">
+<h2><a class="toc-backref" href="#id140">growcrops</a></h2>
+<p>Instantly grow seeds inside farming plots.</p>
+<p>With no argument, this command list the various seed types currently in
+use in your farming plots.
+With a seed type, the script will grow 100 of these seeds, ready to be
+harvested. You can change the number with a 2nd argument.</p>
+<p>For example, to grow 40 plump helmet spawn:</p>
 <pre class="literal-block">
-source add [magma|water] [0-7]
+growcrops plump 40
 </pre>
-<p>The number argument is the target liquid level (0 = drain, 7 = source).</p>
-<p>To add more than 1 unit everytime, call the command again on the same spot.</p>
-<p>To delete one source, place the cursor over its tile and use <tt class="docutils literal">delete</tt>.
-To remove all existing sources, call <tt class="docutils literal">source clear</tt>.</p>
-<p>The <tt class="docutils literal">list</tt> argument shows all existing sources.</p>
-<p>Ex:</p>
+</div>
+<div class="section" id="lever">
+<h2><a class="toc-backref" href="#id141">lever</a></h2>
+<p>Allow manipulation of in-game levers from the dfhack console.</p>
+<p>Can list levers, including state and links, with:</p>
 <pre class="literal-block">
-source add water     - water source
-source add magma 7   - magma source
-source add water 0   - water drain
+lever list
 </pre>
-</div>
-<div class="section" id="masspit">
-<h2><a class="toc-backref" href="#id145">masspit</a></h2>
-<p>Designate all creatures in cages on top of a pit/pond activity zone for pitting.
-Works best with an animal stockpile on top of the zone.</p>
-<p>Works with a zone number as argument (eg <tt class="docutils literal">Activity Zone #6</tt> -&gt; <tt class="docutils literal">masspit 6</tt>)
-or with the game cursor on top of the area.</p>
-</div>
-<div class="section" id="digfort">
-<h2><a class="toc-backref" href="#id146">digfort</a></h2>
-<p>A script to designate an area for digging according to a plan in csv format.</p>
-<p>This script, inspired from quickfort, can designate an area for digging.
-Your plan should be stored in a .csv file like this:</p>
+<p>To queue a job so that a dwarf will pull the lever 42, use <tt class="docutils literal">lever pull 42</tt>.
+This is the same as 'q'uerying the building and queue a 'P'ull request.</p>
+<p>To magically toggle the lever immediately, use:</p>
 <pre class="literal-block">
-# this is a comment
-d;d;u;d;d;skip this tile;d
-d;d;d;i
+lever pull 42 --now
 </pre>
-<p>Available tile shapes are named after the 'dig' menu shortcuts:
-<tt class="docutils literal">d</tt> for dig, <tt class="docutils literal">u</tt> for upstairs, <tt class="docutils literal">d</tt> downstairs, <tt class="docutils literal">i</tt> updown,
-<tt class="docutils literal">h</tt> channel, <tt class="docutils literal">r</tt> upward ramp, <tt class="docutils literal">x</tt> remove designation.
-Unrecognized characters are ignored (eg the 'skip this tile' in the sample).</p>
-<p>Empty lines and data after a <tt class="docutils literal">#</tt> are ignored as comments.
-To skip a row in your design, use a single <tt class="docutils literal">;</tt>.</p>
-<p>One comment in the file may contain the phrase <tt class="docutils literal">start(3,5)</tt>. It is interpreted
-as an offset for the pattern: instead of starting at the cursor, it will start
-3 tiles left and 5 tiles up from the cursor.</p>
-<p>The script takes the plan filename, starting from the root df folder (where
-Dwarf Fortress.exe is found).</p>
-</div>
-<div class="section" id="invasion-now">
-<h2><a class="toc-backref" href="#id147">invasion-now</a></h2>
-<p>Triggers an invasion, or several in the near future.</p>
-<p><cite>invasion-now civName</cite> trigger an invasion from the civilization with the id civName, starting in about ten ticks</p>
-<p><cite>invasion-now civName start</cite> trigger an invasion from civName in a number of ticks between 10*start and 11*start-1 (inclusive)</p>
-<p><cite>invasion-now civName start end</cite> trigger an invasion from civName in about 10*start ticks, and continue triggering invasions every ten ticks afterward until about 10*end ticks have passed</p>
-<p>Probably fails if the start time of a triggered invasion is later than the start of the next year.</p>
-</div>
-<div class="section" id="digmat">
-<h2><a class="toc-backref" href="#id148">digmat</a></h2>
-<p>Designates a tile for digging. Monitors the tile, and when it is dug out, add
-surrounding discovered tiles of the same material for digging. Similar to 'digv',
-but less cheaty. Works for stone layers, soil layers, veins, etc.</p>
-<p>If the tile you call the script on already has a digging designation, reuse the
-same designation for future digging (eg dig up/downstairs). When digging stairs,
-also designate tiles on z-1 and z+1 when they are discovered.</p>
 </div>
-<div class="section" id="superdwarf">
-<h2><a class="toc-backref" href="#id149">superdwarf</a></h2>
-<p>Similar to fastdwarf, per-creature.</p>
-<p>To make any creature superfast, target it ingame using 'v' and:</p>
+<div class="section" id="locate-ore">
+<h2><a class="toc-backref" href="#id142">locate-ore</a></h2>
+<p>Scan the map for metal ores.</p>
+<p>Finds and designate for digging one tile of a specific metal ore.
+Only works for native metal ores, does not handle reaction stuff (eg STEEL).</p>
+<p>When invoked with the <tt class="docutils literal">list</tt> argument, lists metal ores available on the map.</p>
+<p>Examples:</p>
 <pre class="literal-block">
-superdwarf add
+locate-ore list
+locate-ore hematite
+locate-ore iron
 </pre>
-<p>Other options available: <tt class="docutils literal">del</tt>, <tt class="docutils literal">clear</tt>, <tt class="docutils literal">list</tt>.</p>
-<p>This plugin also shortens the 'sleeping' and 'on break' periods of targets.</p>
-</div>
-<div class="section" id="drainaquifer">
-<h2><a class="toc-backref" href="#id150">drainaquifer</a></h2>
-<p>Remove all 'aquifer' tag from the map blocks. Irreversible.</p>
-</div>
-<div class="section" id="deathcause">
-<h2><a class="toc-backref" href="#id151">deathcause</a></h2>
-<p>Focus a body part ingame, and this script will display the cause of death of
-the creature.
-Also works when selecting units from the 'u'nitlist viewscreen.</p>
 </div>
 <div class="section" id="lua">
-<h2><a class="toc-backref" href="#id152">lua</a></h2>
+<h2><a class="toc-backref" href="#id143">lua</a></h2>
 <p>There are the following ways to invoke this command:</p>
 <ol class="arabic">
 <li><p class="first"><tt class="docutils literal">lua</tt> (without any parameters)</p>
@@ -3288,26 +2979,98 @@ directory. If the filename is not supplied, it loads &quot;dfhack.lua&quot;.</p>
 </li>
 </ol>
 </div>
-<div class="section" id="embark">
-<h2><a class="toc-backref" href="#id153">embark</a></h2>
-<p>Allows to embark anywhere. Currently windows only.</p>
+<div class="section" id="masspit">
+<h2><a class="toc-backref" href="#id144">masspit</a></h2>
+<p>Designate all creatures in cages on top of a pit/pond activity zone for pitting.
+Works best with an animal stockpile on top of the zone.</p>
+<p>Works with a zone number as argument (eg <tt class="docutils literal">Activity Zone #6</tt> -&gt; <tt class="docutils literal">masspit 6</tt>)
+or with the game cursor on top of the area.</p>
 </div>
-<div class="section" id="lever">
-<h2><a class="toc-backref" href="#id154">lever</a></h2>
-<p>Allow manipulation of in-game levers from the dfhack console.</p>
-<p>Can list levers, including state and links, with:</p>
+<div class="section" id="multicmd">
+<h2><a class="toc-backref" href="#id145">multicmd</a></h2>
+<p>Run multiple dfhack commands. The argument is split around the
+character ; and all parts are run sequencially as independent
+dfhack commands. Useful for hotkeys.</p>
+<p>Example:</p>
 <pre class="literal-block">
-lever list
+multicmd locate-ore iron ; digv
 </pre>
-<p>To queue a job so that a dwarf will pull the lever 42, use <tt class="docutils literal">lever pull 42</tt>.
-This is the same as 'q'uerying the building and queue a 'P'ull request.</p>
-<p>To magically toggle the lever immediately, use:</p>
+</div>
+<div class="section" id="quicksave">
+<h2><a class="toc-backref" href="#id146">quicksave</a></h2>
+<p>If called in dwarf mode, makes DF immediately auto-save the game by setting a flag
+normally used in seasonal auto-save.</p>
+</div>
+<div class="section" id="removebadthoughts">
+<h2><a class="toc-backref" href="#id147">removebadthoughts</a></h2>
+<p>This script remove negative thoughts from your dwarves. Very useful against
+tantrum spirals.</p>
+<p>The script can target a single creature, when used with the <tt class="docutils literal">him</tt> argument,
+or the whole fort population, with <tt class="docutils literal">all</tt>.</p>
+<p>To show every bad thought present without actually removing them, run the
+script with the <tt class="docutils literal"><span class="pre">-n</span></tt> or <tt class="docutils literal"><span class="pre">--dry-run</span></tt> argument. This can give a quick
+hint on what bothers your dwarves the most.</p>
+<p>Individual dwarf happiness may not increase right after this command is run,
+but in the short term your dwarves will get much more joyful.</p>
+<p>Internals: the thoughts are set to be very old, so that the game remove them
+quickly after you unpause.</p>
+</div>
+<div class="section" id="setfps">
+<h2><a class="toc-backref" href="#id148">setfps</a></h2>
+<p>Run <tt class="docutils literal">setfps &lt;number&gt;</tt> to set the FPS cap at runtime, in case you want to watch
+combat in slow motion or something :)</p>
+</div>
+<div class="section" id="siren">
+<h2><a class="toc-backref" href="#id149">siren</a></h2>
+<p>Wakes up sleeping units, cancels breaks and stops parties either everywhere,
+or in the burrows given as arguments. In return, adds bad thoughts about
+noise, tiredness and lack of protection. Also, the units with interrupted
+breaks will go on break again a lot sooner. The script is intended for
+emergencies, e.g. when a siege appears, and all your military is partying.</p>
+</div>
+<div class="section" id="soundsense-season">
+<h2><a class="toc-backref" href="#id150">soundsense-season</a></h2>
+<p>It is a well known issue that Soundsense cannot detect the correct
+current season when a savegame is loaded and has to play random
+season music until a season switch occurs.</p>
+<p>This script registers a hook that prints the appropriate string
+to gamelog.txt on every map load to fix this. For best results
+call the script from <tt class="docutils literal">dfhack.init</tt>.</p>
+</div>
+<div class="section" id="source">
+<h2><a class="toc-backref" href="#id151">source</a></h2>
+<p>Create an infinite magma or water source or drain on a tile.</p>
+<p>This script registers a map tile as a liquid source, and every 12 game ticks
+that tile receives or remove 1 new unit of flow based on the configuration.</p>
+<p>Place the game cursor where you want to create the source (must be a
+flow-passable tile, and not too high in the sky) and call:</p>
 <pre class="literal-block">
-lever pull 42 --now
+source add [magma|water] [0-7]
+</pre>
+<p>The number argument is the target liquid level (0 = drain, 7 = source).</p>
+<p>To add more than 1 unit everytime, call the command again on the same spot.</p>
+<p>To delete one source, place the cursor over its tile and use <tt class="docutils literal">delete</tt>.
+To remove all existing sources, call <tt class="docutils literal">source clear</tt>.</p>
+<p>The <tt class="docutils literal">list</tt> argument shows all existing sources.</p>
+<p>Ex:</p>
+<pre class="literal-block">
+source add water     - water source
+source add magma 7   - magma source
+source add water 0   - water drain
 </pre>
 </div>
+<div class="section" id="superdwarf">
+<h2><a class="toc-backref" href="#id152">superdwarf</a></h2>
+<p>Similar to fastdwarf, per-creature.</p>
+<p>To make any creature superfast, target it ingame using 'v' and:</p>
+<pre class="literal-block">
+superdwarf add
+</pre>
+<p>Other options available: <tt class="docutils literal">del</tt>, <tt class="docutils literal">clear</tt>, <tt class="docutils literal">list</tt>.</p>
+<p>This plugin also shortens the 'sleeping' and 'on break' periods of targets.</p>
+</div>
 <div class="section" id="stripcaged">
-<h2><a class="toc-backref" href="#id155">stripcaged</a></h2>
+<h2><a class="toc-backref" href="#id153">stripcaged</a></h2>
 <p>For dumping items inside cages. Will mark selected items for dumping, then
 a dwarf may come and actually dump it. See also <tt class="docutils literal">autodump</tt>.</p>
 <p>With the <tt class="docutils literal">items</tt> argument, only dumps items laying in the cage, excluding
@@ -3325,70 +3088,69 @@ stripcaged weapons 25321 34228
 </pre>
 </div>
 <div class="section" id="undump-buildings">
-<h2><a class="toc-backref" href="#id156">undump-buildings</a></h2>
+<h2><a class="toc-backref" href="#id154">undump-buildings</a></h2>
 <p>Undesignates building base materials for dumping.</p>
 </div>
-<div class="section" id="create-items">
-<h2><a class="toc-backref" href="#id157">create-items</a></h2>
-<p>Spawn arbitrary items under the cursor.</p>
-<p>The first argument gives the item category, the second gives the material,
-and the optionnal third gives the number of items to create (defaults to 20).</p>
-<p>Currently supported item categories: <tt class="docutils literal">boulder</tt>, <tt class="docutils literal">bar</tt>, <tt class="docutils literal">plant</tt>, <tt class="docutils literal">log</tt>,
-<tt class="docutils literal">web</tt>.</p>
-<p>Instead of material, using <tt class="docutils literal">list</tt> makes the script list eligible materials.</p>
-<p>The <tt class="docutils literal">web</tt> item category will create an uncollected cobweb on the floor.</p>
-<p>Note that the script does not enforce anything, and will let you create
-boulders of toad blood and stuff like that.
-However the <tt class="docutils literal">list</tt> mode will only show 'normal' materials.</p>
-<p>Examples:</p>
-<pre class="literal-block">
-create-items boulders COAL_BITUMINOUS 12
-create-items plant tail_pig
-create-items log list
-create-items web CREATURE:SPIDER_CAVE_GIANT:SILK
-create-items bar CREATURE:CAT:SOAP
-create-items bar adamantine
-</pre>
-</div>
-<div class="section" id="locate-ore">
-<h2><a class="toc-backref" href="#id158">locate-ore</a></h2>
-<p>Scan the map for metal ores.</p>
-<p>Finds and designate for digging one tile of a specific metal ore.
-Only works for native metal ores, does not handle reaction stuff (eg STEEL).</p>
-<p>When invoked with the <tt class="docutils literal">list</tt> argument, lists metal ores available on the map.</p>
-<dl class="docutils">
-<dt>Examples::</dt>
-<dd>locate-ore list
-locate-ore hematite
-locate-ore iron</dd>
-</dl>
-</div>
-<div class="section" id="soundsense-season">
-<h2><a class="toc-backref" href="#id159">soundsense-season</a></h2>
-<p>It is a well known issue that Soundsense cannot detect the correct
-current season when a savegame is loaded and has to play random
-season music until a season switch occurs.</p>
-<p>This script registers a hook that prints the appropriate string
-to gamelog.txt on every map load to fix this. For best results
-call the script from <tt class="docutils literal">dfhack.init</tt>.</p>
-</div>
-<div class="section" id="multicmd">
-<h2><a class="toc-backref" href="#id160">multicmd</a></h2>
-<p>Run multiple dfhack commands. The argument is split around the
-character ; and all parts are run sequencially as independent
-dfhack commands. Useful for hotkeys.</p>
-<dl class="docutils">
-<dt>Example::</dt>
-<dd>multicmd locate-ore iron ; digv</dd>
-</dl>
-</div>
-<div class="section" id="dfstatus">
-<h2><a class="toc-backref" href="#id161">dfstatus</a></h2>
-<p>Show a quick overview of critical stock quantities, including food, dirnks, wood, and various bars.</p>
 </div>
+<div class="section" id="modtools">
+<h1><a class="toc-backref" href="#id155">modtools</a></h1>
+<p>These scripts are mostly useful for raw modders and scripters. They all have standard arguments: arguments are of the form <tt class="docutils literal">tool <span class="pre">-argName1</span> argVal1 <span class="pre">-argName2</span> argVal2</tt>. This is equivalent to <tt class="docutils literal">tool <span class="pre">-argName2</span> argVal2 <span class="pre">-argName1</span> argVal1</tt>. It is not necessary to provide a value to an argument name: <tt class="docutils literal">tool <span class="pre">-argName3</span></tt> is fine. Supplying the same argument name multiple times will result in an error. Argument names are preceded with a dash. The <tt class="docutils literal"><span class="pre">-help</span></tt> argument will print a descriptive usage string describing the nature of the arguments. For multiple word argument values, brackets must be used: <tt class="docutils literal">tool <span class="pre">-argName4</span> [ sadf1 sadf2 sadf3 ]</tt>. In order to allow passing literal braces as part of the argument, backslashes are used: <tt class="docutils literal">tool <span class="pre">-argName4</span> [ \] asdf \foo ]</tt> sets <tt class="docutils literal">argName4</tt> to <tt class="docutils literal">\] asdf foo</tt>. The <tt class="docutils literal"><span class="pre">*-trigger</span></tt> scripts have a similar policy with backslashes.</p>
+<ul>
+<li><p class="first">add-syndrome</p>
+<p>This allows adding and removing syndromes from units.</p>
+</li>
+<li><p class="first">anonymous-script</p>
+<p>This allows running a short simple Lua script passed as an argument instead of running a script from a file. This is useful when you want to do something too complicated to make with the existing modtools, but too simple to be worth its own script file.</p>
+</li>
+<li><p class="first">create-item</p>
+<p>This is mostly the same as the other create item tools, but it uses standard arguments. The other versions will be phased out in a later version.</p>
+</li>
+<li><p class="first">force</p>
+<p>This tool triggers events like megabeasts, caravans, invaders, and migrants.</p>
+</li>
+<li><p class="first">interaction-trigger</p>
+<p>This triggers events when a unit uses an interaction on another. It works by scanning the announcements for the correct attack verb, so the attack verb must be specified in the interaction. It includes an option to suppress this announcement after it finds it.</p>
+</li>
+<li><p class="first">invader-item-destroyer</p>
+<p>This tool configurably destroys invader items to prevent clutter or to prevent the player from getting tools exclusive to certain races.</p>
+</li>
+<li><p class="first">item-trigger</p>
+<p>This powerful tool triggers DFHack commands when a unit equips, unequips, or attacks another unit with specified item types, specified item materials, or specified item contaminants.</p>
+</li>
+<li><p class="first">moddable-gods</p>
+<p>This is a standardized version of Putnam's moddableGods script. It allows you to create gods on the command-line.</p>
+</li>
+<li><p class="first">outside-only</p>
+<p>This allows you to specify certain custom buildings as outside only, or inside only. If the player attempts to build a building in an inappropriate location, the building will be destroyed.</p>
+</li>
+<li><p class="first">projectile-trigger</p>
+<p>This triggers dfhack commands when projectiles hit their targets.</p>
+</li>
+<li><p class="first">random-trigger</p>
+<p>This triggers random dfhack commands with specified probabilities.</p>
+</li>
+<li><p class="first">reaction-trigger</p>
+<p>Triggers dfhack commands when custom reactions complete.</p>
+</li>
+<li><p class="first">reaction-trigger-transition</p>
+<p>Scans raw files and creates a file to help modders transition from autoSyndrome to reaction-trigger.</p>
+</li>
+<li><p class="first">skill-change</p>
+<p>Sets or modifies a skill of a unit.</p>
+</li>
+<li><p class="first">spawn-flow</p>
+<p>Creates flows at the specified location.</p>
+</li>
+<li><p class="first">syndrome-trigger</p>
+<p>Triggers dfhack commands when syndromes are applied to units.</p>
+</li>
+<li><p class="first">transform-unit</p>
+<p>Transforms a unit into another unit type, possibly permanently.</p>
+</li>
+</ul>
 </div>
 <div class="section" id="in-game-interface-tools">
-<h1><a class="toc-backref" href="#id162">In-game interface tools</a></h1>
+<h1><a class="toc-backref" href="#id156">In-game interface tools</a></h1>
 <p>These tools work by displaying dialogs or overlays in the game window, and
 are mostly implemented by lua scripts.</p>
 <div class="note">
@@ -3403,7 +3165,7 @@ guideline because it arguably just fixes small usability bugs in the game UI.</p
 you must enable the plugins which provide them.</p>
 </div>
 <div class="section" id="dwarf-manipulator">
-<h2><a class="toc-backref" href="#id163">Dwarf Manipulator</a></h2>
+<h2><a class="toc-backref" href="#id157">Dwarf Manipulator</a></h2>
 <p>Implemented by the 'manipulator' plugin.</p>
 <p>To activate, open the unit screen and press 'l'.</p>
 <img alt="images/manipulator.png" src="images/manipulator.png" />
@@ -3444,7 +3206,7 @@ cursor onto that cell instead of toggling it.</li>
 directly to the main dwarf mode screen.</p>
 </div>
 <div class="section" id="search">
-<h2><a class="toc-backref" href="#id164">Search</a></h2>
+<h2><a class="toc-backref" href="#id158">Search</a></h2>
 <p>Implemented by the 'search' plugin.</p>
 <p>The search plugin adds search to the Stocks, Animals, Trading, Stockpile,
 Noble (assignment candidates), Military (position candidates), Burrows
@@ -3475,7 +3237,7 @@ only fat or tallow by forbidding fats, then searching for fat/tallow, and
 using Permit Fats again while the list is filtered.</p>
 </div>
 <div class="section" id="automaterial">
-<h2><a class="toc-backref" href="#id165">AutoMaterial</a></h2>
+<h2><a class="toc-backref" href="#id159">AutoMaterial</a></h2>
 <p>Implemented by the 'automaterial' plugin.</p>
 <p>This makes building constructions (walls, floors, fortifications, etc) a little bit
 easier by saving you from having to trawl through long lists of materials each time
@@ -3502,6 +3264,98 @@ toggle this option on, instead of returning you to the main construction menu af
 materials, it returns you back to this screen. If you use this along with several autoselect
 enabled materials, you should be able to place complex constructions more conveniently.</p>
 </div>
+<div class="section" id="gui-advfort">
+<h2><a class="toc-backref" href="#id160">gui/advfort</a></h2>
+<p>This script allows to perform jobs in adventure mode. For more complete help
+press '?' while script is running. It's most confortable to use this as a
+keybinding. (e.g. keybinding set Ctrl-T gui/advfort). Possible arguments:</p>
+<ul class="simple">
+<li>-a or --nodfassign - uses different method to assign items.</li>
+<li>-i or --inventory - checks inventory for possible items to use in the job.</li>
+<li>-c or --cheat - relaxes item requirements for buildings (e.g. walls from bones).
+implies -a</li>
+<li>job - selects that job (e.g. Dig or FellTree)</li>
+</ul>
+<p>An example of player digging in adventure mode:</p>
+<img alt="images/advfort.png" src="images/advfort.png" />
+<div class="admonition-disclaimer admonition">
+<p class="first admonition-title">DISCLAIMER</p>
+<p class="last">advfort changes only persist in non procedural sites. Namely: player forts, caves, camps.</p>
+</div>
+</div>
+<div class="section" id="gui-assign-rack">
+<h2><a class="toc-backref" href="#id161">gui/assign-rack</a></h2>
+<p>Bind to a key (the example config uses P), and activate when viewing a weapon
+rack in the 'q' mode.</p>
+<img alt="images/assign-rack.png" src="images/assign-rack.png" />
+<p>This script is part of a group of related fixes to make the armory storage
+work again. The existing issues are:</p>
+<ul class="simple">
+<li>Weapon racks have to each be assigned to a specific squad, like with
+beds/boxes/armor stands and individual squad members, but nothing in
+the game does this. This issue is what this script addresses.</li>
+<li>Even if assigned by the script, <strong>the game will unassign the racks again without a binary patch</strong>.
+This patch is called <tt class="docutils literal"><span class="pre">weaponrack-unassign</span></tt>, and can be applied via
+the binpatch program, or the matching script. See this for more info
+about the bug:
+<a class="reference external" href="http://www.bay12games.com/dwarves/mantisbt/view.php?id=1445">http://www.bay12games.com/dwarves/mantisbt/view.php?id=1445</a></li>
+<li>Haulers still take equpment stored in the armory away to the stockpiles,
+unless the <tt class="docutils literal"><span class="pre">fix-armory</span></tt> plugin above is used.</li>
+</ul>
+<p>The script interface simply lets you designate one of the squads that
+are assigned to the barracks/armory containing the selected stand as
+the intended user. In order to aid in the choice, it shows the number
+of currently assigned racks for every valid squad.</p>
+</div>
+<div class="section" id="gui-choose-weapons">
+<h2><a class="toc-backref" href="#id162">gui/choose-weapons</a></h2>
+<p>Bind to a key (the example config uses Ctrl-W), and activate in the Equip-&gt;View/Customize
+page of the military screen.</p>
+<p>Depending on the cursor location, it rewrites all 'individual choice weapon' entries
+in the selected squad or position to use a specific weapon type matching the assigned
+unit's top skill. If the cursor is in the rightmost list over a weapon entry, it rewrites
+only that entry, and does it even if it is not 'individual choice'.</p>
+<p>Rationale: individual choice seems to be unreliable when there is a weapon shortage,
+and may lead to inappropriate weapons being selected.</p>
+</div>
+<div class="section" id="gui-clone-uniform">
+<h2><a class="toc-backref" href="#id163">gui/clone-uniform</a></h2>
+<p>Bind to a key (the example config uses Ctrl-C), and activate in the Uniforms
+page of the military screen with the cursor in the leftmost list.</p>
+<p>When invoked, the script duplicates the currently selected uniform template,
+and selects the newly created copy.</p>
+</div>
+<div class="section" id="gui-companion-order">
+<h2><a class="toc-backref" href="#id164">gui/companion-order</a></h2>
+<p>A script to issue orders for companions. Select companions with lower case chars, issue orders with upper
+case. Must be in look or talk mode to issue command on tile.</p>
+<img alt="images/companion-order.png" src="images/companion-order.png" />
+<ul class="simple">
+<li>move - orders selected companions to move to location. If companions are following they will move no more than 3 tiles from you.</li>
+<li>equip - try to equip items on the ground.</li>
+<li>pick-up - try to take items into hand (also wield)</li>
+<li>unequip - remove and drop equipment</li>
+<li>unwield - drop held items</li>
+<li>wait - temporarily remove from party</li>
+<li>follow - rejoin the party after &quot;wait&quot;</li>
+<li>leave - remove from party (can be rejoined by talking)</li>
+</ul>
+</div>
+<div class="section" id="gui-gm-editor">
+<h2><a class="toc-backref" href="#id165">gui/gm-editor</a></h2>
+<p>There are three ways to open this editor:</p>
+<ul class="simple">
+<li>using gui/gm-editor command/keybinding - opens editor on what is selected
+or viewed (e.g. unit/item description screen)</li>
+<li>using gui/gm-editor &lt;lua command&gt; - executes lua command and opens editor on
+its results (e.g. gui/gm-editor &quot;df.global.world.items.all&quot; shows all items)</li>
+<li>using gui/gm-editor dialog - shows an in game dialog to input lua command. Works
+the same as version above.</li>
+</ul>
+<img alt="images/gm-editor.png" src="images/gm-editor.png" />
+<p>This editor allows to change and modify almost anything in df. Press '?' for an
+in-game help.</p>
+</div>
 <div class="section" id="gui-liquids">
 <h2><a class="toc-backref" href="#id166">gui/liquids</a></h2>
 <p>To use, bind to a key (the example config uses Alt-L) and activate in the 'k' mode.</p>
@@ -3532,8 +3386,14 @@ the view on the relevant linked buildings.</p>
 focus on the current one. Shift-Enter has an effect equivalent to pressing Enter, and then
 re-entering the mechanisms ui.</p>
 </div>
+<div class="section" id="gui-mod-manager">
+<h2><a class="toc-backref" href="#id168">gui/mod-manager</a></h2>
+<p>A way to simply install and remove small mods. It looks for specially formatted mods in
+df subfolder 'mods'. Mods are not included, for example mods see: <a class="reference external" href="https://github.com/warmist/df-mini-mods">github mini mod repository</a></p>
+<img alt="images/mod-manager.png" src="images/mod-manager.png" />
+</div>
 <div class="section" id="gui-rename">
-<h2><a class="toc-backref" href="#id168">gui/rename</a></h2>
+<h2><a class="toc-backref" href="#id169">gui/rename</a></h2>
 <p>Backed by the rename plugin, this script allows entering the desired name
 via a simple dialog in the game ui.</p>
 <ul>
@@ -3556,77 +3416,23 @@ their species string.</p>
 unit profession change to Ctrl-Shift-T.</p>
 </div>
 <div class="section" id="gui-room-list">
-<h2><a class="toc-backref" href="#id169">gui/room-list</a></h2>
+<h2><a class="toc-backref" href="#id170">gui/room-list</a></h2>
 <p>To use, bind to a key (the example config uses Alt-R) and activate in the 'q' mode,
 either immediately or after opening the assign owner page.</p>
 <img alt="images/room-list.png" src="images/room-list.png" />
 <p>The script lists other rooms owned by the same owner, or by the unit selected in the assign
 list, and allows unassigning them.</p>
 </div>
-<div class="section" id="gui-choose-weapons">
-<h2><a class="toc-backref" href="#id170">gui/choose-weapons</a></h2>
-<p>Bind to a key (the example config uses Ctrl-W), and activate in the Equip-&gt;View/Customize
-page of the military screen.</p>
-<p>Depending on the cursor location, it rewrites all 'individual choice weapon' entries
-in the selected squad or position to use a specific weapon type matching the assigned
-unit's top skill. If the cursor is in the rightmost list over a weapon entry, it rewrites
-only that entry, and does it even if it is not 'individual choice'.</p>
-<p>Rationale: individual choice seems to be unreliable when there is a weapon shortage,
-and may lead to inappropriate weapons being selected.</p>
-</div>
-<div class="section" id="gui-clone-uniform">
-<h2><a class="toc-backref" href="#id171">gui/clone-uniform</a></h2>
-<p>Bind to a key (the example config uses Ctrl-C), and activate in the Uniforms
-page of the military screen with the cursor in the leftmost list.</p>
-<p>When invoked, the script duplicates the currently selected uniform template,
-and selects the newly created copy.</p>
-</div>
 <div class="section" id="gui-guide-path">
-<h2><a class="toc-backref" href="#id172">gui/guide-path</a></h2>
+<h2><a class="toc-backref" href="#id171">gui/guide-path</a></h2>
 <p>Bind to a key (the example config uses Alt-P), and activate in the Hauling menu with
 the cursor over a Guide order.</p>
 <img alt="images/guide-path.png" src="images/guide-path.png" />
 <p>The script displays the cached path that will be used by the order; the game
 computes it when the order is executed for the first time.</p>
 </div>
-<div class="section" id="gui-workshop-job">
-<h2><a class="toc-backref" href="#id173">gui/workshop-job</a></h2>
-<p>Bind to a key (the example config uses Alt-A), and activate with a job selected in
-a workshop in the 'q' mode.</p>
-<img alt="images/workshop-job.png" src="images/workshop-job.png" />
-<p>The script shows a list of the input reagents of the selected job, and allows changing
-them like the <tt class="docutils literal">job <span class="pre">item-type</span></tt> and <tt class="docutils literal">job <span class="pre">item-material</span></tt> commands.</p>
-<p>Specifically, pressing the 'i' key pops up a dialog that lets you select an item
-type from a list.</p>
-<img alt="images/workshop-job-item.png" src="images/workshop-job-item.png" />
-<p>Pressing 'm', unless the item type does not allow a material,
-lets you choose a material.</p>
-<img alt="images/workshop-job-material.png" src="images/workshop-job-material.png" />
-<p>Since there are a lot more materials than item types, this dialog is more complex
-and uses a hierarchy of sub-menus. List choices that open a sub-menu are marked
-with an arrow on the left.</p>
-<div class="warning">
-<p class="first admonition-title">Warning</p>
-<p class="last">Due to the way input reagent matching works in DF, you must select an item type
-if you select a material, or the material will be matched incorrectly in some cases.
-If you press 'm' without choosing an item type, the script will auto-choose it
-if there is only one valid choice, or pop up an error message box instead of the
-material selection dialog.</p>
-</div>
-<p>Note that both materials and item types presented in the dialogs are filtered
-by the job input flags, and even the selected item type for material selection,
-or material for item type selection. Many jobs would let you select only one
-input item type.</p>
-<p>For example, if you choose a <em>plant</em> input item type for your prepare meal job,
-it will only let you select cookable materials.</p>
-<p>If you choose a <em>barrel</em> item instead (meaning things stored in barrels, like
-drink or milk), it will let you select any material, since in this case the
-material is matched against the barrel itself. Then, if you select, say, iron,
-and then try to change the input item type, now it won't let you select <em>plant</em>;
-you have to unset the material first.</p>
-</div>
 <div class="section" id="gui-workflow">
-<h2><a class="toc-backref" href="#id174">gui/workflow</a></h2>
+<h2><a class="toc-backref" href="#id172">gui/workflow</a></h2>
 <p>Bind to a key (the example config uses Alt-W), and activate with a job selected
 in a workshop in the 'q' mode.</p>
 <img alt="images/workflow.png" src="images/workflow.png" />
@@ -3672,89 +3478,45 @@ of stock history for the selected item, with the rightmost point representing
 the current stock value. The bright green dashed line is the target
 limit (maximum) and the dark green line is that minus the gap (minimum).</p>
 </div>
-<div class="section" id="gui-assign-rack">
-<h2><a class="toc-backref" href="#id175">gui/assign-rack</a></h2>
-<p>Bind to a key (the example config uses P), and activate when viewing a weapon
-rack in the 'q' mode.</p>
-<img alt="images/assign-rack.png" src="images/assign-rack.png" />
-<p>This script is part of a group of related fixes to make the armory storage
-work again. The existing issues are:</p>
-<ul class="simple">
-<li>Weapon racks have to each be assigned to a specific squad, like with
-beds/boxes/armor stands and individual squad members, but nothing in
-the game does this. This issue is what this script addresses.</li>
-<li>Even if assigned by the script, <strong>the game will unassign the racks again without a binary patch</strong>.
-This patch is called <tt class="docutils literal"><span class="pre">weaponrack-unassign</span></tt>, and can be applied via
-the binpatch program, or the matching script. See this for more info
-about the bug:
-<a class="reference external" href="http://www.bay12games.com/dwarves/mantisbt/view.php?id=1445">http://www.bay12games.com/dwarves/mantisbt/view.php?id=1445</a></li>
-<li>Haulers still take equpment stored in the armory away to the stockpiles,
-unless the <tt class="docutils literal"><span class="pre">fix-armory</span></tt> plugin above is used.</li>
-</ul>
-<p>The script interface simply lets you designate one of the squads that
-are assigned to the barracks/armory containing the selected stand as
-the intended user. In order to aid in the choice, it shows the number
-of currently assigned racks for every valid squad.</p>
-</div>
-<div class="section" id="gui-advfort">
-<h2><a class="toc-backref" href="#id176">gui/advfort</a></h2>
-<p>This script allows to perform jobs in adventure mode. For more complete help
-press '?' while script is running. It's most confortable to use this as a
-keybinding. (e.g. keybinding set Ctrl-T gui/advfort). Possible arguments:</p>
-<ul class="simple">
-<li>-a or --nodfassign - uses different method to assign items.</li>
-<li>-i or --inventory - checks inventory for possible items to use in the job.</li>
-<li>-c or --cheat - relaxes item requirements for buildings (e.g. walls from bones).
-implies -a</li>
-<li>job - selects that job (e.g. Dig or FellTree)</li>
-</ul>
-<p>An example of player digging in adventure mode:</p>
-<img alt="images/advfort.png" src="images/advfort.png" />
-<div class="admonition-disclaimer admonition">
-<p class="first admonition-title">DISCLAIMER</p>
-<p class="last">advfort changes only persist in non procedural sites. Namely: player forts, caves, camps.</p>
-</div>
-</div>
-<div class="section" id="gui-companion-order">
-<h2><a class="toc-backref" href="#id177">gui/companion-order</a></h2>
-<p>A script to issue orders for companions. Select companions with lower case chars, issue orders with upper
-case. Must be in look or talk mode to issue command on tile.</p>
-<img alt="images/companion-order.png" src="images/companion-order.png" />
-<ul class="simple">
-<li>move - orders selected companions to move to location. If companions are following they will move no more than 3 tiles from you.</li>
-<li>equip - try to equip items on the ground.</li>
-<li>pick-up - try to take items into hand (also wield)</li>
-<li>unequip - remove and drop equipment</li>
-<li>unwield - drop held items</li>
-<li>wait - temporarily remove from party</li>
-<li>follow - rejoin the party after &quot;wait&quot;</li>
-<li>leave - remove from party (can be rejoined by talking)</li>
-</ul>
-</div>
-<div class="section" id="gui-gm-editor">
-<h2><a class="toc-backref" href="#id178">gui/gm-editor</a></h2>
-<p>There are three ways to open this editor:</p>
-<ul class="simple">
-<li>using gui/gm-editor command/keybinding - opens editor on what is selected
-or viewed (e.g. unit/item description screen)</li>
-<li>using gui/gm-editor &lt;lua command&gt; - executes lua command and opens editor on
-its results (e.g. gui/gm-editor &quot;df.global.world.items.all&quot; shows all items)</li>
-<li>using gui/gm-editor dialog - shows an in game dialog to input lua command. Works
-the same as version above.</li>
-</ul>
-<img alt="images/gm-editor.png" src="images/gm-editor.png" />
-<p>This editor allows to change and modify almost anything in df. Press '?' for an
-in-game help.</p>
+<div class="section" id="gui-workshop-job">
+<h2><a class="toc-backref" href="#id173">gui/workshop-job</a></h2>
+<p>Bind to a key (the example config uses Alt-A), and activate with a job selected in
+a workshop in the 'q' mode.</p>
+<img alt="images/workshop-job.png" src="images/workshop-job.png" />
+<p>The script shows a list of the input reagents of the selected job, and allows changing
+them like the <tt class="docutils literal">job <span class="pre">item-type</span></tt> and <tt class="docutils literal">job <span class="pre">item-material</span></tt> commands.</p>
+<p>Specifically, pressing the 'i' key pops up a dialog that lets you select an item
+type from a list.</p>
+<img alt="images/workshop-job-item.png" src="images/workshop-job-item.png" />
+<p>Pressing 'm', unless the item type does not allow a material,
+lets you choose a material.</p>
+<img alt="images/workshop-job-material.png" src="images/workshop-job-material.png" />
+<p>Since there are a lot more materials than item types, this dialog is more complex
+and uses a hierarchy of sub-menus. List choices that open a sub-menu are marked
+with an arrow on the left.</p>
+<div class="warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">Due to the way input reagent matching works in DF, you must select an item type
+if you select a material, or the material will be matched incorrectly in some cases.
+If you press 'm' without choosing an item type, the script will auto-choose it
+if there is only one valid choice, or pop up an error message box instead of the
+material selection dialog.</p>
 </div>
-<div class="section" id="gui-mod-manager">
-<h2><a class="toc-backref" href="#id179">gui/mod-manager</a></h2>
-<p>A way to simply install and remove small mods. It looks for specially formatted mods in
-df subfolder 'mods'. Mods are not included, for example mods see: <a class="reference external" href="https://github.com/warmist/df-mini-mods">github mini mod repository</a></p>
-<img alt="images/mod-manager.png" src="images/mod-manager.png" />
+<p>Note that both materials and item types presented in the dialogs are filtered
+by the job input flags, and even the selected item type for material selection,
+or material for item type selection. Many jobs would let you select only one
+input item type.</p>
+<p>For example, if you choose a <em>plant</em> input item type for your prepare meal job,
+it will only let you select cookable materials.</p>
+<p>If you choose a <em>barrel</em> item instead (meaning things stored in barrels, like
+drink or milk), it will let you select any material, since in this case the
+material is matched against the barrel itself. Then, if you select, say, iron,
+and then try to change the input item type, now it won't let you select <em>plant</em>;
+you have to unset the material first.</p>
 </div>
 </div>
 <div class="section" id="behavior-mods">
-<h1><a class="toc-backref" href="#id180">Behavior Mods</a></h1>
+<h1><a class="toc-backref" href="#id174">Behavior Mods</a></h1>
 <p>These plugins, when activated via configuration UI or by detecting certain
 structures in RAWs, modify the game engine behavior concerning the target
 objects to add features not otherwise present.</p>
@@ -3765,20 +3527,20 @@ technical challenge, and do not represent any long-term plans to produce more
 similar modifications of the game.</p>
 </div>
 <div class="section" id="siege-engine">
-<h2><a class="toc-backref" href="#id181">Siege Engine</a></h2>
+<h2><a class="toc-backref" href="#id175">Siege Engine</a></h2>
 <p>The siege-engine plugin enables siege engines to be linked to stockpiles, and
 aimed at an arbitrary rectangular area across Z levels, instead of the original
 four directions. Also, catapults can be ordered to load arbitrary objects, not
 just stones.</p>
 <div class="section" id="rationale">
-<h3><a class="toc-backref" href="#id182">Rationale</a></h3>
+<h3><a class="toc-backref" href="#id176">Rationale</a></h3>
 <p>Siege engines are a very interesting feature, but sadly almost useless in the current state
 because they haven't been updated since 2D and can only aim in four directions. This is an
 attempt to bring them more up to date until Toady has time to work on it. Actual improvements,
 e.g. like making siegers bring their own, are something only Toady can do.</p>
 </div>
 <div class="section" id="configuration-ui">
-<h3><a class="toc-backref" href="#id183">Configuration UI</a></h3>
+<h3><a class="toc-backref" href="#id177">Configuration UI</a></h3>
 <p>The configuration front-end to the plugin is implemented by the gui/siege-engine
 script. Bind it to a key (the example config uses Alt-A) and activate after selecting
 a siege engine in 'q' mode.</p>
@@ -3801,7 +3563,7 @@ menu.</p>
 </div>
 </div>
 <div class="section" id="power-meter">
-<h2><a class="toc-backref" href="#id184">Power Meter</a></h2>
+<h2><a class="toc-backref" href="#id178">Power Meter</a></h2>
 <p>The power-meter plugin implements a modified pressure plate that detects power being
 supplied to gear boxes built in the four adjacent N/S/W/E tiles.</p>
 <p>The configuration front-end is implemented by the gui/power-meter script. Bind it to a
@@ -3812,11 +3574,11 @@ in the build menu.</p>
 configuration page, but configures parameters relevant to the modded power meter building.</p>
 </div>
 <div class="section" id="steam-engine">
-<h2><a class="toc-backref" href="#id185">Steam Engine</a></h2>
+<h2><a class="toc-backref" href="#id179">Steam Engine</a></h2>
 <p>The steam-engine plugin detects custom workshops with STEAM_ENGINE in
 their token, and turns them into real steam engines.</p>
 <div class="section" id="id1">
-<h3><a class="toc-backref" href="#id186">Rationale</a></h3>
+<h3><a class="toc-backref" href="#id180">Rationale</a></h3>
 <p>The vanilla game contains only water wheels and windmills as sources of
 power, but windmills give relatively little power, and water wheels require
 flowing water, which must either be a real river and thus immovable and
@@ -3827,7 +3589,7 @@ it can be done just by combining existing features of the game engine
 in a new way with some glue code and a bit of custom logic.</p>
 </div>
 <div class="section" id="construction">
-<h3><a class="toc-backref" href="#id187">Construction</a></h3>
+<h3><a class="toc-backref" href="#id181">Construction</a></h3>
 <p>The workshop needs water as its input, which it takes via a
 passable floor tile below it, like usual magma workshops do.
 The magma version also needs magma.</p>
@@ -3851,7 +3613,7 @@ short axles that can be built later than both of the engines.</p>
 </div>
 </div>
 <div class="section" id="operation">
-<h3><a class="toc-backref" href="#id188">Operation</a></h3>
+<h3><a class="toc-backref" href="#id182">Operation</a></h3>
 <p>In order to operate the engine, queue the Stoke Boiler job (optionally
 on repeat). A furnace operator will come, possibly bringing a bar of fuel,
 and perform it. As a result, a &quot;boiling water&quot; item will appear
@@ -3882,7 +3644,7 @@ decrease it by further 4%, and also decrease the whole steam
 use rate by 10%.</p>
 </div>
 <div class="section" id="explosions">
-<h3><a class="toc-backref" href="#id189">Explosions</a></h3>
+<h3><a class="toc-backref" href="#id183">Explosions</a></h3>
 <p>The engine must be constructed using barrel, pipe and piston
 from fire-safe, or in the magma version magma-safe metals.</p>
 <p>During operation weak parts get gradually worn out, and
@@ -3891,7 +3653,7 @@ toppled during operation by a building destroyer, or a
 tantruming dwarf.</p>
 </div>
 <div class="section" id="save-files">
-<h3><a class="toc-backref" href="#id190">Save files</a></h3>
+<h3><a class="toc-backref" href="#id184">Save files</a></h3>
 <p>It should be safe to load and view engine-using fortresses
 from a DF version without DFHack installed, except that in such
 case the engines won't work. However actually making modifications
@@ -3902,7 +3664,7 @@ being generated.</p>
 </div>
 </div>
 <div class="section" id="add-spatter">
-<h2><a class="toc-backref" href="#id191">Add Spatter</a></h2>
+<h2><a class="toc-backref" href="#id185">Add Spatter</a></h2>
 <p>This plugin makes reactions with names starting with <tt class="docutils literal">SPATTER_ADD_</tt>
 produce contaminants on the items instead of improvements. The produced
 contaminants are immune to being washed away by water or destroyed by
