diff --git a/README.rst b/README.rst
index cac6eaf58..abd0abd97 100644
--- a/README.rst
+++ b/README.rst
@@ -155,6 +155,10 @@ Confirmed working DFusion plugins:
     * This is currently working only on Windows.
     * The game will be suspended while you're using dfusion. Don't panic when it doen't respond.
 
+drybuckets
+==========
+This utility removes all objects of type LIQUID_MISC:NONE and material WATER:NONE - that is, water stored in buckets.
+
 fastdwarf
 =========
 Makes your minions move at ludicrous speeds.
diff --git a/Readme.html b/Readme.html
index 96f92712d..822f0de09 100644
--- a/Readme.html
+++ b/Readme.html
@@ -356,62 +356,63 @@ access DF memory and allow for easier development of new tools.</p>
 <li><a class="reference internal" href="#confirmed-working-dfusion-plugins" id="id30">Confirmed working DFusion plugins:</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#fastdwarf" id="id31">fastdwarf</a></li>
-<li><a class="reference internal" href="#filltraffic" id="id32">filltraffic</a><ul>
-<li><a class="reference internal" href="#traffic-type-codes" id="id33">Traffic Type Codes:</a></li>
-<li><a class="reference internal" href="#other-options" id="id34">Other Options:</a></li>
-<li><a class="reference internal" href="#example" id="id35">Example:</a></li>
+<li><a class="reference internal" href="#drybuckets" id="id31">drybuckets</a></li>
+<li><a class="reference internal" href="#fastdwarf" id="id32">fastdwarf</a></li>
+<li><a class="reference internal" href="#filltraffic" id="id33">filltraffic</a><ul>
+<li><a class="reference internal" href="#traffic-type-codes" id="id34">Traffic Type Codes:</a></li>
+<li><a class="reference internal" href="#other-options" id="id35">Other Options:</a></li>
+<li><a class="reference internal" href="#example" id="id36">Example:</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#tiletraffic" id="id36">tiletraffic</a><ul>
-<li><a class="reference internal" href="#id4" id="id37">Traffic Type Codes:</a></li>
-<li><a class="reference internal" href="#id5" id="id38">Example:</a></li>
+<li><a class="reference internal" href="#tiletraffic" id="id37">tiletraffic</a><ul>
+<li><a class="reference internal" href="#id4" id="id38">Traffic Type Codes:</a></li>
+<li><a class="reference internal" href="#id5" id="id39">Example:</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#flows" id="id39">flows</a></li>
-<li><a class="reference internal" href="#getplants" id="id40">getplants</a><ul>
-<li><a class="reference internal" href="#id6" id="id41">Options</a></li>
+<li><a class="reference internal" href="#flows" id="id40">flows</a></li>
+<li><a class="reference internal" href="#getplants" id="id41">getplants</a><ul>
+<li><a class="reference internal" href="#id6" id="id42">Options</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#grow" id="id42">grow</a></li>
-<li><a class="reference internal" href="#extirpate" id="id43">extirpate</a><ul>
-<li><a class="reference internal" href="#id7" id="id44">Options</a></li>
+<li><a class="reference internal" href="#grow" id="id43">grow</a></li>
+<li><a class="reference internal" href="#extirpate" id="id44">extirpate</a><ul>
+<li><a class="reference internal" href="#id7" id="id45">Options</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#immolate" id="id45">immolate</a></li>
-<li><a class="reference internal" href="#liquids" id="id46">liquids</a></li>
-<li><a class="reference internal" href="#mode" id="id47">mode</a></li>
-<li><a class="reference internal" href="#forcepause" id="id48">forcepause</a></li>
-<li><a class="reference internal" href="#die" id="id49">die</a></li>
-<li><a class="reference internal" href="#probe" id="id50">probe</a></li>
-<li><a class="reference internal" href="#prospector" id="id51">prospector</a><ul>
-<li><a class="reference internal" href="#id8" id="id52">Options</a></li>
+<li><a class="reference internal" href="#immolate" id="id46">immolate</a></li>
+<li><a class="reference internal" href="#liquids" id="id47">liquids</a></li>
+<li><a class="reference internal" href="#mode" id="id48">mode</a></li>
+<li><a class="reference internal" href="#forcepause" id="id49">forcepause</a></li>
+<li><a class="reference internal" href="#die" id="id50">die</a></li>
+<li><a class="reference internal" href="#probe" id="id51">probe</a></li>
+<li><a class="reference internal" href="#prospector" id="id52">prospector</a><ul>
+<li><a class="reference internal" href="#id8" id="id53">Options</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#reveal" id="id53">reveal</a></li>
-<li><a class="reference internal" href="#unreveal" id="id54">unreveal</a></li>
-<li><a class="reference internal" href="#revtoggle" id="id55">revtoggle</a></li>
-<li><a class="reference internal" href="#revflood" id="id56">revflood</a></li>
-<li><a class="reference internal" href="#seedwatch" id="id57">seedwatch</a></li>
-<li><a class="reference internal" href="#ssense-stonesense" id="id58">ssense / stonesense</a></li>
-<li><a class="reference internal" href="#tubefill" id="id59">tubefill</a></li>
-<li><a class="reference internal" href="#vdig" id="id60">vdig</a></li>
-<li><a class="reference internal" href="#vdigx" id="id61">vdigx</a></li>
-<li><a class="reference internal" href="#expdig" id="id62">expdig</a><ul>
-<li><a class="reference internal" href="#patterns" id="id63">Patterns:</a></li>
-<li><a class="reference internal" href="#filters" id="id64">Filters:</a></li>
-<li><a class="reference internal" href="#examples" id="id65">Examples:</a></li>
+<li><a class="reference internal" href="#reveal" id="id54">reveal</a></li>
+<li><a class="reference internal" href="#unreveal" id="id55">unreveal</a></li>
+<li><a class="reference internal" href="#revtoggle" id="id56">revtoggle</a></li>
+<li><a class="reference internal" href="#revflood" id="id57">revflood</a></li>
+<li><a class="reference internal" href="#seedwatch" id="id58">seedwatch</a></li>
+<li><a class="reference internal" href="#ssense-stonesense" id="id59">ssense / stonesense</a></li>
+<li><a class="reference internal" href="#tubefill" id="id60">tubefill</a></li>
+<li><a class="reference internal" href="#vdig" id="id61">vdig</a></li>
+<li><a class="reference internal" href="#vdigx" id="id62">vdigx</a></li>
+<li><a class="reference internal" href="#expdig" id="id63">expdig</a><ul>
+<li><a class="reference internal" href="#patterns" id="id64">Patterns:</a></li>
+<li><a class="reference internal" href="#filters" id="id65">Filters:</a></li>
+<li><a class="reference internal" href="#examples" id="id66">Examples:</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#digcircle" id="id66">digcircle</a><ul>
-<li><a class="reference internal" href="#shape" id="id67">Shape:</a></li>
-<li><a class="reference internal" href="#action" id="id68">Action:</a></li>
-<li><a class="reference internal" href="#designation-types" id="id69">Designation types:</a></li>
-<li><a class="reference internal" href="#id9" id="id70">Examples:</a></li>
+<li><a class="reference internal" href="#digcircle" id="id67">digcircle</a><ul>
+<li><a class="reference internal" href="#shape" id="id68">Shape:</a></li>
+<li><a class="reference internal" href="#action" id="id69">Action:</a></li>
+<li><a class="reference internal" href="#designation-types" id="id70">Designation types:</a></li>
+<li><a class="reference internal" href="#id9" id="id71">Examples:</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#weather" id="id71">weather</a><ul>
-<li><a class="reference internal" href="#id10" id="id72">Options:</a></li>
+<li><a class="reference internal" href="#weather" id="id72">weather</a><ul>
+<li><a class="reference internal" href="#id10" id="id73">Options:</a></li>
 </ul>
 </li>
 </ul>
@@ -603,8 +604,12 @@ It also removes any and all 'down ramps' that can remain after a cave-in (you do
 </div>
 </div>
 </div>
+<div class="section" id="drybuckets">
+<h2><a class="toc-backref" href="#id31">drybuckets</a></h2>
+<p>This utility removes all objects of type LIQUID_MISC:NONE and material WATER:NONE - that is, water stored in buckets.</p>
+</div>
 <div class="section" id="fastdwarf">
-<h2><a class="toc-backref" href="#id31">fastdwarf</a></h2>
+<h2><a class="toc-backref" href="#id32">fastdwarf</a></h2>
 <p>Makes your minions move at ludicrous speeds.</p>
 <blockquote>
 <ul class="simple">
@@ -614,10 +619,10 @@ It also removes any and all 'down ramps' that can remain after a cave-in (you do
 </blockquote>
 </div>
 <div class="section" id="filltraffic">
-<h2><a class="toc-backref" href="#id32">filltraffic</a></h2>
+<h2><a class="toc-backref" href="#id33">filltraffic</a></h2>
 <p>Set traffic designations using flood-fill starting at the cursor.</p>
 <div class="section" id="traffic-type-codes">
-<h3><a class="toc-backref" href="#id33">Traffic Type Codes:</a></h3>
+<h3><a class="toc-backref" href="#id34">Traffic Type Codes:</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -634,7 +639,7 @@ It also removes any and all 'down ramps' that can remain after a cave-in (you do
 </table>
 </div>
 <div class="section" id="other-options">
-<h3><a class="toc-backref" href="#id34">Other Options:</a></h3>
+<h3><a class="toc-backref" href="#id35">Other Options:</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -649,15 +654,15 @@ It also removes any and all 'down ramps' that can remain after a cave-in (you do
 </table>
 </div>
 <div class="section" id="example">
-<h3><a class="toc-backref" href="#id35">Example:</a></h3>
+<h3><a class="toc-backref" href="#id36">Example:</a></h3>
 <p>'filltraffic H' - When used in a room with doors, it will set traffic to HIGH in just that room.</p>
 </div>
 </div>
 <div class="section" id="tiletraffic">
-<h2><a class="toc-backref" href="#id36">tiletraffic</a></h2>
+<h2><a class="toc-backref" href="#id37">tiletraffic</a></h2>
 <p>Set traffic designations for every single tile of the map (useful for resetting traffic designations).</p>
 <div class="section" id="id4">
-<h3><a class="toc-backref" href="#id37">Traffic Type Codes:</a></h3>
+<h3><a class="toc-backref" href="#id38">Traffic Type Codes:</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -674,19 +679,19 @@ It also removes any and all 'down ramps' that can remain after a cave-in (you do
 </table>
 </div>
 <div class="section" id="id5">
-<h3><a class="toc-backref" href="#id38">Example:</a></h3>
+<h3><a class="toc-backref" href="#id39">Example:</a></h3>
 <p>'filltraffic N' - Set traffic to 'normal' for all tiles.</p>
 </div>
 </div>
 <div class="section" id="flows">
-<h2><a class="toc-backref" href="#id39">flows</a></h2>
+<h2><a class="toc-backref" href="#id40">flows</a></h2>
 <p>A tool for checking how many tiles contain flowing liquids. If you suspect that your magma sea leaks into HFS, you can use this tool to be sure without revealing the map.</p>
 </div>
 <div class="section" id="getplants">
-<h2><a class="toc-backref" href="#id40">getplants</a></h2>
+<h2><a class="toc-backref" href="#id41">getplants</a></h2>
 <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>
 <div class="section" id="id6">
-<h3><a class="toc-backref" href="#id41">Options</a></h3>
+<h3><a class="toc-backref" href="#id42">Options</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -705,15 +710,15 @@ It also removes any and all 'down ramps' that can remain after a cave-in (you do
 </div>
 </div>
 <div class="section" id="grow">
-<h2><a class="toc-backref" href="#id42">grow</a></h2>
+<h2><a class="toc-backref" href="#id43">grow</a></h2>
 <p>Makes all saplings present on the map grow into trees (almost) instantly.</p>
 </div>
 <div class="section" id="extirpate">
-<h2><a class="toc-backref" href="#id43">extirpate</a></h2>
+<h2><a class="toc-backref" href="#id44">extirpate</a></h2>
 <p>A tool for getting rid of trees and shrubs. By default, it only kills a tree/shrub under the cursor.
 The plants are turned into ashes instantly.</p>
 <div class="section" id="id7">
-<h3><a class="toc-backref" href="#id44">Options</a></h3>
+<h3><a class="toc-backref" href="#id45">Options</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -729,11 +734,11 @@ The plants are turned into ashes instantly.</p>
 </div>
 </div>
 <div class="section" id="immolate">
-<h2><a class="toc-backref" href="#id45">immolate</a></h2>
+<h2><a class="toc-backref" href="#id46">immolate</a></h2>
 <p>Very similar to extirpate, but additionally sets the plants on fire. The fires can and <em>will</em> spread ;)</p>
 </div>
 <div class="section" id="liquids">
-<h2><a class="toc-backref" href="#id46">liquids</a></h2>
+<h2><a class="toc-backref" href="#id47">liquids</a></h2>
 <p>Allows adding magma, water and obsidian to the game. It replaces the normal dfhack command line and can't be used from a hotkey.
 For more information, refer to the command's internal help.</p>
 <div class="note">
@@ -743,7 +748,7 @@ temperatures (creating heat traps). You've been warned.</p>
 </div>
 </div>
 <div class="section" id="mode">
-<h2><a class="toc-backref" href="#id47">mode</a></h2>
+<h2><a class="toc-backref" href="#id48">mode</a></h2>
 <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>
 <div class="admonition-example admonition">
@@ -755,22 +760,22 @@ You just lost a fortress and gained an adventurer.</p>
 <p>I take no responsibility of anything that happens as a result of using this tool :P</p>
 </div>
 <div class="section" id="forcepause">
-<h2><a class="toc-backref" href="#id48">forcepause</a></h2>
+<h2><a class="toc-backref" href="#id49">forcepause</a></h2>
 <p>Forces DF to pause. This is useful when your FPS drops below 1 and you lose control of the game.</p>
 </div>
 <div class="section" id="die">
-<h2><a class="toc-backref" href="#id49">die</a></h2>
+<h2><a class="toc-backref" href="#id50">die</a></h2>
 <p>Instantly kills DF without saving.</p>
 </div>
 <div class="section" id="probe">
-<h2><a class="toc-backref" href="#id50">probe</a></h2>
+<h2><a class="toc-backref" href="#id51">probe</a></h2>
 <p>Can be used to determine tile properties like temperature.</p>
 </div>
 <div class="section" id="prospector">
-<h2><a class="toc-backref" href="#id51">prospector</a></h2>
+<h2><a class="toc-backref" href="#id52">prospector</a></h2>
 <p>Lists all available minerals on the map, how much of them there is and the z-levels where they can be found. By default, only processes the already discovered part of the map.</p>
 <div class="section" id="id8">
-<h3><a class="toc-backref" href="#id52">Options</a></h3>
+<h3><a class="toc-backref" href="#id53">Options</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -782,28 +787,28 @@ You just lost a fortress and gained an adventurer.</p>
 </div>
 </div>
 <div class="section" id="reveal">
-<h2><a class="toc-backref" href="#id53">reveal</a></h2>
+<h2><a class="toc-backref" href="#id54">reveal</a></h2>
 <p>This reveals the map. By default, HFS will remain hidden so that the demons don't spawn. You can use 'reveal hell' to reveal everything. With hell revealed, you won't be able to unpause until you hide the map again. If you really want to unpause with hell revealed, use 'reveal demons'.</p>
 </div>
 <div class="section" id="unreveal">
-<h2><a class="toc-backref" href="#id54">unreveal</a></h2>
+<h2><a class="toc-backref" href="#id55">unreveal</a></h2>
 <p>Reverts the effects of 'reveal'.</p>
 </div>
 <div class="section" id="revtoggle">
-<h2><a class="toc-backref" href="#id55">revtoggle</a></h2>
+<h2><a class="toc-backref" href="#id56">revtoggle</a></h2>
 <p>Switches between 'reveal' and 'unreveal'.</p>
 </div>
 <div class="section" id="revflood">
-<h2><a class="toc-backref" href="#id56">revflood</a></h2>
+<h2><a class="toc-backref" href="#id57">revflood</a></h2>
 <p>This command will hide the whole map and then reveal all the tiles that have a path to the in-game cursor.</p>
 </div>
 <div class="section" id="seedwatch">
-<h2><a class="toc-backref" href="#id57">seedwatch</a></h2>
+<h2><a class="toc-backref" href="#id58">seedwatch</a></h2>
 <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="ssense-stonesense">
-<h2><a class="toc-backref" href="#id58">ssense / stonesense</a></h2>
+<h2><a class="toc-backref" href="#id59">ssense / stonesense</a></h2>
 <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>
 <p>Compatible with Windows &gt; XP SP3 and most modern Linux distributions.</p>
 <p>All the data resides in the 'stonesense' directory.</p>
@@ -813,24 +818,24 @@ You just lost a fortress and gained an adventurer.</p>
 <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="tubefill">
-<h2><a class="toc-backref" href="#id59">tubefill</a></h2>
+<h2><a class="toc-backref" href="#id60">tubefill</a></h2>
 <p>Fills all the adamantine veins again. Veins that were empty will be filled in too, but might still trigger a demon invasion (this is a known bug).</p>
 </div>
 <div class="section" id="vdig">
-<h2><a class="toc-backref" href="#id60">vdig</a></h2>
+<h2><a class="toc-backref" href="#id61">vdig</a></h2>
 <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="vdigx">
-<h2><a class="toc-backref" href="#id61">vdigx</a></h2>
+<h2><a class="toc-backref" href="#id62">vdigx</a></h2>
 <p>A permanent alias for 'vdig x'.</p>
 </div>
 <div class="section" id="expdig">
-<h2><a class="toc-backref" href="#id62">expdig</a></h2>
+<h2><a class="toc-backref" href="#id63">expdig</a></h2>
 <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>
 <div class="section" id="patterns">
-<h3><a class="toc-backref" href="#id63">Patterns:</a></h3>
+<h3><a class="toc-backref" href="#id64">Patterns:</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -847,7 +852,7 @@ You just lost a fortress and gained an adventurer.</p>
 </table>
 </div>
 <div class="section" id="filters">
-<h3><a class="toc-backref" href="#id64">Filters:</a></h3>
+<h3><a class="toc-backref" href="#id65">Filters:</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -863,7 +868,7 @@ You just lost a fortress and gained an adventurer.</p>
 <p>After you have a pattern set, you can use 'expdig' to apply it again.</p>
 </div>
 <div class="section" id="examples">
-<h3><a class="toc-backref" href="#id65">Examples:</a></h3>
+<h3><a class="toc-backref" href="#id66">Examples:</a></h3>
 <ul class="simple">
 <li>'expdig diag5 hidden' = designate the diagonal 5 patter over all hidden tiles.</li>
 <li>'expdig' = apply last used pattern and filter.</li>
@@ -872,11 +877,11 @@ You just lost a fortress and gained an adventurer.</p>
 </div>
 </div>
 <div class="section" id="digcircle">
-<h2><a class="toc-backref" href="#id66">digcircle</a></h2>
+<h2><a class="toc-backref" href="#id67">digcircle</a></h2>
 <p>A command for easy designation of filled and hollow circles.
 It has several types of options.</p>
 <div class="section" id="shape">
-<h3><a class="toc-backref" href="#id67">Shape:</a></h3>
+<h3><a class="toc-backref" href="#id68">Shape:</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -891,7 +896,7 @@ It has several types of options.</p>
 </table>
 </div>
 <div class="section" id="action">
-<h3><a class="toc-backref" href="#id68">Action:</a></h3>
+<h3><a class="toc-backref" href="#id69">Action:</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -906,7 +911,7 @@ It has several types of options.</p>
 </table>
 </div>
 <div class="section" id="designation-types">
-<h3><a class="toc-backref" href="#id69">Designation types:</a></h3>
+<h3><a class="toc-backref" href="#id70">Designation types:</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -929,7 +934,7 @@ It has several types of options.</p>
 repeats with the last selected parameters.</p>
 </div>
 <div class="section" id="id9">
-<h3><a class="toc-backref" href="#id70">Examples:</a></h3>
+<h3><a class="toc-backref" href="#id71">Examples:</a></h3>
 <ul class="simple">
 <li>'digcircle filled 3' = Dig a filled circle with radius = 3.</li>
 <li>'digcircle' = Do it again.</li>
@@ -937,11 +942,11 @@ repeats with the last selected parameters.</p>
 </div>
 </div>
 <div class="section" id="weather">
-<h2><a class="toc-backref" href="#id71">weather</a></h2>
+<h2><a class="toc-backref" href="#id72">weather</a></h2>
 <p>Prints the current weather map by default.</p>
 <p>Also lets you change the current weather to 'clear sky', 'rainy' or 'snowing'.</p>
 <div class="section" id="id10">
-<h3><a class="toc-backref" href="#id72">Options:</a></h3>
+<h3><a class="toc-backref" href="#id73">Options:</a></h3>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />