diff --git a/.github/release_template.md b/.github/release_template.md
new file mode 100644
index 000000000..5ca0a1983
--- /dev/null
+++ b/.github/release_template.md
@@ -0,0 +1,64 @@
+#### Q: How do I download DFHack?
+**A:** Either add to your Steam library from our [Steam page](https://store.steampowered.com/app/2346660/DFHack) or scroll to the latest release on our [GitHub releases page](https://github.com/DFHack/dfhack/releases), expand the "Assets" list, and download the file for your platform (e.g. `dfhack-XX.XX-rX-Windows-64bit.zip`.
+
+-------------
+
+This release is compatible with all distributions of Dwarf Fortress: [Steam](https://store.steampowered.com/app/975370/Dwarf_Fortress/), [Itch](https://kitfoxgames.itch.io/dwarf-fortress), and [Classic](https://www.bay12games.com/dwarves/).
+
+- [Install DFHack from Steam](https://store.steampowered.com/app/2346660/DFHack)
+- [Manual install](https://docs.dfhack.org/en/stable/docs/Installing.html#installing)
+- [Quickstart guide (for players)](https://docs.dfhack.org/en/stable/docs/Quickstart.html#quickstart)
+- [Modding guide (for modders)](https://docs.dfhack.org/en/stable/docs/guides/modding-guide.html)
+
+Please report any issues (or feature requests) on the DFHack [GitHub issue tracker](https://github.com/DFHack/dfhack/issues). When reporting issues, please upload a zip file of your savegame and a zip file of your `mods` directory to the cloud and add links to the GitHub issue. Make sure your files are downloadable by "everyone with the link". We need your savegame to reproduce the problem and test the fix, and we need your active mods so we can load your savegame. Issues with savegames and mods attached get fixed first!
+
+Highlights
+----------------------------------
+
+<details>
+<summary>Highlight 1, Highlight 2</summary>
+
+### Highlight 1
+
+Demo screenshot/vidcap
+
+Text
+
+### Highlight 2
+
+Demo screenshot/vidcap
+
+Text
+
+</details>
+
+Announcements
+----------------------------------
+
+<details>
+<summary>Annc 1, PSAs</summary>
+
+### Annc 1
+
+Text
+
+### PSAs
+
+As always, remember that, just like the vanilla DF game, DFHack tools can also have bugs. It is a good idea to **save often and keep backups** of the forts that you care about.
+
+Many DFHack tools that worked in previous (pre-Steam) versions of DF have not been updated yet and are marked with the "unavailable" tag in their docs. If you try to run them, they will show a warning and exit immediately. You can run the command again to override the warning (though of course the tools may not work). We make no guarantees of reliability for the tools that are marked as "unavailable".
+
+The in-game interface for running DFHack commands (`gui/launcher`) will not show "unavailable" tools by default. You can still run them if you know their names, or you can turn on dev mode by hitting Ctrl-D while in `gui/launcher` and they will be added to the autocomplete list. Some tools do not compile yet and are not available at all, even when in dev mode.
+
+If you see a tool complaining about the lack of a cursor, know that it's referring to the **keyboard** cursor (which used to be the only real option in Dwarf Fortress). You can enable the keyboard cursor by entering mining mode or selecting the dump/forbid tool and hitting Alt-K (the DFHack keybinding for `toggle-kbd-cursor`). We're working on making DFHack tools more mouse-aware and accessible so this step isn't necessary in the future.
+
+</details>
+
+Generated release notes
+====================
+
+<details>
+<summary>New tools, fixes, and improvements</summary>
+
+%RELEASE_NOTES%
+</details>
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
new file mode 100644
index 000000000..aa5571e0b
--- /dev/null
+++ b/.github/workflows/build-linux.yml
@@ -0,0 +1,168 @@
+name: Build linux64
+
+on:
+  workflow_call:
+    inputs:
+      dfhack_ref:
+        type: string
+      scripts_ref:
+        type: string
+      structures_ref:
+        type: string
+      artifact-name:
+        type: string
+      append-date-and-hash:
+        type: boolean
+        default: false
+      cache-id:
+        type: string
+        default: ''
+      cache-readonly:
+        type: boolean
+        default: false
+      platform-files:
+        type: boolean
+        default: true
+      common-files:
+        type: boolean
+        default: true
+      docs:
+        type: boolean
+        default: false
+      html:
+        type: boolean
+        default: true
+      stonesense:
+        type: boolean
+        default: false
+      extras:
+        type: boolean
+        default: false
+      tests:
+        type: boolean
+        default: false
+      xml-dump-type-sizes:
+        type: boolean
+        default: false
+      gcc-ver:
+        type: string
+        default: "10"
+
+jobs:
+  build-linux64:
+    name: Build linux64
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Install basic build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build
+      - name: Install binary build dependencies
+        if: inputs.platform-files || inputs.xml-dump-type-sizes
+        run: |
+          sudo apt-get install \
+              ccache \
+              gcc-${{ inputs.gcc-ver }} \
+              g++-${{ inputs.gcc-ver }} \
+              libxml-libxslt-perl
+      - name: Install stonesense dependencies
+        if: inputs.stonesense
+        run: sudo apt-get install libgl-dev
+      - name: Install doc dependencies
+        if: inputs.docs
+        run: pip install 'sphinx<4.4.0'
+      - name: Clone DFHack
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ inputs.dfhack_ref && github.repository || 'DFHack/dfhack' }}
+          ref: ${{ inputs.dfhack_ref }}
+          submodules: true
+          fetch-depth: ${{ !inputs.platform-files && 1 || 0 }}
+      - name: Clone scripts
+        if: inputs.scripts_ref
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ inputs.scripts_ref && github.repository || 'DFHack/scripts' }}
+          ref: ${{ inputs.scripts_ref }}
+          path: scripts
+      - name: Clone structures
+        if: inputs.structures_ref
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ inputs.structures_ref && github.repository || 'DFHack/df-structures' }}
+          ref: ${{ inputs.structures_ref }}
+          path: library/xml
+      - name: Fetch ccache
+        if: inputs.platform-files
+        uses: actions/cache/restore@v3
+        with:
+          path: ~/.cache/ccache
+          key: linux-gcc-${{ inputs.gcc-ver }}-${{ inputs.cache-id }}-${{ github.sha }}
+          restore-keys: |
+            linux-gcc-${{ inputs.gcc-ver }}-${{ inputs.cache-id }}
+            linux-gcc-${{ inputs.gcc-ver }}
+      - name: Configure DFHack
+        env:
+          CC: gcc-${{ inputs.gcc-ver }}
+          CXX: g++-${{ inputs.gcc-ver }}
+        run: |
+          cmake \
+            -S . \
+            -B build \
+            -G Ninja \
+            -DCMAKE_INSTALL_PREFIX=build/image \
+            -DCMAKE_BUILD_TYPE=Release \
+            ${{ inputs.platform-files && '-DCMAKE_C_COMPILER_LAUNCHER=ccache' || '' }} \
+            ${{ inputs.platform-files && '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache' || '' }} \
+            -DBUILD_LIBRARY:BOOL=${{ inputs.platform-files }} \
+            -DBUILD_PLUGINS:BOOL=${{ inputs.platform-files }} \
+            -DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} \
+            -DBUILD_DEV_PLUGINS:BOOL=${{ inputs.extras }} \
+            -DBUILD_SIZECHECK:BOOL=${{ inputs.extras }} \
+            -DBUILD_SKELETON:BOOL=${{ inputs.extras }} \
+            -DBUILD_DOCS:BOOL=${{ inputs.docs }} \
+            -DBUILD_DOCS_NO_HTML:BOOL=${{ !inputs.html }} \
+            -DBUILD_TESTS:BOOL=${{ inputs.tests }} \
+            -DBUILD_XMLDUMP:BOOL=${{ inputs.xml-dump-type-sizes }} \
+            ${{ inputs.xml-dump-type-sizes && '-DINSTALL_XMLDUMP:BOOL=1' || ''}} \
+            -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} \
+            -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }}
+      - name: Build DFHack
+        run: ninja -C build install
+      - name: Run cpp tests
+        if: inputs.platform-files
+        run: ninja -C build test
+      - name: Finalize cache
+        if: inputs.platform-files
+        run: |
+          ccache --show-stats --verbose
+          ccache --max-size 40M
+          ccache --cleanup
+          ccache --max-size 500M
+          ccache --zero-stats
+      - name: Save ccache
+        if: inputs.platform-files && !inputs.cache-readonly
+        uses: actions/cache/save@v3
+        with:
+          path: ~/.cache/ccache
+          key: linux-gcc-${{ inputs.gcc-ver }}-${{ inputs.cache-id }}-${{ github.sha }}
+      - name: Format artifact name
+        if: inputs.artifact-name
+        id: artifactname
+        run: |
+          if test "false" = "${{ inputs.append-date-and-hash }}"; then
+            echo name=${{ inputs.artifact-name }} >> $GITHUB_OUTPUT
+          else
+            echo name=${{ inputs.artifact-name }}-$(date +%Y%m%d)-$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
+          fi
+      - name: Prep artifact
+        if: inputs.artifact-name
+        run: |
+          cd build/image
+          tar cjf ../../${{ steps.artifactname.outputs.name }}.tar.bz2 .
+      - name: Upload artifact
+        if: inputs.artifact-name
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.artifactname.outputs.name }}
+          path: ${{ steps.artifactname.outputs.name }}.tar.bz2
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
new file mode 100644
index 000000000..795482d80
--- /dev/null
+++ b/.github/workflows/build-windows.yml
@@ -0,0 +1,135 @@
+name: Build win64
+
+on:
+  workflow_call:
+    inputs:
+      dfhack_ref:
+        type: string
+      scripts_ref:
+        type: string
+      structures_ref:
+        type: string
+      artifact-name:
+        type: string
+      append-date-and-hash:
+        type: boolean
+        default: false
+      cache-id:
+        type: string
+        default: ''
+      cache-readonly:
+        type: boolean
+        default: false
+      platform-files:
+        type: boolean
+        default: true
+      common-files:
+        type: boolean
+        default: true
+      docs:
+        type: boolean
+        default: false
+      html:
+        type: boolean
+        default: true
+      stonesense:
+        type: boolean
+        default: false
+      tests:
+        type: boolean
+        default: false
+      xml-dump-type-sizes:
+        type: boolean
+        default: false
+      launchdf:
+        type: boolean
+        default: false
+
+
+jobs:
+  build-win64:
+    name: Build win64
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install ccache
+      - name: Clone DFHack
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ inputs.dfhack_ref && github.repository || 'DFHack/dfhack' }}
+          ref: ${{ inputs.dfhack_ref }}
+          submodules: true
+          fetch-depth: 0
+      - name: Clone scripts
+        if: inputs.scripts_ref
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ inputs.scripts_ref && github.repository || 'DFHack/scripts' }}
+          ref: ${{ inputs.scripts_ref }}
+          path: scripts
+      - name: Clone structures
+        if: inputs.structures_ref
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ inputs.structures_ref && github.repository || 'DFHack/df-structures' }}
+          ref: ${{ inputs.structures_ref }}
+          path: library/xml
+      - name: Get 3rd party SDKs
+        if: inputs.launchdf
+        uses: actions/checkout@v3
+        with:
+          repository: DFHack/3rdparty
+          ref: main
+          ssh-key: ${{ secrets.DFHACK_3RDPARTY_TOKEN }}
+          path: depends/steam
+      - name: Fetch ccache
+        if: inputs.platform-files
+        uses: actions/cache/restore@v3
+        with:
+          path: build/win64-cross/ccache
+          key: win-msvc-${{ inputs.cache-id }}-${{ github.sha }}
+          restore-keys: |
+            win-msvc-${{ inputs.cache-id }}
+            win-msvc
+      - name: Cross-compile
+        env:
+          CMAKE_EXTRA_ARGS: -DBUILD_LIBRARY=${{ inputs.platform-files }} -DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} -DBUILD_DOCS:BOOL=${{ inputs.docs }} -DBUILD_DOCS_NO_HTML:BOOL=${{ !inputs.html }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }} -DBUILD_TESTS:BOOL=${{ inputs.tests }} -DBUILD_XMLDUMP:BOOL=${{ inputs.xml-dump-type-sizes }} ${{ inputs.xml-dump-type-sizes && '-DINSTALL_XMLDUMP:BOOL=1' || '' }}
+        run: |
+          cd build
+          bash -x build-win64-from-linux.sh
+      - name: Finalize cache
+        run: |
+          cd build
+          ccache -d win64-cross/ccache --show-stats --verbose
+          ccache -d win64-cross/ccache --max-size 150M
+          ccache -d win64-cross/ccache --cleanup
+          ccache -d win64-cross/ccache --max-size 500M
+          ccache -d win64-cross/ccache --zero-stats
+      - name: Save ccache
+        if: inputs.platform-files && !inputs.cache-readonly
+        uses: actions/cache/save@v3
+        with:
+          path: build/win64-cross/ccache
+          key: win-msvc-${{ inputs.cache-id }}-${{ github.sha }}
+      - name: Format artifact name
+        if: inputs.artifact-name
+        id: artifactname
+        run: |
+          if test "false" = "${{ inputs.append-date-and-hash }}"; then
+            echo name=${{ inputs.artifact-name }} >> $GITHUB_OUTPUT
+          else
+            echo name=${{ inputs.artifact-name }}-$(date +%Y%m%d)-$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
+          fi
+      - name: Prep artifact
+        if: inputs.artifact-name
+        run: |
+          cd build/win64-cross/output
+          tar cjf ../../../${{ steps.artifactname.outputs.name }}.tar.bz2 .
+      - name: Upload artifact
+        if: inputs.artifact-name
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.artifactname.outputs.name }}
+          path: ${{ steps.artifactname.outputs.name }}.tar.bz2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7819cf2ec..10a6d332d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,190 +3,32 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    name: build (Linux, GCC ${{ matrix.gcc }}, ${{ matrix.plugins }} plugins)
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-        - ubuntu-18.04
-        gcc:
-        - 4.8
-        - 7
-        plugins:
-        - default
-        include:
-        - os: ubuntu-22.04
-          gcc: 12
-          plugins: all
-    steps:
-    - name: Set up Python 3
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install \
-            ccache \
-            libgtk2.0-0 \
-            libncursesw5 \
-            libsdl-image1.2-dev \
-            libsdl-ttf2.0-dev \
-            libsdl1.2-dev \
-            libxml-libxml-perl \
-            libxml-libxslt-perl \
-            lua5.3 \
-            ninja-build \
-            zlib1g-dev
-        pip install 'sphinx<4.4.0'
-    - name: Install GCC
-      run: |
-        sudo apt-get install gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
-    - name: Clone DFHack
-      uses: actions/checkout@v1
-      with:
-        fetch-depth: 0  # unlimited - we need past tags
-        submodules: true
-    - name: Set up environment
-      id: env_setup
-      run: |
-        DF_VERSION="$(sh ci/get-df-version.sh)"
-        echo "df_version=${DF_VERSION}" >> $GITHUB_OUTPUT
-        echo "DF_VERSION=${DF_VERSION}" >> $GITHUB_ENV
-        echo "DF_FOLDER=${HOME}/DF/${DF_VERSION}/df_linux" >> $GITHUB_ENV
-        echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV
-        #    - name: Fetch DF cache
-        #      uses: actions/cache@v3
-        #      with:
-        #        path: ~/DF
-        #        key: dfcache-${{ steps.env_setup.outputs.df_version }}-${{ hashFiles('ci/download-df.sh') }}
-    - name: Fetch ccache
-      uses: actions/cache@v3
-      with:
-        path: ~/.ccache
-        key: ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.ref_name }}-${{ github.sha }}
-        restore-keys: |
-          ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.ref_name }}
-          ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}
-          #    - name: Download DF
-          #      run: |
-          #        sh ci/download-df.sh
-    - name: Configure DFHack
-      env:
-        CC: gcc-${{ matrix.gcc }}
-        CXX: g++-${{ matrix.gcc }}
-      run: |
-        cmake \
-          -S . \
-          -B build-ci \
-          -G Ninja \
-          -DDFHACK_BUILD_ARCH=64 \
-          -DBUILD_TESTS:BOOL=ON \
-          -DBUILD_DEV_PLUGINS:BOOL=${{ matrix.plugins == 'all' }} \
-          -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \
-          -DBUILD_SKELETON:BOOL=${{ matrix.plugins == 'all' }} \
-          -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \
-          -DBUILD_SUPPORTED:BOOL=1 \
-          -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-          -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
-    - name: Build DFHack
-      run: |
-        ninja -C build-ci install
-        ccache --show-stats
-    - name: Run cpp unit tests
-      id: run_tests_cpp
-      run: |
-        ninja -C build-ci test
-        exit $?
-        #    - name: Run lua tests
-        #      id: run_tests_lua
-        #      run: |
-        #        export TERM=dumb
-        #        status=0
-        #        script -qe -c "python ci/run-tests.py --headless --keep-status \"$DF_FOLDER\"" || status=$((status + 1))
-        #        python ci/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt" || status=$((status + 2))
-        #        mkdir -p artifacts
-        #        cp "$DF_FOLDER"/test*.json "$DF_FOLDER"/*.log artifacts || status=$((status + 4))
-        #        exit $status
-        #    - name: Upload test artifacts
-        #      uses: actions/upload-artifact@v1
-        #      if: (success() || failure()) && steps.run_tests.outcome != 'skipped'
-        #      continue-on-error: true
-        #      with:
-        #        name: test-artifacts-${{ matrix.gcc }}
-        #        path: artifacts
-    - name: Clean up DF folder
-      # prevent DFHack-generated files from ending up in the cache
-      # (download-df.sh also removes them, this is just to save cache space)
-      if: success() || failure()
-      run: |
-        rm -rf "$DF_FOLDER"
+  test:
+    uses: ./.github/workflows/test.yml
+    with:
+      dfhack_ref: ${{ github.ref }}
+    secrets: inherit
+
+  package:
+    uses: ./.github/workflows/package.yml
+    with:
+      dfhack_ref: ${{ github.ref }}
+    secrets: inherit
 
   docs:
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Set up Python 3
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3
-    - name: Install dependencies
-      run: |
-        pip install 'sphinx'
-    - name: Clone DFHack
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-    - name: Build docs
-      run: |
-        sphinx-build -W --keep-going -j auto --color . docs/html
-    - name: Upload docs
-      uses: actions/upload-artifact@v1
-      with:
-        name: docs
-        path: docs/html
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      dfhack_ref: ${{ github.ref }}
+      platform-files: false
+      common-files: false
+      docs: true
+    secrets: inherit
 
   lint:
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Set up Python 3
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3
-    - name: Set up Ruby 2.7
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - name: Install Lua
-      run: |
-        sudo apt-get update
-        sudo apt-get install lua5.3
-    - name: Clone DFHack
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-        # don't need tags here
-    - name: Check whitespace
-      run: |
-        python ci/lint.py --git-only --github-actions
-    - name: Check Authors.rst
-      if: success() || failure()
-      run: |
-        python ci/authors-rst.py
-    - name: Check for missing documentation
-      if: success() || failure()
-      run: |
-        python ci/script-docs.py
-    - name: Check Lua syntax
-      if: success() || failure()
-      run: |
-        python ci/script-syntax.py --ext=lua --cmd="luac5.3 -p" --github-actions
-    - name: Check Ruby syntax
-      if: success() || failure()
-      run: |
-        python ci/script-syntax.py --ext=rb --cmd="ruby -c" --github-actions
+    uses: ./.github/workflows/lint.yml
+    with:
+      dfhack_ref: ${{ github.ref }}
+    secrets: inherit
 
   check-pr:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/buildmaster-rebuild.yml b/.github/workflows/buildmaster-rebuild.yml
deleted file mode 100644
index 5a1fe9504..000000000
--- a/.github/workflows/buildmaster-rebuild.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Buildmaster rebuild
-
-on:
-  workflow_dispatch:
-    inputs:
-      pull_request:
-        description: Pull request ID
-        type: string
-        required: true  # remove if we support commit rebuilds later
-
-jobs:
-  rebuild:
-    runs-on: ubuntu-latest
-    name: Trigger Buildmaster
-    steps:
-    - name: Set up Python 3
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3
-    - name: Install dependencies
-      run: |
-        pip install requests
-    - name: Clone DFHack
-      uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
-        submodules: false
-    - name: Run
-      env:
-        DFHACK_BUILDMASTER_WEBHOOK_URL: ${{ secrets.DFHACK_BUILDMASTER_WEBHOOK_URL }}
-        DFHACK_BUILDMASTER_WEBHOOK_SECRET: ${{ secrets.DFHACK_BUILDMASTER_WEBHOOK_SECRET }}
-        GITHUB_REPO: ${{ github.repository }}
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        python ci/buildmaster-rebuild-pr.py --pull-request ${{ github.event.inputs.pull_request }}
diff --git a/.github/workflows/clean-cache.yml b/.github/workflows/clean-cache.yml
new file mode 100644
index 000000000..e88e46c01
--- /dev/null
+++ b/.github/workflows/clean-cache.yml
@@ -0,0 +1,32 @@
+name: Clean up PR caches
+
+on:
+  workflow_call:
+  pull_request_target:
+    types:
+      - closed
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          REPO=${{ github.repository }}
+          BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
+
+          echo "Fetching list of cache keys"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1)
+
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR; do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
new file mode 100644
index 000000000..8ce6a3bfa
--- /dev/null
+++ b/.github/workflows/github-release.yml
@@ -0,0 +1,81 @@
+name: Deploy to GitHub
+
+on:
+  push:
+    tags:
+    - '*-r*'
+
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: Tag
+        required: true
+
+jobs:
+  package:
+    uses: ./.github/workflows/package.yml
+    with:
+      dfhack_ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }}
+      append-date-and-hash: false
+      cache-readonly: true
+      launchdf: true
+    secrets: inherit
+
+  create-update-release:
+    name: Draft GitHub release
+    needs: package
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - name: Install doc dependencies
+      run: pip install 'sphinx<4.4.0'
+    - name: Clone DFHack
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }}
+        submodules: true
+    - name: Get tag
+      id: gettag
+      run: |
+        TAG=$(git describe --tags --abbrev=0 --exact-match)
+        echo name="$TAG" >> $GITHUB_OUTPUT
+        echo type=$(echo "$TAG" | egrep 'r[0-9]+$' && echo "release" || echo "prerelease") >> $GITHUB_OUTPUT
+    - name: Generate release text
+      run: |
+        python docs/gen_changelog.py -a
+        CHANGELOG_FILE=docs/changelogs/${{ steps.gettag.outputs.name }}-github.txt
+        if ! test -f $CHANGELOG_FILE; then CHANGELOG_FILE=docs/changelogs/future-github.txt; fi
+        TOKEN_LINE=$(grep -Fhne '%RELEASE_NOTES%' .github/release_template.md | sed 's/:.*//')
+        head -n $((TOKEN_LINE - 1)) .github/release_template.md > release_body.md
+        CHANGELOG_LINES=$(wc -l <$CHANGELOG_FILE)
+        tail -n $((CHANGELOG_LINES - 4)) $CHANGELOG_FILE >> release_body.md
+        tail -n 1 .github/release_template.md >> release_body.md
+        cat release_body.md
+    - name: Stage release
+      uses: actions/download-artifact@v3
+    - name: Prep artifacts
+      run: |
+        mkdir artifacts
+        cd dfhack-windows64-build
+        tar xjf dfhack-windows64-build.tar.bz2
+        rm dfhack-windows64-build.tar.bz2
+        zip -qr ../artifacts/dfhack-${{ steps.gettag.outputs.name }}-Windows-64bit.zip .
+        cd ../dfhack-linux64-build
+        mv dfhack-linux64-build.tar.bz2 ../artifacts/dfhack-${{ steps.gettag.outputs.name }}-Linux-64bit.tar.bz2
+    - name: Create or update GitHub release
+      uses: ncipollo/release-action@v1
+      with:
+        artifacts: "artifacts/dfhack-*"
+        bodyFile: "release_body.md"
+        allowUpdates: true
+        artifactErrorsFailBuild: true
+        draft: true
+        name: "DFHack ${{ steps.gettag.outputs.name }}"
+        omitBodyDuringUpdate: true
+        omitDraftDuringUpdate: true
+        omitNameDuringUpdate: true
+        omitPrereleaseDuringUpdate: true
+        prerelease: ${{ steps.gettag.outputs.type == 'prerelease' }}
+        replacesArtifacts: true
+        tag: ${{ steps.gettag.outputs.name }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000..77be37f37
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,44 @@
+name: Lint
+
+on:
+  workflow_call:
+    inputs:
+      dfhack_ref:
+        type: string
+      scripts_ref:
+        type: string
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install Lua
+      run: |
+        sudo apt-get update
+        sudo apt-get install lua5.3
+    - name: Clone DFHack
+      uses: actions/checkout@v3
+      with:
+        repository: ${{ inputs.dfhack_ref && github.repository || 'DFHack/dfhack' }}
+        ref: ${{ inputs.dfhack_ref }}
+    - name: Get scripts submodule ref
+      if: '!inputs.scripts_ref'
+      id: scriptssubmoduleref
+      run: echo ref=$(git submodule | fgrep scripts | cut -c2-41) >> $GITHUB_OUTPUT
+    - name: Clone scripts
+      uses: actions/checkout@v3
+      with:
+        repository: ${{ inputs.scripts_ref && github.repository || 'DFHack/scripts' }}
+        ref: ${{ inputs.scripts_ref || steps.scriptssubmoduleref.outputs.ref }}
+        path: scripts
+    - name: Check whitespace
+      run: python ci/lint.py --git-only --github-actions
+    - name: Check Authors.rst
+      if: always()
+      run: python ci/authors-rst.py
+    - name: Check for missing documentation
+      if: always()
+      run: python ci/script-docs.py
+    - name: Check Lua syntax
+      if: always()
+      run: python ci/script-syntax.py --ext=lua --cmd="luac5.3 -p" --github-actions
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
new file mode 100644
index 000000000..733f567cf
--- /dev/null
+++ b/.github/workflows/package.yml
@@ -0,0 +1,52 @@
+name: Package
+
+on:
+  workflow_call:
+    inputs:
+      dfhack_ref:
+        type: string
+      scripts_ref:
+        type: string
+      structures_ref:
+        type: string
+      append-date-and-hash:
+        type: boolean
+        default: true
+      cache-readonly:
+        type: boolean
+        default: false
+      launchdf:
+        type: boolean
+        default: false
+
+jobs:
+  package-win64:
+    name: Windows
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      dfhack_ref: ${{ inputs.dfhack_ref }}
+      scripts_ref: ${{ inputs.scripts_ref }}
+      structures_ref: ${{ inputs.structures_ref }}
+      artifact-name: dfhack-windows64-build
+      append-date-and-hash: ${{ inputs.append-date-and-hash }}
+      cache-id: release
+      cache-readonly: ${{ inputs.cache-readonly }}
+      stonesense: true
+      docs: true
+      launchdf: ${{ inputs.launchdf }}
+    secrets: inherit
+
+  package-linux:
+    name: Linux
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      dfhack_ref: ${{ inputs.dfhack_ref }}
+      scripts_ref: ${{ inputs.scripts_ref }}
+      structures_ref: ${{ inputs.structures_ref }}
+      artifact-name: dfhack-linux64-build
+      append-date-and-hash: ${{ inputs.append-date-and-hash }}
+      cache-id: release
+      cache-readonly: ${{ inputs.cache-readonly }}
+      stonesense: true
+      docs: true
+    secrets: inherit
diff --git a/.github/workflows/steam-deploy.yml b/.github/workflows/steam-deploy.yml
new file mode 100644
index 000000000..d4c4d9e8a
--- /dev/null
+++ b/.github/workflows/steam-deploy.yml
@@ -0,0 +1,92 @@
+name: Deploy to Steam
+
+on:
+  push:
+    tags:
+    - '*-r*'
+
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: Branch or commit hash
+        type: string
+        required: true
+        default: develop
+      version:
+        description: Version or build description
+        type: string
+        required: true
+      release_channel:
+        description: Steam release channel
+        type: string
+        required: true
+        default: staging
+
+jobs:
+  depot-common:
+    name: Common depot files
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      artifact-name: common-depot
+      dfhack_ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }}
+      platform-files: false
+      docs: true
+      stonesense: true
+    secrets: inherit
+
+  depot-win64:
+    name: Windows depot files
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      artifact-name: win64-depot
+      dfhack_ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }}
+      cache-id: release
+      cache-readonly: true
+      common-files: false
+      stonesense: true
+      launchdf: true
+    secrets: inherit
+
+  depot-linux64:
+    name: Linux depot files
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      artifact-name: linux64-depot
+      dfhack_ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }}
+      cache-id: release
+      cache-readonly: true
+      common-files: false
+      stonesense: true
+    secrets: inherit
+
+  deploy-to-steam:
+    name: Deploy to Steam
+    needs:
+    - depot-common
+    - depot-win64
+    - depot-linux64
+    runs-on: ubuntu-latest
+    concurrency: steam
+    steps:
+    - name: Download depot files
+      uses: actions/download-artifact@v3
+    - name: Stage depot files
+      run: |
+        for name in common win64 linux64; do
+          cd ${name}-depot
+          tar xjf ${name}-depot.tar.bz2
+          rm ${name}-depot.tar.bz2
+          cd ..
+        done
+    - name: Steam deploy
+      uses: game-ci/steam-deploy@v3
+      with:
+        username: ${{ secrets.STEAM_USERNAME }}
+        configVdf: ${{ secrets.STEAM_CONFIG_VDF}}
+        appId: 2346660
+        buildDescription: ${{ github.event.inputs && github.event.inputs.version || github.ref_name }}
+        rootPath: .
+        depot1Path: common-depot
+        depot2Path: win64-depot
+        depot3Path: linux64-depot
+        releaseBranch: ${{ github.event.inputs && github.event.inputs.release_channel || 'staging' }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..6255219e6
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,146 @@
+name: Test
+
+on:
+  workflow_call:
+    inputs:
+      dfhack_ref:
+        type: string
+      scripts_ref:
+        type: string
+      structures_ref:
+        type: string
+
+jobs:
+  build-windows:
+    name: Windows MSVC
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      dfhack_ref: ${{ inputs.dfhack_ref }}
+      scripts_ref: ${{ inputs.scripts_ref }}
+      structures_ref: ${{ inputs.structures_ref }}
+      artifact-name: test-msvc
+      cache-id: test
+      docs: true
+      html: false
+      tests: true
+
+  build-linux:
+    name: Linux gcc-${{ matrix.gcc }}
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      dfhack_ref: ${{ inputs.dfhack_ref }}
+      scripts_ref: ${{ inputs.scripts_ref }}
+      structures_ref: ${{ inputs.structures_ref }}
+      artifact-name: test-gcc-${{ matrix.gcc }}
+      cache-id: test
+      stonesense: ${{ matrix.plugins == 'all' }}
+      extras: ${{ matrix.plugins == 'all' }}
+      docs: true
+      html: false
+      tests: true
+      gcc-ver: ${{ matrix.gcc }}
+    secrets: inherit
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - gcc: 10
+          plugins: "default"
+        - gcc: 12
+          plugins: "all"
+
+  run-tests:
+    name: Test (${{ matrix.os }}, ${{ matrix.compiler }}, ${{ matrix.plugins }} plugins, ${{ matrix.config }} config)
+    needs:
+    - build-windows
+    - build-linux
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows
+            compiler: msvc
+            plugins: "default"
+            config: "default"
+          - os: windows
+            compiler: msvc
+            plugins: "default"
+            config: "empty"
+          - os: ubuntu
+            compiler: gcc-10
+            plugins: "default"
+            config: "default"
+          - os: ubuntu
+            compiler: gcc-12
+            plugins: "all"
+            config: "default"
+    steps:
+    - name: Set env
+      shell: bash
+      run: echo "DF_FOLDER=DF" >> $GITHUB_ENV
+    - name: Install dependencies
+      if: matrix.os == 'ubuntu'
+      run: |
+        sudo apt-get update
+        sudo apt-get install \
+          libsdl2-2.0-0 \
+          libsdl2-image-2.0-0
+    - name: Clone DFHack
+      uses: actions/checkout@v3
+      with:
+        repository: ${{ inputs.dfhack_ref && github.repository || 'DFHack/dfhack' }}
+        ref: ${{ inputs.dfhack_ref }}
+    - name: Detect DF version
+      shell: bash
+      run: echo DF_VERSION="$(sh ci/get-df-version.sh)" >> $GITHUB_ENV
+    - name: Fetch DF cache
+      id: restore-df
+      uses: actions/cache/restore@v3
+      with:
+        path: ${{ env.DF_FOLDER }}
+        key: df-${{ matrix.os }}-${{ env.DF_VERSION }}-${{ hashFiles('ci/download-df.sh') }}
+    - name: Download DF
+      if: steps.restore-df.outputs.cache-hit != 'true'
+      run: sh ci/download-df.sh ${{ env.DF_FOLDER }} ${{ matrix.os }} ${{ env.DF_VERSION }}
+    - name: Save DF cache
+      if: steps.restore-df.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v3
+      with:
+        path: ${{ env.DF_FOLDER }}
+        key: df-${{ matrix.os }}-${{ env.DF_VERSION }}-${{ hashFiles('ci/download-df.sh') }}
+    - name: Install blank DFHack init scripts
+      if: matrix.config == 'empty'
+      shell: bash
+      run: |
+        mkdir -p ${{ env.DF_FOLDER }}/dfhack-config/init
+        cd data/dfhack-config/init
+        for fname in *.init; do touch ../../../${{ env.DF_FOLDER }}/dfhack-config/init/$fname; done
+    - name: Download DFHack
+      uses: actions/download-artifact@v3
+      with:
+        name: test-${{ matrix.compiler }}
+    - name: Install DFHack
+      shell: bash
+      run: tar xjf test-${{ matrix.compiler }}.tar.bz2 -C ${{ env.DF_FOLDER }}
+    - name: Start X server
+      if: matrix.os == 'ubuntu'
+      run: Xvfb :0 -screen 0 1600x1200x24 &
+    - name: Run lua tests
+      timeout-minutes: 10
+      env:
+        DISPLAY: :0
+        TERM: xterm-256color
+      run: python ci/run-tests.py --keep-status "${{ env.DF_FOLDER }}"
+    - name: Check RPC interface
+      run: python ci/check-rpc.py "${{ env.DF_FOLDER }}/dfhack-rpc.txt"
+    - name: Upload test artifacts
+      uses: actions/upload-artifact@v3
+      if: always()
+      continue-on-error: true
+      with:
+        name: test-output-${{ matrix.compiler }}-${{ matrix.plugins }}_plugins-${{ matrix.config }}_config
+        path: |
+          ${{ env.DF_FOLDER }}/dfhack-rpc.txt
+          ${{ env.DF_FOLDER }}/test*.json
+          ${{ env.DF_FOLDER }}/*.log
diff --git a/.gitignore b/.gitignore
index 9b78fa31f..5b4c7f6fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # linux backup files
 *~
 
-#Kdevelop project files
+# Kdevelop project files
 *.kdev4
 .kdev4
 
@@ -9,7 +9,6 @@
 build*/
 nix
 buntu
-build/VC2010
 
 #except for the real one
 !build/
@@ -37,6 +36,7 @@ build/lua
 build/bin
 build/depends
 build/library
+build/package
 build/plugins
 build/scripts
 build/install_manifest.txt
@@ -70,7 +70,7 @@ tags
 # Mac OS X .DS_Store files
 .DS_Store
 
-#VS is annoying about this one.
+# VS is annoying about this one.
 /build/win64/DF_PATH.txt
 /build/win32/DF_PATH.txt
 /.vs
@@ -80,3 +80,7 @@ tags
 
 # external plugins
 /plugins/CMakeLists.custom.txt
+
+# 3rd party downloads
+depends/steam
+depends/SDL2
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6b23e9cdd..45d51dc30 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ ci:
 repos:
 # shared across repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.5.0
   hooks:
     - id: check-added-large-files
     - id: check-case-conflict
@@ -20,11 +20,11 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.19.2
+  rev: 0.27.1
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.3.1
+  rev: v1.5.4
   hooks:
     - id: forbid-tabs
       exclude_types:
@@ -39,6 +39,6 @@ repos:
       name: Check Authors.rst
       language: python
       entry: python3 ci/authors-rst.py
-      files: docs/Authors\.rst
+      files: docs/about/Authors\.rst
       pass_filenames: false
-exclude: '^(depends/|data/.*\.json$|.*\.diff$)'
+exclude: '^(depends/|data/.*\.json$|.*\.diff$|.*\.dfstock$)'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fae14970..c7f2ec1ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,21 +1,19 @@
 # main project file. use it from a build sub-folder, see COMPILE for details
 
 ## some generic CMake magic
-cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
 cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0074 NEW)
 project(dfhack)
 
-if("${CMAKE_GENERATOR}" STREQUAL Ninja)
-    if("${CMAKE_VERSION}" VERSION_LESS 3.9)
-        message(WARNING "You are using an old version of CMake (${CMAKE_VERSION}) with Ninja. This may result in ninja errors - see docs/Compile.rst for more details. Upgrading your CMake version is recommended.")
-    endif()
-endif()
+# set up versioning.
+set(DF_VERSION "50.11")
+set(DFHACK_RELEASE "r2")
+set(DFHACK_PRERELEASE FALSE)
 
-if(NOT("${CMAKE_VERSION}" VERSION_LESS 3.12))
-    # make ZLIB_ROOT work in CMake >= 3.12
-    # https://cmake.org/cmake/help/git-stage/policy/CMP0074.html
-    cmake_policy(SET CMP0074 NEW)
-endif()
+set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
+set(DFHACK_ABI_VERSION 1)
+set(DFHACK_BUILD_ID "" CACHE STRING "Build ID (should be specified on command line)")
 
 # Set up build types
 if(CMAKE_CONFIGURATION_TYPES)
@@ -32,14 +30,16 @@ else(CMAKE_CONFIGURATION_TYPES)
 endif(CMAKE_CONFIGURATION_TYPES)
 
 option(BUILD_DOCS "Choose whether to build the documentation (requires python and Sphinx)." OFF)
+option(BUILD_DOCS_NO_HTML "Don't build the HTML docs, only the in-game docs." OFF)
 option(REMOVE_SYMBOLS_FROM_DF_STUBS "Remove debug symbols from DF stubs. (Reduces libdfhack size to about half but removes a few useful symbols)" ON)
 
 macro(CHECK_GCC compiler_path)
     execute_process(COMMAND ${compiler_path} -dumpversion OUTPUT_VARIABLE GCC_VERSION_OUT)
     string(STRIP "${GCC_VERSION_OUT}" GCC_VERSION_OUT)
-    if(${GCC_VERSION_OUT} VERSION_LESS "4.8")
-        message(SEND_ERROR "${compiler_path} version ${GCC_VERSION_OUT} cannot be used - use GCC 4.8 or later")
-    elseif(${GCC_VERSION_OUT} VERSION_GREATER "4.9.9")
+    if(${GCC_VERSION_OUT} VERSION_LESS "10")
+        message(SEND_ERROR "${compiler_path} version ${GCC_VERSION_OUT} cannot be used - use GCC 10 or later")
+        # TODO: this may need to be removed when DF linux actually comes out
+        # TODO: and we can test
         # GCC 5 changes ABI name mangling to enable C++11 changes.
         # This must be disabled to enable linking against DF.
         # http://developerblog.redhat.com/2015/02/05/gcc5-and-the-c11-abi/
@@ -61,13 +61,15 @@ if(UNIX)
 endif()
 
 if(WIN32)
-    if((NOT MSVC) OR (MSVC_VERSION LESS 1930) OR (MSVC_VERSION GREATER 1934))
-        message(SEND_ERROR "MSVC 2022 is required")
+    if(NOT MSVC)
+        message(SEND_ERROR "No MSVC found! MSVC 2022 version 1930 to 1937 is required.")
+    elseif((MSVC_VERSION LESS 1930) OR (MSVC_VERSION GREATER 1937))
+        message(SEND_ERROR "MSVC 2022 version 1930 to 1937 is required, Version Found: ${MSVC_VERSION}")
     endif()
 endif()
 
-# Ask for C++11 standard from compilers
-set(CMAKE_CXX_STANDARD 11)
+# Ask for C++-20 standard from compilers
+set(CMAKE_CXX_STANDARD 20)
 # Require the standard support from compilers.
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # Use only standard c++ to keep code portable
@@ -121,7 +123,7 @@ elseif("${DFHACK_BUILD_ARCH}" STREQUAL "64")
     set(DFHACK_SETARCH "x86_64")
     add_definitions(-DDFHACK64)
 else()
-    message(SEND_ERROR "Invalid build architecture (should be 32/64): ${DFHACK_BUILD_ARCH}")
+    message(SEND_ERROR "Invalid build architecture (should be 32 or 64): ${DFHACK_BUILD_ARCH}")
 endif()
 
 if(CMAKE_CROSSCOMPILING)
@@ -132,14 +134,8 @@ endif()
 find_package(Perl REQUIRED)
 
 # set up folder structures for IDE solutions
-# MSVC Express won't load solutions that use this. It also doesn't include MFC supported
-# Check for MFC!
-find_package(MFC QUIET)
-if(MFC_FOUND OR (NOT MSVC))
-    option(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." ON)
-else()
-    option(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." OFF)
-endif()
+# checking for msvc express is meaningless now, all available editions of msvc support folder groupings
+option(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." ON)
 
 if(CMAKE_USE_FOLDERS)
     set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -186,30 +182,24 @@ endif()
 if(NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl
     OR NOT EXISTS ${dfhack_SOURCE_DIR}/scripts/CMakeLists.txt
     OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/clsocket/CMakeLists.txt
+    OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/jsoncpp-sub/CMakeLists.txt
     OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/libexpat/expat/CMakeLists.txt
     OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/libzip/CMakeLists.txt
     OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/xlsxio/CMakeLists.txt
+    OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/googletest/CMakeLists.txt
     OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/luacov/src
 )
-    message(SEND_ERROR "One or more required submodules could not be found! Run 'git submodule update --init' from the root DFHack directory. (See the section 'Getting the Code' in docs/Compile.rst)")
+    message(SEND_ERROR "One or more required submodules could not be found! Run 'git submodule update --init' from the root DFHack directory. (See the section 'Getting the Code' in docs/dev/compile/Compile.rst)")
 endif()
 
-# set up versioning.
-set(DF_VERSION "50.04")
-set(DFHACK_RELEASE "alpha0")
-set(DFHACK_PRERELEASE TRUE)
-
-set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
-
-set(DFHACK_ABI_VERSION 1)
-
-set(DFHACK_BUILD_ID "" CACHE STRING "Build ID (should be specified on command line)")
+# dfhack data goes here:
+set(DFHACK_DATA_DESTINATION hack)
 
 ## where to install things (after the build is done, classic 'make install' or package structure)
 # the dfhack libraries will be installed here:
 if(UNIX)
     # put the lib into DF/hack
-    set(DFHACK_LIBRARY_DESTINATION hack)
+    set(DFHACK_LIBRARY_DESTINATION ${DFHACK_DATA_DESTINATION})
 else()
     # windows is crap, therefore we can't do nice things with it. leave the libs on a nasty pile...
     set(DFHACK_LIBRARY_DESTINATION .)
@@ -217,37 +207,27 @@ endif()
 
 # external tools will be installed here:
 set(DFHACK_BINARY_DESTINATION .)
-# dfhack data goes here:
-set(DFHACK_DATA_DESTINATION hack)
 # plugin libs go here:
-set(DFHACK_PLUGIN_DESTINATION hack/plugins)
-# dfhack header files go here:
-set(DFHACK_INCLUDES_DESTINATION hack/include)
+set(DFHACK_PLUGIN_DESTINATION ${DFHACK_DATA_DESTINATION}/plugins)
 # dfhack lua files go here:
-set(DFHACK_LUA_DESTINATION hack/lua)
-# the windows .lib file goes here:
-set(DFHACK_DEVLIB_DESTINATION hack)
+set(DFHACK_LUA_DESTINATION ${DFHACK_DATA_DESTINATION}/lua)
 
 # user documentation goes here:
-set(DFHACK_USERDOC_DESTINATION hack)
-# developer documentation goes here:
-set(DFHACK_DEVDOC_DESTINATION hack)
+set(DFHACK_USERDOC_DESTINATION ${DFHACK_DATA_DESTINATION})
 
 # some options for the user/developer to play with
-option(BUILD_LIBRARY "Build the library that goes into DF." ON)
-option(BUILD_PLUGINS "Build the plugins." ON)
+option(BUILD_LIBRARY "Build the DFHack library." ON)
+option(BUILD_PLUGINS "Build the DFHack plugins." ON)
+option(INSTALL_SCRIPTS "Install DFHack scripts." ON)
+option(INSTALL_DATA_FILES "Install DFHack platform independent files." ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 if(UNIX)
     ## flags for GCC
     # default to hidden symbols
-    # build 32bit
     # ensure compatibility with older CPUs
-    # enable C++11 features
     add_definitions(-DLINUX_BUILD)
-    add_definitions(-D_GLIBCXX_USE_C99)
-    set(GCC_COMMON_FLAGS "-fvisibility=hidden -mtune=generic -Wall -Werror")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g")
+    set(GCC_COMMON_FLAGS "-fvisibility=hidden -mtune=generic -Wall -Werror -Wl,--disable-new-dtags")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COMMON_FLAGS}")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCC_COMMON_FLAGS}")
     if(DFHACK_BUILD_64)
@@ -258,7 +238,7 @@ if(UNIX)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i686")
     endif()
     string(REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_INSTALL_RPATH "hack")
+    set(CMAKE_INSTALL_RPATH ${DFHACK_LIBRARY_DESTINATION})
 elseif(MSVC)
     # for msvc, tell it to always use 8-byte pointers to member functions to avoid confusion
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vmg /vmm /MP")
@@ -280,30 +260,50 @@ elseif(WIN32)
     add_definitions(-DWIN32)
 endif()
 
-#### download depends ####
+#### dependencies ####
+
+# fix for pyenv: default to `python3` before `python3.x`
+set(Python_FIND_UNVERSIONED_NAMES FIRST)
 
 include(CMake/DownloadFile.cmake)
 
 if(WIN32)
-    # Download zlib on Windows
-    set(ZLIB_DOWNLOAD_DIR ${dfhack_SOURCE_DIR}/depends/zlib/lib/win${DFHACK_BUILD_ARCH})
-    download_file("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/win64-zlib.lib"
-        ${ZLIB_DOWNLOAD_DIR}/zlib.lib
-        "a3b2fc6b68efafa89b0882e354fc8418")
-
-    # Move zlib to the build folder so possible 32 and 64-bit builds
-    # in the same source tree don't conflict
-    file(COPY ${dfhack_SOURCE_DIR}/depends/zlib
-        DESTINATION ${CMAKE_BINARY_DIR}/depends/)
-    file(COPY ${ZLIB_DOWNLOAD_DIR}/zlib.lib
-        DESTINATION ${CMAKE_BINARY_DIR}/depends/zlib/lib/)
-
-    # Do the same for SDLreal.dll
-    # (DFHack doesn't require this at build time, so no need to move it to the build folder)
-    set(SDLREAL_DOWNLOAD_DIR ${dfhack_SOURCE_DIR}/package/windows/win${DFHACK_BUILD_ARCH})
-    download_file("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/win64-SDL.dll"
-        ${SDLREAL_DOWNLOAD_DIR}/SDLreal.dll
-        "1ae242c4b94cb03756a1288122a66faf")
+    set(ZLIB_FILE zlib.lib)
+    set(ZLIB_PATH ${dfhack_SOURCE_DIR}/depends/zlib/)
+    set(ZLIB_MD5 a3b2fc6b68efafa89b0882e354fc8418)
+    download_file("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/win64-${ZLIB_FILE}"
+        ${ZLIB_PATH}lib/${ZLIB_FILE}
+        ${ZLIB_MD5})
+    set(ZLIB_ROOT ${ZLIB_PATH})
+else()
+    # Rescan for pthread and zlib if the build arch changed
+    if(NOT "${DFHACK_BUILD_ARCH}" STREQUAL "${DFHACK_BUILD_ARCH_PREV}")
+        unset(ZLIB_LIBRARY CACHE)
+        unset(CMAKE_HAVE_PTHREAD_H CACHE)
+    endif()
+
+    if(NOT APPLE AND DFHACK_BUILD_32)
+        set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
+    endif()
+endif()
+find_package(ZLIB REQUIRED)
+include_directories(${ZLIB_INCLUDE_DIRS})
+
+if(BUILD_LIBRARY)
+    # Download SDL release and extract into depends in the build dir
+    # all we need are the header files (including generated headers), so the same release package
+    # will work for all platforms
+    # (the above statement is untested for OSX)
+    set(SDL_VERSION 2.26.2)
+    set(SDL_ZIP_MD5 574daf26d48de753d0b1e19823c9d8bb)
+    set(SDL_ZIP_FILE SDL2-devel-${SDL_VERSION}-VC.zip)
+    set(SDL_ZIP_PATH ${dfhack_SOURCE_DIR}/depends/SDL2/)
+    download_file("https://github.com/libsdl-org/SDL/releases/download/release-${SDL_VERSION}/${SDL_ZIP_FILE}"
+        ${SDL_ZIP_PATH}${SDL_ZIP_FILE}
+        ${SDL_ZIP_MD5})
+    file(ARCHIVE_EXTRACT INPUT ${SDL_ZIP_PATH}${SDL_ZIP_FILE}
+        DESTINATION ${SDL_ZIP_PATH})
+    include_directories(${SDL_ZIP_PATH}/SDL2-${SDL_VERSION}/include)
 endif()
 
 if(APPLE)
@@ -364,26 +364,6 @@ endif()
 
 #### expose depends ####
 
-if(UNIX)
-    # Rescan for pthread and zlib if the build arch changed
-    if(NOT "${DFHACK_BUILD_ARCH}" STREQUAL "${DFHACK_BUILD_ARCH_PREV}")
-        unset(ZLIB_LIBRARY CACHE)
-        unset(CMAKE_HAVE_PTHREAD_H CACHE)
-    endif()
-endif()
-
-# find and make available libz
-if(NOT UNIX) # Windows
-    # zlib is in here so 32-bit and 64-bit builds in the same source tree are possible
-    set(ZLIB_ROOT ${CMAKE_BINARY_DIR}/depends/zlib/)
-else()
-    if(NOT APPLE AND DFHACK_BUILD_32)
-        # 32-bit Linux
-        set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
-    endif()
-endif()
-
-find_package(ZLIB REQUIRED)
 include_directories(depends/protobuf)
 include_directories(depends/lua/include)
 include_directories(depends/md5)
@@ -405,17 +385,19 @@ endif()
 
 include_directories(depends/lodepng)
 include_directories(depends/tthread)
-include_directories(${ZLIB_INCLUDE_DIRS})
 include_directories(depends/clsocket/src)
 include_directories(depends/xlsxio/include)
-add_subdirectory(depends)
+
+if(BUILD_LIBRARY)
+    add_subdirectory(depends)
+endif()
 
 # Testing with CTest
 macro(dfhack_test name files)
-if(UNIX AND NOT APPLE) # remove this once our MSVC build env has been updated
+if(BUILD_LIBRARY AND UNIX AND NOT APPLE) # remove this once our MSVC build env has been updated
     add_executable(${name} ${files})
     target_include_directories(${name} PUBLIC depends/googletest/googletest/include)
-    target_link_libraries(${name} dfhack gtest SDL)
+    target_link_libraries(${name} dfhack gtest)
     add_test(NAME ${name} COMMAND ${name})
 endif()
 endmacro()
@@ -427,24 +409,25 @@ if(NOT GIT_FOUND)
 endif()
 
 # build the lib itself
+add_subdirectory(library)
 if(BUILD_LIBRARY)
-    add_subdirectory(library)
-    install(FILES LICENSE.rst DESTINATION ${DFHACK_USERDOC_DESTINATION})
-    install(FILES docs/changelog-placeholder.txt DESTINATION ${DFHACK_USERDOC_DESTINATION} RENAME changelog.txt)
+    file(WRITE ${CMAKE_BINARY_DIR}/dfhack_setarch.txt ${DFHACK_SETARCH})
+    install(FILES ${CMAKE_BINARY_DIR}/dfhack_setarch.txt DESTINATION ${DFHACK_DATA_DESTINATION})
 endif()
 
-file(WRITE "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" ${DFHACK_SETARCH})
-install(FILES "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" DESTINATION "${DFHACK_DATA_DESTINATION}")
-
-install(DIRECTORY dfhack-config/ DESTINATION dfhack-config/default)
-
 # build the plugins
-if(BUILD_PLUGINS)
-    add_subdirectory(plugins)
+add_subdirectory(plugins)
+
+if(INSTALL_DATA_FILES)
+    add_subdirectory(data)
+    install(FILES LICENSE.rst DESTINATION ${DFHACK_USERDOC_DESTINATION})
+    install(FILES docs/changelog-placeholder.txt DESTINATION ${DFHACK_USERDOC_DESTINATION} RENAME changelog.txt)
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/depends/luacov/src/luacov/ DESTINATION ${DFHACK_DATA_DESTINATION}/lua/luacov)
 endif()
 
-add_subdirectory(data)
-add_subdirectory(scripts)
+if(INSTALL_SCRIPTS)
+    add_subdirectory(scripts)
+endif()
 
 if(BUILD_DOCS)
     find_package(Python3)
@@ -485,7 +468,14 @@ if(BUILD_DOCS)
         "${CMAKE_CURRENT_SOURCE_DIR}/conf.py"
     )
 
-    set(SPHINX_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/docs/html/.buildinfo")
+    if(BUILD_DOCS_NO_HTML)
+        set(SPHINX_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/docs/text/index.txt")
+        set(SPHINX_BUILD_TARGETS text)
+    else()
+        set(SPHINX_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/docs/html/.buildinfo")
+        set(SPHINX_BUILD_TARGETS html text)
+    endif()
+
     set_property(
         DIRECTORY PROPERTY ADDITIONAL_CLEAN_FILES TRUE
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/changelogs"
@@ -502,9 +492,10 @@ if(BUILD_DOCS)
         "${CMAKE_BINARY_DIR}/docs/text"
         "${CMAKE_BINARY_DIR}/docs/xml"
     )
+
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
         COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/docs/build.py"
-            html text --sphinx="${SPHINX_EXECUTABLE}" -- -q
+        ${SPHINX_BUILD_TARGETS} --sphinx="${SPHINX_EXECUTABLE}" -- -q -W
         DEPENDS ${SPHINX_DEPS}
         COMMENT "Building documentation with Sphinx"
     )
@@ -517,10 +508,12 @@ if(BUILD_DOCS)
     add_custom_command(TARGET dfhack_docs POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E touch ${SPHINX_OUTPUT})
 
-    install(DIRECTORY ${dfhack_SOURCE_DIR}/docs/html/
-        DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs
-        FILES_MATCHING PATTERN "*"
-                       PATTERN html/_sources EXCLUDE)
+    if(NOT BUILD_DOCS_NO_HTML)
+        install(DIRECTORY ${dfhack_SOURCE_DIR}/docs/html/
+            DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs
+            FILES_MATCHING PATTERN "*"
+                           PATTERN html/_sources EXCLUDE)
+    endif()
     install(DIRECTORY ${dfhack_SOURCE_DIR}/docs/text/
         DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs)
     install(FILES docs/changelogs/news.rst docs/changelogs/news-dev.rst DESTINATION ${DFHACK_USERDOC_DESTINATION})
@@ -605,7 +598,9 @@ endif()
 set(DFHACK_BUILD_ARCH_PREV "${DFHACK_BUILD_ARCH}" CACHE STRING "Previous build architecture" FORCE)
 
 option(BUILD_SIZECHECK "Build the sizecheck library, for research" OFF)
-if(BUILD_SIZECHECK)
+if(BUILD_LIBRARY AND BUILD_SIZECHECK)
     add_subdirectory(depends/sizecheck)
     add_dependencies(dfhack sizecheck)
 endif()
+
+add_subdirectory(package/windows)
diff --git a/LICENSE.rst b/LICENSE.rst
index 68678dfb3..529814423 100644
--- a/LICENSE.rst
+++ b/LICENSE.rst
@@ -36,6 +36,7 @@ tinyxml_        Zlib          \(c\) 2000-2006, Lee Thomason
 UTF-8-decoder_  MIT           \(c\) 2008-2010, Bjoern Hoehrmann
 xlsxio_         MIT           \(c\) 2016-2020, Brecht Sanders
 alt-getopt_     MIT           \(c\) 2009 Aleksey Cheusov
+googletest_     BSD 3-Clause  \(c\) 2008, Google Inc.
 =============== ============= =================================================
 
 .. _DFHack: https://github.com/DFHack/dfhack
@@ -56,6 +57,7 @@ alt-getopt_     MIT           \(c\) 2009 Aleksey Cheusov
 .. _UTF-8-decoder: http://bjoern.hoehrmann.de/utf-8/decoder/dfa
 .. _xlsxio: https://github.com/brechtsanders/xlsxio
 .. _alt-getopt: https://github.com/LuaDist/alt-getopt
+.. _googletest: https://github.com/google/googletest
 
 .. _CC-BY-SA: http://creativecommons.org/licenses/by/3.0/deed.en_US
 
diff --git a/build/.gitignore b/build/.gitignore
index 3c85ab4df..f25d10ca7 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -6,3 +6,4 @@ DF_PATH.txt
 _CPack_Packages
 *.tar.*
 .cmake
+win64-cross
diff --git a/build/build-win64-from-linux.sh b/build/build-win64-from-linux.sh
new file mode 100755
index 000000000..9404188fd
--- /dev/null
+++ b/build/build-win64-from-linux.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -e
+# Number of jobs == core count
+jobs=$(grep -c ^processor /proc/cpuinfo)
+
+# Calculate absolute paths for docker to do mounts
+srcdir=$(realpath "$(dirname "$(readlink -f "$0")")"/..)
+
+cd "$srcdir"/build
+
+builder_uid=$(id -u)
+
+mkdir -p win64-cross
+mkdir -p win64-cross/output
+mkdir -p win64-cross/ccache
+
+# Check for sudo; we want to use the real user
+if [[ $(id -u) -eq 0 ]]; then
+    if [[ -z "$SUDO_UID" || "$SUDO_UID" -eq 0 ]]; then
+        echo "Please don't run this script directly as root, use sudo instead:"
+        echo
+        echo "  sudo $0"
+        # This is because we can't change the buildmaster UID in the container to 0 --
+        # that's already taken by root.
+        exit 1
+    fi
+
+    # If this was run using sudo, let's make sure the directories are owned by the
+    # real user (and set the BUILDER_UID to it)
+    builder_uid=$SUDO_UID
+    chown -R $builder_uid win64-cross
+fi
+
+# Assumes you built a container image called dfhack-build-msvc from
+# https://github.com/BenLubar/build-env/tree/master/msvc, see
+# docs/dev/compile/Compile.rst.
+#
+# NOTE: win64-cross is mounted in /src/build due to the hardcoded `cmake ..` in
+# the Dockerfile
+if ! docker run --rm -i -v "$srcdir":/src -v "$srcdir/build/win64-cross/":/src/build  \
+    -e BUILDER_UID=$builder_uid \
+    -e CCACHE_DIR=/src/build/ccache \
+    -e steam_username \
+    -e steam_password \
+    --name dfhack-win \
+    ghcr.io/dfhack/build-env:msvc \
+    bash -c "cd /src/build && dfhack-configure windows 64 Release -DCMAKE_INSTALL_PREFIX=/src/build/output -DBUILD_DOCS=1 $CMAKE_EXTRA_ARGS && dfhack-make -j$jobs install" \
+    ; then
+    echo
+    echo "Build failed"
+    exit 1
+else
+    echo
+    echo "Windows artifacts are at win64-cross/output. Copy or symlink them to"
+    echo "your steam DF directory to install dfhack (and optionally delete the"
+    echo "hack/ directory already present)"
+    echo
+    echo "Typically this can be done like this:"
+    echo "  cp -r win64-cross/output/* ~/.local/share/Steam/steamapps/common/\"Dwarf Fortress\""
+fi
diff --git a/build/win64/build-debug.bat b/build/win64/build-debug.bat
index be62460d0..2db9df402 100644
--- a/build/win64/build-debug.bat
+++ b/build/win64/build-debug.bat
@@ -1,8 +1 @@
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
-    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
-) else (
-    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-)
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj
-cd ..
+cmake --build VC2022 -t ALL_BUILD -- /m /p:Platform=x64 /p:Configuration=RelWithDebInfo
diff --git a/build/win64/build-release.bat b/build/win64/build-release.bat
index 695c35a90..f719d64bc 100644
--- a/build/win64/build-release.bat
+++ b/build/win64/build-release.bat
@@ -1,9 +1 @@
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
-    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
-) else (
-    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-)
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=Release ALL_BUILD.vcxproj
-cd ..
-pause
+cmake --build VC2022 -t ALL_BUILD -- /m /p:Platform=x64 /p:Configuration=Release
diff --git a/build/win64/generate-MSVC-all.bat b/build/win64/generate-MSVC-all.bat
index ea8db34c0..29240da7f 100644
--- a/build/win64/generate-MSVC-all.bat
+++ b/build/win64/generate-MSVC-all.bat
@@ -1,6 +1,4 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_STONESENSE=1
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEV_PLUGINS=1 -DBUILD_STONESENSE=1
diff --git a/build/win64/generate-MSVC-gui.bat b/build/win64/generate-MSVC-gui.bat
index cd18006d0..71bc1dd14 100644
--- a/build/win64/generate-MSVC-gui.bat
+++ b/build/win64/generate-MSVC-gui.bat
@@ -1,7 +1,5 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo Pre-generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%"
-cmake-gui .
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%"
+cmake-gui VC2022
diff --git a/build/win64/generate-MSVC-minimal.bat b/build/win64/generate-MSVC-minimal.bat
index 30e9b91ee..8eac91b2f 100644
--- a/build/win64/generate-MSVC-minimal.bat
+++ b/build/win64/generate-MSVC-minimal.bat
@@ -1,6 +1,4 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0
diff --git a/build/win64/generate-MSVC-release.bat b/build/win64/generate-MSVC-release.bat
index ef0b3dbbf..26ad32ba1 100644
--- a/build/win64/generate-MSVC-release.bat
+++ b/build/win64/generate-MSVC-release.bat
@@ -1,6 +1,4 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DOCS=1 -DBUILD_STONESENSE=1
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022  -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEV_PLUGINS=0 -DBUILD_DOCS=1 -DBUILD_STONESENSE=1
diff --git a/build/win64/generate-MSVC-steam.bat b/build/win64/generate-MSVC-steam.bat
new file mode 100644
index 000000000..2b9cec8ad
--- /dev/null
+++ b/build/win64/generate-MSVC-steam.bat
@@ -0,0 +1,4 @@
+IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
+IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
+echo generating a build folder
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEV_PLUGINS=1 -DBUILD_STONESENSE=1 -DBUILD_DFLAUNCH=1
diff --git a/build/win64/generate-MSVC-testing.bat b/build/win64/generate-MSVC-testing.bat
index 57c0db06d..d94f77d30 100644
--- a/build/win64/generate-MSVC-testing.bat
+++ b/build/win64/generate-MSVC-testing.bat
@@ -1,6 +1,4 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_SUPPORTED=0 -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0 -DBUILD_SIZECHECK=1
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_SUPPORTED=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0 -DBUILD_SIZECHECK=1
diff --git a/build/win64/install-debug.bat b/build/win64/install-debug.bat
index 7d94fef80..b6c22b0e3 100644
--- a/build/win64/install-debug.bat
+++ b/build/win64/install-debug.bat
@@ -1,8 +1 @@
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
-    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
-) else (
-    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-)
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo INSTALL.vcxproj
-cd ..
+cmake --build VC2022 -t INSTALL -- /m /p:Platform=x64 /p:Configuration=RelWithDebInfo
diff --git a/build/win64/install-release.bat b/build/win64/install-release.bat
index 0162a8827..61aabf771 100644
--- a/build/win64/install-release.bat
+++ b/build/win64/install-release.bat
@@ -1,8 +1 @@
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
-    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
-) else (
-    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-)
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=Release INSTALL.vcxproj
-cd ..
+cmake --build VC2022 -t INSTALL -- /m /p:Platform=x64 /p:Configuration=Release
diff --git a/build/win64/package-debug.bat b/build/win64/package-debug.bat
index d029f9bc3..afaec234a 100644
--- a/build/win64/package-debug.bat
+++ b/build/win64/package-debug.bat
@@ -1,10 +1,2 @@
-@echo off
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
-    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
-) else (
-    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-)
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo PACKAGE.vcxproj
-cd ..
+cmake --build VC2022 -t PACKAGE -- /m /p:Platform=x64 /p:Configuration=RelWithDebInfo
 exit %ERRORLEVEL%
diff --git a/build/win64/package-release.bat b/build/win64/package-release.bat
index 5c347c3b4..75b35bcd5 100644
--- a/build/win64/package-release.bat
+++ b/build/win64/package-release.bat
@@ -1,9 +1 @@
-@echo off
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
-    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
-) else (
-    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-)
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=Release PACKAGE.vcxproj
-cd ..
+cmake --build VC2022 -t PACKAGE -- /m /p:Platform=x64 /p:Configuration=Release
diff --git a/build/win64/set_df_path.vbs b/build/win64/set_df_path.vbs
index 219d150da..85aeba2ce 100644
--- a/build/win64/set_df_path.vbs
+++ b/build/win64/set_df_path.vbs
@@ -2,11 +2,21 @@ Option Explicit
 
 Const BIF_returnonlyfsdirs   = &H0001
 
-Dim wsh, objDlg, objF, fso, spoFile
-Set objDlg = WScript.CreateObject("Shell.Application")
-Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs)
+Dim wsh, objDlg, objF, fso, spoFile, args
 
 Set fso = CreateObject("Scripting.FileSystemObject")
+
+set args = Wscript.Arguments
+if args.count > 0 Then
+    Set ObjF = fso.GetFolder(args.Item(0))
+else
+    Set objDlg = WScript.CreateObject("Shell.Application")
+    Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs)
+    if IsValue(objF) Then
+        set ObjF = objF.self
+    end if
+end if
+
 If fso.FileExists("DF_PATH.txt") Then
     fso.DeleteFile "DF_PATH.txt", True
 End If
@@ -14,7 +24,7 @@ End If
 If IsValue(objF) Then
     If InStr(1, TypeName(objF), "Folder") > 0 Then
         Set spoFile = fso.CreateTextFile("DF_PATH.txt", True)
-        spoFile.WriteLine(objF.Self.Path)
+        spoFile.WriteLine(objF.Path)
     End If
 End If
 
diff --git a/ci/authors-rst.py b/ci/authors-rst.py
index b9ef48d7c..6f3717276 100755
--- a/ci/authors-rst.py
+++ b/ci/authors-rst.py
@@ -35,6 +35,8 @@ def main():
                     error(line_number, 'bad table divider')
                 if line != lines[first_div_index]:
                     error(line_number, 'malformed table divider')
+            if line == lines[first_div_index + i - 1]:
+                error(line_number, 'duplicate of previous line')
         if len(div_indices) < 3:
             error(len(lines), 'missing table divider(s)')
         for i in div_indices[3:]:
diff --git a/ci/buildmaster-rebuild-pr.py b/ci/buildmaster-rebuild-pr.py
deleted file mode 100755
index 7ce988683..000000000
--- a/ci/buildmaster-rebuild-pr.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import hashlib
-import hmac
-import json
-import logging
-import os
-import uuid
-
-import requests
-
-logging.basicConfig(level=logging.DEBUG)
-
-
-def get_required_env(name):
-    value = os.environ.get(name)
-    if not value:
-        raise ValueError(f'Expected environment variable {name!r} to be non-empty')
-    return value
-
-
-def make_sig(body, secret, algorithm):
-    return hmac.new(secret.encode(), body.encode(), algorithm).hexdigest()
-
-
-webhook_url = get_required_env('DFHACK_BUILDMASTER_WEBHOOK_URL')
-secret = get_required_env('DFHACK_BUILDMASTER_WEBHOOK_SECRET')
-api_token = get_required_env('GITHUB_TOKEN')
-repo = get_required_env('GITHUB_REPO')
-
-
-parser = argparse.ArgumentParser()
-target_group = parser.add_mutually_exclusive_group(required=True)
-target_group.add_argument('--pull-request', type=int, help='Pull request to rebuild')
-args = parser.parse_args()
-
-
-response = requests.get(
-    f'https://api.github.com/repos/{repo}/pulls/{args.pull_request}',
-    headers={
-        'Authorization': f'Bearer {api_token}',
-    },
-)
-response.raise_for_status()
-pull_request_data = response.json()
-
-
-body = json.dumps({
-    'action': 'synchronize',
-    'number': args.pull_request,
-    'pull_request': pull_request_data,
-})
-
-response = requests.post(
-    'https://lubar-webhook-proxy.appspot.com/github/buildmaster',
-    headers={
-        'Content-Type': 'application/json',
-        'User-Agent': 'GitHub-Hookshot/' + requests.utils.default_user_agent(),
-        'X-GitHub-Delivery': 'dfhack-rebuild-' + str(uuid.uuid4()),
-        'X-GitHub-Event': 'pull_request',
-        'X-Hub-Signature': 'sha1=' + make_sig(body, secret, hashlib.sha1),
-        'X-Hub-Signature-256': 'sha256=' + make_sig(body, secret, hashlib.sha256),
-    },
-    data=body,
-    timeout=15,
-)
-
-print(response)
-print(str(response.text))
-response.raise_for_status()
diff --git a/ci/check-rpc.py b/ci/check-rpc.py
index aba3e3811..be7d07986 100755
--- a/ci/check-rpc.py
+++ b/ci/check-rpc.py
@@ -1,8 +1,10 @@
 #!/usr/bin/env python3
 import glob
+import itertools
 import sys
 
 actual = {'': {}}
+SEP = ('=' * 80)
 
 with open(sys.argv[1]) as f:
     plugin_name = ''
@@ -26,7 +28,7 @@ for p in glob.iglob('library/proto/*.proto'):
                 parts = line.split(' ')
                 expected[''][parts[2]] = (parts[4], parts[6])
 
-for p in glob.iglob('plugins/proto/*.proto'):
+for p in itertools.chain(glob.iglob('plugins/proto/*.proto'), glob.iglob('plugins/*/proto/*.proto')):
     plugin_name = ''
     with open(p) as f:
         for line in f:
@@ -53,6 +55,7 @@ for plugin_name in actual:
     methods = actual[plugin_name]
 
     if plugin_name not in expected:
+        print(SEP)
         print('Missing documentation for plugin proto files: ' + plugin_name)
         print('Add the following lines:')
         print('// Plugin: ' + plugin_name)
@@ -73,12 +76,14 @@ for plugin_name in actual:
                 missing.append('// RPC ' + m + ' : ' + io[0] + ' -> ' + io[1])
 
         if len(missing) > 0:
+            print(SEP)
             print('Incomplete documentation for ' + ('core' if plugin_name == '' else 'plugin "' + plugin_name + '"') + ' proto files. Add the following lines:')
             for m in missing:
                 print(m)
                 error_count += 1
 
         if len(wrong) > 0:
+            print(SEP)
             print('Incorrect documentation for ' + ('core' if plugin_name == '' else 'plugin "' + plugin_name + '"') + ' proto files. Replace the following comments:')
             for m in wrong:
                 print(m)
@@ -88,6 +93,7 @@ for plugin_name in expected:
     methods = expected[plugin_name]
 
     if plugin_name not in actual:
+        print(SEP)
         print('Incorrect documentation for plugin proto files: ' + plugin_name)
         print('The following methods are documented, but the plugin does not provide any RPC methods:')
         for m in methods:
@@ -102,6 +108,7 @@ for plugin_name in expected:
                 missing.append('// RPC ' + m + ' : ' + io[0] + ' -> ' + io[1])
 
         if len(missing) > 0:
+            print(SEP)
             print('Incorrect documentation for ' + ('core' if plugin_name == '' else 'plugin "' + plugin_name + '"') + ' proto files. Remove the following lines:')
             for m in missing:
                 print(m)
diff --git a/ci/download-df.sh b/ci/download-df.sh
index bb1e91759..399b75714 100755
--- a/ci/download-df.sh
+++ b/ci/download-df.sh
@@ -1,52 +1,53 @@
 #!/bin/sh
 
+DF_FOLDER=$1
+OS_TARGET=$2
+DF_VERSION=$3
+
 set -e
 
-df_tardest="df.tar.bz2"
-save_tardest="test_save.tgz"
-
-cd "$(dirname "$0")"
-echo "DF_VERSION: $DF_VERSION"
-echo "DF_FOLDER: $DF_FOLDER"
-mkdir -p "$DF_FOLDER"
-# back out of df_linux
-cd "$DF_FOLDER/.."
-
-if ! test -f "$df_tardest"; then
-    minor=$(echo "$DF_VERSION" | cut -d. -f2)
-    patch=$(echo "$DF_VERSION" | cut -d. -f3)
-    echo "Downloading DF $DF_VERSION"
-    while read url; do
-        echo "Attempting download: ${url}"
-        if wget -v "$url" -O "$df_tardest"; then
-            break
-        fi
-    done <<URLS
-    https://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2
-    https://files.dfhack.org/DF/0.${minor}.${patch}/df_${minor}_${patch}_linux.tar.bz2
-URLS
-    echo $df_tardest
-    if ! test -f "$df_tardest"; then
-        echo "DF failed to download: $df_tardest not found"
-        exit 1
-    fi
-
-    echo "Downloading test save"
-    #test_save_url="https://files.dfhack.org/DF/0.${minor}.${patch}/test_save.tgz"
-    test_save_url="https://drive.google.com/uc?export=download&id=1XvYngl-DFONiZ9SD9OC4B2Ooecu8rPFz"
-    if ! wget -v "$test_save_url" -O "$save_tardest"; then
-        echo "failed to download test save"
-        exit 1
-    fi
-    echo $save_tardest
+minor=$(echo "$DF_VERSION" | cut -d. -f1)
+patch=$(echo "$DF_VERSION" | cut -d. -f2)
+df_url="https://www.bay12games.com/dwarves/df_${minor}_${patch}"
+if test "$OS_TARGET" = "windows"; then
+    WGET="C:/msys64/usr/bin/wget.exe"
+    df_url="${df_url}_win_s.zip"
+    df_archive_name="df.zip"
+    df_extract_cmd="unzip -d ${DF_FOLDER}"
+elif test "$OS_TARGET" = "ubuntu"; then
+    WGET=wget
+    df_url="${df_url}_linux.tar.bz2"
+    df_archive_name="df.tar.bz2"
+    df_extract_cmd="tar -x -j -C ${DF_FOLDER} -f"
+else
+    echo "Unhandled OS target: ${OS_TARGET}"
+    exit 1
+fi
+
+if ! $WGET -v "$df_url" -O "$df_archive_name"; then
+    echo "Failed to download DF from $df_url"
+    exit 1
+fi
+
+md5sum "$df_archive_name"
+
+save_url="https://dffd.bay12games.com/download.php?id=15434&f=dreamfort.7z"
+save_archive_name="test_save.7z"
+save_extract_cmd="7z x -o${DF_FOLDER}/save"
+
+if ! $WGET -v "$save_url" -O "$save_archive_name"; then
+    echo "Failed to download test save from $save_url"
+    exit 1
 fi
 
-rm -rf df_linux
-mkdir -p df_linux/data/save
+md5sum "$save_archive_name"
 
 echo Extracting
-tar xf "$df_tardest" --strip-components=1 -C df_linux
-tar xf "$save_tardest" -C df_linux/data/save
+mkdir -p ${DF_FOLDER}
+$df_extract_cmd "$df_archive_name"
+$save_extract_cmd "$save_archive_name"
+mv ${DF_FOLDER}/save/* ${DF_FOLDER}/save/region1
+
 echo Done
 
 ls -l
diff --git a/ci/run-tests.py b/ci/run-tests.py
index a6a35bc76..13eeb099c 100755
--- a/ci/run-tests.py
+++ b/ci/run-tests.py
@@ -55,33 +55,32 @@ if os.path.exists(test_status_file):
     os.remove(test_status_file)
 
 print('Backing up init.txt to init.txt.orig')
-init_txt_path = 'data/init/init.txt'
+default_init_txt_path = 'data/init/init_default.txt'
+prefs_path = 'prefs'
+init_txt_path = 'prefs/init.txt'
+if not os.path.exists(init_txt_path):
+    os.makedirs(prefs_path, exist_ok=True)
+    shutil.copyfile(default_init_txt_path, init_txt_path)
+
 shutil.copyfile(init_txt_path, init_txt_path + '.orig')
 with open(init_txt_path) as f:
     init_contents = f.read()
-init_contents = change_setting(init_contents, 'INTRO', 'NO')
 init_contents = change_setting(init_contents, 'SOUND', 'NO')
 init_contents = change_setting(init_contents, 'WINDOWED', 'YES')
-init_contents = change_setting(init_contents, 'WINDOWEDX', '80')
-init_contents = change_setting(init_contents, 'WINDOWEDY', '25')
-init_contents = change_setting(init_contents, 'FPS', 'YES')
-if args.headless:
-    init_contents = change_setting(init_contents, 'PRINT_MODE', 'TEXT')
+init_contents = change_setting(init_contents, 'WINDOWEDX', '1200')
+init_contents = change_setting(init_contents, 'WINDOWEDY', '800')
+#if args.headless:
+#    init_contents = change_setting(init_contents, 'PRINT_MODE', 'TEXT')
 
 init_path = 'dfhack-config/init'
 if not os.path.isdir('hack/init'):
     # we're on an old branch that still reads init files from the root dir
     init_path = '.'
-try:
-    os.mkdir(init_path)
-except OSError as error:
-    # ignore already exists errors
-    pass
+os.makedirs(init_path, exist_ok=True)
 test_init_file = os.path.join(init_path, 'dfhackzzz_test.init')  # Core sorts these alphabetically
 with open(test_init_file, 'w') as f:
     f.write('''
     devel/dump-rpc dfhack-rpc.txt
-    :lua dfhack.internal.addScriptPath(dfhack.getHackPath())
     test --resume -- lua scr.breakdown_level=df.interface_breakdown_types.%s
     ''' % ('NONE' if args.no_quit else 'QUIT'))
 
diff --git a/ci/test.lua b/ci/test.lua
index aca78e851..9a7c0d345 100644
--- a/ci/test.lua
+++ b/ci/test.lua
@@ -1,11 +1,13 @@
 -- DFHack developer test harness
 --@ module = true
 
-local expect = require 'test_util.expect'
-local json = require 'json'
-local mock = require 'test_util.mock'
-local script = require 'gui.script'
-local utils = require 'utils'
+local expect = require('test_util.expect')
+local gui = require('gui')
+local helpdb = require('helpdb')
+local json = require('json')
+local mock = require('test_util.mock')
+local script = require('gui.script')
+local utils = require('utils')
 
 local help_text =
 [====[
@@ -13,49 +15,59 @@ local help_text =
 test
 ====
 
-Run DFHack tests.
+Tags: dev
 
-Usage:
+Command: "test"
+
+    Run DFHack regression tests.
+
+Discover DFHack functionality that has broken due to recent changes in DF or DFHack.
+
+Usage
+-----
 
     test [<options>] [<done_command>]
 
 If a done_command is specified, it will be run after the tests complete.
 
-Options:
-
-    -h, --help      display this help message and exit.
-    -d, --test_dir  specifies which directory to look in for tests. defaults to
-                    the "hack/scripts/test" folder in your DF installation.
-    -m, --modes     only run tests in the given comma separated list of modes.
-                    see the next section for a list of valid modes. if not
-                    specified, the tests are not filtered by modes.
-    -r, --resume    skip tests that have already been run. remove the
-                    test_status.json file to reset the record.
-    -s, --save_dir  the save folder to load for "fortress" mode tests. this
-                    save is only loaded if a fort is not already loaded when
-                    a "fortress" mode test is run. if not specified, defaults to
-                    'region1'.
-    -t, --tests     only run tests that match one of the comma separated list of
-                    patterns. if not specified, no tests are filtered.
-
-Modes:
-
-    none      the test can be run on any screen
-    title     the test must be run on the DF title screen. note that if the game
-              has a map loaded, "title" mode tests cannot be run
-    fortress  the test must be run while a map is loaded. if the game is
-              currently on the title screen, the save specified by the save_dir
-              parameter will be loaded.
-
-Examples:
-
-    test                 runs all tests
-    test -r              runs all tests that haven't been run before
-    test -m none         runs tests that don't need the game to be in a
-                         specific mode
-    test -t quickfort    runs quickfort tests
-    test -d /path/to/dfhack-scripts/repo/test
-                         runs tests in your dev scripts repo
+Options
+-------
+
+-d, --test_dir  specifies which directory to look in for tests. defaults to
+                the "hack/scripts/test" folder in your DF installation.
+-m, --modes     only run tests in the given comma separated list of modes.
+                see the next section for a list of valid modes. if not
+                specified, the tests are not filtered by modes.
+-r, --resume    skip tests that have already been run. remove the
+                test_status.json file to reset the record.
+-s, --save_dir  the save folder to load for "fortress" mode tests. this
+                save is only loaded if a fort is not already loaded when
+                a "fortress" mode test is run. if not specified, defaults to
+                'region1'.
+-t, --tests     only run tests that match one of the comma separated list of
+                patterns. if not specified, no tests are filtered and all tessts
+                are run.
+
+Modes
+-----
+
+none      the test can be run on any screen
+title     the test must be run on the DF title screen. note that if the game
+          has a map loaded, "title" mode tests cannot be run
+fortress  the test must be run while a map is loaded. if the game is
+          currently on the title screen, the save specified by the save_dir
+          parameter will be loaded.
+
+Examples
+--------
+
+test                 runs all tests
+test -r              runs all tests that haven't been run before
+test -m none         runs tests that don't need the game to be in a
+                     specific mode
+test -t quickfort    runs quickfort tests
+test -d /path/to/dfhack-scripts/repo/test
+                     runs tests in your dev scripts repo
 
 Default values for the options may be set in a file named test_config.json in
 your DF folder. Options with comma-separated values should be written as json
@@ -140,18 +152,37 @@ end
 test_envvars.require = clean_require
 test_envvars.reqscript = clean_reqscript
 
-local function is_title_screen(scr)
-    scr = scr or dfhack.gui.getCurViewscreen()
-    return df.viewscreen_titlest:is_instance(scr)
+local function is_title_screen()
+    return dfhack.gui.matchFocusString('title/Default')
+end
+
+local function wait_for(ms, desc, predicate)
+    local start_ms = dfhack.getTickCount()
+    local prev_ms = start_ms
+    while not predicate() do
+        delay(10)
+        local now_ms = dfhack.getTickCount()
+        if now_ms - start_ms > ms then
+            qerror(('%s took too long (timed out at %s)'):format(
+                desc, dfhack.gui.getCurFocus(true)[1]))
+        end
+        if now_ms - prev_ms > 1000 then
+            print(('Waiting for %s...'):format(desc))
+            prev_ms = now_ms
+        end
+    end
 end
 
 -- This only handles pre-fortress-load screens. It will time out if the player
 -- has already loaded a fortress or is in any screen that can't get to the title
 -- screen by sending ESC keys.
 local function ensure_title_screen()
+    if df.viewscreen_dwarfmodest:is_instance(dfhack.gui.getDFViewscreen(true)) then
+        qerror('Cannot reach title screen from loaded fort')
+    end
     for i = 1, 100 do
         local scr = dfhack.gui.getCurViewscreen()
-        if is_title_screen(scr) then
+        if is_title_screen() then
             print('Found title screen')
             return
         end
@@ -160,57 +191,94 @@ local function ensure_title_screen()
         if i % 10 == 0 then print('Looking for title screen...') end
     end
     qerror(string.format('Could not find title screen (timed out at %s)',
-                         dfhack.gui.getCurFocus(true)))
+                         dfhack.gui.getCurFocus(true)[1]))
 end
 
-local function is_fortress(focus_string)
-    focus_string = focus_string or dfhack.gui.getCurFocus(true)
-    return focus_string == 'dwarfmode/Default'
+local function is_fortress()
+    return dfhack.gui.matchFocusString('dwarfmode/Default')
+end
+
+-- error out if we're not running in a CI environment
+-- the tests may corrupt saves, and we don't want to unexpectedly ruin a real player save
+-- this heuristic is not perfect, but it should be able to detect most cases
+local function ensure_ci_save(scr)
+    if #scr.savegame_header ~= 1
+        or #scr.savegame_header_world ~= 1
+        or not string.find(scr.savegame_header[0].fort_name, 'Dream')
+    then
+        qerror('Unexpected test save in slot 0; please manually load a fort for ' ..
+            'running fortress mode tests. note that tests may alter or corrupt the ' ..
+            'fort! Do not save after running tests.')
+    end
+end
+
+local function click_top_title_button(scr)
+    local sw, sh = dfhack.screen.getWindowSize()
+    df.global.gps.mouse_x = sw // 2
+    df.global.gps.precise_mouse_x = df.global.gps.mouse_x * df.global.gps.tile_pixel_x
+    if sh < 60 then
+        df.global.gps.mouse_y = 25
+    else
+        df.global.gps.mouse_y = (sh // 2) + 3
+    end
+    df.global.gps.precise_mouse_y = df.global.gps.mouse_y * df.global.gps.tile_pixel_y
+    gui.simulateInput(scr, '_MOUSE_L')
+end
+
+local function load_first_save(scr)
+    if #scr.savegame_header == 0 then
+        qerror('no savegames available to load')
+    end
+
+    click_top_title_button(scr)
+    wait_for(1000, 'world list', function()
+        return scr.mode == 2
+    end)
+    click_top_title_button(scr)
+    wait_for(1000, 'savegame list', function()
+        return scr.mode == 3
+    end)
+    click_top_title_button(scr)
+    wait_for(1000, 'loadgame progress bar', function()
+        return dfhack.gui.matchFocusString('loadgame')
+    end)
 end
 
 -- Requires that a fortress game is already loaded or is ready to be loaded via
--- the "Continue Playing" option in the title screen. Otherwise the function
+-- the "Continue active game" option in the title screen. Otherwise the function
 -- will time out and/or exit with error.
 local function ensure_fortress(config)
-    local focus_string = dfhack.gui.getCurFocus(true)
     for screen_timeout = 1,10 do
-        if is_fortress(focus_string) then
-            print('Loaded fortress map')
+        if is_fortress() then
+            print('Fortress map is loaded')
             -- pause the game (if it's not already paused)
             dfhack.gui.resetDwarfmodeView(true)
             return
         end
-        local scr = dfhack.gui.getCurViewscreen(true)
-        if focus_string == 'title' or
-                focus_string == 'dfhack/lua/load_screen' then
+        local scr = dfhack.gui.getCurViewscreen()
+        if dfhack.gui.matchFocusString('title/Default', scr) then
+            print('Attempting to load the test fortress')
+            -- TODO: reinstate loading of a specified save dir; for now
+            -- just load the first possible save, which will at least let us
+            -- run fortress tests in CI
             -- qerror()'s on falure
-            dfhack.run_script('load-save', config.save_dir)
-        elseif focus_string ~= 'loadgame' then
+            -- dfhack.run_script('load-save', config.save_dir)
+            ensure_ci_save(scr)
+            load_first_save(scr)
+        elseif not dfhack.gui.matchFocusString('loadgame', scr) then
             -- if we're not actively loading a game, hope we're in
             -- a screen where hitting ESC will get us to the game map
             -- or the title screen
             scr:feed_key(df.interface_key.LEAVESCREEN)
         end
         -- wait for current screen to change
-        local prev_focus_string = focus_string
-        for frame_timeout = 1,100 do
-            delay(10)
-            focus_string = dfhack.gui.getCurFocus(true)
-            if focus_string ~= prev_focus_string then
-                goto next_screen
-            end
-            if frame_timeout % 10 == 0 then
-                print(string.format(
-                    'Loading fortress (currently at screen: %s)',
-                    focus_string))
-            end
-        end
-        print('Timed out waiting for screen to change')
-        break
-        ::next_screen::
+        local prev_focus_string = dfhack.gui.getCurFocus()[1]
+        wait_for(60000, 'screen change', function()
+            return dfhack.gui.getCurFocus()[1] ~= prev_focus_string
+        end)
     end
     qerror(string.format('Could not load fortress (timed out at %s)',
-                         focus_string))
+                         table.concat(dfhack.gui.getCurFocus(), ' ')))
 end
 
 local MODES = {
@@ -236,6 +304,25 @@ local function load_test_config(config_file)
     return config
 end
 
+local function TestTable()
+    local inner = utils.OrderedTable()
+    local meta = copyall(getmetatable(inner))
+
+    function meta:__newindex(k, v)
+        if inner[k] then
+            error('Attempt to overwrite existing test: ' .. k)
+        elseif type(v) ~= 'function' then
+            error('Attempt to define test as non-function: ' .. k .. ' = ' .. tostring(v))
+        else
+            inner[k] = v
+        end
+    end
+
+    local self = {}
+    setmetatable(self, meta)
+    return self
+end
+
 -- we have to save and use the original dfhack.printerr here so our test harness
 -- output doesn't trigger its own dfhack.printerr usage detection (see
 -- detect_printerr below)
@@ -280,7 +367,7 @@ end
 
 local function build_test_env(path)
     local env = {
-        test = utils.OrderedTable(),
+        test = TestTable(),
         -- config values can be overridden in the test file to define
         -- requirements for the tests in that file
         config = {
@@ -352,33 +439,46 @@ local function load_tests(file, tests)
     if not code then
         dfhack.printerr('Failed to load file: ' .. tostring(err))
         return false
-    else
-        dfhack.internal.IN_TEST = true
-        local ok, err = dfhack.pcall(code)
-        dfhack.internal.IN_TEST = false
-        if not ok then
-            dfhack.printerr('Error when running file: ' .. tostring(err))
-            return false
-        else
-            if not MODES[env.config.mode] then
-                dfhack.printerr('Invalid config.mode: ' .. tostring(env.config.mode))
-                return false
-            end
-            for name, test_func in pairs(env.test) do
-                if env.config.wrapper then
-                    local fn = test_func
-                    test_func = function() env.config.wrapper(fn) end
-                end
-                local test_data = {
-                    full_name = short_filename .. ':' .. name,
-                    func = test_func,
-                    private = env_private,
-                    config = env.config,
-                }
-                test_data.name = test_data.full_name:gsub('test/', ''):gsub('.lua', '')
-                table.insert(tests, test_data)
-            end
+    end
+    dfhack.internal.IN_TEST = true
+    local ok, err = dfhack.pcall(code)
+    dfhack.internal.IN_TEST = false
+    if not ok then
+        dfhack.printerr('Error when running file: ' .. tostring(err))
+        return false
+    end
+    if not MODES[env.config.mode] then
+        dfhack.printerr('Invalid config.mode: ' .. tostring(env.config.mode))
+        return false
+    end
+    if not env.config.target then
+        dfhack.printerr('Skipping tests for unspecified target in ' .. file)
+        return true  -- TODO: change to false once existing tests have targets specified
+    end
+    local targets = type(env.config.target) == 'table' and env.config.target or {env.config.target}
+    for _,target in ipairs(targets) do
+        if target == 'core' then goto continue end
+        if type(target) ~= 'string' or not helpdb.is_entry(target) or
+            helpdb.get_entry_tags(target).unavailable
+        then
+            dfhack.printerr('Skipping tests for unavailable target: ' .. target)
+            return true
+        end
+        ::continue::
+    end
+    for name, test_func in pairs(env.test) do
+        if env.config.wrapper then
+            local fn = test_func
+            test_func = function() env.config.wrapper(fn) end
         end
+        local test_data = {
+            full_name = short_filename .. ':' .. name,
+            func = test_func,
+            private = env_private,
+            config = env.config,
+        }
+        test_data.name = test_data.full_name:gsub('test/', ''):gsub('.lua', '')
+        table.insert(tests, test_data)
     end
     return true
 end
@@ -520,6 +620,10 @@ local function filter_tests(tests, config)
 end
 
 local function run_tests(tests, status, counts, config)
+    wait_for(60000, 'game load', function()
+        local scr = dfhack.gui.getDFViewscreen()
+        return not df.viewscreen_initial_prepst:is_instance(scr)
+    end)
     print(('Running %d tests'):format(#tests))
     local start_ms = dfhack.getTickCount()
     local num_skipped = 0
@@ -529,6 +633,7 @@ local function run_tests(tests, status, counts, config)
             goto skip
         end
         if not MODES[test.config.mode].detect() then
+            print(('Switching to %s mode for test: %s'):format(test.config.mode, test.name))
             local ok, err = pcall(MODES[test.config.mode].navigate, config)
             if not ok then
                 MODES[test.config.mode].failed = true
@@ -537,12 +642,13 @@ local function run_tests(tests, status, counts, config)
                 goto skip
             end
         end
+        -- pre-emptively mark the test as failed in case we induce a crash
+        status[test.full_name] = TestStatus.FAILED
+        save_test_status(status)
         if run_test(test, status, counts) then
             status[test.full_name] = TestStatus.PASSED
-        else
-            status[test.full_name] = TestStatus.FAILED
+            save_test_status(status)
         end
-        save_test_status(status)
         ::skip::
     end
     local elapsed_ms = dfhack.getTickCount() - start_ms
@@ -575,7 +681,7 @@ local function dump_df_state()
         enabler = {
             fps = df.global.enabler.fps,
             gfps = df.global.enabler.gfps,
-            fullscreen = df.global.enabler.fullscreen,
+            fullscreen_state = df.global.enabler.fullscreen_state.whole,
         },
         gps = {
             dimx = df.global.gps.dimx,
diff --git a/ci/update-submodules.manifest b/ci/update-submodules.manifest
index e97cae6f3..0c8f03e81 100644
--- a/ci/update-submodules.manifest
+++ b/ci/update-submodules.manifest
@@ -2,6 +2,7 @@ library/xml master
 scripts master
 plugins/stonesense master
 plugins/isoworld dfhack
+depends/clsocket master
 depends/libzip dfhack
 depends/libexpat dfhack
 depends/xlsxio dfhack
diff --git a/conf.py b/conf.py
index 60c3be579..ffcc24b75 100644
--- a/conf.py
+++ b/conf.py
@@ -78,8 +78,7 @@ def write_tool_docs():
         os.makedirs(os.path.join('docs/tools', os.path.dirname(k[0])),
                     mode=0o755, exist_ok=True)
         with write_file_if_changed('docs/tools/{}.rst'.format(k[0])) as outfile:
-            if k[0] != 'search':
-                outfile.write(label)
+            outfile.write(label)
             outfile.write(include)
 
 
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 412ffa347..355182bfb 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,28 +1,30 @@
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dfhack-config/
+        DESTINATION "${DFHACK_DATA_DESTINATION}/data/dfhack-config-defaults")
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/init/
         DESTINATION "${DFHACK_DATA_DESTINATION}/init")
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/base_command_counts.json
-        DESTINATION "${DFHACK_DATA_DESTINATION}/data/base_command_counts.json")
-
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/quickfort/
-        DESTINATION "${DFHACK_DATA_DESTINATION}/data/quickfort")
+        DESTINATION "${DFHACK_DATA_DESTINATION}/data")
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/orders/
-        DESTINATION dfhack-config/orders/library)
+        DESTINATION "${DFHACK_DATA_DESTINATION}/data/orders")
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stockpiles/
+        DESTINATION "${DFHACK_DATA_DESTINATION}/data/stockpiles")
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/examples/
-        DESTINATION "${DFHACK_DATA_DESTINATION}/examples")
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/art/
+        DESTINATION "${DFHACK_DATA_DESTINATION}/data/art")
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/professions/
-        DESTINATION dfhack-config/professions/library)
+        DESTINATION "${DFHACK_DATA_DESTINATION}/data/professions")
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/
-        DESTINATION blueprints
+        DESTINATION "${DFHACK_DATA_DESTINATION}/data/blueprints"
         FILES_MATCHING PATTERN "*"
-                       PATTERN blueprints/library/test EXCLUDE)
+                       PATTERN blueprints/test EXCLUDE)
 
 if(BUILD_TESTS)
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/library/test/
-            DESTINATION blueprints/library/test
-    )
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/test/
+            DESTINATION "${DFHACK_DATA_DESTINATION}/data/blueprints/test")
 endif()
diff --git a/data/art/border-bold.png b/data/art/border-bold.png
new file mode 100644
index 000000000..16423a3a7
Binary files /dev/null and b/data/art/border-bold.png differ
diff --git a/data/art/border-medium.png b/data/art/border-medium.png
new file mode 100644
index 000000000..529a60ee4
Binary files /dev/null and b/data/art/border-medium.png differ
diff --git a/data/art/border-panel.png b/data/art/border-panel.png
new file mode 100644
index 000000000..52b24b919
Binary files /dev/null and b/data/art/border-panel.png differ
diff --git a/data/art/border-thin.png b/data/art/border-thin.png
new file mode 100644
index 000000000..71fa59a3e
Binary files /dev/null and b/data/art/border-thin.png differ
diff --git a/data/art/border-window.png b/data/art/border-window.png
new file mode 100644
index 000000000..34747d69b
Binary files /dev/null and b/data/art/border-window.png differ
diff --git a/data/art/control-panel.png b/data/art/control-panel.png
new file mode 100644
index 000000000..2f5e9468a
Binary files /dev/null and b/data/art/control-panel.png differ
diff --git a/data/art/green-pin.png b/data/art/green-pin.png
new file mode 100644
index 000000000..25d0e696f
Binary files /dev/null and b/data/art/green-pin.png differ
diff --git a/data/art/icons.png b/data/art/icons.png
new file mode 100644
index 000000000..141d9f79f
Binary files /dev/null and b/data/art/icons.png differ
diff --git a/data/art/logo.png b/data/art/logo.png
new file mode 100644
index 000000000..133dc5aaf
Binary files /dev/null and b/data/art/logo.png differ
diff --git a/data/art/logo_hovered.png b/data/art/logo_hovered.png
new file mode 100644
index 000000000..fe82cc1ae
Binary files /dev/null and b/data/art/logo_hovered.png differ
diff --git a/data/art/on-off.png b/data/art/on-off.png
new file mode 100644
index 000000000..2b731e1c6
Binary files /dev/null and b/data/art/on-off.png differ
diff --git a/data/art/pathable.png b/data/art/pathable.png
new file mode 100644
index 000000000..00f7f831d
Binary files /dev/null and b/data/art/pathable.png differ
diff --git a/data/art/red-pin.png b/data/art/red-pin.png
new file mode 100644
index 000000000..763b83e97
Binary files /dev/null and b/data/art/red-pin.png differ
diff --git a/data/art/unsuspend.png b/data/art/unsuspend.png
new file mode 100644
index 000000000..f1d1d33da
Binary files /dev/null and b/data/art/unsuspend.png differ
diff --git a/data/blueprints/library/aquifer_tap.csv b/data/blueprints/aquifer_tap.csv
similarity index 53%
rename from data/blueprints/library/aquifer_tap.csv
rename to data/blueprints/aquifer_tap.csv
index 3cc560ce8..d16a22927 100644
--- a/data/blueprints/library/aquifer_tap.csv
+++ b/data/blueprints/aquifer_tap.csv
@@ -3,34 +3,34 @@
 ""
 Here's the procedure:
 ""
-1) Dig a tunnel from where you want the water to end up (e.g. your well cistern) off to an unused portion of the map. Be sure to dig a one-tile-wide diagonal segment in this tunnel so water that will eventually flow through the tunnel is depressurized.
+1) Dig a tunnel from where you want the water to end up (e.g. your well cistern) off to an unused portion of the map that has an aquifer above it. Be sure to dig a one-tile-wide diagonal segment in this tunnel so water that will eventually flow through the tunnel is depressurized.
 ""
-"2) From the end of that tunnel, dig a staircase straight up to the z-level just below the lowest aquifer level. Also dig the staircase down one z-level below the tunnel level."
+"2) From the end of that tunnel, dig a staircase straight up to the lowest aquifer level. Erase the top staircase tile (the down-only stairs) so your miners don't dig it yet. We'll be adding it back with the aquifer_tap blueprint. Also dig the staircase column down one z-level below the tunnel level."
 ""
-"3) From the bottom of the staircase (the z-level below where the water will flow to your cisterns), dig a straight, one-tile wide tunnel to the edge of the map. This is your drainage tunnel. Smooth the map edge tile and carve a fortification. The water can flow through the fortification and off the map, allowing the dwarves to dig out the aquifer tap without drowning."
+"3) From the bottom of the staircase (the z-level below where the water will flow to your cisterns), dig a straight, one-tile wide tunnel to the closest edge of the map. This is your emergency drainage tunnel. Smooth the map edge tile and carve a fortification. The water can flow through the fortification and off the map, allowing the dwarves to dig out the aquifer tap without drowning."
 ""
 4) Place a lever-controlled floodgate in the drainage tunnel and open the floodgate. Place the lever somewhere else in your fort so that it will remain dry and accessible.
 ""
-"5) If you care about how nice things look, haul away any boulders in the tunnels and smooth the tiles. You won't be able to access any of this area once it fills up with water!"
+"5) If you want, haul away any boulders in the tunnels and/or smooth the tiles. You won't be able to access any of this area once it fills up with water!"
 ""
-"6) Apply this blueprint (gui/quickfort library/aquifer_tap.csv -n /dig) to the z-level above the top of the staircase, inside the lowest aquifer level. Do not unpause until after the next step."
+"6) Apply this blueprint (gui/quickfort aquifer_tap /dig) to the z-level above the top of the staircase, inside the lowest aquifer level. Do not unpause until after the next step."
 ""
-"7) Damp tiles cancel dig designations if the tile is currently hidden, so to avoid having to re-apply this blueprint after every tile your dwarves dig, position the cursor straight up (north) of the left-most tile designated for digging and straight left (west) of the topmost designated tile and run the following commands in the DFHack console:"
+"7) Damp tiles cancel dig designations if the tile is currently hidden, so to avoid having to re-apply this blueprint after every tile your dwarves dig, position the keyboard cursor straight up (north) of the left-most tile designated for digging and straight left (west) of the topmost designated tile and run the following commands in the DFHack console:"
 tiletypes-command f any ; f designated 1 ; p any ; p hidden 0 ; r 23 23 1
 tiletypes-here
 ""
-"8) Unpause and dig out the tap. If you care about appearances, haul away any boulders and feel free to remove the ramps (d-z). The water will safely flow down the staircase, through the open floodgate, down the drainage tunnel, and off the map until you choose to close the floodgate."
+"8) Unpause and dig out the tap. You can haul away any boulders and remove the ramps if you like. The water will safely flow down the staircase, through the open floodgate, down the drainage tunnel, and off the map as long as the floodgate is open."
 
 "9) Once everything is dug out and all dwarves are out of the waterways, close the floodgate. Your cisterns will fill with water. Since the waterway to your cisterns is depressurized, the cisterns will stay forever full, but will not flood."
 ""
 A diagram might be useful. Here is a vertical view through the z-levels. This blueprint goes at the top:
 ""
-j  <- center of this blueprint
+"j  <- down stairs, center of this blueprint"
 i
-... <- make this as tall as you need
+"... <- up/down stairs, make this as tall as you need"
 i
 i <- cistern outlet level
-u <- drainage level
+"u <- up stairs, drainage level"
 ""
 "Good luck! If done right, this method is the safest way to supply your fort with clean water."
 #dig label(dig) start(13 13 center of tap) light aquifer water collector
diff --git a/data/blueprints/bedrooms/28-3-Modified_Windmill_Villas.csv b/data/blueprints/bedrooms/28-3-Modified_Windmill_Villas.csv
new file mode 100644
index 000000000..af15f0cc4
--- /dev/null
+++ b/data/blueprints/bedrooms/28-3-Modified_Windmill_Villas.csv
@@ -0,0 +1,74 @@
+"#dig label(dig) start(12; 12) 28 bedrooms, 3 tiles each"
+
+,,,,,,,d,,,,,,d
+,,,,,,,d,,,,,,d
+,,,,,d,,d,,d,,d,,d,,d
+,,,,,d,,d,,d,,d,,d,,d
+,,,,,d,d,d,d,d,,d,d,d,,d,,d,d,d
+,,,,,,,d,,,,,,d,d,,,d
+,,,d,d,d,,d,,d,d,d,,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,,,,d,,d,,,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,,d,d,d
+,,,,,d,,,,d,~,~,~,d,,d
+,,,d,d,d,,d,d,d,~,~,~,d,d,d,,d,d,d
+,,,,,,,d,,d,~,~,~,d,,,,d
+,,,d,d,d,,d,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,d,,,,d,,d,,,,d,d
+,d,d,d,d,d,d,d,d,d,,d,d,d,,d,,d,d,d
+,,,,,d,,,d,d,,,,,,d
+,,,d,d,d,,d,,d,d,d,,d,d,d,d,d
+,,,,,,,d,,d,,d,,d,,d,,d
+,,,,,,,d,,d,,d,,d,,d,,d
+,,,,,,,,,d,,,,,,d
+,,,,,,,,,d,,,,,,d
+
+#meta label(rooms)
+zone/zone
+build/build
+#zone label(zone) start(12; 12) hidden()
+,,,,,,b(3x5),,,,,,b(3x5)
+,,,,,,,`,,,,,,`
+,,,,b(3x5),,,`,b(3x5),,b(3x5),,,`,b(3x5)
+,,,,,`,,`,,`,,`,,`,,`
+,,,,,`,,`,,`,,`,,`,,`,b(5x3)
+,,,,,`,`,`,`,`,,`,`,`,,`,,`,`,`
+,,b(5x3),,,,,`,b(5x3),,,,,`,`,,,`,b(5x3)
+,,,`,`,`,,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+b(5x3),,,,,,`,`,,,,`,,`,b(3x5),,b(5x3),`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`
+,,b(5x3),,,`,b(3x5),,,`,`,`,`,`,,`,b(5x3)
+,,,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`
+,,b(5x3),,,,,`,,`,`,`,`,`,,,,`,b(5x3)
+,,,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+b(5x3),,,,,`,,,,`,b(5x3),`,,,,`,b(5x3)
+,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
+,,b(5x3),,,`,b(3x5),,`,`,b(3x5),,b(3x5),,,`,b(3x5)
+,,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,,,,,,,`,b(3x5),`,,`,,`,b(3x5),`,,`
+,,,,,,,`,,`,,`,,`,,`,,`
+,,,,,,,,,`,,,,,,`
+,,,,,,,,,`,,,,,,`
+
+#build label(build) start(12; 12) hidden()
+
+,,,,,,,f,,,,,,f
+,,,,,,,h,,,,,,h
+,,,,,f,,b,,f,,f,,b,,f
+,,,,,h,,d,,h,,h,,d,,h
+,,,,,b,d,`,d,b,,b,d,`,,b,,b,h,f
+,,,,,,,`,,,,,,`,d,,,d
+,,,f,h,b,,`,,f,h,b,,`,`,`,`,`,d,b,h,f
+,,,,,,d,`,,,,d,,`,,,,d
+,f,h,b,d,`,`,`,`,`,`,`,`,`,,f,,b,h,f
+,,,,,d,,,,`,`,`,`,`,,h
+,,,f,h,b,,b,d,`,`,`,`,`,d,b,,b,h,f
+,,,,,,,h,,`,`,`,`,`,,,,d
+,,,f,h,b,,f,,`,`,`,`,`,`,`,`,`,d,b,h,f
+,,,,,d,,,,`,,d,,,,`,d
+,f,h,b,d,`,`,`,`,`,,b,h,f,,`,,b,h,f
+,,,,,d,,,d,`,,,,,,`
+,,,f,h,b,,b,,`,d,b,,b,d,`,d,b
+,,,,,,,h,,d,,h,,h,,d,,h
+,,,,,,,f,,b,,f,,f,,b,,f
+,,,,,,,,,h,,,,,,h
+,,,,,,,,,f,,,,,,f
diff --git a/data/blueprints/bedrooms/48-4-Raynard_Whirlpool_Housing.csv b/data/blueprints/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
new file mode 100644
index 000000000..ae7d83f6e
--- /dev/null
+++ b/data/blueprints/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
@@ -0,0 +1,209 @@
+"#dig label(dig) start(17; 17) 48 rooms, 4 tiles each"
+
+,,,,,,,,,,,,,,d,,,,d
+,,,,,d,,,,d,,,,d,d,d,d,d,d,d,,,,d,,,,d
+,,,,d,d,d,d,d,d,d,,,,d,,d,,d,,,,d,d,d,d,d,d,d
+,,d,,,d,,d,,d,,,d,,,,d,,,,d,,,d,,d,,d,,,d
+,d,d,d,,,,d,,,,d,d,d,,d,d,d,,d,d,d,,,,d,,,,d,d,d
+,,d,,,d,d,d,d,d,,,d,,,d,d,d,,,d,,,d,d,d,d,d,,,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,,d,d,d,d,d,,,d,,,d,d,d,,,d,,,d,d,d,d,d,,,d
+,d,d,d,,,,d,,,,d,d,d,,d,d,d,,d,d,d,,,,d,,,,d,d,d
+,,d,,,d,,d,,d,,,d,,,,d,,,,d,,,d,,d,,d,,,d
+,,,,d,d,d,d,d,d,d,,,,d,,d,,d,,,,d,d,d,d,d,d,d
+,,,,,d,,d,,d,,,,d,d,d,d,d,d,d,,,,d,,d,,d
+,,,d,,,,d,,,,d,,,d,,d,,d,,,d,,,,d,,,,d
+,,d,d,d,,d,d,d,,d,d,d,,,,d,,,,d,d,d,,d,d,d,,d,d,d
+,,,d,,,d,d,d,,,d,,,d,~,~,~,d,,,d,,,d,d,d,,,d
+,,,d,d,d,d,d,d,d,d,d,d,d,d,~,~,~,d,d,d,d,d,d,d,d,d,d,d,d
+,,,d,,,d,d,d,,,d,,,d,~,~,~,d,,,d,,,d,d,d,,,d
+,,d,d,d,,d,d,d,,d,d,d,,,,d,,,,d,d,d,,d,d,d,,d,d,d
+,,,d,,,,d,,,,d,,,d,,d,,d,,,d,,,,d,,,,d
+,,,,,d,,d,,d,,,,d,d,d,d,d,d,d,,,,d,,d,,d
+,,,,d,d,d,d,d,d,d,,,,d,,d,,d,,,,d,d,d,d,d,d,d
+,,d,,,d,,d,,d,,,d,,,,d,,,,d,,,d,,d,,d,,,d
+,d,d,d,,,,d,,,,d,d,d,,d,d,d,,d,d,d,,,,d,,,,d,d,d
+,,d,,,d,d,d,d,d,,,d,,,d,d,d,,,d,,,d,d,d,d,d,,,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,,d,d,d,d,d,,,d,,,d,d,d,,,d,,,d,d,d,d,d,,,d
+,d,d,d,,,,d,,,,d,d,d,,d,d,d,,d,d,d,,,,d,,,,d,d,d
+,,d,,,d,,d,,d,,,d,,,,d,,,,d,,,d,,d,,d,,,d
+,,,,d,d,d,d,d,d,d,,,,d,,d,,d,,,,d,d,d,d,d,d,d
+,,,,,d,,,,d,,,,d,d,d,d,d,d,d,,,,d,,,,d
+,,,,,,,,,,,,,,d,,,,d
+
+#meta label(rooms)
+zone1/zone1
+zone2/zone2
+zone3/zone3
+zone4/zone4
+build/build
+#zone label(zone1) start(17; 17) hidden()
+
+,,,,,,,,,,,,,,`,,,,`
+,,,,,`,,,,`,,,,`,,`,,`,,`,,,,`,,,,`
+,b,b,b,`,,`,,`,,`,b,b,b,`,,,,`,b,b,b,`,,`,,`,,`,b,b,b
+b,b,b,b,b,`,,,,`,b,b,b,b,b,,,,b,b,b,b,b,`,,,,`,b,b,b,b,b
+b,b,b,b,b,,,,,,b,b,b,b,b,,,,b,b,b,b,b,,,,,,b,b,b,b,b
+b,b,b,b,b,,,,,,b,b,b,b,b,,,,b,b,b,b,b,,,,,,b,b,b,b,b
+,,,,,,,`,,,,,,,,,`,,,,,,,,,`
+,,`,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,`
+,`,,`,,,,,,,,`,,`,,,,,,`,,`,,,,,,,,`,,`
+,,`,,,`,,,,`,,,`,,,,,,,,`,,,`,,,,`,,,`
+,,,,`,,`,,`,,`,,,,`,,,,`,,,,`,,`,,`,,`
+,,b,b,b,`,,,,`,b,b,b,`,,`,,`,,`,b,b,b,`,,,,`,b,b,b
+,b,b,b,b,b,,,,b,b,b,b,b,`,,,,`,b,b,b,b,b,,,,b,b,b,b,b
+,b,b,b,b,b,,,,b,b,b,b,b,,,,,,b,b,b,b,b,,,,b,b,b,b,b
+,b,b,b,b,b,,,,b,b,b,b,b,,,,,,b,b,b,b,b,,,,b,b,b,b,b
+,,,,,,,`,,,,,,,,,,,,,,,,,,`
+,,,`,,,,,,,,`,,,,,,,,,,`,,,,,,,,`
+,,`,,`,,,,,,`,,`,,,,,,,,`,,`,,,,,,`,,`
+,,,`,,,,,,,,`,,,`,,,,`,,,`,,,,,,,,`
+,,,,,`,,,,`,,,,`,,`,,`,,`,,,,`,,,,`
+,b,b,b,`,,`,,`,,`,b,b,b,`,,,,`,b,b,b,`,,`,,`,,`,b,b,b
+b,b,b,b,b,`,,,,`,b,b,b,b,b,,,,b,b,b,b,b,`,,,,`,b,b,b,b,b
+b,b,b,b,b,,,,,,b,b,b,b,b,,,,b,b,b,b,b,,,,,,b,b,b,b,b
+b,b,b,b,b,,,,,,b,b,b,b,b,,,,b,b,b,b,b,,,,,,b,b,b,b,b
+,,,,,,,`,,,,,,,,,`,,,,,,,,,`
+,,`,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,`
+,`,,`,,,,,,,,`,,`,,,,,,`,,`,,,,,,,,`,,`
+,,`,,,`,,,,`,,,`,,,,,,,,`,,,`,,,,`,,,`
+,,,,`,,`,,`,,`,,,,`,,,,`,,,,`,,`,,`,,`
+,,,,,`,,,,`,,,,`,,`,,`,,`,,,,`,,,,`
+,,,,,,,,,,,,,,`,,,,`
+
+#zone label(zone2) start(17; 17) hidden()
+,,,,,,,,,,,,,b,b,b
+,,,,b,b,b,,,,,,b,b,b,b,,,`,,,,b,b,b
+,,,b,b,b,b,,,`,,,b,b,b,b,,`,,`,,b,b,b,b,,,`
+,~,~,b,b,b,b,,`,,`,~,b,b,b,b,,,`,~,~,b,b,b,b,,`,,`,~,~,~
+~,~,~,b,b,b,b,,,`,~,~,~,b,b,b,,,~,~,~,b,b,b,b,,,`,~,~,~,~,~
+~,~,~,~,b,b,b,,,,~,~,~,~,~,,,,~,~,~,~,b,b,b,,,,~,~,~,~,~
+~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~
+,~,~,~,,,,`,,,,~,~,~,,,`,,,~,~,~,,,,`,,,,~,~,~
+,,`,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,`
+,`,,`,b,b,b,,,,,`,,`,,,,,,`,,`,b,b,b,,,,,`,,`
+,,`,b,b,b,b,,,`,,,`,b,b,b,,,,,`,b,b,b,b,,,`,,,`
+,,,b,b,b,b,,`,,`,,b,b,b,b,,,`,,,b,b,b,b,,`,,`
+,,~,b,b,b,b,,,`,~,~,b,b,b,b,,`,,`,~,b,b,b,b,,,`,~,~,~
+,~,~,~,b,b,b,,,~,~,~,b,b,b,b,,,`,~,~,~,b,b,b,,,~,~,~,~,~
+,~,~,~,~,~,,,,~,~,~,~,b,b,b,,,,~,~,~,~,~,,,,~,~,~,~,~
+,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~
+,,~,~,~,,,`,,,~,~,~,,,,,,,,~,~,~,,,`,,,~,~,~
+,,,`,,,,,,,,`,,,,,,,,,,`,,,,,,,,`
+,,`,,`,,,,,,`,,`,b,b,b,,,,,`,,`,,,,,,`,,`
+,,,`,b,b,b,,,,,`,b,b,b,b,,,`,,,`,b,b,b,,,,,`
+,,,b,b,b,b,,,`,,,b,b,b,b,,`,,`,,b,b,b,b,,,`
+,~,~,b,b,b,b,,`,,`,~,b,b,b,b,,,`,~,~,b,b,b,b,,`,,`,~,~,~
+~,~,~,b,b,b,b,,,`,~,~,~,b,b,b,,,~,~,~,b,b,b,b,,,`,~,~,~,~,~
+~,~,~,~,b,b,b,,,,~,~,~,~,~,,,,~,~,~,~,b,b,b,,,,~,~,~,~,~
+~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~
+,~,~,~,,,,`,,,,~,~,~,,,`,,,~,~,~,,,,`,,,,~,~,~
+,,`,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,`
+,`,,`,b,b,b,,,,,`,,`,,,,,,`,,`,b,b,b,,,,,`,,`
+,,`,b,b,b,b,,,`,,,`,b,b,b,,,,,`,b,b,b,b,,,`,,,`
+,,,b,b,b,b,,`,,`,,b,b,b,b,,,`,,,b,b,b,b,,`,,`
+,,,b,b,b,b,,,`,,,b,b,b,b,,`,,`,,b,b,b,b,,,`
+,,,,b,b,b,,,,,,b,b,b,b,,,`,,,,b,b,b
+,,,,,,,,,,,,,b,b,b
+#zone label(zone3) start(17; 17) hidden()
+,,,,,,,,,,,,,~,~,~
+,,,,~,~,~,,,,,,~,~,~,~,~,,`,,,,~,~,~
+,,,~,~,~,~,~,,`,,,~,~,~,~,~,`,,`,,~,~,~,~,~,,`
+,~,~,~,~,~,~,~,`,,`,~,~,~,~,~,~,,`,~,~,~,~,~,~,~,`,,`,~,~,~
+~,~,~,~,~,~,~,~,,`,~,~,~,~,~,~,,,~,~,~,~,~,~,~,~,,`,~,~,~,~,~
+~,~,~,~,~,~,~,,,,~,~,~,~,~,,,,~,~,~,~,~,~,~,,,,~,~,~,~,~
+~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~
+,,,,,,,`,,,,,,,,,`,,,,,,,,,`
+b,b,b,b,b,,,,,,b,b,b,b,b,,,,b,b,b,b,b,,,,,,b,b,b,b,b
+b,b,b,b,b,~,~,,,,b,b,b,b,b,,,,b,b,b,b,b,~,~,,,,b,b,b,b,b
+b,b,b,b,b,~,~,~,,`,b,b,b,b,b,~,,,b,b,b,b,b,~,~,~,,`,b,b,b,b,b
+,b,b,b,~,~,~,~,`,,`,b,b,b,~,~,~,,`,b,b,b,~,~,~,~,`,,`,b,b,b
+,,~,~,~,~,~,~,,`,~,~,~,~,~,~,~,`,,`,~,~,~,~,~,~,,`,~,~,~
+,~,~,~,~,~,~,,,~,~,~,~,~,~,~,~,,`,~,~,~,~,~,~,,,~,~,~,~,~
+,~,~,~,~,~,,,,~,~,~,~,~,~,~,,,,~,~,~,~,~,,,,~,~,~,~,~
+,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~
+,,,,,,,`,,,,,,,,,,,,,,,,,,`
+,b,b,b,b,b,,,,b,b,b,b,b,,,,,,b,b,b,b,b,,,,b,b,b,b,b
+,b,b,b,b,b,,,,b,b,b,b,b,~,~,,,,b,b,b,b,b,,,,b,b,b,b,b
+,b,b,b,b,b,~,,,b,b,b,b,b,~,~,~,,`,b,b,b,b,b,~,,,b,b,b,b,b
+,,b,b,b,~,~,~,,`,b,b,b,~,~,~,~,`,,`,b,b,b,~,~,~,,`,b,b,b
+,~,~,~,~,~,~,~,`,,`,~,~,~,~,~,~,,`,~,~,~,~,~,~,~,`,,`,~,~,~
+~,~,~,~,~,~,~,~,,`,~,~,~,~,~,~,,,~,~,~,~,~,~,~,~,,`,~,~,~,~,~
+~,~,~,~,~,~,~,,,,~,~,~,~,~,,,,~,~,~,~,~,~,~,,,,~,~,~,~,~
+~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~
+,,,,,,,`,,,,,,,,,`,,,,,,,,,`
+b,b,b,b,b,,,,,,b,b,b,b,b,,,,b,b,b,b,b,,,,,,b,b,b,b,b
+b,b,b,b,b,~,~,,,,b,b,b,b,b,,,,b,b,b,b,b,~,~,,,,b,b,b,b,b
+b,b,b,b,b,~,~,~,,`,b,b,b,b,b,~,,,b,b,b,b,b,~,~,~,,`,b,b,b,b,b
+,b,b,b,~,~,~,~,`,,`,b,b,b,~,~,~,,`,b,b,b,~,~,~,~,`,,`,b,b,b
+,,,~,~,~,~,~,,`,,,~,~,~,~,~,`,,`,,~,~,~,~,~,,`
+,,,,~,~,~,,,,,,~,~,~,~,~,,`,,,,~,~,~
+,,,,,,,,,,,,,~,~,~
+#zone label(zone4) start(17; 17) hidden()
+,,,,,,,,,,,,,~,~,~,,b,b,b
+,,,,~,~,~,,b,b,b,,~,~,~,~,,b,b,b,b,,~,~,~,,b,b,b
+,,,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b
+,~,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~
+~,~,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,~,~,~,~,~,,b,b,b,b,~,~,~
+~,~,~,~,~,~,~,,b,b,b,~,~,~,~,,,,~,~,~,~,~,~,~,,b,b,b,~,~,~,~
+~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~
+,~,~,~,,,,`,,,,~,~,~,,,`,,,~,~,~,,,,`,,,,~,~,~
+~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~
+~,~,~,~,~,~,~,,b,b,b,~,~,~,~,,,,~,~,~,~,~,~,~,,b,b,b,~,~,~,~
+~,~,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,~,~,~,~,~,,b,b,b,b,~,~,~
+,~,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~
+,,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~
+,~,~,~,~,~,~,,b,b,b,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,~,~,~
+,~,~,~,~,~,,,,~,~,~,~,~,~,~,,b,b,b,~,~,~,~,,,,~,~,~,~,~
+,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~
+,,~,~,~,,,`,,,~,~,~,,,,,,,,~,~,~,,,`,,,~,~,~
+,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~
+,~,~,~,~,~,,,,~,~,~,~,~,~,~,,b,b,b,~,~,~,~,,,,~,~,~,~,~
+,~,~,~,~,~,~,,b,b,b,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,~,~,~
+,,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~
+,~,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~
+~,~,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,~,~,~,~,~,,b,b,b,b,~,~,~
+~,~,~,~,~,~,~,,b,b,b,~,~,~,~,,,,~,~,~,~,~,~,~,,b,b,b,~,~,~,~
+~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~
+,~,~,~,,,,`,,,,~,~,~,,,`,,,~,~,~,,,,`,,,,~,~,~
+~,~,~,~,~,,,,,,~,~,~,~,~,,,,~,~,~,~,~,,,,,,~,~,~,~,~
+~,~,~,~,~,~,~,,b,b,b,~,~,~,~,,,,~,~,~,~,~,~,~,,b,b,b,~,~,~,~
+~,~,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,~,~,~,~,~,,b,b,b,b,~,~,~
+,~,~,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~
+,,,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b,~,~,~,~,,b,b,b,b
+,,,,~,~,~,,b,b,b,,~,~,~,~,,b,b,b,b,,~,~,~,,b,b,b
+,,,,,,,,,,,,,~,~,~,,b,b,b
+#build label(build) start(17; 17) hidden()
+
+,,,,,,,,,,,,,,f,,,,f
+,,,,,h,,,,h,,,,b,,d,,d,,b,,,,h,,,,h
+,,,,b,,d,,d,,b,,,,h,,,,h,,,,b,,d,,d,,b
+,,b,,,f,,,,f,,,b,,,,,,,,b,,,f,,,,f,,,b
+,f,,h,,,,,,,,h,,f,,,,,,f,,h,,,,,,,,h,,f
+,,d,,,,,,,,,,d,,,,,,,,d,,,,,,,,,,d
+,,,,,,,s,,,,,,,,,s,,,,,,,,,s
+,,d,,,,,,,,,,d,,,,,,,,d,,,,,,,,,,d
+,f,,h,,,,,,,,h,,f,,,,,,f,,h,,,,,,,,h,,f
+,,b,,,f,,,,f,,,b,,,,,,,,b,,,f,,,,f,,,b
+,,,,b,,d,,d,,b,,,,h,,,,h,,,,b,,d,,d,,b
+,,,,,h,,,,h,,,,b,,d,,d,,b,,,,h,,,,h
+,,,b,,,,,,,,b,,,f,,,,f,,,b,,,,,,,,b
+,,h,,f,,,,,,f,,h,,,,,,,,h,,f,,,,,,f,,h
+,,,d,,,,,,,,d,,,,,,,,,,d,,,,,,,,d
+,,,,,,,s,,,,,,,,,,,,,,,,,,s
+,,,d,,,,,,,,d,,,,,,,,,,d,,,,,,,,d
+,,h,,f,,,,,,f,,h,,,,,,,,h,,f,,,,,,f,,h
+,,,b,,,,,,,,b,,,f,,,,f,,,b,,,,,,,,b
+,,,,,h,,,,h,,,,b,,d,,d,,b,,,,h,,,,h
+,,,,b,,d,,d,,b,,,,h,,,,h,,,,b,,d,,d,,b
+,,b,,,f,,,,f,,,b,,,,,,,,b,,,f,,,,f,,,b
+,f,,h,,,,,,,,h,,f,,,,,,f,,h,,,,,,,,h,,f
+,,d,,,,,,,,,,d,,,,,,,,d,,,,,,,,,,d
+,,,,,,,s,,,,,,,,,s,,,,,,,,,s
+,,d,,,,,,,,,,d,,,,,,,,d,,,,,,,,,,d
+,f,,h,,,,,,,,h,,f,,,,,,f,,h,,,,,,,,h,,f
+,,b,,,f,,,,f,,,b,,,,,,,,b,,,f,,,,f,,,b
+,,,,b,,d,,d,,b,,,,h,,,,h,,,,b,,d,,d,,b
+,,,,,h,,,,h,,,,b,,d,,d,,b,,,,h,,,,h
+,,,,,,,,,,,,,,f,,,,f
diff --git a/data/blueprints/bedrooms/95-9-Hactar1_3_Branch_Tree.csv b/data/blueprints/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
new file mode 100644
index 000000000..78543b1e0
--- /dev/null
+++ b/data/blueprints/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
@@ -0,0 +1,228 @@
+"#dig label(dig) start(36;73) 95 bedrooms (including 14 suites), 190 tombs"
+
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,,d,,,d,,,d,,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,,d,,,d,,,d,,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,,d,,,,,,,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,,d,d,d,d,,d,,d,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,,d,d,d,d,d,d,d,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,,d,d,d,d,,d,,d,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,d,d,d,,,d,,,,,,,d,,,,,,,d,,,,,,,d,,,,,,,d,,,d,d,d
+,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,d,d,d,,,d,,,,,,,d,,,,,,d,d,d,,,,,,d,,,,,,,d,,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,d,d,d,,,,,,d
+,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,d,,d,d,d,,d,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,d,,d,d,d,,d,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,,d,,,d,d,d,,,d,,,,,,,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,,d,,,d,d,d,,,d,,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,d,d,d,,d,d,d,,d,d,d,,,,,,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,,,,,d,d,d,,,,,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,d,d,d,,d,d,d,,,d,,,d,,,d,,,d,d,d,,d,d,d,,d,d,d,,,d,,,d,,,d,,,d,d,d,,d,d,d
+,,,,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d
+,,,,,,,,,,,,d,d,d,,d,d,d,,,d,,,d,,,d,,,d,d,d,,d,d,d,,d,d,d,,,d,,,d,,,d,,,d,d,d,,d,d,d
+,,,,,,,,,,,,,d,,,,,,,d,d,d,,d,,d,d,d,,,,,,d,d,d,,,,,,d,d,d,,d,,d,d,d,,,,,,,d
+,,,,,d,d,d,,d,d,d,,d,,d,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,d,d
+,,,,,d,d,d,,d,d,d,,d,,d,d,d,d,,d,d,d,,d,,,,,,,d,,,d,d,d,,,d,,,,,,,d,,d,d,d,,d,d,d,d,,d,,d,d,d,,d,d,d
+,d,d,d,,,d,,,,,,,d,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,,d,,,,,,,d,,,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,,,d,,,,,,,d,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,,d,,,,,,,d,,,d,d,d
+,,,,,d,d,d,,d,d,d,,d,,d,d,d,d,,d,d,d,,d,,,,,,,d,,,d,d,d,,,d,,,,,,,d,,d,d,d,,d,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,d,d
+,,,,,d,d,d,,d,d,d,,d,,d,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,d,,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,d,,,,,,,d,d,d,,d,,d,d,d,,,,,,d,d,d,,,,,,d,d,d,,d,,d,d,d,,,,,,,d
+,,,,,,,,,,,,d,d,d,,d,d,d,,,d,,,d,,,d,,,d,d,d,,d,d,d,,d,d,d,,,d,,,d,,,d,,,d,d,d,,d,d,d
+,,,,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d
+,,,,,,,,,,,,d,d,d,,d,d,d,,,d,,,d,,,d,,,d,d,d,,d,d,d,,d,d,d,,,d,,,d,,,d,,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,,,,,d,d,d,,,,,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,d,d,d,d,d,d,d,d,d,d,d,,,,,,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,,,d,,,d,d,d,,,d,,,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,,d,d,,d,d,d,,d,d,,,,,,,d
+,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,d,,d,d,d,,d,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,d,d,d,,d,d,d,,d,d,,d,d,d,,d,d,,d,d,d,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,~,~,~,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,~,~,~,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,~,~,~,d,d,d,d,d,d,d,d,d,d,d,d
+#meta label(rooms)
+zone/zone
+build/build
+#zone label(zone) start(36;73) hidden()
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,b(5x5)
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1)
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,b(5x5),,,,,`,b(5x5)
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,b(5x5),,,,,`,b(5x5)
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,b(5x5),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x5)
+,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),,,`,,,`,,,`,,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),b(5x6),,`,,,`,b(5x6),,`,,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,b(5x5),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x5)
+,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`,,`,,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1)
+,,,,,,,,,,,,,,,,,,,b(5x5),,,,b(5x5),,,,,`,b(6x5),,,,,,`,b(6x5),,,,,,`,b(5x5),,,,b(5x5)
+,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,`,,`,,`,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,,`,`,`
+,,,,,,,,,,,,,,,b(5x5),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,`,,`,,`,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x5)
+,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),,,`,,,,,,,`,,,,,,,`,,,,,,,`,,,,,,,`,,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),b(5x5),,`,,b(5x5),,,,,`,b(5x5),,,,,`,`,`,b(5x5),,,,,`,b(5x5),,,,b(5x5),,`,,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,`,`,`,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1)
+,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,`,`,`,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,b(5x5),,,,b(5x5),,`,,b(4x5),,,,`,`,`,b(4x5),,,b(5x5),,`,,b(5x5)
+,,,,,,,,,,,,,,,,,,,,,,,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,T{pets=true}(1x1),,`,`,`,,T{pets=true}(1x1),`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`,,`,T{pets=true}(1x1),,`,`,`,,T{pets=true}(1x1),`,,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1)
+,,,,,,,,,,,,,,,,,,,b(5x5),,,,,`,b(5x5),,,,b(5x4),,`,,,`,`,`,b(5x4),,`,,b(5x5),,,,,`,b(5x5)
+,,,,,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,b(5x5),,`,,,`,`,`,b(5x5),,`,,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,,,,b(5x5),,,,,`,b(5x5),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x5),,,,,`,b(5x5)
+,,,,,,,,,,,,,,,,,,,,`,`,`,,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,`,`,`,,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,,,,,,,,,,b(5x5),,,,b(5x5),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x5),,,,,`,`,`,b(5x5),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x5),,,,b(5x5)
+,,,,,,,,,,,,`,`,`,,`,`,T{pets=true}(1x1),,,`,,,`,,,`,,,T{pets=true}(1x1),`,`,,`,`,`,,`,`,T{pets=true}(1x1),,,`,,,`,,,`,,,T{pets=true}(1x1),`,`,,`,`,`
+,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`
+,,,,,,,,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,T{pets=true}(1x1),b(5x6),,`,,,`,b(5x5),,`,,,T{pets=true}(1x1),`,`,,`,`,`,,`,`,T{pets=true}(1x1),b(5x5),,`,,,`,b(5x6),,`,,,T{pets=true}(1x1),`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1)
+,,,,b(5x5),,,,b(5x5),,,,,`,b(6x5),,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x4),,,,,`,`,`,b(5x4),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(6x5),,,,,,`,b(5x5),,,,b(5x5)
+,,,,,`,`,`,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,`,`,`
+,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`,,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,`,`
+b(5x5),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,`,,`,`,`,,`,,,,,,,`,,,`,`,`,,,`,,,,,,,`,,`,`,`,,`,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x5)
+,`,`,T{pets=true}(1x1),,,`,,,,,,,`,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,`,,,,,,,`,,,T{pets=true}(1x1),`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,T{pets=true}(1x1),b(5x5),,`,,b(5x5),,,,,`,b(6x5),,,,,b(5x6),,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,b(5x6),,,,b(6x5),,,,,,`,b(5x5),,,,b(5x5),,`,,,T{pets=true}(1x1),`,`
+,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,`,,`,`,`,,`,b(5x5),,,,b(5x4),,`,,,`,`,`,b(5x4),,`,,b(5x5),,,,,`,,`,`,`,,`,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1)
+,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`,,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,`,`
+,,,,,`,`,`,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,`,`,`
+,,,,,,,,,,,b(5x5),,`,,b(5x5),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x5),,,,,`,`,`,b(5x5),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x5),,,,b(5x5),,`
+,,,,,,,,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,T{pets=true}(1x1),,,`,,,`,,,`,,,T{pets=true}(1x1),`,`,,`,`,`,,`,`,T{pets=true}(1x1),,,`,,,`,,,`,,,T{pets=true}(1x1),`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1)
+,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`
+,,,,,,,,,,,,`,`,`,,`,`,T{pets=true}(1x1),b(5x5),,`,,,`,b(5x5),,`,,,T{pets=true}(1x1),`,`,,`,`,`,,`,`,T{pets=true}(1x1),b(5x5),,`,,,`,b(5x5),,`,,,T{pets=true}(1x1),`,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),b(5x6),,,,,`,`,`,b(5x6),,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,T{pets=true}(1x1)
+,,,,,,,,,,,,,,,,,,,,`,`,`,,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,`,`,`,,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,b(5x5),,,,,`,b(5x5),,,,,`,`,`,`,`,`,`,`,`,`,`,b(5x5),,,,,`,b(5x5)
+,,,,,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,,,`,,,`,`,`,,,`,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,T{pets=true}(1x1),,`,,T{pets=true}(1x1),`,`
+,,,,,,,,,,,,,,,,,,,,,,b(5x5),,`,,b(5x5),,,,,`,`,,`,`,`,,`,`,b(5x5),,,,b(5x5),,`
+,,,,,,,,,,,,,,,,,,,,,,,T{pets=true}(1x1),`,T{pets=true}(1x1),,`,`,T{pets=true}(1x1),,`,`,,`,`,`,,`,`,,T{pets=true}(1x1),`,`,,T{pets=true}(1x1),`,T{pets=true}(1x1)
+,,,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,T{pets=true}(1x1),,`,`,,`,`,`,,`,`,,T{pets=true}(1x1),`,`,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
+#build label(build) start(36;73) hidden()
+
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,h,`,f
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,b,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,n,`,n
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,f,`,n,,`,,n,`,f
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,b,`,d,`,d,`,b,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,h,`,n,,`,,n,`,h
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,h,`,f,,`,,h,`,f
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,b,`,,`,,`,b,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,n,`,n,,`,,n,`,n
+,,,,,,,,,,,,,,,,,,,,,,,,,,,f,`,n,,,d,,,`,,,d,,,n,`,f
+,,,,,,,,,,,,,,,,,,,,,,,,,,,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,h,`,n,,,d,,,`,,,d,,,n,`,h
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,n,`,n,,`,,n,`,n
+,,,,,,,,,,,,,,,,,,,,,,,,,,,h,`,f,,r,b,t,,`,,r,b,t,,h,`,f
+,,,,,,,,,,,,,,,,,,,,,,,,,,,`,b,`,,a,`,c,,`,,a,`,c,,`,b,`
+,,,,,,,,,,,,,,,,,,,,,,,,,,,n,`,n,,h,s,f,,`,,h,s,f,,n,`,n
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,,`,,,,,,,d
+,,,,,,,,,,,,,,,,,,,,h,`,f,,f,`,n,,`,,n,r,a,h,,`,,h,a,r,n,,`,,n,`,f,,h,`,f
+,,,,,,,,,,,,,,,,,,,,`,b,`,,`,b,`,d,`,d,`,b,`,s,,`,,s,`,b,`,d,`,d,`,b,`,,`,b,`
+,,,,,,,,,,,,,,,,,,,,n,`,n,,h,`,n,,`,,n,t,c,f,,`,,f,c,t,n,,`,,n,`,h,,n,`,n
+,,,,,,,,,,,,,,,,f,`,n,,,d,,,,,,,`,,,,,,,`,,,,,,,`,,,,,,,d,,,n,`,f
+,,,,,,,,,,,,,,,,`,b,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,b,`
+,,,,,,,,,,,,,,,,h,`,n,,,d,,,,,,,`,,,,,,`,`,`,,,,,,`,,,,,,,d,,,n,`,h
+,,,,,,,,,,,,,,,,,,,,n,`,n,,f,`,n,,`,,n,`,f,,`,`,`,,f,`,n,,`,,n,`,f,,n,`,n
+,,,,,,,,,,,,,,,,,,,,`,b,`,,`,b,`,d,`,d,`,b,`,,`,`,`,,`,b,`,d,`,d,`,b,`,,`,b,`
+,,,,,,,,,,,,,,,,,,,,h,`,f,,h,`,n,,`,,n,`,h,,`,`,`,,h,`,n,,`,,n,`,h,,h,`,f
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,`,`,`,,,,,,d
+,,,,,,,,,,,,,,,,,,,,,,,h,`,f,,n,`,n,,f,n,,`,`,`,,n,f,,n,`,n,,h,`,f
+,,,,,,,,,,,,,,,,,,,,,,,`,b,`,,`,b,`,,b,`,d,`,`,`,d,`,b,,`,b,`,,`,b,`
+,,,,,,,,,,,,,,,,,,,,,,,n,`,n,,h,`,f,,h,n,,`,`,`,,n,h,,h,`,f,,n,`,n
+,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,,d,,,`,`,`,,,d,,,,,,,d
+,,,,,,,,,,,,,,,,,,,,f,`,n,,`,,n,`,f,,n,`,n,,`,`,`,,n,`,n,,f,`,n,,`,,n,`,f
+,,,,,,,,,,,,,,,,,,,,`,b,`,d,`,d,`,b,`,,h,b,f,,`,`,`,,h,b,f,,`,b,`,d,`,d,`,b,`
+,,,,,,,,,,,,,,,,,,,,h,`,n,,`,,n,`,h,,,d,,,`,`,`,,,d,,,h,`,n,,`,,n,`,h
+,,,,,,,,,,,,,,,,,,,,,,,,`,,,,,,n,`,n,,`,`,`,,n,`,n,,,,,,`
+,,,,,,,,,,,,,,,,,,,,h,`,f,,`,,h,`,f,,`,b,`,,`,`,`,,`,b,`,,h,`,f,,`,,h,`,f
+,,,,,,,,,,,,,,,,,,,,`,b,`,,`,,`,b,`,,h,`,f,,`,`,`,,h,`,f,,`,b,`,,`,,`,b,`
+,,,,,,,,,,,,,,,,,,,,n,`,n,,`,,n,`,n,,,,,,`,`,`,,,,,,n,`,n,,`,,n,`,n
+,,,,,,,,,,,,h,`,f,,f,`,n,,,d,,,`,,,d,,,n,`,f,,`,`,`,,f,`,n,,,d,,,`,,,d,,,n,`,f,,h,`,f
+,,,,,,,,,,,,`,b,`,,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`,,`,`,`,,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`,,`,b,`
+,,,,,,,,,,,,n,`,n,,h,`,n,,,d,,,`,,,d,,,n,`,h,,`,`,`,,h,`,n,,,d,,,`,,,d,,,n,`,h,,n,`,n
+,,,,,,,,,,,,,d,,,,,,,n,`,n,,`,,n,`,n,,,,,,`,`,`,,,,,,n,`,n,,`,,n,`,n,,,,,,,d
+,,,,,h,`,f,,f,`,n,,`,,n,r,a,h,,r,b,t,,`,,`,b,`,,h,b,f,,`,`,`,,h,b,f,,`,b,`,,`,,r,b,t,,h,a,r,n,,`,,n,`,f,,h,`,f
+,,,,,`,b,`,,`,b,`,d,`,d,`,b,`,s,,a,`,c,,`,,h,`,f,,n,`,n,,`,`,`,,n,`,n,,h,`,f,,`,,a,`,c,,s,`,b,`,d,`,d,`,b,`,,`,b,`
+,,,,,n,`,n,,h,`,n,,`,,n,t,c,f,,h,s,f,,`,,,,,,,d,,,`,`,`,,,d,,,,,,,`,,h,s,f,,f,c,t,n,,`,,n,`,h,,n,`,n
+,f,`,n,,,d,,,,,,,`,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,`,,,,,,,d,,,n,`,f
+,`,b,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,b,`
+,h,`,n,,,d,,,,,,,`,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,`,,,,,,,d,,,n,`,h
+,,,,,n,`,n,,f,`,n,,`,,n,r,a,h,,h,s,f,,`,,,,,,,d,,,`,`,`,,,d,,,,,,,`,,h,s,f,,h,a,r,n,,`,,n,`,f,,n,`,n
+,,,,,`,b,`,,`,b,`,d,`,d,`,b,`,s,,a,`,c,,`,,h,`,f,,n,`,n,,`,`,`,,n,`,n,,h,`,f,,`,,a,`,c,,s,`,b,`,d,`,d,`,b,`,,`,b,`
+,,,,,h,`,f,,h,`,n,,`,,n,t,c,f,,r,b,t,,`,,`,b,`,,h,b,f,,`,`,`,,h,b,f,,`,b,`,,`,,r,b,t,,f,c,t,n,,`,,n,`,h,,h,`,f
+,,,,,,,,,,,,,d,,,,,,,n,`,n,,`,,n,`,n,,,,,,`,`,`,,,,,,n,`,n,,`,,n,`,n,,,,,,,d
+,,,,,,,,,,,,n,`,n,,f,`,n,,,d,,,`,,,d,,,n,`,f,,`,`,`,,f,`,n,,,d,,,`,,,d,,,n,`,f,,n,`,n
+,,,,,,,,,,,,`,b,`,,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`,,`,`,`,,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`,,`,b,`
+,,,,,,,,,,,,h,`,f,,h,`,n,,,d,,,`,,,d,,,n,`,h,,`,`,`,,h,`,n,,,d,,,`,,,d,,,n,`,h,,h,`,f
+,,,,,,,,,,,,,,,,,,,,n,`,n,,`,,n,`,n,,,,,,`,`,`,,,,,,n,`,n,,`,,n,`,n
+,,,,,,,,,,,,,,,,,,,,`,b,`,,`,,`,b,`,,h,s,f,,`,`,`,,h,s,f,,`,b,`,,`,,`,b,`
+,,,,,,,,,,,,,,,,,,,,h,`,f,,`,,h,`,f,,a,`,c,,`,`,`,,a,`,c,,h,`,f,,`,,h,`,f
+,,,,,,,,,,,,,,,,,,,,,,,,`,,,,,,r,b,t,d,`,`,`,d,r,b,t,,,,,,`
+,,,,,,,,,,,,,,,,,,,,f,`,n,,`,,n,`,f,,n,`,n,,`,`,`,,n,`,n,,f,`,n,,`,,n,`,f
+,,,,,,,,,,,,,,,,,,,,`,b,`,d,`,d,`,b,`,,,d,,,`,`,`,,,d,,,`,b,`,d,`,d,`,b,`
+,,,,,,,,,,,,,,,,,,,,h,`,n,,`,,n,`,h,,`,`,`,,`,`,`,,`,`,`,,h,`,n,,`,,n,`,h
+,,,,,,,,,,,,,,,,,,,,,,,,d,,,,,,,`,`,,`,`,`,,`,`,,,,,,,d
+,,,,,,,,,,,,,,,,,,,,,,,n,`,n,,f,`,n,,`,`,,`,`,`,,`,`,,n,`,f,,n,`,n
+,,,,,,,,,,,,,,,,,,,,,,,`,b,`,,`,b,`,d,`,`,,`,`,`,,`,`,d,`,b,`,,`,b,`
+,,,,,,,,,,,,,,,,,,,,,,,h,`,f,,h,`,n,,`,`,,`,`,`,,`,`,,n,`,h,,h,`,f
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
diff --git a/data/blueprints/dreamfort.csv b/data/blueprints/dreamfort.csv
new file mode 100644
index 000000000..22b78230a
--- /dev/null
+++ b/data/blueprints/dreamfort.csv
@@ -0,0 +1,2994 @@
+#notes label(help) run me for the dreamfort walkthrough
+"Welcome to Dreamfort! These blueprints will help you build a functional, secure, fully self-sustaining fortress that you can use as-is or extend to build the fortress of your dreams!"
+""
+"It can be difficult to apply a set of blueprints that you did not write yourself. This walkthrough will guide you through the high-level steps of building Dreamfort. Run ""gui/quickfort dreamfort /checklist"" (or, if you're looking at the online version, switch to the ""checklist"" sheet) for a compact list of the blueprints you'll be applying. Each level also has its own mini-walkthrough with more details."
+""
+"The final fort will have a walled-in area on the surface for livestock, trading, aboveground farming, and military training. One z-level down is the farming level, with related workshops and vents up to the surface for miasma prevention. The farming level also has a miniature dining hall and dormitory for use until you get the services and housing levels set up."
+""
+"Beyond those two, the other layers can be built in any order, at any z-level, according to your preference and the layout peculiarities of your embark site:"
+"- The industry level has a compact, but complete set of workshops and stockpiles (minus what is already provided on the farming level)."
+"- The services level has dining, hospital, marksman barracks, and justice services. It has a well system and is 4 z-levels deep."
+"- The guildhall level has large rooms for building libraries, temples, and guildhalls, with optional furniture layouts."
+- The suites level has fancy rooms for your nobles with the furniture that they require.
+- The apartments levels have small but well-furnished bedrooms for your other dwarves.
+- The crypt level houses your dead.
+""
+"Run each level's ""help"" blueprint (e.g. ""gui/quickfort dreamfort /surface_help"") for more details."
+""
+"Dreamfort has a central stairs-based design. For all Dreamfort levels, place the cursor on the center (undug) tile of the 3x3 stairs area when you apply the blueprints for that level. The first surface blueprint will designate a column of stairs that you can use as a guide. If you need to extend the stairs down further to lower levels, run ""gui/quickfort dreamfort /central_stairs"" and set the repeat option to go down however many levels you need (each repetition is 2 levels). Apply it with the cursor on the z-level below the lowest current stairs."
+""
+"Dreamfort blueprints take care of everything to get the fort up and running. You don't need to clear any extra trees or create any extra buildings or stockpiles (though of course you are free to do so). Blueprints that do require manual steps, like 'assign minecart to hauling route', will leave a message telling you so when you run them. Note that blueprints will designate buildings to build even if you don't have the materials needed to build them. You can use the ""o"" hotkey to automatically create the manager orders for all the needed items when you have a blueprint loaded in gui/quickfort. Make sure your manager is available to validate all the incoming work orders!"
+""
+"There are some tasks common to all forts that Dreamfort doesn't specifically handle for you. For example, Dreamfort sets up a barracks, but managing squads is up to you. Here are some other common tasks that may need to be done manually (or with some other tool):"
+- Exploratory mining for specific resources like iron (see gui/design for help with this)
+"- Filling the well system with water (if you have a light aquifer, see library/aquifer_tap.csv for help with this)"
+- Bringing magma up to the industry level to power magma forges/furnaces (see library/pump_stack.csv for help with this)
+- Manufacturing trade goods
+"- Custom stockpile setups to assist with, for example, encrusting only high-quality items"
+""
+"Dreamfort works best at an embark site that is relatively flat and has at least one soil layer. New players should avoid embarks with aquifers if they are not prepared to deal with them. Bring picks for mining, an axe for woodcutting, and an anvil for a forge. Bring a few blocks to speed up initial workshop construction as well. That's all you really need, but see the example embark profile in the online spreadsheets for a more complete setup."
+""
+"Other DFHack tools also work very well with Dreamfort, such as autofarm. See the /setup_help blueprint for a suggested list to turn on in the DFHack gui/control-panel."
+""
+"Once you have your starting surface workshops up and running, you might want to configure buildingplan to only use blocks for constructions so it won't use your precious wood, boulders, and bars to build floors and walls. If you bring at least 7 blocks with you on embark, you can set this to be your default in the Autostart tab of gui/control-panel."
+""
+"Directly after embark, run ""gui/quickfort dreamfort /setup_help"" to get some advice on initial settings, and get started building your fort with ""gui/quickfort dreamfort /surface1"" on the surface (see /surface_help for how to select a good spot). Read the walkthroughs for each level to understand what's going on and follow the checklist to keep track of where you are in the building process. Good luck, and have fun building an awesome Dreamfort-based fort!"
+""
+"The dreamfort.csv file distributed with DFHack is generated from online spreadsheet files. If you want to look at how these blueprints are put together, it is easier to look at the online spreadsheets than the giant .csv. You can view them at: https://drive.google.com/drive/folders/1dsmvnzbOKsyFS3DCj0F8ibSnMhVHEjdV"
+You are welcome to copy the Dreamfort spreadsheets and make your own modifications!
+""
+"If you like, you can download a fully built Dreamfort-based fort from https://dffd.bay12games.com/file.php?id=15434 and explore it
+interactively."
+"# The dreamfort.csv distributed with DFHack is generated with the following command:
+  for fname in dreamfort*.xlsx; do xlsx2csv -a -p '' ""$fname""; done | sed 's/,*$//'"
+#notes label(checklist) command checklist
+"Here is the recommended order for Dreamfort commands. Each line is a blueprint that you run with gui/quickfort (default keybinding: Ctrl-Shift-Q), except where we use other tools as noted. If you set ""dreamfort"" as the filter when you open gui/quickfort, you'll conveniently only see Dreamfort blueprints to choose from. See the walkthroughs (the ""help"" blueprints) for context and details. You can also copy text from this spreadsheet online and paste it in gui/launcher with Ctrl-V."
+"If the checklist indicates that you should generate orders, that means to hit the ""o"" hotkey when the blueprint is loaded in gui/quickfort. You'll get a popup saying which orders were generated. Also remember to read the messages the blueprints display after you run them so you don't miss any important manual steps!"
+""
+-- Preparation (before you embark!) --
+Optionally copy the premade Dreamfort embark profile from the online spreadsheets to the prefs/embark_profiles.txt file.
+Run gui/control-panel and enable settings on the Autostart tab. See the /setup_help notes for details.
+""
+-- Set settings and preload initial orders --
+DFHack command,Blueprint,Generate orders,Notes
+gui/quickfort,/setup_help,,For advice on how to do initial setup for success.
+"quickfort orders library/dreamfort.csv -n ""/surface2, /farming2, /surface3, /industry2, /surface4, /industry3""",,,"Queue up orders required to get the fort minimally functional and secure. You can remove the order for the anvil (you brought one with you, right?)."
+""
+-- Find a good starting spot on the surface --
+DFHack command,Blueprint,Generate orders,Notes
+gui/quickfort,/perimeter,,Run at embark. Don't actually apply the blueprint -- it's way too early to dedicate resources to building walls. Just use the preview shadow to find a good spot on the surface.
+""
+-- Dig  --
+DFHack command,Blueprint,Generate orders,Notes
+gui/quickfort,/surface1,,Clear some trees and dig central staircase. Run when you find your center tile. Deconstruct your wagon if it is in the way.
+gui/quickfort,/dig_all,,"Run when you find a suitable (non-aquifer) rock layer for the industry level. It designates digging for industry, services, guildhall, suites, apartments, and the crypt all in one go. This list does not include the farming level, which we'll designate in the uppermost soil layer once the surface miasma channels are dug. Note that it is more efficient for your miners if you designate the digging for a level before they dig the central stairs past that level. The stairs down on each level are designated at priority 5 instead of the regular priority 4. This lets the miners focus on one z-level at a time and not run up and down the stairs attempting to dig out two blueprints simultaneously. If you need to designate your levels individually due to caverns interrupting the sequence or just because it is your preference, run the level-specific dig blueprints (i.e. /industry1, /services1, /guildhall1, /suites1, 3 levels of /apartments1, and /crypt1) instead of running /dig_all."
+""
+-- Core fort (should finish at about the third migration wave) --
+DFHack command,Blueprint,Generate orders,Notes
+gui/quickfort,/surface2,,"Build starter workshops/stockpiles and dig miasma vents. Run after initial trees are cleared. If you are deconstructing the wagon, do it before running this blueprint so the jobs that depend on scattered wagon contents (e.g. blocks) don't get canceled later."
+gui/quickfort,/farming1,,Dig out the farming level. Run when channels on the surface are dug and the additional designated trees are cleared.
+gui/quickfort,/farming2,,Build farming level. Run as soon as the farming level has been completely dug out.
+gui/quickfort,/surface3,,Cover the miasma vents and start protecting the central staircase from early invasions. Run right after /farming2.
+gui/quickfort,/industry2,,Build industry level. Run as soon as the industry level has been completely dug out.
+prioritize ConstructBuilding,,,"To get those workshops up and running ASAP. You may have to run this several times as the materials for the building construction jobs become ready. As industry workshops are built, you can remove the temporary workshops and stockpiles on the surface. Be sure that there are no items attached to jobs left in the surface workshops before deconstructing them, otherwise you'll get canceled jobs!"
+gui/quickfort,/surface4,,Finish protecting the staircase and lay flooring for future buildings. Run after the walls and floors around the staircase are built and you have moved production from the surface to the industry level.
+gui/quickfort,/industry3,,Build the rest of the industry level. Run once /surface4 is mostly complete.
+orders import library/basic,,,"Run after the first migration wave, so you have dwarves to do all the basic tasks. Note that this is the ""orders"" plugin, not the ""quickfort orders"" command."
+gui/quickfort,/services2,Yes,"Build simple hospital and dining room, including a well. Run once the 4 services levels have been dug out and you have built up some stone in your industry stone stockpiles. Feel free to remove the orders for the ropes if you already brought them with you. If you are filling your wells from an aquifer or stream, now is also a good time to start digging the plumbing."
+gui/quickfort,/surface5,Yes,"Build surface buildings, drawbridges, and furniture. Run when all marked trees on the surface are chopped down and previously-designated walls and floors have been constructed. Be sure to check that the little ""wing"" of roof section over the future barracks is constructed so we can place the barracks beds."
+prioritize ConstructBuilding,,,Run when you see the bridges ready to be built so the busy masons come and build them.
+gui/quickfort,/surface6,Yes,Build security perimeter. Run once you have linked all levers to their respective bridges.
+gui/quickfort,/surface7,Yes,Build roof. Run after the surface walls are completed and any marked trees are chopped down. Be sure to give your haulers some time to fill the stonecutter's stockpile with some stone first so your stonecutters won't be hauling it up from the depths by hand.
+""
+-- Plumbing --
+"If you haven't done it already, this is a good time to fill your well cisterns, either with a bucket brigade or by routing water from a freshwater stream or an aquifer (see the aquifer_tap library blueprint for help with this)."
+Also consider bringing magma up to your services level so you can replace the forge and furnaces on your industry level with more powerful magma versions. This is especially important if your embark has insufficient trees to convert into charcoal. Keep in mind that moving magma is a tricky process and can take a long time. Don't forget to continue making progress through this checklist!
+""
+-- Mature fort (fourth migration wave onward) --
+"The order of steps in this section is not important. Feel free to reorder as per the needs of your fort. Once you have about 50 dwarves, you can queue up as much as you want and your haulers will be able to keep your stonecutters supplied. You can even build another two Stonecutter's workshops to speed things along. You might need to dig a quarry on an unused level to get enough stone, though."
+DFHack command,Blueprint,Generate orders,Notes
+orders import library/furnace,,,Automated production of basic furnace-related items. Don't forget to create a sand collection zone (or remove the sand- and glass-related orders if you have no sand).
+gui/quickfort,/guildhall2_default,Yes,"Build library and non-denominational temple, and prepare space for future needed temples and guildhalls. Run when the guildhall level has been dug out."
+gui/quickfort,/services3,Yes,"Extend the dining room and hospital, and start the jail. Run when your population grows to about 20."
+gui/quickfort,/apartments2,Yes,Build and zone bedrooms. Run when the first apartment level has been dug out and you have outgrown your starter dormintory.
+gui/quickfort,/suites2,Yes,Build rooms that you can zone for your nobles. Run when the suites level has been dug out and you are approaching a population of 50.
+gui/quickfort,/crypt2,Yes,Build a small group of tombs. Run when the crypt level has been dug out and you have outgrown your starter tomb on the farming level.
+gui/quickfort,/surface8,Yes,"Build extended trap corridors. If you have a strong military, you might not need this."
+gui/quickfort,/farming3,Yes,Add in all the doors we couldn't afford to build earlier.
+orders import library/military,,,Automated production of military equipment. Turn on automelt in the meltables piles on the industry level to automatically upgrade all metal military equipment to masterwork quality. These orders are optional if you are not using a military.
+orders import library/smelting,,,Automated production of all types of metal bars.
+gui/quickfort,/services4,Yes,Build full dining room and jail.
+orders import library/rockstock,,,Maintains a small stock of all types of rock furniture. Useful for filling out future guildhalls.
+orders import library/glassstock,,,Maintains a small stock of all types of glass furniture and parts (only import if you have sand).
+gui/quickfort,/apartments2,Yes,Repeat as needed as your fort grows.
+gui/quickfort,/crypt3,Yes,Run when the crypt is starting to run out of free tombs.
+""
+See this checklist online at https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569
+#notes label(setup_help)
+These are Dreamfort's suggestions for adjustments to settings and initial setup.
+""
+You can save some time by setting up your settings in gui/control-panel before you embark.
+"Beyond the bugfix tools that are enabled by default, we recommend enabling the following DFHack tools in gui/control-panel (but they are not required if you prefer to do these things manually):"
+""
+"On the gui/control-panel ""Autostart"" tab, additionally enable:"
+- autobutcher
+- autobutcher target 10 10 14 2 BIRD_GOOSE
+- autochop
+- autofarm
+- autofish
+- autonestbox
+- autoslab
+- ban-cooking all
+- buildingplan set boulders false
+- buildingplan set logs false
+- dwarfvet
+- nestboxes
+- prioritize
+- seedwatch
+- suspendmanager
+- tailor
+"Note that if you've already started your fort and have missed the ""new fort"" trigger, you can enable these tools on the ""Fort"" tab instead. You can run the one-time commands (like ban-cooking all) manually from gui/launcher."
+""
+"On the gui/control-panel ""Maintenance"" tab, enable:"
+- everything
+""
+"On the gui/control-panel ""System"" tab, additionally enable:"
+- work-now
+""
+"Now, after you've arrived at your embark site, open the nobles screen and:"
+"- Assign dwarves to at least manager, chief medical dwarf, broker, and bookkeeper noble roles (they can all be the same dwarf)"
+""
+On the work details screen (Labor -> Work details)
+  - Specialize your miners (click the hammer-lock button so it turns red) and make your miners also engravers (they'll need something to do once the mining is done)
+  - Deselect fishing from all dwarves -- you have enough food to get started and you'll need their time for hauling
+""
+In standing orders (Labor -> Standing orders):
+"  - Change ""Automatically weave all thread"" to ""No automatic weaving"" so the hospital always has thread -- we'll be managing cloth production with automated orders"
+"- On the ""Other"" tab, change ""Everybody harvests"" to ""Only farmers harvest"""
+"#meta label(dig_all) start(central stairs on industry level) dig industry, services, guildhall, suites, apartments, and crypt levels. does not include farming."
+# Note that this blueprint will only work for the unified dreamfort.csv. It won't work for the individual .xlsx files (since #meta blueprints can't cross file boundaries).
+""
+/industry1
+#>
+/services1
+#>4
+/guildhall1
+#>
+/suites1
+#>
+/apartments1 repeat(down 3)
+#>3
+/crypt1
+#ignore
+"Here are the most important skills for getting Dreamfort up and running, along with suggestions for how to distribute them."
+""
+Manager / Bookkeeper / Broker,Miner,Miner,Mason,Smith,Outdoorsdwarf,Farmer
+Mechanic,Miner,Miner,Stonecutter,Weaponsmith,Carpenter,Stonecutter
+Stonecrafting,Engraver,Engraver,Mason,Armorsmith,Wood Cutter,Planter
+""
+"The most time-consuming tasks in early Dreamfort are: mining, chopping down trees, and making blocks. Starting with at least two miners, two woodcutters (assuming your embark has trees), and two stonecutters helps keep the fort from stalling. If you have to smooth walls to prevent a light aquifer from flooding your fort, starting with a few engravers saves a ton of time."
+""
+We suggest bringing at least:
+2 picks,for the two miners
+2 battleaxes,for two active woodcutters
+1 anvil,for the forge
+food and seeds,as per usual
+4 ropes,"for the hospital well and traction benches. you could build the ropes out of raw materials, but dwarves are usually too busy to do textile work at the start of the game."
+7 blocks,for starting workshops and the temporary trade depot. necessary if you have buildingplan configured for blocks only.
+many boulders,for quickly turning into more blocks while your miners are digging in dirt or dealing with aquifers. blocks are the limiting factor in the early stages.
+dogs and cats,for protection and vermin control
+geese,for bones and leather. bring at least 1 male and 2 females for the 2 early nestboxes.
+""
+Also bring logs for beds if embarking in an area without many trees.
+""
+See ldog's Dreamfort embark profile for a more advanced (and more thoroughly explained!) approach:
+https://drive.google.com/file/d/1Et42JTzeYK23iI5wrPMsFJ7lUXwVBQob/view?usp=sharing
+"#ignore Add these lines to the bottom of your ""prefs/embark_profiles.txt"" file to make the ""Dreamfort"" profile available in-game. Also see ldog's dreamfort embark profile for a more advanced, dwarfy approach."
+[PROFILE]
+[TITLE:Dreamfort]
+[SKILL:1:STONECRAFT:1]
+[SKILL:1:MECHANICS:5]
+[SKILL:1:JUDGING_INTENT:1]
+[SKILL:1:APPRAISAL:1]
+[SKILL:1:ORGANIZATION:1]
+[SKILL:1:RECORD_KEEPING:1]
+[SKILL:2:MINING:5]
+[SKILL:2:ENGRAVE_STONE:4]
+[SKILL:2:SWIMMING:1]
+[SKILL:3:MINING:5]
+[SKILL:3:ENGRAVE_STONE:4]
+[SKILL:3:SWIMMING:1]
+[SKILL:4:MASONRY:2]
+[SKILL:4:MILITARY_TACTICS:5]
+[SKILL:4:CUT_STONE:3]
+[SKILL:5:FORGE_WEAPON:5]
+[SKILL:5:FORGE_ARMOR:5]
+[SKILL:6:WOODCUTTING:5]
+[SKILL:6:CARPENTRY:5]
+[SKILL:7:PLANT:5]
+[SKILL:7:CUT_STONE:5]
+[ITEM:10:CLOTH:NONE:CREATURE_MAT:SPIDER_CAVE:SILK]
+[ITEM:100:WOOD:NONE:PLANT_MAT:WILLOW:WOOD]
+[ITEM:30:BLOCKS:NONE:INORGANIC:QUARTZITE]
+[ITEM:21:SEEDS:NONE:PLANT_MAT:MUSHROOM_HELMET_PLUMP:SEED]
+[ITEM:21:SEEDS:NONE:PLANT_MAT:GRASS_TAIL_PIG:SEED]
+[ITEM:21:SEEDS:NONE:PLANT_MAT:GRASS_WHEAT_CAVE:SEED]
+[ITEM:21:SEEDS:NONE:PLANT_MAT:POD_SWEET:SEED]
+[ITEM:20:SEEDS:NONE:PLANT_MAT:BUSH_QUARRY:SEED]
+[ITEM:20:SEEDS:NONE:PLANT_MAT:MUSHROOM_CUP_DIMPLE:SEED]
+[ITEM:1:ANVIL:NONE:INORGANIC:IRON]
+[ITEM:2:WEAPON:ITEM_WEAPON_AXE_BATTLE:INORGANIC:COPPER]
+[ITEM:2:WEAPON:ITEM_WEAPON_PICK:INORGANIC:COPPER]
+[ITEM:20:DRINK:NONE:PLANT_MAT:GRASS_TAIL_PIG:DRINK]
+[ITEM:20:DRINK:NONE:PLANT_MAT:MUSHROOM_HELMET_PLUMP:DRINK]
+[ITEM:20:DRINK:NONE:PLANT_MAT:POD_SWEET:DRINK]
+[ITEM:20:DRINK:NONE:PLANT_MAT:GRASS_WHEAT_CAVE:DRINK]
+[ITEM:30:PLANT:NONE:PLANT_MAT:MUSHROOM_HELMET_PLUMP:STRUCTURAL]
+[ITEM:45:BOULDER:NONE:INORGANIC:QUARTZITE]
+[ITEM:20:THREAD:NONE:CREATURE_MAT:SPIDER_CAVE:SILK]
+[ITEM:4:CHAIN:NONE:CREATURE_MAT:SPIDER_CAVE:SILK]
+[PET:2:DOG:FEMALE:STANDARD]
+[PET:1:DOG:MALE:STANDARD]
+[PET:2:CAT:FEMALE:STANDARD]
+[PET:1:CAT:MALE:STANDARD]
+[PET:2:BIRD_GOOSE:FEMALE:STANDARD]
+[PET:2:BIRD_GOOSE:MALE:STANDARD]
+#notes label(surface_help)
+Sets up a protected entrance to your fort in a flat area on the surface.
+Screenshot: https://drive.google.com/file/d/1dlu3nmwQszav-ZaTx-ac28wrcaYBQc_t
+""
+Features:
+- A starting set of workshops and stockpiles (which you can later remove once you establish your permanent workshops and storage)
+"- Livestock grazing area, nestbox zones, and beehives"
+"- Walls, roof, and lever-controlled gates for security"
+- Barracks (with prisoner processing quantum dump)
+- Trap-filled hallways for invaders
+- Optional extended trap hallways (to handle larger sieges with a smaller/no military)
+"- Protected trade depot, with separate trade goods stockpiles for organics and inorganics (for easy elven trading)"
+- A grid of small farm plots for lucrative surface farming
+"- A burrow named ""Inside+"" that grows with your fort as you dig it out. It is pre-registered as a civilian alert burrow so you can use it to get your civilians to safety during sieges."
+"- A burrow named ""Clearcutting area"" that is automatically registered with autochop (if you have it enabled) to keep the area around your fort clear of trees"
+""
+Manual steps you have to take:
+"- Assign grazing livestock to the large pasture, dogs to the pasture over the central stairs, and male birds to the zone between the rows of nestboxes (DFHack's autonestbox will auto-assign the female egg-laying birds to the nestbox zones)"
+- Connect levers to the drawbridges that match the names of the levers
+- Assign minecarts to the trade goods and prisoner processing quantum stockpile hauling routes with assign-minecarts all
+""
+Be sure to choose an embark site that has a flat area on the surface large enough to use these blueprints!
+""
+Surface Walkthrough:
+"1) Choose a tile for your central fortress stairs. The terrain around that tile should be perfectly flat. Trees are ok, but no slopes, rivers, or ponds. To be sure that the tile you've chosen is in a good spot, run ""gui/quickfort dreamfort /perimeter"". This will show you the eventual boundaries of the fort. Some wall segments might be missing due to existing trees, but that's ok. Make sure the area within the exterior wall is flat. Cancel out of the preview. You don't actually need to apply this blueprint."
+""
+"2) With the cursor on the chosen tile, run /surface1 to clear surrounding trees and set up your pastures. Deconstruct your wagon to get it out of the way of our upcoming walls and floors. Remember to assign your dogs to the pasture around the staircase and your grazing animals to the large pasture. Your egg-layers will automatically get assigned to nestbox zones once the nestboxes are built, so you don't need to worry about them. You can let your cats roam free to chase vermin."
+""
+"3) Once the marked trees have been cleared, run /surface2 to setup starting workshops/stockpiles, channel out the miasma vents for the farming level, and start clearing trees from a larger area. If you haven't done it already, now is a good time to configure buildingplan to only build buildings with blocks, not logs or raw boulders. Generate manager orders for /surface2."
+""
+"4) Once the channels are dug out and the trees are cleared, start digging the farming level one z-level down. Once you have run /farming2, come back to the surface and run /surface3 to cover the vents and build an enclosure around your central stairs. Although the vents will be covered with flooring, they will still work to prevent miasma on the farming level. Generate manager orders for /surface3."
+""
+"5) Once all walls and floors have been constructed around the stairwell, run /surface4 to build floors and walls to support upcoming buildings and furniture. Generate manager orders for /surface4."
+""
+"6) Once walls and floors have been constructed (including the small roof segment one z-level up over the barracks), run /surface5 to build furniture, gates, and the permanent trade depot. Remember to deconstruct the temporary trade depot once nobody is using it. Generate manager orders for /surface5."
+""
+"7) Once all marked trees are cleared, run /surface6 to build the security perimeter and remaining flooring. Generate manager orders for /surface6."
+""
+"8) Once you have enough dwarves to do a lot of building without starving other important tasks, run /surface7 to build the roof. Generate manager orders for /surface7."
+""
+"9) For extra security, you can run /surface8 any time after /surface7 to extend the trap corridors. Generate manager orders for /surface8."
+""
+"10) Once your industry and farming levels are set up and running, you can disassemble the surface workshops and remove the surface stockpiles. Disassembling a workshop scatters the items stored within it and cancels any pending jobs that happen to use those items. In order to avoid job cancellations, first set the surface workshops to not accept general work orders (click on the building, select the ""Work orders"" tab, and set the ""General work orders allowed"" to 0). Then check to see if any items in a workshop are marked as being part of an active job. Once no items in the workshop have that marker, you are free to disassemble that workshop."
+""
+Sieges and Prisoner Processing:
+Here are some tips and procedures for handling seiges -- including how to clean up afterwards!
+""
+"- Your ""Inside+"" burrow will automatically grow with your fort and should include only safe areas of your fort. In particular, it should not include the ""atrium"" area (where the ""siege bait"" pasture is) or the trapped hallways."
+""
+"- When a siege begins, set your civilian alert (attach the alert to your ""Inside+"" burrow if it isn't already) to ensure all your civilians stay out of danger. Immediately pull the lever to close the outer main gate. It is also wise to close the trade depot and inner main gate as well. That way, if enemies get past the traps, they'll have to go through the soldiers in your barracks (assuming you have a military)."
+""
+"- During a siege, you can use the levers to control how attackers path through the trapped corridors. If there are more enemies than cage traps, time your lever pulling so that the inner gates snap closed before your last cage trap is sprung. Then the remaining attackers will have to backtrack and go through the other trap-filled hallway. You can also choose *not* to use the trap hallways and meet the siege with your military. It's up to you!"
+""
+"- If your cage traps fill up, ensure your hallways are free of uncaged attackers, then close the trap hallway outer gates and open the inner gates. Clear the civilian alert and allow your dwarves to reset all the traps -- make some extra cages in preparation for this! Then re-enable the civilian alert and open the trap hallway outer gates."
+""
+"- Once the last attacker is caged, open all the gates and unset the civilian alert. Life is normal again!"
+""
+"After a siege, you can use the caged prisoners to safely train your military. Here's how:"
+""
+"- Once the prisoners are hauled to the ""prisoner quantum"" stockpile in the barracks, run ""stripcaged all"" in DFHack's gui/launcher."
+""
+"- After all the prisoners' items have been confiscated, bring your military dwarves to the barracks (if they aren't already there)."
+""
+- Assign a group of prisoners to the pasture that overlaps the prisoner quantum stockpile
+""
+"- Hauler dwarves will come and release prisoners one by one. Your military dwarves will immediately pounce on the released prisoners and chop them to bits, saving the hauler dwarves from being attacked. Repeat until all prisoners have been ""processed"". Some prisoners are not directly hostile (like cavern-caught gorlaks) and you may need to be target them explicitly to get your soldiers to attack them."
+#dig label(central_stairs_odd) start(2;2) hidden() carved spiral stairs odd levels
+`,j6,`
+u,`,u
+`,j6,`
+#meta label(central_stairs_even) hidden() carved spiral stairs even levels
+/central_stairs_odd transform(cw)
+#meta label(central_stairs) two levels of carved spiral stairs (repeat down as needed)
+/central_stairs_odd
+#>
+/central_stairs_even
+#build label(central_stairs_odd_constructed) start(2;2) hidden() constructed spiral stairs odd levels
+`,Cd,`
+Cu,`,Cu
+`,Cd,`
+#meta label(central_stairs_even_constructed) hidden() constructed spiral stairs even levels
+/central_stairs_odd_constructed transform(cw)
+#meta label(central_stairs_constructed) two levels of constructed spiral stairs (repeat down as needed)
+/central_stairs_odd_constructed
+#>
+/central_stairs_even_constructed
+"#meta label(perimeter) start(central stairs) message(If you accidentally applied this blueprint to the map, run quickfort undo on this blueprint to clean up.) show the eventual perimeter of the surface fort; useful for location scouting"
+walls/surface_walls
+corridor_gates/surface_corridor_gates
+corridor/surface_corridor
+corridor_traps/surface_corridor_traps
+""
+"#meta label(surface1) start(central stairs)
+message(Once the central stairs are mined out deeply enough, you should start digging the industry level in a non-aquifer rock layer. You'll need the boulders from the digging to make blocks.
+If your wagon is within the fort perimeter, deconstruct it to get it out of the way.
+Once the marked trees are all chopped down (if any), continue with /surface2.) clear trees and set up pastures"
+clear_small/surface_clear_small
+burrow_start/surface_burrow_start
+zones/surface_zones
+#>
+central_stairs/central_stairs repeat(down 10)
+""
+"#meta label(surface2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
+Once the channels are dug out and the marked trees are cleared, continue with /surface3.) set up starting workshops/stockpiles, channel miasma vents, and clear more trees"
+place_start/surface_place_start
+build_start/surface_build_start
+channel/surface_channel
+clear/surface_clear
+""
+"#meta label(surface3) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
+Once the walls and floors around the staircase have been constructed, continue with /surface4.) Cover vents and protect the central stairs."
+cover_vents/surface_cover_vents
+cover_stairs/surface_cover_stairs
+""
+"#meta label(surface4) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
+Once the bits of flooring have been constructed, continue with /surface5. Be sure to check one z-level above the surface to ensure the roof segment above the future barracks has been finished.) build walls and flooring to support upcoming buildings and furniture"
+stairs_doors/surface_stairs_doors
+pre_building/surface_pre_building
+""
+"#meta label(surface5) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
+Disassemble the temporary trade depot in the pasture once the new one is constructed (and no merchants are using the old one).
+Once the marked trees are cleared, continue with /surface6.) build gates, furniture, and trade stockpile/depot"
+traffic/surface_traffic
+place/surface_place
+build/surface_build
+clear_large/surface_clear_large
+""
+"#meta label(surface6) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
+Continue with /surface7 sometime after the walls are completed and any marked trees are chopped down, whenever you have enough dwarves to build the roof without starving other important construction tasks.) build traps and remaining walls/floors"
+walls/surface_walls
+floors/surface_floors
+traps/surface_traps
+clear_large/surface_clear_large
+""
+"#meta label(surface7) start(central stairs (on ground level)) message(Remember to enqueue manager orders for this blueprint.
+For extra security, you can run /surface8 at any time to extend the trap corridors.) expand Inside+ burrow to safe surface areas and build roof"
+burrows/surface_burrows
+#<
+roof/surface_roof
+roof2/surface_roof2
+roof3/surface_roof3
+roof4/surface_roof4
+""
+#meta label(surface8) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) build extended trap corridors
+corridor_gates/surface_corridor_gates
+corridor/surface_corridor
+corridor_traps/surface_corridor_traps
+#dig label(surface_clear_small) start(19; 19) hidden() clear trees for starting workshops and stockpiles
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,t1(25x11),,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,t1,`,`,`,`,`,`,,`,,`,`,`,`,`,t1,`,`,`,t1,`,`,,`
+,,,`,,`,,`,t1,t1,,,,,,`,t1,t1,t1,t1,t1,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,t1,t1,t1,t1,t1,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,t1,j,t1,j,t1,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,t1,t1,t1,t1,t1,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,t1,t1,t1,t1,t1,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,t1,,,,,,t1,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,t1,t1,,,,,,t1,t1,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,t1,t1,,t1,t1,t1,,t1,t1,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,t1,t1,t1,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,t1,,,t1,t1,t1,,,t1,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,t1,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#burrow label(surface_burrow_start) start(19; 19) hidden() create safety burrow that will grow with your fort
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,`,`,,`,`,,`
+,,,`,,`,,`,,,,,,,,`,a{name=Inside+ create=true civalert=true}(5x5),,,,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,~,,~,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+"#zone label(surface_zones) start(19; 19) hidden() message(Remember to assign your dogs to the pasture surrounding the central stairs, your grazing animals to the large pasture, and your male birds to the zone between the rows of nestboxes. If your wagon is far away, you can let your animals wander closer to the fort before pasturing them to save hauling time.) pastures and training areas"
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,"n{name=""Main pasture""}(25x11)",,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,"t{name=""Pet training area""}(9x5)",,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,"n{name=""Nestbox 1""}(1x1)","n{name=""Nestbox 2""}(1x1)","n{name=""Nestbox 3""}(1x1)","n{name=""Nestbox 4""}(1x1)","n{name=""Nestbox 5""}(1x1)","n{name=""Nestbox 6""}(1x1)","n{name=""Nestbox 7""}(1x1)",`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,"n{name=""Male birds""}(7x3)",,,,,,,,"n/guarddogs{name=""Guard dogs""}(5x1)",~,~,~,~,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,n/guarddogs(5x1),~,~,~,~,,,,,,,,,,,`,,`
+,,,`,,`,,`,"n{name=""Nestbox 8""}(1x1)","n{name=""Nestbox 9""}(1x1)","n{name=""Nestbox 10""}(1x1)","n{name=""Nestbox 11""}(1x1)","n{name=""Nestbox 12""}(1x1)","n{name=""Nestbox 13""}(1x1)","n{name=""Nestbox 14""}(1x1)",`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,"B{name=""Surface barracks""}(8x5)",,,,,,,,`,,,,,,,,`,"m{name=""Welcome area/wagon parking lot""}(8x5)",,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,"n{name=""Siege bait pasture""}",,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,"t{name=""Caged wildlife taming area""}(1x1)",,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,"n{name=""Prisoner processing pen""}(1x-2)",`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#place label(surface_place_start) start(19; 19) hidden() starting stockpiles
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,"gunzSpd{name=""Starting misc"" containers=0}(8x2)",,,,,,,,"hlr{name=""Starting cloth/trash"" containers=0}(8x2)",,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,"f{name=""Starting food""}(8x4)",,,,,,,,"w{name=""Starting wood""}(4x4)",,,,"s2{name=""Starting stone""}:=otherstone(6x4)",,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_build_start) start(19; 19) hidden() starting workshops
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,`,`,"D{name=""Starter trade depot""}",`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,,,,,,,,,,`,,`
+,,,`,,`,`,"wt{name=""Starter mechanic's""}",`,,`,"wc{name=""Starter carpenter""}",`,,`,"wr{name=""Starter craftsdwarf's""}",`,,`,"wm{name=""Starter stoneworker's"" max_general_orders=2}",`,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,N,N,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#dig label(surface_channel) start(19; 19) hidden() channel miasma vents
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,h1,`,`,`,`,`,`,,`,,`,`,`,`,`,h1,`,`,`,h1,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,h1,,,,,,h1,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,h1,h1,,,,,,h1,h1,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,h1,h1,,h1,h1,h1,,h1,h1,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,h1,h1,h1,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,h1,,,h1,h1,h1,,,h1,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,h1,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#dig label(surface_clear) start(19; 19) hidden() clear trees so the farming level can be dug without fear of generating surface holes
+
+
+,,,,t1(29x29)
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,`,`,,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,t1,t1
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,t1,t1
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,t1,t1
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,t1,t1
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,t1,t1
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,t1,t1
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,t1,t1
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,t1,t1
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,t1,t1
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+,,,,,,,,,,,,,,,t1,t1,t1,t1,t1,t1,t1
+
+#build label(surface_cover_vents) start(19; 19) hidden() cover the miasma vents
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,Cw,`,`,`,`,`,`,,`,,`,`,`,`,`,Cw,`,`,`,Cw,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,Cf,,,,,,Cf,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,Cf,Cf,,,,,,Cf,Cf,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,Cf,Cf,,Cf,Cf,Cf,,Cf,Cf,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,Cf,Cf,Cf,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,Cw,,,Cf,Cf,Cf,,,Cw,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,Cf,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_cover_stairs) start(19; 19) hidden() protect the central stairs
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,Cw,Cw,Cf,Cw,Cf,Cw,Cw,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,Cw,,,,,,Cw,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,Cf,,`,`,`,,Cf,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,Cw,,H,~,H,,Cw,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,Cf,,`,`,`,,Cf,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,Cw,,,,,,Cw,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,Cw,Cw,Cf,Cw,Cf,Cw,Cw,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_stairs_doors) start(19; 19) hidden()
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,Cr,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,d,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,d,,`,`,`,,d,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,d,,`,`,`,,d,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,d,`,d,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#<
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,Cf,`,Cf,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,Cf,`,Cf,`,`,`,`,,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_pre_building) start(19; 19) hidden() flooring and anchoring walls for future buildings/doors
+#<
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,~,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,Cf,Cf,Cf,~,~,~,~,~,~,~,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,Cf,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,Cf,`,`,`,`,~,`,~,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,Cf,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,Cf,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,Cf,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,Cf,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#>
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,Cf,,Cf,,Cf,`,Cf,Cf,,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cw,,,,,,,,,,`,`,`,,,Cf,Cf,,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,,,,,,,,`,,`,`,`,,`,Cf,Cf,,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cw,,,,,,,,,,`,`,`,,,Cf,Cf,,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,`,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,`,`,`,`,`,Cw,Cf,Cw,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,Cf,Cf,,Cf,Cf,,,,`,~,Cf,Cf,Cf,Cf,Cf,~,`,,,,,,,,,`,,`
+,,,`,,`,Cf,,,,,,,,~,~,Cf,Cf,Cf,Cf,Cf,~,~,,,,,,,,,`,,`
+,,,`,,`,Cf,,,,,,,,~,~,,~,~,~,,~,~,,,,,,,,,`,,`
+,,,`,,`,Cf,,,,,,Cf,,Cf,Cf,,~,~,~,,Cf,Cf,,,,,,,,,`,,`
+,,,`,,`,Cf,Cf,,,,,Cf,,`,,,~,~,~,,,`,Cf,,Cf,,,Cf,,Cf,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,Cf,Cf,,,,,,,,Cf,Cf,,,,~,,,,Cf,Cf,,,,,,,,Cf,Cf,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#dig label(surface_traffic) start(19; 19) hidden() set traffic designations
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,or,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,or,`,or,or,ol,ol,ol,ol,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,or,ol,ol,or,ol,ol,ol,ol,ol,ol,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,or,ol,ol,or,,,,,ol,ol,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,or,ol,ol,or,,,,,ol,ol,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,or,`,or,or,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,ol,ol,ol,ol,ol,ol,ol,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,ol,ol,ol,ol,ol,ol,ol
+,,,,,,,,,,,,,,,ol,ol,ol,ol,ol,ol,ol
+
+"#place label(surface_place) start(19; 19) hidden() message(Remember to assign minecarts to the trade goods and prisoner processing quantum stockpiles (run ""assign-minecarts all"").
+Feel free to adjust the configuration of the ""trade goods"" feeder stockpile so it accepts the item types you want to trade away. If those items types are also accepted by other stockpiles, configure those stockpiles to give to the ""trade goods"" stockpile.
+You might also want to set the ""trade goods quantum"" stockpile to autotrade.) remaining surface stockpiles"
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,"a10{name=""Pets/Prisoner feeder"" autotrain=true}(9x5)",,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,"c{name=""Organic trade goods quantum"" quantum=true}:+all",,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,"g{name=""Trade goods"" containers=0}:-cat_finished_goods/type/,core/artifact+crafts(2x3)",,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,"c{name=""Inorganic trade goods quantum"" autotrade=true quantum=true}:+all-organic",,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,"a{name=""Prisoner/cage quantum"" autotrain=true quantum=true}",,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+"#build label(surface_build) start(19; 19) hidden() message(Use autofarm to manage farm crop selection.
+Remember to connect the levers to the gates once they are built.) gates, barracks, farm area, and trade area"
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,~h{do_install=true do_gather=true}(1x1),`,~,~,N,N,N,N,N,`,"Tl{name=""Barracks gate""}",,"Tl{name=""Inner main gate""}",,"Tl{name=""Trade depo gate""}",`,"trackstopE{name=""Organic trade goods dumper"" take_from=""Trade goods"" route=""Organic trade goods quantum""}",,,~,~,~,~,~,,`,,`
+,,,`,,`,~h{do_install=true do_gather=true}(1x1),`,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),,,`,`,`,,,,,,~,~,~,~,~,,`,,`
+,,,`,,`,"~h{name=""reserved for splitting"" do_install=true}(1x1)",d,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),`,,`,`,`,,`,,,,~,~,D,~,~,,`,,`
+,,,`,,`,~h{do_install=true do_gather=true}(1x1),`,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),,,`,`,`,,,,,,~,~,~,~,~,,`,,`
+,,,`,,`,~h{do_install=true do_gather=true}(1x1),`,N,N,N,N,N,N,N,`,"Tl{name=""Left outer gate""}(1x1)","Tl{name=""Left inner gate""}(1x1)","Tl{name=""Outer main gate""}(1x1)","Tl{name=""Right inner gate""}(1x1)","Tl{name=""Right outer gate""}(1x1)",`,"trackstopE{name=""Inorganic trade goods dumper"" take_from=""Trade goods,Organic trade goods quantum"" route=""Inorganic trade goods quantum""}:-organic",,,~,~,~,~,~,,`,,`
+,,,`,,`,`,`,`,`,`,`,d,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,b,h,,a,r,,,,`,,"gw{name=""Inner main gate""}",gw,gw,gw,gw,,`,,,,,,,,,`,,`
+,,,`,,`,b,,,,,,,,"ga{name=""Barracks gate""}",ga,gw,gw,gw,gw,gw,"gd{name=""Trade depo gate""}",gd,,,,,,,,,`,,`
+,,,`,,`,b,,,,,,,,ga,ga,,,,,,gd,gd,,,,,,,,,`,,`
+,,,`,,`,b,,,,,,"trackstopS{name=""Prisoner/cage dumper"" take_from=""Pets/Prisoner feeder"" route=""Prisoner/cage quantum""}:-cat_animals/tameable",,ga,ga,,,,,,gd,gd,,,,,,,,,`,,`
+,,,`,,`,b,h,,,,,,,`,,,,,,,,`,s,,s,,,s,,s,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,"gd{name=""Left outer gate""}",gd,,,,,,,,"gd{name=""Left inner gate""}",gd,,,,,,,,"ga{name=""Right inner gate""}",ga,,,,,,,,"ga{name=""Right outer gate""}",ga,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,"gw{name=""Outer main gate""}",gw,gw,gw,gw,gw,gw,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,gw,gw,gw,gw,gw,gw,gw
+,,,,,,,,,,,,,,,gw,gw,gw,gw,gw,gw,gw
+
+#dig label(surface_clear_large) start(19; 19) hidden() clear wider area of trees
+t1(37x33)
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_walls) start(19; 19) hidden() build remaining walls
+
+
+
+,,,`,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,Cw,Cw,Cw,Cw,~,Cw,Cw,Cw,Cw,~,~,,~,,~,~,Cw,Cw,Cw,~,Cw,Cw,Cw,~,Cw,Cw,,`
+,,,`,,Cw,,Cw,,,,,,,,~,,,,,,~,,,,,,,,,,Cw,,`
+,,,`,,Cw,,~,,,,,,,,,,`,`,`,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,~,,`,`,`,,~,,,,,,,,,,Cw,,`
+,,,`,,Cw,,~,,,,,,,,,,`,`,`,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,Cw,,,,,,,,~,,,,,,~,,,,,,,,,,Cw,,`
+,,,`,,Cw,Cw,Cw,Cw,Cw,Cw,~,,~,Cw,~,~,,~,,~,~,Cw,Cw,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,Cw,,,,,,,,Cw,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
+,,,`,,Cw,,,,,,,,,~,,,,,,,,~,,,,,,,,,Cw,,`
+,,,`,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,`,`
+
+
+
+#build label(surface_floors) start(19; 19) hidden() build remaining flooring
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,~,Cf,~,Cf,~,`,~,~,Cf,~,~,~,~,~,Cf,`,,`
+,,,`,,`,,`,,,,,,,,~,Cf,Cf,Cf,Cf,Cf,~,~,~,Cf,~,~,~,~,~,Cf,`,,`
+,,,`,,`,,~,,,,,,,,`,Cf,`,Cf,`,Cf,`,~,~,Cf,~,~,~,~,~,Cf,`,,`
+,,,`,,`,,`,,,,,,,,~,Cf,Cf,Cf,Cf,Cf,~,~,~,Cf,~,~,~,~,~,Cf,`,,`
+,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,~,~,Cf,~,~,~,~,~,Cf,`,,`
+,,,`,,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,~,Cf,~,~,Cf,Cf,Cf,`,~,~,~,~,~,~,~,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,~,~,~,~,~,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,Cf,~,~,~,Cf,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,Cf,Cf,Cf,Cf,Cf,~,Cf,~,~,Cf,~,~,~,Cf,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,~,Cf,Cf,Cf,Cf,~,Cf,`,Cf,Cf,~,~,~,Cf,Cf,`,~,Cf,~,Cf,Cf,~,Cf,~,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,~,,,,,,,,,,,Cf,Cf,Cf,~,Cf,Cf,Cf,,,,,,,,,,,~,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_traps) start(19; 19) hidden()
+
+,,,,,Tc,,,,,,,,,,,,,,,,,,,,,,,,,,Tc
+,,,,,Tc,,,,,,,,,,,,,,,,,,,,,,,,,,Tc
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,,,,,,,,,,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,Tc,Tc,,,,,,,,Tc,Tc
+,,,,,,,,,,,,,Tc,Tc,,,,,,,,Tc,Tc
+
+#burrow label(surface_burrows) start(19; 19) hidden() extend safety burrow to newly safe surface areas and set up surrounding clearcutting area
+
+
+,,"a{name=""Clearcutting area"" create=true autochop_clear=true}(-10x-10)","a{name=""Clearcutting area"" create=true autochop_clear=true}(32x-10)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"a{name=""Clearcutting area"" create=true autochop_clear=true}(10x-10)"
+,,"a{name=""Clearcutting area"" create=true autochop_clear=true}(-10x27)",`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,"a{name=""Clearcutting area"" create=true autochop_clear=true}(10x27)"
+,,,`,,`,a{name=Inside+}(25x17),,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,`,`,,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,~,,~,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,a{name=Inside+},`,`,`,`,,`,,`,`,`,`,a{name=Inside+}(7x6),,,,,,,`,,`
+,,,`,,`,a{name=Inside+}(7x5),,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,"a{name=""Clearcutting area"" create=true autochop_clear=true}(-10x10)","a{name=""Clearcutting area"" create=true autochop_clear=true}(32x10)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"a{name=""Clearcutting area"" create=true autochop_clear=true}(10x10)"
+
+
+#build label(surface_roof) start(19; 19) hidden() roof hatch and adjacent tiles
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,Cf,,Cf,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,Cf,H,Cf,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,~,~,~,~,~,~,~,~,~,~,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,~,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,~,~,~,~,~,~,~,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,~,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,~,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,~,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,~,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_roof2) start(19; 19) hidden() lower half of the roof
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,~,,~,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,~,~,~,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,~,~,~,~,~,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,~,~,~,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,~,~,~,~,~,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,Cf,`,Cf,Cf,Cf,Cf,~,~,~,~,~,~,~,~,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,Cf,`,Cf,Cf,Cf,Cf,~,Cf,Cf,`,~,~,~,~,~,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,~,~,~,~,~,~,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_roof3) start(19; 19) hidden() upper half center of the roof
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,Cf,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_roof4) start(19; 19) hidden() upper half remainder of the roof
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_corridor_gates) start(19; 19) hidden() message(Remember to connect the levers to the new external trap gates.) gates for the longer trap hallways
+
+
+,,,,"gx{name=""Left trap gate""}",,,,,,,,,,,,,,,,,,,,,,,,,,,,"gx{name=""Right trap gate""}"
+,,,`,gx,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,gx,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,"Tl{name=""Left trap gate""}",`,`,`,"Tl{name=""Right trap gate""}",`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_corridor) start(19; 19) hidden() longer trap hallway walls
+
+
+,,,,~,,,,,,,,,,,,,,,,,,,,,,,,,,,,~
+,,,Cw,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,Cw
+,,,Cw,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,Cw
+,,,Cw,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,`,~,`,`,`,~,`,,,,,,,,,,`,,Cw
+,,,Cw,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,Cw
+,,,Cw,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,Cw
+,,,Cw,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,Cw
+,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,Cw,Cw,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,Cw,Cw
+
+
+
+#<
+
+
+
+,,,`,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,Cf,`
+,,,`,Cf,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,Cf,`
+,,,`,Cf,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,Cf,`
+,,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+#build label(surface_corridor_traps) start(19; 19) hidden() traps for the longer trap hallways
+
+
+,,Tc,Tc,~,,,,,,,,,,,,,,,,,,,,,,,,,,,,~,Tc,Tc
+,,Tc,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,Tc
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,Tc,`
+,,,`,Tc,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,`,~,`,`,`,~,`,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,Tc,`
+,,,`,Tc,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,Tc,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,Tc,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,Tc
+,,Tc,Tc,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Tc,Tc
+
+
+#notes label(farming_help)
+"Sets up farming, food storage, and related industries. Also provides post-embark necessities that can later be disassembled."
+Screenshot: https://drive.google.com/file/d/1vDaedLcgoexUdKREUz75ZXQi0ZSdwWwj
+""
+Features:
+- Pairs with the surface blueprints for vents that prevent miasma
+- Farm plots (can be managed by DFHack autofarm)
+- Plentiful food storage
+- Refuse/corpse quantum stockpile
+"- Starter dormitory, dining room, and tomb for use until more permanent versions are ready"
+- Offices for your manager and bookkeeper
+""
+Workshops:
+- Kitchen
+- Brewery
+- Butcher
+- Fishery
+- Tannery
+- Farmer's Workshop
+- Quern
+- Screw Press
+""
+Manual steps you have to take:
+"- Assign a minecart to your refuse quantum stockpile hauling route (you can run ""assign-minecarts all"" to do this)"
+""
+Farming Walkthrough:
+"1) Wait until you have channeled the miasma vents and cleared trees on the surface before digging out the farming level on the z-level below the surface, otherwise you will end up with extra ramps on the farming level and unprotected holes through the surface when you later chop down trees growing above empty space."
+""
+2) Start digging with /farming1 and get started on manufacturing furniture by generating manager orders for /farming2
+""
+"3) Once the level is dug out, run /farming2 to designate zones, build workshops and stockpiles, and place furniture. Remember to assign a minecart to the newly-designated quantum refuse dump with assign-minecarts all."
+""
+"4) Once your fort has enough free time to build the remaining doors, run /farming3. Generate manager orders for /farming3."
+""
+"5) You can disassemble the dining room and dormitory once the services and apartments levels are up and running, if you like."
+"#dig label(farming1) start(16; 18; central stairs) message(Once the area is dug out, continue with /farming2.)"
+# this level is dug at priority 2 since it is dug in soil. it's worth the miner's time to
+# stop digging the industry level and quickly dig out this one.
+,,,,,,,,,2,2,2,,2,2,2,2,2,,2,2,2,2
+,,,,,,,,,2,2,2,,2,2,2,2,2,,2,2,2,2
+,,,,,,,,,2,2,2,,2,2,2,2,2,,2,2,2,2
+,,,,,,,,,,,2,,2,2,2,2,2,,2,2,2,2
+,,,,,,,2,2,2,,2,,2,2,2,2,2,,2,2,2,2
+,,,,,,,2,2,2,2,2,,2,2,2,2,2,,2,2,2,2
+,,,,,,,2,2,2,,2,,2,2,2,2,2,,2
+,,,,,,,,,,,2,,2,2,2,2,2,,2,,2,2,2
+,,,,,,2,2,2,2,,2,,2,2,2,2,2,,2,2,2,2,2
+,,,,,,2,2,2,2,,2,,2,2,2,2,2,,2,,2,2,2
+,,,2,2,,2,2,2,2,,2,,2,2,2,2,2,,2
+,,2,2,2,,2,2,2,2,,2,,2,2,2,2,2,,2,,2,2,2,,2,2,2
+,,2,2,2,2,2,z2,2,2,2,2,,,2,,2,,,2,2,2,z2,2,2,2,z2,2
+,,,2,2,,2,2,2,2,,2,2,2,2,2,2,2,2,2,,2,2,2,,2,2,2
+,,,,2,,,2,,,,,,2,`,`,`,2,,,,,2,,,,2
+,,2,2,2,2,2,2,2,2,2,2,,2,`,~,`,2,,2,2,2,2,2,2,2,2,2,2
+,,2,2,2,2,2,2,2,2,2,2,2,2,`,`,`,2,2,2,2,2,2,2,2,2,2,2,2
+,,2,2,2,2,2,2,2,2,2,2,,2,2,2,2,2,,2,2,2,2,2,2,2,2,2,2
+,,2,2,2,2,2,2,2,2,2,,,,2,,2,,,,2,2,2,2,2,2,2,2,2
+,,2,2,2,2,2,2,2,2,,,z2,2,2,2,2,2,z2,,,2,2,2,2,2,2,2,2
+,,2,2,2,2,2,2,2,2,,z2,z2,,,2,,,z2,z2,,2,2,2,2,2,2,2,2
+,,2,2,2,2,2,2,2,,,z2,z2,,z2,z2,z2,,z2,z2,,,2,2,2,2,2,2,2
+,,2,2,2,2,2,2,2,,2,2,2,,z2,z2,z2,,2,2,2,,2,2,2,2,2,2,2
+,,2,2,2,2,2,2,2,,2,z2,2,,z2,z2,z2,,2,z2,2,,2,2,2,2,2,2,2
+,,2,2,2,2,2,2,2,,2,2,2,,,2,,,2,2,2,,2,2,2,2,2,2,2
+,,,,,,,,,,,,,,,z2
+
+
+"#meta label(farming2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
+Once furniture has been placed, continue with /farming3.) workshops, stockpiles, and important furniture"
+zone/farming_zone
+place/farming_place
+build/farming_build
+traffic/farming_traffic
+""
+#meta label(farming3) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) build remaining doors
+doors/farming_doors
+#zone label(farming_zone) start(16; 18) hidden() rooms
+
+
+,,,,,,,,,T{pets=true}(1x1),`,`,,`,`,`,`,`,,"h{name=""Starter dining hall""}(4x6)",,,`
+,,,,,,,,,T{pets=true}(1x1),`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,T{pets=true}(1x1),`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,,,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,"o{name=""Manager's office"" assigned_unit=manager}(3x1)",,`,,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,"o{name=""Bookkeeper's office"" assigned_unit=bookkeeper}(3x1)",,`,,`,,`,`,`,`,`,,`
+,,,,,,,,,,,`,,`,`,`,`,`,,`,,"D{name=""Starter dormitory""}(3x3)",,`
+,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,`,`,`,`
+,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`
+,,,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`
+,,`,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
+,,,`,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
+,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
+,,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,,,,`,,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,,`,`,,,`,,,`,`,,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,,`,`,`,,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,`
+
+
+"#place label(farming_place) start(16; 18) hidden() message(remember to assign a minecart to the refuse quantum stockpile (run ""assign-minecarts all"")"
+
+
+,,,,,,,,,`,`,`,,`,`,`,"c{name=""Seeds"" barrels=10 links_only=true take_from=""Starting food""}:+seeds(1x9)","c{name=""Potash""}:+potash(1x12)",,"c{name=""booze"" barrels=-1 take_from=""Starting food""}:+booze(4x2)",,,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,,,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,`,`,`,,`,,`,`,`,`,`,,`,"c{name=""Prepared food"" take_from=""Starting food""}:+preparedmeals(3x2)",,`
+,,,,,,,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,`,`,`,,`,,`,`,`,`,`,,`
+,,,,,,,,,,,`,,`,`,`,`,`,,`,,`,`,`
+,,,,,,`,`,`,"u{name=""Pots"" take_from=""Starting misc""}:-cat_furniture/type+pots(1x4)",,`,,`,`,`,`,`,,`,`,`,`,`
+,,,,,,`,`,`,~,,`,,"c{name=""Seeds feeder"" give_to=""Seeds"" take_from=""Starting food""}:+seeds(4x3)",,,,`,,`,,`,`,`
+,,,"u{name=""Bags"" take_from=""Starting misc""}:-cat_furniture/type+bags(2x2)",~,,`,`,`,~,,`,,`,`,`,`,`,,`
+,,`,~,~,,`,`,`,~,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
+,,`,"c{name=""Jugs"" take_from=""Starting misc""}:+cat_finished_goods/core,total+woodtools(2x2)",~,`,`,`,`,"u{name=""Barrels"" take_from=""Starting misc,Starting food""}:-cat_furniture/type+barrels(1x2)",`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
+,,,~,~,,`,`,`,~,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
+,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
+,,"c{name=""Plants"" barrels=-1 take_from=""Starting food""}:+plants",c,c,c,c,c,c,c,c,c,,`,`,~,`,`,,"c{name=""Cookable food"" barrels=-1 take_from=""Starting food""}:+cat_food/meat/,fish/prepared/,egg/,cheese/,leaves/,powder/,glob/,liquid/plant/,paste/,pressed/,milk,royal_jelly-dye-cat_food/tallow,thread,liquid/misc/",c,c,c,c,c,c,c,c,c
+,,c,c,c,c,c,c,c,c,c,c,`,`,`,`,`,`,`,c,c,c,c,c,c,c,c,c,c
+,,c,c,c,c,c,c,c,c,c,c,,`,`,`,`,`,,c,c,c,c,c,c,c,c,c,c
+,,c,c,c,c,c,c,c,c,c,,,,`,,`,,,,c,c,c,c,c,c,c,c,c
+,,c,c,c,c,c,c,c,c,,,c,`,`,`,`,`,c,,,c,c,c,c,c,c,c,c
+,,c,c,c,c,c,c,c,c,,"c{name=""Unprepared fish"" take_from=""Starting food""}:+unpreparedfish",c,,,`,,,"c{name=""Rawhides"" take_from=""Starting cloth/trash""}:+rawhides",c,,c,c,c,c,c,c,c,c
+,,c,c,c,c,c,c,c,,,c,c,,"c{name=""Refuse feeder"" give_to=""Rawhides"" take_from=""Starting cloth/trash""}:+cat_refuse/type(1x3)","y2{name=""Corpse feeder"" take_from=""Starting cloth/trash""}:+cat_refuse/corpses,bodyparts(2x3)",~,,c,c,,,c,c,c,c,c,c,c
+,,c,c,c,c,c,c,c,,`,`,`,,~,~,~,,`,`,`,,c,c,c,c,c,c,c
+,,c,c,c,c,c,c,c,,`,`,`,,~,~,~,,`,`,`,,c,c,c,c,c,c,c
+,,c,c,c,c,c,c,c,,`,`,`,,,`,,,`,`,`,,c,c,c,c,c,c,c
+,,,,,,,,,,,,,,,"ry{name=""Refuse/corpse quantum"" give_to=""Rawhides"" quantum=true}"
+
+
+#build label(farming_build) start(16; 18) hidden() workshops and important furniture
+
+
+,,,,,,,,,n,`,`,,p{seasonal_fertilize=true}(3x1),,,`,`,,`,`,`,`
+,,,,,,,,,n,`,`,,p{seasonal_fertilize=true}(3x1),,,`,`,,`,`,`,`
+,,,,,,,,,n,`,`,,p{seasonal_fertilize=true}(3x1),,,`,`,,c,t,t,c
+,,,,,,,,,,,`,,p{seasonal_fertilize=true}(3x1),,,`,`,,c,t,t,c
+,,,,,,,t,c,`,,`,,p{seasonal_fertilize=true}(3x1),,,`,`,,`,`,`,`
+,,,,,,,`,`,`,`,`,,p{seasonal_fertilize=true}(3x1),,,`,`,,`,`,`,`
+,,,,,,,t,c,`,,`,,p{seasonal_fertilize=true}(3x1),,,`,`,,`
+,,,,,,,,,,,`,,p{seasonal_fertilize=true}(3x1),,,`,`,,`,,b,b,b
+,,,,,,`,`,`,`,,`,,p{seasonal_fertilize=true}(3x1),,,`,`,,`,`,`,`,h
+,,,,,,`,wl,`,`,,`,,`,`,`,`,`,,`,,b,b,b
+,,,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`
+,,wq,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
+,,wp,`,`,`,`,ww,`,`,`,`,,,`,,`,,,`,`,`,wu,`,`,`,wz,`
+,,,`,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
+,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
+,,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,,,,`,,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,,,`,d,`,`,`,d,`,,,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,,`,`,,,d,,,`,`,,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,,`,`,`,,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,wh,`,,`,`,`,,`,wn,`,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,`,`,,,"trackstopS{name=""Refuse/corpse dumper"" take_from=""Refuse feeder,Corpse feeder"" route=""Refuse/corpse quantum""}",,,`,`,`,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,`
+
+
+#dig label(farming_traffic) start(16; 18) hidden() keep hungry dwarves away from the crops and food stores so they prefer the prepared meals
+
+
+,,,,,,,,,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,,,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,,,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,,,,,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,ol,ol,ol,,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,ol,ol,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,ol,ol,ol,,ol,,or,or,or,or,or,,ol
+,,,,,,,,,,,ol,,or,or,or,or,or,,ol,,ol,ol,ol
+,,,,,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol,ol,ol,ol,ol
+,,,,,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol,,ol,ol,ol
+,,,ol,ol,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol
+,,ol,ol,ol,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol,,or,or,or,,or,or,or
+,,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,,or,,or,,,ol,or,or,or,or,ol,or,or,or
+,,,ol,ol,,ol,ol,ol,ol,,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,,or,or,or
+,,,,or,,,or,,,,,,ol,`,`,`,ol,,,,,or,,,,or
+,,or,or,or,or,or,or,or,or,or,or,,ol,`,~,`,ol,,or,or,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,or,or,or,ol,`,`,`,ol,or,or,or,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,or,or,,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,or,,,,or,,or,,,,or,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,,,or,or,or,or,or,or,or,,,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,,or,or,,,or,,,or,or,,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,,,or,or,,or,or,or,,or,or,,,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,,or,or,or,,or,or,or,,or,or,or,,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,,or,or,or,,or,or,or,,or,or,or,,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,,or,or,or,,,or,,,or,or,or,,or,or,or,or,or,or,or
+,,,,,,,,,,,,,,,or
+
+
+#build label(farming_doors) start(16; 18) hidden() remaining doors
+
+
+,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,,~,~,~,~
+,,,,,,,,,,,d,,`,`,`,`,`,,~,~,~,~
+,,,,,,,`,`,`,,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,`,`,`,d,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,`,`,`,,`,,`,`,`,`,`,,d
+,,,,,,,,,,,`,,`,`,`,`,`,,`,,~,~,~
+,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,d,`,`,~
+,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,,~,~,~
+,,,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`
+,,`,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
+,,`,`,`,d,`,`,`,`,d,`,,,d,,d,,,`,d,`,`,`,d,`,`,`
+,,,`,`,,`,`,`,`,,`,d,`,`,`,`,`,d,`,,`,`,`,,`,`,`
+,,,,d,,,d,,,,,,`,`,`,`,`,,,,,d,,,,d
+,,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,,,,d,,d,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,,,`,~,`,`,`,~,`,,,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,,`,`,,,~,,,`,`,,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,,`,`,`,,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,`
+
+
+#notes label(industry_help)
+Sets up workshops for all non-farming industries
+Screenshot: https://drive.google.com/file/d/1c8YTHxTgJY5tUII-BOWdLhmDFAHwIOEs
+""
+Features:
+- Compact layout that covers all workshops
+- Manager orders that automate basic fortress maintenance
+"- Space available underneath the forge and smelters for magma, allowing the starting forge and smelters to be eventually replaced by magma versions."
+- Quantum stockpiles for compact storage
+with separate stockpiles for:
+- A reserve of uncut gems for strange moods that the jeweler's workshop cannot take from
+"- Wood, iron bars, steel bars, flux, and coal so you can see at a glance if you're low on stock"
+"- Items that cannot be quantum stockpiled (e.g. lye, dye, and sand bags)"
+- Meltable weapons and armor
+""
+Workshops:
+- 2x Stonecutter
+- 4x Craftsdwarf
+- 1x Jeweler
+- 1x Mechanic
+- 4x Smelter
+- 1x Forge
+- 1x Glassmaker
+- 1x Kiln
+- 4x Wood furnace
+- 1x Ashery
+- 1x Soap maker
+- 1x Carpenter
+- 1x Siege workshop
+- 1x Bowyer
+- 1x Dyer
+- 1x Loom
+- 1x Clothier
+""
+Manual steps you have to take:
+- Assign minecarts to your quantum stockpile hauling routes. The assign-minecarts all command will do it for you.
+""
+Optional manual steps you can take:
+"- If desired, set one or both stockpiles in the bottom left to auto-melt. This results in melting all weapons and armor that are inferior to masterwork. This is great for upgrading your military, but it takes a *lot* of fuel unless you have first replaced the forge and smelters with magma versions. If you enable automelt and you don't have magma forges and magma smelters, be sure to be in a forested area, set up autochop, and keep your coal stocks high."
+""
+Industry Walkthrough:
+"1) Start digging out /industry1 as soon as you find a non-aquifer stone layer at least two layers beneath the surface so the boulders can be used by your starting workshops. The services level is intended to be dug beneath this one, and there is space on that level to route magma underneath your furnaces so you can replace the furnaces on this level with magma-powered equivalents."
+""
+"2) Generate manager orders for /industry2. You brought an anvil with you (right??), so you can remove the unneeded anvil work order from the manager orders screen. Note that stockpiles that accept containers may claim the barrels you need to build the Dyer's Workshop and Ashery. If you see those two buildings not being constructed, build a few extra barrels or run combine all to free up some existing ones."
+""
+"3) Once the area is dug out, run /industry2 to build replacements for your starter workshops up on the surface. Remember to assign minecarts to to your quantum stockpile hauling routes with assign-minecarts all."
+""
+"4) After the initial workshops are constructed, run /industry3 to build the remaining workshops."
+""
+"5) Once you have enough dwarves to do maintenance tasks (that is, after the first or second migration wave), run ""orders import library/basic"" to use the provided manager orders to take care of your fort's basic needs, such as food, booze, and raw material processing."
+""
+"6) If you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-west stockpiles for auto-melt. If you don't have a high density of trees to make into charcoal, though, be sure to route magma to the level beneath this one and replace the forge and furnaces with magma equivalents."
+""
+"7) Once you have magma furnaces (or abundant fuel) and more dwarves, run ""orders import library/furnace"", ""orders import library/military"", and ""orders import library/smelting"" (in that order) to import the remaining fort automation orders. The military orders are optional if you are not planning to have a military, of course."
+""
+"8) At any time, feel free to build extra workshops or designate custom stockpiles in the remaining open space. The space is there for you to use! Note the area in the bottom right can be used for additional magma-powered furnaces and workshops since there is space reserved for magma in those spots in the services level beneath."
+"#dig label(industry1) start(18; 18; central stairs) message(Once the area is dug out, continue with /industry2.)"
+
+
+,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,,d,,d,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,d,`,`,`,d,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,,d,,d,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
+
+
+#meta label(industry2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) stockpiles and high-priority workshops
+traffic/industry_traffic
+place/industry_place
+build/industry_build
+#meta label(industry3) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) remaining workshops
+build2/industry_build2
+#dig label(industry_traffic) start(18; 18; central stairs) hidden() traffic patterns
+
+
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,oh,ol,ol,ol,oh,ol,ol,ol,oh,ol,ol,ol,oh
+,,,,oh,oh,oh,oh,oh,oh,oh,oh,ol,ol,ol,oh,ol,ol,ol,oh,ol,ol,ol,oh,oh,oh,oh,oh,oh,oh,oh
+,,,,oh,`,`,`,`,`,`,oh,ol,ol,ol,oh,ol,ol,ol,oh,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,oh,`,`,`,`,`,`,oh,ol,ol,ol,oh,oh,oh,oh,oh,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,oh,`,`,`,`,`,`,oh,ol,ol,ol,oh,oh,`,oh,oh,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,oh,`,`,`,`,`,`,oh,ol,ol,ol,oh,oh,`,oh,oh,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,oh,`,`,`,`,`,`,oh,ol,ol,ol,`,`,`,`,`,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,oh,`,`,`,`,`,`,oh,ol,ol,ol,`,`,`,`,`,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,ol,ol,ol,`,`,`,`,`,ol,ol,ol,oh,oh,oh,oh,oh,oh,oh,oh,oh,`
+,,`,ol,ol,ol,ol,ol,ol,ol,ol,ol,oh,oh,oh,`,`,`,`,`,oh,oh,oh,ol,ol,ol,ol,ol,ol,ol,ol,ol,`
+,,`,ol,ol,ol,ol,ol,ol,ol,ol,ol,oh,oh,oh,`,`,`,`,`,oh,oh,oh,ol,ol,ol,ol,ol,ol,ol,ol,ol,`
+,,`,ol,ol,ol,ol,ol,ol,ol,ol,ol,oh,oh,,,`,,`,,,oh,oh,ol,ol,ol,ol,ol,ol,ol,ol,ol,`
+,,`,oh,oh,oh,oh,oh,oh,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,oh,oh,oh,oh,oh,oh,`
+,,`,ol,ol,ol,oh,oh,oh,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,oh,oh,oh,ol,ol,ol,`
+,,`,ol,ol,ol,oh,`,`,`,`,`,`,`,,`,,`,,`,,`,`,`,`,`,`,`,oh,ol,ol,ol,`
+,,`,ol,ol,ol,oh,oh,oh,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,oh,oh,oh,ol,ol,ol,`
+,,`,oh,oh,oh,oh,oh,oh,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,oh,oh,oh,oh,oh,oh,`
+,,`,ol,ol,ol,ol,ol,ol,ol,ol,ol,oh,oh,,,`,,`,,,oh,oh,ol,ol,ol,ol,ol,ol,ol,ol,ol,`
+,,`,ol,ol,ol,ol,ol,ol,ol,ol,ol,oh,oh,oh,`,`,`,`,`,oh,oh,oh,ol,ol,ol,ol,ol,ol,ol,ol,ol,`
+,,`,ol,ol,ol,ol,ol,ol,ol,ol,ol,oh,oh,oh,`,`,`,`,`,oh,oh,oh,ol,ol,ol,ol,ol,ol,ol,ol,ol,`
+,,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,ol,ol,ol,`,`,`,`,`,ol,ol,ol,oh,oh,oh,oh,oh,oh,oh,oh,oh,`
+,,,,`,`,`,`,`,`,`,oh,ol,ol,ol,`,`,`,`,`,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,`,`,`,`,`,`,`,oh,ol,ol,ol,`,`,`,`,`,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,`,`,`,`,`,`,`,oh,ol,ol,ol,oh,oh,`,oh,oh,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,oh,oh,oh,oh,oh,oh,oh,oh,ol,ol,ol,`,oh,`,oh,`,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,`,`,`,`,`,`,`,oh,ol,ol,ol,`,`,`,`,`,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,`,`,`,`,`,`,`,oh,ol,ol,ol,`,ol,ol,ol,`,ol,ol,ol,oh,`,`,`,`,`,`,oh
+,,,,`,`,`,`,`,`,`,oh,ol,ol,ol,`,ol,ol,ol,`,ol,ol,ol,oh,oh,oh,oh,oh,oh,oh,oh
+,,,,,,,,,,,oh,ol,ol,ol,oh,ol,ol,ol,oh,ol,ol,ol,oh
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+"#place label(industry_place) start(18; 18) hidden()  message(remember to:
+- assign minecarts to to your quantum stockpile hauling routes (use ""assign-minecarts all"")
+- if you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt
+- once you have enough dwarves, run ""orders import library/basic"" to automate your fort's basic needs (see /industry_help for more info on this file)) industry stockpiles"
+
+
+,,,,,,,,,,,"e{name=""Rough gems for moods"" containers=0 take_from=""Stoneworker quantum,Gem feeder""}:=roughgems",e,e,e,e,e,e,e,e,e,e,e,e
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"se{name=""Stoneworker quantum"" quantum=true}",`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,"s10{name=""Stone feeder""}:=otherstone(5x4)",,,~,~,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`
+,,"w{name=""Wood"" take_from=""Goods/wood quantum,Wood feeder""}",`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,"c{name=""Dye"" barrels=-1 }:+dye"
+,,w,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,c
+,,w,`,`,`,`,`,`,`,`,`,`,`,`,"e{name=""Gem feeder"" containers=0}(5x1)",,,~,~,`,`,`,`,`,`,`,`,`,`,`,`,c
+,,w,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,c
+,,w,`,`,`,`,`,`,"w{name=""Wood feeder""}(2x5)",,"g{name=""Goods feeder"" containers=0}:+cat_food/tallow+wax-crafts-goblets(3x3)",,`,,`,`,`,`,`,,"hlS{name=""Cloth/bones feeder"" containers=0}:+cat_refuse/skulls/,bones/,hair/,shells/,teeth/,horns/-adamantinethread(5x5)",,,~,~,`,`,`,`,`,`,c
+,,w,`,`,`,`,`,`,~,~,~,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,c
+,,`,`,`,`,`,"c{name=""Goods/wood quantum"" quantum=true give_to=""Pots,Barrels,Jugs,Bags,Seeds feeder""}:+all",`,~,~,~,~,~,,`,,`,,`,,~,~,~,~,~,`,"r{name=""Cloth/bones quantum"" quantum=true}:+all",`,`,`,`,c
+,,"c{name=""Lye"" barrels=0}:+miscliquid",`,`,`,`,`,`,~,~,"u2{name=""Furniture feeder""}:-sand(3x2)",~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,c
+,,c,`,`,`,`,`,`,~,~,~,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,c
+,,c,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,c
+,,c,`,`,`,`,`,`,`,`,`,`,`,`,"bnpdz{name=""Bar/military feeder"" containers=0}:-potash+adamantinethread(5x3)",,,,~,`,`,`,`,`,`,`,`,`,`,`,`,c
+,,c,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,c
+,,c,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,c
+,,,,"pd{name=""Meltable steel/bronze"" take_from=""Metalworker quantum,Bar/military feeder"" containers=0}:-cat_weapons/mats/,other/-cat_armor/mats/,other/+bronzeweapons+bronzearmor+steelweapons+steelarmor-masterworks-artifacts(7x3)",,,~,~,~,~,`,`,`,`,"s5{name=""Ore/clay feeder""}:-otherstone(5x2)",,,~,~,`,`,`,`,`,`,`,`,`,`,`
+,,,,~,~,~,~,~,~,~,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`
+,,,,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,"c{name=""Coal"" containers=0 take_from=""Metalworker quantum,Bar/military feeder""}:+coal",`,"c{name=""Metalworker quantum"" quantum=true}:+all",`,"c{name=""Iron"" containers=0 take_from=""Metalworker quantum,Bar/military feeder""}:+ironbars",`,`,`,`,`,`,`,`,`,`,`
+,,,,"pd{name=""Other meltables"" take_from=""Metalworker quantum,Bar/military feeder"" containers=0}:-cat_weapons/other/-cat_armor/other/-bronzeweapons-bronzearmor-steelweapons-steelarmor-masterworks-artifacts(7x3)",,,~,~,~,~,`,`,`,`,c,"c{name=Flux take_from=""Metalworker quantum,Ore/clay feeder"" links_only=true}:+flux(3x1)",,,c,`,`,`,`,`,`,`,`,`,`,`
+,,,,~,~,~,~,~,~,~,`,`,`,`,c,`,`,`,c,`,`,`,`,`,`,`,`,`,`,`
+,,,,~,~,~,~,~,~,~,`,`,`,`,c,`,`,`,c,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,"u{name=""Sand bags""}:-cat_furniture/type+sand",u,u,u,u,u,`,"c{name=""Steel"" containers=0 take_from=""Metalworker quantum,Bar/military feeder""}:+steelbars",c,c,c,c,c
+
+
+#build label(industry_build) start(18; 18) hidden() workshops to build first
+
+
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"wj{name=""Encruster"" take_from=""Goods/wood quantum,Stoneworker quantum,Gem feeder""}",`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,"wr{name=""Stone craftsdwarf""}",`,`,`,`,`,`,`,wt,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"trackstopN{name=""Stone/gem dumper"" take_from=""Stone feeder,Gem feeder"" route=""Stone/gem quantum""}",`,`,`,`,`,`,`,`,~,`,`,`,`
+,,,,`,`,~,`,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,wm{max_general_orders=2},`,`,`,`,`,`,`,wm{max_general_orders=10},`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,~,`,`,~,`,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,`,~,`,`,~,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,,~,,~,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,,,,`,~,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,wc,`,`,`,"trackstopW{name=""Goods/wood dumper"" take_from=""Wood feeder,Goods feeder,Furniture feeder"" route=""Goods/wood quantum""}",`,`,`,`,`,,`,,`,,`,,`,`,`,`,`,"trackstopE{name=""Cloth/bones dumper"" take_from=""Cloth/bones feeder"" route=""Cloth/bones quantum""}",`,`,`,~,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,,,,`,~,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,,~,,~,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,~,`,`,~,`,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,`,~,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"trackstopS{name=""Metalworker dumper"" take_from=""Bar/military feeder,Ore/clay feeder"" route=""Metalworker quantum""}",`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,~,`,`,`,~,`,`,`,~,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+#build label(industry_build2) start(18; 18) hidden() remaining workshops
+
+
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,ws,`,`,`,`
+,,,,`,`,wS,`,`,wb,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,wy,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,wk,`,`,wo,`,`,"wd{take_from=""Cloth/bones feeder,Cloth/bones quantum,Dye""}",`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,,d,,d,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,,,,`,d,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,~,`,`,`,~,`,`,`,`,`,,`,,`,,`,,`,`,`,`,`,~,`,`,`,we,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,,,,`,d,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,,d,,d,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,"wr{name=""Wood craftsdwarf""}",`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,"wr{name=""Misc craftsdwarf""}",`,`,"wr{name=""Bone craftsdwarf""}",`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,eg,`,`,`,wf{max_general_orders=9},`,`,`,ek,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+#notes label(services_help)
+"Sets up public services (dining, hospital, etc.)"
+Screenshot: https://drive.google.com/file/d/1RQMy_zYQWM5GN7-zjn6LoLWmnrJjkxPM
+""
+Features:
+- Spacious dining room/tavern (tavern is restricted to citizens and residents only by default)
+- Large prepared food and drink stockpiles
+- Well cistern system (route or carry your own water)
+- Hospital (also restricted to residents by default) with a well for washing
+- Well-appointed jail cells for happy prisoners
+- Bolt-recycling archery range for your marksdwarves
+- Interrogation room (office) for your Captain of the Guard
+- Garbage dump
+- Empty space for magma to power forges and smelters in the industry level above
+""
+Manual steps you have to take:
+"- If you want to tavern to attract visitors, change the restriction in the location configuration screen."
+"- Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water to prevent muddiness. If you want to fill with buckets, you can use the pre-designated pond zones on the level below the main floor. If you feel adventurous and are experienced with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
+"- If you are filling the wells with a bucket brigade and at least one well is already constructed, you'll run into issues with the dwarves stealing water from one well to fill another. Temporarily deconstruct the wells or temporarily build grates beneath the wells to block the buckets to avoid this issue. Remember to rebuild the wells or remove the grates afterwards, though!"
+""
+Services Walkthrough:
+1) Start this level when your fort grows to about 30 dwarves so everyone has a place to eat.
+""
+2) Start digging with /services1. Note that this digs out the main level and three levels below for the well cisterns.
+""
+"3) Once the area is dug out, start populating the rooms with /services2. Generate manager orders for /services2."
+""
+4) Fill the wells with either bucket brigades or by carefully routing flowing water.
+""
+"5) When your fort has grown some more, or you start needing a jail, run /services3 to extend the rooms a bit more. Generate manager orders for /services3."
+""
+"6) When your fort is more mature and you need to expand the rooms, run /services4 to finish everything up. If you didn't have a Sheriff/Captain of the Guard to automatically assign to the interrogation room when you ran /services2, you can manually assign the office now. Generate manager orders for /services4."
+"#dig label(services1) start(18; 18; central stairs) message(Once the area is dug out, continue with /services2.)"
+
+,d,d,d,,d,d,d,,d,d,d,,d,h,d,,d,h,d,,d,h,d,,d,h,d,,d,h,d
+,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
+,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
+,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d
+,d,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,,,,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,h,h,h,h,h,h,h,h,h,h,,d,,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,,j,,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,,d,,d,,,,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,h,d,d,d,d,d,,d,,d,`,`,`,d,,d,,d,d,d,h,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,,,d,,,,,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,,d,d
+,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,,d,d,d,d,d
+
+#>
+
+,,,,,,,,,,,,,j5,h5,j,,j5,h5,j,,j5,h5,j,,j5,h5,j,,j5,h5,j
+,,,,,,,,,,,,,5,5,5,,5,5,5,,5,5,5,,5,5,5,,5,5,5
+,,,,,,,,,,,,,,d,,,,d,,,,d,,,,d,,,,d
+,,,,,,,,,,,,,,d,,,,d,,,,d,,,,d,,,,d
+,,,,,,,,,,,,,,d,,,,d,,,,d,,,,d,,,,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,,,,,,,,,,,,,,,,,,,,d
+,,,,,,d,,,,,,,,,,,,,,,,,,,,d
+,,,,,,d,,,,,,,,,,,,,,,,,,,,d
+,,,,,,d,,,,,,,,,,,,,,,,,,,,d
+,,,,,,d,,,,,,,,,,,,,,,,,,u,d,d
+,,,,,,d,,,,,,,,,,,,,,,,,,,,d
+,,,,,,d,,,,,,,,,,,,,,,,,,,,d
+,,,,,,d,,,,,,,,,,,,,,,,,,,,d
+,,,,,,d,,,,,,,,,d,d,d,d,d,,,,,,,d
+,,,,,5,5,5,,,,,,,,d,`,`,`,d,,,,,,5,5,5
+,,,,,j5,h5,j,,,,,,,,d,`,`,`,d,,,,,,j5,h5,j
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,,,,,,,,,,,d,d,d,d,d
+
+#>
+
+,,,,,,,,,,,,,u5,h5,i,,u5,h5,i,,u5,h5,i,,u5,h5,i,,u5,h5,i
+
+
+
+
+
+
+
+
+
+
+
+
+
+,,,,,,,,,,,,,,,d,d,d,d,d
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,u5,h5,i,,,,,,,,d,`,`,`,d,,,,,,u5,h5,i
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,,,,,,,,,,,d,d,d,d,d
+
+#>
+
+,,,,,,,,,,,,,,d,u,,,d,u,,,d,u,,,d,u,,,d,u
+
+
+
+
+
+
+
+
+
+
+
+
+
+,,,,,,,,,,,,,,,d,d,d,d,d
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,,d,u,,,,,,,,d,`,`,`,d,,,,,,,d,u
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,,,,,,,,,,,d,d,d,d,d
+
+"#meta label(services2) start(central stairs) message(Once furniture has been built, continue with /services3.) zones and minimally functional hospital and dining hall"
+traffic/services_traffic
+zones/services_zones
+place/services_place
+build/services_build
+""
+"#meta label(services3) start(central stairs) message(Once furniture has been built, continue with /services4.) expand furnishings"
+place2/services_place2
+build2/services_build2
+""
+#meta label(services4) start(central stairs) complete furnishings
+place3/services_place3
+build3/services_build3
+#dig label(services_traffic) start(18; 18) hidden() keep lollygaggers out of the cisterns and justice areas
+
+,`,`,`,,`,`,`,,`,`,`,,or,or,or,,or,or,or,,or,or,or,,or,or,or,,or,or,or
+,`,`,`,,`,`,`,,`,`,`,,or,or,or,,or,or,or,,or,or,or,,or,or,or,,or,or,or
+,`,`,`,,`,`,`,,`,`,`,,or,or,or,,or,or,or,,or,or,or,,or,or,or,,or,or,or
+,,`,,,,`,,,,`,,,,or,,,,or,,,,or,,,,or,,,,or
+,`,`,`,`,`,`,`,`,`,`,`,,,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,or
+,`,`,`,`,`,`,`,`,`,`,`,,or,or,or,or,or,or,or,or,or,or,,or,,or,or,or,or,or
+,`,`,`,`,`,`,`,`,`,`,`,,or,or,or,or,or,or,or,or,or,or,,or,,or,or,or,or,or
+,`,`,`,`,`,`,`,`,`,`,`,,or,or,or,or,or,or,or,or,or,or,,or,,or,or,or,or,or
+,`,`,`,`,`,`,`,`,`,`,`,,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or
+,`,`,`,`,`,`,`,`,`,`,`,,or,or,or,or,or,or,or,or,or,or,,or,,or,or,or,or,or
+,`,`,`,`,`,`,`,`,`,`,`,,or,or,or,or,or,or,or,or,or
+,`,`,`,`,`,`,`,`,`,`,`,,or,or,or,or,or,or,or,or,or,,or,,or,,or,,or
+,`,`,`,`,`,`,`,`,`,`,`,,,,,or,,or,,,,,or,,or,,or,,or
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,or,,or,,or,,or
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,oh,oh,oh,oh,oh,oh,oh,oh,ol,or,or,or,or
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,oh,oh,oh,oh,oh,ol,or
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,oh,oh,oh,oh,oh,oh,oh,oh,ol,or,or,or,or
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,or,,or,,or,,or
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,or,,,,,,or,,or,,or,,or
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,or,,or,,or,,or
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#>
+
+,,,,,,,,,,,,,or,or,or,,or,or,or,,or,or,or,,or,or,or,,or,or,or
+,,,,,,,,,,,,,or,or,or,,or,or,or,,or,or,or,,or,or,or,,or,or,or
+,,,,,,,,,,,,,,or,,,,or,,,,or,,,,or,,,,or
+,,,,,,,,,,,,,,or,,,,or,,,,or,,,,or,,,,or
+,,,,,,,,,,,,,,or,,,,or,,,,or,,,,or,,,,or
+,,,,,,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or,or
+,,,,,,or,,,,,,,,,,,,,,,,,,,,or
+,,,,,,or,,,,,,,,,,,,,,,,,,,,or
+,,,,,,or,,,,,,,,,,,,,,,,,,,,or
+,,,,,,or,,,,,,,,,,,,,,,,,,,,or
+,,,,,,or,,,,,,,,,,,,,,,,,,or,or,or
+,,,,,,or,,,,,,,,,,,,,,,,,,,,or
+,,,,,,or,,,,,,,,,,,,,,,,,,,,or
+,,,,,,or,,,,,,,,,,,,,,,,,,,,or
+,,,,,,or,,,,,,,,,`,`,`,`,`,,,,,,,or
+,,,,,or,or,or,,,,,,,,`,`,`,`,`,,,,,,or,or,or
+,,,,,or,or,or,,,,,,,,`,`,`,`,`,,,,,,or,or,or
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+
+#>
+
+,,,,,,,,,,,,,or,or,or,,or,or,or,,or,or,or,,or,or,or,,or,or,or
+
+
+
+
+
+
+
+
+
+
+
+
+
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,or,or,or,,,,,,,,`,`,`,`,`,,,,,,or,or,or
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+
+#>
+
+,,,,,,,,,,,,,,or,or,,,or,or,,,or,or,,,or,or,,,or,or
+
+
+
+
+
+
+
+
+
+
+
+
+
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,or,or,,,,,,,,`,`,`,`,`,,,,,,,or,or
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+
+"#zone label(services_zones) start(18; 18) hidden() message(Don't forget to assign a doctor to the hospital!
+If you'd like to fill your wells via bucket brigade, activate the inactive pond zones one level down from where the wells will be built.) garbage dump, hospital, taverrn, barracks, archery range, and pond zones"
+,,,,,,,,,,,,"j{name=""Jail 1""}(5x5)",,,,"j{name=""Jail 2""}(5x5)",,,,"j{name=""Jail 3""}(5x5)",,,,"j{name=""Jail 4""}(5x5)",,,,"j{name=""Jail 5""}(5x5)"
+,"b{location=tavern/bigpub name=""Rented room 1""}(1x3)","b{location=tavern/bigpub name=""Rented room 2""}(1x3)","b{location=tavern/bigpub name=""Rented room 3""}(1x3)",,"b{location=tavern/bigpub name=""Rented room 4""}(1x3)","b{location=tavern/bigpub name=""Rented room 5""}(1x3)","b{location=tavern/bigpub name=""Rented room 6""}(1x3)",,"b{location=tavern/bigpub name=""Rented room 7""}(1x3)","b{location=tavern/bigpub name=""Rented room 8""}(1x3)","b{location=tavern/bigpub name=""Rented room 9""}(1x3)",,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+"h{location=tavern/bigpub allow=residents name=""Grand hall tavern""}(13x31)",,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,`,"o{name=""Interrogation room"" assigned_unit=sheriff}(7x7)"
+,`,`,`,`,`,`,`,`,`,`,`,,"B{name=""Marksdwarf barracks""}a{name=""Shooting gallery"" shoot_from=""south""}",Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba
+,`,`,`,`,`,`,`,`,`,`,`,,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,,m{location=hospital name=Hospital allow=residents},,m,,m,,m
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,m,,m,,m,,m
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,m,,m,,m,,m
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,m,m,m,m,m,m,m,m,m,m
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,m,m,m,m,m,m,m
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,m,m,m,m,m,m,m,m,m,m
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,m,,m,,m,,m
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,"d{name=""Garbage dump""}",,,,,,m,,m,,m,,m
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,m,,m,,m,,m
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#>
+
+,,,,,,,,,,,,,`,"p{name=""Jail 1 cistern"" pond=true active=false}",`,,`,"p{name=""Jail 2 cistern"" pond=true active=false}",`,,`,"p{name=""Jail 3 cistern"" pond=true active=false}",`,,`,"p{name=""Jail 4 cistern"" pond=true active=false}",`,,`,"p{name=""Jail 5 cistern"" pond=true active=false}",`
+,,,,,,,,,,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,,,,,,,,,,,,,`,,,,`,,,,`,,,,`,,,,`
+,,,,,,,,,,,,,,`,,,,`,,,,`,,,,`,,,,`
+,,,,,,,,,,,,,,`,,,,`,,,,`,,,,`,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,`,`,`,`,`,,,,,,,`
+,,,,,`,`,`,,,,,,,,`,`,`,`,`,,,,,,`,`,`
+,,,,,`,"p{name=""Tavern cistern"" pond=true active=false}",`,,,,,,,,`,`,`,`,`,,,,,,`,"p{name=""Hospital cistern"" pond=true active=false}",`
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+
+#place label(services_place) start(18; 18) hidden()
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,"z{name=""Training quantum"" quantum=true}",`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,"z{name=""Training bolts feeder"" containers=0 take_from=""Metalworker quantum""}:-cat_ammo/type/,mats/,other/+bolts+woodammo+boneammo(9x1)",,,,,,,,`,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,"c{name=""Garbage dump"" links_only=true}",,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,"c{name=""Prepared food"" barrels=-1}:+preparedmeals(5x5)",,,,`,,"c{name=""Booze"" barrels=-1}:+booze(5x5)",,,,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+"#build label(services_build) start(18; 18) hidden() message(Remember to enqueue manager orders for this blueprint.
+Assign a minecart to the training ammo quantum dump with ""assign-minecarts all"") build basic hospital, dining room, and barracks"
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,A,A,A,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,h,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,"trackstopN{name=""Training bolts dumper"" take_from=""Training bolts feeder"" route=""Training bolts quantum""}",`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,b
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,d
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,t,`,`,d,R
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,l,`,`,h
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,R
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,c,t,t,c,`
+,`,`,`,`,`,`,c,t,t,c,`
+,`,`,`,`,`,`,c,t,t,c,`
+,`,`,`,`,`,`,c,t,t,c,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,h,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#place label(services_place2) start(18; 18) hidden() jail food and booze
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,"c{name=""Jail booze"" barrels=-1 take_from=""Booze""}:+booze(1x2)",,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,"c{name=""Jail food"" take_from=""Prepared food""}:+preparedmeals(2x1)",,`,,`,`,`,,`,`,`
+,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,~,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,~,~,~,~,~,~,~,~,~,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,~,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,~,~,~,~,~,,~,~,~,~,~
+,~,~,~,~,~,,~,~,~,~,~
+,~,~,~,~,~,,~,~,~,~,~
+,~,~,~,~,~,,~,~,~,~,~
+,~,~,~,~,~,,~,~,~,~,~
+
+#build label(services_build2) start(18; 18) hidden() message(Remember to enqueue manager orders for this blueprint.) expand each room
+
+,`,b,`,,`,b,`,,`,b,`,,`,`,`,,`,`,`,,t,l,b,,`,`,`,,`,`,`
+,`,h,`,,`,h,`,,`,h,`,,`,`,`,,`,`,`,,c,v,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,`,,,,`,,,,`,,,,`,,,,`,,,,d,,,,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,A,A,A,~,~,~,A,A,A,A,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,c,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,t,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,c,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,~,`,`,`,`,`,`,`,h,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,~,`,`,`,~,`,`,`,b
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,b,,b,,b,,~
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,d,,d,,d,,~
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,`,~,~
+,`,`,`,`,`,l,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,~,`,`,~
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,c,t,t,c,`,~,~,~,~,`
+,`,c,t,t,c,`,~,~,~,~,`
+,`,c,t,t,c,`,~,~,~,~,`
+,`,c,t,t,c,`,~,~,~,~,`
+,`,`,`,`,`,`,`,`,`,`,`
+,h,`,`,`,`,~,`,`,`,`,h
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#place label(services_place3) start(18; 18) hidden() remaining jail food and booze
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,"c{name=""Jail booze"" barrels=-1 take_from=""Booze""}:+booze(1x2)",,`,`,"c{name=""Jail booze"" barrels=-1 take_from=""Booze""}:+booze(1x2)",,`,`,~,,`,`,"c{name=""Jail booze"" barrels=-1 take_from=""Booze""}:+booze(1x2)",,`,`,"c{name=""Jail booze"" barrels=-1 take_from=""Booze""}:+booze(1x2)"
+,`,`,`,,`,`,`,,`,`,`,,"c{name=""Jail food"" take_from=""Prepared food""}:+preparedmeals(2x1)",,`,,"c{name=""Jail food"" take_from=""Prepared food""}:+preparedmeals(2x1)",,`,,~,`,`,,"c{name=""Jail food"" take_from=""Prepared food""}:+preparedmeals(2x1)",,`,,"c{name=""Jail food"" take_from=""Prepared food""}:+preparedmeals(2x1)",,`
+,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,~,`,`,`,`,`,,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,~,~,~,~,~,~,~,~,~,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,~,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,~,~,~,~,~,,~,~,~,~,~
+,~,~,~,~,~,,~,~,~,~,~
+,~,~,~,~,~,,~,~,~,~,~
+,~,~,~,~,~,,~,~,~,~,~
+,~,~,~,~,~,,~,~,~,~,~
+
+#build label(services_build3) start(18; 18) hidden() message(Remember to enqueue manager orders for this blueprint.) finalize furniture
+
+,b,~,b,,b,~,b,,b,~,b,,t,l,b,,t,l,b,,~,~,~,,t,l,b,,t,l,b
+,h,~,h,,h,~,h,,h,~,h,,c,v,`,,c,v,`,,~,~,`,,c,v,`,,c,v,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,d,,,,d,,,,d,,,,d,,,,d,,,,~,,,,d,,,,d
+,`,`,`,s,`,`,`,s,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,`
+,s,`,`,`,`,`,`,`,`,`,s,,~,~,~,~,~,~,~,~,~,~,,`,,j,`,`,`,j
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,,`,`,~,`,`
+,s,`,`,`,`,`,`,`,`,`,s,,`,`,`,`,`,`,`,`,`,`,,`,,j,`,~,`,j
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,d,`,d,`,`,~,`,`
+,s,`,`,`,`,`,`,`,`,`,s,,~,h,h,`,`,`,h,h,~,`,,`,,j,`,`,`,j
+,`,`,`,`,`,`,`,`,`,`,`,,~,b,b,`,~,`,b,b,~
+,s,`,`,`,`,`,`,`,`,`,s,,`,`,`,`,`,`,`,`,`,,~,,~,,~,,~
+,`,`,`,`,`,`,`,`,`,`,`,,,,,d,,d,,,,,~,,~,,~,,~
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,d,`,d,`,`,`,`,`,d,`,d,`,`,`,`,`,~,`,`,~,~
+,`,c,t,`,`,~,`,`,t,c,`,,s,,`,`,`,`,`,,s,,`,`,`,~,`,`,~
+,`,c,t,`,`,`,`,`,t,c,`,d,`,d,`,`,`,`,`,d,`,d,`,`,`,`,`,t,`,`,~,~
+,`,c,t,t,c,`,c,t,t,c,`,,,,`,`,`,`,`,,,,`,,`,,`,,`
+,`,c,t,t,c,`,c,t,t,c,`,,,,,,`,,,,,,d,,d,,d,,d
+,`,c,t,t,c,`,c,t,t,c,`,,,,,,,,,,,,b,,b,,b,,b
+,`,~,~,~,~,`,~,~,~,~,`
+,`,~,~,~,~,`,~,~,~,~,`
+,`,~,~,~,~,`,~,~,~,~,`
+,`,~,~,~,~,`,~,~,~,~,`
+,`,`,`,`,`,`,`,`,`,`,`
+,~,`,s,`,`,~,`,`,s,`,~
+,,,,d,d,,d,d
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#notes label(guildhall_help)
+"Eight 7x7 rooms for guildhalls, temples, libraries, etc."
+Screenshot: https://drive.google.com/file/d/1mt66QOkfBqFLtw6AJKU6GNYmhB72XSJG
+""
+Features:
+"- Big rooms, optionally pre-furnished. Double-thick walls to ensure engravings add maximum value. Declare locations from the pre-created meeting zones as needed."
+""
+Guildhall Walkthrough:
+1) Dig out the rooms with /guildhall1.
+""
+"2) Once the area is dug out, choose a /guildhall2 variant based on your needs. For your first copy of this level, you probably want /guildhall2_default, which includes temple and library zones. For later copies you probably want to create all locations yourself, so you should choose /guildhall2_no_locations if you want the default furnishings or /guildhall2_custom for a full blank slate. Generate manager orders for your chosen variant."
+""
+"Note that the default temple and library are created ""Citizens and Long-Term Residents only"", but you can change this in the location configuration screen if you want them to attract visitors. If you need more rooms, you can dig another /guildhall1 in an unused z-level."
+"#dig label(guildhall1) start(15; 15; central stairs) message(Once the area is dug out, continue with /guildhall2.)"
+
+
+,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,3,3,3,3,3,3,3,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,3,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d
+,,,,,,,d,,,,,,3,,d,,,,,,d
+,,,,,,,d,,,,,,3,d,d,,,,,,d
+,,d,d,d,d,d,d,d,,,,,3,,d,,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,3,3,3,3,3,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,3,`,`,`,3,3,3,3,3,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,d,,3,`,`,`,3,,d,,3,3,3,3,3,d,d
+,,d,d,d,d,d,d,d,d,d,d,3,`,`,`,3,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,3,3,3,3,3,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,,d,,d,,,,,d,d,d,d,d,d,d
+,,,,,,,d,,,,,,d,d,d,,,,,,d
+,,,,,,,d,,,,,,d,,d,,,,,,d
+,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+
+
+#meta label(guildhall2_default) furnished with default temple and library
+locations/guildhall_locations
+doors/guildhall_doors
+furnish/guildhall_furnish
+""
+#meta label(guildhall2_no_locations) fully furnished and zoned but no locations
+zones/guildhall_zones
+doors/guildhall_doors
+furnish/guildhall_furnish
+""
+#meta label(guildhall2_custom) only zones and doors
+zones/guildhall_zones
+doors/guildhall_doors
+""
+""
+"#zone label(guildhall_locations) start(15; 15; central stairs) hidden() message(The library and temple are restricted to residents only by default. If you'd like them to attract vistors, please go to the location screen and change the restrictions.) declare a library and temple"
+
+,m(9x9),,,,,,,,,"m{location=temple name=""All-inclusive temple"" allow=residents}(9x9)",,,,,,,,,m(9x9)
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,,,,,,~,,,,,,~,,~,,,,,,~
+,m(9x9),,,,,,~,,,,,,`,~,`,,,,m(9x9),,~
+,,`,`,`,`,`,`,`,,,,,~,,~,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,`,~,`,,,,`,~,`,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,~,,`,,`,,`,,~,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,`,~,`,,,,`,~,`,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,~,,~,,,,,`,`,`,`,`,`,`
+,,,,,,,~,,,,,,`,~,`,,,,,,~
+,m(9x9),,,,,,~,,,m{location=library name=Library allow=residents}(9x9),,,~,,~,,,,m(9x9),,~
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+
+
+"#zone label(guildhall_zones) start(15; 15; central stairs) hidden() designate zones, ready for custom locations to be assigned"
+
+,m(9x9),,,,,,,,,m(9x9),,,,,,,,,m(9x9)
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,,,,,,~,,,,,,~,,~,,,,,,~
+,m(9x9),,,,,,~,,,,,,`,~,`,,,,m(9x9),,~
+,,`,`,`,`,`,`,`,,,,,~,,~,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,`,~,`,,,,`,~,`,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,~,,`,,`,,`,,~,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,`,~,`,,,,`,~,`,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,~,,~,,,,,`,`,`,`,`,`,`
+,,,,,,,~,,,,,,`,~,`,,,,,,~
+,m(9x9),,,,,,~,,,m(9x9),,,~,,~,,,,m(9x9),,~
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+
+
+#build label(guildhall_doors) start(15; 15; central stairs) hidden() message(Remember to enqueue manager orders for this blueprint.) build doors
+
+
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,d,d,`,`,`,`,`,`,`,d,d,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,,,,,,d,,,,,,d,,d,,,,,,d
+,,,,,,,d,,,,,,`,s,`,,,,,,d
+,,`,`,`,`,`,`,`,,,,,d,,d,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,d,`,d,`,,,,`,d,`,d,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,s,,`,,`,,`,,s,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,d,`,d,`,,,,`,d,`,d,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,d,,d,,,,,`,`,`,`,`,`,`
+,,,,,,,d,,,,,,`,s,`,,,,,,d
+,,,,,,,d,,,,,,d,,d,,,,,,d
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,d,d,`,`,`,`,`,`,`,d,d,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+
+
+"#build label(guildhall_furnish) start(15; 15; central stairs) hidden() furnish 4 guildhalls, 3 temples, and a library"
+
+
+,,F,`,`,`,s,`,`,,,F,s,`,c,`,`,f,,,`,`,s,`,`,`,F
+,,`,`,c,`,`,`,`,,,`,`,h,~a,`,`,f,,,`,`,`,`,c,`,`
+,,`,c,t,c,`,`,s,,,`,`,`,`,`,`,`,,,s,`,`,c,t,c,`
+,,`,`,c,`,c,`,`,,,`,`,`,`,`,`,`,,,`,`,c,`,c,`,`
+,,s,`,`,c,t,c,`,,,`,`,c,c,c,`,`,,,`,c,t,c,`,`,s
+,,`,`,`,`,c,`,`,~,~,`,`,c,c,c,`,`,~,~,`,`,c,`,`,`,`
+,,`,`,s,`,`,`,t,,,t,`,`,`,`,`,t,,,t,`,`,`,s,`,`
+,,,,,,,~,,,,,,~,,~,,,,,,~
+,,,,,,,~,,,,,,`,~,`,,,,,,~
+,,f,f,`,`,`,`,t,,,,,~,,~,,,,,t,`,`,`,`,f,f
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,c,c,`,~,`,~,`,,,,`,~,`,~,`,c,c,`,`,`,`
+,,c,~a,`,`,c,c,`,,~,,`,,`,,`,,~,,`,c,c,`,`,~a,c
+,,`,h,`,`,c,c,`,~,`,~,`,,,,`,~,`,~,`,c,c,`,`,h,`
+,,s,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,s
+,,F,`,`,`,`,`,t,,,,,~,,~,,,,,t,`,`,`,`,`,F
+,,,,,,,~,,,,,,`,~,`,,,,,,~
+,,,,,,,~,,,,,,~,,~,,,,,,~
+,,`,`,s,`,`,`,t,,,t,`,`,`,`,`,t,,,t,`,`,`,s,`,`
+,,`,`,`,`,c,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,c,`,`,`,`
+,,s,`,`,c,t,c,`,,,t,c,`,`,`,c,t,,,`,c,t,c,`,`,s
+,,`,`,c,`,c,`,`,,,t,c,`,`,`,c,t,,,`,`,c,`,c,`,`
+,,`,c,t,c,`,`,s,,,t,c,`,`,`,c,t,,,s,`,`,c,t,c,`
+,,`,`,c,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,c,`,`
+,,F,`,`,`,s,`,`,,,h,~c,~c,s,~c,~c,h,,,`,`,s,`,`,`,F
+
+
+#notes label(beds_help)
+Suites for nobles and apartments for the teeming masses
+Suites screenshot: https://drive.google.com/file/d/16XRb1w5zFoyVq2LBMx_aCwOyjFq7GULc
+Apt. screenshot: https://drive.google.com/file/d/16-NXlodLIQjeZUMSmsWRafeytwU2dXQo
+""
+Features:
+- Well-appointed suites to satisfy nobles or citizens with a need for opulence
+"- Suite rooms are multi-functional. Any suite can be zoned as a bedroom, office, dining hall, or tomb. If a noble requires a fancier version than what one room can provide, include multiple rooms in the zone. A suites level can fully satisfy a monarch if each zone covers four (engraved) rooms."
+- Apartments with beds and storage to keep dwarves happy and the fortress clean
+""
+Suites Walkthrough:
+1) Dig out the suites layer with /suites1.
+""
+"2) Once the area is dug out, furnish the suites with /suites2. The rooms are left unzoned so you can configure them for the needs of specific nobles. Generate manager orders for /suites2."
+""
+Apartments Walkthrough:
+"1) Dig out one layer of apartments with /apartments1, or 3 layers at once (180 bedrooms total) by configuring gui/quickfort to repeat down 3 levels."
+""
+"2) Once a layer is dug out, build furniture with /apartments2. Generate manager orders for /apartments2."
+"#dig label(suites1) start(18; 18; central stairs) message(Once the area is dug out, run /suites2) noble suites"
+
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,,,,d,,,,,,,d,,,,d,d,d,,,,d,,,,,,,d,,,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,,,,,,,,,,,,,,d,d,d,,,,,,,,,,,,,,,d
+,d,,,,,,,,,,,,,,,d,d,d,,,,,,,,,,,,,,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,,,d,,,,,,,d,,,,d,d,d,,,,d,,,,,,,d,,,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,d,d,d,d,d,d,d,,d,`,~,`,d,,d,d,d,d,d,d,d,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,,,,d,,,,,,,d,,,,d,d,d,,,,d,,,,,,,d,,,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,,,,,,,,,,,,,,d,d,d,,,,,,,,,,,,,,,d
+,d,,,,,,,,,,,,,,,d,d,d,,,,,,,,,,,,,,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,d,d,d,d,d,,,d,d,d,d,d,,d,,d,,d,d,d,d,d,,,d,d,d,d,d,,d
+,d,,,,d,,,,,,,d,,,,d,d,d,,,,d,,,,,,,d,,,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+
+"#meta label(suites2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
+rooms are left unzoned so you can configure them for specific nobles.) build furniture and set traffic patterns"
+traffic_suites/suites_traffic
+build_suites/suites_build
+#dig label(suites_traffic) start(18; 18; central stairs) hidden() don't path through other dwarves' rooms
+
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,,,,or,,,,,,,or,,,,`,`,`,,,,or,,,,,,,or,,,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,or,`,`,`,`,`,,,`,`,`,`,`,or,oh,`,oh,or,`,`,`,`,`,,,`,`,`,`,`,or,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,,,,,,,,,,,,,,oh,`,oh,,,,,,,,,,,,,,,`
+,`,,,,,,,,,,,,,,,oh,`,oh,,,,,,,,,,,,,,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,or,`,`,`,`,`,,,`,`,`,`,`,or,oh,`,oh,or,`,`,`,`,`,,,`,`,`,`,`,or,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,,,or,,,,,,,or,,,,oh,`,oh,,,,or,,,,,,,or,,,,`
+,`,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,`,`,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,`,`
+,`,`,,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`,,`,`
+,`,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,`,`,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,`,`
+,`,,,,or,,,,,,,or,,,,oh,`,oh,,,,or,,,,,,,or,,,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,or,`,`,`,`,`,,,`,`,`,`,`,or,oh,`,oh,or,`,`,`,`,`,,,`,`,`,`,`,or,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,,,,,,,,,,,,,,oh,`,oh,,,,,,,,,,,,,,,`
+,`,,,,,,,,,,,,,,,oh,`,oh,,,,,,,,,,,,,,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,or,`,`,`,`,`,,,`,`,`,`,`,or,oh,`,oh,or,`,`,`,`,`,,,`,`,`,`,`,or,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,`,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,`,`,`,`,`,,,`,`,`,`,`,,oh,,oh,,`,`,`,`,`,,,`,`,`,`,`,,`
+,`,,,,or,,,,,,,or,,,,`,`,`,,,,or,,,,,,,or,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+#build label(suites_build) start(18; 18; central stairs) hidden()
+
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,,,,d,,,,,,,d,,,,`,`,`,,,,d,,,,,,,d,,,,`
+,`,,a,r,`,`,h,,,h,`,`,r,a,,d,,d,,a,r,`,`,h,,,h,`,`,r,a,,`
+,`,,`,`,`,`,h,,,h,`,`,`,`,,`,s,`,,`,`,`,`,h,,,h,`,`,`,`,,`
+,`,d,`,`,b,`,`,,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,,`,`,b,`,`,d,`
+,`,,c,`,`,`,f,,,f,`,`,`,c,,`,`,`,,c,`,`,`,f,,,f,`,`,`,c,,`
+,`,,t,`,s,`,n,,,n,`,s,`,t,,`,s,`,,t,`,s,`,n,,,n,`,s,`,t,,`
+,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,`,,t,`,s,`,n,,,n,`,s,`,t,,`,s,`,,t,`,s,`,n,,,n,`,s,`,t,,`
+,`,,c,`,`,`,f,,,f,`,`,`,c,,`,`,`,,c,`,`,`,f,,,f,`,`,`,c,,`
+,`,d,`,`,b,`,`,,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,,`,`,b,`,`,d,`
+,`,,`,`,`,`,h,,,h,`,`,`,`,,`,s,`,,`,`,`,`,h,,,h,`,`,`,`,,`
+,`,,a,r,`,`,h,,,h,`,`,r,a,,d,,d,,a,r,`,`,h,,,h,`,`,r,a,,`
+,`,,,,d,,,,,,,d,,,,`,`,`,,,,d,,,,,,,d,,,,`
+,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`
+,`,`,,s,`,`,s,`,`,s,`,`,s,,`,`,~,`,`,,s,`,`,s,`,`,s,`,`,s,,`,`
+,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`
+,`,,,,d,,,,,,,d,,,,`,`,`,,,,d,,,,,,,d,,,,`
+,`,,a,r,`,`,h,,,h,`,`,r,a,,d,,d,,a,r,`,`,h,,,h,`,`,r,a,,`
+,`,,`,`,`,`,h,,,h,`,`,`,`,,`,s,`,,`,`,`,`,h,,,h,`,`,`,`,,`
+,`,d,`,`,b,`,`,,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,,`,`,b,`,`,d,`
+,`,,c,`,`,`,f,,,f,`,`,`,c,,`,`,`,,c,`,`,`,f,,,f,`,`,`,c,,`
+,`,,t,`,s,`,n,,,n,`,s,`,t,,`,s,`,,t,`,s,`,n,,,n,`,s,`,t,,`
+,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,`,,t,`,s,`,n,,,n,`,s,`,t,,`,s,`,,t,`,s,`,n,,,n,`,s,`,t,,`
+,`,,c,`,`,`,f,,,f,`,`,`,c,,`,`,`,,c,`,`,`,f,,,f,`,`,`,c,,`
+,`,d,`,`,b,`,`,,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,,`,`,b,`,`,d,`
+,`,,`,`,`,`,h,,,h,`,`,`,`,,`,s,`,,`,`,`,`,h,,,h,`,`,`,`,,`
+,`,,a,r,`,`,h,,,h,`,`,r,a,,d,,d,,a,r,`,`,h,,,h,`,`,r,a,,`
+,`,,,,d,,,,,,,d,,,,`,`,`,,,,d,,,,,,,d,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+"#dig label(apartments1) start(18; 18; central stairs) message(Once the area is dug out, continue with /apartments2.) apartment complex"
+
+,,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,,,,d,,,d,,,d,,,d,,,d,,d,,,d,,,d,,,d,,,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,,d,,,d,,,d,,,d,,d,d,d,,d,,,d,,,d,,,d,,,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,,,,,,,,,,,,,,,,d,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,d,,,d,,,d,,,d,,,d,,,d,d,d,,,d,,,d,,,d,,,d,,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,`,~,`,d,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,,,d,,,d,,,d,,,d,,,d,d,d,,,d,,,d,,,d,,,d,,,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,,,,,,,,,,,,,,,,d,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,,d,,,d,,,d,,,d,,,d,,d,d,d,,d,,,d,,,d,,,d,,,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,,,d,,,d,,,d,,,d,,d,,,d,,,d,,,d,,,d
+,,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+,,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d,,d,d
+
+#meta label(apartments2) start(central stairs) zone rooms and build furniture
+zone_apartments/apartments_rooms
+build_apartments/apartments_build
+#zone label(apartments_rooms) start(18; 18; central stairs) hidden() zone rooms
+,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5)
+,,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,,,,`,,,`,,,`,,,`,,,`,,`,,,`,,,`,,,`,,,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+b(4x5),,`,b(4x5),,`,b(4x5),,`,b(4x5),,`,b(4x5),,`,,`,`,`,b(4x5),`,,b(4x5),`,,b(4x5),`,,b(4x5),`,,b(4x5),`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,,`,`,`,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5)
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,,,`,,,`,,,`,,,`,,,`,`,`,,,`,,,`,,,`,,,`,,,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+b(4x5),`,,b(4x5),`,,b(4x5),`,,b(4x5),`,,b(4x5),`,,,`,`,`,b(4x5),,`,b(4x5),,`,b(4x5),,`,b(4x5),,`,b(4x5),,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,,`,`,`,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5),,,b(4x5)
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,,`,,,`,,,`,,,`,,,`,,`,`,`,,`,,,`,,,`,,,`,,,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,b(4x5),,`,b(4x5),,`,b(4x5),,`,b(4x5),,`,b(4x5),,`,b(4x5),`,,b(4x5),`,,b(4x5),`,,b(4x5),`,,b(4x5),`
+,,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+
+#build label(apartments_build) start(18; 18; central stairs) hidden() message(Remember to enqueue manager orders for this blueprint.) build furniture
+
+,,,f,h,,f,h,,f,h,,f,h,,f,h,,h,f,,h,f,,h,f,,h,f,,h,f
+,,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,,,b,`,,b,`,,b,`,,b,`,,b,`,,`,b,,`,b,,`,b,,`,b,,`,b
+,,,,d,,,d,,,d,,,d,,,d,,d,,,d,,,d,,,d,,,d
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,d,,,d,,,d,,,d,,,d,,`,`,`,,d,,,d,,,d,,,d,,,d
+,b,`,,b,`,,b,`,,b,`,,b,`,,`,`,`,,`,b,,`,b,,`,b,,`,b,,`,b
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,f,h,,f,h,,f,h,,f,h,,f,h,,`,`,`,,h,f,,h,f,,h,f,,h,f,,h,f
+,,,,,,,,,,,,,,,,`,`,`
+,h,f,,h,f,,h,f,,h,f,,h,f,,`,`,`,,f,h,,f,h,,f,h,,f,h,,f,h
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,`,b,,`,b,,`,b,,`,b,,`,b,,d,,d,,b,`,,b,`,,b,`,,b,`,,b,`
+,d,,,d,,,d,,,d,,,d,,,`,`,`,,,d,,,d,,,d,,,d,,,d
+,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`
+,d,,,d,,,d,,,d,,,d,,,`,`,`,,,d,,,d,,,d,,,d,,,d
+,`,b,,`,b,,`,b,,`,b,,`,b,,d,,d,,b,`,,b,`,,b,`,,b,`,,b,`
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,h,f,,h,f,,h,f,,h,f,,h,f,,`,`,`,,f,h,,f,h,,f,h,,f,h,,f,h
+,,,,,,,,,,,,,,,,`,`,`
+,f,h,,f,h,,f,h,,f,h,,f,h,,`,`,`,,h,f,,h,f,,h,f,,h,f,,h,f
+,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,b,`,,b,`,,b,`,,b,`,,b,`,,`,`,`,,`,b,,`,b,,`,b,,`,b,,`,b
+,,d,,,d,,,d,,,d,,,d,,`,`,`,,d,,,d,,,d,,,d,,,d
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,d,,,d,,,d,,,d,,,d,,d,,,d,,,d,,,d,,,d
+,,,b,`,,b,`,,b,`,,b,`,,b,`,,`,b,,`,b,,`,b,,`,b,,`,b
+,,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`,,`,`
+,,,f,h,,f,h,,f,h,,f,h,,f,h,,h,f,,h,f,,h,f,,h,f,,h,f
+
+#notes label(crypt_help)
+Places to rest your dead
+Screenshot: https://drive.google.com/file/d/16iT_ho7BIRPD_eofuxdlVQ4FunR1Li23
+""
+Features:
+"- Staged crypt expansion that grows with your, um, need"
+- 52 tombs in stage 1
+- 160 additional tombs in stage 2 (212 tombs total)
+- Extendable in any direction by applying the blueprints multiple times
+""
+Crypt Walkthrough:
+1) Dig out the layer with /crypt1.
+""
+"2) Once the area is dug out, add initial tombs with /crypt2."
+""
+"3) If/when you need additional tombs, apply /crypt3."
+"#dig label(crypt1) start(18; 18; central stairs) message(Once the area is dug out, continue with /crypt2.) crypt complex"
+
+,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,d,d,,d,,d,,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,d,d,d,,,,d,d,d,d,,d,,d,,d,,d,,d
+,,,,,,,,,,,,d,d,d,d,,~,,d,d,d,d
+,,d,,d,,d,,d,,d,,d,d,d,d,,,,d,d,d,d,,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,d,d,,d,,d,,d,,d,,d,,d,,d
+,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d,,d
+,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d
+
+#meta label(crypt2) start(central stairs) small crypt that can be extended later
+zone/crypt_zone
+build/crypt_build
+""
+#meta label(crypt3) start(central stairs) crypt extension
+zone_extended/crypt_extended_zone
+build_extended/crypt_extended_build
+#zone label(crypt_zone) start(18; 18; central stairs) hidden() zone tombs
+
+
+
+
+
+
+
+
+
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`
+,,,,,,,,,,,`,`,,,,,,,,,,`,`
+,,,,,,,,,,,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,`,,T{pets=true}(1x1),,`,`,`,,T{pets=true}(1x1),,`
+,,,,,,,,,,,`,`,,,,`,`,`,,,,`,`
+,,,,,,,,,,,,`,`,`,`,,,,`,`,`,`
+,,,,,,,,,,,,`,`,`,`,,~,,`,`,`,`
+,,,,,,,,,,,,`,`,`,`,,,,`,`,`,`
+,,,,,,,,,,,`,`,,,,`,`,`,,,,`,`
+,,,,,,,,,,,,`,,T{pets=true}(1x1),,`,`,`,,T{pets=true}(1x1),,`
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`
+,,,,,,,,,,,`,`,,,,,,,,,,`,`
+,,,,,,,,,,,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+
+
+
+
+
+
+#build label(crypt_build) start(18; 18; central stairs) hidden() message(Remember to enqueue manager orders for this blueprint.) build urns
+
+
+
+
+
+
+
+
+
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,`,,n,,n,,n,,n,,`
+,,,,,,,,,,,`,`,,,,,,,,,,`,`
+,,,,,,,,,,,,`,,n,,n,,n,,n,,`
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,`,,n,,`,s,`,,n,,`
+,,,,,,,,,,,`,`,,,,`,`,`,,,,`,`
+,,,,,,,,,,,,`,`,`,`,,,,`,`,`,`
+,,,,,,,,,,,,`,`,s,`,,~,,`,s,`,`
+,,,,,,,,,,,,`,`,`,`,,,,`,`,`,`
+,,,,,,,,,,,`,`,,,,`,`,`,,,,`,`
+,,,,,,,,,,,,`,,n,,`,s,`,,n,,`
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,`,,n,,n,,n,,n,,`
+,,,,,,,,,,,`,`,,,,,,,,,,`,`
+,,,,,,,,,,,,`,,n,,n,,n,,n,,`
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+
+
+
+
+
+
+#zone label(crypt_extended_zone) start(18; 18; central stairs) hidden() zone more tombs
+
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,~,,~,,~,,~,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,~,,~,,~,,~,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,~,,`,`,`,,~,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,`,`,`,,,,`,`,`,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,,,,,,,,,,,,`,`,`,`,,~,,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,`,`,`,,,,`,`,`,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,~,,`,`,`,,~,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,~,,~,,~,,~,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,~,,~,,~,,~,,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,`,,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1),,T{pets=true}(1x1)
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+
+#build label(crypt_extended_build) start(18; 18; central stairs) hidden() message(Remember to enqueue manager orders for this blueprint.) build more urns
+
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,n,,n,,n,,n,,`,,n,,n,,n,,n,,n
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,n,,n,,n,,n,,`,,n,,n,,n,,n,,n
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,n,,n,,n,,n,,`,,n,,n,,n,,n,,n
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,n,,n,,n,,n,,`,,n,,n,,n,,n,,n
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,~,,~,,~,,~,,`,,n,,n,,n,,n,,n
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,~,,~,,~,,~,,`,,n,,n,,n,,n,,n
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,~,,`,~,`,,~,,`,,n,,n,,n,,n,,n
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,`,`,`,,,,`,`,`,`,,n,,n,,n,,n,,n
+,,,,,,,,,,,,`,`,~,`,,~,,`,~,`,`
+,,n,,n,,n,,n,,n,,`,`,`,`,,,,`,`,`,`,,n,,n,,n,,n,,n
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,~,,`,~,`,,~,,`,,n,,n,,n,,n,,n
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,~,,~,,~,,~,,`,,n,,n,,n,,n,,n
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,~,,~,,~,,~,,`,,n,,n,,n,,n,,n
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,n,,n,,n,,n,,`,,n,,n,,n,,n,,n
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,n,,n,,n,,n,,`,,n,,n,,n,,n,,n
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,n,,n,,n,,n,,`,,n,,n,,n,,n,,n
+,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,n,,n,,n,,n,,n,,`,,n,,n,,n,,n,,`,,n,,n,,n,,n,,n
+,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
diff --git a/data/blueprints/library/embark.csv b/data/blueprints/embark.csv
similarity index 100%
rename from data/blueprints/library/embark.csv
rename to data/blueprints/embark.csv
diff --git a/data/blueprints/library/exploratory-mining/connected-mineshafts.csv b/data/blueprints/exploratory-mining/connected-mineshafts.csv
similarity index 100%
rename from data/blueprints/library/exploratory-mining/connected-mineshafts.csv
rename to data/blueprints/exploratory-mining/connected-mineshafts.csv
diff --git a/data/blueprints/library/exploratory-mining/tunnels.csv b/data/blueprints/exploratory-mining/tunnels.csv
similarity index 100%
rename from data/blueprints/library/exploratory-mining/tunnels.csv
rename to data/blueprints/exploratory-mining/tunnels.csv
diff --git a/data/blueprints/library/exploratory-mining/vertical-mineshafts.csv b/data/blueprints/exploratory-mining/vertical-mineshafts.csv
similarity index 100%
rename from data/blueprints/library/exploratory-mining/vertical-mineshafts.csv
rename to data/blueprints/exploratory-mining/vertical-mineshafts.csv
diff --git a/data/blueprints/library/layout-helpers/mark_down_left.csv b/data/blueprints/layout-helpers/mark_down_left.csv
similarity index 100%
rename from data/blueprints/library/layout-helpers/mark_down_left.csv
rename to data/blueprints/layout-helpers/mark_down_left.csv
diff --git a/data/blueprints/library/layout-helpers/mark_down_right.csv b/data/blueprints/layout-helpers/mark_down_right.csv
similarity index 100%
rename from data/blueprints/library/layout-helpers/mark_down_right.csv
rename to data/blueprints/layout-helpers/mark_down_right.csv
diff --git a/data/blueprints/library/layout-helpers/mark_up_left.csv b/data/blueprints/layout-helpers/mark_up_left.csv
similarity index 100%
rename from data/blueprints/library/layout-helpers/mark_up_left.csv
rename to data/blueprints/layout-helpers/mark_up_left.csv
diff --git a/data/blueprints/library/layout-helpers/mark_up_right.csv b/data/blueprints/layout-helpers/mark_up_right.csv
similarity index 100%
rename from data/blueprints/library/layout-helpers/mark_up_right.csv
rename to data/blueprints/layout-helpers/mark_up_right.csv
diff --git a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
deleted file mode 100644
index 89363e35f..000000000
--- a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
+++ /dev/null
@@ -1,70 +0,0 @@
-"#dig start(11; 12) 28 bedrooms, 3 tiles each (efficient layout)"
-# see an image of this blueprint at https://i.imgur.com/XD7D4ux.png
- , , , , , ,d, , , , , ,d, , , , , , , , ,#
- , , , , , ,d, , , , , ,d, , , , , , , , ,#
- , , , ,d, ,d, ,d, ,d, ,d, ,d, , , , , , ,#
- , , , ,d, ,d, ,d, ,d, ,d, ,d, , , , , , ,#
- , , , ,d,d,d,d,d, ,d,d,d, ,d, ,d,d,d, , ,#
- , , , , , ,d, , , , , ,d,d, , ,d, , , , ,#
- , ,d,d,d, ,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,#
- , , , , ,d,d, , , ,d, ,d, , , ,d, , , , ,#
-d,d,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d,d,d, , ,#
- , , , ,d, , , ,d,i,i,i,d, ,d, , , , , , ,#
- , ,d,d,d, ,d,d,d,i,i,i,d,d,d, ,d,d,d, , ,#
- , , , , , ,d, ,d,i,i,i,d, , , ,d, , , , ,#
- , ,d,d,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,#
- , , , ,d, , , ,d, ,d, , , ,d,d, , , , , ,#
-d,d,d,d,d,d,d,d,d, ,d,d,d, ,d, ,d,d,d, , ,#
- , , , ,d, , ,d,d, , , , , ,d, , , , , , ,#
- , ,d,d,d, ,d, ,d,d,d, ,d,d,d,d,d, , , , ,#
- , , , , , ,d, ,d, ,d, ,d, ,d, ,d, , , , ,#
- , , , , , ,d, ,d, ,d, ,d, ,d, ,d, , , , ,#
- , , , , , , , ,d, , , , , ,d, , , , , , ,#
- , , , , , , , ,d, , , , , ,d, , , , , , ,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
-"#build label(furniture) start(11; 11) 28x doors, beds, coffers, and cabinets"
- , , , , , ,f, , , , , ,f, , , , , , , , ,#
- , , , , , ,h, , , , , ,h, , , , , , , , ,#
- , , , ,f, ,b, ,f, ,f, ,b, ,f, , , , , , ,#
- , , , ,h, ,d, ,h, ,h, ,d, ,h, , , , , , ,#
- , , , ,b,d,`,d,b, ,b,d,`, ,b, ,b,h,f, , ,#
- , , , , , ,`, , , , , ,`,d, , ,d, , , , ,#
- , ,f,h,b, ,`, ,f,h,b, ,`,`,`,`,`,d,b,h,f,#
- , , , , ,d,`, , , ,d, ,`, , , ,d, , , , ,#
-f,h,b,d,`,`,`,`,`,`,`,`,`, ,f, ,b,h,f, , ,#
- , , , ,d, , , ,`,`,`,`,`, ,h, , , , , , ,#
- , ,f,h,b, ,b,d,`,`,`,`,`,d,b, ,b,h,f, , ,#
- , , , , , ,h, ,`,`,`,`,`, , , ,d, , , , ,#
- , ,f,h,b, ,f, ,`,`,`,`,`,`,`,`,`,d,b,h,f,#
- , , , ,d, , , ,`, ,d, , , ,`,d, , , , , ,#
-f,h,b,d,`,`,`,`,`, ,b,h,f, ,`, ,b,h,f, , ,#
- , , , ,d, , ,d,`, , , , , ,`, , , , , , ,#
- , ,f,h,b, ,b, ,`,d,b, ,b,d,`,d,b, , , , ,#
- , , , , , ,h, ,d, ,h, ,h, ,d, ,h, , , , ,#
- , , , , , ,f, ,b, ,f, ,f, ,b, ,f, , , , ,#
- , , , , , , , ,h, , , , , ,h, , , , , , ,#
- , , , , , , , ,f, , , , , ,f, , , , , , ,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
-#query label(rooms) start(11; 11) room designations
- , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , ,r+,, , , , ,r+,, , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , , , ,r+,, , ,r+,,r+,, , ,r+,,r+,, , , ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , , , ,r+,, , , , ,r+,, , , , , , ,r+,, ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , ,r+,, , , , , , , , , , , , ,r+,, , , ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , , , ,r+,,r+,, , , , , , ,r+,,r+,, , , ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , , , ,r+,, , , , , , , , , , , , ,r+,, ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , ,r+,, , , , , , ,r+,, , , , ,r+,, , , ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , , , ,r+,,r+,, , ,r+,,r+,, , ,r+,, , , ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , ,r+,, , , , ,r+,, , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
deleted file mode 100644
index 881be3dd1..000000000
--- a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
+++ /dev/null
@@ -1,100 +0,0 @@
-"#dig start(16; 17; central 3x3 stairwell) 48 rooms, 4 tiles each (more aesthetic)"
-# see an image of this blueprint at: https://i.imgur.com/3pNc0HM.png
- , , , , , , , , , , , , ,d, , , ,d, , , , , , , , , , , , , ,#
- , , , ,d, , , ,d, , , ,d,d,d,d,d,d,d, , , ,d, , , ,d, , , , ,#
- , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,#
- ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, ,#
-d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d,#
- ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, ,#
- ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,#
- ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, ,#
-d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d,#
- ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, ,#
- , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,#
- , , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , , ,#
- , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,#
- ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, ,#
- , ,d, , ,d,d,d, , ,d, , ,d,i,i,i,d, , ,d, , ,d,d,d, , ,d, , ,#
- , ,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d, , ,#
- , ,d, , ,d,d,d, , ,d, , ,d,i,i,i,d, , ,d, , ,d,d,d, , ,d, , ,#
- ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, ,#
- , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,#
- , , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , , ,#
- , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,#
- ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, ,#
-d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d,#
- ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, ,#
- ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,#
- ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, ,#
-d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d,#
- ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, ,#
- , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,#
- , , , ,d, , , ,d, , , ,d,d,d,d,d,d,d, , , ,d, , , ,d, , , , ,#
- , , , , , , , , , , , , ,d, , , ,d, , , , , , , , , , , , , ,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
-"#build label(furniture) start(16; 16; central 3x3 stairwell) 48x doors, beds, cabinets, and coffers; 8x statues"
- , , , , , , , , , , , , ,f, , , ,f, , , , , , , , , , , , , ,#
- , , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , , ,#
- , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,#
- ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, ,#
-f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f,#
- ,d, , , , , , , , , ,d, , , , , , , ,d, , , , , , , , , ,d, ,#
- , , , , , ,s, , , , , , , , ,s, , , , , , , , ,s, , , , , , ,#
- ,d, , , , , , , , , ,d, , , , , , , ,d, , , , , , , , , ,d, ,#
-f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f,#
- ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, ,#
- , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,#
- , , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , , ,#
- , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,#
- ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, ,#
- , ,d, , , , , , , ,d, , , , , , , , , ,d, , , , , , , ,d, , ,#
- , , , , , ,s, , , , , , , , , , , , , , , , , ,s, , , , , , ,#
- , ,d, , , , , , , ,d, , , , , , , , , ,d, , , , , , , ,d, , ,#
- ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, ,#
- , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,#
- , , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , , ,#
- , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,#
- ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, ,#
-f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f,#
- ,d, , , , , , , , , ,d, , , , , , , ,d, , , , , , , , , ,d, ,#
- , , , , , ,s, , , , , , , , ,s, , , , , , , , ,s, , , , , , ,#
- ,d, , , , , , , , , ,d, , , , , , , ,d, , , , , , , , , ,d, ,#
-f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f,#
- ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, ,#
- , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,#
- , , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , , ,#
- , , , , , , , , , , , , ,f, , , ,f, , , , , , , , , , , , , ,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
-#query label(rooms) start(16; 16; central 3x3 stairwell) room designations
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , ,#
- , , ,r+,, , , , ,r+,, , , , , , , , , , ,r+,, , , , ,r+,, , ,#
- ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,,#
- , , ,r+,, , , , ,r+,, , , , , , , , , , ,r+,, , , , ,r+,, , ,#
- , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , ,#
- , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, ,#
- , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , ,#
- , , ,r+,, , , , ,r+,, , , , , , , , , , ,r+,, , , , ,r+,, , ,#
- ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,,#
- , , ,r+,, , , , ,r+,, , , , , , , , , , ,r+,, , , , ,r+,, , ,#
- , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
deleted file mode 100644
index ec2a1ce1e..000000000
--- a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
+++ /dev/null
@@ -1,232 +0,0 @@
-"#dig start(36;74) 97 rooms, 9 tiles each (fractal design)"
-# see an image of this blueprint at: https://i.imgur.com/ENi5QLX.png
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,d, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , ,d,d,d, , ,d, , , , , , ,d, , , , , , ,d, , , , , , ,d, , , , , , ,d, , ,d,d,d, , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , ,d,d,d, , ,d, , , , , , ,d, , , , , ,d,d,d, , , , , ,d, , , , , , ,d, , ,d,d,d, , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , ,d,d,d, , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,d, , ,d,d,d, , ,d, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , ,d,d,d, ,d,d,d, ,d,d,d, , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , ,d,d,d, , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
- , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
- , , , , , , , , , , , ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
- , , , , , , , , , , , , ,d, , , , , , ,d,d,d, ,d, ,d,d,d, , , , , ,d,d,d, , , , , ,d,d,d, ,d, ,d,d,d, , , , , , ,d, , , , , , , , , , , , , ,#
- , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , ,#
- , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , ,#
- , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d,d,d, ,d, , , , , , ,d, , ,d,d,d, , ,d, , , , , , ,d, ,d,d,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , ,#
- ,d,d,d, , ,d, , , , , , ,d, , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , ,d, , , , , , ,d, , ,d,d,d, ,#
- ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,#
- ,d,d,d, , ,d, , , , , , ,d, , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , ,d, , , , , , ,d, , ,d,d,d, ,#
- , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d,d,d, ,d, , , , , , ,d, , ,d,d,d, , ,d, , , , , , ,d, ,d,d,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , ,#
- , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , ,#
- , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , ,#
- , , , , , , , , , , , , ,d, , , , , , ,d,d,d, ,d, ,d,d,d, , , , , ,d,d,d, , , , , ,d,d,d, ,d, ,d,d,d, , , , , , ,d, , , , , , , , , , , , , ,#
- , , , , , , , , , , , ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
- , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
- , , , , , , , , , , , ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , ,d,d,d, , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,d,d, ,d,d,d, ,d,d, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d, ,d,d,d, ,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
-"#build label(furniture) start(36;73) 97 doors; 95 beds, coffers, and cabinets; 190 urns; 14 tables, chairs, weapon racks, armor stands, and statues"
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,f,`,n, ,`, ,n,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`,d,`,d,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,n, ,`, ,n,`,h, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, ,`, ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,`, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,`, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, ,r,b,t, ,`, ,r,b,t, ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, ,a,`,c, ,`, ,a,`,c, ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,h,s,f, ,`, ,h,s,f, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,`, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,h,`,f, ,f,`,n, ,`, ,n,r,a,h, ,`, ,h,a,r,n, ,`, ,n,`,f, ,h,`,f, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,d,`,b,`,s, ,`, ,s,`,b,`,d,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,n,`,n, ,h,`,n, ,`, ,n,t,c,f, ,`, ,f,c,t,n, ,`, ,n,`,h, ,n,`,n, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , ,f,`,n, , ,d, , , , , , ,`, , , , , , ,`, , , , , , ,`, , , , , , ,d, , ,n,`,f, , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , ,`,b,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,b,`, , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , ,h,`,n, , ,d, , , , , , ,`, , , , , ,`,`,`, , , , , ,`, , , , , , ,d, , ,n,`,h, , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,n,`,n, ,f,`,n, ,`, ,n,`,f, ,`,`,`, ,f,`,n, ,`, ,n,`,f, ,n,`,n, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,d,`,b,`, ,`,`,`, ,`,b,`,d,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,h,`,f, ,h,`,n, ,`, ,n,`,h, ,`,`,`, ,h,`,n, ,`, ,n,`,h, ,h,`,f, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , ,`,`,`, , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, ,n,`,n, ,f,n, ,`,`,`, ,n,f, ,n,`,n, ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`,b,`, ,b,`,d,`,`,`,d,`,b, ,`,b,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,h,`,f, ,h,n, ,`,`,`, ,n,h, ,h,`,f, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,d, , ,`,`,`, , ,d, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,f,`,n, ,`, ,n,`,f, ,n,`,n, ,`,`,`, ,n,`,n, ,f,`,n, ,`, ,n,`,f, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,`,b,`,d,`,d,`,b,`, ,h,b,f, ,`,`,`, ,h,b,f, ,`,b,`,d,`,d,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,h,`,n, ,`, ,n,`,h, , ,d, , ,`,`,`, , ,d, , ,h,`,n, ,`, ,n,`,h, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,`, , , , , ,n,`,n, ,`,`,`, ,n,`,n, , , , , ,`, , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,h,`,f, ,`, ,h,`,f, ,`,b,`, ,`,`,`, ,`,b,`, ,h,`,f, ,`, ,h,`,f, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`, ,`,b,`, ,h,`,f, ,`,`,`, ,h,`,f, ,`,b,`, ,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,n,`,n, ,`, ,n,`,n, , , , , ,`,`,`, , , , , ,n,`,n, ,`, ,n,`,n, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , ,h,`,f, ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, ,`,`,`, ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, ,h,`,f, , , , , , , , , , , , ,#
- , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, ,`,`,`, ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , ,#
- , , , , , , , , , , , ,n,`,n, ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, ,`,`,`, ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, ,n,`,n, , , , , , , , , , , , ,#
- , , , , , , , , , , , , ,d, , , , , , ,n,`,n, ,`, ,n,`,n, , , , , ,`,`,`, , , , , ,n,`,n, ,`, ,n,`,n, , , , , , ,d, , , , , , , , , , , , , ,#
- , , , , ,h,`,f, ,f,`,n, ,`, ,n,r,a,h, ,r,b,t, ,`, ,`,b,`, ,h,b,f, ,`,`,`, ,h,b,f, ,`,b,`, ,`, ,r,b,t, ,h,a,r,n, ,`, ,n,`,f, ,h,`,f, , , , , ,#
- , , , , ,`,b,`, ,`,b,`,d,`,d,`,b,`,s, ,a,`,c, ,`, ,h,`,f, ,n,`,n, ,`,`,`, ,n,`,n, ,h,`,f, ,`, ,a,`,c, ,s,`,b,`,d,`,d,`,b,`, ,`,b,`, , , , , ,#
- , , , , ,n,`,n, ,h,`,n, ,`, ,n,t,c,f, ,h,s,f, ,`, , , , , , ,d, , ,`,`,`, , ,d, , , , , , ,`, ,h,s,f, ,f,c,t,n, ,`, ,n,`,h, ,n,`,n, , , , , ,#
- ,f,`,n, , ,d, , , , , , ,`, , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , ,`, , , , , , ,d, , ,n,`,f, ,#
- ,`,b,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,b,`, ,#
- ,h,`,n, , ,d, , , , , , ,`, , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , ,`, , , , , , ,d, , ,n,`,h, ,#
- , , , , ,n,`,n, ,f,`,n, ,`, ,n,r,a,h, ,h,s,f, ,`, , , , , , ,d, , ,`,`,`, , ,d, , , , , , ,`, ,h,s,f, ,h,a,r,n, ,`, ,n,`,f, ,n,`,n, , , , , ,#
- , , , , ,`,b,`, ,`,b,`,d,`,d,`,b,`,s, ,a,`,c, ,`, ,h,`,f, ,n,`,n, ,`,`,`, ,n,`,n, ,h,`,f, ,`, ,a,`,c, ,s,`,b,`,d,`,d,`,b,`, ,`,b,`, , , , , ,#
- , , , , ,h,`,f, ,h,`,n, ,`, ,n,t,c,f, ,r,b,t, ,`, ,`,b,`, ,h,b,f, ,`,`,`, ,h,b,f, ,`,b,`, ,`, ,r,b,t, ,f,c,t,n, ,`, ,n,`,h, ,h,`,f, , , , , ,#
- , , , , , , , , , , , , ,d, , , , , , ,n,`,n, ,`, ,n,`,n, , , , , ,`,`,`, , , , , ,n,`,n, ,`, ,n,`,n, , , , , , ,d, , , , , , , , , , , , , ,#
- , , , , , , , , , , , ,n,`,n, ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, ,`,`,`, ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, ,n,`,n, , , , , , , , , , , , ,#
- , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, ,`,`,`, ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , ,#
- , , , , , , , , , , , ,h,`,f, ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, ,`,`,`, ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, ,h,`,f, , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,n,`,n, ,`, ,n,`,n, , , , , ,`,`,`, , , , , ,n,`,n, ,`, ,n,`,n, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`, ,`,b,`, ,h,s,f, ,`,`,`, ,h,s,f, ,`,b,`, ,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,h,`,f, ,`, ,h,`,f, ,a,`,c, ,`,`,`, ,a,`,c, ,h,`,f, ,`, ,h,`,f, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,`, , , , , ,r,b,t,d,`,`,`,d,r,b,t, , , , , ,`, , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,f,`,n, ,`, ,n,`,f, ,n,`,n, ,`,`,`, ,n,`,n, ,f,`,n, ,`, ,n,`,f, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,`,b,`,d,`,d,`,b,`, , ,d, , ,`,`,`, , ,d, , ,`,b,`,d,`,d,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , ,h,`,n, ,`, ,n,`,h, ,`,`,`, ,`,`,`, ,`,`,`, ,h,`,n, ,`, ,n,`,h, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,`,`, ,`,`,`, ,`,`, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,f,`,n, ,`,`, ,`,`,`, ,`,`, ,n,`,f, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,`, ,`,`,`, ,`,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, ,h,`,n, ,`,`, ,`,`,`, ,`,`, ,n,`,h, ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,`,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
-#query label(rooms) start(36;73) message(use burial script to mark urns as usable) room designations
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , ,r+,, ,r+,, , , , , , ,r+,, ,r+,, , ,r+,, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,~,~,~, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,~,~,~, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,~,~,~, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
- , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
deleted file mode 100644
index c5566920b..000000000
--- a/data/blueprints/library/dreamfort.csv
+++ /dev/null
@@ -1,3132 +0,0 @@
-#notes label(help) run me for the dreamfort walkthrough
-"Welcome to Dreamfort! These blueprints will help you build a functional, secure, fully self-sustaining fortress that you can use as-is or extend to build the fortress of your dreams!"
-""
-"It can be difficult to apply a set of blueprints that you did not write yourself. This walkthrough will guide you through the high-level steps of building Dreamfort. Run ""quickfort run library/dreamfort.csv -n /checklist"" (or, if you're looking at the online version, switch to the ""checklist"" sheet) for a compact list of the commands you'll be running. Each level also has its own mini-walkthrough with more details."
-""
-"The final fort will have a walled-in area on the surface for livestock, trading, aboveground farming, and military training. One z-level down is the farming level, with related workshops and vents up to the surface for miasma prevention. The farming level also has a miniature dining hall and dormitory for use until you get the services and housing levels set up."
-""
-"Beyond those two, the other layers can be built in any order, at any z-level, according to your preference and the layout peculiarities of your embark site:"
-"- The industry level has a compact, but complete set of workshops and stockpiles (minus what is already provided on the farming level)."
-"- The services level has dining, hospital, marksman barracks, and justice services, plus a well system. It is 4 z-levels deep."
-"- The guildhall level has large, empty rooms for building libraries, temples, and guildhalls."
-- The suites level has fancy rooms for your nobles.
-- The apartments levels have small but well-furnished bedrooms for your other dwarves.
-""
-"Run each level's ""help"" blueprint (e.g. ""quickfort run library/dreamfort.csv -n /surface_help"") for more details."
-""
-"Dreamfort has a central stairs-based design. For all Dreamfort levels, place the cursor on the center (undug) tile of the 3x3 stairs area when you apply the blueprints for that level. The first surface blueprint will designate a column of stairs that you can use as a guide. If you need to extend the stairs down further to lower levels, run ""quickfort run library/dreamfort.csv -n /central_stairs --repeat down,10"" with the cursor on the z-level below the lowest current stairs."
-""
-"Dreamfort blueprints take care of everything to get the fort up and running. You don't need to clear any extra trees or create any extra buildings or stockpiles (though of course you are free to do so). Blueprints that do require manual steps, like 'assign minecart to hauling route', will leave a message telling you so when you run them. Note that blueprints will designate buildings to build even if you don't have the materials needed to build them. You can use ""quickfort orders"" to automatically create the manager orders for all the needed items. Make sure your manager is available to validate all the incoming work orders!"
-""
-"There are some tasks common to all forts that Dreamfort doesn't specifically handle for you. For example, Dreamfort sets up a barracks, but managing squads is up to you. Here are some other common tasks that may need to be done manually (or with some other tool):"
-- Exploratory mining for specific resources like iron
-- Filling the well system with water
-- Bringing magma up to the industry level to power magma forges/furnaces
-- Manufacturing trade goods
-- Assigning skilled labors to migrants (although the example professions included with DFHack will help with this)
-"- Custom stockpile setups to assist with, for example, encrusting only high-quality items"
-""
-"Dreamfort works best at an embark site that is flat and has at least one soil layer. New players should avoid embarks with aquifers if they are not prepared to deal with them. Bring picks for mining, an axe for woodcutting, and an anvil for a forge. Bring a few blocks to speed up initial workshop construction as well. That's all you really need, but see the example embark profile in the online spreadsheets for a more complete setup."
-""
-"Other DFHack commands also work very well with Dreamfort, such as autofarm, autonestbox, prioritize, seedwatch, tailor, and, of course, buildingplan. An init file that gets everything configured for you is distributed with DFHack as hack/examples/init/onMapLoad_dreamfort.init."
-Put that file in your dfhack-config/init/ directory -- the same directory that has dfhack.init.
-""
-"Also check out https://docs.dfhack.org/en/stable/docs/Plugins.html#professions for more information on the default labor professions that are distributed with DFHack, including suggestions on how many dwarves of each profession you are likely to need at each stage of fort maturity."
-""
-"Once you have your starting surface workshops up and running, you might want to configure buildingplan (in its global settings, accessible from any building placement screen, e.g.: b-a-G) to only use blocks for constructions so it won't use your precious wood, boulders, and bars to build floors and walls. If you bring at least 7 blocks with you on embark, you can even set this in your dfhack-config/init/onMapLoad.init file like this:"
-on-new-fortress buildingplan set boulders false; buildingplan set logs false
-""
-"Directly after embark, run ""quickfort run library/dreamfort.csv -n /setup"" with your cursor on your wagon to set settings, and get started building your fort with ""quickfort run library/dreamfort.csv -n /surface1"" on the surface (see /surface_help for how to select a good spot). Read the walkthroughs for each level to understand what's going on and follow the checklist to keep track of where you are in the building process. Good luck, and have fun building an awesome Dreamfort-based fort!"
-""
-"The dreamfort.csv file distributed with DFHack is generated from online spreadsheet files. If you want to look at how these blueprints are put together, it is easier to look at the online spreadsheets than the giant .csv. You can view them at: https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP"
-You are welcome to copy the Dreamfort spreadsheets and make your own modifications!
-""
-"If you like, you can download a fully built Dreamfort-based fort from https://dffd.bay12games.com/file.php?id=15434 and explore it
-interactively."
-"# The dreamfort.csv distributed with DFHack is generated with the following command:
-  for fname in dreamfort*.xlsx; do xlsx2csv -a -p '' ""$fname""; done | sed 's/,*$//'"
-#notes label(checklist) command checklist
-"Here is the recommended order for Dreamfort commands. You can copy/paste the command lines directly into the DFHack terminal, or, if you prefer, you can run the blueprints in the UI with gui/quickfort. See the walkthroughs (the ""help"" blueprints) for context and details. Also remember to read the messages the blueprints print out after you run them so you don't miss any important manual steps."
-""
--- Preparation (before you embark!) --
-Copy hack/examples/init/onMapLoad_dreamfort.init to your dfhack-config/init directory inside your DF installation
-Optionally copy the premade Dreamfort embark profile from the online spreadsheets to the data/init/embark_profiles.txt file
-""
--- Set settings and preload initial orders --
-quickfort run library/dreamfort.csv -n /setup,# Run before making any manual adjustments to settings! Run the /setup_help blueprint for details on what this blueprint does.
-"quickfort orders library/dreamfort.csv -n ""/surface2, /farming2, /surface3, /farming3, /industry2, /surface4""","# Queue up orders required to get the fort minimally functional and secure. You can remove the order for the anvil (you brought one with you, right?)."
-""
--- Find a good starting spot on the surface --
-gui/quickfort library/dreamfort.csv -n /perimeter,# Run at embark. Don't actually apply the blueprint. Just use the preview shadow to find a good spot on the surface.
-""
--- Dig  --
-quickfort run library/dreamfort.csv -n /surface1,# Run when you find your center tile.
-quickfort run library/dreamfort.csv -n /dig_all,"# Run when you find a suitable rock layer for the industry level. It designates digging for industry, services, guildhall, suites, and apartments all in one go. This list does not include the farming level, which we'll dig in the uppermost soil layer a bit later. Note that it is more efficient for your miners if you designate your digging before they dig the central stairs past that level since the stairs are dug at a low priority. This keeps your miners focused on one level at a time. If you need to designate your levels individually due to caverns interrupting the sequence or just because it is your preference, run the level-specific dig blueprints (i.e. /industry1, /services1, /guildhall1, /suites1, and 5 levels of /apartments1) instead of running /dig_all."
-""
--- Core fort (should finish at about the third migration wave) --
-quickfort run library/dreamfort.csv -n /surface2,"# Run after initial trees are cleared. If you are deconstructing the wagon now, wait until after the wagon is deconstructed so the jobs that depend on wagon contents (e.g. blocks) don't get canceled later."
-quickfort run library/dreamfort.csv -n /farming1,# Run when channels are dug and the additional designated trees are cleared.
-quickfort run library/dreamfort.csv -n /farming2,# Run when the farming level has been dug out.
-quickfort run library/dreamfort.csv -n /surface3,# Run right after /farming2.
-quickfort run library/dreamfort.csv -n /farming3,# Run when furniture has been placed.
-quickfort run library/dreamfort.csv -n /industry2,# Run when the industry level has been dug out.
-prioritize ConstructBuilding,# To get those workshops up and running ASAP. You may have to run this several times as the materials for the building construction jobs become ready.
-quickfort run library/dreamfort.csv -n /surface4,"# Run after the walls and floors are built on the surface. Even if /surface3 is finished before you run /industry2, though, wait until after /industry2 to run this blueprint so that surface walls, floors, and roofing don't prevent your workshops from being built (due to lack of blocks)."
-"quickfort orders,run library/dreamfort.csv -n /services2",# Run when the services levels have been dug out. Feel free to remove the orders for the ropes if you already brought them with you.
-orders import library/basic,"# Run after the first migration wave, so you have dorfs to do all the basic tasks. Note that this is the ""orders"" plugin, not the ""quickfort orders"" command."
-"quickfort orders,run library/dreamfort.csv -n /surface5","# Run when all marked trees on the surface are chopped down and walls and floors have been constructed, including the roof section over the future barracks."
-prioritize ConstructBuilding,# Run when you see the bridges ready to be built so the busy masons come and build them.
-"quickfort orders,run library/dreamfort.csv -n /surface6",# Run when at least the beehives and weapon rack are constructed and you have linked all levers to their respective bridges.
-"quickfort orders,run library/dreamfort.csv -n /surface7",# Run after the surface walls are completed and any marked trees are chopped down.
-""
--- Plumbing --
-"This is a good time to fill your well cisterns, either with a bucket brigade or by routing water from a freshwater stream or an aquifer (see the library/aquifer_tap.csv blueprint for help with this)."
-"Also consider bringing magma up to your services level so you can replace the forge and furnaces on your industry level with more powerful magma versions. This is especially important if your embark has insufficient trees to convert into charcoal. Keep in mind that moving magma is a tricky process and can take a long time. Don't forget to continue making progress through the checklist! If you choose to use magma, I suggest getting it in place before importing the military and smelting automation orders since they make heavy use of furnaces and forges."
-""
--- Mature fort (third migration wave onward) --
-orders import library/furnace,# Automated production of basic furnace-related items. Don't forget to create a sand collection zone (or remove the sand- and glass-related orders if you have no sand).
-"quickfort orders,run library/dreamfort.csv -n /suites2",# Run when the suites level has been dug out.
-"quickfort orders,run library/dreamfort.csv -n /surface8","# Run if/when you need longer trap corridors on the surface for larger sieges, anytime after you run /surface7."
-"quickfort orders,run library/dreamfort.csv -n /apartments2",# Run when the first apartment level has been dug out.
-"quickfort orders,run library/dreamfort.csv -n /services3","# Run after the dining table and chair, weapon rack, and archery targets have been constructed. Also wait until after you complete /surface7, though, because surface defenses are more important than a grand dining hall."
-"quickfort orders,run library/dreamfort.csv -n /guildhall2",# Run when the guildhall level has been dug out.
-"quickfort orders,run library/dreamfort.csv -n ""/guildhall3, /guildhall4""",# Optionally run after /guildhall2 to build default furnishings and declare a library and temple.
-"quickfort orders,run library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed on the first apartments level.
-"quickfort orders,run library/dreamfort.csv -n /farming4",# Run once you have a cache of potash.
-orders import library/military,# Automated production of military equipment. Turn on automelt in the meltables piles on the industry level to automatically upgrade all metal military equipment to masterwork quality. These orders are optional if you are not using a military.
-orders import library/smelting,# Automated production of all types of metal bars.
-"quickfort orders,run library/dreamfort.csv -n /services4","# Run when you need a jail, anytime after the restraints are placed from /services3."
-orders import library/rockstock,# Maintains a small stock of all types of rock furniture.
-orders import library/glassstock,# Maintains a small stock of all types of glass furniture and parts (only import if you have sand).
-""
--- Repeat for each remaining apartments level as needed --
-"quickfort orders,run library/dreamfort.csv -n /apartments2",# Run when the apartment level has been dug out.
-"quickfort orders,run library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed.
-burial -pets,# Run once the coffins are placed to set them to allow for burial.
-
-See this checklist online at https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569
-#notes label(setup_help)
-Makes common initial adjustments to in-game settings.
-""
-"The /setup blueprint is intended to be run once at the start of the game, before anything else is changed. Players are welcome to make any further customizations after this blueprint is run. Please be sure to run the /setup blueprint before making any other changes, though, so your settings are not overwritten!"
-""
-The following settings are changed:
-"- The manager, chief medical dwarf, broker, and bookkeeper noble roles are assigned to the first suggested dwarf. This is likely to be the expedition leader, but the game could suggest others if they have relevant skills. Bookkeeping is set to the highest precision."
-""
-- Standing orders are set to:
-  - only farmers harvest
-  - gather refuse from outside (incl. vermin)
-  - no autoloom (so the hospital always has thread -- we'll be managing cloth production with automated orders)
-""
-"- A burrow named ""Inside"" is created, but it's up to the player to define the area as the fort expands. It is intended for use in getting your civilians to safety during sieges. A military alert named ""Siege"" is also created and associated with the ""Inside"" burrow."
-""
-- Military uniforms get the following modifications:
-  - all default uniforms set to replace clothing
-"  - in the ""Metal armor"" uniform, the ""metal armor"" item is removed and replaced by ""metal breastplate"" and ""metal mail shirt"""
-"  - in the ""Metal armor"" uniform, the ""metal legwear"" item is removed and replaced by ""metal greaves"""
-""
-"All default uniforms should also have a leather cloak added, but the position of the cloak in the equipment list changes for every embark. We suggest manually adding a leather cloak to your uniforms after running the /setup blueprint."
-""
-- Hotkeys are created for the 8 most interesting levels. Only the names are set -- it's up to the player to adjust them to actual locations in the (H) menu since the blueprint can't know where the levels will eventually be built. Feel free to replace any hotkeys with locations that *you* think are interesting : )
-""
-These are all set for your convenience. Nothing in Dreamfort depends on these settings staying as they are. Feel free to change any setting to your personal preference.
-""
-#aliases
-startnobles: n{Down 4}{togglesequence 8}{Up}s{Up}&^^
-startorders: ohrov^Wl^^
-startburrows: wa&nInside&^^
-metalarmorsetup: A{Right 2}{Down 2}&{Down}&{Left}&M{Right}{Down}&{Left}{Down}{Right}{Down}&{Left}{Down 2}L{Right}{Down 2}&{Left}{Down 3}&M{Right}{Down}&{Left 2}
-startmilitary: mnr{Down}r{metalarmorsetup}{Down}racNSiege&{Right}&^
-sethotkey: {fkey}n{name}&
-starthotkeys: H{sethotkey fkey={F2} name=Farming}{sethotkey fkey={F3} name=Industry}{sethotkey fkey={F4} name=Services}{sethotkey fkey={F5} name=Guildhall}{sethotkey fkey={F6} name=Quarry}{sethotkey fkey={F7} name=Cavern}{sethotkey fkey={F8} name=Magma}^
-""
-"#config label(setup) message(Please set the zoom targets of the hotkeys (the 'H' menu) according to where you actually end up digging the levels.
-As you build your fort, expand the ""Inside"" burrow to include new civilian-safe areas.
-Optionally, add a leather cloak to your military uniforms to enhance their protection rating.
-Nothing in Dreamfort depends on these settings staying as they are. Feel free to change any setting to your personal preference.) assign nobles, set standing orders, create burrows, make adjustments to military uniforms, and set hotkey names"
-{startnobles}{startorders}{startburrows}{startmilitary}{starthotkeys}
-"#meta label(dig_all) start(central stairs on industry level) dig industry, services, guildhall, suites, and apartments levels. does not include farming."
-# Note that this blueprint will only work for the unified dreamfort.csv. It won't work for the individual .xlsx files (since #meta blueprints can't cross file boundaries).
-""
-/industry1
-#>
-/services1
-#>4
-/guildhall1
-#>
-/suites1
-#>
-/apartments1 repeat(down 5)
-#ignore
-"Here are the minimal labors needed for essential tasks in getting Dreamfort up and running, along with suggestions for which dwarves to assign them to. You can enable additional labors as you wish. Skills with an asterisk (*) are especially worth putting points into on the embark preparation screen."
-""
-Manager / Bookkeeper / Broker,Miner,Miner,Mason,Mason,Outdoorsdwarf,Farmer
-Mechanic (*),Miner (*),Miner (*),Mason (*),Mason (*),Carpenter (*),Grower (*)
-Stonecrafter,,,,,Wood Cutter (*)
-Wood Cutter,,,,,Bee Keeper
-Architect
-Misc. labors needed for constructing workshops
-""
-"The most time-consuming tasks in early Dreamfort are: mining, chopping down trees, and making blocks. Starting with at least two miners, two woodcutters (assuming your embark has trees), and two masons helps in keeping the fort from stalling."
-""
-We suggest bringing at least:
-2 picks,for the two miners
-2 battleaxes,for the two woodcutters
-1 anvil,for the forge
-food and seeds,as per usual
-4 ropes,"for the hospital well and traction benches. you could build the ropes out of raw materials, but dwarves are usually too busy to do textile work at the start of the game."
-7 blocks,for starting workshops and the temporary trade depot. necessary if you have buildingplan configured for blocks only.
-many boulders,for quickly turning into more blocks. blocks are the limiting factor in the early stages.
-dogs and cats,for protection and vermin control
-geese,"for bones and leather. bring at least 1 male and 2 females for the 2 early nestboxes. autobutcher settings in the included onMapLoad_dreamfort.init file are optimized for raising geese. if you prefer another bird, be sure to adjust the autobutcher settings."
-""
-Also bring logs for beds if embarking in an area without many trees.
-""
-See ldog's Dreamfort embark profile for a more advanced (and more thoroughly explained!) approach:
-https://drive.google.com/file/d/1Et42JTzeYK23iI5wrPMsFJ7lUXwVBQob/view?usp=sharing
-"#ignore Add these lines to the bottom of your ""data/init/embark_profiles.txt"" file to make the ""Dreamfort"" profile available in-game. Also see ldog's dreamfort embark profile for a more advanced, dwarfy approach."
-[TITLE:Dreamfort]
-[SKILL:1:STONECRAFT:1]
-[SKILL:1:MECHANICS:5]
-[SKILL:1:JUDGING_INTENT:1]
-[SKILL:1:APPRAISAL:1]
-[SKILL:1:ORGANIZATION:1]
-[SKILL:1:RECORD_KEEPING:1]
-[SKILL:2:MINING:5]
-[SKILL:2:DETAILSTONE:2]
-[SKILL:2:SWIMMING:1]
-[SKILL:3:MINING:5]
-[SKILL:3:DETAILSTONE:2]
-[SKILL:3:SWIMMING:1]
-[SKILL:4:MASONRY:5]
-[SKILL:5:MASONRY:5]
-[SKILL:6:WOODCUTTING:5]
-[SKILL:6:CARPENTRY:5]
-[SKILL:7:PLANT:3]
-[ITEM:2:WEAPON:ITEM_WEAPON_PICK:INORGANIC:COPPER]
-[ITEM:2:WEAPON:ITEM_WEAPON_AXE_BATTLE:INORGANIC:COPPER]
-[ITEM:1:ANVIL:NONE:INORGANIC:IRON]
-[ITEM:7:DRINK:NONE:PLANT_MAT:MUSHROOM_HELMET_PLUMP:DRINK]
-[ITEM:26:DRINK:NONE:PLANT_MAT:GRASS_TAIL_PIG:DRINK]
-[ITEM:26:DRINK:NONE:PLANT_MAT:GRASS_WHEAT_CAVE:DRINK]
-[ITEM:26:DRINK:NONE:PLANT_MAT:POD_SWEET:DRINK]
-[ITEM:10:SEEDS:NONE:PLANT_MAT:MUSHROOM_HELMET_PLUMP:SEED]
-[ITEM:10:SEEDS:NONE:PLANT_MAT:GRASS_TAIL_PIG:SEED]
-[ITEM:10:SEEDS:NONE:PLANT_MAT:GRASS_WHEAT_CAVE:SEED]
-[ITEM:10:SEEDS:NONE:PLANT_MAT:POD_SWEET:SEED]
-[ITEM:10:SEEDS:NONE:PLANT_MAT:BUSH_QUARRY:SEED]
-[ITEM:10:SEEDS:NONE:PLANT_MAT:MUSHROOM_CUP_DIMPLE:SEED]
-[ITEM:25:PLANT:NONE:PLANT_MAT:MUSHROOM_HELMET_PLUMP:STRUCTURAL]
-[ITEM:4:CHAIN:NONE:CREATURE_MAT:SPIDER_CAVE:SILK]
-[ITEM:5:CLOTH:NONE:CREATURE_MAT:SPIDER_CAVE:SILK]
-[ITEM:5:THREAD:NONE:CREATURE_MAT:SPIDER_CAVE:SILK]
-[ITEM:50:WOOD:NONE:PLANT_MAT:WILLOW:WOOD]
-[ITEM:40:BOULDER:NONE:INORGANIC:QUARTZITE]
-[ITEM:10:BLOCKS:NONE:INORGANIC:QUARTZITE]
-[PET:2:DOG:FEMALE:STANDARD]
-[PET:1:DOG:MALE:STANDARD]
-[PET:2:CAT:FEMALE:STANDARD]
-[PET:1:CAT:MALE:STANDARD]
-[PET:2:BIRD_GOOSE:FEMALE:STANDARD]
-[PET:2:BIRD_GOOSE:MALE:STANDARD]
-#meta label(all_orders) hidden() references all blueprints that generate orders; for testing only
-/surface1
-/surface2
-/surface3
-/surface4
-/surface5
-/surface6
-/surface7
-/surface8
-/farming1
-/farming2
-/farming3
-/farming4
-/industry1
-/industry2
-/services1
-/services2
-/services3
-/services4
-/guildhall1
-/guildhall2
-/guildhall3
-/guildhall4
-/suites1
-/suites2
-/apartments1 repeat(>5)
-/apartments2 repeat(>5)
-/apartments3 repeat(>5)
-#notes label(surface_help)
-Sets up a protected entrance to your fort in a flat area on the surface.
-Screenshot: https://drive.google.com/file/d/1YL_vQJLB2YnUEFrAg9y3HEdFq3Wpw9WP
-""
-Features:
-- A starting set of workshops and stockpiles (which you can later remove once you establish your permanent workshops and storage)
-- Livestock grazing area with nestbox zones and beehives
-"- Walls, roof, and lever-controlled gates for security"
-- Barracks (with prisoner processing quantum dump)
-- Trap-filled hallways for invaders
-- Optional extended trap hallways (to handle larger sieges)
-- Protected trade depot
-- A grid of 1x1 farm plots (intended to be managed by DFHack autofarm)
-""
-Manual steps you have to take:
-- Assign grazing livestock to the large pasture and dogs to the pasture over the central stairs (DFHack's autonestbox can manage the nestbox zones)
-- Connect levers to the gates that match the names of the levers
-- Assign minecarts to the trade goods and prisoner processing quantum stockpile hauling routes
-""
-Be sure to choose an embark site that has a flat area on the surface large enough to use these blueprints!
-""
-Surface Walkthrough:
-"1) Choose a tile for your central fortress stairs. The terrain around that tile should be perfectly flat. Trees are ok, but no slopes, rivers, or lakes. To be sure that the tile you've chosen is in a good spot, set the cursor over that tile and run ""quickfort run library/dreamfort.csv -n /perimeter"". This will show you the eventual boundaries of the fort. Some wall segments might be missing due to existing trees, but that's ok. Make sure the area within the exterior wall is flat. Run ""quickfort undo library/dreamfort.csv -n /perimeter"" to clean up."
-""
-"2) With the cursor on the chosen tile, run /surface1 to clear surrounding trees and set up your pastures. Deconstruct your wagon to get it out of the way of our upcoming walls and floors. Remember to assign your dogs to the pasture around the staircase and your grazing animals to the large pasture. Your egg-layers will automatically get assigned to nestbox zones once the nestboxes are built, so you don't need to worry about them. You can let your cats roam free to chase vermin."
-""
-"3) Once the marked trees have been cleared, run /surface2 to setup starting workshops/stockpiles, channel out the miasma vents for the farming level, and start clearing trees from a larger area. If you haven't done it already, now is a good time to configure buildingplan to only build buildings with blocks, not logs or raw boulders. Do this by entering buildingplan's global configuration (""baG"") and ensuring the only generic building material allowed is ""blocks"". Run ""quickfort orders"" for /surface2."
-""
-"4) Once the channels are dug out and the trees are cleared, start digging the farming level one z-level down. Once you have run /farming2, come back to the surface and run /surface3 to cover the vents and build an enclosure around your central stairs. Although the vents will be covered with flooring, they will still work to prevent miasma on the farming level. Run ""quickfort orders"" for /surface3."
-""
-"5) Once all walls and floors have been constructed around the stairwell, run /surface4 to build floors and walls to support upcoming buildings and furniture. Run ""quickfort orders"" for /surface4."
-""
-"6) Once walls and floors have been constructed (including the small roof segment one z-level up over the barracks), run /surface5 to build furniture, gates, and the permanent trade depot. Remember to deconstruct the temporary trade depot once nobody is using it. Run ""quickfort orders"" for /surface5."
-""
-"7) Once at least the beehives and weapon rack are built, run /surface6 to configure the rooms and build the remaining walls and floors. Run ""quickfort orders"" for /surface6."
-""
-"8) Once you have enough dwarves to do a lot of building without starving other important tasks, run /surface7 to build the roof. Run ""quickfort orders"" for /surface7."
-""
-"9) For extra security, you can run /surface8 any time after /surface7 to extend the trap corridors. Run ""quickfort orders"" for /surface8."
-""
-"10) Once your industry and farming levels are set up and running, you can disassemble the surface workshops and remove the surface stockpiles. Disassembling a workshop scatters the items stored within it and cancels any pending jobs that happen to use those items. In order to avoid job cancellations, first set the surface workshops to not accept general work orders. Do this by entering query mode (""q""), selecting a workshop, entering the workshop profile (""P""), moving to work orders (right arrow), and hitting Enter. Then enter view mode (""t"") and check to see if any items in a workshop are marked with ""TSK"". Once no items in the workshop have that marker, you are free to disassemble that workshop."
-""
-Sieges and Prisoner Processing:
-Here are some tips and procedures for handling seiges -- including how to clean up afterwards!
-""
-"- Ensure your ""Inside"" burrow includes only below-ground areas and safe surface areas of your fort. In particular, don't include the ""atrium"" area (where the ""siege bait"" zone is) or the trapped hallways."
-""
-"- When a siege begins, set the civilian alert to ""Siege"" to ensure all your civilians stay out of danger. Immediately pull the lever to close the outer main gate. It is also wise to close the trade depot and inner main gate as well. That way, if enemies get past the traps, they'll have to go through the soldiers in your barracks."
-""
-"- During a siege, use the levers to control how attackers path through the trapped corridors. If there are more enemies than cage traps, time your lever pulling so that the inner gates snap closed before your last cage trap is sprung. Then the remaining attackers will have to backtrack and go through the other trap-filled hallway."
-""
-"- If your cage traps fill up, ensure your hallways are free of uncaged attackers, then close the trap hallway outer gates and open the inner gates. Unset the civilian alert and allow your dwarves to reset all the traps -- make some extra cages in preparation for this! Then re-set the civilian alert to ""Siege"" and open the trap hallway outer gates."
-""
-"- Once the last attacker is caged, open all the gates and unset the civilian alert. Life is normal again!"
-""
-"After a siege, you can use the caged prisoners to safely train your military. Here's how:"
-""
-"- Once the prisoners are hauled to the ""prisoner quantum"" stockpile, run ""unforbid all"" and ""stripcaged all"" in the DFHack console (or GUI launcher)."
-""
-"- After all the prisoners' items have been confiscated, bring your military dwarves to the barracks (if they aren't already there)."
-""
-- Use the zone (i) menu to assign a group prisoners to the pasture that overlaps the prisoner quantum stockpile
-""
-"- Hauler dwarves will come and release prisoners one by one. Your military dwarves will immediately pounce on the released prisoner and chop them to bits, saving the hauler dwarves from being attacked. Repeat until all prisoners have been ""processed""."
-""
-"Only common hostile creatures are accepted by the prisoner hauling route by default. You can add additional creature types by configuring the hauling route stop in the 'h' menu. Note that generated creature types, like necromancer experiments, can't be explicitly added. You have to (at least temporarily) accept all animals to include them."
-#meta label(perimeter) start(central stairs) message(Run quickfort undo on this blueprint to clean up.) show the eventual perimeter of the surface fort; useful for location scouting
-walls/surface_walls
-corridor/surface_corridor
-""
-"#meta label(surface1) start(central stairs)
-message(Once the central stairs are mined out deeply enough, you should start digging the industry level in a non-aquifer rock layer. You'll need the boulders from the digging to make blocks.
-If your wagon is within the fort perimeter, deconstruct it to get it out of the way.
-Once the marked trees are all chopped down (if any), continue with /surface2.) clear trees and set up pastures"
-clear_small/surface_clear_small
-zones/surface_zones
-name_zones/surface_name_zones
-#>
-central_stairs/central_stairs repeat(down 10)
-""
-"#meta label(surface2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
-Once the channels are dug out and the marked trees are cleared, continue with /surface3.) set up starting workshops/stockpiles, channel miasma vents, and clear more trees"
-build_start/surface_build_start
-place_start/surface_place_start
-query_start/surface_query_start
-channel/surface_channel
-clear/surface_clear
-""
-"#meta label(surface3) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
-Once the walls and floors have been constructed, continue with /surface4.) Cover vents and protect the central stairs."
-cover_vents/surface_cover_vents
-cover_stairs/surface_cover_stairs
-""
-"#meta label(surface4) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
-Once the walls and floors have been constructed, continue with /surface5. Be sure to check one z-level above the surface to ensure the roof segment above the future barracks has been finished.) build walls and flooring to support upcoming buildings and furniture"
-stairs_doors/surface_stairs_doors
-pre_building/surface_pre_building
-""
-"#meta label(surface5) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
-Disassemble the temporary trade depot in the pasture once the new one is constructed (and no merchants are using the old one).
-Once the marked trees are cleared and at least the beehives and weapon rack have been constructed, continue with /surface6.) build gates, furniture, and trade stockpile/depot"
-place/surface_place
-build/surface_build
-query/surface_query
-traffic/surface_traffic
-clear_large/surface_clear_large
-""
-"#meta label(surface6) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
-Continue with /surface7 sometime after the walls are completed and any marked trees are chopped down, whenever you have enough dwarves to build the roof without starving other important construction tasks.) configure hives and barracks, build traps and remaining walls/floors"
-query2/surface_query2
-walls/surface_walls
-floors/surface_floors
-traps/surface_traps
-clear_large/surface_clear_large
-""
-"#meta label(surface7) start(central stairs (on ground level)) message(Remember to enqueue manager orders for this blueprint.
-For extra security, you can run /surface8 at any time to extend the trap corridors.) build roof"
-#<
-roof/surface_roof
-roof2/surface_roof2
-roof3/surface_roof3
-roof4/surface_roof4
-""
-#meta label(surface8) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) build extended trap corridors
-corridor_gates/surface_corridor_gates
-corridor/surface_corridor
-corridor_traps/surface_corridor_traps
-query_corridor/surface_query_corridor
-#dig label(central_stairs_odd) start(2;2) hidden() spiral stairs odd levels
-`,j6,`
-u,`,u
-`,j6,`
-#meta label(central_stairs_even) hidden() spiral stairs even levels
-/central_stairs_odd transform(cw)
-#meta label(central_stairs) two levels of spiral stairs (use --repeat down)
-/central_stairs_odd
-#>
-/central_stairs_even
-#dig label(surface_clear_small) start(19; 19) hidden() clear trees for starting workshops and stockpiles
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,t1(25x9),,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,t1,`,`,`,`,`,`,,`,,`,`,`,`,`,t1,`,`,`,t1,`,`,,`
-,,,`,,`,,`,t1,t1,,,,,,`,t1,t1,t1,t1,t1,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,t1,t1,t1,t1,t1,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,t1,j,t1,j,t1,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,t1,t1,t1,t1,t1,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,t1,t1,t1,t1,t1,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,t1,,,,,,t1,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,t1,t1,,,,,,t1,t1,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,t1,t1,,t1,t1,t1,,t1,t1,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,t1,t1,t1,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,t1,,,t1,t1,t1,,,t1,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,t1,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-"#zone label(surface_zones) start(19; 19) hidden() message(Remember to assign your dogs to the pasture surrounding the central stairs and your grazing animals to the large pasture.
-Feel free to assign an unimportant animal to the pasture in the main entranceway to use as bait during sieges.) pastures and training areas"
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,nmt(25x11),,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),`,,,,,,`,nt(9x5),,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,nt,nt,nt,nt,nt,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,nt,`,~,`,nt,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,nt,nt,nt,nt,nt,,,,,,,,,,,`,,`
-,,,`,,`,,`,n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,n,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,n,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#query label(surface_name_zones) start(19; 19) hidden()
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,"{namezone name=""main pasture""}",,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,"{namezone name=""nestbox1""}","{namezone name=""nestbox2""}","{namezone name=""nestbox3""}","{namezone name=""nestbox4""}","{namezone name=""nestbox5""}","{namezone name=""nestbox6""}","{namezone name=""nestbox7""}",`,,,,,,`,"{namezone name=""taming area""}",,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,"{namezone name=""guard dogs""}",,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,"{namezone name=""nestbox8""}","{namezone name=""nestbox9""}","{namezone name=""nestbox10""}","{namezone name=""nestbox11""}","{namezone name=""nestbox12""}","{namezone name=""nestbox13""}","{namezone name=""nestbox14""}",`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,"{namezone name=""siege bait""}",,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,"{namezone name=""prisoner processing""}",,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_build_start) start(19; 19) hidden() message(There is room to the left of the carpenter's workshop to build one more workshop of any type if you need it.) starting workshops
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,wc,,,,wr,,,,wm,,,,wt,,,,,D,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,N,N,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#place label(surface_place_start) start(19; 19) hidden() starting stockpiles
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,f(8x4),,,,,,,,w(4x4),,,,s2(5x4),,,,,gunzSpd(4x4),,,,hlr(4x4),,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#query label(surface_query_start) start(19; 19) hidden() config stockpiles
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,"{givename name=""starting food""}",,,,"{givename name=""starting wood""}",,,,,"{givename name=""starting stone""}",,,,"{givename name=""starting misc""}",,,,"{givename name=""starting cloth/trash""}",`,,`
-,,,`,,`,,,,,,,,,,,,,otherstone,,,,,nocontainers,,,,nocontainers,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#dig label(surface_channel) start(19; 19) hidden() channel miasma vents
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,h1,`,`,`,`,`,`,,`,,`,`,`,`,`,h1,`,`,`,h1,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,h1,,,,,,h1,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,h1,h1,,,,,,h1,h1,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,h1,h1,,h1,h1,h1,,h1,h1,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,h1,h1,h1,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,h1,,,h1,h1,h1,,,h1,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,h1,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#dig label(surface_clear) start(19; 19) hidden() clear trees so the farming level can be dug without fear of generating surface holes
-
-
-,,,,t1(29x29)
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,`,`,,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,t1,t1
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,t1,t1
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,t1,t1
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,t1,t1
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,t1,t1
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,t1,t1
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,t1,t1
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,t1,t1
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,t1,t1
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-,,,,,,,,,,,,,,,t1,t1,t1,t1,t1,t1,t1
-
-#build label(surface_cover_vents) start(19; 19) hidden() cover the miasma vents
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,Cw,`,`,`,`,`,`,,`,,`,`,`,`,`,Cw,`,`,`,Cw,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,Cf,,,,,,Cf,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,Cf,Cf,,,,,,Cf,Cf,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,Cf,Cf,,Cf,Cf,Cf,,Cf,Cf,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,Cf,Cf,Cf,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,Cw,,,Cf,Cf,Cf,,,Cw,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,Cf,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_cover_stairs) start(19; 19) hidden() protect the central stairs
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,Cr,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,Cw,Cw,Cf,Cw,Cf,Cw,Cw,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,Cw,,,,,,Cw,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,Cf,,`,`,`,,Cf,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,Cw,,H,~,H,,Cw,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,Cf,,`,`,`,,Cf,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,Cw,,,,,,Cw,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,Cw,Cw,Cf,Cw,Cf,Cw,Cw,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#<
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,Cf,`,Cf,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,Cf,`,Cf,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_stairs_doors) start(19; 19) hidden()
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,d,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,d,,`,`,`,,d,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,d,,`,`,`,,d,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,d,`,d,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_pre_building) start(19; 19) hidden() flooring and anchoring walls for future buildings/doors
-#<
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,~,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,Cf,Cf,Cf,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,Cf,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,~,`,~,`,`,`,`,Cf,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,Cf,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,Cf,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,Cf,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,Cf,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#>
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,Cf,,Cf,,Cf,`,,,,,,,,,,`,,`
-,,,`,,`,,Cw,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,Cf,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,Cw,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,Cw,Cf,Cw,`,`,`,,`,,`,`,`,Cw,Cf,Cw,`,`,`,`,`,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,~,,,,,,~,`,,,,,,,Cf,Cf,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,Cf,Cf,Cf,Cf,Cf,~,~,,,,,,,,Cf,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,,~,~,~,,~,~,,,,,Cf,Cf,,Cf,`,,`
-,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,,Cf,,~,~,~,,Cf,,,Cf,,,,,,Cf,`,,`
-,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,`,,,~,~,~,,,`,,Cf,,,,,Cf,Cf,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,Cf,,,,,,,,,Cf,,,,,~,,,,,Cf,,,,,,,,,Cf,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#place label(surface_place) start(19; 19) hidden() remaining surface stockpiles
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,a5(9x5),,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,g(3x3),,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,c,,,,,,,`,,,,,,,,`,,c,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-"#build label(surface_build) start(19; 19) hidden() message(Use autofarm to manage farm crop selection.
-Remember to connect the levers to the gates once they are built.) gates, barracks, farm area, and trade area"
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,~h,`,~,~,N,N,N,N,N,`,Tl,,Tl,,Tl,`,,,,,,,,,,`,,`
-,,,`,,`,~h,`,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,~h,d,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),`,,`,`,`,,`,,,,,,,,,,`,,`
-,,,`,,`,~h,`,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,~h,`,N,N,N,N,N,N,N,`,Tl,Tl,Tl,Tl,Tl,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,d,`,`,`,`,,`,,`,`,`,`,d,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,gw,gw,gw,gw,gw,,`,,,,,,,h,b,`,,`
-,,,`,,`,,,,,,,,,ga,ga,gw,gw,gw,gw,gw,gd,gd,,,,,,,,b,`,,`
-,,,`,,`,,,,,,D,,,ga,ga,,,,,,gd,gd,,,,,a,r,,b,`,,`
-,,,`,,`,,trackstopS,,,,,,,ga,ga,,,,,,gd,gd,,trackstopS,,,,,,b,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,h,b,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,gd,gd,,,,,,,,gd,gd,,,,,,,,ga,ga,,,,,,,,ga,ga,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,gw,gw,gw,gw,gw,gw,gw,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,gw,gw,gw,gw,gw,gw,gw
-,,,,,,,,,,,,,,,gw,gw,gw,gw,gw,gw,gw
-
-#aliases
-"prisoner_route_enable: {enableanimals}{cages}{permittraps}{animalsprefix}{Right}{permitsearch search="" men""}{permitsearch search=dwarves}{permitsearch search=elves}{permitsearch search=humans}{permitsearch search=kobolds}{permitsearch search=gremlins}{permitsearch search=giants}{permitsearch search=goblins}{permitsearch search=ettins}{permitsearch search=cyclopes}{permitsearch search=ogres}{permitsearch search=eyes}{permitsearch search=reachers}{permitsearch search=gorlaks}{permitsearch search=trolls}{permitsearch search=minotaurs}^"
-
-"#query label(surface_query) start(19; 19) hidden() message(Remember to assign minecarts to the trade goods and prisoner processing quantum stockpiles (run ""assign-minecarts all"").
-Feel free to adjust the configuration of the ""trade goods"" feeder stockpile so it accepts the item types you want to trade away. If those items types are also accepted by other stockpiles, configure those stockpiles to give to the ""trade goods"" stockpile.
-You might also want to set the ""trade goods quantum"" stockpile to Auto Trade if you have the autotrade DFHack plugin enabled.)"
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,"{givename name=""trade depo gate""}",,"{givename name=""inner main gate""}",,"{givename name=""barracks gate""}",`,"{givename name=""prison/training area""}",,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,"{givename name=""left outer gate""}","{givename name=""left inner gate""}","{givename name=""outer main gate""}","{givename name=""right inner gate""}","{givename name=""right outer gate""}",`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,nocontainers,crafts,,,,,,,`,,,,"{givename name=""inner main gate""}",,,,`,,,,,,,,,`,,`
-,,,`,,`,"{givename name=""trade goods""}",,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,{forbidmasterworkfinishedgoods}{forbidartifactfinishedgoods},,,,,,,,"{givename name=""trade depo gate""}",,,,,,,,"{givename name=""barracks gate""}",,,,,,,,,`,,`
-,,,`,,`,,"{quantumstopfromnorth name=""Trade Goods quantum""}",,,,,,,,,,,,,,,,,"{quantumstop name=""Prisoner/Cage quantum"" move={Up 5} move_back={Down 5} route_enable={prisoner_route_enable}}{givename name=""prisoner/cage dumper""}",,,,,,,`,,`
-,,,`,,`,,"{quantum name=""trade goods quantum""}",,,,,,,`,,,,,,,,`,,"{quantum name=""prisoner/cage quantum"" quantum_enable={enableanimals}}",,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,"{givename name=""left outer gate""}",,,,,,,,,"{givename name=""left inner gate""}",,,,,,,,"{givename name=""right inner gate""}",,,,,,,,,"{givename name=""right outer gate""}",,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,"{givename name=""outer main gate""}",,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#dig label(surface_traffic) start(19; 19) hidden() set traffic designations
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,or,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,ol,ol,ol,ol,ol,,`,or,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,ol,ol,ol,ol,ol,ol,ol,ol,ol,or,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,ol,ol,,,,,,ol,ol,or,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,ol,ol,,,,,,ol,ol,or,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,or,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,ol,ol,ol,ol,ol,ol,ol,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,ol,ol,ol,ol,ol,ol,ol
-,,,,,,,,,,,,,,,ol,ol,ol,ol,ol,ol,ol
-
-#dig label(surface_clear_large) start(19; 19) hidden() clear wider area of trees
-t1(37x33)
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,`,`,,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#query label(surface_query2) start(19; 19) hidden()
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,cg,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,cg,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,c,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
-,,,`,,`,cg,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,cg,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,r&,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_walls) start(19; 19) hidden() build remaining walls
-
-
-
-,,,`,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,Cw,Cw,Cw,Cw,~,Cw,Cw,Cw,Cw,~,~,,~,,~,~,Cw,Cw,Cw,~,Cw,Cw,Cw,~,Cw,Cw,,`
-,,,`,,Cw,,Cw,,,,,,,,~,,,,,,~,,,,,,,,,,Cw,,`
-,,,`,,Cw,,~,,,,,,,,,,`,`,`,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,~,,`,`,`,,~,,,,,,,,,,Cw,,`
-,,,`,,Cw,,~,,,,,,,,,,`,`,`,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,Cw,,,,,,,,~,,,,,,~,,,,,,,,,,Cw,,`
-,,,`,,Cw,Cw,Cw,Cw,Cw,Cw,~,,~,Cw,~,~,,~,,~,~,Cw,~,,~,Cw,Cw,Cw,Cw,Cw,Cw,,`
-,,,`,,Cw,,,,,,,,,Cw,,,,,,,,Cw,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,Cw,,`
-,,,`,,Cw,,,,,,,,,~,,,,,,,,~,,,,,,,,,Cw,,`
-,,,`,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,`,`
-
-
-
-#build label(surface_floors) start(19; 19) hidden() build remaining flooring
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,~,Cf,~,Cf,~,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,~,Cf,Cf,Cf,Cf,Cf,~,,,,,,,,,,`,,`
-,,,`,,`,,~,,,,,,,,`,Cf,`,Cf,`,Cf,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,~,Cf,Cf,Cf,Cf,Cf,~,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,~,`,`,`,`,`,`,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,Cf,Cf,Cf,Cf,Cf,Cf,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,~,Cf,~,~,~,Cf,~,~,Cf,Cf,Cf,Cf,~,~,Cf,~,`,,`
-,,,`,,`,Cf,~,Cf,~,~,~,~,~,~,~,Cf,~,~,~,Cf,~,~,Cf,~,Cf,Cf,Cf,Cf,Cf,~,`,,`
-,,,`,,`,Cf,~,Cf,~,~,~,~,~,`,Cf,Cf,~,~,~,Cf,Cf,`,Cf,~,Cf,Cf,Cf,Cf,~,~,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,~,,,,,,,,,,,Cf,Cf,Cf,~,Cf,Cf,Cf,,,,,,,,,,,~,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_traps) start(19; 19) hidden()
-
-,,,,,Tc,Tc,,,,,,,,,,,,,,,,,,,,,,,,Tc,Tc
-,,,,,Tc,Tc,,,,,,,,,,,,,,,,,,,,,,,,Tc,Tc
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,,,,,,,,,,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,Tc,Tc,,,,,,,,Tc,Tc
-,,,,,,,,,,,,,Tc,Tc,,,,,,,,Tc,Tc
-
-#build label(surface_roof) start(19; 19) hidden() roof hatch and adjacent tiles
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,Cf,,Cf,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,Cf,H,Cf,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,~,~,~,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,~,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,~,`,~,`,`,`,`,~,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,~,~,~,~,~,~,~,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,~,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,~,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,~,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,~,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_roof2) start(19; 19) hidden() lower half of the roof
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,~,,~,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,~,~,~,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,~,~,~,~,~,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
-,,,`,,`,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,~,~,~,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,~,~,~,~,~,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
-,,,`,,`,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,~,~,~,~,~,~,~,~,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
-,,,`,,`,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,~,~,~,~,~,`,Cf,Cf,~,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
-,,,`,,`,`,`,`,`,`,`,Cf,`,`,`,`,~,`,~,`,`,`,`,~,`,`,`,`,`,`,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,~,~,~,~,~,~,~,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_roof3) start(19; 19) hidden() upper half center of the roof
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,Cf,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,~,`,`,`,`,`,`,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_roof4) start(19; 19) hidden() upper half remainder of the roof
-
-
-
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,~,`,`,`,`,`,`,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_corridor_gates) start(19; 19) hidden() gates for the longer trap hallways
-
-
-,,,,gx,,,,,,,,,,,,,,,,,,,,,,,,,,,,gx
-,,,`,gx,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,gx,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,Tl,`,`,`,Tl,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_corridor) start(19; 19) hidden() longer trap hallway walls
-
-
-,,,,~,,,,,,,,,,,,,,,,,,,,,,,,,,,,~
-,,,Cw,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,Cw
-,,,Cw,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,Cw
-,,,Cw,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,`,~,`,`,`,~,`,,,,,,,,,,`,,Cw
-,,,Cw,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,Cw
-,,,Cw,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,Cw
-,,,Cw,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,Cw
-,,,Cw,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,Cw
-,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
-,,,Cw,Cw,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,Cw,Cw
-
-
-
-#<
-
-
-
-,,,`,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,Cf,`
-,,,`,Cf,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,`,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,`,`,`,`,`,`,~,`,`,`,`,~,`,~,`,`,`,`,~,`,`,`,`,`,`,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,~,`,Cf,`
-,,,`,Cf,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,Cf,`
-,,,`,Cf,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#build label(surface_corridor_traps) start(19; 19) hidden() traps for the longer trap hallways
-
-
-,,,,~,,,,,,,,,,,,,,,,,,,,,,,,,,,,~
-,,,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,Tc,`
-,,,`,Tc,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,`,~,`,`,`,~,`,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,Tc,`
-,,,`,Tc,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,Tc,`
-,,,`,Tc,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,Tc,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#query label(surface_query_corridor) start(19; 19) hidden() (Remember to connect the levers to the new external trap gates.) configure barracks and name outer levers/gates
-
-
-
-,,,`,"{givename name=""left trap gate""}",`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,"{givename name=""right trap gate""}",`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,"{givename name=""left trap gate""}",`,`,`,"{givename name=""right trap gate""}",`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
-,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
-,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-
-#notes label(farming_help)
-"Sets up farming, food storage, and related industries. Also provides post-embark necessities that can later be disassembled."
-Screenshot: https://drive.google.com/file/d/1fBC3G5Y888l4tVe5REAyAd_zeojADVme
-""
-Features:
-- Pairs with the surface blueprints for vents that prevent miasma
-- Farm plots (intended to be managed by DFHack autofarm)
-- Plentiful food storage
-- Refuse/corpse quantum stockpile
-- Small dormitory and dining room for post-embark needs
-- Small offices for your manager and bookkeeper
-""
-Workshops:
-- Kitchen
-- Brewery
-- Butcher
-- Fishery
-- Tannery
-- Farmer's Workshop
-- Quern
-- Screw Press
-""
-Manual steps you have to take:
-- Check to make sure the lower office is assigned to your manager and assign the upper office to your bookkeeper (if different from your manager)
-"- Assign a minecart to your refuse quantum stockpile hauling route (you can run ""assign-minecarts all"" at the DFHack prompt to do this)"
-"- If the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile (the one on the left) on the industry level"
-""
-Farming Walkthrough:
-"1) Wait until you have channeled the miasma vents and cleared trees on the surface before digging out the farming level on the z-level below the surface, otherwise you will end up with extra ramps on the farming level and unprotected holes through the surface when you later chop down trees growing above empty space."
-""
-"2) Start digging with /farming1 and get started on manufacturing furniture by running ""quickfort orders"" on /farming2 and /farming3."
-""
-"3) Once the level is dug out, run /farming2 to build workshops, stockpiles, and the furniture we need to anchor the rooms. Remember to assign a minecart to the newly-designated quantum refuse dump. There are also jugs, pots, and bags stockpiles on this level that should be configured to ""take"" from the industry level stockpile once we get the industry level built."
-""
-"4) When the furniture is in place, run /farming3 to designate your starter dining room and dormitory and build the farm plots and remaining furniture. The blueprint also attempts to assign the lower office to your manager, but double-check this assignment in case your dwarves are in an unexpected order."
-""
-"5) Once your fort has enough free time to build the remaining doors, run /farming4. This will also enable seasonal fertilization for your farm plots. Run ""quickfort orders"" for /farming4."
-""
-"6) You can disassemble the dining room and dormitory once the services and apartments levels are up and running, if you like."
-"#dig label(farming1) start(16; 18; central stairs) message(Once the area is dug out, continue with /farming2.)"
-# this level is dug at priority 2 since it is dug in soil. it's worth the miner's time to stop digging the industry level and
-# quickly dig out this one.
-,,,,,,,,,2,2,2,,2,2,2,2,2,,2,2,2,2
-,,,,,,,,,2,2,2,,2,2,2,2,2,,2,2,2,2
-,,,,,,,,,2,2,2,,2,2,2,2,2,,2,2,2,2
-,,,,,,,,,,,2,,2,2,2,2,2,,2,2,2,2
-,,,,,,,2,2,2,,2,,2,2,2,2,2,,2,2,2,2
-,,,,,,,2,2,2,2,2,,2,2,2,2,2,,2,2,2,2
-,,,,,,,2,2,2,,2,,2,2,2,2,2,,2
-,,,,,,,,,,,2,,2,2,2,2,2,,2,,2,2,2
-,,,,,,2,2,2,2,,2,,2,2,2,2,2,,2,2,2,2,2
-,,,,,,2,2,2,2,,2,,2,2,2,2,2,,2,,2,2,2
-,,,2,2,,2,2,2,2,,2,,2,2,2,2,2,,2
-,,2,2,2,,2,2,2,2,,2,,2,2,2,2,2,,2,,2,2,2,,2,2,2
-,,2,2,2,2,2,z2,2,2,2,2,,,2,,2,,,2,2,2,z2,2,2,2,z2,2
-,,,2,2,,2,2,2,2,,2,2,2,2,2,2,2,2,2,,2,2,2,,2,2,2
-,,,,2,,,2,,,,,,2,`,`,`,2,,,,,2,,,,2
-,,2,2,2,2,2,2,2,2,2,2,,2,`,~,`,2,,2,2,2,2,2,2,2,2,2,2
-,,2,2,2,2,2,2,2,2,2,2,2,2,`,`,`,2,2,2,2,2,2,2,2,2,2,2,2
-,,2,2,2,2,2,2,2,2,2,2,,2,2,2,2,2,,2,2,2,2,2,2,2,2,2,2
-,,2,2,2,2,2,2,2,2,2,,,,2,,2,,,,2,2,2,2,2,2,2,2,2
-,,2,2,2,2,2,2,2,2,,,z2,2,2,2,2,2,z2,,,2,2,2,2,2,2,2,2
-,,2,2,2,2,2,2,2,2,,z2,z2,,,2,,,z2,z2,,2,2,2,2,2,2,2,2
-,,2,2,2,2,2,2,2,,,z2,z2,,z2,z2,z2,,z2,z2,,,2,2,2,2,2,2,2
-,,2,2,2,2,2,2,2,,2,2,2,,z2,z2,z2,,2,2,2,,2,2,2,2,2,2,2
-,,2,2,2,2,2,2,2,,2,z2,2,,z2,z2,z2,,2,z2,2,,2,2,2,2,2,2,2
-,,2,2,2,2,2,2,2,,2,2,2,,,2,,,2,2,2,,2,2,2,2,2,2,2
-,,,,,,,,,,,,,,,z2
-
-
-"#meta label(farming2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
-Once furniture has been placed, continue with /farming3.) workshops, stockpiles, and important furniture"
-build/farming_build
-place/farming_place
-traffic/farming_traffic
-query_stockpiles/farming_query_stockpiles
-link_stockpiles/farming_link
-""
-#meta label(farming3) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) configure rooms and build farm plots and more furniture
-query_rooms/farming_rooms
-build2/farming_build2
-""
-#meta label(farming4) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) configure farm plots and build remaining furniture
-query_plots/farming_query_plots
-build3/farming_build3
-#build label(farming_build) start(16; 18) hidden() workshops and important furniture
-
-
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,c,t,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,t,c
-,,,,,,,,,,,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,c,t,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`
-,,,,,,,,,,,`,,`,`,`,`,`,,`,,`,`,b
-,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,`,`,`,`
-,,,,,,`,wl,`,`,,`,,`,`,`,`,`,,`,,`,`,`
-,,,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`
-,,wq,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
-,,wp,`,`,`,`,ww,`,`,`,`,,,`,,`,,,`,`,`,wu,`,`,`,wz,`
-,,,`,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
-,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,,,,`,,`,,,,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,`,`,,,`,,,`,`,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,,`,`,`,,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,wh,`,,`,`,`,,`,wn,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,,trackstopS,,,`,`,`,,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,`
-
-
-#place label(farming_place) start(16; 18) hidden() stockpiles
-
-
-,,,,,,,,,`,`,`,,`,`,`,f10(1x9),b(1x12),,f(4x2),,,`
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,,,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`,f(3x2),,`
-,,,,,,,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`
-,,,,,,,,,,,`,,`,`,`,`,`,,`,,`,`,`
-,,,,,,`,`,`,u,,`,,`,`,`,`,`,,`,`,`,`,`
-,,,,,,`,`,`,u,,`,,f(4x3),,,`,`,,`,,`,`,`
-,,,u,u,,`,`,`,u,,`,,`,`,`,`,`,,`
-,,`,u,u,,`,`,`,u,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
-,,`,g,g,`,`,`,`,u,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
-,,,g,g,,`,`,`,u,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
-,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
-,,f,f,f,f,f,f,f,f,f,f,,`,`,~,`,`,,f,f,f,f,f,f,f,f,f,f
-,,f,f,f,f,f,f,f,f,f,f,`,`,`,`,`,`,`,f,f,f,f,f,f,f,f,f,f
-,,f,f,f,f,f,f,f,f,f,f,,`,`,`,`,`,,f,f,f,f,f,f,f,f,f,f
-,,f,f,f,f,f,f,f,f,f,,,,`,,`,,,,f,f,f,f,f,f,f,f,f
-,,f,f,f,f,f,f,f,f,,,f,`,`,`,`,`,r,,,f,f,f,f,f,f,f,f
-,,f,f,f,f,f,f,f,f,,f,f,,,`,,,r,r,,f,f,f,f,f,f,f,f
-,,f,f,f,f,f,f,f,,,f,f,,r(2x3),,ry2(1x3),,r,r,,,f,f,f,f,f,f,f
-,,f,f,f,f,f,f,f,,`,`,`,,`,`,`,,`,`,`,,f,f,f,f,f,f,f
-,,f,f,f,f,f,f,f,,`,`,`,,`,`,`,,`,`,`,,f,f,f,f,f,f,f
-,,f,f,f,f,f,f,f,,`,`,`,,,`,,,`,`,`,,f,f,f,f,f,f,f
-,,,,,,,,,,,,,,,ry
-
-
-#dig label(farming_traffic) start(16; 18) hidden() keep hungry dwarves away from the crops and food stores so they prefer the prepared meals
-
-
-,,,,,,,,,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
-,,,,,,,,,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
-,,,,,,,,,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
-,,,,,,,,,,,ol,,or,or,or,or,or,,ol,ol,ol,ol
-,,,,,,,ol,ol,ol,,ol,,or,or,or,or,or,,ol,ol,ol,ol
-,,,,,,,ol,ol,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
-,,,,,,,ol,ol,ol,,ol,,or,or,or,or,or,,ol
-,,,,,,,,,,,ol,,or,or,or,or,or,,ol,,ol,ol,ol
-,,,,,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol,ol,ol,ol,ol
-,,,,,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol,,ol,ol,ol
-,,,ol,ol,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol
-,,ol,ol,ol,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol,,ol,ol,ol,,ol,ol,ol
-,,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,,or,,or,,,ol,ol,ol,ol,ol,ol,ol,ol,ol
-,,,ol,ol,,ol,ol,ol,ol,,ol,ol,ol,ol,ol,ol,ol,ol,ol,,ol,ol,ol,,ol,ol,ol
-,,,,or,,,or,,,,,,ol,`,`,`,ol,,,,,or,,,,or
-,,or,or,or,or,or,or,or,or,or,or,,ol,`,~,`,ol,,or,or,or,or,or,or,or,or,or,or
-,,or,or,or,or,or,or,or,or,or,or,or,ol,`,`,`,ol,or,or,or,or,or,or,or,or,or,or,or
-,,or,or,or,or,or,or,or,or,or,or,,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,or
-,,or,or,or,or,or,or,or,or,or,,,,ol,,ol,,,,or,or,or,or,or,or,or,or,or
-,,or,or,or,or,or,or,or,or,,,ol,ol,ol,ol,ol,ol,ol,,,or,or,or,or,or,or,or,or
-,,or,or,or,or,or,or,or,or,,ol,ol,,,ol,,,ol,ol,,or,or,or,or,or,or,or,or
-,,or,or,or,or,or,or,or,,,ol,ol,,ol,ol,ol,,ol,ol,,,or,or,or,or,or,or,or
-,,or,or,or,or,or,or,or,,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,or,or,or,or
-,,or,or,or,or,or,or,or,,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,or,or,or,or
-,,or,or,or,or,or,or,or,,ol,ol,ol,,,ol,,,ol,ol,ol,,or,or,or,or,or,or,or
-,,,,,,,,,,,,,,,ol
-
-
-"#query label(farming_query_stockpiles) start(16; 18) hidden() message(remember to:
-- assign a minecart to the refuse quantum stockpile (run ""assign-minecarts all"")
-- if the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level) config stockpiles"
-
-
-,,,,,,,,,`,`,`,,`,`,`,seeds,potash,,booze,,,`
-,,,,,,,,,`,`,`,,`,`,`,linksonly,nocontainers,,"{givename name=""booze""}",`,`,`
-,,,,,,,,,`,`,`,,`,`,`,"{givename name=""seeds""}","{givename name=""potash""}",,`,`,`,`
-,,,,,,,,,,,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`,preparedfood
-,,,,,,,`,`,`,`,`,,`,`,`,`,`,,`,"{givename name=""prepared food""}",`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`
-,,,,,,,,,,,`,,`,`,`,`,`,,`,,`,`,`
-,,,,,,`,`,`,pots,,`,,`,`,`,`,`,,`,`,`,`,`
-,,,,,,`,`,`,"{givename name=""pots""}",,`,,seeds,nocontainers,"{givename name=""seeds feeder""}",give2up,`,,`,,`,`,`
-,,,bags,,,`,`,`,`,,`,,`,`,`,`,`,,`
-,,`,nocontainers,"{givename name=""bags""}",,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
-,,`,woodentools,,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
-,,,nocontainers,"{givename name=""jugs""}",,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
-,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
-,,plants,,,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,,,,,,,"{givename name=""cookable food""}"
-,,`,,,,"{givename name=""plants""}",`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,forbidplants,,,,,`,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,forbidtallow,,,,,`,`
-,,`,`,`,`,`,`,`,`,`,,,,`,,`,,,,`,`,forbiddye,,,,`,`,`
-,,`,`,`,`,`,`,`,`,,,unpreparedfish,,,,,,rawhides,,,`,forbidunpreparedfish,,,,,,`
-,,`,`,`,`,`,`,`,`,,`,nocontainers,,,`,,,"{givename name=""rawhides""}",`,,`,forbidmiscliquid,,,,,,`
-,,`,`,`,`,`,`,`,,,`,"{givename name=""unprepared fish""}",,forbidcraftrefuse,"{givename name=""refuse feeder""}",corpses,,t{Left 3}{Down 4}&,`,,,forbidpreparedfood,,,,,,`
-,,`,`,`,`,`,`,`,,`,`,`,,forbidcorpses,"{give move=""{Right 3}{Up}""}","{givename name=""corpse feeder""}",,`,`,`,,forbidbooze,,,,,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,forbidseeds,,,,,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,,"{quantumstop name=""Refuse/Corpse quantum"" sp_links=""{sp_link move={Up} move_back={Down}}{sp_link move=""""{Right}{Up}"""" move_back=""""{Down}{Left}""""}""}{givename name=""refuse/corpse dumper""}",,,`,`,`,,forbidwax,,,,`,`,`
-,,,,,,,,,,,,,,,"{quantum name=""refuse/corpse quantum""}"
-
-
-#query label(farming_link) start(16; 18) hidden() set farming stockpiles to take from starting surface stockpiles
-
-
-,,,,,,,,,`,`,`,,`,`,`,t{Down 6}{Left 10}<&,`,,t{Down 6}{Left 13}<&,`,`,`
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,,,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`,t{Down 2}{Left 14}<&,`,`
-,,,,,,,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`
-,,,,,,,,,,,`,,`,`,`,`,`,,`,,`,`,`
-,,,,,,`,`,`,t{Up 2}{Right 11}<&,,`,,`,`,`,`,`,,`,`,`,`,`
-,,,,,,`,`,`,`,,`,,t{Up 3}{Left 7}<&,`,`,`,`,,`,,`,`,`
-,,,t{Up 4}{Right 17}<&,`,,`,`,`,`,,`,,`,`,`,`,`,,`
-,,`,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
-,,`,t{Up 6}{Right 17}<&,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
-,,,`,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
-,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
-,,t{Up 9}{Right 4}<&,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,t{Up 9}{Left 13}<&,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,,,,`,,`,,,,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,,t{Up 13}{Left 6}<&,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,`,`,,,`,,,`,`,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,,t{Up 15}{Right 10}<&,`,`,,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,`
-
-
-#query label(farming_rooms) start(16; 18) hidden() message(Check to ensure the lower office got assigned to your manager and assign the upper office to your bookkeeper (if different from your manager).) configure rooms
-
-
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,r&a+&,,,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,r+&h
-,,,,,,,,,,,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,r&a+&,,,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`
-,,,,,,,,,,,`,,`,`,`,`,`,,`,,`,`,r&d
-,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,`,`,`,`
-,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`
-,,,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`
-,,`,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
-,,,`,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
-,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,,,,`,,`,,,,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,`,`,,,`,,,`,`,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,,`,`,`,,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,`
-
-
-"#build label(farming_build2) start(16; 18) hidden() farm plots, remaining furniture, and important doors"
-
-
-,,,,,,,,,`,`,`,,p(3x1),,,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,p(3x1),,,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,p(3x1),,,`,`,,c,t,~,~
-,,,,,,,,,,,`,,p(3x1),,,`,`,,c,t,t,c
-,,,,,,,`,`,`,,`,,p(3x1),,,`,`,,`,`,`,`
-,,,,,,,`,`,`,`,`,,p(3x1),,,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,p(3x1),,,`,`,,`
-,,,,,,,,,,,`,,p(3x1),,,`,`,,`,,b,b,~
-,,,,,,`,`,`,`,,`,,p(3x1),,,`,`,,`,`,`,`,h
-,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,,b,b,b
-,,,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`
-,,`,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
-,,,`,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
-,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,,,,`,,`,,,,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,,`,d,`,`,`,d,`,,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,`,`,,,d,,,`,`,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,,`,`,`,,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,`
-
-
-#query label(farming_query_plots) start(16; 18) hidden() configure farm plots for seasonal fertilization
-
-
-,,,,,,,,,`,`,`,,s,`,`,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,s,`,`,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,s,`,`,`,`,,`,`,`,`
-,,,,,,,,,,,`,,s,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,s,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,`,`,,s,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,s,`,`,`,`,,`
-,,,,,,,,,,,`,,s,`,`,`,`,,`,,`,`,`
-,,,,,,`,`,`,`,,`,,s,`,`,`,`,,`,`,`,`,`
-,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`
-,,,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`
-,,`,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
-,,,`,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
-,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,,,,`,,`,,,,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,`,`,,,`,,,`,`,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,,`,`,`,,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,`
-
-
-#build label(farming_build3) start(16; 18) hidden() remaining doors
-
-
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,`,`,`,,`,`,`,`,`,,~,~,~,~
-,,,,,,,,,,,d,,`,`,`,`,`,,~,~,~,~
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,d,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,`,`,`,,`,,`,`,`,`,`,,d
-,,,,,,,,,,,`,,`,`,`,`,`,,`,,~,~,~
-,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,d,`,`,~
-,,,,,,`,`,`,`,,`,,`,`,`,`,`,,`,,~,~,~
-,,,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`
-,,`,`,`,,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
-,,`,`,`,d,`,`,`,`,d,`,,,d,,d,,,`,d,`,`,`,d,`,`,`
-,,,`,`,,`,`,`,`,,`,d,`,`,`,`,`,d,`,,`,`,`,,`,`,`
-,,,,d,,,d,,,,,,`,`,`,`,`,,,,,d,,,,d
-,,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,,,,d,,d,,,,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,,`,~,`,`,`,~,`,,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,,`,`,,,~,,,`,`,,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,,`,`,`,,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,`
-
-
-#notes label(industry_help)
-Sets up workshops for all non-farming industries
-Screenshot: https://drive.google.com/file/d/1emMaHHCaUPcdRbkLQqvr-0ZCs2tdM5X7
-""
-Features:
-- Space-efficient layout for all workshops
-- Manager orders that automate basic fortress maintenance
-"- Space available underneath the forge and smelters for magma, allowing the starting forge and smelters to be eventually replaced by magma versions."
-- Quantum stockpiles for compact storage
-with separate stockpiles for:
-- A reserve of uncut gems for strange moods that the jeweler's workshop cannot take from
-"- Wood, steel bars, and coal so you can see at a glance if you're low on stock"
-- Items that cannot be quantum stockpiled (e.g. lye and sand bags)
-- Meltable weapons and armor
-""
-Workshops:
-- 2x Mason
-- 4x Craftsdwarf
-- 1x Jeweler
-- 1x Mechanic
-- 4x Smelter
-- 1x Forge
-- 1x Glassmaker
-- 1x Kiln
-- 4x Wood furnace
-- 1x Ashery
-- 1x Soap maker
-- 1x Carpenter
-- 1x Siege workshop
-- 1x Bowyer
-- 1x Dyer
-- 1x Loom
-- 1x Clothier
-""
-""
-Manual steps you have to take:
-- Assign minecarts to your quantum stockpile hauling routes
-"- Give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level"
-""
-Optional manual steps you can take:
-- Restrict the Mechanic's workshop to only allow skilled workers so unskilled trap-resetters won't be tasked to build mechanisms.
-"- Restrict the Craftsdwarf's workshops to only allow labors that take from the adjacent stockpiles. That is, only allow Woodcrafting for the Craftsdwarf's workshop on the left near the wood stockpile, Stonecrafting and Strand Extraction for the Craftsdwarf's workshop near the Mason's workshops, and Bonecrafting for one of the Craftsdwarf's workshop near the Clothier's workshop. The last Craftdwarf's workshop can hold all the remaining labors, or it can be a secondary workshop for a labor that you want more dwarves working on."
-"- To encourage your masons to concentrate on building blocks and other high-volume orders, it helps to set one of your Mason's workshops to service a maximum of 2 manager orders at a time."
-"- Once you have enough haulers, you can increase the rate of stone and ore hauling jobs by building more wheelbarrows and adding them to the stone and ore feeder stockpiles."
-"- If desired, set one or both stockpiles in the bottom left to auto-melt. This results in melting all weapons and armor that are inferior to masterwork. This is great for upgrading your military, but it takes a *lot* of fuel unless you have first replaced the forge and smelters with magma versions. If you enable automelt and you don't have magma forges and magma smelters, be sure to be in a heavily forested area, enable auto-chop, and keep your coal stocks high."
-""
-Industry Walkthrough:
-"1) Start digging out /industry1 as soon as you find a stone layer at least two layers beneath the surface so the boulders can be used by your starting workshops. The services level is intended to be dug beneath this one, and there is space on that level to route magma underneath your furnaces so you can replace the furnaces on this level with magma-powered equivalents."
-""
-"2) Queue up manufacturing by running ""quickfort orders"" on /industry2. You brought an anvil with you (right??), so you can remove the unneeded anvil work order from the manager orders screen (j-m). Note that stockpiles that accept containers may claim the barrels you need to build the Dyer's Workshop and Ashery. If you see those two buildings not being constructed, build a few extra barrels or run combine-plants and combine-drinks to free up some existing ones."
-""
-"3) Once the area is dug out, run /industry2. Remember to assign minecarts to to your quantum stockpile hauling routes, and if the farming level is already built, give from the ""Goods"" quantum stockpile (the one on the left) to the jugs, pots, and bags stockpiles on the farming level."
-""
-"4) Once you have enough dwarves to do maintenance tasks (that is, after the first or second migration wave), run ""orders import library/basic"" to use the provided basic.json to take care of your fort's basic needs, such as food, booze, and raw material processing."
-""
-"5) If you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt. If you don't have a high density of trees to make into charcoal, though, be sure to route magma to the level beneath this one and replace the forge and furnaces with magma equivalents."
-""
-"6) Once you have magma furnaces (or abundant fuel) and more dwarves, run ""orders import library/furnace"", ""orders import library/military"", and ""orders import library/smelting"" to import the remaining fort automation orders. The military orders are optional if you are not planning to have a military, of course."
-""
-"7) At any time, feel free to build extra workshops or designate custom stockpiles in the unused space in the top and bottom right. The space is there for you to use!"
-"#dig label(industry1) start(18; 18; central stairs) message(Once the area is dug out, continue with /industry2.)"
-
-
-,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,,,d,,d,,,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,,d,`,`,`,d,,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,,,d,,d,,,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
-
-
-"#meta label(industry2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) build workshops and stockpiles, configure stockpiles"
-build/industry_build
-place/industry_place
-query/industry_query
-#build label(industry_build) start(18; 18) hidden()
-
-
-,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,wj,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,wr,`,`,`,`,`,`,`,wt,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,trackstopN,`,`,`,`,`,`,`,`,ws,`,`,`,`
-,,,,`,`,wS,`,`,wb,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,wm,`,`,`,`,`,`,`,wm,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,wy,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,wk,`,`,wo,`,`,wd,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,,,d,,d,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,,,,`,d,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,wc,`,`,`,trackstopW,`,`,`,`,`,,`,,`,,`,,`,`,`,`,`,trackstopE,`,`,`,we,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,,,,`,d,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,,,d,,d,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,wr,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,wr,`,`,wr,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,trackstopS,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,eg,`,`,`,wf,`,`,`,ek,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
-
-
-#place label(industry_place) start(18; 18) hidden()
-
-
-,,,,,,,,,,,e,e,e,e,e,e,e,e,e,e,e,e,e
-,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,c,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,s4(5x4),,,~,~,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`
-,,w,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,w,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,w,`,`,`,`,`,`,`,`,`,`,`,`,e(5x1),,,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,w,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,w,`,`,`,`,`,`,w(2x5),,fg(3x3),,`,,`,`,`,`,`,,frhlS(5x5),,,~,~,`,`,`,`,`,`,`
-,,w,`,`,`,`,`,`,~,~,~,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,`
-,,`,`,`,`,`,c,`,~,~,~,~,~,,`,,`,,`,,~,~,~,~,~,`,r,`,`,`,`,`
-,,f3,`,`,`,`,`,`,~,~,u2(3x2),~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,`
-,,f3,`,`,`,`,`,`,~,~,~,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,`
-,,f3,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,f3,`,`,`,`,`,`,`,`,`,`,`,`,bnpdhz(5x3),,,,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,f3,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,f3,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,pd(7x3),,,~,~,~,~,`,`,`,`,s2(5x2),,,~,~,`,`,`,`,`,`,`,`,`,`,`
-,,,,~,~,~,~,~,~,~,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`
-,,,,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,b,`,c,`,b,`,`,`,`,`,`,`,`,`,`,`
-,,,,pd(7x3),,,~,~,~,~,`,`,`,`,b,s,s,s,b,`,`,`,`,`,`,`,`,`,`,`
-,,,,~,~,~,~,~,~,~,`,`,`,`,b,`,`,`,b,`,`,`,`,`,`,`,`,`,`,`
-,,,,~,~,~,~,~,~,~,`,`,`,`,b,`,`,`,b,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,u,u,u,u,u,u,`,b,b,b,b,b,b
-
-
-"#query label(industry_query) start(18; 18) hidden() message(remember to:
-- assign minecarts to to your quantum stockpile hauling routes (use ""assign-minecarts all"")
-- if the farming level is already built, give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level
-- if you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt
-- once you have enough dwarves, run ""orders import library/basic"" to automate your fort's basic needs (see /industry_help for more info on this file)
-- optionally, restrict the labors for your Craftsdwarf's and Mechanic's workshops as per the guidance in /industry_help)"
-
-
-,,,,,,,,,,,roughgems,,,,nocontainers,"{givename name=""rough gems for moods""}",t{Down 5}&,,,,,~,~
-,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,"{givename name=""stone craftsdwarf""}",`,`,`,"{quantum name=""stoneworker quantum""}g{Up 3}&",`,`,`,~,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"{quantumstop name=""Stoneworker quantum"" sp_links=""{sp_link move={Down} move_back={Up}}{sp_link move=""""{Down 5}"""" move_back=""""{Up 5}""""}""}{givename name=""stoneworker dumper""}",`,`,`,`,`,`,`,`,~,`,`,`,`
-,,,,`,`,~,`,`,~,`,`,`,`,`,otherstone,,,,~,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,~,`,"{givename name=""stone feeder""}",~,~,~,~,`,~,`,`,`,`,`,`,`,`,`
-,,"{givename name=""wood""}",`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,~,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,~,`,~,`,`,~,`,`,~,`,`,`,`,nocontainers,"{givename name=""gem feeder""}",~,~,~,`,`,`,`,~,`,`,~,`,`,~,`,`
-,,~,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,~,`,`,`,`,`,`,"{givename name=""wood feeder""}",~,"{givename name=""goods feeder""}",nocontainers,~,,`,`,`,`,`,,craftrefuse,,,,~,`,`,`,`,`,`,`
-,,t{Right 5}{Down}&,`,`,`,`,`,`,~,~,{tallow}{permitwax},~,~,`,`,,,,`,`,"{givename name=""cloth/bones feeder""}",g{Up 3}{Right 5}&,~,~,~,`,`,`,`,`,`,`
-,,`,`,~,`,`,"{quantum name=""goods/wood quantum""}g{Up 13}{Right 10}&","{quantumstop name=""Goods/Wood quantum"" sp_links=""{sp_link move={Right} move_back={Left}}{sp_link move=""""{Right 5}"""" move_back=""""{Left 5}""""}{sp_link move=""""{Down}{Right 5}"""" move_back=""""{Left 5}{Up}""""}""}{givename name=""goods/wood dumper""}",~,~,{forbidcrafts}{forbidgoblets},~,~,,`,,`,,`,,nocontainers,~,~,~,~,"{quantumstopfromwest name=""Clothier/Bones quantum""}{givename name=""cloth/bones dumper""}","{quantum name=""cloth/bones quantum""}g{Up 4}&",`,`,~,`,`
-,,miscliquid,`,`,`,`,`,`,~,~,"{givename name=""furniture feeder""}",~,~,`,`,,,,`,`,forbidadamantinethread,~,~,~,~,`,`,`,`,`,`,`
-,,"{givename name=""miscliquid""}",`,`,`,`,`,`,~,~,forbidsand,~,~,,`,`,`,`,`,,dye,~,~,~,~,`,`,`,`,`,`,`
-,,~,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,~,`,"{givename name=""wood craftsdwarf""}",`,`,~,`,`,~,`,`,`,`,forbidpotash,nocontainers,"{givename name=""bar/military feeder""}",~,~,`,`,`,`,"{givename name=""misc craftsdwarf""}",`,`,"{givename name=""bone craftsdwarf""}",`,`,`,`,`
-,,~,`,`,`,`,`,`,`,`,`,`,`,`,adamantinethread,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,~,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,nocontainers,t{Right 12}{Up 3}&,t{Right 11}{Down 3}&,"{givename name=""meltable steel/brnze""}",,,,`,`,~,`,forbidotherstone,,,,,`,~,`,`,`,`,`,`,`,`,`
-,,,,{bronzeweapons}{permitsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons},,,,,,,`,`,`,`,"{givename name=""ore/clay feeder""}",~,~,~,~,`,`,`,`,`,`,`,`,`,`,`
-,,,,{bronzearmor}{permitsteelarmor}{forbidmasterworkarmor}{forbidartifactarmor},,,,,,,`,`,`,`,`,`,"{quantumstop name=""Metalworker quantum"" sp_links=""{sp_link move={Up} move_back={Down}}{sp_link move=""""{Up 5}"""" move_back=""""{Down 5}""""}""}{givename name=""metalworker dumper""}",`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,~,`,t{Right 2}&,`,"{quantum name=""metalworker quantum""}",`,t{Left 2}&,`,~,`,`,`,`,`,`,`,`,`
-,,,,nocontainers,t{Right 12}{Up 7}&,t{Right 11}{Up 1}&,"{givename name=""other meltables""}",,,,`,`,`,`,coal,flux,t{Up}&,"{givename name=""flux""}",ironbars,`,`,`,`,`,`,`,`,`,`,`
-,,,,{metalweapons}{forbidbronzeweapons}{forbidsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons},,,,,,,`,`,`,`,"{givename name=""coal""}",`,`,`,"{givename name=""iron""}",`,`,`,`,`,`,`,`,`,`,`
-,,,,{metalarmor}{forbidbronzearmor}{forbidsteelarmor}{forbidmasterworkarmor}{forbidartifactarmor},,,,,,,`,`,~,`,nocontainers,`,~,`,nocontainers,`,~,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,sand,"{givename name=""sand bags""}",nocontainers,~,~,~,`,t{Up 5}{Left}&,,,nocontainers,steelbars,"{givename name=""steel""}"
-
-
-#notes label(services_help)
-"Sets up public services (dining, hospital, etc.)"
-Screenshot: https://drive.google.com/file/d/13vDIkTVOZGkM84tYf4O5nmRs4VZdE1gh
-""
-Features:
-- Spacious dining room/tavern (tavern is restricted to residents-only by default)
-- Prepared food and drink stockpiles
-- Well cistern system (bring your own water)
-- Hospital with a well for washing
-- Garbage dump
-- Empty space for magma to power forges and smelters in the industry level above
-""
-Note the hospital also has animal training enabled so it can be used with the dwarfvet plugin if it's enabled.
-""
-Manual steps you have to take:
-"- If you want to tavern to attract visitors, change the restriction in the (l)ocation menu."
-"- Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water to prevent muddiness. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experienced with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
-"- If you are filling the wells with a bucket brigade and at least one well is already constructed, you'll run into issues with the dwarves stealing water from one well to fill another. Temporarily deconstruct the wells or temporarily build grates beneath the wells to block the buckets to avoid this issue. Remember to rebuild the wells or remove the grates afterwards, though!"
-- Assign the office to the right of the barracks to your Sheriff/Captain of the Guard to use it as an interrogation room.
-""
-Services Walkthrough:
-1) Start this level when your fort grows to about 50 dwarves so everyone has a place to eat.
-""
-2) Start digging with /services1. Note that this digs out the main level and three levels below for the wells.
-""
-"3) Once the area is dug out, set up important furniture, stockpiles, hospital zone and garbage dump zone with /services2. Run ""quickfort orders"" for /services2."
-""
-"4) When the table and chair have been placed in the dining room, the beds are placed in the rented rooms, and the weapon rack and archery targets are constructed in the barracks, run /services3 to build the rest of the furniture and configure your dining room/tavern and barracks. Run ""quickfort orders"" for /services3."
-""
-5) Fill the wells with either bucket brigades or by carefully routing flowing water.
-""
-"6) When your fort is mature enough to need jail cells, run /services4 to set those up, anytime after the restraints are built in the jail cell block. You also get some decorative statues to increase the value of your dining hall. Assign the office to the right of the barracks to your Sheriff/Captain of the Guard to use it as an interrogation room. Run ""quickfort orders"" for /services4."
-"#dig label(services1) start(18; 18; central stairs) message(Once the area is dug out, continue with /services2.)"
-
-,d,d,d,,d,d,d,,d,d,d,,d,h,d,,j,,d,h,d
-,d,d,d,,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d
-,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d
-,,d,,,,d,,,,d,,,,,,,d
-,d,d,d,d,d,d,d,d,d,d,d,,d,h,d,,d,,d,h,d,,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,,,,,d,,,,,,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,,,d
-,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,d,,d,,d,,d
-,d,d,d,d,d,d,d,d,d,d,d,,,,,d,,d,,,,,d,,d,,d,,d
-,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,d,,d,`,`,`,d,,d,,d,d,d,h,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,,,,,,d,,,,,,d,,d,,d,,d
-,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,,,d,,d,,d,,d
-,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,,d,d
-,d,d,d,d,d,,d,d,d,d,d
-,d,d,d,d,d,,d,d,d,d,d
-,d,d,d,d,d,,d,d,d,d,d
-,d,d,d,d,d,,d,d,d,d,d
-,d,d,d,d,d,,d,d,d,d,d
-
-#>
-
-,,,,,,,,,,,,,j5,h5,j,,u,,j,h5,j5
-,,,,,,,,,,,,,5,5,5,5,d,5,5,5,5
-,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,j5,h5,j,,d,,j,h5,j5
-,,,,,,,,,,,,,5,5,5,5,d,5,5,5,5
-,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d
-,,,,,,,,,,,,,,,,,6,,,,,,,,,d
-,,,,,,,,,,,,,,,,,d,,,,,,,,,d
-,,,,,,,,,,,,,,,d,d,d,d,d,,,,,,,d
-,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,5,5,5
-,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,j,h5,j5
-,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,d,d,d,d,d
-
-#>
-
-,,,,,,,,,,,,,u5,h5,i,,,,i,h5,u5
-
-
-
-,,,,,,,,,,,,,u5,h5,i,,,,i,h5,u5
-
-
-
-
-
-
-
-
-
-,,,,,,,,,,,,,,,d,d,d,d,d
-,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,i,h5,u5
-,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,d,d,d,d,d
-
-#>
-
-,,,,,,,,,,,,,,d,u,,,,u,d
-
-
-
-,,,,,,,,,,,,,,d,u,,,,u,d
-
-
-
-
-
-
-
-
-
-,,,,,,,,,,,,,,,d,d,d,d,d
-,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,u,d
-,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,d,d,d,d,d
-
-"#meta label(services2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
-Once furniture has been placed, continue with /services3.) dining hall anchors, stockpiles, hospital, garbage dump"
-zones/services_zones
-build/services_build
-place/services_place
-name_zones/services_name_zones
-query_stockpiles/services_query_stockpiles
-""
-"#meta label(services3) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) configure dining room/tavern, build dining hall and hospital furniture"
-query_dining/services_query_dining
-query_rented_rooms/services_query_rented_rooms
-build2/services_build2
-""
-#meta label(services4) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) declare and furnish jail and build decorative furniture
-build3/services_build3
-place_jail/services_place_jail
-query_jail/services_query_jail
-"#zone label(services_zones) start(18; 18) hidden() message(If you'd like to fill your wells via bucket brigade, activate the inactive pond zones one level down from where the wells will be built.) garbage dump, hospital, and pond zones"
-
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,d,,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#>
-
-,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
-,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
-,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`,,,,,,,,,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,apPf,`
-,,,,,,,,,,,,,,,`,`,`,`,`
-,,,,,,,,,,,,,,,`,`,`,`,`
-
-#build label(services_build) start(18; 18) hidden() build basic hospital and dining room anchor
-
-,b,b,b,,b,b,b,,b,b,b,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,d,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,A,A,A,`,A,A,A,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,r,`,`,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,d,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,trackstopN,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,b
-,`,`,`,`,`,`,`,`,`,`,`,,,,,d,,d,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,t,`,`,`,`,R
-,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,h
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,l,`,`,`,`,R
-,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,t,c,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,R
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,h,`,`,`,`,`
-,,,,`,`,,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#place label(services_place) start(18; 18) hidden()
-
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,c,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,z(7x1),,,`,`,`,`,`,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,c,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,,`,`
-,f(5x5),,,`,`,,f(5x5),,,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#query label(services_name_zones) start(18; 18) hidden()
-
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,"{namezone name=""hospital""}"
-,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,"{namezone name=""garbage dump""}"
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#>
-
-,,,,,,,,,,,,,`,"{namezone name=""jail3 well""}",`,,`,,`,"{namezone name=""jail4 well""}",`
-,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,`,"{namezone name=""jail1 well""}",`,,`,,`,"{namezone name=""jail2 well""}",`
-,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`,,,,,,,,,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,"{namezone name=""hospital well""}",`
-,,,,,,,,,,,,,,,`,`,`,`,`
-,,,,,,,,,,,,,,,`,`,`,`,`
-
-"#query label(services_query_stockpiles) start(18; 18) hidden() message(Configure the training ammo stockpile to take from the metalworker quantum on the industry level. Assign a minecart to the training ammo quantum dump with ""assign-minecarts all"") configure stockpiles"
-
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,"{quantum name=""training quantum""}",`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,"{quantumstopfromsouth name=""Training quantum""}{givename name=""training dumper""}",`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,nocontainers,{bolts}{forbidmetalbolts}{forbidartifactammo},"{givename name=""training bolts""}",`,`,`,`,`,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,"{givename name=""garbage dump""}"
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,,`,`
-,preparedfood,"{givename name=""prepared food""}",`,`,`,,booze,"{givename name=""booze""}",`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-"#query label(services_query_dining) start(18; 18) hidden() message(The tavern is restricted to residents only by default. If you'd like your tavern to attract vistors, please go to the (l)ocation menu and change the restriction.) set up dining room/tavern and barracks"
-
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,r+&w,r+&w,r+&w,`,r+&w,r+&w,r+&w,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,r{+ 2}&,,,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,"r{+ 12}&h{givename name=""grand hall""}lai^l{Up}r^q",,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#query label(services_query_rented_rooms) start(18; 18) hidden() attach rented rooms to tavern
-
-,r&l-&,r&l-&,r&l-&,,r&l-&,r&l-&,r&l-&,,r&l-&,r&l-&,r&l-&,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-"#build label(services_build2) start(18; 18) hidden() build rest of hospital and dining room, doors, prep for jail"
-
-,~,~,~,,~,~,~,,~,~,~,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,v,`,d,`,d,`,v,`
-,f,`,h,,f,`,h,,f,`,h,,`,`,`,,`,,`,`,`
-,,d,,,,d,,,,d,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,v,`,d,`,d,`,v,`,,`,`,c,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,~,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,b,~,~,~,`,~,~,~,h,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,~,`,`,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,`,`,`,`,`,~,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,`,`,`,`,a,,b,,b,,b,,~
-,`,`,`,`,`,`,`,`,`,`,`,,,,,~,,~,,,,,d,,d,,d,,d
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,~,`,`,`,d,~
-,`,c,t,t,c,`,c,t,t,c,`,~,`,d,`,`,`,`,`,d,`,d,`,`,`,`,`,`,~
-,`,c,t,t,c,`,c,t,t,c,`,,`,,`,`,`,`,`,,`,,`,`,`,~,`,`,`,d,~
-,`,c,t,t,c,`,c,t,t,c,`,~,`,d,`,`,`,`,`,d,`,d,`,`,`,`,`,`,f
-,`,c,t,~,~,`,c,t,t,c,`,,,,`,`,`,`,`,,,,`,`,`,t,`,`,`,d,~
-,`,c,t,t,c,`,c,t,t,c,`,,,,,,`,,,,,,d,,d,,d,,d
-,`,c,t,t,c,`,c,t,t,c,`,,,,,,,,,,,,b,,b,,b,,b
-,`,c,t,t,c,`,c,t,t,c,`
-,`,c,t,t,c,`,c,t,t,c,`
-,`,c,t,t,c,`,c,t,t,c,`
-,`,c,t,t,c,`,c,t,t,c,`
-,`,`,`,`,`,`,`,`,`,`,`
-,h,`,`,`,`,~,`,`,`,`,h
-,,,,d,d,,d,d
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#>
-
-,,,,,,,,,,,,,`,`,`,,`,,`,`,`
-,,,,,,,,,,,,,`,`,`,d,`,d,`,`,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,`,`,`,,`,,`,`,`
-,,,,,,,,,,,,,`,`,`,d,`,d,`,`,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`,,,,,,,,,`
-,,,,,,,,,,,,,,,,,d,,,,,,,,,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,d
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
-,,,,,,,,,,,,,,,`,`,`,`,`
-,,,,,,,,,,,,,,,`,`,`,`,`
-
-#dig label(services_traffic) start(18; 18) hidden() promote the tavern as the place to eat
-
-,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,,or,,or,or,or
-,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,or,or,or,or,or,or
-,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,,or,,or,or,or
-,,ol,,,,ol,,,,ol,,,,,,,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,,or,,or,or,or,,or,or,or,or,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,,or,or,or,or,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,,or,,or,or,or,,or,or,or,or,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,,,,,or,,,,,,or,or,or,or,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,,or,or,or,or,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,,,,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,or,or,or,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,,or,,or,,or,,or
-,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,,,,or,,or,,,,,or,,or,,or,,or
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,,,oh,oh,oh,oh,oh,,,,or,or,or,or,or,or,or,or,or
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,`,`,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,or,or
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,`,,oh,`,`,`,oh,,`,,oh,oh,oh,`,oh,or,or,or,or
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,`,`,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,or,or
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,,,oh,oh,oh,oh,oh,,,,or,or,or,or,or,or,or,or,or
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,,,,,`,,,,,,or,,or,,or,,or
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,,,,,,,,,,,or,,or,,or,,or
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
-,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
-,,,,oh,oh,,oh,oh
-,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
-,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
-,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
-,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
-,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
-
-"#build label(services_build3) start(18; 18) hidden() jail, statues"
-
-,~,~,~,,~,~,~,,~,~,~,,t,l,b,,`,,t,l,b
-,`,`,`,,`,`,`,,`,`,`,,c,~,`,~,`,~,c,~,`
-,~,`,~,,~,`,~,,~,`,~,,`,`,`,,`,,`,`,`
-,,~,,,,~,,,,~,,,,,,,`
-,`,`,`,s,`,`,`,s,`,`,`,,t,l,b,,`,,t,l,b,,j,`,`,`,j
-,`,`,`,`,`,`,`,`,`,`,`,,c,~,`,~,`,~,c,~,`,,`,`,~,`,`
-,s,`,`,`,`,`,`,`,`,`,s,,`,`,`,,`,,`,`,`,,v,`,t,`,v
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,~,,,,,,`,`,c,`,`
-,s,`,`,`,`,`,`,`,`,`,s,,~,~,~,~,`,~,~,~,~,,j,`,`,`,j
-,`,`,`,`,`,`,`,`,`,`,`,,~,`,`,`,~,`,`,`,`,,,,d
-,s,`,`,`,`,`,`,`,`,`,s,,~,`,`,`,`,`,`,`,`,~,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,~,`,`,`,`,`,`,`,`
-,s,`,`,`,`,`,`,`,`,`,s,,~,`,`,`,`,`,`,`,~,,~,,~,,~,,~
-,`,`,`,`,`,`,`,`,`,`,`,,,,,~,,~,,,,,~,,~,,~,,~
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,s,`,~,`,`,`,~,~
-,`,~,~,~,~,`,~,~,~,~,`,~,`,~,`,`,`,`,`,~,`,~,`,`,`,`,`,`,~
-,`,~,~,~,~,`,~,~,~,~,`,,s,,`,`,`,`,`,,s,,`,`,`,~,`,`,`,~,~
-,`,~,~,~,~,`,~,~,~,~,`,~,`,~,`,`,`,`,`,~,`,~,`,`,`,`,`,`,~
-,`,~,~,~,~,`,~,~,~,~,`,,,,`,`,`,`,`,,,,`,s,`,~,`,`,`,~,~
-,`,~,~,~,~,`,~,~,~,~,`,,,,,,`,,,,,,~,,~,,~,,~
-,`,~,~,~,~,`,~,~,~,~,`,,,,,,,,,,,,~,,~,,~,,~
-,`,~,~,~,~,`,~,~,~,~,`
-,`,~,~,~,~,`,~,~,~,~,`
-,`,~,~,~,~,`,~,~,~,~,`
-,`,~,~,~,~,`,~,~,~,~,`
-,`,`,`,`,`,`,`,`,`,`,`
-,~,`,s,`,`,~,`,`,s,`,~
-,,,,~,~,,~,~
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#place label(services_place_jail) start(18; 18) hidden()
-
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,f(1x2),`,`,`,`,`,f(1x2)
-,`,`,`,,`,`,`,,`,`,`,,f(2x1),`,`,,`,,f(2x1),`,`
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,f(1x2),`,`,`,`,`,f(1x2),,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,f(2x1),`,`,,`,,f(2x1),`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#query label(services_query_jail) start(18; 18) hidden() message(Assign the office to the right of the barracks to your Sheriff/Captain of the Guard to use it as your interrogation room) set up barracks and jail
-
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,"r--&j{givename name=""jail3""}","{booze}{givename name=""booze""}",`,`,`,`,"r--&j{givename name=""jail4""}","{booze}{givename name=""booze""}"
-,`,`,`,,`,`,`,,`,`,`,,"{preparedfood}{givename name=""prepared food""}",t{Down 4}&,t{Down 4}&,,`,,"{preparedfood}{givename name=""prepared food""}",t{Down 4}&,t{Down 4}&
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,"r--&j{givename name=""jail1""}","{booze}{givename name=""booze""}",`,`,`,`,"r--&j{givename name=""jail2""}","{booze}{givename name=""booze""}",,`,`,"r+&{givename name=""sheriff's office""}",`,`
-,`,`,`,`,`,`,`,`,`,`,`,,"{preparedfood}{givename name=""prepared food""}",t{Down 22}{Left 10}&,t{Down 22}{Left 4}&,,`,,"{preparedfood}{givename name=""prepared food""}",t{Left 6}&,t{Left 6}&,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,"{givename name=""interrogation""}"
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#notes label(guildhall_help)
-"Eight 7x7 rooms for guildhalls, temples, libraries, etc."
-Screenshot: https://drive.google.com/file/d/17jHiCKeZm6FSS-CI4V0r0GJZh09nzcO_
-""
-Features:
-"- Big rooms, optionally pre-furnished. Double-thick walls to ensure engravings add value to the ""correct"" side. Declare locations from the pre-created meeting zones as needed."
-""
-Guildhall Walkthrough:
-1) Dig out the rooms with /guildhall1.
-""
-"2) Once the area is dug out, pre-create the zones and add doors and a few statues with /guildhall2. Run ""quickfort orders"" for /guildhall2."
-""
-"3) Furnish individual rooms manually, or get default furnishings for a variety of room types by running /guildhall3. If you use the default furnishings, also run ""quickfort orders"" for /guildhall3. Declare appropriate locations from the pre-created zones as you need guildhalls, libraries, and temples. If you'd like a ""no specific diety"" temple declared for the top room and a library declared for the bottom room, run /guildhall4. Both locations will be ""Residents only"" by default, but you can change this in the (l)ocation menu if you want them to attract visitors. If you need more rooms, you can dig another /guildhall1 in an unused z-level."
-"#dig label(guildhall1) start(15; 15; central stairs) message(Once the area is dug out, continue with /guildhall2.)"
-
-
-,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,3,3,3,3,3,3,3,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,3,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d
-,,,,,,,d,,,,,,3,,d,,,,,,d
-,,,,,,,d,,,,,,3,d,d,,,,,,d
-,,d,d,d,d,d,d,d,,,,,3,,d,,,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,,3,3,3,3,3,,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,3,`,`,`,3,3,3,3,3,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,d,,3,`,`,`,3,,d,,3,3,3,3,3,d,d
-,,d,d,d,d,d,d,d,d,d,d,3,`,`,`,3,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,,3,3,3,3,3,,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,,,d,,d,,,,,d,d,d,d,d,d,d
-,,,,,,,d,,,,,,d,d,d,,,,,,d
-,,,,,,,d,,,,,,d,,d,,,,,,d
-,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
-,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
-
-
-#meta label(guildhall2)
-doors/guildhall_doors
-zones/guildhall_zones
-"#build label(guildhall_doors) start(15; 15; central stairs) hidden() message(Remember to enqueue manager orders for this blueprint.
-Smooth/engrave tiles, furnish rooms, and declare locations as required.) build doors"
-
-
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,d,d,`,`,`,`,`,`,`,d,d,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,,,,,,d,,,,,,d,,d,,,,,,d
-,,,,,,,d,,,,,,`,s,`,,,,,,d
-,,`,`,`,`,`,`,`,,,,,d,,d,,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,d,`,d,`,,,,`,d,`,d,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,s,,`,,`,,`,,s,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,d,`,d,`,,,,`,d,`,d,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,,d,,d,,,,,`,`,`,`,`,`,`
-,,,,,,,d,,,,,,`,s,`,,,,,,d
-,,,,,,,d,,,,,,d,,d,,,,,,d
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,d,d,`,`,`,`,`,`,`,d,d,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-
-
-#zone label(guildhall_zones) start(15; 15; central stairs) hidden() designate zones
-
-,m(9x9),,,,,,,,,m(9x9),,,,,,,,,m(9x9)
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,,,,,,~,,,,,,~,,~,,,,,,~
-,m(9x9),,,,,,~,,,,,,`,~,`,,,,m(9x9),,~
-,,`,`,`,`,`,`,`,,,,,~,,~,,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,~,`,~,`,,,,`,~,`,~,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,~,,`,,`,,`,,~,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,~,`,~,`,,,,`,~,`,~,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,,~,,~,,,,,`,`,`,`,`,`,`
-,,,,,,,~,,,,,,`,~,`,,,,,,~
-,m(9x9),,,,,,~,,,m(9x9),,,~,,~,,,,m(9x9),,~
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-
-
-"#build label(guildhall3) start(15; 15; central stairs) message(Remember to enqueue manager orders for this blueprint.) furnish 4 guildhalls, 3 temples, and a library"
-
-
-,,`,`,`,`,s,`,`,,,`,s,`,c,`,`,f,,,`,`,s,`,`,`,`
-,,`,`,c,`,`,`,`,,,`,`,h,~a,`,`,f,,,`,`,`,`,c,`,`
-,,`,c,t,c,`,`,s,,,`,`,`,`,`,`,`,,,s,`,`,c,t,c,`
-,,`,`,c,`,c,`,`,,,`,`,`,`,`,`,`,,,`,`,c,`,c,`,`
-,,s,`,`,c,t,c,`,,,`,`,c,c,c,`,`,,,`,c,t,c,`,`,s
-,,`,`,`,`,c,`,`,~,~,`,`,c,c,c,`,`,~,~,`,`,c,`,`,`,`
-,,`,`,s,`,`,`,t,,,t,`,`,`,`,`,t,,,t,`,`,`,s,`,`
-,,,,,,,~,,,,,,~,,~,,,,,,~
-,,,,,,,~,,,,,,`,~,`,,,,,,~
-,,f,f,`,`,`,`,t,,,,,~,,~,,,,,t,`,`,`,`,f,f
-,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
-,,`,`,`,`,c,c,`,~,`,~,`,,,,`,~,`,~,`,c,c,`,`,`,`
-,,c,~a,`,`,c,c,`,,~,,`,,`,,`,,~,,`,c,c,`,`,~a,c
-,,`,h,`,`,c,c,`,~,`,~,`,,,,`,~,`,~,`,c,c,`,`,h,`
-,,s,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,s
-,,`,`,`,`,`,`,t,,,,,~,,~,,,,,t,`,`,`,`,`,`
-,,,,,,,~,,,,,,`,~,`,,,,,,~
-,,,,,,,~,,,,,,~,,~,,,,,,~
-,,`,`,s,`,`,`,t,,,t,`,`,`,`,`,t,,,t,`,`,`,s,`,`
-,,`,`,`,`,c,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,c,`,`,`,`
-,,s,`,`,c,t,c,`,,,t,c,`,`,`,c,t,,,`,c,t,c,`,`,s
-,,`,`,c,`,c,`,`,,,t,c,`,`,`,c,t,,,`,`,c,`,c,`,`
-,,`,c,t,c,`,`,s,,,t,c,`,`,`,c,t,,,s,`,`,c,t,c,`
-,,`,`,c,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,c,`,`
-,,`,`,`,`,s,`,`,,,h,~c,~c,s,~c,~c,h,,,`,`,s,`,`,`,`
-
-
-"#query label(guildhall4) start(15; 15; central stairs) message(The library and temple are restricted to residents only by default. If you'd like them to attract vistors, please go to the (l)ocation menu and change the restriction.) declare a library and temple"
-
-
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,^ilat&^l{Up}r^q,,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,,,,,,`,,,,,,`,,`,,,,,,`
-,,,,,,,`,,,,,,`,`,`,,,,,,`
-,,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,`,,`,,`,,`,,`,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`
-,,,,,,,`,,,,,,`,`,`,,,,,,`
-,,,,,,,`,,,,,,`,,`,,,,,,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,^ilal&^l{Up}r^q,,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
-
-
-#notes label(beds_help)
-Suites for nobles and apartments for the teeming masses
-Suites screenshot: https://drive.google.com/file/d/1IBqCf6fF3lw7sHiBE_15Euubysl5AAiS
-Apt. screenshot: https://drive.google.com/file/d/1mDQQXG8BnXqasRGFC9R5N6xNALiswEyr
-""
-Features:
-- Well-appointed suites to satisfy nobles
-- Apartments with beds and storage to keep dwarves happy and the fortress clean
-- Apartments also serve as burial chambers since dwarves like looking at coffins
-- Meta blueprint included for designating 5 levels of apartments for a full 200+ dwarves
-""
-Suites Walkthrough:
-1) Dig out the suites layer with /suites1.
-""
-"2) Once the area is dug out, furnish the suites with /suites2. The rooms are left unconfigured so you can assign them to specific nobles. Each room can serve as a bedroom, a dining hall, an office, and/or a tomb. Run ""quickfort orders"" for /suites2."
-""
-Apartments Walkthrough:
-"1) Dig out one layer of apartments with /apartments1, or 5 layers at once (enough for 200 dwarves) with by adding ""--repeat down,5"" to the quickfort command."
-""
-"2) Once a layer is dug out, build beds with /apartments2. Run ""quickfort orders"" for /apartments2."
-""
-"3) Once the beds are built, configure the rooms and build the remaining furniture with /apartments3. Run ""quickfort orders"" for /apartments3."
-""
-"4) Once the coffins are all in place, run ""burial -pets"" to set them all to accept burials."
-"#dig label(suites1) start(18; 18; central ramp) message(Once the area is dug out, run /suites2) noble suites"
-
-,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,d,d,,,,d,,,,,,d,,,,d,,d,,,,d,,,,,,d,,,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,,,,,,,,,,,,,d,d,d,,,,,,,,,,,,,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,,,d,,,,,,d,,,,d,d,d,,,,d,,,,,,d,,,,d,d
-,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,d,d,,d,d,d,d,d,d,d,d,d,d,,d,`,~,`,d,,d,d,d,d,d,d,d,d,d,d,,d,d
-,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,d,d,,,,d,,,,,,d,,,,d,d,d,,,,d,,,,,,d,,,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,,,,,,,,,,,,,d,d,d,,,,,,,,,,,,,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
-,d,d,,,,d,,,,,,d,,,,d,,d,,,,d,,,,,,d,,,,d,d
-,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-
-"#build label(suites2) start(18; 18; central ramp) message(Remember to enqueue manager orders for this blueprint.
-bedrooms are left unconfigured so you can assign them to specific nobles)"
-
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,,,,d,,,,,,d,,,,d,,d,,,,d,,,,,,d,,,,`,`
-,`,`,,a,r,`,`,h,,h,`,`,r,a,,`,s,`,,a,r,`,`,h,,h,`,`,r,a,,`,`
-,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,`
-,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`
-,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,s,`,,c,`,`,`,f,,f,`,`,`,c,,`,`
-,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,`
-,`,`,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,`,`
-,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,s,`,,t,`,s,`,n,,n,`,s,`,t,,`,`
-,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,`
-,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`
-,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,s,`,,`,`,`,`,h,,h,`,`,`,`,,`,`
-,`,`,,a,r,`,`,h,,h,`,`,r,a,,d,,d,,a,r,`,`,h,,h,`,`,r,a,,`,`
-,`,`,,,,d,,,,,,d,,,,`,`,`,,,,d,,,,,,d,,,,`,`
-,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`
-,`,`,,s,`,`,s,`,`,s,`,`,s,,`,`,~,`,`,,s,`,`,s,`,`,s,`,`,s,,`,`
-,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`
-,`,`,,,,d,,,,,,d,,,,`,`,`,,,,d,,,,,,d,,,,`,`
-,`,`,,a,r,`,`,h,,h,`,`,r,a,,d,,d,,a,r,`,`,h,,h,`,`,r,a,,`,`
-,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,s,`,,`,`,`,`,h,,h,`,`,`,`,,`,`
-,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`
-,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,`
-,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,s,`,,t,`,s,`,n,,n,`,s,`,t,,`,`
-,`,`,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,`,`
-,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,`
-,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,s,`,,c,`,`,`,f,,f,`,`,`,c,,`,`
-,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`
-,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,`
-,`,`,,a,r,`,`,h,,h,`,`,r,a,,`,s,`,,a,r,`,`,h,,h,`,`,r,a,,`,`
-,`,`,,,,d,,,,,,d,,,,d,,d,,,,d,,,,,,d,,,,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-
-"#dig label(apartments1) start(18; 18; central ramp) message(Once the area is dug out, continue with /apartments2.) apartment complex"
-
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d
-,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,,,,,,,,,,,,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,,d,,d,d,d,,d,d,d,,d,d,d
-,,,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d
-,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,,d,d,d
-,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,`,~,`,d,,d,d,d,d,d,d,d,d,d,d,d,d,d
-,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,,d,d,d
-,,,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,,,,,,,,,,,,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d
-,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d
-
-"#build label(apartments2) start(18; 18; central ramp) message(Remember to enqueue manager orders for this blueprint.
-Once beds have been placed, continue with /apartments3.) build beds"
-
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,b,`,,`,b,`,,`,b,`,,`,`,`,,`,b,`,,`,b,`,,`,b,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,,,,,,,,,,,,`,`,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,b,`,,`,b,`,,`,b,`,,`,`,`,,`,b,`,,`,b,`,,`,b,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`
-,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`
-,`,b,`,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`,`,b,`
-,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`
-,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,b,`,,`,b,`,,`,b,`,,`,`,`,,`,b,`,,`,b,`,,`,b,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,,,,,,,,,,,,`,`,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,b,`,,`,b,`,,`,b,`,,`,`,`,,`,b,`,,`,b,`,,`,b,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-
-#meta label(apartments3) start(central ramp) message(Remember to enqueue manager orders for this blueprint.) configure rooms and build remaining furniture
-query_apartments/apartments_rooms
-build2_apartments/apartments_build2
-#query label(apartments_rooms) start(18; 18) hidden() configure rooms
-
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,`,`,,`,r-&,`,,`,r-&,`,,`,r-&,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,,,,,,,,,,,,`,`,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,`,`,,`,r-&,`,,`,r-&,`,,`,r-&,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`
-,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`
-,`,r-&,`,`,`,`,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,`,`,`,`,`,`,`,`,r-&,`
-,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`
-,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,`,`,,`,r-&,`,,`,r-&,`,,`,r-&,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,,,,,,,,,,,,`,`,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,`,`,,`,r-&,`,,`,r-&,`,,`,r-&,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`
-,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-
-"#build label(apartments_build2) start(18; 18) hidden() message(Coffins should be configured with DFHack ""burial"" script) build remaining furniture"
-
-,,,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h
-,,,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`
-,,,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f
-,,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,s,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d
-,,,,n,`,h,,n,`,h,,n,`,h,,`,`,`,,n,`,h,,n,`,h,,n,`,h
-,,,,`,~,`,,`,~,`,,`,~,`,,`,s,`,,`,~,`,,`,~,`,,`,~,`
-,,,,n,`,f,,n,`,f,,n,`,f,,`,`,`,,n,`,f,,n,`,f,,n,`,f
-,,,,,,,,,,,,,,,,`,`,`
-,,,,n,`,h,,n,`,h,,n,`,h,,`,s,`,,n,`,h,,n,`,h,,n,`,h
-,,,,`,~,`,,`,~,`,,`,~,`,,`,`,`,,`,~,`,,`,~,`,,`,~,`
-,,,,n,`,f,,n,`,f,,n,`,f,,d,,d,,n,`,f,,n,`,f,,n,`,f
-,,,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d
-,n,`,h,,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,,n,`,h
-,`,~,`,d,`,s,`,`,s,`,`,s,`,,`,`,~,`,`,,`,s,`,`,s,`,`,s,`,d,`,~,`
-,n,`,f,,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,,n,`,f
-,,,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d
-,,,,n,`,h,,n,`,h,,n,`,h,,d,,d,,n,`,h,,n,`,h,,n,`,h
-,,,,`,~,`,,`,~,`,,`,~,`,,`,`,`,,`,~,`,,`,~,`,,`,~,`
-,,,,n,`,f,,n,`,f,,n,`,f,,`,s,`,,n,`,f,,n,`,f,,n,`,f
-,,,,,,,,,,,,,,,,`,`,`
-,,,,n,`,h,,n,`,h,,n,`,h,,`,`,`,,n,`,h,,n,`,h,,n,`,h
-,,,,`,~,`,,`,~,`,,`,~,`,,`,s,`,,`,~,`,,`,~,`,,`,~,`
-,,,,n,`,f,,n,`,f,,n,`,f,,`,`,`,,n,`,f,,n,`,f,,n,`,f
-,,,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,s,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d
-,,,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h
-,,,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`
-,,,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f
diff --git a/data/blueprints/library/pump_stack.csv b/data/blueprints/library/pump_stack.csv
deleted file mode 100644
index 6bd129308..000000000
--- a/data/blueprints/library/pump_stack.csv
+++ /dev/null
@@ -1,58 +0,0 @@
-#notes label(help)
-A pump stack is useful for moving water or magma up through the z-levels.
-""
-"These blueprints can be used from the quickfort commandline, but are much easier to use with the visual interface. That way you can check the vertical path interactively before you apply. Run gui/quickfort pump_stack"
-""
-"1) Select the ""dig"" blueprint and position the blueprint preview on the bottom level of the future pump stack. It should be on the z-level just above the liquid you want to pump."
-""
-"2) Enable repetitions with the ""R"" hotkey and lock the blueprint in place with the ""L"" hotkey. Move up the z-levels to check that the pump stack has a clear path and doesn't intersect with any open areas (e.g. caverns). Increase the number of repetitions with the ""+"" or ""*"" hotkeys if you need the pump stack to extend further up. Unlock the blueprint and shift it around if you need to, then lock it again to recheck the vertical path."
-""
-"3) If you need to flip the pump stack around to make it fit through the rock layers, enable transformations with the ""t"" hotkey and rotate/flip the blueprint with Ctrl+arrow keys."
-""
-"4) Once you have everything lined up, hit Enter to apply. If the height ends up being one too many at the top, manually undesignate the top level."
-""
-"5) Since you do not need to transmit power down below the lowest level, replace the channel designation on the middle tile of the bottom-most pump stack level with a regular dig designation. Likewise, replace the Up/Down staircase designation on the lowest level with an Up staircase designation. Otherwise you might get magma critters climbing up through your access stairway!"
-""
-"6) After the stack is dug out, prepare for building by setting the buildingplan plugin material filters for screw pumps (b-M-s-M). If you are planning to move magma, be sure to select magma-safe materials (like green glass) for all three components of the screw pump."
-""
-"7) Finally, position the cursor back on the access stairs on the lowest level and run the ""build"" blueprint with the same repetition and transformation settings that you used for the ""dig"" blueprint. As you manufacture the materials you need to construct the screw pumps, your dwarves will build the pump stack from the bottom up."
-""
-"Sometimes, a screw pump will spontaneously deconstruct while you are building the stack. This will reduce the efficiency of the stack a little, but it's nothing to worry about. Just re-run the ""build"" blueprint over the entire stack to ""fix up"" any broken pieces. The blueprint will harmlessly skip over any correctly-built screw pumps."
-""
-See the wiki for more info on pump stacks: https://dwarffortresswiki.org/index.php/Screw_pump#Pump_stack
-#dig label(digSN) start(2;4;on access stairs) hidden() for a pump from south level
-
-,,,d
-,,,h
-,i,d,d
-,,,h
-
-#dig label(digNS) start(2;4;on access stairs) hidden() for a pump from north level
-
-,,,h
-,d,d,d
-,i,,h
-,,,d
-
-#meta label(dig) start(at the bottom level on the access stairs) 2 levels of pump stack - bottom level pumps from the south
-/digSN
-#<
-/digNS
-#build label(buildSN) start(2;4;on access stairs) hidden() for a pump from south level
-
-,,,`
-,,,~
-,`,`,Msm
-,,,`
-
-#build label(buildNS) start(2;4;on access stairs) hidden() for a pump from north level
-
-,,,`
-,`,`,~
-,`,,Msu
-,,,`
-
-#meta label(build) start(at the bottom level on the access stairs) 2 levels of pump stack - bottom level pumps from the south
-/buildSN
-#<
-/buildNS
diff --git a/data/blueprints/pump_stack.csv b/data/blueprints/pump_stack.csv
new file mode 100644
index 000000000..bf6d4c25d
--- /dev/null
+++ b/data/blueprints/pump_stack.csv
@@ -0,0 +1,80 @@
+#notes label(help)
+A pump stack is useful for moving water or magma up through the z-levels.
+""
+"1) Select the ""/dig"" blueprint and position the blueprint preview on the bottom level of the future pump stack. It should be on the z-level just above the liquid you want to pump."
+""
+"2) Enable repetitions with the ""r"" hotkey (ensure you're repeating Up z-levels, not Down) and lock the blueprint in place with the ""L"" hotkey. Move up the z-levels to check that the pump stack has a clear path and doesn't intersect with any open areas (e.g. caverns). Increase the number of repetitions with the ""+"" or ""*"" hotkeys if you need the pump stack to extend further up. Unlock the blueprint and shift it around if you need to, then lock it again to recheck the vertical path."
+""
+"3) If you need to flip the pump stack around to make it fit through the rock layers, enable transformations with the ""t"" hotkey and rotate/flip the blueprint as necessary."
+""
+"4) Once you have everything lined up, hit Enter to apply. If the height ends up being one too many at the top, manually undesignate the top level."
+""
+"5) Since the bottom up/down staircase is a liability, erase the Up/Down staircase designation on the lowest level and replace it with an Up staircase designation. Otherwise you might get magma critters climbing up through your access stairway!"
+""
+"6) After the stack is dug out, haul away (or dump) any stones that are in the way of building the pumps."
+""
+"7) Load up the ""/channel"" blueprint and apply it with the same repetition and transformation settings that you used for the ""/dig"" blueprint. Unless you have restarted DF, gui/quickfort will have saved your settings."
+""
+"8) Since you do not need to transmit power down below the lowest level, erase the channel designation on the middle tile of the bottom-most pump stack level."
+""
+"9) After the channels are dug, prepare for building by setting the buildingplan plugin material filters for screw pumps. If you are planning to move magma, be sure to select magma-safe materials (like green glass) for all three components of the screw pump."
+""
+"10) Finally, generate orders for (the ""o"" hotkey) and run the ""/build"" blueprint with the same repetition and transformation settings that you used for the other blueprints. As you manufacture the materials you need to construct the screw pumps, your dwarves will build the pump stack from the bottom up, ensuring each new screw pump is properly supported by the one below."
+""
+"If your dwarves end up building the pumps out of order, a section of the stack may spontaneously deconstruct. This will reduce the efficiency of the stack a little, but it's nothing to worry about. Just re-run the ""/build"" blueprint over the entire stack to ""fix up"" any broken pieces. The blueprint will harmlessly skip over any correctly-built screw pumps."
+""
+See the wiki for more info on pump stacks: https://dwarffortresswiki.org/index.php/Screw_pump#Pump_stack
+#dig label(digSN) start(2;4;on access stairs) hidden() for a pump from south level
+
+,,,d
+,,,d
+,i,d,d
+,,,d
+
+#dig label(digNS) start(2;4;on access stairs) hidden() for a pump from north level
+
+,,,d
+,d,d,d
+,i,,d
+,,,d
+
+#meta label(dig) start(at the bottom level on the access stairs) 2 levels of pump stack - bottom level pumps from the south
+/digSN
+#<
+/digNS
+#dig label(channelSN) start(2;4;on access stairs) hidden() for a pump from south level
+
+,,,`
+,,,h
+,~,`,`
+,,,h
+
+#dig label(channelNS) start(2;4;on access stairs) hidden() for a pump from north level
+
+,,,h
+,`,`,`
+,~,,h
+,,,`
+
+#meta label(channel) start(at the bottom level on the access stairs) 2 levels of pump stack - bottom level pumps from the south
+/channelSN
+#<
+/channelNS
+#build label(buildSN) start(2;4;on access stairs) hidden() for a pump from south level
+
+,,,`
+,,,~
+,`,`,Msm
+,,,`
+
+#build label(buildNS) start(2;4;on access stairs) hidden() for a pump from north level
+
+,,,`
+,`,`,~
+,`,,Msu
+,,,`
+
+#meta label(build) start(at the bottom level on the access stairs) 2 levels of pump stack - bottom level pumps from the south
+/buildSN
+#<
+/buildNS
diff --git a/data/blueprints/library/quickfortress.csv b/data/blueprints/quickfortress.csv
similarity index 100%
rename from data/blueprints/library/quickfortress.csv
rename to data/blueprints/quickfortress.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/gui_quantum-2-build.csv b/data/blueprints/test/ecosystem/golden/gui_quantum-2-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/gui_quantum-2-build.csv
rename to data/blueprints/test/ecosystem/golden/gui_quantum-2-build.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/gui_quantum-3-place.csv b/data/blueprints/test/ecosystem/golden/gui_quantum-3-place.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/gui_quantum-3-place.csv
rename to data/blueprints/test/ecosystem/golden/gui_quantum-3-place.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv b/data/blueprints/test/ecosystem/golden/gui_quantum-4-query.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv
rename to data/blueprints/test/ecosystem/golden/gui_quantum-4-query.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/meta-1-dig.csv b/data/blueprints/test/ecosystem/golden/meta-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/meta-1-dig.csv
rename to data/blueprints/test/ecosystem/golden/meta-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/tracks-2-carve.csv b/data/blueprints/test/ecosystem/golden/tracks-2-carve.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/tracks-2-carve.csv
rename to data/blueprints/test/ecosystem/golden/tracks-2-carve.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/transform-1-dig.csv b/data/blueprints/test/ecosystem/golden/transform-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/transform-1-dig.csv
rename to data/blueprints/test/ecosystem/golden/transform-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/transform-2-construct.csv b/data/blueprints/test/ecosystem/golden/transform-2-construct.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/transform-2-construct.csv
rename to data/blueprints/test/ecosystem/golden/transform-2-construct.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/transform-3-build.csv b/data/blueprints/test/ecosystem/golden/transform-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/transform-3-build.csv
rename to data/blueprints/test/ecosystem/golden/transform-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-1-dig.csv b/data/blueprints/test/ecosystem/in/basic-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-1-dig.csv
rename to data/blueprints/test/ecosystem/in/basic-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-2-carve.csv b/data/blueprints/test/ecosystem/in/basic-2-carve.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-2-carve.csv
rename to data/blueprints/test/ecosystem/in/basic-2-carve.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-3-build.csv b/data/blueprints/test/ecosystem/in/basic-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-3-build.csv
rename to data/blueprints/test/ecosystem/in/basic-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-4-place.csv b/data/blueprints/test/ecosystem/in/basic-4-place.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-4-place.csv
rename to data/blueprints/test/ecosystem/in/basic-4-place.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-5-zone.csv b/data/blueprints/test/ecosystem/in/basic-5-zone.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-5-zone.csv
rename to data/blueprints/test/ecosystem/in/basic-5-zone.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-spec.csv b/data/blueprints/test/ecosystem/in/basic-spec.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-spec.csv
rename to data/blueprints/test/ecosystem/in/basic-spec.csv
diff --git a/data/blueprints/library/test/ecosystem/in/buildings-1-dig.csv b/data/blueprints/test/ecosystem/in/buildings-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/buildings-1-dig.csv
rename to data/blueprints/test/ecosystem/in/buildings-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/buildings-2-construct.csv b/data/blueprints/test/ecosystem/in/buildings-2-construct.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/buildings-2-construct.csv
rename to data/blueprints/test/ecosystem/in/buildings-2-construct.csv
diff --git a/data/blueprints/library/test/ecosystem/in/buildings-3-build.csv b/data/blueprints/test/ecosystem/in/buildings-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/buildings-3-build.csv
rename to data/blueprints/test/ecosystem/in/buildings-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/buildings-spec.csv b/data/blueprints/test/ecosystem/in/buildings-spec.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/buildings-spec.csv
rename to data/blueprints/test/ecosystem/in/buildings-spec.csv
diff --git a/data/blueprints/library/test/ecosystem/in/fortifications-1-dig.csv b/data/blueprints/test/ecosystem/in/fortifications-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/fortifications-1-dig.csv
rename to data/blueprints/test/ecosystem/in/fortifications-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/fortifications-2-smooth.csv b/data/blueprints/test/ecosystem/in/fortifications-2-smooth.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/fortifications-2-smooth.csv
rename to data/blueprints/test/ecosystem/in/fortifications-2-smooth.csv
diff --git a/data/blueprints/library/test/ecosystem/in/fortifications-3-carve.csv b/data/blueprints/test/ecosystem/in/fortifications-3-carve.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/fortifications-3-carve.csv
rename to data/blueprints/test/ecosystem/in/fortifications-3-carve.csv
diff --git a/data/blueprints/library/test/ecosystem/in/fortifications-spec.csv b/data/blueprints/test/ecosystem/in/fortifications-spec.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/fortifications-spec.csv
rename to data/blueprints/test/ecosystem/in/fortifications-spec.csv
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-2-build.csv b/data/blueprints/test/ecosystem/in/gui_quantum-2-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/gui_quantum-2-build.csv
rename to data/blueprints/test/ecosystem/in/gui_quantum-2-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-3-place.csv b/data/blueprints/test/ecosystem/in/gui_quantum-3-place.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/gui_quantum-3-place.csv
rename to data/blueprints/test/ecosystem/in/gui_quantum-3-place.csv
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-4-query.csv b/data/blueprints/test/ecosystem/in/gui_quantum-4-query.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/gui_quantum-4-query.csv
rename to data/blueprints/test/ecosystem/in/gui_quantum-4-query.csv
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv b/data/blueprints/test/ecosystem/in/gui_quantum-spec.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv
rename to data/blueprints/test/ecosystem/in/gui_quantum-spec.csv
diff --git a/data/blueprints/library/test/ecosystem/in/meta-1-dig.csv b/data/blueprints/test/ecosystem/in/meta-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/meta-1-dig.csv
rename to data/blueprints/test/ecosystem/in/meta-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/meta-spec.csv b/data/blueprints/test/ecosystem/in/meta-spec.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/meta-spec.csv
rename to data/blueprints/test/ecosystem/in/meta-spec.csv
diff --git a/data/blueprints/library/test/ecosystem/in/stockpiles-2-place.csv b/data/blueprints/test/ecosystem/in/stockpiles-2-place.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/stockpiles-2-place.csv
rename to data/blueprints/test/ecosystem/in/stockpiles-2-place.csv
diff --git a/data/blueprints/library/test/ecosystem/in/stockpiles-spec.csv b/data/blueprints/test/ecosystem/in/stockpiles-spec.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/stockpiles-spec.csv
rename to data/blueprints/test/ecosystem/in/stockpiles-spec.csv
diff --git a/data/blueprints/library/test/ecosystem/in/tracks-1-dig.csv b/data/blueprints/test/ecosystem/in/tracks-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/tracks-1-dig.csv
rename to data/blueprints/test/ecosystem/in/tracks-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/tracks-2-carve.csv b/data/blueprints/test/ecosystem/in/tracks-2-carve.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/tracks-2-carve.csv
rename to data/blueprints/test/ecosystem/in/tracks-2-carve.csv
diff --git a/data/blueprints/library/test/ecosystem/in/tracks-3-build.csv b/data/blueprints/test/ecosystem/in/tracks-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/tracks-3-build.csv
rename to data/blueprints/test/ecosystem/in/tracks-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/tracks-spec.csv b/data/blueprints/test/ecosystem/in/tracks-spec.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/tracks-spec.csv
rename to data/blueprints/test/ecosystem/in/tracks-spec.csv
diff --git a/data/blueprints/library/test/ecosystem/in/transform-1-dig.csv b/data/blueprints/test/ecosystem/in/transform-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/transform-1-dig.csv
rename to data/blueprints/test/ecosystem/in/transform-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/transform-2-construct.csv b/data/blueprints/test/ecosystem/in/transform-2-construct.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/transform-2-construct.csv
rename to data/blueprints/test/ecosystem/in/transform-2-construct.csv
diff --git a/data/blueprints/library/test/ecosystem/in/transform-3-build.csv b/data/blueprints/test/ecosystem/in/transform-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/transform-3-build.csv
rename to data/blueprints/test/ecosystem/in/transform-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/transform-spec.csv b/data/blueprints/test/ecosystem/in/transform-spec.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/transform-spec.csv
rename to data/blueprints/test/ecosystem/in/transform-spec.csv
diff --git a/data/blueprints/library/test/ecosystem/in/zones-2-zone.csv b/data/blueprints/test/ecosystem/in/zones-2-zone.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/zones-2-zone.csv
rename to data/blueprints/test/ecosystem/in/zones-2-zone.csv
diff --git a/data/blueprints/library/test/ecosystem/in/zones-spec.csv b/data/blueprints/test/ecosystem/in/zones-spec.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/zones-spec.csv
rename to data/blueprints/test/ecosystem/in/zones-spec.csv
diff --git a/data/blueprints/library/test/quickfort/list/all_modes.csv b/data/blueprints/test/quickfort/list/all_modes.csv
similarity index 100%
rename from data/blueprints/library/test/quickfort/list/all_modes.csv
rename to data/blueprints/test/quickfort/list/all_modes.csv
diff --git a/data/blueprints/library/test/quickfort/list/all_modes_separate_sheets.xlsx b/data/blueprints/test/quickfort/list/all_modes_separate_sheets.xlsx
similarity index 100%
rename from data/blueprints/library/test/quickfort/list/all_modes_separate_sheets.xlsx
rename to data/blueprints/test/quickfort/list/all_modes_separate_sheets.xlsx
diff --git a/data/blueprints/library/test/quickfort/list/all_modes_single_sheet.xlsx b/data/blueprints/test/quickfort/list/all_modes_single_sheet.xlsx
similarity index 100%
rename from data/blueprints/library/test/quickfort/list/all_modes_single_sheet.xlsx
rename to data/blueprints/test/quickfort/list/all_modes_single_sheet.xlsx
diff --git a/data/blueprints/library/tombs/Mini_Saracen.csv b/data/blueprints/tombs/Mini_Saracen.csv
similarity index 100%
rename from data/blueprints/library/tombs/Mini_Saracen.csv
rename to data/blueprints/tombs/Mini_Saracen.csv
diff --git a/data/blueprints/library/tombs/The_Saracen_Crypts.csv b/data/blueprints/tombs/The_Saracen_Crypts.csv
similarity index 100%
rename from data/blueprints/library/tombs/The_Saracen_Crypts.csv
rename to data/blueprints/tombs/The_Saracen_Crypts.csv
diff --git a/data/dfhack-config/autonick.txt b/data/dfhack-config/autonick.txt
new file mode 100644
index 000000000..bdd40beed
--- /dev/null
+++ b/data/dfhack-config/autonick.txt
@@ -0,0 +1,1283 @@
+# autonick config file
+# every line in this file that is not empty and does
+# not start with "#" will be used as a nickname by the
+# autonick script.
+
+# nicknames can be multiple words
+Toady One
+Threetoe
+
+#Dwarven single  names  taken from Classic Fantasy works
+Balin
+Dwalin
+Fili
+Kili
+Gloin
+Oin
+Bifur
+Bofur
+Bombur
+Ori
+Gimli
+Thrain
+Thror
+Fundin
+Frerin
+Gror
+Ibun
+Khim
+Fimbrethil
+Floi
+Nali
+Thor
+Vili
+Regin
+Fafnir
+Brokkr
+Sindri
+Nordri
+Sudri
+Austri
+Doriath
+Thingol
+Eol
+Mim
+Telchar
+Narvi
+Gundabad
+Muhrak
+Skorri
+Draupnir
+Alaric
+Grimr
+Eitri
+Svidurr
+Thorgar
+Hrungnir
+Galar
+Skirni
+Hreinn
+Dori
+Hreimr
+Hreinir
+Hroaldr
+Groin
+Vestri
+Nori
+Durin
+Dvalin
+Eikinskjaldi
+Bafur
+Snorri
+Fimafeng
+Vitr
+Dvali
+Dain
+Nain
+Nipingr
+Hrodvitnir
+Sveinn
+Ivaldi
+Svein
+Sveinbjorn
+Havardr
+Haki
+Hakon
+Mouri
+Motsognir
+Eberk
+Thromar
+Kragar
+Borgar
+Throk
+Orvald
+Berric
+Rogar
+Urgen
+Morgrim
+Keldar
+Ingvar
+Frandar
+Grimsi
+Hrokur
+Orik
+Rundar
+Bjornar
+Throki
+Dworin
+Thranduil
+Faldar
+Galdor
+Thorkel
+Dorrin
+Borkan
+Gundrik
+Throkir
+Raldor
+Helgrim
+Throgar
+Borin
+Ragnir
+Orvar
+Skalf
+Baldir
+Fror
+Thorgil
+Ulfar
+Grimbold
+Faldur
+Varrin
+Dornir
+Halgrim
+Gundin
+Ulfgar
+Skalfar
+Yngvarr
+Kaldur
+Thrandar
+Keldin
+Rundin
+Skaldur
+Borgin
+Haldur
+Bjornulf
+Orkarn
+Ragnor
+Baldrick
+Thorlin
+Graldor
+Ulfrik
+Fornir
+Egil
+Grimnor
+Roldor
+Ulfgard
+Borgrim
+Faldrik
+Rognir
+Balfor
+Volmar
+Thormund
+Brynhild
+
+#Dwarven composite  names  taken from Classic Fantasy works
+Gorin Stonehammer
+Brundar Ironfoot
+Haldrek Battlebeard
+Orin Stonefist
+Frida Stormaxe
+Torvald Rockjaw
+Einar Blackforge
+Thorgar Granitebeard
+Ragnir Hammerhelm
+Hilda Ironbrow
+Grimnar Deepdelver
+Ulfrik Ironmane
+Freya Thunderstone
+Ragnar Firebeard
+Gunnar Ironpeak
+Astrid Ironheart
+Bjorn Steelbreaker
+Hrolf Thunderhammer
+Sigrun Stonebreaker
+Eirik Rockbeard
+Helga Frostbeard
+Skaldur Stormguard
+Agnar Stonehand
+Ingrid Mountainmace
+Hjalmar Blackstone
+Solveig Steelhelm
+Rurik Stonegrip
+Freyja Silveraxe
+Thordur Goldbeard
+Gudrun Ironfoot
+Vali Fireforge
+Thora Frostbeard
+Vargr Stoneborn
+Astrid Ironbrow
+Einar Blackstone
+Hilda Hammerheart
+Leif Ironshaper
+Thrain Stormbrow
+Sigrid Steelheart
+Haldor Boulderbreaker
+Ragnhild Strongarm
+Brynjar Ironmantle
+Sigrun Thunderbeard
+Valgard Steelbeard
+Gunnhild Stonefist
+Ingrid Ironrock
+Eirik Frostbane
+Helga Deepforge
+Skaldur Ironshield
+Agnar Stonemace
+Solveig Stormgrip
+Hjalmar Mountainheart
+Gudrun Firebeard
+Thora Thunderstrike
+Vargr Ironhand
+Freyja Stoneguard
+Thordur Blackstone
+Rurik Hammerbeard
+Solveig Ironbreaker
+Astrid Goldhand
+Einar Stormbrew
+Hilda Steelbeard
+Thrain Ironmane
+Sigrid Fireheart
+Haldor Thunderstone
+Ragnhild Ironfoot
+Brynjar Blackhelm
+Sigrun Frostbeard
+Valgard Stoneshield
+Gunnhild Ironheart
+Bjorn Deepdelver
+Ingrid Ironpeak
+Eirik Thunderhammer
+Gormund Stoneforge
+Eovar Broadshield
+Thrunir Hammerstone
+Brunhild Steelbraid
+Garrik Frostbeard
+Haldrek Ironhand
+Astrid Rockrider
+Dagmar Stonefury
+Borgar Thunderhelm
+Ingrid Ironstrike
+Rurik Blackmane
+Fjorn Stoneborn
+Siv Ironbreaker
+Gudrik Stormbeard
+Ulfgar Emberforge
+Eilif Silverstone
+Hilda Stormwarden
+Ormar Ironjaw
+Vali Steelshaper
+Eira Frostbeard
+Torgar Graniteheart
+Brunhild Firebrand
+Haldrek Ironmantle
+Solveig Rockbreaker
+Thrain Thunderaxe
+Brynjar Stoneclaw
+Asa Ironhide
+Grimnar Blackmane
+Ragnvald Hammerfall
+Gudbrand Ironhand
+Astrid Flamebeard
+Ormur Steelbender
+Hjalmar Rockjaw
+Inga Thunderheart
+Valgard Ironbeard
+Eirik Swiftstrike
+Sylvi Stoneguard
+Helge Hammerfist
+Jorunn Fireforge
+Solveig Ironroot
+Thora Stormbeard
+Baldur Stonemane
+Freydis Ironshaper
+Gunnvald Deepstone
+Bjorn Blackstone
+Ingrid Frostmane
+Agnar Steelhammer
+Thordur Ironbeard
+Ylva Goldhand
+Greta Firestone
+Rurik Rockhelm
+Gunnhild Ironsong
+Vali Steelgrip
+Brynhild Stormblade
+Astrid Ironmantle
+Einar Stoneshield
+Hilda Frostbeard
+Ormr Ironheart
+Inga Steelbreaker
+Ulfrik Thunderaxe
+Freyja Stonebeard
+Sigrun Frostfury
+Sylvi Blackmane
+Thorvald Ironhelm
+Eirik Stormstone
+Haldora Deepdelver
+Sigrid Steelshaper
+Gunnar Thunderheart
+Bjorn Ironbrow
+Ingrid Goldmantle
+Agnar Stormforge
+Solveig Ironclaw
+Thora Rockguard
+Grimur Emberstone
+Ragnhild Hammerstrike
+Vali Ironfist
+Brynjar Blackbraid
+Astrid Flameforge
+Einar Stonestorm
+Hilda Frostbane
+Ormur Ironhelm
+Inga Steelshaper
+Gudbrand Thunderbeard
+Freya Stonefist
+Gunnvald Stormmane
+Bjorn Ironhelm
+Ingrid Frostforge
+Agnar Steelgrip
+Thordur Ironhand
+Ylva Flameheart
+Greta Stonemane
+Rurik Ironroot
+Gunnhild Steelbeard
+Vali Thunderstrike
+Thorin Oakenshield
+Dain Ironfoot
+Gamil Zirak
+
+
+# animals
+Mouse
+Otter
+Snake
+Owl
+Bat
+Fox
+Mole
+Cat
+Badger
+Squirrel
+Kit
+Wren
+Jay
+Crow
+Raven
+Sparrow
+Platypus
+House Mouse
+Pangolin
+Funnel Web
+Weasel
+Meerkats
+Rat
+Ant
+Gopher
+Fennec
+Groundhog
+Aardvark
+Rabbit
+Olm
+Chipmunk
+Bilbie
+Vole
+Nile Croc
+Wombat
+Worm
+Gerbil
+Armodillo
+Thrinaxodon
+Binky
+Bandicoot
+Bettongs
+Potoroos
+Antechinus
+Jerboas
+Numbat
+
+# colours
+Flash
+Red
+Gray
+Blue
+Shadow
+Indigo
+Jade
+Silver
+Bistre
+Black
+Black bean
+Noir
+Charcoal
+Ebony
+Eerie
+Jet
+Licorice
+Midnight
+Night
+Onyx
+Space
+Raisin
+Rich
+Russ violet
+Smoky
+Aero
+Alice
+Argent Lue
+Azure
+Azul
+Baby blue
+Berkeley
+Bice
+Bleu
+Bondi
+Brandeis Byzant
+Cambridge
+Carolina
+Celestial
+Celtic
+Cerulean
+Chefchaouen
+Chrysler
+Cobalt
+Columbia
+Cornflower
+Delft
+Denim
+Dodger
+Duke
+Federal
+Electrindigo
+Eclipse
+Illini
+Klein
+Jordy
+Lapis Lazuli
+Majorelle
+Marian
+Maya
+Slate
+Munsell
+Navy
+Neon blue
+Oxford
+Palatinate
+Penn
+Periwinkle
+Phthalo
+Picton
+Poly
+Powder
+Prussia
+Royal
+Ruddy
+Honolulu
+Savoy
+Silver Lake
+Space cadet
+Steel
+Tang
+Tufts
+Ultramarine
+Uranian
+Vista
+Yale
+Zaffre
+Auburn
+Almond
+Beaver
+Beige
+Bole
+Bone
+Bronze
+Sienna
+Umber
+Camel
+Caput mortuum
+Caramel
+Chamoisee
+Chestnut
+Chocolate
+Citron
+Cocoa
+Coffee
+Copper
+Coyote
+Desert
+Drab
+Dun
+Earth
+Fallow
+Fawn
+Field
+Fulvous
+Goldenrod
+Harvest
+Khaki
+Kobicha
+Lion
+Liver
+Mahogany
+Maroon
+Ochre
+Redwood
+Rufous
+Russet
+Rust
+Sand
+Satin
+Sheen
+Seal
+Sepia
+Sinopia
+Tan
+Tawny
+Van Dyke
+Walnut
+Wenge
+Aqua
+Aquamarine
+Capri
+Caribbean
+Celeste
+Cyprus
+Fluorescent
+Jungle
+Keppel
+Ice
+Sea
+Myrtle
+Pacific
+Robin
+Skobeloff
+Teal
+Verdigris
+Vivid
+Zomp
+Platinum
+Timberwolf
+Rose quartz
+Cinereous
+Cadet
+Cool
+Davys
+Paynes
+Glaucous
+Gunmetal
+Feldgrau
+Asparagus
+Avocado
+Brunswick
+Cal Poly
+Castleton
+Celadon
+Chartreuse
+Moss
+Pastel
+Dartmouth
+Emerald
+Fern
+Forest
+Harlequin
+Honeydew
+Hunter
+Kelly green
+Lawn
+Malachite
+Mantis
+Neon
+Olivine
+Paris
+Pear
+Pigment
+Pistachio
+Reseda
+Rifle
+Sage
+Screamin'
+Shamrock
+Bud
+Amaranth
+Baker-Miller
+Cerise
+Carmine
+Magenta
+Eggplant
+Fandango
+Finn
+Fuchsia
+Haze
+Plum
+Pizzazz
+Quinacridone
+Razzle dazzle
+Rose
+Shocking
+Telemagenta
+Aerospace
+Alloy
+Amber
+Atomic
+Tangerine
+Burnt
+Butterscotch
+Carrot
+Champagne
+Coral
+Flame
+Gold
+Hunyadi
+Melon
+Peel
+Papaya
+Peach
+Persimmon
+Princeton
+Pumpkin
+Safety orange
+Saffron
+Tangelo
+Tigers Eye
+Titian
+Xanthous
+Blush
+Brilliant
+Brink
+Carnation
+Cherry
+Cyclamen
+Dogwood
+Hollywood
+Hot
+Lavender
+Mimi
+Misty
+Mountbatten
+Orchid
+Phlox
+Pompadour
+Puce
+Raspberry
+Razzmatazz
+Bonbon
+Quartz
+Taupe
+Vale
+Rosewood
+Rosy
+Salmon
+Tea
+Tickle
+Thulian
+Ultra
+Burgundy
+Byzantium
+Eminence
+Grape
+Iris
+Mardi Gras
+Mauve
+Mauveine
+Mulberry
+Murrey
+Pale
+Pomp
+Power
+Purpureus
+Tekhelet
+Thistle
+Tropical
+Tyrian
+Wisteria
+Barn
+Bittersweet
+Shimmer
+Blood
+Candy apple
+Cantaloupe
+Cardinal
+Chili
+Cosmos
+Cinnabar
+Claret
+Coquelicot
+Cordovan
+Cornell
+Crimson
+Falu
+Brick
+Engine
+Folly
+Imperial
+Jaspar
+Poppy
+Rojo
+Rusty
+Scarlet
+Syracuse
+Tomato
+Turkey
+Vermilion
+Wine
+Alabaster
+Antique
+Cornsilk
+Latte
+Cream
+Eggshell
+Flax
+Floral
+Ghost
+Isabelline
+Ivory
+Lemon
+chiffon
+Linen
+Navajo
+Nyanza
+Lace
+Parchment
+Pearl
+Seasalt
+Seashell
+Vanilla
+Smoke
+Apricot
+Arylide
+Aureolin
+Buff
+Canary
+Ecru
+Gamboge
+Icterine
+Jonquil
+Maize
+Mikado
+Mindaro
+Mustard
+Selective
+Stil de grain
+Straw
+Sunglow
+Sunset
+Wheat
+
+# planets
+Mars
+Jupiter
+Saturn
+Pluto
+Neptune
+Europa
+
+# charites
+Damia
+Auxesia
+Cleta
+Phaenna
+Hegemone
+Peitho
+Paregoros
+Pasithea
+Charis
+Kale
+Antheia
+Eudaimonia
+Euthymia
+Eutychia
+Paidia
+Pandaisia
+Pannychis
+Aglaea
+Euphrosyne
+Thalia
+
+# nature
+Blaze
+River
+Snow
+Bones
+Rain
+Reed
+Lake
+Briar
+Brook
+Sky
+Storm
+Clay
+Ember
+Marsh
+Star
+
+# trees
+Ash
+Oak
+Rowan
+Aspen
+Alder
+Apple
+Beech
+Birch
+Box
+Cedar
+Cypress
+Elder
+Elm
+Larch
+Fir
+Juniper
+Lime
+Pine
+Poplar
+Spruce
+Yew
+
+# seasons
+Spring
+Summer
+Autumn
+Winter
+
+# cardinals
+North
+South
+East
+West
+
+# other
+Ink
+Echo
+Mint
+Mel
+X
+Sam
+Tango
+Gadget
+Brum
+Wall
+Beam
+Ud
+Tal
+Ren
+Aki
+Jun
+Kei
+Lynn
+Lex
+Cid
+Miles
+Rotor
+Mesa
+Verse
+
+# from the "300 list"
+Aiden
+Arden
+Auden
+August
+Avery
+Avis
+Bay
+Blake
+Erin
+Ezra
+Kai
+Lane
+Leah
+Noel
+Pat
+Ray
+Remi
+Roan
+Robyn
+Salem
+Sean
+Tate
+Tobin
+Tori
+True
+Val
+Wilder
+Wisdom
+Wyatt
+Zephyr
+
+# Gemstones
+Actinolite
+Nephrite
+Adamite
+Aegirine
+Afghanite
+Agrellite
+Algodonite
+Alunite
+Amblygonite
+Analcime
+Anatase
+Andalusite
+Chiastolite
+Anglesite
+Anhydrite
+Annabergite
+Anorthite
+Antigorite
+Bowenite
+Apatite
+Apophyllite
+Aragonite
+Asbestos
+Astrophyllite
+Augelite
+Austinite
+Ferro
+Magnes
+Mangan
+Tinzenite
+Azurmalachite
+Azurite
+Baryte
+Bast
+Bayldonite
+Benitoite
+Beryl
+Maxixe
+Goshenite
+Golden beryl
+Heliodor
+Morganite
+Red beryl
+Beryllonite
+Beudantite
+Bismutot
+Biotit
+Boracite
+Bornite
+Brazilianite
+Brookite
+Brucite
+Bustam
+Bytown
+Calcite
+Caledonite
+Canasite
+Cancrin
+Vishnev
+Carleton
+Carnall
+Cassiterite
+Cataplei
+Cavans
+Celestite
+Ceruleite
+Cerussite
+Chalcopyr
+Chambers
+Charlesite
+Charoite
+Childrenite
+Chiolite
+Chrysoberyl
+Alexandrite
+Cymophane
+Chromite
+Chrysocolla
+Clinochlore
+Clinohumite
+Clintonite
+Cobaltite
+Coleman
+Cordierite
+Iolite
+Cornwallite
+Corundum
+Ruby
+Sapphire
+Padparadscha
+Covell
+Creedite
+Crocite
+Cuprite
+Danburite
+Datolite
+Descloiz
+Diamond
+Bort
+Ballas
+Diaspore
+Dickinsonite
+Diopside
+Dioptase
+Dolomite
+Dumortier
+Ekanite
+Trapiche
+Enstatite
+Bronzite
+Hypersthene
+Eosphorite
+Epidote
+Piemont
+Erythrite
+Esperite
+Ettring
+Eudialyte
+Faya
+Feldspar
+Andesine
+Albite
+Anorth
+Anorthoc
+Amazon
+Celsian
+Microcline
+Moonstone
+Adularia
+Rainbow
+Ortho
+Kite
+Plagioclase
+Labradorite
+Oligoclase
+Sunstone
+Oregon Sunstone
+Rainbow Lattice
+Fergusonite
+Ferroaxin
+Fluora
+Fluorapophyl
+Fluorite
+Forster
+Friedelite
+Gadolin
+Gahnite
+Gahnospinel
+Garnet
+Pyralspite
+Almandine
+Spessartine
+Ugrand
+Demantoid
+Melanite
+Topazolita
+Grossular
+Hessonite
+Hydrogrossular
+Tsavorite
+Pyrope
+Rhodolite
+Mali garnet
+Malaia
+Umbal
+Gaspe
+Gayluss
+Gibbsite
+Glaucophane
+Goeth
+Goosecreek
+Grandidier
+Gypsum
+Gyro
+Halite
+Hambergite
+Hanksite
+Hardystonite
+Helenite
+Hematite
+Herder
+Hexagonite
+Hibonite
+Hidden
+Hodgkinsonite
+Holtite
+Howlite
+Huebnerite
+Humite
+Hurlbut
+Ilmenite
+Inderite
+Jadeite
+Jasper
+Jeremejevite
+Kainite
+Kämmerer
+Kaolin
+Kornerup
+Kurnakov
+Kyanite
+Langbein
+Lawsonite
+Lazulite
+Lazurite
+Legrandite
+Lepidolite
+Leucite
+Leucophan
+Linarite
+Lizardite
+Londonite
+Ludlamite
+Ludwigite
+Maria-meionite
+Werner
+Marcasite
+Meliphanite
+Mellite
+Mesolite
+Milar
+Millerite
+Mime
+Monazite
+Mordenite
+Mottram
+Muscovite
+Fuchsite
+Nambul
+Natrolite
+Nepheline
+Neptunite
+Nickeline
+Niccolite
+Nosean
+Nuumm
+Opal
+Fire opal
+Moss opal
+Painite
+Papagoite
+Pargas
+Parisite
+Pectol
+Larimar
+Pentland
+Periclase
+Perthite
+Petal
+Castor
+Pezzottaite
+Phena
+Phosgen
+Phospho
+Piemontite
+Realgar
+Rhodizite
+Rhodochros
+Rhodon
+Richter
+Riebeck
+Crocidolite
+Rosasite
+Rutile
+Samarskite
+Sanidine
+Sapphirine
+Sarcol
+Scapol
+Marialite
+Meionite
+Scheel
+Schizol
+Scorod
+Selenite
+Sella
+Senarmon
+Sepio
+Meerschaum
+Sérandite
+Seraph
+Serendibite
+Serpentine
+Bowen
+Stich
+Shattuck
+Shiga
+Shortite
+Shung
+Siderite
+Silliman
+Simpsonite
+Sinhal
+Smalt
+Smithsonite
+Sodalite
+Hackman
+Sogdian
+Sperry
+Spessar
+Sphaler
+Spinel
+Ceylon
+Spodumene
+Triphane
+Spurrite
+Stauro
+Strontian
+Titanate
+Sulfur
+Bustamite
+Sylvite
+Taaffeita
+Talc
+Tantalite
+Tektites
+Tephroite
+Thomsonite
+Thaumasite
+Topaz
+Tourmaline
+Achroite
+Chrome
+Dravite
+Elbaite
+Indicol
+Olenite
+Paraiba
+Rossman
+Rubellite
+Tremol
+Triphyl
+Triplite
+Tugtup
+Turquoise
+Ulex
+Ussing
+Vanadinite
+Variscite
+Vesuvianite
+Californite
+Villiaum
+Vivianite
+Vlasov
+Wardite
+Wavell
+Welogan
+Whewell
+Wilkeite
+Willemite
+Wither
+Wollastone
+Wulfenite
+Wurtzite
+Xonot
+Yugawara
+Zektzer
+Zeolites
+Chabaz
+Steller
+Stilbite
+Zinc
+Zinnwald
+Zircon
+Jacinth
+Zoisite
+Tanzan
+Thulite
+Zultan
+Zany
+Lapis lazuli
+Desert glass
+Llanite
+Maw sit-sit
+Obsidian
+Tears
+Pallas
+Peridot
+Soapstone
+Tact
+Unakite
+Bauxite
+Concretions
+Bloodstone
+Heliotrope
+Eilat stone
+Epidos
+Glimmer
+Goldstone
+Hawks eye
+Iddings
+Lampro
diff --git a/data/blueprints/README.md b/data/dfhack-config/blueprints/README.md
similarity index 100%
rename from data/blueprints/README.md
rename to data/dfhack-config/blueprints/README.md
diff --git a/data/dfhack-config/buildingplan.json b/data/dfhack-config/buildingplan.json
new file mode 100644
index 000000000..9bb3052b7
--- /dev/null
+++ b/data/dfhack-config/buildingplan.json
@@ -0,0 +1,5 @@
+{
+	"planner": {
+		"minimized": true
+	}
+}
\ No newline at end of file
diff --git a/dfhack-config/dfstatus.lua b/data/dfhack-config/dfstatus.lua
similarity index 100%
rename from dfhack-config/dfstatus.lua
rename to data/dfhack-config/dfstatus.lua
diff --git a/dfhack-config/dwarfmonitor.json b/data/dfhack-config/dwarfmonitor.json
similarity index 100%
rename from dfhack-config/dwarfmonitor.json
rename to data/dfhack-config/dwarfmonitor.json
diff --git a/dfhack-config/init/default.dfhack.init b/data/dfhack-config/init/default.dfhack.init
similarity index 100%
rename from dfhack-config/init/default.dfhack.init
rename to data/dfhack-config/init/default.dfhack.init
diff --git a/dfhack-config/init/default.onLoad.init b/data/dfhack-config/init/default.onLoad.init
similarity index 100%
rename from dfhack-config/init/default.onLoad.init
rename to data/dfhack-config/init/default.onLoad.init
diff --git a/dfhack-config/init/default.onMapLoad.init b/data/dfhack-config/init/default.onMapLoad.init
similarity index 100%
rename from dfhack-config/init/default.onMapLoad.init
rename to data/dfhack-config/init/default.onMapLoad.init
diff --git a/dfhack-config/init/default.onMapUnload.init b/data/dfhack-config/init/default.onMapUnload.init
similarity index 100%
rename from dfhack-config/init/default.onMapUnload.init
rename to data/dfhack-config/init/default.onMapUnload.init
diff --git a/dfhack-config/init/default.onUnload.init b/data/dfhack-config/init/default.onUnload.init
similarity index 100%
rename from dfhack-config/init/default.onUnload.init
rename to data/dfhack-config/init/default.onUnload.init
diff --git a/data/dfhack-config/init/dfhack.control-panel-system.init b/data/dfhack-config/init/dfhack.control-panel-system.init
new file mode 100644
index 000000000..c1ad6a679
--- /dev/null
+++ b/data/dfhack-config/init/dfhack.control-panel-system.init
@@ -0,0 +1,5 @@
+# DO NOT EDIT THIS FILE
+# Please use gui/control-panel to edit this file
+
+enable faststart
+enable work-now
diff --git a/dfhack-config/init/dfhack.init b/data/dfhack-config/init/dfhack.init
similarity index 100%
rename from dfhack-config/init/dfhack.init
rename to data/dfhack-config/init/dfhack.init
diff --git a/dfhack-config/init/onLoad.init b/data/dfhack-config/init/onLoad.init
similarity index 100%
rename from dfhack-config/init/onLoad.init
rename to data/dfhack-config/init/onLoad.init
diff --git a/data/dfhack-config/init/onMapLoad.control-panel-new-fort.init b/data/dfhack-config/init/onMapLoad.control-panel-new-fort.init
new file mode 100644
index 000000000..66a07d14f
--- /dev/null
+++ b/data/dfhack-config/init/onMapLoad.control-panel-new-fort.init
@@ -0,0 +1,4 @@
+# DO NOT EDIT THIS FILE
+# Please use gui/control-panel to edit this file
+
+on-new-fortress enable fix/protect-nicks
diff --git a/data/dfhack-config/init/onMapLoad.control-panel-repeats.init b/data/dfhack-config/init/onMapLoad.control-panel-repeats.init
new file mode 100644
index 000000000..cbed00b67
--- /dev/null
+++ b/data/dfhack-config/init/onMapLoad.control-panel-repeats.init
@@ -0,0 +1,5 @@
+# DO NOT EDIT THIS FILE
+# Please use gui/control-panel to edit this file
+
+repeat --name general-strike --time 1 --timeUnits days --command [ fix/general-strike -q ]
+repeat --name warn-starving --time 10 --timeUnits days --command [ warn-starving ]
diff --git a/dfhack-config/init/onMapLoad.init b/data/dfhack-config/init/onMapLoad.init
similarity index 100%
rename from dfhack-config/init/onMapLoad.init
rename to data/dfhack-config/init/onMapLoad.init
diff --git a/dfhack-config/init/onMapUnload.init b/data/dfhack-config/init/onMapUnload.init
similarity index 100%
rename from dfhack-config/init/onMapUnload.init
rename to data/dfhack-config/init/onMapUnload.init
diff --git a/dfhack-config/init/onUnload.init b/data/dfhack-config/init/onUnload.init
similarity index 100%
rename from dfhack-config/init/onUnload.init
rename to data/dfhack-config/init/onUnload.init
diff --git a/dfhack-config/script-paths.txt b/data/dfhack-config/script-paths.txt
similarity index 100%
rename from dfhack-config/script-paths.txt
rename to data/dfhack-config/script-paths.txt
diff --git a/dfhack-config/scripts/README.md b/data/dfhack-config/scripts/README.md
similarity index 100%
rename from dfhack-config/scripts/README.md
rename to data/dfhack-config/scripts/README.md
diff --git a/data/dfhack-config/stockpiles/README.md b/data/dfhack-config/stockpiles/README.md
new file mode 100644
index 000000000..593d45fb6
--- /dev/null
+++ b/data/dfhack-config/stockpiles/README.md
@@ -0,0 +1,5 @@
+This folder contains stockpile settings that can be applied by `stockpiles` and
+`quickfort` tools. For more information, see:
+
+* [stockpiles documentation](https://docs.dfhack.org/en/latest/docs/tools/stockpiles.html)
+* [quickfort documentation](https://docs.dfhack.org/en/latest/docs/guides/quickfort-user-guide.html)
diff --git a/data/examples/README.md b/data/examples/README.md
deleted file mode 100644
index fb2b8e3a1..000000000
--- a/data/examples/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# The DFHack Example Configuration File Library
-
-This folder contains ready-to-use examples of various DFHack configuration
-files. You can use them by copying them to appropriate folders where DFHack
-and its plugins can find them. You can use them unmodified, or you can
-customize them to better suit your preferences.
-
-For information on each of the files in this library, see the
-[DFHack Example Configuration File Guide](https://docs.dfhack.org/en/stable/docs/guides/examples-guide.html).
diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init
deleted file mode 100644
index 8f341cf7e..000000000
--- a/data/examples/init/onMapLoad_dreamfort.init
+++ /dev/null
@@ -1,79 +0,0 @@
-# This dfhack config file automates common tasks for your forts.
-# It was written for the Dreamfort set of quickfort blueprints, but the
-# configuration here is useful for any fort! Copy this file to your
-# dfhack-config/init directory to use. Feed free to edit or override
-# to your liking.
-
-# Uncomment this next line if you want buildingplan (and quickfort) to use only
-# blocks (not bars or logs) for constructions and workshops. If you do
-# uncomment, be sure to bring some blocks with you for starting workshops!
-#on-new-fortress buildingplan set boulders false; buildingplan set logs false
-
-# Disable cooking of useful item types when you start a new fortress.
-on-new-fortress ban-cooking tallow; ban-cooking honey; ban-cooking oil; ban-cooking seeds; ban-cooking brew; ban-cooking fruit; ban-cooking mill; ban-cooking thread; ban-cooking milk; ban-cooking booze
-
-# Show a warning dialog when units are starving
-repeat -name warn-starving -time 10 -timeUnits days -command [ warn-starving ]
-
-# Force dwarves to drop tattered clothing instead of clinging to the scraps
-repeat -name cleanowned -time 1 -timeUnits months -command [ cleanowned X ]
-
-# Automatically enqueue orders to shear and milk animals
-repeat -name autoShearCreature -time 14 -timeUnits days -command [ workorder ShearCreature ]
-repeat -name autoMilkCreature -time 14 -timeUnits days -command [ workorder "{\"job\":\"MilkCreature\",\"item_conditions\":[{\"condition\":\"AtLeast\",\"value\":2,\"flags\":[\"empty\"],\"item_type\":\"BUCKET\"}]}" ]
-
-# Fulfill high-volume orders before slower once-daily orders
-repeat -name orders-sort -time 1 -timeUnits days -command [ orders sort ]
-
-# Don't let caravans bring barrels of blood and other useless liquids
-fix/blood-del
-
-# Manages crop assignment for farm plots
-enable autofarm
-autofarm default 30
-autofarm threshold 150 GRASS_TAIL_PIG
-
-# allows you to configure a stockpile to automatically mark items for melting
-enable automelt
-
-# creates manager orders to produce replacements for worn clothing
-enable tailor
-
-# auto-assigns nesting birds to nestbox zones and protects fertile eggs from
-# being cooked/eaten
-enable zone autonestbox nestboxes
-
-# manages seed stocks
-enable seedwatch
-seedwatch all 30
-
-# ensures important tasks get assigned to workers.
-# otherwise many job types can get ignored in busy forts.
-on-new-fortress prioritize -aq defaults
-
-# autobutcher settings are saved in the savegame, so we only need to set them once.
-# this way, any custom settings you set during gameplay are not overwritten
-#
-# feel free to change this to "target 0 0 0 0" if you don't expect to want to raise
-# any animals not listed here -- you can always change it anytime during the game
-# later if you change your mind.
-on-new-fortress enable autobutcher
-on-new-fortress autobutcher target 2 2 2 2 new
-# dogs and cats. You should raise the limits for dogs if you will be training them
-# for hunting or war.
-on-new-fortress autobutcher target 2 2 2 2 DOG
-on-new-fortress autobutcher target 1 1 2 2 CAT
-# geese are our primary source of bones and leather. let the younglings grow up
-# before we butcher so we get adult-scale products from them. BIRD_PEAFOWL_BLUE,
-# BIRD_CHICKEN, and BIRD_TURKEY are also viable. feel free to change this to
-# your bird of choice.
-on-new-fortress autobutcher target 50 50 14 2 BIRD_GOOSE
-# alpaca, sheep, and llamas give wool. we need to keep these numbers low, though, or
-# else risk running out of grass for grazing.
-on-new-fortress autobutcher target 2 2 4 2 ALPACA SHEEP LLAMA
-# pigs give milk and meat and are zero-maintenance.
-on-new-fortress autobutcher target 5 5 6 2 PIG
-# immediately butcher all unprofitable animals
-on-new-fortress autobutcher target 0 0 0 0 HORSE YAK DONKEY WATER_BUFFALO GOAT CAVY BIRD_DUCK BIRD_GUINEAFOWL
-# watch for new animals
-on-new-fortress autobutcher autowatch
diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
index c6620f492..ce4a8a490 100644
--- a/data/init/dfhack.keybindings.init
+++ b/data/init/dfhack.keybindings.init
@@ -16,39 +16,41 @@ keybinding add Ctrl-Shift-P "gui/launcher --minimal"
 # show hotkey popup menu
 keybinding add Ctrl-Shift-C hotkeys
 
+# control panel
+keybinding add Ctrl-Shift-E gui/control-panel
+
 # on-screen keyboard
 keybinding add Ctrl-Shift-K gui/cp437-table
 
-# an in-game init file editor
-#keybinding add Alt-S@title|dwarfmode/Default|dungeonmode gui/settings-manager
+# customizable quick command list
+keybinding add Ctrl-Shift-A gui/quickcmd
 
 
 ######################
 # dwarfmode bindings #
 ######################
 
-# quicksave, only in main dwarfmode screen and menu page
-#keybinding add Ctrl-Alt-S@dwarfmode/Default quicksave
-
-# toggle the display of water level as 1-7 tiles
-keybinding add Ctrl-W@dwarfmode|dungeonmode twaterlvl
+# quicksave
+keybinding add Ctrl-Alt-S@dwarfmode quicksave
 
 # designate the whole vein for digging
-#keybinding add Ctrl-V@dwarfmode digv
-#keybinding add Ctrl-Shift-V@dwarfmode "digv x"
+keybinding add Ctrl-V@dwarfmode digv
+keybinding add Ctrl-Shift-V@dwarfmode "digv x"
 
 # clean the selected tile of blood etc
-#keybinding add Ctrl-C spotclean
+keybinding add Ctrl-C@dwarfmode spotclean
 
 # destroy the selected item
-#keybinding add Ctrl-K@dwarfmode autodump-destroy-item
+keybinding add Ctrl-K@dwarfmode autodump-destroy-item
+
+# bring up the autodump UI
+keybinding add Ctrl-H@dwarfmode gui/autodump
 
-# destroy items designated for dump in the selected tile
-#keybinding add Ctrl-Shift-K@dwarfmode autodump-destroy-here
+# apply blueprints to the map
+keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort
 
-# apply blueprints to the map (Alt-F for compatibility with LNP Quickfort)
-#keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort
-#keybinding add Alt-F@dwarfmode gui/quickfort
+# toggle keyboard cursor
+keybinding add Alt-K@dwarfmode toggle-kbd-cursor
 
 # show information collected by dwarfmonitor
 #keybinding add Alt-M@dwarfmode/Default "dwarfmonitor prefs"
@@ -154,6 +156,10 @@ keybinding add Ctrl-W@dwarfmode|dungeonmode twaterlvl
 #keybinding add Ctrl-Shift-N@dwarfmode|unit|unitlist|joblist|dungeon_monsterstatus|layer_unit_relationship|item|workshop_profile|layer_noblelist|locations|pets|layer_overall_health|textviewer|reportlist|announcelist|layer_military|layer_unit_health|customize_unit|buildinglist gui/rename
 #keybinding add Ctrl-Shift-T@dwarfmode|unit|unitlist|joblist|dungeon_monsterstatus|layer_unit_relationship|item|workshop_profile|layer_noblelist|locations|pets|layer_overall_health|textviewer|reportlist|announcelist|layer_military|layer_unit_health|customize_unit "gui/rename unit-profession"
 
+# gui/design
+keybinding add Ctrl-D@dwarfmode/Default gui/design
+
+
 
 #####################
 # adv mode bindings #
diff --git a/data/init/dfhack.tools.init b/data/init/dfhack.tools.init
index a910a8e34..515c5535f 100644
--- a/data/init/dfhack.tools.init
+++ b/data/init/dfhack.tools.init
@@ -78,6 +78,13 @@
 # Display DFHack version on title screen
 #enable title-version
 
+# Enable system services
+enable buildingplan
+enable burrow
+enable confirm
+enable logistics
+enable overlay
+
 # Dwarf Manipulator (simple in-game Dwarf Therapist replacement)
 #enable manipulator
 
@@ -88,29 +95,17 @@
 #enable automaterial
 
 # Other interface improvement tools
-#enable \
-# overlay \
-# confirm \
 # dwarfmonitor \
 # mousequery \
 # autogems \
-# autodump \
-# automelt \
-# autotrade \
-# buildingplan \
-# trackstop \
 # zone \
 # stocks \
-# autochop \
-# stockpiles
+#
 #end a line with a backslash to make it continue to the next line. The \ is deleted for the final command.
 # Multiline commands are ONLY supported for scripts like dfhack.init. You cannot do multiline command manually on the DFHack console.
 # You cannot extend a commented line.
 # You can comment out the extension of a line.
 
-# enable mouse controls and sand indicator in embark screen
-#embark-tools enable sticky sand mouse
-
 # enable option to enter embark assistant
 #enable embark-assistant
 
@@ -129,3 +124,11 @@
 
 # a replacement for the "load game" screen
 #gui/load-screen enable
+
+###################
+# Default Aliases #
+###################
+
+alias add autounsuspend suspendmanager
+alias add gui/dig gui/design
+alias add version help
diff --git a/data/orders/basic.json b/data/orders/basic.json
index b3fae8dcd..8e271ba04 100644
--- a/data/orders/basic.json
+++ b/data/orders/basic.json
@@ -1,31 +1,9 @@
 [
-	{
-		"amount_left" : 150,
-		"amount_total" : 150,
-		"frequency" : "Monthly",
-		"id" : 0,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "LessThan",
-				"flags" : 
-				[
-					"unrotten"
-				],
-				"item_type" : "FOOD",
-				"value" : 400
-			}
-		],
-		"job" : "PrepareMeal",
-		"meal_ingredients" : 2
-	},
 	{
 		"amount_left" : 10,
 		"amount_total" : 10,
 		"frequency" : "Daily",
-		"id" : 1,
+		"id" : 0,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -47,7 +25,7 @@
 					"unrotten",
 					"cookable"
 				],
-				"value" : 500
+				"value" : 80
 			},
 			{
 				"condition" : "AtMost",
@@ -57,15 +35,6 @@
 				],
 				"item_type" : "FOOD",
 				"value" : 3500
-			},
-			{
-				"condition" : "AtLeast",
-				"flags" : 
-				[
-					"unrotten"
-				],
-				"item_type" : "FOOD",
-				"value" : 400
 			}
 		],
 		"job" : "PrepareMeal",
@@ -75,7 +44,7 @@
 		"amount_left" : 2,
 		"amount_total" : 2,
 		"frequency" : "Daily",
-		"id" : 2,
+		"id" : 1,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -112,7 +81,7 @@
 		"amount_left" : 2,
 		"amount_total" : 2,
 		"frequency" : "Daily",
-		"id" : 3,
+		"id" : 2,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -149,7 +118,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 4,
+		"id" : 3,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -170,7 +139,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 5,
+		"id" : 4,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -205,7 +174,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 6,
+		"id" : 5,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -237,7 +206,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 7,
+		"id" : 6,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -256,10 +225,9 @@
 				"condition" : "AtLeast",
 				"flags" : 
 				[
-					"empty",
-					"bag"
+					"empty"
 				],
-				"item_type" : "BOX",
+				"item_type" : "BAG",
 				"value" : 5
 			}
 		],
@@ -269,7 +237,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 8,
+		"id" : 7,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -291,7 +259,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 9,
+		"id" : 8,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -310,10 +278,9 @@
 				"condition" : "AtLeast",
 				"flags" : 
 				[
-					"empty",
-					"bag"
+					"empty"
 				],
-				"item_type" : "BOX",
+				"item_type" : "BAG",
 				"value" : 5
 			}
 		],
@@ -324,7 +291,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 10,
+		"id" : 9,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -355,7 +322,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 11,
+		"id" : 10,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -388,7 +355,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 12,
+		"id" : 11,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -428,7 +395,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 13,
+		"id" : 12,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -454,7 +421,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 14,
+		"id" : 13,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -489,7 +456,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 15,
+		"id" : 14,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -524,7 +491,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 16,
+		"id" : 15,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -559,7 +526,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 17,
+		"id" : 16,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -589,7 +556,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 18,
+		"id" : 17,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -620,6 +587,36 @@
 		"job" : "MakeTool",
 		"material" : "INORGANIC"
 	},
+	{
+		"amount_left" : 1,
+		"amount_total" : 1,
+		"frequency" : "Daily",
+		"id" : 18,
+		"is_active" : false,
+		"is_validated" : false,
+		"item_conditions" : 
+		[
+			{
+				"condition" : "AtLeast",
+				"item_type" : "WOOD",
+				"value" : 50
+			},
+			{
+				"condition" : "AtMost",
+				"flags" : 
+				[
+					"empty"
+				],
+				"item_type" : "BIN",
+				"value" : 5
+			}
+		],
+		"job" : "ConstructBin",
+		"material_category" : 
+		[
+			"wood"
+		]
+	},
 	{
 		"amount_left" : 1,
 		"amount_total" : 1,
@@ -725,6 +722,10 @@
 			},
 			{
 				"condition" : "AtMost",
+				"flags" : 
+				[
+					"empty"
+				],
 				"item_subtype" : "ITEM_TOOL_MINECART",
 				"item_type" : "TOOL",
 				"value" : 2
@@ -844,14 +845,13 @@
 				"condition" : "AtMost",
 				"flags" : 
 				[
-					"empty",
-					"sewn_imageless"
+					"empty"
 				],
-				"item_type" : "BOX",
+				"item_type" : "BAG",
 				"value" : 30
 			}
 		],
-		"job" : "ConstructChest",
+		"job" : "ConstructBag",
 		"material_category" : 
 		[
 			"leather"
@@ -880,14 +880,13 @@
 				"condition" : "AtMost",
 				"flags" : 
 				[
-					"empty",
-					"sewn_imageless"
+					"empty"
 				],
-				"item_type" : "BOX",
+				"item_type" : "BAG",
 				"value" : 30
 			}
 		],
-		"job" : "ConstructChest",
+		"job" : "ConstructBag",
 		"material_category" : 
 		[
 			"silk"
@@ -916,14 +915,13 @@
 				"condition" : "AtMost",
 				"flags" : 
 				[
-					"empty",
-					"sewn_imageless"
+					"empty"
 				],
-				"item_type" : "BOX",
+				"item_type" : "BAG",
 				"value" : 30
 			}
 		],
-		"job" : "ConstructChest",
+		"job" : "ConstructBag",
 		"material_category" : 
 		[
 			"cloth"
@@ -952,14 +950,13 @@
 				"condition" : "AtMost",
 				"flags" : 
 				[
-					"empty",
-					"sewn_imageless"
+					"empty"
 				],
-				"item_type" : "BOX",
+				"item_type" : "BAG",
 				"value" : 30
 			}
 		],
-		"job" : "ConstructChest",
+		"job" : "ConstructBag",
 		"material_category" : 
 		[
 			"yarn"
@@ -1137,8 +1134,11 @@
 			},
 			{
 				"condition" : "AtMost",
-				"item_type" : "LIQUID_MISC",
-				"material" : "LYE",
+				"contains" : 
+				[
+					"lye"
+				],
+				"reaction_id" : "MAKE_SOAP_FROM_TALLOW",
 				"value" : 5
 			}
 		],
@@ -1166,8 +1166,11 @@
 			},
 			{
 				"condition" : "AtLeast",
-				"item_type" : "LIQUID_MISC",
-				"material" : "LYE",
+				"contains" : 
+				[
+					"lye"
+				],
+				"reaction_id" : "MAKE_SOAP_FROM_TALLOW",
 				"value" : 3
 			},
 			{
@@ -1200,8 +1203,11 @@
 			},
 			{
 				"condition" : "AtLeast",
-				"item_type" : "LIQUID_MISC",
-				"material" : "LYE",
+				"contains" : 
+				[
+					"lye"
+				],
+				"reaction_id" : "MAKE_SOAP_FROM_OIL",
 				"value" : 3
 			},
 			{
diff --git a/data/orders/furnace.json b/data/orders/furnace.json
index 54d7d758e..62e389ded 100644
--- a/data/orders/furnace.json
+++ b/data/orders/furnace.json
@@ -152,10 +152,9 @@
 				"condition" : "AtLeast",
 				"flags" : 
 				[
-					"empty",
-					"bag"
+					"empty"
 				],
-				"item_type" : "BOX",
+				"item_type" : "BAG",
 				"value" : 10
 			},
 			{
diff --git a/data/orders/military.json b/data/orders/military.json
index 536b2cd7a..e461f0d3d 100644
--- a/data/orders/military.json
+++ b/data/orders/military.json
@@ -92,15 +92,16 @@
 		[
 			{
 				"condition" : "AtLeast",
-				"item_type" : "SKIN_TANNED",
+				"flags" : 
+				[
+					"silk"
+				],
+				"item_type" : "CLOTH",
+				"min_dimension" : 10000,
 				"value" : 10
 			},
 			{
 				"condition" : "AtMost",
-				"flags" : 
-				[
-					"leather"
-				],
 				"item_subtype" : "ITEM_ARMOR_CLOAK",
 				"item_type" : "ARMOR",
 				"value" : 10
@@ -110,7 +111,7 @@
 		"job" : "MakeArmor",
 		"material_category" : 
 		[
-			"leather"
+			"silk"
 		]
 	},
 	{
@@ -152,25 +153,21 @@
 		[
 			{
 				"condition" : "AtLeast",
-				"item_type" : "SKIN_TANNED",
-				"value" : 25
+				"item_type" : "WOOD",
+				"value" : 50
 			},
 			{
 				"condition" : "AtMost",
-				"flags" : 
-				[
-					"leather"
-				],
 				"item_subtype" : "ITEM_SHIELD_SHIELD",
 				"item_type" : "SHIELD",
-				"value" : 1
+				"value" : 10
 			}
 		],
 		"item_subtype" : "ITEM_SHIELD_SHIELD",
 		"job" : "MakeShield",
 		"material_category" : 
 		[
-			"leather"
+			"wood"
 		]
 	},
 	{
@@ -191,7 +188,7 @@
 				"condition" : "AtMost",
 				"item_subtype" : "ITEM_ARMOR_LEATHER",
 				"item_type" : "ARMOR",
-				"value" : 1
+				"value" : 10
 			}
 		],
 		"item_subtype" : "ITEM_ARMOR_LEATHER",
@@ -223,7 +220,7 @@
 				],
 				"item_subtype" : "ITEM_HELM_HELM",
 				"item_type" : "HELM",
-				"value" : 1
+				"value" : 10
 			}
 		],
 		"item_subtype" : "ITEM_HELM_HELM",
@@ -255,7 +252,7 @@
 				],
 				"item_subtype" : "ITEM_SHOES_BOOTS",
 				"item_type" : "SHOES",
-				"value" : 2
+				"value" : 20
 			}
 		],
 		"item_subtype" : "ITEM_SHOES_BOOTS",
@@ -287,7 +284,7 @@
 				],
 				"item_subtype" : "ITEM_PANTS_LEGGINGS",
 				"item_type" : "PANTS",
-				"value" : 1
+				"value" : 10
 			}
 		],
 		"item_subtype" : "ITEM_PANTS_LEGGINGS",
@@ -319,7 +316,7 @@
 				],
 				"item_subtype" : "ITEM_GLOVES_GLOVES",
 				"item_type" : "GLOVES",
-				"value" : 2
+				"value" : 20
 			}
 		],
 		"item_subtype" : "ITEM_GLOVES_GLOVES",
@@ -421,7 +418,7 @@
 				"condition" : "AtLeast",
 				"item_type" : "BOULDER",
 				"material" : "INORGANIC:CASSITERITE",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"condition" : "AtLeast",
@@ -571,37 +568,6 @@
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BOULDER",
-				"material" : "INORGANIC:NATIVE_PLATINUM",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "AtMost",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 10
-			}
-		],
-		"job" : "SmeltOre",
-		"material" : "INORGANIC:NATIVE_PLATINUM"
-	},
-	{
-		"amount_left" : 4,
-		"amount_total" : 4,
-		"frequency" : "Daily",
-		"id" : 19,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
 		[
 			{
 				"condition" : "AtLeast",
@@ -629,7 +595,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 20,
+		"id" : 19,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -660,7 +626,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 21,
+		"id" : 20,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -691,7 +657,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 22,
+		"id" : 21,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -722,7 +688,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 23,
+		"id" : 22,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -731,7 +697,7 @@
 				"bearing" : "TIN",
 				"condition" : "AtLeast",
 				"item_type" : "BOULDER",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"bearing" : "COPPER",
@@ -759,7 +725,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 24,
+		"id" : 23,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -792,7 +758,7 @@
 				"bearing" : "TIN",
 				"condition" : "AtMost",
 				"item_type" : "BOULDER",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"bearing" : "COPPER",
@@ -808,7 +774,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 25,
+		"id" : 24,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -845,7 +811,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 26,
+		"id" : 25,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -888,7 +854,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 27,
+		"id" : 26,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -924,7 +890,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 28,
+		"id" : 27,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -967,7 +933,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 29,
+		"id" : 28,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1015,7 +981,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 30,
+		"id" : 29,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1070,232 +1036,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 31,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_MACE",
-				"item_type" : "WEAPON",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 10
-			}
-		],
-		"item_subtype" : "ITEM_WEAPON_MACE",
-		"job" : "MakeWeapon",
-		"material" : "INORGANIC:PLATINUM"
-	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 32,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
-				"item_type" : "WEAPON",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 10
-			}
-		],
-		"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
-		"job" : "MakeWeapon",
-		"material" : "INORGANIC:PLATINUM"
-	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 64,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 20
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_CROSSBOW",
-				"item_type" : "WEAPON",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 10
-			}
-		],
-		"item_subtype" : "ITEM_WEAPON_CROSSBOW",
-		"job" : "MakeWeapon",
-		"material" : "INORGANIC:PLATINUM"
-	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 35,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "AtMost",
-				"flags" : 
-				[
-					"metal"
-				],
-				"item_subtype" : "ITEM_WEAPON_MACE",
-				"item_type" : "WEAPON",
-				"value" : 10
-			}
-		],
-		"item_subtype" : "ITEM_WEAPON_MACE",
-		"job" : "MakeWeapon",
-		"material" : "INORGANIC:SILVER"
-	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 35,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "AtMost",
-				"flags" : 
-				[
-					"metal"
-				],
-				"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
-				"item_type" : "WEAPON",
-				"value" : 10
-			}
-		],
-		"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
-		"job" : "MakeWeapon",
-		"material" : "INORGANIC:SILVER"
-	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 64,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 20
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
-			{
-				"condition" : "AtMost",
-				"flags" : 
-				[
-					"metal"
-				],
-				"item_subtype" : "ITEM_WEAPON_CROSSBOW",
-				"item_type" : "WEAPON",
-				"value" : 10
-			}
-		],
-		"item_subtype" : "ITEM_WEAPON_CROSSBOW",
-		"job" : "MakeWeapon",
-		"material" : "INORGANIC:SILVER"
-	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 37,
+		"id" : 30,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1328,7 +1069,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 38,
+		"id" : 31,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1361,7 +1102,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 39,
+		"id" : 32,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1394,7 +1135,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 40,
+		"id" : 33,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1427,7 +1168,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 41,
+		"id" : 34,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1460,7 +1201,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 42,
+		"id" : 35,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1500,7 +1241,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 43,
+		"id" : 36,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1540,7 +1281,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 44,
+		"id" : 37,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1558,26 +1299,47 @@
 				"value" : 100
 			},
 			{
-				"condition" : "LessThan",
+				"condition" : "AtMost",
+				"item_subtype" : "ITEM_WEAPON_MACE",
+				"item_type" : "WEAPON",
+				"material" : "INORGANIC:STEEL",
+				"value" : 10
+			}
+		],
+		"item_subtype" : "ITEM_WEAPON_MACE",
+		"job" : "MakeWeapon",
+		"material" : "INORGANIC:STEEL"
+	},
+	{
+		"amount_left" : 1,
+		"amount_total" : 1,
+		"frequency" : "Daily",
+		"id" : 38,
+		"is_active" : false,
+		"is_validated" : false,
+		"item_conditions" : 
+		[
+			{
+				"condition" : "AtLeast",
 				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
+				"material" : "INORGANIC:STEEL",
+				"value" : 10
 			},
 			{
-				"condition" : "LessThan",
+				"condition" : "AtLeast",
 				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
+				"material" : "COAL",
+				"value" : 100
 			},
 			{
 				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_MACE",
+				"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
 				"item_type" : "WEAPON",
 				"material" : "INORGANIC:STEEL",
 				"value" : 10
 			}
 		],
-		"item_subtype" : "ITEM_WEAPON_MACE",
+		"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
 		"job" : "MakeWeapon",
 		"material" : "INORGANIC:STEEL"
 	},
@@ -1585,7 +1347,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 45,
+		"id" : 39,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1603,26 +1365,47 @@
 				"value" : 100
 			},
 			{
-				"condition" : "LessThan",
+				"condition" : "AtMost",
+				"item_subtype" : "ITEM_WEAPON_SPEAR",
+				"item_type" : "WEAPON",
+				"material" : "INORGANIC:STEEL",
+				"value" : 10
+			}
+		],
+		"item_subtype" : "ITEM_WEAPON_SPEAR",
+		"job" : "MakeWeapon",
+		"material" : "INORGANIC:STEEL"
+	},
+	{
+		"amount_left" : 1,
+		"amount_total" : 1,
+		"frequency" : "Daily",
+		"id" : 40,
+		"is_active" : false,
+		"is_validated" : false,
+		"item_conditions" : 
+		[
+			{
+				"condition" : "AtLeast",
 				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
+				"material" : "INORGANIC:STEEL",
+				"value" : 10
 			},
 			{
-				"condition" : "LessThan",
+				"condition" : "AtLeast",
 				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
+				"material" : "COAL",
+				"value" : 100
 			},
 			{
 				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
+				"item_subtype" : "ITEM_WEAPON_SWORD_SHORT",
 				"item_type" : "WEAPON",
 				"material" : "INORGANIC:STEEL",
 				"value" : 10
 			}
 		],
-		"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
+		"item_subtype" : "ITEM_WEAPON_SWORD_SHORT",
 		"job" : "MakeWeapon",
 		"material" : "INORGANIC:STEEL"
 	},
@@ -1630,7 +1413,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 46,
+		"id" : 41,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1649,13 +1432,13 @@
 			},
 			{
 				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_SPEAR",
+				"item_subtype" : "ITEM_WEAPON_AXE_BATTLE",
 				"item_type" : "WEAPON",
 				"material" : "INORGANIC:STEEL",
 				"value" : 10
 			}
 		],
-		"item_subtype" : "ITEM_WEAPON_SPEAR",
+		"item_subtype" : "ITEM_WEAPON_AXE_BATTLE",
 		"job" : "MakeWeapon",
 		"material" : "INORGANIC:STEEL"
 	},
@@ -1663,7 +1446,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 47,
+		"id" : 42,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1672,7 +1455,7 @@
 				"condition" : "AtLeast",
 				"item_type" : "BAR",
 				"material" : "INORGANIC:STEEL",
-				"value" : 10
+				"value" : 30
 			},
 			{
 				"condition" : "AtLeast",
@@ -1682,13 +1465,13 @@
 			},
 			{
 				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_SWORD_SHORT",
+				"item_subtype" : "ITEM_WEAPON_PICK",
 				"item_type" : "WEAPON",
 				"material" : "INORGANIC:STEEL",
 				"value" : 10
 			}
 		],
-		"item_subtype" : "ITEM_WEAPON_SWORD_SHORT",
+		"item_subtype" : "ITEM_WEAPON_PICK",
 		"job" : "MakeWeapon",
 		"material" : "INORGANIC:STEEL"
 	},
@@ -1696,7 +1479,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 48,
+		"id" : 43,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1705,7 +1488,7 @@
 				"condition" : "AtLeast",
 				"item_type" : "BAR",
 				"material" : "INORGANIC:STEEL",
-				"value" : 10
+				"value" : 30
 			},
 			{
 				"condition" : "AtLeast",
@@ -1715,13 +1498,13 @@
 			},
 			{
 				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_AXE_BATTLE",
+				"item_subtype" : "ITEM_WEAPON_CROSSBOW",
 				"item_type" : "WEAPON",
 				"material" : "INORGANIC:STEEL",
 				"value" : 10
 			}
 		],
-		"item_subtype" : "ITEM_WEAPON_AXE_BATTLE",
+		"item_subtype" : "ITEM_WEAPON_CROSSBOW",
 		"job" : "MakeWeapon",
 		"material" : "INORGANIC:STEEL"
 	},
@@ -1729,7 +1512,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 49,
+		"id" : 44,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1737,8 +1520,8 @@
 			{
 				"condition" : "AtLeast",
 				"item_type" : "BAR",
-				"material" : "INORGANIC:STEEL",
-				"value" : 30
+				"material" : "INORGANIC:SILVER",
+				"value" : 5
 			},
 			{
 				"condition" : "AtLeast",
@@ -1746,23 +1529,38 @@
 				"material" : "COAL",
 				"value" : 100
 			},
+			{
+				"condition" : "LessThan",
+				"item_type" : "BOULDER",
+				"reaction_class" : "FLUX",
+				"value" : 5
+			},
 			{
 				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_PICK",
+				"flags" : 
+				[
+					"metal"
+				],
+				"item_subtype" : "ITEM_WEAPON_MACE",
 				"item_type" : "WEAPON",
+				"value" : 10
+			},
+			{
+				"condition" : "LessThan",
+				"item_type" : "BAR",
 				"material" : "INORGANIC:STEEL",
 				"value" : 10
 			}
 		],
-		"item_subtype" : "ITEM_WEAPON_PICK",
+		"item_subtype" : "ITEM_WEAPON_MACE",
 		"job" : "MakeWeapon",
-		"material" : "INORGANIC:STEEL"
+		"material" : "INORGANIC:SILVER"
 	},
 	{
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 50,
+		"id" : 45,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1770,8 +1568,8 @@
 			{
 				"condition" : "AtLeast",
 				"item_type" : "BAR",
-				"material" : "INORGANIC:STEEL",
-				"value" : 30
+				"material" : "INORGANIC:SILVER",
+				"value" : 5
 			},
 			{
 				"condition" : "AtLeast",
@@ -1779,35 +1577,38 @@
 				"material" : "COAL",
 				"value" : 100
 			},
+			{
+				"condition" : "LessThan",
+				"item_type" : "BOULDER",
+				"reaction_class" : "FLUX",
+				"value" : 5
+			},
 			{
 				"condition" : "AtMost",
-				"item_subtype" : "ITEM_WEAPON_CROSSBOW",
+				"flags" : 
+				[
+					"metal"
+				],
+				"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
 				"item_type" : "WEAPON",
-				"material" : "INORGANIC:STEEL",
 				"value" : 10
 			},
 			{
 				"condition" : "LessThan",
 				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
+				"material" : "INORGANIC:STEEL",
+				"value" : 10
 			}
 		],
-		"item_subtype" : "ITEM_WEAPON_CROSSBOW",
+		"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
 		"job" : "MakeWeapon",
-		"material" : "INORGANIC:STEEL"
+		"material" : "INORGANIC:SILVER"
 	},
 	{
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 51,
+		"id" : 46,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1855,7 +1656,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 52,
+		"id" : 47,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1903,7 +1704,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 53,
+		"id" : 48,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1951,7 +1752,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 54,
+		"id" : 49,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1999,7 +1800,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 55,
+		"id" : 50,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2047,7 +1848,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 56,
+		"id" : 51,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2105,7 +1906,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 57,
+		"id" : 52,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2163,7 +1964,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 58,
+		"id" : 53,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2198,12 +1999,6 @@
 				"material" : "INORGANIC:SILVER",
 				"value" : 5
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
@@ -2223,7 +2018,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 59,
+		"id" : 54,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2258,12 +2053,6 @@
 				"material" : "INORGANIC:SILVER",
 				"value" : 5
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
@@ -2283,7 +2072,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 60,
+		"id" : 55,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2331,7 +2120,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 61,
+		"id" : 56,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2379,7 +2168,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 62,
+		"id" : 57,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2427,7 +2216,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 63,
+		"id" : 58,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2475,7 +2264,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 64,
+		"id" : 59,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2504,18 +2293,6 @@
 				"material" : "INORGANIC:STEEL",
 				"value" : 30
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
@@ -2535,7 +2312,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 79,
+		"id" : 74,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2583,7 +2360,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 80,
+		"id" : 75,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2631,7 +2408,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 81,
+		"id" : 76,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2679,7 +2456,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 82,
+		"id" : 77,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2727,7 +2504,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 83,
+		"id" : 78,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2775,7 +2552,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 84,
+		"id" : 79,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2833,7 +2610,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 85,
+		"id" : 80,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2891,7 +2668,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 72,
+		"id" : 67,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2936,12 +2713,6 @@
 				"item_type" : "BAR",
 				"material" : "INORGANIC:SILVER",
 				"value" : 5
-			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
 			}
 		],
 		"item_subtype" : "ITEM_WEAPON_MACE",
@@ -2952,7 +2723,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 87,
+		"id" : 82,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2987,12 +2758,6 @@
 				"material" : "INORGANIC:SILVER",
 				"value" : 5
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
@@ -3012,7 +2777,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 88,
+		"id" : 83,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3060,7 +2825,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 89,
+		"id" : 84,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3108,7 +2873,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 90,
+		"id" : 85,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3156,7 +2921,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 91,
+		"id" : 86,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3204,7 +2969,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 92,
+		"id" : 87,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3233,18 +2998,6 @@
 				"material" : "INORGANIC:STEEL",
 				"value" : 30
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
@@ -3264,7 +3017,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 79,
+		"id" : 74,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3318,7 +3071,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 80,
+		"id" : 75,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3372,7 +3125,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 81,
+		"id" : 76,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3426,7 +3179,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 82,
+		"id" : 77,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3480,7 +3233,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 83,
+		"id" : 78,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3534,7 +3287,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 84,
+		"id" : 79,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3598,7 +3351,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 85,
+		"id" : 80,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3662,7 +3415,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 86,
+		"id" : 81,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3697,12 +3450,6 @@
 				"material" : "INORGANIC:SILVER",
 				"value" : 5
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
@@ -3728,7 +3475,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 87,
+		"id" : 82,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3763,12 +3510,6 @@
 				"material" : "INORGANIC:SILVER",
 				"value" : 5
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
@@ -3794,7 +3535,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 88,
+		"id" : 83,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3848,7 +3589,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 89,
+		"id" : 84,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3902,7 +3643,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 90,
+		"id" : 85,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3956,7 +3697,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 91,
+		"id" : 86,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4010,7 +3751,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 92,
+		"id" : 87,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4039,18 +3780,6 @@
 				"material" : "INORGANIC:STEEL",
 				"value" : 30
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
@@ -4076,7 +3805,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 93,
+		"id" : 88,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4136,7 +3865,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 94,
+		"id" : 89,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4196,7 +3925,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 95,
+		"id" : 90,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4256,7 +3985,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 96,
+		"id" : 91,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4316,7 +4045,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 97,
+		"id" : 92,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4376,7 +4105,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 98,
+		"id" : 93,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4446,7 +4175,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 99,
+		"id" : 94,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4516,7 +4245,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 100,
+		"id" : 95,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4557,12 +4286,6 @@
 				"material" : "INORGANIC:SILVER",
 				"value" : 5
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
@@ -4588,7 +4311,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 101,
+		"id" : 96,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4629,12 +4352,6 @@
 				"material" : "INORGANIC:SILVER",
 				"value" : 5
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "LessThan",
 				"item_type" : "BAR",
@@ -4660,7 +4377,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 102,
+		"id" : 97,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4720,7 +4437,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 103,
+		"id" : 98,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4780,7 +4497,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 104,
+		"id" : 99,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4840,7 +4557,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 105,
+		"id" : 100,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4900,7 +4617,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 106,
+		"id" : 101,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4935,18 +4652,6 @@
 				"material" : "INORGANIC:STEEL",
 				"value" : 30
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"flags" : 
diff --git a/data/orders/smelting.json b/data/orders/smelting.json
index fec669324..781a52100 100644
--- a/data/orders/smelting.json
+++ b/data/orders/smelting.json
@@ -43,7 +43,7 @@
 				"condition" : "AtLeast",
 				"item_type" : "BOULDER",
 				"material" : "INORGANIC:CASSITERITE",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"condition" : "AtLeast",
@@ -668,7 +668,7 @@
 				"bearing" : "TIN",
 				"condition" : "AtLeast",
 				"item_type" : "BOULDER",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"bearing" : "COPPER",
@@ -729,7 +729,7 @@
 				"bearing" : "TIN",
 				"condition" : "AtMost",
 				"item_type" : "BOULDER",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"bearing" : "COPPER",
@@ -791,13 +791,13 @@
 				"bearing" : "TIN",
 				"condition" : "AtLeast",
 				"item_type" : "BOULDER",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"bearing" : "COPPER",
 				"condition" : "AtLeast",
 				"item_type" : "BOULDER",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"condition" : "AtLeast",
@@ -828,13 +828,13 @@
 				"condition" : "AtLeast",
 				"item_type" : "BAR",
 				"material" : "INORGANIC:TIN",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"condition" : "AtLeast",
 				"item_type" : "BAR",
 				"material" : "INORGANIC:COPPER",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"condition" : "AtLeast",
@@ -1068,13 +1068,13 @@
 				"bearing" : "TIN",
 				"condition" : "AtLeast",
 				"item_type" : "BOULDER",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"bearing" : "COPPER",
 				"condition" : "AtLeast",
 				"item_type" : "BOULDER",
-				"value" : 5
+				"value" : 25
 			},
 			{
 				"condition" : "AtLeast",
diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
deleted file mode 100644
index f000b5bd1..000000000
--- a/data/quickfort/aliases-common.txt
+++ /dev/null
@@ -1,509 +0,0 @@
-# Standard library of aliases for quickfort query mode blueprints.
-#
-# Please DO NOT EDIT this file directly. It will get overwritten when DFHack
-# is updated. Instead, custom aliases should be added to
-#   dfhack-config/quickfort/aliases.txt
-# Custom alias definitions will take precedence over aliases in this file.
-#
-# Please see
-#   https://docs.dfhack.org/en/latest/docs/guides/quickfort-alias-guide.html
-# or
-#   hack/docs/docs/guides/quickfort-alias-guide.html
-# in your DF installation directory for alias syntax documentation and
-# documentation for the aliases in this file.
-
-##################################
-# naming aliases
-##################################
-
-name:     {Empty}
-givename: !n{name}&
-namezone: ^i{givename}^q
-
-
-##################################
-# quantum stockpile aliases
-##################################
-
-# Allows the standard stockpile config aliases to also be used to configure
-# hauling routes.
-enter_sp_config: {enter_sp_config_default}
-enter_sp_config_default: s
-enter_sp_config_hauling: &
-
-quantum_enable: {enableanimals}{enablefood}{enablefurniture}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}{enableweapons}{enablearmor}{enablesheet}
-quantum: {linksonly}{nocontainers}{quantum_enable}{givename}
-
-stop_name: {Empty}
-route_enable: {quantum_enable}{enablecorpses}{enablerefuse}
-sp_link: s{move}p{move_back}
-sp_links: {sp_link}
-quantumstop: ^hrn{name}&sn{stop_name}&&xxx{route_enable enter_sp_config={enter_sp_config_hauling}}{sp_links}^^q
-quantumstopfromeast: {quantumstop move={Right} move_back={Left}}
-quantumstopfromsouth: {quantumstop move={Down} move_back={Up}}
-quantumstopfromwest: {quantumstop move={Left} move_back={Right}}
-quantumstopfromnorth: {quantumstop move={Up} move_back={Down}}
-
-
-##################################
-# farm plots
-##################################
-
-growlastcropall: a/&b/&c/&d/&
-growfirstcropall: a&b&c&d&
-
-
-########################################
-# stockpile utility aliases
-########################################
-
-linksonly: a
-maxbins: V
-maxbarrels: R
-nobins: C
-nobarrels: E
-nocontainers: {nobins}{nobarrels}
-
-give: g{move}&
-give2up: {give move={Up 2}}
-give2down: {give move={Down 2}}
-give2left: {give move={Left 2}}
-give2right: {give move={Right 2}}
-give10up: {give move={Up 10}}
-give10down: {give move={Down 10}}
-give10left: {give move={Left 10}}
-give10right: {give move={Right 10}}
-
-togglesequence: &{Down}
-togglesequence2: &{Down 2}
-
-# these aliases use the DFHack "search" plugin to filter the right column
-forbidsearch: s{search}&f{Left}{Right}
-permitsearch: s{search}&p{Left}{Right}
-togglesearch: s{search}&&{Left}{Right}
-
-masterworkonly: {prefix}{Right}{Up 2}f{Right}{Up 2}&^
-artifactonly:   {prefix}{Right}{Up 2}f{Right}{Up}&^
-
-togglemasterwork: {prefix}{Right}{Up 2}{Right}{Up 2}&^
-toggleartifact:   {prefix}{Right}{Up 2}{Right}{Up}&^
-
-
-##################################
-# animal stockpile adjustments
-##################################
-
-animalsprefix:  {enter_sp_config}
-enableanimals:  {animalsprefix}e^
-disableanimals: {animalsprefix}d^
-
-cages: {animalsprefix}bu^
-traps: {animalsprefix}bj^
-
-forbidcages: {animalsprefix}u^
-forbidtraps: {animalsprefix}j^
-
-permitcages: {forbidcages}
-permittraps: {forbidtraps}
-
-
-##################################
-# food stockpile adjustments
-##################################
-
-foodprefix:  {enter_sp_config}{Down}
-enablefood:  {foodprefix}e^
-disablefood: {foodprefix}d^
-
-preparedfood:   {foodprefix}bu^
-unpreparedfish: {foodprefix}b{Right}{Down 2}p^
-plants:         {foodprefix}b{Right}{Down 4}p^
-booze:          {foodprefix}b{Right}{Down 5}p{Down}p^
-seeds:          {foodprefix}b{Right}{Down 9}p^
-dye:            {foodprefix}b{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
-tallow:         {foodprefix}b{Right}{Down 13}{Right}{permitsearch search=tallow}^
-miscliquid:     {foodprefix}b{Right}{Down 18}p^
-wax:            {foodprefix}b{Right}{Down 15}{Right}{Down 6}&^
-
-forbidpreparedfood:   {foodprefix}u^
-forbidunpreparedfish: {foodprefix}{Right}{Down 2}f^
-forbidplants:         {foodprefix}{Right}{Down 4}f^
-forbidbooze:          {foodprefix}{Right}{Down 5}f{Down}f^
-forbidseeds:          {foodprefix}{Right}{Down 9}f^
-forbiddye:            {foodprefix}{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
-forbidtallow:         {foodprefix}{Right}{Down 13}{Right}{forbidsearch search=tallow}^
-forbidmiscliquid:     {foodprefix}{Right}{Down 18}f^
-forbidwax:            {foodprefix}{Right}{Down 15}{Right}{Down 6}&^
-
-permitpreparedfood:   {forbidpreparedfood}
-permitunpreparedfish: {foodprefix}{Right}{Down 2}p^
-permitplants:         {foodprefix}{Right}{Down 4}p^
-permitbooze:          {foodprefix}{Right}{Down 5}p{Down}p^
-permitseeds:          {foodprefix}{Right}{Down 9}p^
-permitdye:            {forbiddye}
-permittallow:         {foodprefix}{Right}{Down 13}{Right}{permitsearch search=tallow}^
-permitmiscliquid:     {foodprefix}{Right}{Down 18}p^
-permitwax:            {forbidwax}
-
-# the next two aliases are for compatibility with previous implementations of
-# Quickfort and are not documented.
-# enables everything but seeds
-noseeds: {disablefood}{enablefood}{forbidseeds}
-# enables all food except for the types listed above
-food: {noseeds}{forbidpreparedfood}{forbidunpreparedfish}{forbidplants}{forbidbooze}{forbiddye}{forbidtallow}{forbidmiscliquid}
-
-
-##################################
-# furniture stockpile adjustments
-##################################
-
-furnitureprefix:  {enter_sp_config}{Down 2}
-enablefurniture:  {furnitureprefix}e^
-disablefurniture: {furnitureprefix}d^
-
-pots:    {furnitureprefix}de{Right}f{Right}{Up 5}&^
-bags:    {furnitureprefix}de{Right}f{Right}{Up 10}&{Left}{Down}f{Down}f{Down}f{Right}{Down}&{Down 6}&{Down}&{Down 6}&^
-buckets: {furnitureprefix}de{Right}f{Right}{Up 12}&^
-sand:    {furnitureprefix}de{Right}f{Right}{Up}&^
-
-forbidpots:    {furnitureprefix}{Right 2}{Up 5}&^
-forbidbuckets: {furnitureprefix}{Right 2}{Up 12}&^
-forbidsand:    {furnitureprefix}{Right 2}{Up}&^
-
-permitpots:    {forbidpots}
-permitbuckets: {forbidbuckets}
-permitsand:    {forbidsand}
-
-masterworkfurniture: {masterworkonly prefix={furnitureprefix}}
-artifactfurniture:   {artifactonly prefix={furnitureprefix}}
-
-forbidmasterworkfurniture: {togglemasterwork prefix={furnitureprefix}}
-forbidartifactfurniture:   {toggleartifact prefix={furnitureprefix}}
-
-permitmasterworkfurniture: {togglemasterwork prefix={furnitureprefix}}
-permitartifactfurniture:   {toggleartifact prefix={furnitureprefix}}
-
-
-###########################################
-# corpses and refuse stockpile adjustments
-###########################################
-
-corpsesprefix:  {enter_sp_config}{Down 3}
-enablecorpses:  {corpsesprefix}e^
-disablecorpses: {corpsesprefix}d{Up}d^
-
-refuseprefix:  {enter_sp_config}{Down 4}
-enablerefuse:  {refuseprefix}e^
-disablerefuse: {refuseprefix}d^
-
-corpses:     {refuseprefix}b{Right}{Down}p^
-rawhides:    {refuseprefix}b{Right 2}{Down}&^
-tannedhides: {refuseprefix}b{Right 2}{Down 53}&^
-skulls:      {refuseprefix}b{Right}{Down 3}p^
-bones:       {refuseprefix}b{Right}{Down 4}p^
-shells:      {refuseprefix}b{Right}{Down 5}p^
-teeth:       {refuseprefix}b{Right}{Down 6}p^
-horns:       {refuseprefix}b{Right}{Down 7}p^
-hair:        {refuseprefix}b{Right}{Down 8}p^
-usablehair:  {refuseprefix}b{Right}{Down 8}{Right}{togglesearch search=sheep}{togglesearch search=llama}{togglesearch search=alpaca}{togglesearch search=troll}^
-craftrefuse: {skulls}{permitbones}{permitshells}{permitteeth}{permithorns}{permitusablehair}
-
-forbidcorpses:     {refuseprefix}{Right}{Down}f^
-forbidrawhides:    {refuseprefix}{Right 2}{Down}&^
-forbidtannedhides: {refuseprefix}{Right 2}{Down 53}&^
-forbidskulls:      {refuseprefix}{Right}{Down 3}f^
-forbidbones:       {refuseprefix}{Right}{Down 4}f^
-forbidshells:      {refuseprefix}{Right}{Down 5}f^
-forbidteeth:       {refuseprefix}{Right}{Down 6}f^
-forbidhorns:       {refuseprefix}{Right}{Down 7}f^
-forbidhair:        {refuseprefix}{Right}{Down 8}f^
-forbidusablehair:  {refuseprefix}{Right}{Down 8}{Right}{forbidsearch search=sheep}{forbidsearch search=llama}{forbidsearch search=alpaca}{forbidsearch search=troll}^
-forbidcraftrefuse: {forbidskulls}{forbidbones}{forbidshells}{forbidteeth}{forbidhorns}{forbidusablehair}
-
-permitcorpses:     {refuseprefix}{Right}{Down}p^
-permitrawhides:    {forbidrawhides}
-permittannedhides: {forbidtannedhides}
-permitskulls:      {refuseprefix}{Right}{Down 3}p^
-permitbones:       {refuseprefix}{Right}{Down 4}p^
-permitshells:      {refuseprefix}{Right}{Down 5}p^
-permitteeth:       {refuseprefix}{Right}{Down 6}p^
-permithorns:       {refuseprefix}{Right}{Down 7}p^
-permithair:        {refuseprefix}{Right}{Down 8}p^
-permitusablehair:  {refuseprefix}{Right}{Down 8}{Right}{permitsearch search=sheep}{permitsearch search=llama}{permitsearch search=alpaca}{permitsearch search=troll}^
-permitcraftrefuse: {permitskulls}{permitbones}{permitshells}{permitteeth}{permithorns}{permitusablehair}
-
-
-##################################
-# stone stockpile adjustments
-##################################
-
-stoneprefix:  {enter_sp_config}{Down 5}
-enablestone:  {stoneprefix}e^
-disablestone: {stoneprefix}d^
-
-metal:         {stoneprefix}b{Right}p^
-iron:          {stoneprefix}b{Right}{Right}&{Down}&{Down 13}&^
-economic:      {stoneprefix}b{Right}{Down}p^
-flux:          {stoneprefix}b{Right}{Down}{Right}{togglesequence 4}{Down 4}&^
-plaster:       {stoneprefix}b{Right}{Down}{Right}{Down 6}&{Down 3}{togglesequence 3}^
-coalproducing: {stoneprefix}b{Right}{Down}{Right}{Down 4}{togglesequence 2}^
-otherstone:    {stoneprefix}b{Right}{Down 2}p^
-bauxite:       {stoneprefix}b{Right}{Down 2}{Right}{Down 42}&^
-clay:          {stoneprefix}b{Right}{Down 3}p^
-
-forbidmetal:         {stoneprefix}{Right}f^
-forbidiron:          {stoneprefix}{Right}{Right}&{Down}&{Down 13}&^
-forbideconomic:      {stoneprefix}{Right}{Down}f^
-forbidflux:          {stoneprefix}{Right}{Down}{Right}{togglesequence 4}{Down 4}&^
-forbidplaster:       {stoneprefix}{Right}{Down}{Right}{Down 6}&{Down 3}{togglesequence 3}^
-forbidcoalproducing: {stoneprefix}{Right}{Down}{Right}{Down 4}{togglesequence 2}^
-forbidotherstone:    {stoneprefix}{Right}{Down 2}f^
-forbidbauxite:       {stoneprefix}{Right}{Down 2}{Right}{Down 42}&^
-forbidclay:          {stoneprefix}{Right}{Down 3}f^
-
-permitmetal:         {stoneprefix}{Right}p^
-permitiron:          {forbidiron}
-permiteconomic:      {stoneprefix}{Right}{Down}p^
-permitflux:          {forbidflux}
-permitplaster:       {forbidplaster}
-permitcoalproducing: {forbidcoalproducing}
-permitotherstone:    {stoneprefix}{Right}{Down 2}p^
-permitbauxite:       {forbidbauxite}
-permitclay:          {stoneprefix}{Right}{Down 3}p^
-
-
-##################################
-# ammo stockpile adjustments
-##################################
-
-ammoprefix:  {enter_sp_config}{Down 6}
-enableammo:  {ammoprefix}e^
-disableammo: {ammoprefix}d^
-
-bolts: {ammoprefix}a{Right 2}f&^
-
-forbidmetalbolts:  {ammoprefix}{Right}{Down}f^
-forbidwoodenbolts: {ammoprefix}{Right}{Down 2}{Right}&^
-forbidbonebolts:   {ammoprefix}{Right}{Down 2}{Right}{Down}&^
-
-masterworkammo: {masterworkonly prefix={ammoprefix}}
-artifactammo:   {artifactonly prefix={ammoprefix}}
-
-forbidmasterworkammo: {togglemasterwork prefix={ammoprefix}}
-forbidartifactammo:   {toggleartifact prefix={ammoprefix}}
-
-permitmasterworkammo: {togglemasterwork prefix={ammoprefix}}
-permitartifactammo:   {toggleartifact prefix={ammoprefix}}
-
-
-##################################
-# bar stockpile adjustments
-##################################
-
-barsprefix:  {enter_sp_config}{Down 8}
-enablebars:  {barsprefix}e^
-disablebars: {barsprefix}d^
-
-bars:        {barsprefix}b{Right}p{Down}p^
-metalbars:   {barsprefix}b{Right}p^
-ironbars:    {barsprefix}b{Right 2}&^
-steelbars:   {barsprefix}b{Right 2}{Down 8}&^
-pigironbars: {barsprefix}b{Right 2}{Down 9}&^
-otherbars:   {barsprefix}b{Right}{Down}p^
-coal:        {barsprefix}b{Right}{Down}{Right}&^
-potash:      {barsprefix}b{Right}{Down}{Right}{Down}&^
-ash:         {barsprefix}b{Right}{Down}{Right}{Down 2}&^
-pearlash:    {barsprefix}b{Right}{Down}{Right}{Down 3}&^
-soap:        {barsprefix}b{Right}{Down}{Right}{Down 4}&^
-blocks:      {barsprefix}b{Down 2}p{Down}p{Down}p^
-
-forbidbars:        {barsprefix}{Right}f{Down}f^
-forbidmetalbars:   {barsprefix}{Right}f^
-forbidironbars:    {barsprefix}{Right 2}&^
-forbidsteelbars:   {barsprefix}{Right 2}{Down 8}&^
-forbidpigironbars: {barsprefix}{Right 2}{Down 9}&^
-forbidotherbars:   {barsprefix}{Right}{Down}f^
-forbidcoal:        {barsprefix}{Right}{Down}{Right}&^
-forbidpotash:      {barsprefix}{Right}{Down}{Right}{Down}&^
-forbidash:         {barsprefix}{Right}{Down}{Right}{Down 2}&^
-forbidpearlash:    {barsprefix}{Right}{Down}{Right}{Down 3}&^
-forbidsoap:        {barsprefix}{Right}{Down}{Right}{Down 4}&^
-forbidblocks:      {barsprefix}{Down 2}f{Down}f{Down}f^
-
-
-##################################
-# gem stockpile adjustments
-##################################
-
-gemsprefix:  {enter_sp_config}{Down 9}
-enablegems:  {gemsprefix}e^
-disablegems: {gemsprefix}d^
-
-roughgems:  {gemsprefix}b{Right}p^
-roughglass: {gemsprefix}b{Right}{Down}p^
-cutgems:    {gemsprefix}b{Right}{Down 2}p^
-cutglass:   {gemsprefix}b{Right}{Down 3}p^
-cutstone:   {gemsprefix}b{Right}{Down 4}p^
-
-forbidroughgems:  {gemsprefix}{Right}f^
-forbidroughglass: {gemsprefix}{Right}{Down}f^
-forbidcutgems:    {gemsprefix}{Right}{Down 2}f^
-forbidcutglass:   {gemsprefix}{Right}{Down 3}f^
-forbidcutstone:   {gemsprefix}{Right}{Down 4}f^
-
-
-#######################################
-# finished goods stockpile adjustments
-#######################################
-
-finishedgoodsprefix:  {enter_sp_config}{Down 10}
-enablefinishedgoods:  {finishedgoodsprefix}e^
-disablefinishedgoods: {finishedgoodsprefix}d^
-
-crafts:      {finishedgoodsprefix}{Right}f{Right}{Down 9}{togglesequence 9}^
-goblets:     {finishedgoodsprefix}{Right}f{Right}{Down 2}&^
-jugs:        {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^
-stonetools:  {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^
-woodentools: {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down}f{Down}f{Down}f{Down}f{Right}&^
-
-forbidcrafts:  {finishedgoodsprefix}{Right 2}{Down 9}{togglesequence 9}^
-forbidgoblets: {finishedgoodsprefix}{Right 2}{Down 2}&^
-
-permitcrafts:  {forbidcrafts}
-permitgoblets: {forbidgoblets}
-
-masterworkfinishedgoods: {masterworkonly prefix={finishedgoodsprefix}}
-artifactfinishedgoods:   {artifactonly prefix={finishedgoodsprefix}}
-
-forbidmasterworkfinishedgoods: {togglemasterwork prefix={finishedgoodsprefix}}
-forbidartifactfinishedgoods:   {toggleartifact prefix={finishedgoodsprefix}}
-
-permitmasterworkfinishedgoods: {togglemasterwork prefix={finishedgoodsprefix}}
-permitartifactfinishedgoods:   {toggleartifact prefix={finishedgoodsprefix}}
-
-
-##################################
-# cloth
-##################################
-
-clothprefix:  {enter_sp_config}{Down 12}
-enablecloth:  {clothprefix}e^
-disablecloth: {clothprefix}d^
-
-thread:           {clothprefix}b{Right}p{Down}p{Down}p^
-adamantinethread: {clothprefix}b{Right}{Down 3}p^
-cloth:            {clothprefix}b{Right}{Down 4}p{Down}p{Down}p^
-adamantinecloth:  {clothprefix}b{Right}{Up}p^
-
-forbidthread:           {clothprefix}{Right}f{Down}f{Down}f^
-forbidadamantinethread: {clothprefix}{Right}{Down 3}f^
-forbidcloth:            {clothprefix}{Right}{Down 4}f{Down}f{Down}f^
-forbidadamantinecloth:  {clothprefix}{Right}{Up}f^
-
-permitthread:           {clothprefix}{Right}p{Down}p{Down}p^
-permitadamantinethread: {clothprefix}{Right}{Down 3}p^
-permitcloth:            {clothprefix}{Right}{Down 4}p{Down}p{Down}p^
-permitadamantinecloth:  {clothprefix}{Right}{Up}p^
-
-##################################
-# weapon stockpile adjustments
-##################################
-
-weaponsprefix:  {enter_sp_config}{Down 14}
-enableweapons:  {weaponsprefix}e^
-disableweapons: {weaponsprefix}d^
-
-metalweapons:  {forbidtrapcomponents}{forbidstoneweapons}{forbidotherweapons}
-ironweapons:   {metalweapons}{forbidmetalweapons}{permitironweapons}
-bronzeweapons: {metalweapons}{forbidmetalweapons}{permitbronzeweapons}
-copperweapons: {metalweapons}{forbidmetalweapons}{permitcopperweapons}
-steelweapons:  {metalweapons}{forbidmetalweapons}{permitsteelweapons}
-
-forbidweapons:        {weaponsprefix}{Right}f^
-forbidtrapcomponents: {weaponsprefix}{Right}{Down}f^
-forbidmetalweapons:   {weaponsprefix}{Right}{Down 2}f^
-forbidstoneweapons:   {weaponsprefix}{Right}{Down 3}f^
-forbidotherweapons:   {weaponsprefix}{Right}{Down 4}f^
-forbidironweapons:    {weaponsprefix}{Right}{Down 2}{Right}&^
-forbidbronzeweapons:  {weaponsprefix}{Right}{Down 2}{Right}{Down 6}&^
-forbidcopperweapons:  {weaponsprefix}{Right}{Down 2}{Right}{Down 3}&^
-forbidsteelweapons:   {weaponsprefix}{Right}{Down 2}{Right}{Down 8}&^
-
-permitweapons:        {weaponsprefix}{Right}p^
-permittrapcomponents: {weaponsprefix}{Right}{Down}p^
-permitmetalweapons:   {weaponsprefix}{Right}{Down 2}p^
-permitstoneweapons:   {weaponsprefix}{Right}{Down 3}p^
-permitotherweapons:   {weaponsprefix}{Right}{Down 4}p^
-permitironweapons:    {forbidironweapons}
-permitbronzeweapons:  {forbidbronzeweapons}
-permitcopperweapons:  {forbidcopperweapons}
-permitsteelweapons:   {forbidsteelweapons}
-
-masterworkweapons: {masterworkonly prefix={weaponsprefix}}
-artifactweapons:   {artifactonly prefix={weaponsprefix}}
-
-forbidmasterworkweapons: {togglemasterwork prefix={weaponsprefix}}
-forbidartifactweapons:   {toggleartifact prefix={weaponsprefix}}
-
-permitmasterworkweapons: {togglemasterwork prefix={weaponsprefix}}
-permitartifactweapons:   {toggleartifact prefix={weaponsprefix}}
-
-
-##################################
-# armor stockpile adjustments
-##################################
-
-armorprefix:  {enter_sp_config}{Down 15}
-enablearmor:  {armorprefix}e^
-disablearmor: {armorprefix}d^
-
-metalarmor:  {forbidotherarmor}
-otherarmor:  {forbidmetalarmor}
-ironarmor:   {metalarmor}{forbidmetalarmor}{permitironarmor}
-bronzearmor: {metalarmor}{forbidmetalarmor}{permitbronzearmor}
-copperarmor: {metalarmor}{forbidmetalarmor}{permitcopperarmor}
-steelarmor:  {metalarmor}{forbidmetalarmor}{permitsteelarmor}
-
-forbidmetalarmor:  {armorprefix}{Right}{Down 6}f^
-forbidotherarmor:  {armorprefix}{Right}{Down 7}f^
-forbidironarmor:   {armorprefix}{Right}{Down 6}{Right}&^
-forbidbronzearmor: {armorprefix}{Right}{Down 6}{Right}{Down 6}&^
-forbidcopperarmor: {armorprefix}{Right}{Down 6}{Right}{Down 3}&^
-forbidsteelarmor:  {armorprefix}{Right}{Down 6}{Right}{Down 8}&^
-
-permitmetalarmor:   {armorprefix}{Right}{Down 6}p^
-permitotherarmor:   {armorprefix}{Right}{Down 7}p^
-permitironarmor:    {forbidironarmor}
-permitbronzearmor:  {forbidbronzearmor}
-permitcopperarmor:  {forbidcopperarmor}
-permitsteelarmor:   {forbidsteelarmor}
-
-masterworkarmor: {masterworkonly prefix={armorprefix}}
-artifactarmor:   {artifactonly prefix={armorprefix}}
-
-forbidmasterworkarmor: {togglemasterwork prefix={armorprefix}}
-forbidartifactarmor:   {toggleartifact prefix={armorprefix}}
-
-permitmasterworkarmor: {togglemasterwork prefix={armorprefix}}
-permitartifactarmor:   {toggleartifact prefix={armorprefix}}
-
-
-##################################
-# others
-##################################
-
-coinsprefix:  {enter_sp_config}{Down 7}
-enablecoins:  {coinsprefix}e^
-disablecoins: {coinsprefix}d^
-
-leatherprefix:  {enter_sp_config}{Down 11}
-enableleather:  {leatherprefix}e^
-disableleather: {leatherprefix}d^
-
-woodprefix:  {enter_sp_config}{Down 13}
-enablewood:  {woodprefix}e^
-disablewood: {woodprefix}d^
-
-sheetprefix:  {enter_sp_config}{Down 16}
-enablesheet:  {sheetprefix}e^
-disablesheet: {sheetprefix}d^
diff --git a/data/stockpiles/adamantinecloth.dfstock b/data/stockpiles/adamantinecloth.dfstock
new file mode 100644
index 000000000..38781d313
--- /dev/null
+++ b/data/stockpiles/adamantinecloth.dfstock
@@ -0,0 +1 @@
+rBINORGANIC:ADAMANTINE
\ No newline at end of file
diff --git a/data/stockpiles/adamantinethread.dfstock b/data/stockpiles/adamantinethread.dfstock
new file mode 100644
index 000000000..2231b389f
--- /dev/null
+++ b/data/stockpiles/adamantinethread.dfstock
@@ -0,0 +1 @@
+r"INORGANIC:ADAMANTINE
\ No newline at end of file
diff --git a/data/stockpiles/adamantineweapons.dfstock b/data/stockpiles/adamantineweapons.dfstock
new file mode 100644
index 000000000..6236196f0
Binary files /dev/null and b/data/stockpiles/adamantineweapons.dfstock differ
diff --git a/data/stockpiles/all.dfstock b/data/stockpiles/all.dfstock
new file mode 100644
index 000000000..eace9c53d
Binary files /dev/null and b/data/stockpiles/all.dfstock differ
diff --git a/data/stockpiles/artifacts.dfstock b/data/stockpiles/artifacts.dfstock
new file mode 100644
index 000000000..1c7315dfe
Binary files /dev/null and b/data/stockpiles/artifacts.dfstock differ
diff --git a/data/stockpiles/ash.dfstock b/data/stockpiles/ash.dfstock
new file mode 100644
index 000000000..d313e0096
--- /dev/null
+++ b/data/stockpiles/ash.dfstock
@@ -0,0 +1,2 @@
+R
+ASH
\ No newline at end of file
diff --git a/data/stockpiles/bags.dfstock b/data/stockpiles/bags.dfstock
new file mode 100644
index 000000000..3bfa1a1a1
--- /dev/null
+++ b/data/stockpiles/bags.dfstock
@@ -0,0 +1,2 @@
+
+BAG
\ No newline at end of file
diff --git a/data/stockpiles/barrels.dfstock b/data/stockpiles/barrels.dfstock
new file mode 100644
index 000000000..70a723903
--- /dev/null
+++ b/data/stockpiles/barrels.dfstock
@@ -0,0 +1,2 @@
+
+BARREL
\ No newline at end of file
diff --git a/data/stockpiles/bars.dfstock b/data/stockpiles/bars.dfstock
new file mode 100644
index 000000000..c292dcf56
--- /dev/null
+++ b/data/stockpiles/bars.dfstock
@@ -0,0 +1,6 @@
+Rõ
+COAL
+POTASH
+ASH
+PEARLASH
+SOAPINORGANIC:IRONINORGANIC:SILVERINORGANIC:COPPERINORGANIC:NICKELINORGANIC:ZINCINORGANIC:BRONZEINORGANIC:BRASSINORGANIC:STEELINORGANIC:PIG_IRONINORGANIC:PLATINUMINORGANIC:ELECTRUM
INORGANIC:TININORGANIC:PEWTER_FINEINORGANIC:PEWTER_TRIFLEINORGANIC:PEWTER_LAYINORGANIC:LEADINORGANIC:ALUMINUMINORGANIC:NICKEL_SILVERINORGANIC:BILLONINORGANIC:STERLING_SILVERINORGANIC:BLACK_BRONZEINORGANIC:ROSE_GOLDINORGANIC:BISMUTHINORGANIC:BISMUTH_BRONZEINORGANIC:ADAMANTINEINORGANIC:GOLDINORGANIC:DIVINE_1INORGANIC:DIVINE_3INORGANIC:DIVINE_5INORGANIC:DIVINE_7INORGANIC:DIVINE_9INORGANIC:DIVINE_11INORGANIC:DIVINE_13INORGANIC:DIVINE_15INORGANIC:DIVINE_17INORGANIC:DIVINE_19
\ No newline at end of file
diff --git a/data/stockpiles/bauxite.dfstock b/data/stockpiles/bauxite.dfstock
new file mode 100644
index 000000000..83a49cb5b
--- /dev/null
+++ b/data/stockpiles/bauxite.dfstock
@@ -0,0 +1,2 @@
+2
+INORGANIC:BAUXITE
\ No newline at end of file
diff --git a/data/stockpiles/blocks.dfstock b/data/stockpiles/blocks.dfstock
new file mode 100644
index 000000000..cd08d9333
--- /dev/null
+++ b/data/stockpiles/blocks.dfstock
@@ -0,0 +1 @@
+RãGREEN_GLASSCLEAR_GLASS
CRYSTAL_GLASSWOOD"INORGANIC:IRON"INORGANIC:SILVER"INORGANIC:COPPER"INORGANIC:NICKEL"INORGANIC:ZINC"INORGANIC:BRONZE"INORGANIC:BRASS"INORGANIC:STEEL"INORGANIC:PIG_IRON"INORGANIC:PLATINUM"INORGANIC:ELECTRUM"
INORGANIC:TIN"INORGANIC:PEWTER_FINE"INORGANIC:PEWTER_TRIFLE"INORGANIC:PEWTER_LAY"INORGANIC:LEAD"INORGANIC:ALUMINUM"INORGANIC:NICKEL_SILVER"INORGANIC:BILLON"INORGANIC:STERLING_SILVER"INORGANIC:BLACK_BRONZE"INORGANIC:ROSE_GOLD"INORGANIC:BISMUTH"INORGANIC:BISMUTH_BRONZE"INORGANIC:ADAMANTINE"INORGANIC:PLASTER"INORGANIC:CERAMIC_EARTHENWARE"INORGANIC:CERAMIC_STONEWARE"INORGANIC:CERAMIC_PORCELAIN"INORGANIC:ASH_GLAZE"INORGANIC:TIN_GLAZE"INORGANIC:SANDSTONE"INORGANIC:SILTSTONE"INORGANIC:MUDSTONE"INORGANIC:SHALE"INORGANIC:CLAYSTONE"INORGANIC:ROCK_SALT"INORGANIC:LIMESTONE"INORGANIC:CONGLOMERATE"INORGANIC:DOLOMITE"INORGANIC:CHERT"INORGANIC:CHALK"INORGANIC:GRANITE"INORGANIC:DIORITE"INORGANIC:GABBRO"INORGANIC:RHYOLITE"INORGANIC:BASALT"INORGANIC:ANDESITE"INORGANIC:DACITE"INORGANIC:OBSIDIAN"INORGANIC:QUARTZITE"INORGANIC:SLATE"INORGANIC:PHYLLITE"INORGANIC:SCHIST"INORGANIC:GNEISS"INORGANIC:MARBLE"INORGANIC:HEMATITE"INORGANIC:LIMONITE"INORGANIC:GARNIERITE"INORGANIC:NATIVE_GOLD"INORGANIC:NATIVE_SILVER"INORGANIC:NATIVE_COPPER"INORGANIC:MALACHITE"INORGANIC:GALENA"INORGANIC:SPHALERITE"INORGANIC:CASSITERITE"INORGANIC:COAL_BITUMINOUS"INORGANIC:LIGNITE"INORGANIC:NATIVE_PLATINUM"INORGANIC:CINNABAR"INORGANIC:COBALTITE"INORGANIC:TETRAHEDRITE"INORGANIC:HORN_SILVER"INORGANIC:GYPSUM"INORGANIC:TALC"
INORGANIC:JET"INORGANIC:PUDDINGSTONE"INORGANIC:PETRIFIED_WOOD"INORGANIC:GRAPHITE"INORGANIC:BRIMSTONE"INORGANIC:KIMBERLITE"INORGANIC:BISMUTHINITE"INORGANIC:REALGAR"INORGANIC:ORPIMENT"INORGANIC:STIBNITE"INORGANIC:MARCASITE"INORGANIC:SYLVITE"INORGANIC:CRYOLITE"INORGANIC:PERICLASE"INORGANIC:ILMENITE"INORGANIC:RUTILE"INORGANIC:MAGNETITE"INORGANIC:CHROMITE"INORGANIC:PYROLUSITE"INORGANIC:PITCHBLENDE"INORGANIC:BAUXITE"INORGANIC:NATIVE_ALUMINUM"INORGANIC:BORAX"INORGANIC:OLIVINE"INORGANIC:HORNBLENDE"INORGANIC:KAOLINITE"INORGANIC:SERPENTINE"INORGANIC:ORTHOCLASE"INORGANIC:MICROCLINE"INORGANIC:MICA"INORGANIC:CALCITE"INORGANIC:SALTPETER"INORGANIC:ALABASTER"INORGANIC:SELENITE"INORGANIC:SATINSPAR"INORGANIC:ANHYDRITE"INORGANIC:ALUNITE"INORGANIC:RAW_ADAMANTINE"INORGANIC:SLADE" INORGANIC:BROMS_CLEAN_CORPSEDUST"INORGANIC:GOLD"INORGANIC:DIVINE_1"INORGANIC:DIVINE_3"INORGANIC:DIVINE_5"INORGANIC:DIVINE_7"INORGANIC:DIVINE_9"INORGANIC:DIVINE_11"INORGANIC:DIVINE_13"INORGANIC:DIVINE_15"INORGANIC:DIVINE_17"INORGANIC:DIVINE_19
\ No newline at end of file
diff --git a/data/stockpiles/bolts.dfstock b/data/stockpiles/bolts.dfstock
new file mode 100644
index 000000000..2e5bd4b4b
--- /dev/null
+++ b/data/stockpiles/bolts.dfstock
@@ -0,0 +1,2 @@
+B
+AMMO:ITEM_AMMO_BOLTS
\ No newline at end of file
diff --git a/data/stockpiles/boneammo.dfstock b/data/stockpiles/boneammo.dfstock
new file mode 100644
index 000000000..909c67d1d
--- /dev/null
+++ b/data/stockpiles/boneammo.dfstock
@@ -0,0 +1 @@
+BBONE
\ No newline at end of file
diff --git a/data/stockpiles/booze.dfstock b/data/stockpiles/booze.dfstock
new file mode 100644
index 000000000..736560f98
Binary files /dev/null and b/data/stockpiles/booze.dfstock differ
diff --git a/data/stockpiles/bronzearmor.dfstock b/data/stockpiles/bronzearmor.dfstock
new file mode 100644
index 000000000..22dda4155
Binary files /dev/null and b/data/stockpiles/bronzearmor.dfstock differ
diff --git a/data/stockpiles/bronzeweapons.dfstock b/data/stockpiles/bronzeweapons.dfstock
new file mode 100644
index 000000000..54cd87d11
Binary files /dev/null and b/data/stockpiles/bronzeweapons.dfstock differ
diff --git a/data/stockpiles/buckets.dfstock b/data/stockpiles/buckets.dfstock
new file mode 100644
index 000000000..cb6b8c4bb
--- /dev/null
+++ b/data/stockpiles/buckets.dfstock
@@ -0,0 +1,2 @@
+
+BUCKET
\ No newline at end of file
diff --git a/data/stockpiles/cages.dfstock b/data/stockpiles/cages.dfstock
new file mode 100644
index 000000000..0ca677985
Binary files /dev/null and b/data/stockpiles/cages.dfstock differ
diff --git a/data/stockpiles/cat_ammo.dfstock b/data/stockpiles/cat_ammo.dfstock
new file mode 100644
index 000000000..55a20e7e6
--- /dev/null
+++ b/data/stockpiles/cat_ammo.dfstock
@@ -0,0 +1 @@
+B0

\ No newline at end of file
diff --git a/data/stockpiles/cat_animals.dfstock b/data/stockpiles/cat_animals.dfstock
new file mode 100644
index 000000000..9796e4535
--- /dev/null
+++ b/data/stockpiles/cat_animals.dfstock
@@ -0,0 +1,2 @@
+
+ 

\ No newline at end of file
diff --git a/data/stockpiles/cat_armor.dfstock b/data/stockpiles/cat_armor.dfstock
new file mode 100644
index 000000000..54a2d54ee
--- /dev/null
+++ b/data/stockpiles/cat_armor.dfstock
@@ -0,0 +1 @@
+Š
h

\ No newline at end of file
diff --git a/data/stockpiles/cat_bars_blocks.dfstock b/data/stockpiles/cat_bars_blocks.dfstock
new file mode 100644
index 000000000..b7ae54bb1
--- /dev/null
+++ b/data/stockpiles/cat_bars_blocks.dfstock
@@ -0,0 +1 @@
+R(

\ No newline at end of file
diff --git a/data/stockpiles/cat_cloth.dfstock b/data/stockpiles/cat_cloth.dfstock
new file mode 100644
index 000000000..d88106c6b
--- /dev/null
+++ b/data/stockpiles/cat_cloth.dfstock
@@ -0,0 +1 @@
+rH

\ No newline at end of file
diff --git a/data/stockpiles/cat_coins.dfstock b/data/stockpiles/cat_coins.dfstock
new file mode 100644
index 000000000..a48133ac4
--- /dev/null
+++ b/data/stockpiles/cat_coins.dfstock
@@ -0,0 +1 @@
+J

\ No newline at end of file
diff --git a/data/stockpiles/cat_corpses.dfstock b/data/stockpiles/cat_corpses.dfstock
new file mode 100644
index 000000000..f4edc7ff8
--- /dev/null
+++ b/data/stockpiles/cat_corpses.dfstock
@@ -0,0 +1 @@
+Ê


\ No newline at end of file
diff --git a/data/stockpiles/cat_finished_goods.dfstock b/data/stockpiles/cat_finished_goods.dfstock
new file mode 100644
index 000000000..68a2d9053
--- /dev/null
+++ b/data/stockpiles/cat_finished_goods.dfstock
@@ -0,0 +1 @@
+b0

\ No newline at end of file
diff --git a/data/stockpiles/cat_food.dfstock b/data/stockpiles/cat_food.dfstock
new file mode 100644
index 000000000..32829f677
--- /dev/null
+++ b/data/stockpiles/cat_food.dfstock
@@ -0,0 +1 @@
+¨


\ No newline at end of file
diff --git a/data/stockpiles/cat_furniture.dfstock b/data/stockpiles/cat_furniture.dfstock
new file mode 100644
index 000000000..fdec022ed
--- /dev/null
+++ b/data/stockpiles/cat_furniture.dfstock
@@ -0,0 +1 @@
+8

\ No newline at end of file
diff --git a/data/stockpiles/cat_gems.dfstock b/data/stockpiles/cat_gems.dfstock
new file mode 100644
index 000000000..8a6483e26
--- /dev/null
+++ b/data/stockpiles/cat_gems.dfstock
@@ -0,0 +1 @@
+Z(

\ No newline at end of file
diff --git a/data/stockpiles/cat_leather.dfstock b/data/stockpiles/cat_leather.dfstock
new file mode 100644
index 000000000..357287897
--- /dev/null
+++ b/data/stockpiles/cat_leather.dfstock
@@ -0,0 +1 @@
+j

\ No newline at end of file
diff --git a/data/stockpiles/cat_refuse.dfstock b/data/stockpiles/cat_refuse.dfstock
new file mode 100644
index 000000000..a6219a81a
--- /dev/null
+++ b/data/stockpiles/cat_refuse.dfstock
@@ -0,0 +1 @@
+*`

\ No newline at end of file
diff --git a/data/stockpiles/cat_sheets.dfstock b/data/stockpiles/cat_sheets.dfstock
new file mode 100644
index 000000000..0230086d8
--- /dev/null
+++ b/data/stockpiles/cat_sheets.dfstock
@@ -0,0 +1 @@
+Ò


\ No newline at end of file
diff --git a/data/stockpiles/cat_stone.dfstock b/data/stockpiles/cat_stone.dfstock
new file mode 100644
index 000000000..29bcd227e
--- /dev/null
+++ b/data/stockpiles/cat_stone.dfstock
@@ -0,0 +1 @@
+2

\ No newline at end of file
diff --git a/data/stockpiles/cat_weapons.dfstock b/data/stockpiles/cat_weapons.dfstock
new file mode 100644
index 000000000..8f46ee619
--- /dev/null
+++ b/data/stockpiles/cat_weapons.dfstock
@@ -0,0 +1 @@
+‚
H

\ No newline at end of file
diff --git a/data/stockpiles/cat_wood.dfstock b/data/stockpiles/cat_wood.dfstock
new file mode 100644
index 000000000..5613a0f07
--- /dev/null
+++ b/data/stockpiles/cat_wood.dfstock
@@ -0,0 +1 @@
+z

\ No newline at end of file
diff --git a/data/stockpiles/clay.dfstock b/data/stockpiles/clay.dfstock
new file mode 100644
index 000000000..e01c7abaf
--- /dev/null
+++ b/data/stockpiles/clay.dfstock
@@ -0,0 +1,6 @@
+2f
+INORGANIC:CLAY
+INORGANIC:SILTY_CLAY
+INORGANIC:SANDY_CLAY
+INORGANIC:CLAY_LOAM
+INORGANIC:FIRE_CLAY
\ No newline at end of file
diff --git a/data/stockpiles/cloth.dfstock b/data/stockpiles/cloth.dfstock
new file mode 100644
index 000000000..26c4c52f3
--- /dev/null
+++ b/data/stockpiles/cloth.dfstock
@@ -0,0 +1 @@
+rŽ'*"CREATURE:SPIDER_BROWN_RECLUSE:SILK*&CREATURE:BROWN_RECLUSE_SPIDER_MAN:SILK*(CREATURE:GIANT_BROWN_RECLUSE_SPIDER:SILK*CREATURE:SPIDER_PHANTOM:SILK*CREATURE:SPIDER_CAVE_GIANT:SILK*CREATURE:SPIDER_CAVE:SILK*INORGANIC:DIVINE_2*INORGANIC:DIVINE_4*INORGANIC:DIVINE_6*INORGANIC:DIVINE_8*INORGANIC:DIVINE_10*INORGANIC:DIVINE_12*INORGANIC:DIVINE_14*INORGANIC:DIVINE_16*INORGANIC:DIVINE_18*INORGANIC:DIVINE_20*CREATURE:FORGOTTEN_BEAST_4:SILK* CREATURE:FORGOTTEN_BEAST_22:SILK* CREATURE:FORGOTTEN_BEAST_33:SILK* CREATURE:FORGOTTEN_BEAST_51:SILK* CREATURE:FORGOTTEN_BEAST_56:SILK* CREATURE:FORGOTTEN_BEAST_58:SILK* CREATURE:FORGOTTEN_BEAST_62:SILK* CREATURE:FORGOTTEN_BEAST_74:SILK* CREATURE:FORGOTTEN_BEAST_80:SILK* CREATURE:FORGOTTEN_BEAST_87:SILK* CREATURE:FORGOTTEN_BEAST_90:SILK*!CREATURE:FORGOTTEN_BEAST_106:SILK*!CREATURE:FORGOTTEN_BEAST_109:SILK*!CREATURE:FORGOTTEN_BEAST_127:SILK*!CREATURE:FORGOTTEN_BEAST_131:SILK*!CREATURE:FORGOTTEN_BEAST_143:SILK*!CREATURE:FORGOTTEN_BEAST_145:SILK*!CREATURE:FORGOTTEN_BEAST_163:SILK*!CREATURE:FORGOTTEN_BEAST_177:SILK*!CREATURE:FORGOTTEN_BEAST_189:SILK*!CREATURE:FORGOTTEN_BEAST_194:SILK*!CREATURE:FORGOTTEN_BEAST_197:SILK*!CREATURE:FORGOTTEN_BEAST_200:SILK*!CREATURE:FORGOTTEN_BEAST_201:SILK*!CREATURE:FORGOTTEN_BEAST_202:SILK*!CREATURE:FORGOTTEN_BEAST_217:SILK*!CREATURE:FORGOTTEN_BEAST_224:SILK*!CREATURE:FORGOTTEN_BEAST_234:SILK*!CREATURE:FORGOTTEN_BEAST_242:SILK*!CREATURE:FORGOTTEN_BEAST_246:SILK*!CREATURE:FORGOTTEN_BEAST_250:SILK*!CREATURE:FORGOTTEN_BEAST_270:SILK*!CREATURE:FORGOTTEN_BEAST_271:SILK*!CREATURE:FORGOTTEN_BEAST_286:SILK*!CREATURE:FORGOTTEN_BEAST_291:SILK*!CREATURE:FORGOTTEN_BEAST_296:SILK*!CREATURE:FORGOTTEN_BEAST_329:SILK*!CREATURE:FORGOTTEN_BEAST_350:SILK*!CREATURE:FORGOTTEN_BEAST_351:SILK*!CREATURE:FORGOTTEN_BEAST_359:SILK*!CREATURE:FORGOTTEN_BEAST_365:SILK*!CREATURE:FORGOTTEN_BEAST_375:SILK*!CREATURE:FORGOTTEN_BEAST_376:SILK*!CREATURE:FORGOTTEN_BEAST_377:SILK*!CREATURE:FORGOTTEN_BEAST_383:SILK*!CREATURE:FORGOTTEN_BEAST_387:SILK*!CREATURE:FORGOTTEN_BEAST_398:SILK*!CREATURE:FORGOTTEN_BEAST_400:SILK*!CREATURE:FORGOTTEN_BEAST_406:SILK*!CREATURE:FORGOTTEN_BEAST_410:SILK*!CREATURE:FORGOTTEN_BEAST_417:SILK*!CREATURE:FORGOTTEN_BEAST_428:SILK*!CREATURE:FORGOTTEN_BEAST_429:SILK*!CREATURE:FORGOTTEN_BEAST_432:SILK*!CREATURE:FORGOTTEN_BEAST_442:SILK*!CREATURE:FORGOTTEN_BEAST_448:SILK*!CREATURE:FORGOTTEN_BEAST_452:SILK*!CREATURE:FORGOTTEN_BEAST_457:SILK*!CREATURE:FORGOTTEN_BEAST_468:SILK*!CREATURE:FORGOTTEN_BEAST_472:SILK*!CREATURE:FORGOTTEN_BEAST_479:SILK*!CREATURE:FORGOTTEN_BEAST_482:SILK*!CREATURE:FORGOTTEN_BEAST_492:SILK*!CREATURE:FORGOTTEN_BEAST_504:SILK*!CREATURE:FORGOTTEN_BEAST_512:SILK*!CREATURE:FORGOTTEN_BEAST_519:SILK*!CREATURE:FORGOTTEN_BEAST_537:SILK*!CREATURE:FORGOTTEN_BEAST_550:SILK*!CREATURE:FORGOTTEN_BEAST_556:SILK*!CREATURE:FORGOTTEN_BEAST_557:SILK*!CREATURE:FORGOTTEN_BEAST_563:SILK*!CREATURE:FORGOTTEN_BEAST_573:SILK*!CREATURE:FORGOTTEN_BEAST_583:SILK*!CREATURE:FORGOTTEN_BEAST_588:SILK*!CREATURE:FORGOTTEN_BEAST_599:SILK*!CREATURE:FORGOTTEN_BEAST_602:SILK*!CREATURE:FORGOTTEN_BEAST_605:SILK*!CREATURE:FORGOTTEN_BEAST_607:SILK*!CREATURE:FORGOTTEN_BEAST_611:SILK*!CREATURE:FORGOTTEN_BEAST_618:SILK*!CREATURE:FORGOTTEN_BEAST_621:SILK*!CREATURE:FORGOTTEN_BEAST_627:SILK*!CREATURE:FORGOTTEN_BEAST_638:SILK*!CREATURE:FORGOTTEN_BEAST_639:SILK*!CREATURE:FORGOTTEN_BEAST_651:SILK*!CREATURE:FORGOTTEN_BEAST_659:SILK*!CREATURE:FORGOTTEN_BEAST_670:SILK*!CREATURE:FORGOTTEN_BEAST_686:SILK*!CREATURE:FORGOTTEN_BEAST_692:SILK*!CREATURE:FORGOTTEN_BEAST_695:SILK*!CREATURE:FORGOTTEN_BEAST_697:SILK*!CREATURE:FORGOTTEN_BEAST_699:SILK*!CREATURE:FORGOTTEN_BEAST_707:SILK*!CREATURE:FORGOTTEN_BEAST_713:SILK*!CREATURE:FORGOTTEN_BEAST_723:SILK*!CREATURE:FORGOTTEN_BEAST_733:SILK*!CREATURE:FORGOTTEN_BEAST_740:SILK*!CREATURE:FORGOTTEN_BEAST_741:SILK*!CREATURE:FORGOTTEN_BEAST_747:SILK*!CREATURE:FORGOTTEN_BEAST_758:SILK*!CREATURE:FORGOTTEN_BEAST_766:SILK*!CREATURE:FORGOTTEN_BEAST_769:SILK*!CREATURE:FORGOTTEN_BEAST_771:SILK*!CREATURE:FORGOTTEN_BEAST_790:SILK*!CREATURE:FORGOTTEN_BEAST_794:SILK*!CREATURE:FORGOTTEN_BEAST_826:SILK*!CREATURE:FORGOTTEN_BEAST_827:SILK*!CREATURE:FORGOTTEN_BEAST_837:SILK*!CREATURE:FORGOTTEN_BEAST_839:SILK*!CREATURE:FORGOTTEN_BEAST_846:SILK*!CREATURE:FORGOTTEN_BEAST_847:SILK*!CREATURE:FORGOTTEN_BEAST_849:SILK*!CREATURE:FORGOTTEN_BEAST_850:SILK*!CREATURE:FORGOTTEN_BEAST_855:SILK*CREATURE:TITAN_1:SILK*CREATURE:TITAN_5:SILK*CREATURE:TITAN_18:SILK*CREATURE:TITAN_24:SILK*CREATURE:TITAN_28:SILK*CREATURE:TITAN_29:SILK*CREATURE:TITAN_30:SILK*CREATURE:TITAN_31:SILK*CREATURE:DEMON_13:SILK*CREATURE:DEMON_15:SILK*CREATURE:DEMON_43:SILK*CREATURE:DEMON_46:SILK*CREATURE:DEMON_49:SILK*CREATURE:DEMON_50:SILK*CREATURE:DEMON_52:SILK2PLANT:FLAX:THREAD2PLANT:JUTE:THREAD2PLANT:HEMP:THREAD2PLANT:COTTON:THREAD2PLANT:RAMIE:THREAD2PLANT:KENAF:THREAD2PLANT:GRASS_TAIL_PIG:THREAD2PLANT:REED_ROPE:THREAD:CREATURE:SHEEP:HAIR:CREATURE:LLAMA:HAIR:CREATURE:ALPACA:HAIR:CREATURE:TROLL:HAIR
\ No newline at end of file
diff --git a/data/stockpiles/coal.dfstock b/data/stockpiles/coal.dfstock
new file mode 100644
index 000000000..8e9ec16e0
--- /dev/null
+++ b/data/stockpiles/coal.dfstock
@@ -0,0 +1,2 @@
+R
+COAL
\ No newline at end of file
diff --git a/data/stockpiles/coalproducing.dfstock b/data/stockpiles/coalproducing.dfstock
new file mode 100644
index 000000000..30d6f7adf
--- /dev/null
+++ b/data/stockpiles/coalproducing.dfstock
@@ -0,0 +1,3 @@
+2.
+INORGANIC:COAL_BITUMINOUS
+INORGANIC:LIGNITE
\ No newline at end of file
diff --git a/data/stockpiles/copperarmor.dfstock b/data/stockpiles/copperarmor.dfstock
new file mode 100644
index 000000000..bc7b8ec58
Binary files /dev/null and b/data/stockpiles/copperarmor.dfstock differ
diff --git a/data/stockpiles/copperweapons.dfstock b/data/stockpiles/copperweapons.dfstock
new file mode 100644
index 000000000..a30c53107
Binary files /dev/null and b/data/stockpiles/copperweapons.dfstock differ
diff --git a/data/stockpiles/crafts.dfstock b/data/stockpiles/crafts.dfstock
new file mode 100644
index 000000000..633dd9f1f
--- /dev/null
+++ b/data/stockpiles/crafts.dfstock
@@ -0,0 +1,10 @@
+bG
+FIGURINE
+AMULET
+SCEPTER
+CROWN
+RING
+EARRING
+BRACELET
+GEM
+TOTEM
\ No newline at end of file
diff --git a/data/stockpiles/cutgems.dfstock b/data/stockpiles/cutgems.dfstock
new file mode 100644
index 000000000..1049acd67
--- /dev/null
+++ b/data/stockpiles/cutgems.dfstock
@@ -0,0 +1 @@
+ZÃ"INORGANIC:ONYX"INORGANIC:MORION"INORGANIC:SCHORL"INORGANIC:LACE AGATE"INORGANIC:BLUE JADE"INORGANIC:LAPIS LAZULI"INORGANIC:PRASE"INORGANIC:PRASE OPAL"INORGANIC:BLOODSTONE"INORGANIC:MOSS AGATE"INORGANIC:MOSS OPAL"INORGANIC:VARISCITE"INORGANIC:CHRYSOPRASE"INORGANIC:CHRYSOCOLLA"INORGANIC:SARD"INORGANIC:CARNELIAN"INORGANIC:BANDED AGATE"INORGANIC:SARDONYX"INORGANIC:CHERRY OPAL"INORGANIC:LAVENDER JADE"INORGANIC:PINK JADE"INORGANIC:TUBE AGATE"INORGANIC:FIRE AGATE"INORGANIC:PLUME AGATE"INORGANIC:BROWN JASPER"INORGANIC:PICTURE JASPER"INORGANIC:SMOKY QUARTZ"INORGANIC:WAX OPAL"INORGANIC:WOOD OPAL"INORGANIC:AMBER OPAL"INORGANIC:GOLD OPAL"INORGANIC:CITRINE"INORGANIC:YELLOW JASPER"INORGANIC:TIGEREYE"INORGANIC:TIGER IRON"INORGANIC:SUNSTONE"INORGANIC:RESIN OPAL"INORGANIC:PYRITE"INORGANIC:CLEAR TOURMALINE"INORGANIC:GRAY CHALCEDONY"INORGANIC:DENDRITIC AGATE"INORGANIC:SHELL OPAL"INORGANIC:BONE OPAL"INORGANIC:WHITE CHALCEDONY"INORGANIC:FORTIFICATION AGATE"INORGANIC:MILK QUARTZ"INORGANIC:MOONSTONE"INORGANIC:WHITE JADE"INORGANIC:JASPER OPAL"INORGANIC:PINEAPPLE OPAL"INORGANIC:ONYX OPAL"INORGANIC:MILK OPAL"INORGANIC:PIPE OPAL"INORGANIC:AVENTURINE"INORGANIC:TURQUOISE"INORGANIC:QUARTZ_ROSE"INORGANIC:CRYSTAL_ROCK"INORGANIC:BLACK ZIRCON"INORGANIC:BLACK PYROPE"INORGANIC:MELANITE"INORGANIC:INDIGO TOURMALINE"INORGANIC:BLUE GARNET"INORGANIC:TSAVORITE"INORGANIC:GREEN TOURMALINE"INORGANIC:DEMANTOID"INORGANIC:GREEN ZIRCON"INORGANIC:GREEN JADE"INORGANIC:HELIODOR"INORGANIC:PERIDOT"INORGANIC:RED ZIRCON"INORGANIC:RED TOURMALINE"INORGANIC:RED PYROPE"INORGANIC:ALMANDINE"INORGANIC:RED GROSSULAR"INORGANIC:PINK TOURMALINE"INORGANIC:RED BERYL"INORGANIC:FIRE OPAL"INORGANIC:RHODOLITE"INORGANIC:SPINEL_PURPLE"INORGANIC:ALEXANDRITE"INORGANIC:TANZANITE"INORGANIC:MORGANITE"INORGANIC:VIOLET SPESSARTINE"INORGANIC:PINK GARNET"INORGANIC:KUNZITE"INORGANIC:CINNAMON GROSSULAR"INORGANIC:HONEY YELLOW BERYL"INORGANIC:JELLY OPAL"INORGANIC:BROWN ZIRCON"INORGANIC:YELLOW ZIRCON"INORGANIC:GOLDEN BERYL"INORGANIC:YELLOW SPESSARTINE"INORGANIC:TOPAZ"INORGANIC:TOPAZOLITE"INORGANIC:YELLOW GROSSULAR"INORGANIC:RUBICELLE"INORGANIC:CLEAR GARNET"INORGANIC:GOSHENITE"INORGANIC:CAT'S EYE"INORGANIC:CLEAR ZIRCON"INORGANIC:AMETHYST"INORGANIC:AQUAMARINE"INORGANIC:SPINEL_RED"INORGANIC:CHRYSOBERYL"INORGANIC:OPAL_PFIRE"INORGANIC:OPAL_REDFLASH"INORGANIC:OPAL_BLACK"INORGANIC:OPAL_WHITE"INORGANIC:OPAL_CRYSTAL"INORGANIC:OPAL_CLARO"INORGANIC:OPAL_LEVIN"INORGANIC:OPAL_HARLEQUIN"INORGANIC:OPAL_PINFIRE"INORGANIC:OPAL_BANDFIRE"INORGANIC:DIAMOND_LY"INORGANIC:DIAMOND_FY"INORGANIC:EMERALD"INORGANIC:RUBY"INORGANIC:SAPPHIRE"INORGANIC:DIAMOND_CLEAR"INORGANIC:DIAMOND_RED"INORGANIC:DIAMOND_GREEN"INORGANIC:DIAMOND_BLUE"INORGANIC:DIAMOND_YELLOW"INORGANIC:DIAMOND_BLACK"INORGANIC:SAPPHIRE_STAR"INORGANIC:RUBY_STAR
\ No newline at end of file
diff --git a/data/stockpiles/cutglass.dfstock b/data/stockpiles/cutglass.dfstock
new file mode 100644
index 000000000..6997d42ac
--- /dev/null
+++ b/data/stockpiles/cutglass.dfstock
@@ -0,0 +1 @@
+Z)GLASS_GREENGLASS_CLEAR
GLASS_CRYSTAL
\ No newline at end of file
diff --git a/data/stockpiles/cutstone.dfstock b/data/stockpiles/cutstone.dfstock
new file mode 100644
index 000000000..5e0f3f881
--- /dev/null
+++ b/data/stockpiles/cutstone.dfstock
@@ -0,0 +1 @@
+Zâ"INORGANIC:PLASTER"INORGANIC:CERAMIC_EARTHENWARE"INORGANIC:CERAMIC_STONEWARE"INORGANIC:CERAMIC_PORCELAIN"INORGANIC:ASH_GLAZE"INORGANIC:TIN_GLAZE"INORGANIC:SANDSTONE"INORGANIC:SILTSTONE"INORGANIC:MUDSTONE"INORGANIC:SHALE"INORGANIC:CLAYSTONE"INORGANIC:ROCK_SALT"INORGANIC:LIMESTONE"INORGANIC:CONGLOMERATE"INORGANIC:DOLOMITE"INORGANIC:CHERT"INORGANIC:CHALK"INORGANIC:GRANITE"INORGANIC:DIORITE"INORGANIC:GABBRO"INORGANIC:RHYOLITE"INORGANIC:BASALT"INORGANIC:ANDESITE"INORGANIC:DACITE"INORGANIC:OBSIDIAN"INORGANIC:QUARTZITE"INORGANIC:SLATE"INORGANIC:PHYLLITE"INORGANIC:SCHIST"INORGANIC:GNEISS"INORGANIC:MARBLE"INORGANIC:HEMATITE"INORGANIC:LIMONITE"INORGANIC:GARNIERITE"INORGANIC:NATIVE_GOLD"INORGANIC:NATIVE_SILVER"INORGANIC:NATIVE_COPPER"INORGANIC:MALACHITE"INORGANIC:GALENA"INORGANIC:SPHALERITE"INORGANIC:CASSITERITE"INORGANIC:COAL_BITUMINOUS"INORGANIC:LIGNITE"INORGANIC:NATIVE_PLATINUM"INORGANIC:CINNABAR"INORGANIC:COBALTITE"INORGANIC:TETRAHEDRITE"INORGANIC:HORN_SILVER"INORGANIC:GYPSUM"INORGANIC:TALC"
INORGANIC:JET"INORGANIC:PUDDINGSTONE"INORGANIC:PETRIFIED_WOOD"INORGANIC:GRAPHITE"INORGANIC:BRIMSTONE"INORGANIC:KIMBERLITE"INORGANIC:BISMUTHINITE"INORGANIC:REALGAR"INORGANIC:ORPIMENT"INORGANIC:STIBNITE"INORGANIC:MARCASITE"INORGANIC:SYLVITE"INORGANIC:CRYOLITE"INORGANIC:PERICLASE"INORGANIC:ILMENITE"INORGANIC:RUTILE"INORGANIC:MAGNETITE"INORGANIC:CHROMITE"INORGANIC:PYROLUSITE"INORGANIC:PITCHBLENDE"INORGANIC:BAUXITE"INORGANIC:NATIVE_ALUMINUM"INORGANIC:BORAX"INORGANIC:OLIVINE"INORGANIC:HORNBLENDE"INORGANIC:KAOLINITE"INORGANIC:SERPENTINE"INORGANIC:ORTHOCLASE"INORGANIC:MICROCLINE"INORGANIC:MICA"INORGANIC:CALCITE"INORGANIC:SALTPETER"INORGANIC:ALABASTER"INORGANIC:SELENITE"INORGANIC:SATINSPAR"INORGANIC:ANHYDRITE"INORGANIC:ALUNITE"INORGANIC:RAW_ADAMANTINE"INORGANIC:SLADE" INORGANIC:BROMS_CLEAN_CORPSEDUST
\ No newline at end of file
diff --git a/data/stockpiles/dye.dfstock b/data/stockpiles/dye.dfstock
new file mode 100644
index 000000000..67b785d20
Binary files /dev/null and b/data/stockpiles/dye.dfstock differ
diff --git a/data/stockpiles/economic.dfstock b/data/stockpiles/economic.dfstock
new file mode 100644
index 000000000..976f4cc11
--- /dev/null
+++ b/data/stockpiles/economic.dfstock
@@ -0,0 +1,13 @@
+2ò

+INORGANIC:LIMESTONE
+INORGANIC:DOLOMITE
+INORGANIC:CHALK
+INORGANIC:MARBLE
+INORGANIC:COAL_BITUMINOUS
+INORGANIC:LIGNITE
+INORGANIC:GYPSUM
+INORGANIC:KAOLINITE
+INORGANIC:CALCITE
+INORGANIC:ALABASTER
+INORGANIC:SELENITE
+INORGANIC:SATINSPAR
\ No newline at end of file
diff --git a/data/stockpiles/everything.dfstock b/data/stockpiles/everything.dfstock
new file mode 100644
index 000000000..c0fcb6051
Binary files /dev/null and b/data/stockpiles/everything.dfstock differ
diff --git a/data/stockpiles/flux.dfstock b/data/stockpiles/flux.dfstock
new file mode 100644
index 000000000..ec86187db
--- /dev/null
+++ b/data/stockpiles/flux.dfstock
@@ -0,0 +1,6 @@
+2_
+INORGANIC:LIMESTONE
+INORGANIC:DOLOMITE
+INORGANIC:CHALK
+INORGANIC:MARBLE
+INORGANIC:CALCITE
\ No newline at end of file
diff --git a/data/stockpiles/goblets.dfstock b/data/stockpiles/goblets.dfstock
new file mode 100644
index 000000000..bff4f8a6d
--- /dev/null
+++ b/data/stockpiles/goblets.dfstock
@@ -0,0 +1,2 @@
+b
+GOBLET
\ No newline at end of file
diff --git a/data/stockpiles/ironarmor.dfstock b/data/stockpiles/ironarmor.dfstock
new file mode 100644
index 000000000..9474bd69f
Binary files /dev/null and b/data/stockpiles/ironarmor.dfstock differ
diff --git a/data/stockpiles/ironbars.dfstock b/data/stockpiles/ironbars.dfstock
new file mode 100644
index 000000000..2cb77c0e3
--- /dev/null
+++ b/data/stockpiles/ironbars.dfstock
@@ -0,0 +1 @@
+RINORGANIC:IRON
\ No newline at end of file
diff --git a/data/stockpiles/ironore.dfstock b/data/stockpiles/ironore.dfstock
new file mode 100644
index 000000000..2108b60ac
--- /dev/null
+++ b/data/stockpiles/ironore.dfstock
@@ -0,0 +1,4 @@
+2=
+INORGANIC:HEMATITE
+INORGANIC:LIMONITE
+INORGANIC:MAGNETITE
\ No newline at end of file
diff --git a/data/stockpiles/ironweapons.dfstock b/data/stockpiles/ironweapons.dfstock
new file mode 100644
index 000000000..8c0afecd1
Binary files /dev/null and b/data/stockpiles/ironweapons.dfstock differ
diff --git a/data/stockpiles/masterworks.dfstock b/data/stockpiles/masterworks.dfstock
new file mode 100644
index 000000000..fa94c86a9
Binary files /dev/null and b/data/stockpiles/masterworks.dfstock differ
diff --git a/data/stockpiles/metalammo.dfstock b/data/stockpiles/metalammo.dfstock
new file mode 100644
index 000000000..f1d9cdee9
--- /dev/null
+++ b/data/stockpiles/metalammo.dfstock
@@ -0,0 +1 @@
+BÒINORGANIC:IRONINORGANIC:SILVERINORGANIC:COPPERINORGANIC:NICKELINORGANIC:ZINCINORGANIC:BRONZEINORGANIC:BRASSINORGANIC:STEELINORGANIC:PIG_IRONINORGANIC:PLATINUMINORGANIC:ELECTRUM
INORGANIC:TININORGANIC:PEWTER_FINEINORGANIC:PEWTER_TRIFLEINORGANIC:PEWTER_LAYINORGANIC:LEADINORGANIC:ALUMINUMINORGANIC:NICKEL_SILVERINORGANIC:BILLONINORGANIC:STERLING_SILVERINORGANIC:BLACK_BRONZEINORGANIC:ROSE_GOLDINORGANIC:BISMUTHINORGANIC:BISMUTH_BRONZEINORGANIC:ADAMANTINEINORGANIC:GOLDINORGANIC:DIVINE_1INORGANIC:DIVINE_3INORGANIC:DIVINE_5INORGANIC:DIVINE_7INORGANIC:DIVINE_9INORGANIC:DIVINE_11INORGANIC:DIVINE_13INORGANIC:DIVINE_15INORGANIC:DIVINE_17INORGANIC:DIVINE_19
\ No newline at end of file
diff --git a/data/stockpiles/metalarmor.dfstock b/data/stockpiles/metalarmor.dfstock
new file mode 100644
index 000000000..f3a00646a
Binary files /dev/null and b/data/stockpiles/metalarmor.dfstock differ
diff --git a/data/stockpiles/metalbars.dfstock b/data/stockpiles/metalbars.dfstock
new file mode 100644
index 000000000..103619c50
--- /dev/null
+++ b/data/stockpiles/metalbars.dfstock
@@ -0,0 +1 @@
+RÒINORGANIC:IRONINORGANIC:SILVERINORGANIC:COPPERINORGANIC:NICKELINORGANIC:ZINCINORGANIC:BRONZEINORGANIC:BRASSINORGANIC:STEELINORGANIC:PIG_IRONINORGANIC:PLATINUMINORGANIC:ELECTRUM
INORGANIC:TININORGANIC:PEWTER_FINEINORGANIC:PEWTER_TRIFLEINORGANIC:PEWTER_LAYINORGANIC:LEADINORGANIC:ALUMINUMINORGANIC:NICKEL_SILVERINORGANIC:BILLONINORGANIC:STERLING_SILVERINORGANIC:BLACK_BRONZEINORGANIC:ROSE_GOLDINORGANIC:BISMUTHINORGANIC:BISMUTH_BRONZEINORGANIC:ADAMANTINEINORGANIC:GOLDINORGANIC:DIVINE_1INORGANIC:DIVINE_3INORGANIC:DIVINE_5INORGANIC:DIVINE_7INORGANIC:DIVINE_9INORGANIC:DIVINE_11INORGANIC:DIVINE_13INORGANIC:DIVINE_15INORGANIC:DIVINE_17INORGANIC:DIVINE_19
\ No newline at end of file
diff --git a/data/stockpiles/metalore.dfstock b/data/stockpiles/metalore.dfstock
new file mode 100644
index 000000000..8cbb60959
--- /dev/null
+++ b/data/stockpiles/metalore.dfstock
@@ -0,0 +1,17 @@
+2í
+INORGANIC:HEMATITE
+INORGANIC:LIMONITE
+INORGANIC:GARNIERITE
+INORGANIC:NATIVE_GOLD
+INORGANIC:NATIVE_SILVER
+INORGANIC:NATIVE_COPPER
+INORGANIC:MALACHITE
+INORGANIC:GALENA
+INORGANIC:SPHALERITE
+INORGANIC:CASSITERITE
+INORGANIC:NATIVE_PLATINUM
+INORGANIC:TETRAHEDRITE
+INORGANIC:HORN_SILVER
+INORGANIC:BISMUTHINITE
+INORGANIC:MAGNETITE
+INORGANIC:NATIVE_ALUMINUM
\ No newline at end of file
diff --git a/data/stockpiles/metalweapons.dfstock b/data/stockpiles/metalweapons.dfstock
new file mode 100644
index 000000000..b9cd66511
Binary files /dev/null and b/data/stockpiles/metalweapons.dfstock differ
diff --git a/data/stockpiles/miscliquid.dfstock b/data/stockpiles/miscliquid.dfstock
new file mode 100644
index 000000000..dbf75a072
Binary files /dev/null and b/data/stockpiles/miscliquid.dfstock differ
diff --git a/data/stockpiles/organic.dfstock b/data/stockpiles/organic.dfstock
new file mode 100644
index 000000000..70f0496ca
Binary files /dev/null and b/data/stockpiles/organic.dfstock differ
diff --git a/data/stockpiles/otherarmor.dfstock b/data/stockpiles/otherarmor.dfstock
new file mode 100644
index 000000000..ec857e0cc
Binary files /dev/null and b/data/stockpiles/otherarmor.dfstock differ
diff --git a/data/stockpiles/otherbars.dfstock b/data/stockpiles/otherbars.dfstock
new file mode 100644
index 000000000..4cbcc1c8f
--- /dev/null
+++ b/data/stockpiles/otherbars.dfstock
@@ -0,0 +1,6 @@
+R#
+COAL
+POTASH
+ASH
+PEARLASH
+SOAP
\ No newline at end of file
diff --git a/data/stockpiles/otherstone.dfstock b/data/stockpiles/otherstone.dfstock
new file mode 100644
index 000000000..1f9f867ed
--- /dev/null
+++ b/data/stockpiles/otherstone.dfstock
@@ -0,0 +1,56 @@
+2Ë
+INORGANIC:SANDSTONE
+INORGANIC:SILTSTONE
+INORGANIC:MUDSTONE
+INORGANIC:SHALE
+INORGANIC:CLAYSTONE
+INORGANIC:ROCK_SALT
+INORGANIC:CONGLOMERATE
+INORGANIC:CHERT
+INORGANIC:GRANITE
+INORGANIC:DIORITE
+INORGANIC:GABBRO
+INORGANIC:RHYOLITE
+INORGANIC:BASALT
+INORGANIC:ANDESITE
+INORGANIC:DACITE
+INORGANIC:OBSIDIAN
+INORGANIC:QUARTZITE
+INORGANIC:SLATE
+INORGANIC:PHYLLITE
+INORGANIC:SCHIST
+INORGANIC:GNEISS
+INORGANIC:CINNABAR
+INORGANIC:COBALTITE
+INORGANIC:TALC
+
INORGANIC:JET
+INORGANIC:PUDDINGSTONE
+INORGANIC:PETRIFIED_WOOD
+INORGANIC:GRAPHITE
+INORGANIC:BRIMSTONE
+INORGANIC:KIMBERLITE
+INORGANIC:REALGAR
+INORGANIC:ORPIMENT
+INORGANIC:STIBNITE
+INORGANIC:MARCASITE
+INORGANIC:SYLVITE
+INORGANIC:CRYOLITE
+INORGANIC:PERICLASE
+INORGANIC:ILMENITE
+INORGANIC:RUTILE
+INORGANIC:CHROMITE
+INORGANIC:PYROLUSITE
+INORGANIC:PITCHBLENDE
+INORGANIC:BAUXITE
+INORGANIC:BORAX
+INORGANIC:OLIVINE
+INORGANIC:HORNBLENDE
+INORGANIC:SERPENTINE
+INORGANIC:ORTHOCLASE
+INORGANIC:MICROCLINE
+INORGANIC:MICA
+INORGANIC:SALTPETER
+INORGANIC:ANHYDRITE
+INORGANIC:ALUNITE
+INORGANIC:RAW_ADAMANTINE
+INORGANIC:SLADE
\ No newline at end of file
diff --git a/data/stockpiles/otherweapons.dfstock b/data/stockpiles/otherweapons.dfstock
new file mode 100644
index 000000000..f1127a784
Binary files /dev/null and b/data/stockpiles/otherweapons.dfstock differ
diff --git a/data/stockpiles/pearlash.dfstock b/data/stockpiles/pearlash.dfstock
new file mode 100644
index 000000000..3cea5164d
--- /dev/null
+++ b/data/stockpiles/pearlash.dfstock
@@ -0,0 +1,3 @@
+R
+
+PEARLASH
\ No newline at end of file
diff --git a/data/stockpiles/pigironbars.dfstock b/data/stockpiles/pigironbars.dfstock
new file mode 100644
index 000000000..f07b1def2
--- /dev/null
+++ b/data/stockpiles/pigironbars.dfstock
@@ -0,0 +1 @@
+RINORGANIC:PIG_IRON
\ No newline at end of file
diff --git a/data/stockpiles/plants.dfstock b/data/stockpiles/plants.dfstock
new file mode 100644
index 000000000..ca55f19f9
Binary files /dev/null and b/data/stockpiles/plants.dfstock differ
diff --git a/data/stockpiles/plasterproducing.dfstock b/data/stockpiles/plasterproducing.dfstock
new file mode 100644
index 000000000..2764150a3
--- /dev/null
+++ b/data/stockpiles/plasterproducing.dfstock
@@ -0,0 +1,5 @@
+2P
+INORGANIC:GYPSUM
+INORGANIC:ALABASTER
+INORGANIC:SELENITE
+INORGANIC:SATINSPAR
\ No newline at end of file
diff --git a/data/stockpiles/platinumweapons.dfstock b/data/stockpiles/platinumweapons.dfstock
new file mode 100644
index 000000000..162865512
Binary files /dev/null and b/data/stockpiles/platinumweapons.dfstock differ
diff --git a/data/stockpiles/potash.dfstock b/data/stockpiles/potash.dfstock
new file mode 100644
index 000000000..8a09e446f
--- /dev/null
+++ b/data/stockpiles/potash.dfstock
@@ -0,0 +1,2 @@
+R
+POTASH
\ No newline at end of file
diff --git a/data/stockpiles/pots.dfstock b/data/stockpiles/pots.dfstock
new file mode 100644
index 000000000..2c1fe0e5c
--- /dev/null
+++ b/data/stockpiles/pots.dfstock
@@ -0,0 +1,2 @@
+
+FOOD_STORAGE
\ No newline at end of file
diff --git a/data/stockpiles/preparedmeals.dfstock b/data/stockpiles/preparedmeals.dfstock
new file mode 100644
index 000000000..657c93f38
--- /dev/null
+++ b/data/stockpiles/preparedmeals.dfstock
@@ -0,0 +1 @@
+˜


\ No newline at end of file
diff --git a/data/stockpiles/rawhides.dfstock b/data/stockpiles/rawhides.dfstock
new file mode 100644
index 000000000..eedc71760
Binary files /dev/null and b/data/stockpiles/rawhides.dfstock differ
diff --git a/data/stockpiles/roughgems.dfstock b/data/stockpiles/roughgems.dfstock
new file mode 100644
index 000000000..fdad4be1a
--- /dev/null
+++ b/data/stockpiles/roughgems.dfstock
@@ -0,0 +1 @@
+ZÃINORGANIC:ONYXINORGANIC:MORIONINORGANIC:SCHORLINORGANIC:LACE AGATEINORGANIC:BLUE JADEINORGANIC:LAPIS LAZULIINORGANIC:PRASEINORGANIC:PRASE OPALINORGANIC:BLOODSTONEINORGANIC:MOSS AGATEINORGANIC:MOSS OPALINORGANIC:VARISCITEINORGANIC:CHRYSOPRASEINORGANIC:CHRYSOCOLLAINORGANIC:SARDINORGANIC:CARNELIANINORGANIC:BANDED AGATEINORGANIC:SARDONYXINORGANIC:CHERRY OPALINORGANIC:LAVENDER JADEINORGANIC:PINK JADEINORGANIC:TUBE AGATEINORGANIC:FIRE AGATEINORGANIC:PLUME AGATEINORGANIC:BROWN JASPERINORGANIC:PICTURE JASPERINORGANIC:SMOKY QUARTZINORGANIC:WAX OPALINORGANIC:WOOD OPALINORGANIC:AMBER OPALINORGANIC:GOLD OPALINORGANIC:CITRINEINORGANIC:YELLOW JASPERINORGANIC:TIGEREYEINORGANIC:TIGER IRONINORGANIC:SUNSTONEINORGANIC:RESIN OPALINORGANIC:PYRITEINORGANIC:CLEAR TOURMALINEINORGANIC:GRAY CHALCEDONYINORGANIC:DENDRITIC AGATEINORGANIC:SHELL OPALINORGANIC:BONE OPALINORGANIC:WHITE CHALCEDONYINORGANIC:FORTIFICATION AGATEINORGANIC:MILK QUARTZINORGANIC:MOONSTONEINORGANIC:WHITE JADEINORGANIC:JASPER OPALINORGANIC:PINEAPPLE OPALINORGANIC:ONYX OPALINORGANIC:MILK OPALINORGANIC:PIPE OPALINORGANIC:AVENTURINEINORGANIC:TURQUOISEINORGANIC:QUARTZ_ROSEINORGANIC:CRYSTAL_ROCKINORGANIC:BLACK ZIRCONINORGANIC:BLACK PYROPEINORGANIC:MELANITEINORGANIC:INDIGO TOURMALINEINORGANIC:BLUE GARNETINORGANIC:TSAVORITEINORGANIC:GREEN TOURMALINEINORGANIC:DEMANTOIDINORGANIC:GREEN ZIRCONINORGANIC:GREEN JADEINORGANIC:HELIODORINORGANIC:PERIDOTINORGANIC:RED ZIRCONINORGANIC:RED TOURMALINEINORGANIC:RED PYROPEINORGANIC:ALMANDINEINORGANIC:RED GROSSULARINORGANIC:PINK TOURMALINEINORGANIC:RED BERYLINORGANIC:FIRE OPALINORGANIC:RHODOLITEINORGANIC:SPINEL_PURPLEINORGANIC:ALEXANDRITEINORGANIC:TANZANITEINORGANIC:MORGANITEINORGANIC:VIOLET SPESSARTINEINORGANIC:PINK GARNETINORGANIC:KUNZITEINORGANIC:CINNAMON GROSSULARINORGANIC:HONEY YELLOW BERYLINORGANIC:JELLY OPALINORGANIC:BROWN ZIRCONINORGANIC:YELLOW ZIRCONINORGANIC:GOLDEN BERYLINORGANIC:YELLOW SPESSARTINEINORGANIC:TOPAZINORGANIC:TOPAZOLITEINORGANIC:YELLOW GROSSULARINORGANIC:RUBICELLEINORGANIC:CLEAR GARNETINORGANIC:GOSHENITEINORGANIC:CAT'S EYEINORGANIC:CLEAR ZIRCONINORGANIC:AMETHYSTINORGANIC:AQUAMARINEINORGANIC:SPINEL_REDINORGANIC:CHRYSOBERYLINORGANIC:OPAL_PFIREINORGANIC:OPAL_REDFLASHINORGANIC:OPAL_BLACKINORGANIC:OPAL_WHITEINORGANIC:OPAL_CRYSTALINORGANIC:OPAL_CLAROINORGANIC:OPAL_LEVININORGANIC:OPAL_HARLEQUININORGANIC:OPAL_PINFIREINORGANIC:OPAL_BANDFIREINORGANIC:DIAMOND_LYINORGANIC:DIAMOND_FYINORGANIC:EMERALDINORGANIC:RUBYINORGANIC:SAPPHIREINORGANIC:DIAMOND_CLEARINORGANIC:DIAMOND_REDINORGANIC:DIAMOND_GREENINORGANIC:DIAMOND_BLUEINORGANIC:DIAMOND_YELLOWINORGANIC:DIAMOND_BLACKINORGANIC:SAPPHIRE_STARINORGANIC:RUBY_STAR
\ No newline at end of file
diff --git a/data/stockpiles/roughglass.dfstock b/data/stockpiles/roughglass.dfstock
new file mode 100644
index 000000000..23b95b81a
--- /dev/null
+++ b/data/stockpiles/roughglass.dfstock
@@ -0,0 +1,4 @@
+Z)
+GLASS_GREEN
+GLASS_CLEAR
+
GLASS_CRYSTAL
\ No newline at end of file
diff --git a/data/stockpiles/sand.dfstock b/data/stockpiles/sand.dfstock
new file mode 100644
index 000000000..b97921e81
--- /dev/null
+++ b/data/stockpiles/sand.dfstock
@@ -0,0 +1,3 @@
+
+
+SAND_BAG
\ No newline at end of file
diff --git a/data/stockpiles/seeds.dfstock b/data/stockpiles/seeds.dfstock
new file mode 100644
index 000000000..ce9d0a4c2
Binary files /dev/null and b/data/stockpiles/seeds.dfstock differ
diff --git a/data/stockpiles/silverweapons.dfstock b/data/stockpiles/silverweapons.dfstock
new file mode 100644
index 000000000..de517d0ab
Binary files /dev/null and b/data/stockpiles/silverweapons.dfstock differ
diff --git a/data/stockpiles/soap.dfstock b/data/stockpiles/soap.dfstock
new file mode 100644
index 000000000..0436f1e7a
--- /dev/null
+++ b/data/stockpiles/soap.dfstock
@@ -0,0 +1,2 @@
+R
+SOAP
\ No newline at end of file
diff --git a/data/stockpiles/steelarmor.dfstock b/data/stockpiles/steelarmor.dfstock
new file mode 100644
index 000000000..c2ba86fcb
Binary files /dev/null and b/data/stockpiles/steelarmor.dfstock differ
diff --git a/data/stockpiles/steelbars.dfstock b/data/stockpiles/steelbars.dfstock
new file mode 100644
index 000000000..888f32e53
--- /dev/null
+++ b/data/stockpiles/steelbars.dfstock
@@ -0,0 +1 @@
+RINORGANIC:STEEL
\ No newline at end of file
diff --git a/data/stockpiles/steelweapons.dfstock b/data/stockpiles/steelweapons.dfstock
new file mode 100644
index 000000000..fc5233925
Binary files /dev/null and b/data/stockpiles/steelweapons.dfstock differ
diff --git a/data/stockpiles/stonetools.dfstock b/data/stockpiles/stonetools.dfstock
new file mode 100644
index 000000000..dee961a74
--- /dev/null
+++ b/data/stockpiles/stonetools.dfstock
@@ -0,0 +1,2 @@
+bÆ
+TOOLINORGANIC:PLASTERINORGANIC:CERAMIC_EARTHENWAREINORGANIC:CERAMIC_STONEWAREINORGANIC:CERAMIC_PORCELAININORGANIC:ASH_GLAZEINORGANIC:TIN_GLAZEINORGANIC:SANDSTONEINORGANIC:SILTSTONEINORGANIC:MUDSTONEINORGANIC:SHALEINORGANIC:CLAYSTONEINORGANIC:ROCK_SALTINORGANIC:LIMESTONEINORGANIC:CONGLOMERATEINORGANIC:DOLOMITEINORGANIC:CHERTINORGANIC:CHALKINORGANIC:GRANITEINORGANIC:DIORITEINORGANIC:GABBROINORGANIC:RHYOLITEINORGANIC:BASALTINORGANIC:ANDESITEINORGANIC:DACITEINORGANIC:OBSIDIANINORGANIC:QUARTZITEINORGANIC:SLATEINORGANIC:PHYLLITEINORGANIC:SCHISTINORGANIC:GNEISSINORGANIC:MARBLEINORGANIC:HEMATITEINORGANIC:LIMONITEINORGANIC:GARNIERITEINORGANIC:NATIVE_GOLDINORGANIC:NATIVE_SILVERINORGANIC:NATIVE_COPPERINORGANIC:MALACHITEINORGANIC:GALENAINORGANIC:SPHALERITEINORGANIC:CASSITERITEINORGANIC:COAL_BITUMINOUSINORGANIC:LIGNITEINORGANIC:NATIVE_PLATINUMINORGANIC:CINNABARINORGANIC:COBALTITEINORGANIC:TETRAHEDRITEINORGANIC:HORN_SILVERINORGANIC:GYPSUMINORGANIC:TALC
INORGANIC:JETINORGANIC:PUDDINGSTONEINORGANIC:PETRIFIED_WOODINORGANIC:GRAPHITEINORGANIC:BRIMSTONEINORGANIC:KIMBERLITEINORGANIC:BISMUTHINITEINORGANIC:REALGARINORGANIC:ORPIMENTINORGANIC:STIBNITEINORGANIC:MARCASITEINORGANIC:SYLVITEINORGANIC:CRYOLITEINORGANIC:PERICLASEINORGANIC:ILMENITEINORGANIC:RUTILEINORGANIC:MAGNETITEINORGANIC:CHROMITEINORGANIC:PYROLUSITEINORGANIC:PITCHBLENDEINORGANIC:BAUXITEINORGANIC:NATIVE_ALUMINUMINORGANIC:BORAXINORGANIC:OLIVINEINORGANIC:HORNBLENDEINORGANIC:KAOLINITEINORGANIC:SERPENTINEINORGANIC:ORTHOCLASEINORGANIC:MICROCLINEINORGANIC:MICAINORGANIC:CALCITEINORGANIC:SALTPETERINORGANIC:ALABASTERINORGANIC:SELENITEINORGANIC:SATINSPARINORGANIC:ANHYDRITEINORGANIC:ALUNITEINORGANIC:RAW_ADAMANTINEINORGANIC:SLADE
\ No newline at end of file
diff --git a/data/stockpiles/stoneweapons.dfstock b/data/stockpiles/stoneweapons.dfstock
new file mode 100644
index 000000000..acba2374c
Binary files /dev/null and b/data/stockpiles/stoneweapons.dfstock differ
diff --git a/data/stockpiles/tannedhides.dfstock b/data/stockpiles/tannedhides.dfstock
new file mode 100644
index 000000000..9c58d41ce
Binary files /dev/null and b/data/stockpiles/tannedhides.dfstock differ
diff --git a/data/stockpiles/thread.dfstock b/data/stockpiles/thread.dfstock
new file mode 100644
index 000000000..2774f50e8
--- /dev/null
+++ b/data/stockpiles/thread.dfstock
@@ -0,0 +1,146 @@
+rŽ'
+"CREATURE:SPIDER_BROWN_RECLUSE:SILK
+&CREATURE:BROWN_RECLUSE_SPIDER_MAN:SILK
+(CREATURE:GIANT_BROWN_RECLUSE_SPIDER:SILK
+CREATURE:SPIDER_PHANTOM:SILK
+CREATURE:SPIDER_CAVE_GIANT:SILK
+CREATURE:SPIDER_CAVE:SILK
+INORGANIC:DIVINE_2
+INORGANIC:DIVINE_4
+INORGANIC:DIVINE_6
+INORGANIC:DIVINE_8
+INORGANIC:DIVINE_10
+INORGANIC:DIVINE_12
+INORGANIC:DIVINE_14
+INORGANIC:DIVINE_16
+INORGANIC:DIVINE_18
+INORGANIC:DIVINE_20
+CREATURE:FORGOTTEN_BEAST_4:SILK
+ CREATURE:FORGOTTEN_BEAST_22:SILK
+ CREATURE:FORGOTTEN_BEAST_33:SILK
+ CREATURE:FORGOTTEN_BEAST_51:SILK
+ CREATURE:FORGOTTEN_BEAST_56:SILK
+ CREATURE:FORGOTTEN_BEAST_58:SILK
+ CREATURE:FORGOTTEN_BEAST_62:SILK
+ CREATURE:FORGOTTEN_BEAST_74:SILK
+ CREATURE:FORGOTTEN_BEAST_80:SILK
+ CREATURE:FORGOTTEN_BEAST_87:SILK
+ CREATURE:FORGOTTEN_BEAST_90:SILK
+!CREATURE:FORGOTTEN_BEAST_106:SILK
+!CREATURE:FORGOTTEN_BEAST_109:SILK
+!CREATURE:FORGOTTEN_BEAST_127:SILK
+!CREATURE:FORGOTTEN_BEAST_131:SILK
+!CREATURE:FORGOTTEN_BEAST_143:SILK
+!CREATURE:FORGOTTEN_BEAST_145:SILK
+!CREATURE:FORGOTTEN_BEAST_163:SILK
+!CREATURE:FORGOTTEN_BEAST_177:SILK
+!CREATURE:FORGOTTEN_BEAST_189:SILK
+!CREATURE:FORGOTTEN_BEAST_194:SILK
+!CREATURE:FORGOTTEN_BEAST_197:SILK
+!CREATURE:FORGOTTEN_BEAST_200:SILK
+!CREATURE:FORGOTTEN_BEAST_201:SILK
+!CREATURE:FORGOTTEN_BEAST_202:SILK
+!CREATURE:FORGOTTEN_BEAST_217:SILK
+!CREATURE:FORGOTTEN_BEAST_224:SILK
+!CREATURE:FORGOTTEN_BEAST_234:SILK
+!CREATURE:FORGOTTEN_BEAST_242:SILK
+!CREATURE:FORGOTTEN_BEAST_246:SILK
+!CREATURE:FORGOTTEN_BEAST_250:SILK
+!CREATURE:FORGOTTEN_BEAST_270:SILK
+!CREATURE:FORGOTTEN_BEAST_271:SILK
+!CREATURE:FORGOTTEN_BEAST_286:SILK
+!CREATURE:FORGOTTEN_BEAST_291:SILK
+!CREATURE:FORGOTTEN_BEAST_296:SILK
+!CREATURE:FORGOTTEN_BEAST_329:SILK
+!CREATURE:FORGOTTEN_BEAST_350:SILK
+!CREATURE:FORGOTTEN_BEAST_351:SILK
+!CREATURE:FORGOTTEN_BEAST_359:SILK
+!CREATURE:FORGOTTEN_BEAST_365:SILK
+!CREATURE:FORGOTTEN_BEAST_375:SILK
+!CREATURE:FORGOTTEN_BEAST_376:SILK
+!CREATURE:FORGOTTEN_BEAST_377:SILK
+!CREATURE:FORGOTTEN_BEAST_383:SILK
+!CREATURE:FORGOTTEN_BEAST_387:SILK
+!CREATURE:FORGOTTEN_BEAST_398:SILK
+!CREATURE:FORGOTTEN_BEAST_400:SILK
+!CREATURE:FORGOTTEN_BEAST_406:SILK
+!CREATURE:FORGOTTEN_BEAST_410:SILK
+!CREATURE:FORGOTTEN_BEAST_417:SILK
+!CREATURE:FORGOTTEN_BEAST_428:SILK
+!CREATURE:FORGOTTEN_BEAST_429:SILK
+!CREATURE:FORGOTTEN_BEAST_432:SILK
+!CREATURE:FORGOTTEN_BEAST_442:SILK
+!CREATURE:FORGOTTEN_BEAST_448:SILK
+!CREATURE:FORGOTTEN_BEAST_452:SILK
+!CREATURE:FORGOTTEN_BEAST_457:SILK
+!CREATURE:FORGOTTEN_BEAST_468:SILK
+!CREATURE:FORGOTTEN_BEAST_472:SILK
+!CREATURE:FORGOTTEN_BEAST_479:SILK
+!CREATURE:FORGOTTEN_BEAST_482:SILK
+!CREATURE:FORGOTTEN_BEAST_492:SILK
+!CREATURE:FORGOTTEN_BEAST_504:SILK
+!CREATURE:FORGOTTEN_BEAST_512:SILK
+!CREATURE:FORGOTTEN_BEAST_519:SILK
+!CREATURE:FORGOTTEN_BEAST_537:SILK
+!CREATURE:FORGOTTEN_BEAST_550:SILK
+!CREATURE:FORGOTTEN_BEAST_556:SILK
+!CREATURE:FORGOTTEN_BEAST_557:SILK
+!CREATURE:FORGOTTEN_BEAST_563:SILK
+!CREATURE:FORGOTTEN_BEAST_573:SILK
+!CREATURE:FORGOTTEN_BEAST_583:SILK
+!CREATURE:FORGOTTEN_BEAST_588:SILK
+!CREATURE:FORGOTTEN_BEAST_599:SILK
+!CREATURE:FORGOTTEN_BEAST_602:SILK
+!CREATURE:FORGOTTEN_BEAST_605:SILK
+!CREATURE:FORGOTTEN_BEAST_607:SILK
+!CREATURE:FORGOTTEN_BEAST_611:SILK
+!CREATURE:FORGOTTEN_BEAST_618:SILK
+!CREATURE:FORGOTTEN_BEAST_621:SILK
+!CREATURE:FORGOTTEN_BEAST_627:SILK
+!CREATURE:FORGOTTEN_BEAST_638:SILK
+!CREATURE:FORGOTTEN_BEAST_639:SILK
+!CREATURE:FORGOTTEN_BEAST_651:SILK
+!CREATURE:FORGOTTEN_BEAST_659:SILK
+!CREATURE:FORGOTTEN_BEAST_670:SILK
+!CREATURE:FORGOTTEN_BEAST_686:SILK
+!CREATURE:FORGOTTEN_BEAST_692:SILK
+!CREATURE:FORGOTTEN_BEAST_695:SILK
+!CREATURE:FORGOTTEN_BEAST_697:SILK
+!CREATURE:FORGOTTEN_BEAST_699:SILK
+!CREATURE:FORGOTTEN_BEAST_707:SILK
+!CREATURE:FORGOTTEN_BEAST_713:SILK
+!CREATURE:FORGOTTEN_BEAST_723:SILK
+!CREATURE:FORGOTTEN_BEAST_733:SILK
+!CREATURE:FORGOTTEN_BEAST_740:SILK
+!CREATURE:FORGOTTEN_BEAST_741:SILK
+!CREATURE:FORGOTTEN_BEAST_747:SILK
+!CREATURE:FORGOTTEN_BEAST_758:SILK
+!CREATURE:FORGOTTEN_BEAST_766:SILK
+!CREATURE:FORGOTTEN_BEAST_769:SILK
+!CREATURE:FORGOTTEN_BEAST_771:SILK
+!CREATURE:FORGOTTEN_BEAST_790:SILK
+!CREATURE:FORGOTTEN_BEAST_794:SILK
+!CREATURE:FORGOTTEN_BEAST_826:SILK
+!CREATURE:FORGOTTEN_BEAST_827:SILK
+!CREATURE:FORGOTTEN_BEAST_837:SILK
+!CREATURE:FORGOTTEN_BEAST_839:SILK
+!CREATURE:FORGOTTEN_BEAST_846:SILK
+!CREATURE:FORGOTTEN_BEAST_847:SILK
+!CREATURE:FORGOTTEN_BEAST_849:SILK
+!CREATURE:FORGOTTEN_BEAST_850:SILK
+!CREATURE:FORGOTTEN_BEAST_855:SILK
+CREATURE:TITAN_1:SILK
+CREATURE:TITAN_5:SILK
+CREATURE:TITAN_18:SILK
+CREATURE:TITAN_24:SILK
+CREATURE:TITAN_28:SILK
+CREATURE:TITAN_29:SILK
+CREATURE:TITAN_30:SILK
+CREATURE:TITAN_31:SILK
+CREATURE:DEMON_13:SILK
+CREATURE:DEMON_15:SILK
+CREATURE:DEMON_43:SILK
+CREATURE:DEMON_46:SILK
+CREATURE:DEMON_49:SILK
+CREATURE:DEMON_50:SILK
+CREATURE:DEMON_52:SILKPLANT:FLAX:THREADPLANT:JUTE:THREADPLANT:HEMP:THREADPLANT:COTTON:THREADPLANT:RAMIE:THREADPLANT:KENAF:THREADPLANT:GRASS_TAIL_PIG:THREADPLANT:REED_ROPE:THREADCREATURE:SHEEP:HAIRCREATURE:LLAMA:HAIRCREATURE:ALPACA:HAIRCREATURE:TROLL:HAIR
\ No newline at end of file
diff --git a/data/stockpiles/toys.dfstock b/data/stockpiles/toys.dfstock
new file mode 100644
index 000000000..a90eab591
--- /dev/null
+++ b/data/stockpiles/toys.dfstock
@@ -0,0 +1,2 @@
+b
+TOY
\ No newline at end of file
diff --git a/data/stockpiles/trapcomponents.dfstock b/data/stockpiles/trapcomponents.dfstock
new file mode 100644
index 000000000..475b530d4
Binary files /dev/null and b/data/stockpiles/trapcomponents.dfstock differ
diff --git a/data/stockpiles/traps.dfstock b/data/stockpiles/traps.dfstock
new file mode 100644
index 000000000..ed1ba6776
Binary files /dev/null and b/data/stockpiles/traps.dfstock differ
diff --git a/data/stockpiles/unpreparedfish.dfstock b/data/stockpiles/unpreparedfish.dfstock
new file mode 100644
index 000000000..13841da90
Binary files /dev/null and b/data/stockpiles/unpreparedfish.dfstock differ
diff --git a/data/stockpiles/unusablearmor.dfstock b/data/stockpiles/unusablearmor.dfstock
new file mode 100644
index 000000000..d5b2e9c64
Binary files /dev/null and b/data/stockpiles/unusablearmor.dfstock differ
diff --git a/data/stockpiles/unusableweapons.dfstock b/data/stockpiles/unusableweapons.dfstock
new file mode 100644
index 000000000..6af8d1b5a
Binary files /dev/null and b/data/stockpiles/unusableweapons.dfstock differ
diff --git a/data/stockpiles/usablearmor.dfstock b/data/stockpiles/usablearmor.dfstock
new file mode 100644
index 000000000..58c9296de
Binary files /dev/null and b/data/stockpiles/usablearmor.dfstock differ
diff --git a/data/stockpiles/usablehair.dfstock b/data/stockpiles/usablehair.dfstock
new file mode 100644
index 000000000..2082d7dcf
Binary files /dev/null and b/data/stockpiles/usablehair.dfstock differ
diff --git a/data/stockpiles/usableweapons.dfstock b/data/stockpiles/usableweapons.dfstock
new file mode 100644
index 000000000..248610ae9
Binary files /dev/null and b/data/stockpiles/usableweapons.dfstock differ
diff --git a/data/stockpiles/wax.dfstock b/data/stockpiles/wax.dfstock
new file mode 100644
index 000000000..35c69f6ca
Binary files /dev/null and b/data/stockpiles/wax.dfstock differ
diff --git a/data/stockpiles/woodammo.dfstock b/data/stockpiles/woodammo.dfstock
new file mode 100644
index 000000000..6bec8b1e5
--- /dev/null
+++ b/data/stockpiles/woodammo.dfstock
@@ -0,0 +1 @@
+BWOOD
\ No newline at end of file
diff --git a/data/stockpiles/woodtools.dfstock b/data/stockpiles/woodtools.dfstock
new file mode 100644
index 000000000..86eb0d0c8
--- /dev/null
+++ b/data/stockpiles/woodtools.dfstock
@@ -0,0 +1,2 @@
+b
+TOOLWOOD
\ No newline at end of file
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 15ff52488..d3cfbb415 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -4,11 +4,19 @@ add_subdirectory(lua)
 add_subdirectory(md5)
 add_subdirectory(protobuf)
 
+if(UNIX)
+    set_target_properties(lua PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-deprecated-enum-enum-conversion")
+    set_target_properties(protoc PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-restrict")
+    set_target_properties(protoc-bin PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-restrict")
+    set_target_properties(protobuf-lite PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-restrict")
+    set_target_properties(protobuf PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-restrict")
+endif()
+
 if(UNIX AND NOT APPLE) # remove this once our MSVC build env has been updated
 option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF)
 add_subdirectory(googletest)
 if(UNIX)
-    set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized -Wno-sign-compare")
+    set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized -Wno-sign-compare -Wno-restrict")
 endif()
 endif()
 
@@ -31,8 +39,6 @@ option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependenc
 add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/luacov/src/luacov/ DESTINATION ${DFHACK_DATA_DESTINATION}/lua/luacov)
-
 # set the default values of libexpat options - the descriptions are left empty
 # because later option() calls *do* override those
 set(EXPAT_BUILD_EXAMPLES OFF CACHE BOOL "")
diff --git a/depends/clsocket b/depends/clsocket
index 6ed8aa464..8cf949340 160000
--- a/depends/clsocket
+++ b/depends/clsocket
@@ -1 +1 @@
-Subproject commit 6ed8aa46462ea01a1122fc49422840a2facc9757
+Subproject commit 8cf949340e22001bee1ca25c9d6c1d6a89e8faf2
diff --git a/depends/libzip b/depends/libzip
index 081249cce..fc4a77ea2 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit 081249cceb59adc857a72d67e60c32047680f787
+Subproject commit fc4a77ea28eb5eba0ecd11443f291335ec3d2aa0
diff --git a/depends/lua/CMakeLists.txt b/depends/lua/CMakeLists.txt
index c3ff0c16f..efded915f 100644
--- a/depends/lua/CMakeLists.txt
+++ b/depends/lua/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(lua CXX)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.21)
 
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DLUA_USE_APICHECK")
 
diff --git a/depends/lua/src/ldo.c b/depends/lua/src/ldo.c
index 316e45c8f..65158df0b 100644
--- a/depends/lua/src/ldo.c
+++ b/depends/lua/src/ldo.c
@@ -767,14 +767,14 @@ static void f_parser (lua_State *L, void *ud) {
   LClosure *cl;
   struct SParser *p = cast(struct SParser *, ud);
   int c = zgetc(p->z);  /* read first character */
-  if (c == LUA_SIGNATURE[0]) {
-    checkmode(L, p->mode, "binary");
-    cl = luaU_undump(L, p->z, p->name);
-  }
-  else {
+  // if (c == LUA_SIGNATURE[0]) {
+  //   checkmode(L, p->mode, "binary");
+  //   cl = luaU_undump(L, p->z, p->name);
+  // }
+  // else {
     checkmode(L, p->mode, "text");
     cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
-  }
+  // }
   lua_assert(cl->nupvalues == cl->p->sizeupvalues);
   luaF_initupvals(L, cl);
 }
diff --git a/depends/md5/md5.cpp b/depends/md5/md5.cpp
index 044df259e..8aa9ba38c 100644
--- a/depends/md5/md5.cpp
+++ b/depends/md5/md5.cpp
@@ -158,7 +158,7 @@ void MD5Final(unsigned char digest[16], MD5Context *ctx)
  */
 void MD5Transform(uint32_t buf[4], uint32_t in[16])
 {
-    register uint32_t a, b, c, d;
+    uint32_t a, b, c, d;
 
     a = buf[0];
     b = buf[1];
diff --git a/depends/protobuf/google/protobuf/repeated_field.h b/depends/protobuf/google/protobuf/repeated_field.h
index aed4ce9f2..637708254 100644
--- a/depends/protobuf/google/protobuf/repeated_field.h
+++ b/depends/protobuf/google/protobuf/repeated_field.h
@@ -46,6 +46,10 @@
 #ifndef GOOGLE_PROTOBUF_REPEATED_FIELD_H__
 #define GOOGLE_PROTOBUF_REPEATED_FIELD_H__
 
+#ifdef __GNUC__
+#pragma GCC system_header
+#endif
+
 #include <string>
 #include <iterator>
 #include <google/protobuf/stubs/common.h>
diff --git a/depends/xlsxio b/depends/xlsxio
index 439fdbc25..0a9945266 160000
--- a/depends/xlsxio
+++ b/depends/xlsxio
@@ -1 +1 @@
-Subproject commit 439fdbc259c13f23a3122e68ba35ad5a13bcd97c
+Subproject commit 0a994526622c2201756e386ef98b44b193e25f06
diff --git a/depends/zlib/lib/win32/.gitignore b/depends/zlib/lib/.gitignore
similarity index 100%
rename from depends/zlib/lib/win32/.gitignore
rename to depends/zlib/lib/.gitignore
diff --git a/depends/zlib/lib/win64/.gitignore b/depends/zlib/lib/win64/.gitignore
deleted file mode 100644
index 683bf139f..000000000
--- a/depends/zlib/lib/win64/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.lib
diff --git a/dfhack-config/autonick.txt b/dfhack-config/autonick.txt
deleted file mode 100644
index e7de79f54..000000000
--- a/dfhack-config/autonick.txt
+++ /dev/null
@@ -1,152 +0,0 @@
-# autonick config file
-# every line in this file that is not empty and does
-# not start with "#" will be used as a nickname by the
-# autonick script.
-
-# nicknames can be multiple words
-Toady One
-Threetoe
-
-# animals
-Mouse
-Otter
-Snake
-Owl
-Bat
-Fox
-Mole
-Cat
-Badger
-Squirrel
-Kit
-Wren
-Jay
-Crow
-Raven
-Sparrow
-
-# colours
-Flash
-Red
-Gray
-Blue
-Shadow
-Indigo
-Jade
-Umber
-Silver
-
-# planets
-Mars
-Jupiter
-Saturn
-
-# nature
-Blaze
-River
-Snow
-Bones
-Rain
-Reed
-Lake
-Briar
-Brook
-Sky
-Storm
-Clay
-Ember
-Marsh
-Star
-
-# trees
-Ash
-Oak
-Rowan
-Aspen
-Alder
-Apple
-Beech
-Birch
-Box
-Cedar
-Cypress
-Elder
-Elm
-Larch
-Fir
-Juniper
-Lime
-Pine
-Poplar
-Spruce
-Yew
-
-# seasons
-Spring
-Summer
-Autumn
-Winter
-
-# cardinals
-North
-South
-East
-West
-
-# other
-Ink
-Echo
-Mint
-Mel
-X
-Sam
-Tango
-Gadget
-Brum
-Wall
-Beam
-Ud
-Tal
-Ren
-Aki
-Jun
-Kei
-Lynn
-Lex
-Cid
-Miles
-Rotor
-Mesa
-Verse
-
-# from the "300 list"
-Aiden
-Arden
-Auden
-August
-Avery
-Avis
-Bay
-Blake
-Erin
-Ezra
-Kai
-Lane
-Leah
-Noel
-Pat
-Ray
-Remi
-Roan
-Robyn
-Salem
-Sean
-Tate
-Tobin
-Tori
-True
-Val
-Wilder
-Wisdom
-Wyatt
-Zephyr
diff --git a/dfhack-config/overlay.json b/dfhack-config/overlay.json
deleted file mode 100644
index 7ebae0948..000000000
--- a/dfhack-config/overlay.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"hotkeys.menu": {
-		"enabled": true
-	},
-	"unsuspend.overlay": {
-		"enabled": true
-	}
-}
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
deleted file mode 100644
index a3e52052d..000000000
--- a/dfhack-config/quickfort/aliases.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Custom aliases for quickfort query mode blueprints
-#
-# This file defines custom key sequence shortcuts for query mode blueprints.
-# Definitions in this file take precedence over any definitions in the
-# baseline aliases configuration file in
-#   hack/data/quickfort/aliases-common.txt
-#
-# Please see
-#   https://docs.dfhack.org/en/latest/docs/guides/quickfort-alias-guide.html
-# or
-#   hack/docs/docs/guides/quickfort-alias-guide.html
-# in your DF installation directory for alias syntax documentation and an
-# overview of the DFHack alias standard library.
-#
-#
-# Add your custom aliases here. Example:
-#   food_stash: {foodprefix}b{Right}{Down 11}p^{permitplants}
diff --git a/dfhack-config/quickfort/quickfort.txt b/dfhack-config/quickfort/quickfort.txt
deleted file mode 100644
index e3f5aeaec..000000000
--- a/dfhack-config/quickfort/quickfort.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# quickfort main configuration file
-#
-# Set startup defaults for the quickfort script in this file. Settings can be
-# temporarily overridden in the active session with the `quickfort set` command.
-#
-# If you have edited this file but want to revert to "factory defaults", delete
-# this file and a fresh one will be copied from
-# dfhack-config/default/quickfort/quickfort.txt the next time you start DFHack.
-
-# Directory tree to search for blueprints. Can be set to an absolute or relative
-# path. If set to a relative path, resolves to a directory under the DF folder.
-# Note that if you change this directory, you will not automatically pick up
-# blueprints written by the DFHack "blueprint" plugin (which always writes to
-# the "blueprints" dir).
-blueprints_dir=blueprints
-
-# Set to "true" or "false". If true, will designate all dig blueprints in marker
-# mode. If false, only cells with dig codes explicitly prefixed with an "m" will
-# be designated in marker mode.
-force_marker_mode=false
-
-# Skip query blueprint sanity checks that detect common blueprint errors and
-# halt or skip keycode playback. Checks include ensuring a configurable building
-# exists at the designated cursor position and verifying the active UI screen is
-# the same before and after sending keys for the cursor position. If you find
-# you need to enable this for one of your own blueprints, you should probably be
-# using a config blueprint, not a query blueprint.
-query_unsafe=false
-
-# Set to the maximum number of resources you want assigned to stockpiles of the
-# relevant types. Set to -1 for DF defaults (number of stockpile tiles for
-# stockpiles that take barrels and bins, 1 wheelbarrow for stone stockpiles).
-# The default here for wheelbarrows is 0 since using wheelbarrows normally
-# *decreases* the efficiency of your fort.
-stockpiles_max_barrels=-1
-stockpiles_max_bins=-1
-stockpiles_max_wheelbarrows=0
diff --git a/docs/Core.rst b/docs/Core.rst
index 4fb1fdb71..a8991147f 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -21,7 +21,7 @@ DFHack commands can be implemented in any of three ways:
             same version of DFHack.  They are less flexible than scripts,
             but used for complex or ongoing tasks because they run faster.
 
-:scripts:   are Ruby or Lua scripts stored in ``hack/scripts/`` or other
+:scripts:   are Lua scripts stored in ``hack/scripts/`` or other
             directories in the `script-paths`. Because they don't need to
             be compiled, scripts are more flexible about versions, and
             they are easier to distribute. Most third-party DFHack addons
@@ -53,7 +53,7 @@ double quotes.  To include a double quote character, use ``\"``.
 If the first non-whitespace character is ``:``, the command is parsed in
 an alternative mode.  The non-whitespace characters following the ``:`` are
 the command name, and the remaining part of the line is used verbatim as
-the first argument.  This is very useful for the `lua` and `rb` commands.
+the first argument.  This is very useful for the `lua` command.
 As an example, the following two command lines are exactly equivalent::
 
   :foo a b "c d" e f
@@ -144,11 +144,10 @@ savegave portability, mod merging, and general organization of init files,
 DFHack supports multiple init files both in the main DF directory and
 save-specific init files in the save folders.
 
-DFHack looks for init files in three places each time they could be run:
+DFHack looks for init files in two places each time they could be run:
 
-#. The :file:`dfhack-config/init` subdirectory in the main DF directory
-#. :file:`data/save/{world}/raw`, where ``{world}`` is the current save, and
-#. :file:`data/save/{world}/raw/objects`
+#. The :file:`dfhack-config/init` subdirectory in the main DF directory and
+#. :file:`save/{world}/init`, where ``{world}`` is the current save
 
 For each of those directories, all matching init files will be executed in
 alphabetical order.
@@ -156,7 +155,7 @@ alphabetical order.
 Before running matched init scripts in any of those locations, the
 :file:`dfhack-config/init/default.*` file that matches the event will be run to
 load DFHack defaults. Only the :file:`dfhack-config/init` directory is checked
-for this file, not any :file:`raw` directories. If you want DFHack to load
+for this file, not any :file:`save` directories. If you want DFHack to load
 without running any of its default configuration commands, edit the
 :file:`dfhack-config/init/default.*` files and comment out the commands you see
 there.
@@ -217,10 +216,10 @@ after a modded save is unloaded.
 
 .. _other_init_files:
 
-raw/init.d/\*.lua
-.................
+init.d/\*.lua
+.............
 
-Any lua script named ``raw/init.d/*.lua``, in the save or main DF directory,
+Any lua script named ``init.d/*.lua``, in the save or main DF directory,
 will be run when any world or that save is loaded.
 
 
@@ -234,12 +233,58 @@ run. By default, the following folders are searched, in order (relative to the
 root DF folder):
 
 #. :file:`dfhack-config/scripts`
-#. :file:`data/save/{<region folder>}/raw/scripts` (only if a save is loaded)
-#. :file:`raw/scripts`
+#. :file:`save/{world}/scripts` (only if a save is loaded)
 #. :file:`hack/scripts`
+#. :file:`data/installed_mods/...` (see below)
 
 For example, if ``teleport`` is run, these folders are searched in order for
-``teleport.lua`` or ``teleport.rb``, and the first matching file is run.
+``teleport.lua``, and the first matching file is run.
+
+Scripts in installed mods
+.........................
+
+Scripts in mods are automatically added to the script path. The following
+directories are searched for mods::
+
+    ../../workshop/content/975370/ (the DF Steam workshop directory)
+    mods/
+    data/installed_mods/
+
+Each mod can have two directories that contain scripts:
+
+- ``scripts_modactive/`` is added to the script path if and only if the mod is
+    active in the loaded world.
+- ``scripts_modinstalled/`` is added to the script path as long as the mod is
+    installed in one of the searched mod directories.
+
+Multiple versions of a mod may be installed at the same time. If a mod is
+active in a loaded world, then the scripts for the version of the mod that is
+active will be added to the script path. Otherwise, the latest version of each
+mod is added to the script path.
+
+Scripts for active mods take precedence according to their load order when you
+generated the current world.
+
+Scripts for non-active mods are ordered by their containing mod's ID.
+
+For example, the search paths for mods might look like this::
+
+    activemod_last_in_load_order/scripts_modactive
+    activemod_last_in_load_order/scripts_modinstalled
+    activemod_second_to_last_in_load_order/scripts_modactive
+    activemod_second_to_last_in_load_order/scripts_modinstalled
+    ...
+    inactivemod1/scripts_modinstalled
+    inactivemod2/scripts_modinstalled
+    ...
+
+Not all mods will have script directories, of course, and those mods will not be
+added to the script search path. Mods are re-scanned whenever a world is loaded
+or unloaded. For more information on scripts and mods, check out the
+`modding-guide`.
+
+Custom script paths
+...................
 
 Script paths can be added by modifying :file:`dfhack-config/script-paths.txt`.
 Each line should start with one of these characters:
@@ -261,6 +306,23 @@ the root DF folder.
 Note that ``script-paths.txt`` is only read at startup, but the paths can also be
 modified programmatically at any time through the `Lua API <lua-api-internal>`.
 
+Commandline options
+===================
+
+In addition to `Using an OS terminal`_ to execute commands on startup, DFHack
+also recognizes a single commandline option that can be specified on the
+commandline:
+
+- ``--disable-dfhack``: If this option is passed on the Dwarf Fortress
+  commandline, then DFHack will be disabled for the session. You will have to
+  restart Dwarf Fortress without specifying this option in order to use DFHack.
+  If you are launching Dwarf Fortress from Steam, you can enter the option in
+  the "Launch Options" text box in the properties for the Dwarf Fortress app.
+  Note that if you do this, DFHack will be disabled regardless of whether you
+  run Dwarf Fortress from its own app or DFHack's. You will have to clear the
+  DF Launch Options in order to use DFHack again. Note that even if DFHack is
+  disabled, :file:`stdout.txt` and :file:`stderr.txt` will still be redirected
+  to :file:`stdout.log` and :file:`stderr.log`, respectively.
 
 .. _env-vars:
 
@@ -274,6 +336,11 @@ on UNIX-like systems:
 
   DFHACK_SOME_VAR=1 ./dfhack
 
+- ``DFHACK_DISABLE``: if set, DFHack will not initialize, not even to redirect
+  standard output or standard error. This is provided as an alternative
+  to the ``--disable-dfhack`` commandline parameter above for when environment
+  variables are more convenient.
+
 - ``DFHACK_PORT``: the port to use for the RPC server (used by ``dfhack-run``
   and `remotefortressreader` among others) instead of the default ``5000``. As
   with the default, if this port cannot be used, the server is not started.
@@ -310,6 +377,23 @@ Other (non-DFHack-specific) variables that affect DFHack:
   sensitive), ``DF2CONSOLE()`` will produce UTF-8-encoded text. Note that this
   should be the case in most UTF-8-capable \*nix terminal emulators already.
 
+Core preferences
+================
+
+There are a few settings that can be changed dynamically via
+`gui/control-panel` to affect runtime behavior. You can also toggle these from
+the commandline using the `lua` command, e.g.
+``lua dfhack.HIDE_ARMOK_TOOLS=true`` or by editing the generated
+``dfhack-config/init/dfhack.control-panel-preferences.init`` file and
+restarting DF.
+
+- ``dfhack.HIDE_CONSOLE_ON_STARTUP``: Whether to hide the external DFHack
+  terminal window on startup. This, of course, is not useful to change
+  dynamically. You'll have to use `gui/control-panel` or edit the init file
+  directly and restart DF for it to have an effect.
+
+- ``dfhack.HIDE_ARMOK_TOOLS``: Whether to hide "armok" tools in command lists.
+
 Miscellaneous notes
 ===================
 This section is for odd but important notes that don't fit anywhere else.
diff --git a/docs/Installing.rst b/docs/Installing.rst
index 05db198b8..14b5a0f93 100644
--- a/docs/Installing.rst
+++ b/docs/Installing.rst
@@ -7,78 +7,46 @@ Installing DFHack
 .. contents::
     :local:
 
-
 Requirements
 ============
 
-DFHack supports Windows, Linux, and macOS, and both 64-bit and 32-bit builds
-of Dwarf Fortress.
+DFHack supports all operating systems and platforms that Dwarf Fortress itself
+supports, which at the moment is just 64-bit Windows. However, the Windows
+build of DFHack works well under ``wine`` (or ``Proton``, Steam's fork of
+``wine``) on other operating systems.
 
 .. _installing-df-version:
 
 DFHack releases generally only support the version of Dwarf Fortress that they
-are named after. For example, DFHack 0.40.24-r5 only supported DF 0.40.24.
-DFHack releases *never* support newer versions of DF, because DFHack requires
-data about DF that is only possible to obtain after DF has been released.
-Occasionally, DFHack releases will be able to maintain support for older
-versions of DF - for example, DFHack 0.34.11-r5 supported both DF 0.34.11 and
-0.34.10. For maximum stability, you should usually use the latest versions of
-both DF and DFHack.
-
-Windows
--------
-
-* DFHack only supports the SDL version of Dwarf Fortress. The "legacy" version
-  will *not* work with DFHack (the "small" SDL version is acceptable, however).
-* Windows XP and older are *not* supported, due in part to a
-  `Visual C++ 2015 bug <https://stackoverflow.com/questions/32452777/visual-c-2015-express-stat-not-working-on-windows-xp>`_
-
-The Windows build of DFHack should work under Wine on other operating systems,
-although this is not tested very often. It is recommended to use the native
-build for your operating system instead.
-
-.. _installing-reqs-linux:
-
-Linux
------
-
-Generally, DFHack should work on any modern Linux distribution. There are
-multiple release binaries provided - as of DFHack 0.47.04-r1, there are built
-with GCC 7 and GCC 4.8 (as indicated by the ``gcc`` component of their
-filenames). Using the newest build that works on your system is recommended.
-The GCC 4.8 build is built on Ubuntu 14.04 and targets an older glibc, so it
-should work on older distributions.
-
-In the event that none of the provided binaries work on your distribution,
-you may need to `compile DFHack from source <compile>`.
-
-macOS
------
-
-OS X 10.6.8 or later is required.
-
+are named after. For example, DFHack 50.05 only supported DF 50.05. DFHack
+releases *never* support newer versions of DF -- DFHack requires data about DF
+that is only possible to obtain after DF has been released. Occasionally,
+DFHack releases will be able to maintain support for older versions of DF - for
+example, DFHack 0.34.11-r5 supported both DF 0.34.11 and 0.34.10. For maximum
+stability, you should usually use the latest versions of both DF and DFHack.
 
 .. _downloading:
 
 Downloading DFHack
 ==================
 
-Stable builds of DFHack are available on `GitHub <https://github.com/dfhack/dfhack/releases>`_.
-GitHub has been known to change their layout periodically, but as of July 2020,
-downloads are available at the bottom of the release notes for each release, under a section
-named "Assets" (which you may have to expand). The name of the file indicates
-which DF version, platform, and architecture the build supports - the platform
-and architecture (64-bit or 32-bit) **must** match your build of DF. The DF
-version should also match your DF version - see `above <installing-df-version>`
-for details. For example:
+Stable builds of DFHack are available on
+`Steam <https://store.steampowered.com/app/2346660/DFHack__Dwarf_Fortress_Modding_Engine/>`__
+or from our `GitHub <https://github.com/dfhack/dfhack/releases>`__. Either
+location will give you exactly the same package.
+
+On Steam, note that DFHack is a separate app, not a DF Steam Workshop mod. You
+can run DF with DFHack by launching either the DFHack app or the original Dwarf
+Fortress app.
 
-* ``dfhack-0.47.04-r1-Windows-64bit.zip`` supports 64-bit DF on Windows
-* ``dfhack-0.47.04-r1-Linux-32bit-gcc-7.tar.bz2`` supports 32-bit DF on Linux
-  (see `installing-reqs-linux` for details on the GCC version indicator)
+If you download from GitHub, downloads are available at the bottom of the
+release notes for each release, under a section named "Assets" (which you may
+have to expand). The name of the file indicates which DF version, platform, and
+architecture the build supports - the platform and architecture (64-bit or
+32-bit) **must** match your build of DF. The DF version should also match your
+DF version - see `above <installing-df-version>` for details. For example:
 
-The `DFHack website <https://dfhack.org/builds>`_ also provides links to
-unstable builds. These files have a different naming scheme, but the same
-restrictions apply (e.g. a file named ``Windows64`` is for 64-bit Windows DF).
+* ``dfhack-50.07-r1-Windows-64bit.zip`` supports 64-bit DF on Windows
 
 .. warning::
 
@@ -86,84 +54,76 @@ restrictions apply (e.g. a file named ``Windows64`` is for 64-bit Windows DF).
     or by clicking "Download ZIP" on the repo homepage. This will give you an
     incomplete copy of the DFHack source code, which will not work as-is. (If
     you want to compile DFHack instead of using a pre-built release, see
-    `compile` for instructions.)
+    `building-dfhack-index` for instructions.)
+
+Beta releases
+-------------
+
+In between stable releases, we may create beta releases to test new features.
+These are available via the ``beta`` release channel on Steam or from our
+regular Github page as a pre-release tagged with a "beta" or "rc" suffix.
+
+Development builds
+------------------
+
+If you are actively working with the DFHack team on testing a feature, you may
+want to download and install a development build. They are available via the
+``testing`` release channel on Steam or can be downloaded from the build
+artifact list on GitHub for specific repository commits.
+
+To download a development build from GitHub:
+
+- Ensure you are logged into your GitHub account
+- Go to https://github.com/DFHack/dfhack/actions/workflows/build.yml?query=branch%3Adevelop+event%3Apush
+- Click on the first entry that has a green checkmark
+- Click the number under "Artifacts" (or scroll down)
+- Click on the "dfhack-*-build-*" artifact for your platform to download
+
+You can extract this package the same as if you are doing a manual install (see the next section).
 
 Installing DFHack
 =================
 
+If you are installing from Steam, this is handled for you automatically. The
+instructions here are for manual installs.
+
 When you `download DFHack <downloading>`, you will end up with a release archive
 (a ``.zip`` file on Windows, or a ``.tar.bz2`` file on other platforms). Your
 operating system should have built-in utilities capable of extracting files from
 these archives.
 
-The release archives contain several folders, including a ``hack`` folder where
-DFHack binary and system data is stored, a ``dfhack-config`` folder where user
-data and configuration is stored, and a ``blueprints`` folder where `quickfort`
-blueprints are stored. To install DFHack, copy all of the files from the DFHack
-archive into the root DF folder, which should already include a ``data`` folder
-and a ``raw`` folder, among other things. Some packs and other redistributions
-of Dwarf Fortress may place DF in another folder, so ensure that the ``hack``
-folder ends up next to the ``data`` folder.
-
-.. note::
-
-    On Windows, installing DFHack will overwrite ``SDL.dll``. This is
-    intentional and necessary for DFHack to work, so be sure to choose to
-    overwrite ``SDL.dll`` if prompted. (If you are not prompted, you may be
-    installing DFHack in the wrong place.)
-
+The release archives contain a ``hack`` folder where DFHack binary and system
+data is stored, a ``stonesense`` folder that contains data specific to the
+`stonesense` 3d renderer, and various libraries and executable files. To
+install DFHack, copy all of the files from the DFHack archive into the root DF
+folder, which should already include a ``data`` folder and a ``save`` folder,
+among other things. Some redistributions of Dwarf Fortress may place DF in
+another folder, so ensure that the ``hack`` folder ends up next to the ``data``
+folder, and you'll be fine.
 
 Uninstalling DFHack
 ===================
 
-Uninstalling DFHack essentially involves reversing what you did to install
-DFHack. On Windows, replace ``SDL.dll`` with ``SDLreal.dll`` first. Then, you
-can remove any files that were part of the DFHack archive. DFHack does not
-currently maintain a list of these files, so if you want to completely remove
-them, you should consult the DFHack archive that you installed for a full list.
-Generally, any files left behind should not negatively affect DF.
+Just renaming or removing the ``dfhooks`` library file is enough to disable
+DFHack. If you would like to remove all DFHack files, consult the DFHack install
+archive to see the list of files and remove the corresponding files in the Dwarf
+Fortress folder. Any DFHack files left behind will not negatively affect DF.
+
+On Steam, uninstalling DFHack will cleanly remove everything that was installed
+with DFHack, so there is nothing else for you to do.
 
+Note that Steam will leave behind the ``dfhack-config`` folder, which contains
+all your personal DFHack-related settings and data. If you keep this folder,
+all your settings will be restored when you reinstall DFHack later.
 
 Upgrading DFHack
 ================
 
-The recommended approach to upgrade DFHack is to uninstall DFHack first, then
-install the new version. This will ensure that any files that are only part
-of the older DFHack installation do not affect the new DFHack installation
-(although this is unlikely to occur).
-
-It is also possible to overwrite an existing DFHack installation in-place.
-To do this, follow the installation instructions above, but overwrite all files
-that exist in the new DFHack archive (on Windows, this includes ``SDL.dll`` again).
-
-.. note::
-
-    You may wish to make a backup of your ``dfhack-config`` folder first if you
-    have made changes to it. Some archive managers (e.g. Archive Utility on macOS)
-    will overwrite the entire folder, removing any files that you have added.
-
-
-Pre-packaged DFHack installations
-=================================
-
-There are :wiki:`several packs available <Utility:Lazy_Newb_Pack>` that include
-DF, DFHack, and other utilities. If you are new to Dwarf Fortress and DFHack,
-these may be easier to set up. Note that these packs are not maintained by the
-DFHack team and vary in their release schedules and contents. Some may make
-significant configuration changes, and some may not include DFHack at all.
-
-Linux packages
-==============
-
-Third-party DFHack packages are available for some Linux distributions,
-including in:
+Again, if you have installed from Steam, your copy of DFHack will automatically be kept up to date. This section is for manual installers.
 
-* `AUR <https://aur.archlinux.org/packages/dfhack/>`__, for Arch and related
-  distributions
-* `RPM Fusion <https://admin.rpmfusion.org/pkgdb/package/nonfree/dfhack/>`__,
-  for Fedora and related distributions
+First, remove the ``hack`` and ``stonesense`` folders in their entirety. This
+ensures that files that don't exist in the latest version are properly removed
+and don't affect your new installation.
 
-Note that these may lag behind DFHack releases. If you want to use a newer
-version of DFHack, we generally recommended installing it in a clean copy of DF
-in your home folder. Attempting to upgrade an installation of DFHack from a
-package manager may break it.
+Then, extract the DFHack release archive into your Dwarf Fortress folder,
+overwriting any remaining top-level files.
diff --git a/docs/Quickstart.rst b/docs/Quickstart.rst
new file mode 100644
index 000000000..10349a65f
--- /dev/null
+++ b/docs/Quickstart.rst
@@ -0,0 +1,217 @@
+.. _quickstart:
+
+Quickstart guide
+================
+
+Welcome to DFHack! This guide will help get you oriented with the DFHack system
+and teach you how to find and use the tools productively. If you're reading this
+in the in-game `quickstart-guide` reader, hit the right arrow key or click on
+the hotkey hint in the lower right corner of the window to go to the next page.
+
+What is DFHack?
+---------------
+
+DFHack is an add-on for Dwarf Fortress that enables mods and tools to
+significantly extend the game. The default DFHack distribution contains a wide
+variety of tools, including bugfixes, interface improvements, automation agents,
+design blueprints, modding building blocks, and more. Third-party tools (e.g.
+mods downloaded from Steam Workshop or the forums) can also seamlessly integrate
+with the DFHack framework and extend the game far beyond what can be done by
+just modding the raws.
+
+DFHack's mission is to provide tools and interfaces for players and modders to:
+
+- expand the bounds of what is possible in Dwarf Fortress
+- reduce the impact of game bugs
+- give the player more agency and control over the game
+- provide alternatives to toilsome or frustrating aspects of gameplay
+- **make the game more fun**
+
+What can I do with DFHack tools?
+--------------------------------
+
+DFHack has been around for a long time -- almost as long as Dwarf Fortress
+itself. Many of the game's rough edges have been smoothed with DFHack tools.
+Here are some common tasks people use DFHack tools to accomplish:
+
+- Automatically chop trees when log stocks are low
+- Record blueprint files that allow copy and paste of fort designs
+- Import and export lists of manager orders
+- Clean contaminants from map squares that dwarves can't reach
+- Automatically butcher excess livestock so you don't become overrun with
+  animals
+- Promote time-sensitive job types (e.g. food hauling) so they are done
+  expediently
+- Quickly scan the map for visible ores of specific types so you can focus
+  your mining efforts
+
+Some tools are one-shot commands. For example, you can run
+`unforbid all <unforbid>` to claim all (reachable) items on the map after a
+messy siege.
+
+Other tools must be `enabled <enable>` once and then they will run in the
+background. For example, once enabled, `seedwatch` will start monitoring your
+stocks of seeds and prevent your chefs from cooking seeds that you need for
+planting. Tools that are enabled in the context of a fort will save their state
+with that fort, and they will remember that they are enabled the next time you
+load your save.
+
+A third class of tools adds information to the screen or provides new integrated
+functionality via the DFHack `overlay` framework. For example, the `sort` tool
+adds widgets to the squad member selection screen that allow you to search,
+sort, and filter the list of military candidates. You don't have to run any
+command to get the benefits of the tool, it appears automatically when you're
+on the relevant screen.
+
+How can I figure out which commands to run?
+-------------------------------------------
+
+There are several ways to scan DFHack tools and find the ones you need right
+now.
+
+The first place to check is the DFHack logo menu. It's in the upper left corner
+of the screen by default, though you can move it anywhere you want with the
+`gui/overlay` configuration UI.
+
+When you click on the logo (or hit the Ctrl-Shift-C keyboard shortcut), a short
+list of popular, relevant DFHack tools comes up. These are the tools that have
+been assigned hotkeys that are active in the current context. For example, when
+you're looking at a fort map, the list will contain fortress design tools like
+`gui/quickfort` and `gui/design`. You can click on the tools in the list, or
+note the hotkeys listed next to them and maybe use them to launch the tool next
+time without even opening the logo menu.
+
+The second place to check is the DFHack control panel: `gui/control-panel`. It
+will give you an overview of which tools are currently enabled, and will allow
+you to toggle them on or off, see help text for them, or launch their dedicated
+configuration UIs. You can open the control panel from anywhere with the
+Ctrl-Shift-E hotkey or by selecting it from the logo menu list.
+
+In the control panel, you can also select which tools you'd like to be
+automatically enabled and popular commands you'd like to run when you start a
+new fort. On the "Preferences" tab, there are settings you can change, like
+whether you want to limit DFHack functionality to interface improvements,
+bugfixes, and productivity tools, hiding the god-mode tools ("mortal mode") or
+whether you want DFHack windows to pause the game when they come up.
+
+Finally, you can explore the full extent of the DFHack catalog in
+`gui/launcher`, which is always listed first in the DFHack logo menu list. You
+can also bring up the launcher by tapping the backtick key (\`) or hitting
+Ctrl-Shift-D. In the launcher, you can quickly autocomplete any command name by
+selecting it in the list on the right side of the window. Commands are ordered
+by how often you run them, so your favorite commands will always be on top. You
+can also pull full commandlines out of your history with Alt-S or by clicking
+on the "history search" hotkey hint.
+
+Once you have typed (or autocompleted, or searched for) a command, other
+commands related to the one you have selected will appear in the right-hand
+panel. Scanning through that list is a great way to learn about new tools that
+you might find useful. You can also see how commands are grouped by running the
+`tags` command.
+
+The bottom panel will show the full help text for the command you are running,
+allowing you to refer to the usage documentation and examples when you are
+typing your command. After you run a command, the bottom panel switches to
+command output mode, but you can get back to the help text by hitting Ctrl-T or
+clicking on the ``Help`` tab.
+
+How do DFHack in-game windows work?
+-----------------------------------
+
+Many DFHack tools have graphical interfaces that appear in-game. You can tell
+which windows belong to DFHack tools because they will have the word "DFHack"
+printed across their bottom frame edge. DFHack provides an advanced windowing
+system that gives the player a lot of control over where the windows appear and
+whether they capture keyboard and mouse input.
+
+The DFHack windowing system allows multiple overlapping windows to be active at
+once. The one with the highlighted title bar has focus and will receive anything
+you type at the keyboard. Hit Esc or right click to close the window or cancel
+the current action. You can click anywhere on the screen that is not a DFHack
+window to unfocus the window and let it just sit in the background. It won't
+respond to key presses or mouse clicks until you click on it again to give it
+focus. If no DFHack windows are focused, you can right click directly on a
+window to close it without left clicking to focus it first.
+
+DFHack windows are draggable from the title bar or from anywhere on the window
+that doesn't have a mouse-clickable widget on it. Many are resizable as well
+(if the tool window has components that can reasonably be resized).
+
+You can generally use DFHack tools without interrupting the game. That is, if
+the game is unpaused, it can continue to run while a DFHack window is open. If
+configured to do so in `gui/control-panel`, tools will initially pause the game
+to let you focus on the task at hand, but you can unpause like normal if you
+want. You can also interact with the map, scrolling it with the keyboard or
+mouse and selecting units, buildings, and items. Some tools will intercept all
+mouse clicks to allow you to select regions of the map. When these tools have
+focus, you will not be able to use the mouse to interact with map elements or
+pause/unpause the game. Therefore, these tools will pause the game when they
+open, regardless of your settings in `gui/control-panel`. You can still unpause
+with the keyboard (spacebar by default), though.
+
+Where do I go next?
+-------------------
+
+To recap:
+
+You can get to popular, relevant tools for the current context by clicking on
+the DFHack logo or by hitting Ctrl-Shift-C.
+
+You can enable DFHack tools and configure settings with `gui/control-panel`,
+which you can open from the DFHack logo or access directly with the
+Ctrl-Shift-E hotkey.
+
+You can get to the launcher and its integrated autocomplete, history search,
+and help text by hitting backtick (\`) or Ctrl-Shift-D, or, of course, by
+running it from the logo menu list.
+
+With those three interfaces, you have the complete DFHack tool suite at your
+fingertips. So what to run first? Here are a few examples to get you started.
+
+First, let's import some useful manager orders to keep your fort stocked with
+basic necessities. Run ``orders import library/basic``. If you go to your
+manager orders screen, you can see all the orders that have been created for
+you. Note that you could have imported the orders directly from this screen as
+well, using the DFHack `overlay` widget at the bottom of the manager orders
+panel.
+
+Next, try setting up `autochop` to automatically designate trees for chopping
+when you get low on usable logs. Run `gui/control-panel` and select
+``autochop`` in the ``Fort`` list. Click on the button to the left of the name
+or hit Enter to enable it. You can then click on the configure button (the gear
+icon) to launch `gui/autochop` if you'd like to customize its settings. If you
+have the extra screen space, you can go ahead and set the `gui/autochop` window
+to minimal mode (click on the hint near the upper right corner of the window or
+hit Alt-M) and click on the map so the window loses keyboard focus. As you play
+the game, you can glance at the live status panel to check on your stocks of
+wood.
+
+Finally, let's do some fort design copy-pasting. Go to some bedrooms that you
+have set up in your fort. Run `gui/blueprint`, set a name for your blueprint by
+clicking on the name field (or hitting the 'n' hotkey), typing "rooms" (or
+whatever) and hitting Enter to set. Then draw a box around the target area by
+clicking with the mouse. When you select the second corner, the blueprint will
+be saved to your ``dfhack-config/blueprints`` subfolder.
+
+Now open up `gui/quickfort`. You can search for the blueprint you just created
+by typing its name, but it should be up near the top already. If you copied a
+dug-out area with furniture in it, your blueprint will have two labels: "/dig"
+and "/build". Click on the "/dig" blueprint or select it with the keyboard
+arrow keys and hit Enter. You can rotate or flip the blueprint around if you
+need to with the transform hotkeys. You'll see a preview of where the blueprint
+will be applied as you move the mouse cursor around the map. Red outlines mean
+that the blueprint may fail to fully apply at that location, so be sure to
+choose a spot where all the preview tiles are shown with green diamonds. Click
+the mouse or hit Enter to apply the blueprint and designate the tiles for
+digging. Your dwarves will come and dig it out as if you had designated the
+tiles yourself.
+
+Once the area is dug out, run `gui/quickfort` again and select your "/build"
+blueprint this time. Hit ``o`` to generate manager orders for the required
+furniture. Apply the blueprint in the dug-out area, and your furniture will be
+designated. It's just that easy! Note that `quickfort` uses `buildingplan` to
+place buildings, so you don't even need to have the relevant furniture or
+building materials in stock yet. The planned furniture/buildings will get built
+whenever you are able to produce the building materials.
+
+There are many, many more tools to explore. Have fun!
diff --git a/docs/Tags.rst b/docs/Tags.rst
index 2ee18de48..ded15c4c2 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -14,14 +14,16 @@ for the tag assignment spreadsheet.
 "when" tags
 -----------
 - `adventure <adventure-tag-index>`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
-- `dfhack <dfhack-tag-index>`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
+- `dfhack <dfhack-tag-index>`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. quicksave, etc.)
 - `embark <embark-tag-index>`: Tools that are useful while on the fort embark screen or while creating an adventurer.
 - `fort <fort-tag-index>`: Tools that are useful while in fort mode.
 - `legends <legends-tag-index>`: Tools that are useful while in legends mode.
 
 "why" tags
 ----------
-- `armok <armok-tag-index>`: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
+- `armok <armok-tag-index>`: Tools which give the player god-like powers of any variety, such as control over game events, creating items from thin air, or viewing information the game intentionally keeps hidden. Players that do not wish to see these tools listed in DFHack command lists can hide them in the ``Preferences`` tab of `gui/control-panel`.
+
+
 - `auto <auto-tag-index>`: Tools that run in the background and automatically manage routine, toilsome aspects of your fortress.
 - `bugfix <bugfix-tag-index>`: Tools that fix specific bugs, either permanently or on-demand.
 - `design <design-tag-index>`: Tools that help you design your fort.
@@ -46,3 +48,7 @@ for the tag assignment spreadsheet.
 - `stockpiles <stockpiles-tag-index>`: Tools that interact with stockpiles.
 - `units <units-tag-index>`: Tools that interact with units.
 - `workorders <workorders-tag-index>`: Tools that interact with workorders.
+
+"misc" tags
+-----------
+- `unavailable <unavailable-tag-index>`: Tools that are not yet available for the current release.
diff --git a/docs/Tools.rst b/docs/Tools.rst
index 401276d7f..67d7edc54 100644
--- a/docs/Tools.rst
+++ b/docs/Tools.rst
@@ -3,8 +3,8 @@
 DFHack tools
 ============
 
-DFHack has **a lot** of tools. This page attempts to make it clearer what they
-are, how they work, and how to find the ones you want.
+DFHack comes with **a lot** of tools. This page attempts to make it clearer
+what they are, how they work, and how to find the ones you want.
 
 .. contents:: Contents
   :local:
@@ -36,6 +36,12 @@ more than one category. If you already know what you're looking for, try the
 `search` or Ctrl-F on this page. If you'd like to see the full list of tools in
 one flat list, please refer to the `annotated index <all-tag-index>`.
 
+Some tools are part of our back catalog and haven't been updated yet for v50 of
+Dwarf Fortress. These tools are tagged as
+`unavailable <unavailable-tag-index>`. They will still appear in the
+alphabetical list at the bottom of this page, but unavailable tools will not
+listed in any of the indices.
+
 DFHack tools by game mode
 -------------------------
 
diff --git a/docs/about/Authors.rst b/docs/about/Authors.rst
index 280594674..7bb2f0567 100644
--- a/docs/about/Authors.rst
+++ b/docs/about/Authors.rst
@@ -3,7 +3,7 @@ List of authors
 The following is a list of people who have contributed to DFHack, in
 alphabetical order.
 
-If you should be here and aren't, please get in touch on IRC or the forums,
+If you should be here and aren't, please get in touch on Discord or the forums,
 or make a pull request!
 
 ======================= ======================= ===========================
@@ -12,16 +12,22 @@ Name                    Github                  Other
 8Z                      8Z
 Abel                    abstern
 acwatkins               acwatkins
+Alex Blamey             Cubittus
+Alexander Collins       gearsix
 Alexander Gavrilov      angavrilov              ag
+Amber Brown             hawkowl
 Amostubal               Amostubal
 Andrea Cattaneo         acattaneo88
 AndreasPK               AndreasPK
+Andriel Chaoti          AndrielChaoti
 Angus Mezick            amezick
 Antalia                 tamarakorr
 Anuradha Dissanayake    falconne
+Ariphaos                Ariphaos
 arzyu                   arzyu
 Atkana                  Atkana
 AtomicChicken           AtomicChicken
+Batt Mush               hobotron-df
 Bearskie                Bearskie
 belal                   jimhester
 Ben Lubar               BenLubar
@@ -36,8 +42,10 @@ Cameron Ewell           Ozzatron
 Carter Bray             Qartar
 Chris Dombroski         cdombroski
 Chris Parsons           chrismdp
+cjhammel                cjhammel
 Clayton Hughes
 Clément Vuchener        cvuchener
+Corey                   CoreyJ87
 daedsidog               daedsidog
 Dan Amlund              danamlund
 Daniel Brooks           db48x
@@ -46,11 +54,16 @@ David Corbett           dscorbett
 David Seguin            dseguin
 David Timm              dtimm
 Deon
+dikbut                  Tjudge1
+Dmitrii Kurkin          Kurkin
 DoctorVanGogh           DoctorVanGogh
 Donald Ruegsegger       hashaash
 doomchild               doomchild
 DwarvenM                DwarvenM
+Eamon Bode              eamondo2                Baron Von Munchhausen
+EarthPulseAcademy       EarthPulseAcademy
 ElMendukol              ElMendukol
+ElsaTheHobo             ElsaTheHobo             Elsa
 enjia2000
 Eric Wald               eswald
 Erik Youngren           Artanis
@@ -59,6 +72,7 @@ expwnent                expwnent
 Feng
 figment                 figment
 Gabe Rau                gaberau
+Gaelmare                Gaelmare
 gchristopher            gchristopher
 George Murray           GitOnUp
 grubsteak               grubsteak
@@ -66,10 +80,14 @@ Guilherme Abraham       GuilhermeAbraham
 Harlan Playford         playfordh
 Hayati Ayguen           hayguen
 Herwig Hochleitner      bendlas
+Hevlikn                 Hevlikn
 Ian S                   kremlin-
 IndigoFenix
+Jacek Konieczny         Jajcus
+James                   20k
 James Gilles            kazimuth
 James Logsdon           jlogsdon
+Janeene Beeforth        dawnmist
 Jared Adams
 Jeremy Apthorp          nornagon
 Jim Lisi                stonetoad
@@ -78,16 +96,22 @@ jimcarreer              jimcarreer
 jj                      jjyg                    jj\`\`
 Joel Meador             janxious
 John Beisley            huin
+John Cosker             johncosker
 John Shade              gsvslto
 Jonas Ask
+Jonathan Clark          AridTag
 Josh Cooper             cppcooper               coope
+jowario                 jowario
 kane-t                  kane-t
 Kelly Kinkade           ab9rf
+Kelvie Wong             kelvie
+Kib Arekatír            arekatir
 KlonZK                  KlonZK
 Kris Parker             kaypy
 Kristjan Moore          kristjanmoore
 Kromtec                 Kromtec
 Kurik Amudnil
+Kévin Boissonneault     KABoissonneault
 Lethosor                lethosor
 LordGolias              LordGolias
 Mark Nielson            pseudodragon
@@ -106,12 +130,16 @@ Michael Crouch          creidieki
 Michon van Dooren       MaienM
 miffedmap               miffedmap
 Mike Stewart            thewonderidiot
+Mikhail Panov           Halifay
 Mikko Juola             Noeda                   Adeon
 Milo Christiansen       milochristiansen
 MithrilTuxedo           MithrilTuxedo
 mizipzor                mizipzor
 moversti                moversti
+mrrho                   mrrho
+Murad Beybalaev         Erquint
 Myk Taylor              myk002
+Najeeb Al-Shabibi       master-spike
 napagokc                napagokc
 Neil Little             nmlittle
 Nick Rart               nickrart                comestible
@@ -119,20 +147,28 @@ Nicolas Ayala           nicolasayala
 Nik Nyby                nikolas
 Nikolay Amiantov        abbradar
 nocico                  nocico
+NotRexButCaesar         NotRexButCaesar
+Nuno Fernandes          UnknowableCoder
+nuvu                    vallode
 Omniclasm
+oorzkws                 oorzkws
 OwnageIsMagic           OwnageIsMagic
 palenerd                dlmarquis
 PassionateAngler        PassionateAngler
 Patrik Lundell          PatrikLundell
 Paul Fenwick            pjf
 PeridexisErrant         PeridexisErrant
+Peter Hansen            previsualconsent
 Petr Mrázek             peterix
 Pfhreak                 Pfhreak
 Pierre Lulé             plule
 Pierre-David Bélanger   pierredavidbelanger
+PopnROFL                PopnROFL
 potato
+ppaawwll                ppaawwll                ����
 Priit Laes              plaes
 Putnam                  Putnam3145
+quarque2                quarque2
 Quietust                quietust                _Q
 Rafał Karczmarczyk      CarabusX
 Raidau                  Raidau
@@ -145,6 +181,8 @@ reverb
 Rich Rauenzahn          rrauenza
 Rinin                   Rinin
 rndmvar                 rndmvar
+Rob Bailey              actionninja
+Rob Goodberry           robob27
 Robert Heinrich         rh73
 Robert Janetzko         robertjanetzko
 Rocco Moretti           roccomoretti
@@ -155,18 +193,26 @@ Rose                    RosaryMala
 Roses                   Pheosics
 Ross M                  RossM
 rout
+Roxy                    TealSeer                gallowsCalibrator
 rubybrowncoat           rubybrowncoat
 Rumrusher               rumrusher
 RusAnon                 RusAnon
 Ryan Bennitt            ryanbennitt
+Ryan Dwyer              ToxicBananaParty        Jimdude2435
 Ryan Williams           Bumber64                Bumber
 sami
 scamtank                scamtank
+Scott Ellis             StormCrow42
 Sebastian Wolfertz      Enkrod
+SeerSkye                SeerSkye
 seishuuu                seishuuu
 Seth Woodworth          sethwoodworth
+shevernitskiy           shevernitskiy
+Shim Panze              Shim-Panze
+Silver                  silverflyone
 simon
 Simon Jackson           sizeak
+Simon Lees              simotek
 stolencatkarma
 Stoyan Gaydarov         sgayda2
 Su                      Moth-Tolias
@@ -174,6 +220,7 @@ suokko                  suokko                  shrieker
 sv-esk                  sv-esk
 Tachytaenius            wolfboyft
 Tacomagic
+TaxiService             TaxiService
 thefriendlyhacker       thefriendlyhacker
 TheHologram             TheHologram
 Theo Kalfas             teolandon
@@ -197,7 +244,10 @@ ViTuRaS                 ViTuRaS
 Vjek                    vjek
 Warmist                 warmist
 Wes Malone              wesQ3
+Will H                  TSM-EVO
 Will Rogers             wjrogers
+WoosterUK               WoosterUK
+XianMaeve               XianMaeve
 ZechyW                  ZechyW
 Zhentar                 Zhentar
 zilpin                  zilpin
diff --git a/docs/about/Removed.rst b/docs/about/Removed.rst
index 072bd32ab..da7d42d37 100644
--- a/docs/about/Removed.rst
+++ b/docs/about/Removed.rst
@@ -10,12 +10,75 @@ work (e.g. links from the `changelog`).
   :local:
   :depth: 1
 
+.. _workorder-recheck:
+
+workorder-recheck
+=================
+Tool to set 'Checking' status of the selected work order, allowing conditions to be
+reevaluated. Merged into `orders`.
+
+.. _autohauler:
+
+autohauler
+==========
+An automated labor management tool that only addressed hauling labors, leaving the assignment
+of skilled labors entirely up to the player. Fundamentally incompatible with the work detail
+system of labor management in v50 of Dwarf Fortress.
+
+.. _automaterial:
+
+automaterial
+============
+Moved frequently used materials to the top of the materials list when building
+buildings. Also offered extended options when building constructions. All
+functionality has been merged into `buildingplan`.
+
+.. _automelt:
+
+automelt
+========
+Automatically mark items for melting when they are brought to a monitored
+stockpile. Merged into `logistics`.
+
+.. _autotrade:
+
+autotrade
+=========
+Automatically mark items for trading when they are brought to a monitored
+stockpile. Merged into `logistics`.
+
+.. _autounsuspend:
+
+autounsuspend
+=============
+Replaced by `suspendmanager`.
+
+.. _combine-drinks:
+
+combine-drinks
+==============
+Replaced by the new `combine` script. Run
+``combine here --types=drink``
+
+.. _combine-plants:
+
+combine-plants
+==============
+Replaced by the new `combine` script. Run
+``combine here --types=plants``
+
 .. _command-prompt:
 
 command-prompt
 ==============
 Replaced by `gui/launcher --minimal <gui/launcher>`.
 
+.. _create-items:
+
+create-items
+============
+Replaced by `gui/create-item`.
+
 .. _deteriorateclothes:
 
 deteriorateclothes
@@ -110,12 +173,30 @@ This script is no longer useful in current DF versions. The script required a
 binpatch <binpatches/needs-patch>`, which has not been available since DF
 0.34.11.
 
+.. _gui/automelt:
+
+gui/automelt
+============
+Replaced by the `stockpiles` overlay and the gui for `logistics`.
+
+.. _gui/dig:
+
+gui/dig
+=======
+Renamed to gui/design
+
 .. _gui/hack-wish:
 
 gui/hack-wish
 =============
 Replaced by `gui/create-item`.
 
+.. _gui/mechanisms:
+
+gui/mechanisms
+==============
+Linked building interface has been added to the vanilla UI.
+
 .. _gui/no-dfhack-init:
 
 gui/no-dfhack-init
@@ -124,14 +205,52 @@ Tool that warned the user when the ``dfhack.init`` file did not exist. Now that
 ``dfhack.init`` is autogenerated in ``dfhack-config/init``, this warning is no
 longer necessary.
 
+.. _masspit:
+
+masspit
+=======
+Replaced with a GUI version: `gui/masspit`.
+
 .. _resume:
 
 resume
 ======
-
 Allowed you to resume suspended jobs and displayed an overlay indicating
 suspended building construction jobs. Replaced by `unsuspend` script.
 
+.. _ruby:
+.. _rb:
+
+ruby
+====
+Support for the Ruby language in DFHack scripts was removed due to the issues
+the Ruby library causes when used as an embedded language.
+
+.. _search-plugin:
+
+search
+======
+Functionality was merged into `sort`.
+
+.. _show-unit-syndromes:
+
+show-unit-syndromes
+===================
+Replaced with a GUI version: `gui/unit-syndromes`.
+
+.. _stocksettings:
+
+stocksettings
+=============
+Along with ``copystock``, ``loadstock`` and ``savestock``, replaced with the new
+`stockpiles` API.
+
+.. _title-version:
+
+title-version
+=============
+Replaced with an `overlay`.
+
 .. _warn-stuck-trees:
 
 warn-stuck-trees
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index c9665a048..c6553e48c 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -33,6 +33,11 @@ The ``<key>`` parameter above has the following **case-sensitive** syntax::
 where the ``KEY`` part can be any recognized key and :kbd:`[`:kbd:`]` denote
 optional parts.
 
+DFHack commands can advertise the contexts in which they can be usefully run.
+For example, a command that acts on a selected unit can tell `keybinding` that
+it is not "applicable" in the current context if a unit is not actively
+selected.
+
 When multiple commands are bound to the same key combination, DFHack selects
 the first applicable one. Later ``add`` commands, and earlier entries within one
 ``add`` command have priority. Commands that are not specifically intended for
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 5d3fb25b2..c1c309b37 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -22,42 +22,675 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
   spans multiple lines. Three ``]`` characters indicate the end of such a block.
 - ``!`` immediately before a phrase set up to be replaced (see gen_changelog.py) stops that occurrence from being replaced.
 
+Template for new versions:
+
+## New Tools
+
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
 ===end
 ]]]
 
 ================================================================================
-======== IMPORTANT: rename this, and add a new "future" section, BEFORE ========
+======== IMPORTANT: rename this, and add a new "Future" section, BEFORE ========
 ======== making a new DFHack release, even if the only changes made     ========
 ======== were in submodules with their own changelogs!                  ========
 ================================================================================
 
 # Future
 
+## New Tools
+- `burrow`: (reinstated) automatically expand burrows as you dig
+
+## New Features
+- `prospect`: can now give you an estimate of resources from the embark screen. hover the mouse over a potential embark area and run `prospect`.
+- `burrow`: integrated 3d box fill and 2d/3d flood fill extensions for burrow painting mode
+- `buildingplan`: allow specific mechanisms to be selected when linking levers
+- `sort`: military and burrow membership filters for the burrow assignment screen
+
+## Fixes
+- `stockpiles`: hide configure and help buttons when the overlay panel is minimized
+- `caravan`: price of vermin swarms correctly adjusted down. a stack of 10000 bees is worth 10, not 10000
+- `sort`: when filtering out already-established temples in the location assignment screen, also filter out the "No specific deity" option if a non-denominational temple has already been established
+- RemoteServer: continue to accept connections as long as the listening socket is valid instead of closing the socket after the first disconnect
+
+## Misc Improvements
+- `buildingplan`: display how many items are available on the planner panel
+- `buildingplan`: clarify interface when building single-tile staircases
+- `sort`: allow searching by profession on the squad assignment page
+- `sort`: add search for work animal assignment screen; allow filtering by miltary/squad/civilian/burrow
+- `sort`: on the squad assignment screen, make effectiveness and potential ratings use the same scale so effectiveness is always less than or equal to potential for a unit and so you can tell when units are approaching their maximum potential
+- `sort`: new overlay on the animal assignment screen that shows how many work animals each visible unit already has assigned to them
+- `dreamfort`: Inside+ and Clearcutting burrows now automatically created and managed
+
+## Documentation
+
+## API
+- ``Gui::revealInDwarfmodeMap``: gained ``highlight`` parameter to control setting the tile highlight on the zoom target
+- ``Maps::getWalkableGroup``: get the walkability group of a tile
+- ``Units::getReadableName``: now returns the *untranslated* name
+- ``Burrows::setAssignedUnit``: now properly handles inactive burrows
+- ``Gui::getMousePos``: now takes an optional ``allow_out_of_bounds`` parameter so coordinates can be returned for mouse positions outside of the game map (i.e. in the blank space around the map)
+- ``Buildings::completebuild``: used to link a newly created building into the world
+
+## Lua
+- ``dfhack.gui.revealInDwarfmodeMap``: gained ``highlight`` parameter to control setting the tile highlight on the zoom target
+- ``dfhack.maps.getWalkableGroup``: get the walkability group of a tile
+- ``dfhack.gui.getMousePos``: support new optional ``allow_out_of_bounds`` parameter
+- ``gui.FRAME_THIN``: a panel frame suitable for floating tooltips
+- ``dfhack.buildings.completebuild``: expose new module API
+
+## Removed
+
+# 50.11-r2
+
+## New Tools
+- `spectate`: (reinstated) automatically follow dwarves, cycling among interesting ones
+- `preserve-tombs`: keep tombs assigned to units when they die
+
+## New Features
+- `logistics`: ``automelt`` now optionally supports melting masterworks; click on gear icon on `stockpiles` overlay frame
+- `sort`: new search widgets for Info panel tabs, including all "Creatures" subtabs, all "Objects" subtabs, "Tasks", candidate assignment on the "Noble" subtab, and the "Work details" subtab under "Labor"
+- `sort`: new search and filter widgets for the "Interrogate" and "Convict" screens under "Justice"
+- `sort`: new search widgets for location selection screen (when you're choosing what kind of guildhall or temple to dedicate)
+- `sort`: new search widgets for burrow assignment screen and other unit assignment dialogs
+- `sort`: new search widgets for artifacts on the world/raid screen
+- `sort`: new search widgets for slab engraving menu; can filter for only units that need a slab to prevent rising as a ghost
+- `stocks`: hotkey for collapsing all categories on stocks screen
+
+## Fixes
+- `buildingplan`: remove bars of ash, coal, and soap as valid building materials to match v50 rules
+- `buildingplan`: fix incorrect required items being displayed sometimes when switching the planner overlay on and off
+- `zone`: races without specific child or baby names will now get generic child/baby names instead of an empty string
+- `zone`: don't show animal assignment link for cages and restraints linked to dungeon zones (which aren't normally assignable)
+- `sort`: don't count mercenaries as appointed officials in the squad assignment screen
+- `dwarfvet`: fix invalid job id assigned to ``Rest`` job, which could cause crashes on reload
+
+## Misc Improvements
+- `overlay`: allow ``overlay_onupdate_max_freq_seconds`` to be dynamically set to 0 for a burst of high-frequency updates
+- Help icons added to several complex overlays. clicking the icon runs `gui/launcher` with the help text in the help area
+- `orders`: ``recheck`` command now only resets orders that have conditions that can be rechecked
+- `sort`: added help button for squad assignment search/filter/sort
+- `zone`: animals trained for war or hunting are now labeled as such in animal assignment screens
+- `buildingplan`: support filtering cages by whether they are occupied
+- `buildingplan`: show how many items you need to make when planning buildings
+- `tailor`: now adds to existing orders if possilbe instead of creating new ones
+
+## Documentation
+- unavailable tools are no longer listed in the tag indices in the online docs
+
+## API
+- added ``Items::getCapacity``, returns the capacity of an item as a container (reverse-engineered), needed for `combine`
+
+## Lua
+- added ``GRAY`` color aliases for ``GREY`` colors
+- added ``dfhack.items.getCapacity`` to expose the new module API
+- ``utils.search_text``: text search routine (generalized from internal ``widgets.FilteredList`` logic)
+
+## Removed
+- ``FILTER_FULL_TEXT``: moved from ``gui.widgets`` to ``utils``; if your full text search preference is lost, please reset it in `gui/control-panel`
+
+# 50.11-r1
+
+## New Tools
+- `tubefill`: (reinstated) replenishes mined-out adamantine
+
+## Fixes
+- `autolabor`: ensure vanilla work details are reinstated when the fort or the plugin is unloaded
+- ``dfhack.TranslateName()``: fixed crash on certain invalid names, which affected `warn-starving`
+- EventManager: Unit death event no longer misfires on units leaving the map
+
+## Misc Improvements
+- `digtype`: designate only visible tiles by default, and use "auto" dig mode for following veins
+- `digtype`: added options for designating only current z-level, this z-level and above, and this z-level and below
+- `hotkeys`: make the DFHack logo brighten on hover in ascii mode to indicate that it is clickable
+- `hotkeys`: use vertical bars instead of "!" symbols for the DFHack logo in ascii mode to make it easier to read
+- EventManager: guard against potential iterator invalidation if one of the event listeners were to modify the global data structure being iterated over
+- EventManager: for ``onBuildingCreatedDestroyed`` events, changed firing order of events so destroyed events come before created events
+
+## Lua
+- mouse key events are now aligned with internal DF semantics: ``_MOUSE_L`` indicates that the left mouse button has just been pressed and ``_MOUSE_L_DOWN`` indicates that the left mouse button is being held down. similarly for ``_MOUSE_R`` and ``_MOUSE_M``. 3rd party scripts may have to adjust.
+
+# 50.10-r1
+
+## Fixes
+- Linux launcher: allow Steam Overlay and game streaming to function
+- `autobutcher`: don't ignore semi-wild units when marking units for slaughter
+
+## Misc Improvements
+- 'sort': Improve combat skill scale thresholds
+
+# 50.09-r4
+
+## New Features
+- `dig`: new overlay for ASCII mode that visualizes designations for smoothing, engraving, carving tracks, and carving fortifications
+
+## Fixes
+- `buildingplan`: make the construction dimensions readout visible again
+- `seedwatch`: fix a crash when reading data saved by very very old versions of the plugin
+- `gui/mod-manager`: don't continue to display overlay after the raws loading progress bar appears
+
+## Misc Improvements
+- `sort`: add sort option for training need on squad assignment screen
+- `sort`: filter mothers with infants, units with weak mental fortitude, and critically injured units on the squad assignment screen
+- `sort`: display a rating relative to the current sort order next to the visible units on the squad assignment screen
+
+## Documentation
+- add instructions for downloading development builds to the ``Installing`` page
+
+## API
+- `overlay`: overlay widgets can now declare a ``version`` attribute. changing the version of a widget will reset its settings to defaults. this is useful when changing the overlay layout and old saved positions will no longer be valid.
+
+## Lua
+- ``argparse.boolean``: convert arguments to lua boolean values.
+
+# 50.09-r3
+
+## New Features
+- `sort`: search, sort, and filter for squad assignment screen
+- `zone`: advanced unit assignment screens for cages, restraints, and pits/ponds
+- `buildingplan`: one-click magma/fire safety filter for planned buildings
+
+## Fixes
+- Core: reload scripts in mods when a world is unloaded and immediately loaded again
+- Core: fix text getting added to DFHack text entry widgets when Alt- or Ctrl- keys are hit
+- `buildingplan`: ensure selected barrels and buckets are empty (or at least free of lye and milk) as per the requirements of the building
+- `orders`: prevent import/export overlay from appearing on the create workorder screen
+- `caravan`: corrected prices for cages that have units inside of them
+- `tailor`: remove crash caused by clothing items with an invalid ``maker_race``
+- ``dialogs.MessageBox``: fix spacing around scrollable text
+- `seedwatch`: ignore unplantable tree seeds
+- `autobutcher`: fix ``ticks`` commandline option incorrectly rejecting positive integers as valid values
+
+## Misc Improvements
+- Surround DFHack-specific UI elements with square brackets instead of red-yellow blocks for better readability
+- `autobutcher`: don't mark animals for butchering if they are already marked for some kind of training (war, hunt)
+- `hotkeys`: don't display DFHack logo in legends mode since it covers up important interface elements. the Ctrl-Shift-C hotkey to bring up the menu and the mouseover hotspot still function, though.
+- `sort`: animals are now sortable by race on the assignment screens
+- `createitem`: support creating items inside of bags
+
+## API
+- ``Items::getValue()``: remove ``caravan_buying`` parameter since the identity of the selling party doesn't actually affect the item value
+- `RemoteFortressReader`: add a ``force_reload`` option to the GetBlockList RPC API to return blocks regardless of whether they have changed since the last request
+- ``Units``: new animal propery check functions ``isMarkedForTraining(unit)``, ``isMarkedForTaming(unit)``, ``isMarkedForWarTraining(unit)``, and ``isMarkedForHuntTraining(unit)``
+- ``Gui``: ``getAnyStockpile`` and ``getAnyCivzone`` (along with their ``getSelected`` variants) now work through layers of ZScreens. This means that they will still return valid results even if a DFHack tool window is in the foereground.
+
+## Lua
+- ``new()``: improved error handling so that certain errors that were previously uncatchable (creating objects with members with unknown vtables) are now catchable with ``pcall()``
+- ``dfhack.items.getValue()``: remove ``caravan_buying`` param as per C++ API change
+- ``widgets.BannerPanel``: panel with distinctive border for marking DFHack UI elements on otherwise vanilla screens
+- ``widgets.Panel``: new functions to override instead of setting corresponding properties (useful when subclassing instead of just setting attributes): ``onDragBegin``, ``onDragEnd``, ``onResizeBegin``, ``onResizeEnd``
+- ``dfhack.screen.readTile()``: now populates extended tile property fields (like ``top_of_text``) in the returned ``Pen`` object
+- ``dfhack.units``: new animal propery check functions ``isMarkedForTraining(unit)``, ``isMarkedForTaming(unit)``, ``isMarkedForWarTraining(unit)``, and ``isMarkedForHuntTraining(unit)``
+- ``dfhack.gui``: new ``getAnyCivZone`` and ``getAnyStockpile`` functions; also behavior of ``getSelectedCivZone`` and ``getSelectedStockpile`` functions has changes as per the related API notes
+
+# 50.09-r2
+
 ## New Plugins
+- `3dveins`: reinstated for v50, this plugin replaces vanilla DF's blobby vein generation with veins that flow smoothly and naturally between z-levels
+- `zone`: new searchable, sortable, filterable screen for assigning units to pastures
+- `dwarfvet`: reinstated and updated for v50's new hospital mechanics; allow your animals to have their wounds treated at hospitals
+- `dig`: new ``dig.asciiwarmdamp`` overlay that highlights warm and damp tiles when in ASCII mode. there is no effect in graphics mode since the tiles are already highlighted there
 
 ## Fixes
+- Fix extra keys appearing in DFHack text boxes when shift (or any other modifier) is released before the other key you were pressing
+- `logistics`: don't autotrain domestic animals brought by invaders (they'll get attacked by friendly creatures as soon as you let them out of their cage)
+- `logistics`: don't bring trade goods to depot if the only caravans present are tribute caravans
+- `gui/create-item`: when choosing a citizen to create the chosen items, avoid choosing a dead citizen
+- `logistics`: fix potential crash when removing stockpiles or turning off stockpile features
+
+## Misc Improvements
+- `stockpiles`: include exotic pets in the "tameable" filter
+- `logistics`: bring an autotraded bin to the depot if any item inside is tradeable instead of marking all items within the bin as untradeable if any individual item is untradeable
+- `autonick`: add more variety to nicknames based on famous literary dwarves
+- ``widgets.EditField``: DFHack edit fields now support cut/copy/paste with the system clipboard with Ctrl-X/Ctrl-C/Ctrl-V
+- Suppress DF keyboard events when a DFHack keybinding is matched. This prevents, for example, a backtick from appearing in a textbox as text when you launch `gui/launcher` from the backtick keybinding.
+- Dreamfort: give noble suites double-thick walls and add apartment doors
+
+## Documentation
+- `misery`: rewrite the documentation to clarify the actual effects of the plugin
+
+## API
+- ``Units::getUnitByNobleRole``, ``Units::getUnitsByNobleRole``: unit lookup API by role
+- ``Items::markForTrade()``, ``Items::isRequestedTradeGood()``, ``Items::getValue``: see Lua notes below
+
+## Internals
+- Price calculations fixed for many item types
+
+## Lua
+- ``dfhack.units.getUnitByNobleRole``, ``dfhack.units.getUnitsByNobleRole``: unit lookup API by role
+- ``dfhack.items.markForTrade``: mark items for trade
+- ``dfhack.items.isRequestedTradeGood``: discover whether an item is named in a trade agreement with an active caravan
+- ``dfhack.items.getValue``: gained optional ``caravan`` and ``caravan_buying`` parameters for prices that take trader races and agreements into account
+- ``widgets.TextButton``: wraps a ``HotkeyLabel`` and decorates it to look more like a button
+
+# 50.09-r1
+
+## Internals
+
+- Core: update SDL interface from SDL1 to SDL2
+
+# 50.08-r4
+
+## New Plugins
+- `logistics`: automatically mark and route items or animals that come to monitored stockpiles. options are toggleable on an overlay that comes up when you have a stockpile selected.
+
+## Fixes
+- `buildingplan`: don't include artifacts when max quality is masterful
+- `dig-now`: clear item occupancy flags for channeled tiles that had items on them
+- `RemoteFortressReader`: fix a crash with engravings with undefined images
+
+## Misc Improvements
+- `autonick`: additional nicknames based on burrowing animals, colours, gems, and minerals
+- `stockpiles`: added ``barrels``, ``organic``, ``artifacts``, and ``masterworks`` stockpile presets
+- `orders`: only display import/export/sort/clear panel on main orders screen
+- `orders`: refine order conditions for library orders to reduce cancellation spam
+- Blueprint library: dreamfort: full rewrite and update for DF v50
+- Blueprint library: pump_stack: updated walkthrough and separated dig and channel steps so boulders can be cleared
+- Blueprint library: aquifer_tap: updated walkthrough
+- `dig-now`: can now handle digging obsidian that has been formed from magma and water
+
+## Documentation
+- `blueprint-library-guide`: update Dreamfort screenshots and links, add ``aquifer_tap`` screenshot
+
+# 50.08-r3
+
+## Fixes
+- Fix crash for some players when they launch DF outside of the Steam client
+
+# 50.08-r2
+
+## New Plugins
+- `add-spatter`: (reinstated) allow mods to add poisons and magical effects to weapons
+- `changeitem`: (reinstated) change item material, quality, and subtype
+- `createitem`: (reinstated) create arbitrary items from the command line
+- `deramp`: (reinstated) removes all ramps designated for removal from the map
+- `flows`: (reinstated) counts map blocks with flowing liquids
+- `lair`: (reinstated) mark the map as a monster lair (this avoids item scatter when the fortress is abandoned)
+- `luasocket`: (reinstated) provides a Lua API for accessing network sockets
+- `work-now`: (reinstated, renamed from ``workNow``) prevent dwarves from wandering aimlessly with "No job" after completing a task
+
+## Fixes
+- DFHack screen backgrounds now use appropriate tiles in DF Classic
+- RemoteServer: fix crash on malformed json in ``dfhack-config/remote-server.json``
+- `autolabor`: work detail override warning now only appears on the work details screen
+- `RemoteFortressReader`: ensured names are transmitted in UTF-8 instead of CP437
+
+## Misc Improvements
+- `autodump`: no longer checks for a keyboard cursor before executing, so ``autodump destroy`` (which doesn't require a cursor) can still function
+- Settings: recover gracefully when settings files become corrupted (e.g. by DF CTD)
+- `orders`: update orders in library for prepared meals, bins, archer uniforms, and weapons
+- `gui/control-panel`: new preference for whether filters in lists search for substrings in the middle of words (e.g. if set to true, then "ee" will match "steel")
+- `gui/design`: Improved performance for drawing shapes
+- Dreamfort: improve traffic patterns throughout the fortress
+- `gui/blueprint`: recording of stockpile layouts and categories is now supported. note that detailed stockpile configurations will *not* be saved (yet)
+- Core: new commandline flag/environment var: pass ``--disable-dfhack`` on the Dwarf Fortress commandline or specify ``DFHACK_DISABLE=1`` in the environment to disable DFHack for the current session.
+- `overlay`: add links to the quickstart guide and the control panel on the DF title screen
+- Window behavior: non-resizable windows now allow dragging by their frame edges by default
+- `gui/autodump`: fort-mode keybinding: Ctrl-H (when ``armok`` tools are enabled in `gui/control-panel`)
+- Window behavior: if you have multiple DFHack tool windows open, scrolling the mouse wheel while over an unfocused window will focus it and raise it to the top
+- `stockpiles`: allow filtering creatures by tameability
+
+## Internals
+- ``dfhack.internal``: added memory analysis functions: ``msizeAddress``, ``getHeapState``, ``heapTakeSnapshot``, ``isAddressInHeap``, ``isAddressActiveInHeap``, ``isAddressUsedAfterFreeInHeap``, ``getAddressSizeInHeap``, and ``getRootAddressOfHeapObject``
+
+## Lua
+- ``overlay.reload()``: has been renamed to ``overlay.rescan()`` so as not to conflict with the global ``reload()`` function. If you are developing an overlay, please take note of the new function name for reloading your overlay during development.
+- ``gui``: changed frame naming scheme to ``FRAME_X`` rather than ``X_FRAME``, and added aliases for backwards compatibility. (for example ``BOLD_FRAME`` is now called ``FRAME_BOLD``)
+- ``ensure_keys``: walks a series of keys, creating new tables for any missing values
+
+## Removed
+- `orders`: ``library/military_include_artifact_materials`` library file removed since recent research indicates that platinum blunt weapons and silver crossbows are not more effective than standard steel. the alternate military orders file was also causing unneeded confusion.
+
+# 50.08-r1
+
+## Fixes
+- `autoclothing`: eliminate game lag when there are many inventory items in the fort
+- `buildingplan`: fixed size limit calculations for rollers
+- `buildingplan`: fixed items not being checked for accessibility in the filter and item selection dialogs
+- `dig-now`: properly detect and complete smoothing designations that have been converted into active jobs
+
+## Misc Improvements
+- `buildingplan`: planner panel is minimized by default and now remembers minimized state
+- `buildingplan`: can now filter by gems (for gem windows) and yarn (for ropes in wells)
+- ``toggle-kbd-cursor``: add hotkey for toggling the keyboard cursor (Alt-K)
+- ``version``: add alias to display the DFHack help (including the version number) so something happens when players try to run "version"
+- `gui/control-panel`: add preference option for hiding the terminal console on startup
+- `gui/control-panel`: add preference option for hiding "armok" tools in command lists
+- ``Dwarf Therapist``: add a warning to the Labors screen when Dwarf Therapist is active so players know that changes they make to that screen will have no effect. If you're starting a new embark and nobody seems to be doing anything, check your Labors tab for this warning to see if Dwarf Therapist thinks it is in control (even if it's not running).
+- `overlay`: add the DFHack version string to the DF title screen
+
+## Lua
+- ``widgets.RangeSlider``: new mouse-controlled two-headed slider widget
+- ``gui.ZScreenModal``: ZScreen subclass for modal dialogs
+- ``widgets.CycleHotkeyLabel``: exposed "key_sep" and "option_gap" attributes for improved stylistic control.
+
+## Removed
+- `title-version`: replaced by an `overlay` widget
+
+# 50.07-r1
+
+## New Plugins
+- `faststart`: speeds up the "Loading..." screen so the Main Menu appears faster
+
+## Fixes
+-@ `hotkeys`: hotkey hints on menu popup will no longer get their last character cut off by the scrollbar
+-@ ``launchdf``: launch Dwarf Fortress via the Steam client so Steam Workshop is functional
+- `blueprint`: interpret saplings, shrubs, and twigs as floors instead of walls
+- `combine`: fix error processing stockpiles with boundaries that extend outside of the map
+-@ `prospector`: display both "raw" Z levels and "cooked" elevations
+- `stockpiles`: fix crash when importing settings for gems from other worlds
+-@ `stockpiles`: allow numbers in saved stockpile filenames
+
+## Misc Improvements
+-@ `buildingplan`: items in the item selection dialog should now use the same item quality symbols as the base game
+-@ `buildingplan`: hide planner overlay while the DF tutorial is active so that it can detect when you have placed the carpenter's workshop and bed and allow you to finish the tutorial
+- `buildingplan`: can now filter by cloth and silk materials (for ropes)
+-@ `buildingplan`: rearranged elements of ``planneroverlay`` interface
+-@ `buildingplan`: rearranged elements of ``itemselection`` interface
+-@ Mods: scripts in mods that are only in the steam workshop directory are now accessible. this means that a script-only mod that you never mark as "active" when generating a world will still receive automatic updates and be usable from in-game
+-@ Mods: scripts from only the most recent version of an installed mod are added to the script path
+-@ Mods: give active mods a chance to reattach their load hooks when a world is reloaded
+- `gui/control-panel`: bugfix services are now enabled by default
+- Core: hide DFHack terminal console by default when running on Steam Deck
+
+## Documentation
+- `installing`: updated to include Steam installation instructions
+
+## Lua
+- added two new window borders: ``gui.BOLD_FRAME`` for accented elements and ``gui.INTERIOR_MEDIUM_FRAME`` for a signature-less frame that's thicker than the existing ``gui.INTERIOR_FRAME``
+
+# 50.07-beta2
+
+## New Plugins
+- `getplants`: reinstated: designate trees for chopping and shrubs for gathering according to type
+- `prospector`: reinstated: get stone, ore, gem, and other tile property counts in fort mode.
+
+## Fixes
+-@ `buildingplan`: filters are now properly applied to planned stairs
+-@ `buildingplan`: existing carved up/down stairs are now taken into account when determining which stair shape to construct
+- `buildingplan`: upright spike traps are now placed extended rather than retracted
+- `buildingplan`: you can no longer designate constructions on tiles with magma or deep water, mirroring the vanilla restrictions
+-@ `buildingplan`: fixed material filters getting lost for planning buildings on save/reload
+-@ `buildingplan`: respect building size limits (e.g. roads and bridges cannot be more than 31 tiles in any dimension)
+- `tailor`: properly discriminate between dyed and undyed cloth
+-@ `tailor`: no longer default to using adamantine cloth for producing clothes
+- `tailor`: take queued orders into account when calculating available materials
+- `tailor`: skip units who can't wear clothes
+- `tailor`: identify more available items as available, solving issues with over-production
+
+## Misc Improvements
+- `buildingplan`: filters and global settings are now ignored when manually choosing items for a building, allowing you to make custom choices independently of the filters that would otherwise be used
+- `buildingplan`: if `suspendmanager` is running, then planned buildings will be left suspended when their items are all attached. `suspendmanager` will unsuspsend them for construction when it is safe to do so.
+- `buildingplan`: add option for autoselecting the last manually chosen item (like `automaterial` used to do)
+- `confirm`: adds confirmation for removing burrows via the repaint menu
+- `stockpiles`: support applying stockpile configurations with fully enabled categories to stockpiles in worlds other than the one where the configuration was exported from
+- `stockpiles`: support partial application of a saved config based on dynamic filtering (e.g. disable all tallow in a food stockpile, even tallow from world-specific generated creatures)
+- `stockpiles`: additive and subtractive modes when applying a second stockpile configuration on top of a first
+- `stockpiles`: write player-exported stockpile configurations to the ``dfhack-config/stockpiles`` folder. If you have any stockpile configs in other directories, please move them to that folder.
+- `stockpiles`: now includes a library of useful stockpile configs (see docs for details)
+- `automelt`: now allows metal chests to be melted (workaround for DF bug 2493 is no longer needed)
+- `orders`: add minimize button to overlay panel so you can get it out of the way to read long statue descriptions when choosing a subject in the details screen
+- `orders`: add option to delete exported files from the import dialog
+- `enable`: can now interpret aliases defined with the `alias` command
+- Mods: scripts in mods are now automatically added to the DFHack script path. DFHack recognizes two directories in a mod's folder: ``scripts_modinstalled/`` and ``scripts_modactive/``. ``scripts_modinstalled/`` folders will always be added the script path, regardless of whether the mod is active in a world. ``scripts_modactive/`` folders will only be added to the script path when the mod is active in the current loaded world.
+
+## Documentation
+- `modding-guide`: guide updated to include information for 3rd party script developers
+- the ``untested`` tag has been renamed to ``unavailable`` to better reflect the status of the remaining unavaialable tools. most of the simply "untested" tools have now been tested and marked as working. the remaining tools are known to need development work before they are available again.
+
+## Lua
+- ``widgets.Label``: tokens can now specify a ``htile`` property to indicate the tile that should be shown when the Label is hovered over with the mouse
+- ``widgets.Label``: click handlers no longer get the label itself as the first param to the click handler
+- ``widgets.CycleHotkeyLabel``: options that are bare integers will no longer be interpreted as the pen color in addition to being the label and value
+- ``widgets.CycleHotkeyLabel``: option labels and pens can now be functions that return a label or pen
+
+# 50.07-beta1
+
+## Fixes
+-@ `buildingplan`: items are now attached correctly to screw pumps and other multi-item buildings
+-@ `buildingplan`: buildings with different material filters will no longer get "stuck" if one of the filters currently matches no items
+- `showmood` properly count required number of bars and cloth when they aren't the main item for the strange mood
+
+## Misc Improvements
+-@ `buildingplan`: can now filter by clay materials
+-@ `buildingplan`: remember choice per building type for whether the player wants to choose specific items
+-@ `buildingplan`: you can now attach multiple weapons to spike traps
+-@ `buildingplan`: can now filter by whether a slab is engraved
+-@ `buildingplan`: add "minimize" button to temporarily get the planner overlay out of the way if you would rather use the vanilla UI for placing the current building
+-@ `buildingplan`: add ``buildingplan reset`` command for resetting all filters to defaults
+-@ `buildingplan`: rename "Build" button to "Confirm" on the item selection dialog and change the hotkey from "B" to "C"
+- `blueprint`: now writes blueprints to the ``dfhack-config/blueprints`` directory
+- `blueprint-library-guide`: library blueprints have moved from ``blueprints`` to ``hack/data/blueprints``
+- `blueprint-library-guide`: player-created blueprints should now go in the ``dfhack-config/blueprints`` folder. please move your existing blueprints from ``blueprints`` to ``dfhack-config/blueprints``. you don't need to move the library blueprints -- those can be safely deleted from the old ``blueprints`` directory.
+-@ `showmood`: clarify how many bars and/or cloth items are actually needed for the mood
+
+## Removed
+-@ `buildingplan`: "heat safety" setting is temporarily removed while we investigate incorrect item matching
+
+# 50.07-alpha3
+
+## Fixes
+-@ ``widgets.HotkeyLabel``: don't trigger on click if the widget is disabled
+- ``dfhack.job.isSuitableMaterial``: now properly detects lack of fire and magma safety for vulnerable materials with high melting points
+- `dig-now`: fixed multi-layer channel designations only channeling every second layer
+
+## Misc Improvements
+- `dig-now`: added handling of dig designations that have been converted into active jobs
+- `buildingplan`: entirely new UI for building placement, item selection, and materials filtering!
+
+## API
+- Gui focus strings will no longer get the "dfhack/" prefix if the string "dfhack/" already exists in the focus string
+- ``Military``: New module for military functionality
+- ``Military``: new ``makeSquad`` to create a squad
+- ``Military``: changed ``getSquadName`` to take a squad identifier
+- ``Military``: new ``updateRoomAssignments`` for assigning a squad to a barracks and archery range
+- ``Maps::GetBiomeType`` renamed to ``Maps::getBiomeType`` for consistency
+- ``Maps::GetBiomeTypeRef`` renamed to ``Maps::getBiomeTypeRef`` for consistency
+
+## Lua
+- ``dfhack.job.attachJobItem()``: allows you to attach specific items to a job
+- ``dfhack.screen.paintTile()``: you can now explicitly clear the interface cursor from a map tile by passing ``0`` as the tile value
+- ``widgets.Label``: token ``tile`` properties can now be functions that return a value
+- ``widgets.CycleHotkeyLabel``: add ``label_below`` attribute for compact 2-line output
+-@ ``widgets.FilteredList``: search key matching is now case insensitive by default
+-@ ``gui.INTERIOR_FRAME``: a panel frame style for use in highlighting off interior areas of a UI
+- ``maps.getBiomeType``: exposed preexisting function to Lua
+
+## Removed
+-@ ``gui.THIN_FRAME``: replaced by ``gui.INTERIOR_FRAME``
+- `automaterial`: all functionality has been merged into `buildingplan`
+
+# 50.07-alpha2
+
+## Fixes
+-@ `nestboxes`: fixed bug causing nestboxes themselves to be forbidden, which prevented citizens from using them to lay eggs. Now only eggs are forbidden.
+-@ `autobutcher`: implemented work-around for Dwarf Fortress not setting nicknames properly, so that nicknames created in the in-game interface are detected & protect animals from being butchered properly. Note that nicknames for unnamed units are not currently saved by dwarf fortress - use ``enable fix/protect-nicks`` to fix any nicknames created/removed within dwarf fortress so they can be saved/reloaded when you reload the game.
+-@ `seedwatch`: fix saving and loading of seed stock targets
+- `autodump`: changed behaviour to only change ``dump`` and ``forbid`` flags if an item is successfully dumped.
+-@ `autochop`: generate default names for burrows with no assigned names
+- ``Buildings::StockpileIterator``: fix check for stockpile items on block boundary.
+- `tailor`: block making clothing sized for toads; make replacement clothing orders use the size of the wearer, not the size of the garment
+-@ `confirm`: fix fps drop when enabled
+-@ `channel-safely`: fix an out of bounds error regarding the REPORT event listener receiving (presumably) stale id's
+
+## Misc Improvements
+- `autobutcher`: logs activity to the console terminal instead of making disruptive in-game announcements
+- DFHack tool windows that capture mouse clicks (and therefore prevent you from clicking on the "pause" button) now unconditionally pause the game when they open (but you can still unpause with the keyboard if you want to). Examples of this behavior: `gui/quickfort`, `gui/blueprint`, `gui/liquids`
+- `showmood`: now shows the number of items needed for cloth and bars in addition to the technically correct but always confusing "total dimension" (150 per bar or 10,000 per cloth)
+-@ Stopped mouse clicks from affecting the map when a click on a DFHack screen dismisses the window
+- `confirm`: configuration data is now persisted globally.
+- `tailor`: add support for adamantine cloth (off by default); improve logging
+
+## API
+- ``Gui::any_civzone_hotkey``, ``Gui::getAnyCivZone``, ``Gui::getSelectedCivZone``:  new functions to operate on the new zone system
+- Units module: added new predicates for ``isGeldable()``, ``isMarkedForGelding()``, and ``isPet()``
+
+## Lua
+- ``dfhack.gui.getSelectedCivZone``: returns the Zone that the user has selected currently
+- ``widgets.FilteredList``: Added ``edit_on_change`` optional parameter to allow a custom callback on filter edit change.
+- ``widgets.TabBar``: new library widget (migrated from control-panel.lua)
+
+# 50.07-alpha1
+
+## Fixes
+- ``Units::isFortControlled``: Account for agitated wildlife
+-@ Fix right click sometimes closing both a DFHack window and a vanilla panel
+-@ Fixed issue with scrollable lists having some data off-screen if they were scrolled before being made visible
+-@ `channel-safely`: fixed bug resulting in marker mode never being set for any designation
+-@ `automelt`: fixed bug related to lua stack smashing behavior in returned stockpile configs
+-@ `autochop`: fixed bug related to lua stack smashing behavior in returned stockpile configs
+-@ `nestboxes`: now cancels any in-progress hauling jobs when it protects a fertile egg
+-@ Fix persisted data not being written on manual save
+-@ `nestboxes`: now scans for eggs more frequently and cancels any in-progress hauling jobs when it protects a fertile egg
+
+## Misc Improvements
+-@ `automelt`: is now more resistent to vanilla savegame corruption
+-@ `hotkeys`: DFHack logo is now hidden on screens where it covers important information when in the default position (e.g. when choosing an embark site)
+- `misery`: now persists state with the fort
+-@ `autodump`: reinstate ``autodump-destroy-item``, hotkey: Ctrl-K
+- `autodump`: new hotkey for ``autodump-destroy-here``: Ctrl-H
+-@ `dig`: new hotkeys for vein designation on z-level (Ctrl-V) and vein designation across z-levels (Ctrl-Shift-V)
+-@ `clean`: new hotkey for `spotclean`: Ctrl-C
+- `autobutcher`: changed defaults from 5 females / 1 male to 4 females / 2 males so a single unfortunate accident doesn't leave players without a mating pair
+- `autobutcher`: now immediately loads races available at game start into the watchlist
+-@ replaced DFHack logo used for the hover hotspot with a crisper image
+-@ `orders`: recipe for silver crossbows removed from ``library/military`` as it is not a vanilla recipe, but is available in ``library/military_include_artifact_materials``
+- `stonesense`: added an ``INVERT_MOUSE_Z`` option to invert the mouse wheel direction
+
+## Documentation
+
+## API
+
+## Lua
+- `overlay`: overlay widgets can now specify focus paths for the viewscreens they attach to so they only appear in specific contexts. see `overlay-dev-guide` for details.
+- ``widgets.CycleHotkeyLabel``: Added ``key_back`` optional parameter to cycle backwards.
+- ``widgets.HotkeyLabel``: Added ``setLabel`` method to allow easily updating the label text without mangling the keyboard shortcut.
+- ``widgets.HotkeyLabel``: Added ``setOnActivate`` method to allow easily updating the ``on_activate`` callback.
+- ``widgets.FilteredList``: Added ``case_sensitive`` optional paramter to determine if filtering is case sensitive.
+
+# 50.05-alpha3.1
+
+## Fixes
+-@ `seedwatch`: fix parameter parsing when setting targets
+
+# 50.05-alpha3
+
+## New Plugins
+- `autoslab`: automatically create work orders to engrave slabs for ghostly dwarves
+
+## Fixes
+-@ DF screens can no longer get "stuck" on transitions when DFHack tool windows are visible. Instead, those DF screens are force-paused while DFHack windows are visible so the player can close them first and not corrupt the screen sequence. The "PAUSE FORCED" indicator will appear on these DFHack windows to indicate what is happening.
+-@ allow launcher tools to launch themselves without hanging the game
+-@ fix issues with clicks "passing through" some DFHack window elements to the screen below
+- `getplants`: trees are now designated correctly
+- `autoclothing`: fixed a crash that can happen when units are holding invalid items.
+-@ `orders`: fix orders in library/basic that create bags
+- `orders`: library/military now sticks to vanilla rules and does not add orders for normally-mood-only platinum weapons. A new library orders file ``library/military_include_artifact_materials`` is now offered as an alternate ``library/military`` set of orders that still includes the platinum weapons.
+- `autochop`: fixed a crash when processing trees with corrupt data structures (e.g. when a trunk tile fails to fall when the rest of the tree is chopped down)
+
+## Misc Improvements
+-@ DFHack windows can now be "defocused" by clicking somewhere not over the tool window. This has the same effect as pinning previously did, but without the extra clicking.
+- `getplants`: ID values will now be accepted regardless of case
+-@ Windows now display "PAUSE FORCED" on the lower border if the tool is forcing the game to pause
+-@ New borders for DFHack tool windows -- tell us what you think!
+-@ `autoclothing`: merged the two separate reports into the same command.
+- `automelt`: stockpile configuration can now be set from the commandline
+- `channel-safely`: new monitoring for cave-in prevention
+-@ `gui/control-panel`: you can now configure whether DFHack tool windows should pause the game by default
+- `gui/control-panel`: new global hotkey for quick access: Ctrl-Shift-E
+-@ `hotkeys`: clicking on the DFHack logo no longer closes the popup menu
+- `nestboxes`: now saves enabled state in your savegame
+- `gui/launcher`: sped up initialization time for faster window appearance
+- `orders`: orders plugin functionality is now accessible via an `overlay` widget when the manager orders screen is open
+- `gui/quickcmd`: now has its own global keybinding for your convenience: Ctrl-Shift-A
+- `seedwatch`: now persists enabled state in the savegame, automatically loads useful defaults, and respects reachability when counting available seeds
+-@ `quickfort`: planned buildings are now properly attached to any pertinent overlapping zones
+
+## Documentation
+- `compile`: instructions added for cross-compiling DFHack for Windows from a Linux Docker builder
+-@ Quickstart guide has been updated with info on new window behavior and how to use the control panel
+
+## API
+- ``Buildings::containsTile()``: no longer takes a ``room`` parameter since that's not how rooms work anymore. If the building has extents, the extents will be checked. otherwise, the result just depends on whether the tile is within the building's bounding box.
+- ``Units::getCitizens()``: gets a list of citizens, which otherwise you'd have to iterate over all units the world to discover
+- ``Screen::Pen``: now accepts ``top_of_text`` and ``bottom_of_text`` properties to support offset text in graphics mode
+- `overlay`: overlay widgets can now specify a default enabled state if they are not already set in the player's overlay config file
+- ``Lua::Push``: now supports ``std::unordered_map``
+
+## Lua
+- `helpdb`: new function: ``helpdb.refresh()`` to force a refresh of the database. Call if you are a developer adding new scripts, loading new plugins, or changing help text during play
+- `helpdb`: changed from auto-refreshing every 60 seconds to only refreshing on explicit call to ``helpdb.refresh()``. docs very rarely change during a play session, and the automatic database refreshes were slowing down the startup of `gui/launcher` and anything else that displays help text.
+- ``widgets.Label``: ``label.scroll()`` now understands ``home`` and ``end`` keywords for scrolling to the top or bottom
+- ``widgets.List``: new callbacks for double click and shift double click
+- ``dfhack.units.getCitizens()``: gets a list of citizens
+-@ ``gui.ZScreen``: new attribute: ``defocusable`` for controlling whether a window loses keyboard focus when the map is clicked
+- ``widgets.Label``: token ``tile`` properties can now be either pens or numeric texture ids
+- `tiletypes`: now has a Lua API! ``tiletypes_setTile``
+
+## Removed
+- `autohauler`: no plans to port to v50, as it just doesn't make sense with the new work detail system
+
+# 50.05-alpha2
+
+## Fixes
+-@ `autofarm`: don't duplicate status line entries for crops with no current supply
+-@ `orders`: allow the orders library to be listed and imported properly (if you previously copied the orders library into your ``dfhack-config/orders`` directory to work around this bug, you can remove those files now)
+- `tailor`: now respects the setting of the "used dyed clothing" standing order toggle
+
+# 50.05-alpha1
+
+## Fixes
+- ``widgets.WrappedLabel``: no longer resets scroll position when window is moved or resized
 
 ## Misc Improvements
 - Scrollable widgets now react to mouse wheel events when the mouse is over the widget
 - the ``dfhack-config/scripts/`` folder is now searched for scripts by default
+- `hotkeys`: overlay hotspot widget now shows the DFHack logo in graphics mode and "DFHack" in text mode
+- `script-paths`: removed "raw" directories from default script paths. now the default locations to search for scripts are ``dfhack-config/scripts``, ``save/*/scripts``, and ``hack/scripts``
+- ``init.d``: directories have moved from the ``raw`` subfolder (which no longer exists) to the root of the main DF folder or a savegame folder
 
 ## Documentation
 - `overlay-dev-guide`: added troubleshooting tips and common development workflows
 - added DFHack architecture diagrams to the dev intro
+- added DFHack Quickstart guide
 
 ## API
 - ``Gui::getDwarfmodeDims``: now only returns map viewport dimensions; menu dimensions are obsolete
+- ``Gui::getDFViewscreen``: returns the topmost underlying DF viewscreen
+- ``Screen::Pen``: now accepts ``keep_lower`` and ``write_to_lower`` properties to support foreground and background textures in graphics mode
 
 ## Lua
+- Removed ``os.execute()`` and ``io.popen()`` built-in functions
 - ``gui.View``: ``visible`` and ``active`` can now be functions that return a boolean
 - ``widgets.Panel``: new attributes to control window dragging and resizing with mouse or keyboard
 - ``widgets.Window``: Panel subclass with attributes preset for top-level windows
+- ``widgets.CycleHotkeyLabel``: now supports rendering option labels in the color of your choice
+- ``widgets.CycleHotkeyLabel``: new functions ``setOption()`` and ``getOptionPen()``
+- ``widgets.ToggleHotkeyLabel``: now renders the ``On`` option in green text
+- ``widgets.Label``: tiles can now have an associated width
 - `overlay`: ``OverlayWidget`` now inherits from ``Panel`` instead of ``Widget`` to get all the frame and mouse integration goodies
-
-## Internals
+- ``dfhack.gui.getDFViewscreen()``: returns the topmost underlying DF viewscreen
+- ``gui.ZScreen``: Screen subclass that implements window raising, multi-viewscreen input handling, and viewscreen event pass-through so the underlying map can be interacted with and dragged around while DFHack screens are visible
+- ``gui.View``: new function ``view:getMouseFramePos()`` for detecting whether the mouse is within (or over) the exterior frame of a view
+- ``gui.CLEAR_PEN``: now clears the background and foreground and writes to the background (before it would always write to the foreground)
+- ``gui.KEEP_LOWER_PEN``: a general use pen that writes associated tiles to the foreground while keeping the existing background
 
 ## Removed
 - ``fix-job-postings`` from the `workflow` plugin is now obsolete since affected savegames can no longer be loaded
+- Ruby is no longer a supported DFHack scripting language
 
 # 0.47.05-r8
 
diff --git a/docs/dev/Compile.rst b/docs/dev/Compile.rst
deleted file mode 100644
index 6a2e5d029..000000000
--- a/docs/dev/Compile.rst
+++ /dev/null
@@ -1,869 +0,0 @@
-.. highlight:: shell
-
-.. _compile:
-
-################
-Compiling DFHack
-################
-
-DFHack builds are available for all supported platforms; see `installing` for
-installation instructions. If you are a DFHack end-user, modder, or plan on
-writing scripts (not plugins), it is generally recommended (and easier) to use
-these builds instead of compiling DFHack from source.
-
-However, if you are looking to develop plugins, work on the DFHack core, make
-complex changes to DF-structures, or anything else that requires compiling
-DFHack from source, this document will walk you through the build process. Note
-that some steps may be unconventional compared to other projects, so be sure to
-pay close attention if this is your first time compiling DFHack.
-
-.. contents:: Contents
-  :local:
-  :depth: 1
-
-.. _compile-how-to-get-the-code:
-
-How to get the code
-===================
-DFHack uses Git for source control; instructions for installing Git can be found
-in the platform-specific sections below. The code is hosted on
-`GitHub <https://github.com/DFHack/dfhack>`_, and can be downloaded with::
-
-    git clone --recursive https://github.com/DFHack/dfhack
-    cd dfhack
-
-If your version of Git does not support the ``--recursive`` flag, you will need
-to omit it and run ``git submodule update --init`` after entering the dfhack
-directory.
-
-This will check out the code on the default branch of the GitHub repo, currently
-``develop``, which may be unstable. If you want code for the latest stable
-release, you can check out the ``master`` branch instead::
-
-    git checkout master
-    git submodule update
-
-In general, a single DFHack clone is suitable for development - most Git
-operations such as switching branches can be done on an existing clone. If you
-find yourself cloning DFHack frequently as part of your development process, or
-getting stuck on anything else Git-related, feel free to reach out to us for
-assistance.
-
-.. admonition:: Offline builds
-
-  If you plan to build DFHack on a machine without an internet connection (or
-  with an unreliable connection), see `note-offline-builds` for additional
-  instructions.
-
-.. admonition:: Working with submodules
-
-  DFHack uses submodules extensively to manage its subprojects (including the
-  ``scripts`` folder and DF-structures in ``library/xml``). Failing to keep
-  submodules in sync when switching between branches can result in build errors
-  or scripts that don't work. In general, you should always update submodules
-  whenever you switch between branches in the main DFHack repo with
-  ``git submodule update``. (If you are working on bleeding-edge DFHack and
-  have checked out the master branch of some submodules, running ``git pull``
-  in those submodules is also an option.)
-
-  Rarely, we add or remove submodules. If there are any changes to the existence
-  of submodules when you switch between branches, you should run
-  ``git submodule update --init`` instead (adding ``--init`` to the above
-  command).
-
-  Some common errors that can arise when failing to update submodules include:
-
-  * ``fatal: <some path> does not exist`` when performing Git operations
-  * Build errors, particularly referring to structures in the ``df::`` namespace
-    or the ``library/include/df`` folder
-  * ``Not a known DF version`` when starting DF
-  * ``Run 'git submodule update --init'`` when running CMake
-
-  Submodules are a particularly confusing feature of Git. The
-  `Git Book <https://git-scm.com/book/en/v2/Git-Tools-Submodules>`_ has a
-  thorough explanation of them (as well as of many other aspects of Git) and
-  is a recommended resource if you run into any issues. Other DFHack developers
-  are also able to help with any submodule-related (or Git-related) issues
-  you may encounter.
-
-
-Contributing to DFHack
-----------------------
-
-For details on contributing to DFHack, including pull requests, code
-format, and more, please see `contributing-code`.
-
-
-Build settings
-==============
-
-This section describes build configuration options that apply to all platforms.
-If you don't have a working build environment set up yet, follow the instructions
-in the platform-specific sections below first, then come back here.
-
-Generator
----------
-
-The ``Ninja`` CMake build generator is the preferred build method on Linux and
-macOS, instead of ``Unix Makefiles``, which is the default. You can select Ninja
-by passing ``-G Ninja`` to CMake. Incremental builds using Unix Makefiles can be
-much slower than Ninja builds. Note that you will probably need to install
-Ninja; see the platform-specific sections for details.
-
-::
-
-    cmake .. -G Ninja
-
-.. warning::
-
-  Most other CMake settings can be changed by running ``cmake`` again, but the
-  generator cannot be changed after ``cmake`` has been run without creating a
-  new build folder. Do not forget to specify this option.
-
-  CMake versions 3.6 and older, and possibly as recent as 3.9, are known to
-  produce project files with dependency cycles that fail to build
-  (see :issue:`1369`). Obtaining a recent version of CMake is recommended, either from
-  `cmake.org <https://cmake.org/download/>`_ or through a package manager. See
-  the sections below for more platform-specific directions for installing CMake.
-
-Build type
-----------
-
-``cmake`` allows you to pick a build type by changing the ``CMAKE_BUILD_TYPE`` variable::
-
-    cmake .. -DCMAKE_BUILD_TYPE:string=BUILD_TYPE
-
-Valid and useful build types include 'Release' and 'RelWithDebInfo'. The default
-build type is 'Release'.
-
-Target architecture (32-bit vs. 64-bit)
----------------------------------------
-
-Set DFHACK_BUILD_ARCH to either ``32`` or ``64`` to build a 32-bit or 64-bit
-version of DFHack (respectively). The default is currently ``64``, so you will
-need to specify this explicitly for 32-bit builds. Specifying it is a good idea
-in any case.
-
-::
-
-    cmake .. -DDFHACK_BUILD_ARCH=32
-
-*or*
-::
-
-    cmake .. -DDFHACK_BUILD_ARCH=64
-
-Note that the scripts in the "build" folder on Windows will set the architecture
-automatically.
-
-.. _compile-build-options:
-
-Other settings
---------------
-There are a variety of other settings which you can find in CMakeCache.txt in
-your build folder or by running ``ccmake`` (or another CMake GUI). Most
-DFHack-specific settings begin with ``BUILD_`` and control which parts of DFHack
-are built.
-
-
-.. _compile-linux:
-
-Linux
-=====
-On Linux, DFHack acts as a library that shadows parts of the SDL API using LD_PRELOAD.
-
-Dependencies
-------------
-DFHack is meant to be installed into an existing DF folder, so get one ready.
-
-We assume that any Linux platform will have ``git`` available (though it may
-need to be installed with your package manager.)
-
-To build DFHack, you need GCC 4.8 or newer. GCC 4.8 has the benefit of avoiding
-`libstdc++ compatibility issues <linux-incompatible-libstdcxx>`, but can be hard
-to obtain on modern distributions, and working around these issues is done
-automatically by the ``dfhack`` launcher script. As long as your system-provided
-GCC is new enough, it should work. Note that extremely new GCC versions may not
-have been used to build DFHack yet, so if you run into issues with these, please
-let us know (e.g. by opening a GitHub issue).
-
-Before you can build anything, you'll also need ``cmake``. It is advisable to
-also get ``ccmake`` on distributions that split the cmake package into multiple
-parts. As mentioned above, ``ninja`` is recommended (many distributions call
-this package ``ninja-build``).
-
-You will need pthread; most systems should have this already. Note that older
-CMake versions may have trouble detecting pthread, so if you run into
-pthread-related errors and pthread is installed, you may need to upgrade CMake,
-either by downloading it from `cmake.org <https://cmake.org/download/>`_ or
-through your package manager, if possible.
-
-You also need zlib, libsdl (1.2, not sdl2, like DF), perl, and the XML::LibXML
-and XML::LibXSLT perl packages (for the code generation parts). You should be
-able to find them in your distribution's repositories.
-
-To build `stonesense`, you'll also need OpenGL headers.
-
-Here are some package install commands for various distributions:
-
-* On Arch linux:
-
-  * For the required Perl modules: ``perl-xml-libxml`` and ``perl-xml-libxslt`` (or through ``cpan``)
-
-* On Ubuntu::
-
-    apt-get install gcc cmake ninja-build git zlib1g-dev libsdl1.2-dev libxml-libxml-perl libxml-libxslt-perl
-
-  * Other Debian-based distributions should have similar requirements.
-
-* On Fedora::
-
-    yum install gcc-c++ cmake ninja-build git zlib-devel SDL-devel perl-core perl-XML-LibXML perl-XML-LibXSLT ruby
-
-
-Multilib dependencies
----------------------
-If you want to compile 32-bit DFHack on 64-bit distributions, you'll need the
-multilib development tools and libraries:
-
-* ``gcc-multilib`` and ``g++-multilib``
-* If you have installed a non-default version of GCC - for example, GCC 4.8 on a
-  distribution that defaults to 5.x - you may need to add the version number to
-  the multilib packages.
-
-  * For example, ``gcc-4.8-multilib`` and ``g++-4.8-multilib`` if installing for GCC 4.8
-    on a system that uses a later GCC version.
-  * This is definitely required on Ubuntu/Debian, check if using a different distribution.
-
-* ``zlib1g-dev:i386`` (or a similar i386 zlib-dev package)
-
-Note that installing a 32-bit GCC on 64-bit systems (e.g. ``gcc:i386`` on
-Debian) will typically *not* work, as it depends on several other 32-bit
-libraries that conflict with system libraries. Alternatively, you might be able
-to use ``lxc`` to
-:forums:`create a virtual 32-bit environment <139553.msg5435310#msg5435310>`.
-
-Build
------
-Building is fairly straightforward. Enter the ``build`` folder (or create an
-empty folder in the DFHack directory to use instead) and start the build like this::
-
-    cd build
-    cmake .. -G Ninja -DCMAKE_BUILD_TYPE:string=Release -DCMAKE_INSTALL_PREFIX=<path to DF>
-    ninja install  # or ninja -jX install to specify the number of cores (X) to use
-
-<path to DF> should be a path to a copy of Dwarf Fortress, of the appropriate
-version for the DFHack you are building. This will build the library along
-with the normal set of plugins and install them into your DF folder.
-
-Alternatively, you can use ccmake instead of cmake::
-
-    cd build
-    ccmake .. -G Ninja
-    ninja install
-
-This will show a curses-based interface that lets you set all of the
-extra options. You can also use a cmake-friendly IDE like KDevelop 4
-or the cmake-gui program.
-
-.. _linux-incompatible-libstdcxx:
-
-Incompatible libstdc++
-~~~~~~~~~~~~~~~~~~~~~~
-When compiling DFHack yourself, it builds against your system libstdc++. When
-Dwarf Fortress runs, it uses a libstdc++ shipped in the ``libs`` folder, which
-comes from GCC 4.8 and is incompatible with code compiled with newer GCC
-versions. As of DFHack 0.42.05-alpha1, the ``dfhack`` launcher script attempts
-to fix this by automatically removing the DF-provided libstdc++ on startup.
-In rare cases, this may fail and cause errors such as:
-
-.. code-block:: text
-
-   ./libs/Dwarf_Fortress: /pathToDF/libs/libstdc++.so.6: version
-       `GLIBCXX_3.4.18' not found (required by ./hack/libdfhack.so)
-
-The easiest way to fix this is generally removing the libstdc++ shipped with
-DF, which causes DF to use your system libstdc++ instead::
-
-    cd /path/to/DF/
-    rm libs/libstdc++.so.6
-
-Note that distributing binaries compiled with newer GCC versions may result in
-the opposite compatibility issue: users with *older* GCC versions may encounter
-similar errors. This is why DFHack distributes both GCC 4.8 and GCC 7 builds. If
-you are planning on distributing binaries to other users, we recommend using an
-older GCC (but still at least 4.8) version if possible.
-
-
-.. _compile-macos:
-
-macOS
-=====
-DFHack functions similarly on macOS and Linux, and the majority of the
-information above regarding the build process (CMake and Ninja) applies here
-as well.
-
-DFHack can officially be built on macOS only with GCC 4.8 or 7. Anything newer than 7
-will require you to perform extra steps to get DFHack to run (see `osx-new-gcc-notes`),
-and your build will likely not be redistributable.
-
-.. _osx-new-gcc-notes:
-
-Notes for GCC 8+ or OS X 10.10+ users
--------------------------------------
-
-If none of these situations apply to you, skip to `osx-setup`.
-
-If you have issues building on OS X 10.10 (Yosemite) or above, try defining
-the following environment variable::
-
-    export MACOSX_DEPLOYMENT_TARGET=10.9
-
-If you build with a GCC version newer than 7, DFHack will probably crash
-immediately on startup, or soon after. To fix this, you will need to replace
-``hack/libstdc++.6.dylib`` with a symlink to the ``libstdc++.6.dylib`` included
-in your version of GCC::
-
-  cd <path to df>/hack && mv libstdc++.6.dylib libstdc++.6.dylib.orig &&
-  ln -s [PATH_TO_LIBSTDC++] .
-
-For example, with GCC 6.3.0, ``PATH_TO_LIBSTDC++`` would be::
-
-  /usr/local/Cellar/gcc@6/6.3.0/lib/gcc/6/libstdc++.6.dylib  # for 64-bit DFHack
-  /usr/local/Cellar/gcc@6/6.3.0/lib/gcc/6/i386/libstdc++.6.dylib  # for 32-bit DFHack
-
-**Note:** If you build with a version of GCC that requires this, your DFHack
-build will *not* be redistributable. (Even if you copy the ``libstdc++.6.dylib``
-from your GCC version and distribute that too, it will fail on older OS X
-versions.) For this reason, if you plan on distributing DFHack, it is highly
-recommended to use GCC 4.8 or 7.
-
-.. _osx-m1-notes:
-
-Notes for M1 users
-------------------
-
-Alongside the above, you will need to follow these additional steps to get it
-running on Apple silicon.
-
-Install an x86 copy of ``homebrew`` alongside your existing one. `This
-stackoverflow answer <https://stackoverflow.com/a/64951025>`__ describes the
-process.
-
-Follow the normal macOS steps to install ``cmake`` and ``gcc`` via your x86 copy of
-``homebrew``. Note that this will install a GCC version newer than 7, so see
-`osx-new-gcc-notes`.
-
-In your terminal, ensure you have your path set to the correct homebrew in
-addition to the normal ``CC`` and ``CXX`` flags above::
-
-  export PATH=/usr/local/bin:$PATH
-
-.. _osx-setup:
-
-Dependencies and system set-up
-------------------------------
-
-#. Download and unpack a copy of the latest DF
-#. Install Xcode from the Mac App Store
-
-#. Install the XCode Command Line Tools by running the following command::
-
-    xcode-select --install
-
-#. Install dependencies
-
-    It is recommended to use Homebrew instead of MacPorts, as it is generally
-    cleaner, quicker, and smarter. For example, installing MacPort's GCC will
-    install more than twice as many dependencies as Homebrew's will, and all in
-    both 32-bit and 64-bit variants. Homebrew also doesn't require constant use
-    of ``sudo``.
-
-    Using `Homebrew <https://brew.sh/>`_ (recommended)::
-
-        brew tap homebrew/versions
-        brew install git
-        brew install cmake
-        brew install ninja
-        brew install gcc@7
-
-    Using `MacPorts <https://www.macports.org>`_::
-
-        sudo port install gcc7 +universal cmake +universal git-core +universal ninja +universal
-
-    Macports will take some time - maybe hours.  At some point it may ask
-    you to install a Java environment; let it do so.
-
-#. Install Perl dependencies
-
-  * Using system Perl
-
-    * ``sudo cpan``
-
-      If this is the first time you've run cpan, you will need to go through the setup
-      process. Just stick with the defaults for everything and you'll be fine.
-
-      If you are running OS X 10.6 (Snow Leopard) or earlier, good luck!
-      You'll need to open a separate Terminal window and run::
-
-        sudo ln -s /usr/include/libxml2/libxml /usr/include/libxml
-
-    * ``install XML::LibXML``
-    * ``install XML::LibXSLT``
-
-  * In a separate, local Perl install
-
-    Rather than using system Perl, you might also want to consider
-    the Perl manager, `Perlbrew <https://perlbrew.pl>`_.
-
-    This manages Perl 5 locally under ``~/perl5/``, providing an easy
-    way to install Perl and run CPAN against it without ``sudo``.
-    It can maintain multiple Perl installs and being local has the
-    benefit of easy migration and insulation from OS issues and upgrades.
-
-    See https://perlbrew.pl/ for more details.
-
-Building
---------
-
-* Get the DFHack source as per section `compile-how-to-get-the-code`, above.
-* Set environment variables
-
-  Homebrew (if installed elsewhere, replace /usr/local with ``$(brew --prefix)``)::
-
-    export CC=/usr/local/bin/gcc-7
-    export CXX=/usr/local/bin/g++-7
-
-  Macports::
-
-    export CC=/opt/local/bin/gcc-mp-7
-    export CXX=/opt/local/bin/g++-mp-7
-
-  Change the version numbers appropriately if you installed a different version of GCC.
-
-  If you are confident that you have GCC in your path, you can omit the absolute paths::
-
-    export CC=gcc-7
-    export CXX=g++-7
-
-  (adjust as needed for different GCC installations)
-
-* Build DFHack::
-
-    mkdir build-osx
-    cd build-osx
-    cmake .. -G Ninja -DCMAKE_BUILD_TYPE:string=Release -DCMAKE_INSTALL_PREFIX=<path to DF>
-    ninja install  # or ninja -jX install to specify the number of cores (X) to use
-
-  <path to DF> should be a path to a copy of Dwarf Fortress, of the appropriate
-  version for the DFHack you are building.
-
-
-.. _compile-windows:
-
-Windows
-=======
-On Windows, DFHack replaces the SDL library distributed with DF.
-
-Dependencies
-------------
-You will need the following:
-
-* Microsoft Visual C++ 2022, 2019, 2017, or 2015 (optional)
-* Microsoft Visual C++ 2015 Build Tools
-* Git
-* CMake
-* Perl with XML::LibXML and XML::LibXSLT
-
-  * It is recommended to install StrawberryPerl, which includes both.
-
-* Python (for documentation; optional, except for release builds)
-
-Microsoft Visual Studio
-~~~~~~~~~~~~~~~~~~~~~~~
-Releases of Dwarf Fortress since roughly 2016 have been compiled for Windows using
-Microsoft's Visual Studio 2015 C++ compiler. In order to guarantee ABI and STL compatibility
-with Dwarf Fortress, DFHack has to be compiled with the same compiler.
-
-Visual Studio 2015 is no longer supported by Microsoft and it can be difficult to obtain
-working installers for this product today. As of 2022, the recommended approach
-is to use Visual Studio 2022 or Visual Studio 2019, installing additional optional
-Visual Studio components which provide the required support for using
-Visual Studio 2015's toolchain. All of the required tools are available from Microsoft as part of
-Visual Studio's Community Edition at no charge.
-
-You can also download just the Visual C++ 2015 `build tools`_ if you aren't going to use
-Visual Studio to edit code.
-
-Option 1: Build Tools Only
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-Click `build tools`_ and you will be prompted to login to your Microsoft account.
-Then you should be redirected to a page with various download options with 2015
-in their name. If this redirect doesn't occur, just copy, paste, and enter the
-download link again and you should see the options. You need to get:
-Visual C++ Build Tools for Visual Studio 2015 with Update 3.
-Click the download button next to it and a dropdown of download formats will appear.
-Select the DVD format to download an ISO file. When the download is complete,
-click on the ISO file and a folder will popup with the following contents:
-
-* packages (folder)
-* VCPlusPlusBuildTools2015Update3_x64_Files.cat
-* VisualCppBuildTools_Full.exe
-
-The packages folder contains the dependencies that are required by the build tools.
-These include:
-
-* Microsoft .NET Framework 4.6.1 Developer Pack
-* Microsoft Visual C++ 2015 Redistributable (x64) - 14.0.24210
-* Windows 10 Universal SDK - 10.0.10240
-* Windows 8.1 SDK
-
-Click VisualCppBuildTools_Full.exe and use the default options provided by the installer
-wizard that appears. After the installation is completed, add the path where MSBuild.exe
-was installed to your PATH environment variable. The path should be:
-
-* ``C:\Program Files (x86)\MSBuild\14.0\Bin``
-
-Note that this process may install only the ``v140`` toolchain, not the ``v140_xp`` toolchain that
-is normally used to compile build releases of DFHack. Due to a bug in the Microsoft-provided libraries used with
-the ``v140_xp`` toolchain that Microsoft has never fixed, DFHack (and probably also Dwarf Fortress itself)
-doesn't run reliably on 64-bit XP. Investigations have so far suggested that ``v140`` and
-``v140_xp`` are ABI-compatible. As such, there should be no harm in using ``v140`` instead of
-``v140_xp`` as the build toolchain, at least on 64-bit platforms. However, it is our policy to use
-``v140_xp`` for release builds for both 32-bit and 64-bit Windows,
-since 32-bit releases of Dwarf Fortress work on XP and ``v140_xp`` is required for compatibility with
-XP.
-
-The ``v141`` toolchain, in Visual Studio 2017, has been empirically documented to be incompatible with
-released versions of Dwarf Fortress and cannot be used to make usable builds of DFHack.
-
-Option 2: IDE + Build Tools
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Click Visual Studio 2022_ or 2019_ to download an installer wizard that will prompt you
-to select the optional tools you want to download alongside the IDE. You may need to log into
-(or create) a Microsoft account in order to download Visual Studio.
-
-In addition to selecting the workload for "Desktop Development with C++",
-you will also need to go to the "Individual Components" tab in the Installer and
-select the following additional components to get the "``v140_xp``" toolchain that DFHack
-requires for ABI compatibility with recent releases of Dwarf Fortress:
-* MSVC v140 - VS 2015 C++ build tools (v14.00)
-* C++ Windows XP Support for VS 2017 (v141) tools [Deprecated]
-
-Yes, this is unintuitive. Installing XP Support for VS 2017 installs XP Support for VS 2015
-if the 2015 toolchain is installed.
-
-.. _2022: https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030&passive=false
-.. _2019: https://my.visualstudio.com/Downloads?q=visual%20studio%202019&wt.mc_id=o~msft~vscom~older-downloads
-.. _build tools: https://my.visualstudio.com/Downloads?q=visual%20studio%202015&wt.mc_id=o~msft~vscom~older-downloads
-
-Additional dependencies: installing with the Chocolatey Package Manager
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The remainder of dependencies - Git, CMake, StrawberryPerl, and Python - can be
-most easily installed using the Chocolatey Package Manager. Chocolatey is a
-\*nix-style package manager for Windows. It's fast, small (8-20MB on disk)
-and very capable. Think "``apt-get`` for Windows."
-
-Chocolatey is a recommended way of installing the required dependencies
-as it's quicker, requires less effort, and will install known-good utilities
-guaranteed to have the correct setup (especially PATH).
-
-To install Chocolatey and the required dependencies:
-
-* Go to https://chocolatey.org in a web browser
-* At the top of the page it will give you the install command to copy
-
-  * Copy the first one, which starts ``@powershell ...``
-  * It won't be repeated here in case it changes in future Chocolatey releases.
-
-* Open an elevated (Admin) ``cmd.exe`` window
-
-  * On Windows 8 and later this can be easily achieved by:
-
-    * right-clicking on the Start Menu, or pressing Win+X.
-    * choosing "Command Prompt (Admin)"
-
-  * On earlier Windows: find ``cmd.exe`` in Start Menu, right click
-    and choose Open As Administrator.
-
-* Paste in the Chocolatey install command and hit enter
-* Close this ``cmd.exe`` window and open another Admin ``cmd.exe`` in the same way
-* Run the following command::
-
-    choco install git cmake.portable strawberryperl -y
-
-* Close the Admin ``cmd.exe`` window; you're done!
-
-You can now use all of these utilities from any normal ``cmd.exe`` window.
-You only need Admin/elevated ``cmd.exe`` for running ``choco install`` commands;
-for all other purposes, including compiling DFHack, you should use
-a normal ``cmd.exe`` (or, better, an improved terminal like `Cmder <https://cmder.net/>`_;
-details below, under Build.)
-
-**NOTE**: you can run the above ``choco install`` command even if you already have
-Git, CMake or StrawberryPerl installed. Chocolatey will inform you if any software
-is already installed and won't re-install it. In that case, please check the PATHs
-are correct for that utility as listed in the manual instructions below. Or, better,
-manually uninstall the version you have already and re-install via Chocolatey,
-which will ensure the PATH are set up right and will allow Chocolatey to manage
-that program for you in future.
-
-Additional dependencies: installing manually
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If you prefer to install manually rather than using Chocolatey, details and
-requirements are as below. If you do install manually, please ensure you
-have all PATHs set up correctly.
-
-Git
-^^^
-Some examples:
-
-* `Git for Windows <https://git-for-windows.github.io>`_ (command-line and GUI)
-* `tortoisegit <https://tortoisegit.org>`_ (GUI and File Explorer integration)
-
-CMake
-^^^^^
-You can get the win32 installer version from
-`the official site <https://cmake.org/download/>`_.
-It has the usual installer wizard. Make sure you let it add its binary folder
-to your binary search PATH so the tool can be later run from anywhere.
-
-Perl / Strawberry Perl
-^^^^^^^^^^^^^^^^^^^^^^
-For the code generation stage of the build process, you'll need Perl 5 with
-XML::LibXML and XML::LibXSLT. `Strawberry Perl <http://strawberryperl.com>`_ is
-recommended as it includes all of the required packages in a single, easy
-install.
-
-After install, ensure Perl is in your user's PATH. This can be edited from
-``Control Panel -> System -> Advanced System Settings -> Environment Variables``.
-
-The following directories must be in your PATH, in this order:
-
-* ``<path to perl>\c\bin``
-* ``<path to perl>\perl\site\bin``
-* ``<path to perl>\perl\bin``
-* ``<path to perl>\perl\vendor\lib\auto\XML\LibXML`` (may only be required on some systems)
-
-Be sure to close and re-open any existing ``cmd.exe`` windows after updating
-your PATH.
-
-If you already have a different version of Perl installed (for example, from Cygwin),
-you can run into some trouble. Either remove the other Perl install from PATH, or
-install XML::LibXML and XML::LibXSLT for it using CPAN.
-
-Build
------
-There are several different batch files in the ``win32`` and ``win64``
-subfolders in the ``build`` folder, along with a script that's used for picking
-the DF path. Use the subfolder corresponding to the architecture that you want
-to build for.
-
-First, run ``set_df_path.vbs`` and point the dialog that pops up at
-a suitable DF installation which is of the appropriate version for the DFHack
-you are compiling. The result is the creation of the file ``DF_PATH.txt`` in
-the build directory. It contains the full path to the destination directory.
-You could therefore also create this file manually - or copy in a pre-prepared
-version - if you prefer.
-
-Next, run one of the scripts with ``generate`` prefix. These create the MSVC
-solution file(s):
-
-* ``all`` will create a solution with everything enabled (and the kitchen sink).
-* ``gui`` will pop up the CMake GUI and let you choose what to build.
-  This is probably what you want most of the time. Set the options you are interested
-  in, then hit configure, then generate. More options can appear after the configure step.
-* ``minimal`` will create a minimal solution with just the bare necessities -
-  the main library and standard plugins.
-* ``release`` will create a solution with everything that should be included in
-  release builds of DFHack. Note that this includes documentation, which requires
-  Python.
-
-Then you can either open the solution with MSVC or use one of the msbuild scripts:
-
-Building/installing from the command line:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In the build directory you will find several ``.bat`` files:
-
-* Scripts with ``build`` prefix will only build DFHack.
-* Scripts with ``install`` prefix will build DFHack and install it to the previously selected DF path.
-* Scripts with ``package`` prefix will build and create a .zip package of DFHack.
-
-Compiling from the command line is generally the quickest and easiest option.
-However be aware that due to the limitations of ``cmd.exe`` - especially in
-versions of Windows prior to Windows 10 - it can be very hard to see what happens
-during a build.  If you get a failure, you may miss important errors or warnings
-due to the tiny window size and extremely limited scrollback. For that reason you
-may prefer to compile in the IDE which will always show all build output.
-
-Alternatively (or additionally), consider installing an improved Windows terminal
-such as `Cmder <https://cmder.net/>`_. Easily installed through Chocolatey with:
-``choco install cmder -y``.
-
-**Note for Cygwin/msysgit users**: It is also possible to compile DFHack from a
-Bash command line. This has three potential benefits:
-
-* When you've installed Git and are using its Bash, but haven't added Git to your path:
-
-  * You can load Git's Bash and as long as it can access Perl and CMake, you can
-    use it for compile without adding Git to your system path.
-
-* When you've installed Cygwin and its SSH server:
-
-  * You can now SSH in to your Windows install and compile from a remote terminal;
-    very useful if your Windows installation is a local VM on a \*nix host OS.
-
-* In general: you can use Bash as your compilation terminal, meaning you have a decent
-  sized window, scrollback, etc.
-
-  * Whether you're accessing it locally as with Git's Bash, or remotely through
-    Cygwin's SSH server, this is far superior to using ``cmd.exe``.
-
-You don't need to do anything special to compile from Bash. As long as your PATHs
-are set up correctly, you can run the same generate- and build/install/package- bat
-files as detailed above.
-
-Building/installing from the Visual Studio IDE:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-After running the CMake generate script you will have a new folder called VC2015
-or VC2015_32, depending on the architecture you specified. Open the file
-``dfhack.sln`` inside that folder. If you have multiple versions of Visual
-Studio installed, make sure you open with Visual Studio 2015.
-
-The first thing you must then do is change the build type. It defaults to Debug,
-but this cannot be used on Windows. Debug is not binary-compatible with DF.
-If you try to use a debug build with DF, you'll only get crashes and for this
-reason the Windows "debug" scripts actually do RelWithDebInfo builds.
-After loading the Solution, change the Build Type to either ``Release``
-or ``RelWithDebInfo``.
-
-Then build the ``INSTALL`` target listed under ``CMakePredefinedTargets``.
-
-Windows cross compiling from Linux
-==================================
-
-.. highlight:: bash
-
-If you are on Linux but need to produce a Windows build (for example, because the
-DF version you're working on isn't out for Linux yet), here is how you can build
-and run a Windows binary on Linux.
-
-Step 1: prepare a docker image
-------------------------------
-
-On your Linux host, install and run the docker daemon and then run these commands::
-
-    xhost +local:root
-    git clone https://github.com/BenLubar/build-env.git
-    cd build-env/msvc
-    docker build .
-    docker image ls
-    IMAGE_ID=<your image id>
-    docker run -it --env="DISPLAY" --env="QT_X11_NO_MITSHM=1" --volume=/tmp/.X11-unix:/tmp/.X11-unix --user buildmaster --name dfhack-win $IMAGE_ID
-
-The ``xhost`` command and ``--env`` parameters are there so you can eventually
-run Dwarf Fortress from the container and have it display on your host.
-
-Step 2: build DFHack
---------------------
-
-The ``docker run`` command above will give you a shell prompt (as root) in the
-container. Inside the container, run the following commands::
-
-    git clone https://github.com/DFHack/dfhack.git
-    cd dfhack
-    git submodule update --init
-    cd build
-    dfhack-configure windows 64 Release
-    dfhack-make
-
-Inside the ``dfhack-*`` scripts there are several commands that set up the wine
-server. Each invocation of a windows tool will cause wine to run in the container.
-Preloading the wineserver and telling it not to exit will speed configuration and
-compilation up considerably (approx. 10x). You can configure and build DFHack
-with regular ``cmake`` and ``ninja`` commands, but your build will go much slower.
-
-Step 3: copy Dwarf Fortress to the container
---------------------------------------------
-
-First, create a directory in the container to house the Dwarf Fortress binary and
-assets::
-
-    mkdir ~/df
-
-If you can just downlaod Dwarf Fortress directly into the container, then that's fine.
-Otherwise, you can do something like this in your host Linux environment to copy an
-installed version to the container::
-
-    cd ~/.steam/steam/steamapps/common/Dwarf\ Fortress/
-    docker cp . dfhack-win:df/
-
-Step 4: install DFHack and run DF
----------------------------------
-
-Back in the container, run the following commands::
-
-    cd dfhack/build
-    cmake .. -DCMAKE_INSTALL_PREFIX=/home/buildmaster/df
-    ninja install
-    cd ~/df
-    wine64 "Dwarf Fortress.exe"
-
-Other notes
------------
-
-Closing your shell will kick you out of the container. Run this command on your Linux
-host when you want to reattach::
-
-    docker start -ai dfhack-win
-
-If you edit code and need to rebuild, run ``dfhack-make`` and then ``ninja install``.
-That will handle all the wineserver management for you.
-
-Building the documentation
-==========================
-
-The steps above will not build DFHack's documentation by default. If you are
-editing documentation, see `documentation` for details on how to build it.
-
-Misc. Notes
-===========
-
-.. _note-offline-builds:
-
-Note on building DFHack offline
--------------------------------
-
-As of 0.43.05, DFHack downloads several files during the build process, depending
-on your target OS and architecture. If your build machine's internet connection
-is unreliable, or nonexistent, you can download these files in advance.
-
-First, you must locate the files you will need. These can be found in the
-`dfhack-bin repo <https://github.com/DFHack/dfhack-bin/releases>`_. Look for the
-most recent version number *before or equal to* the DF version which you are
-building for. For example, suppose "0.43.05" and "0.43.07" are listed. You should
-choose "0.43.05" if you are building for 0.43.05 or 0.43.06, and "0.43.07" if
-you are building for 0.43.07 or 0.43.08.
-
-Then, download all of the files you need, and save them to ``<path to DFHack
-clone>/CMake/downloads/<any filename>``. The destination filename you choose
-does not matter, as long as the files end up in the ``CMake/downloads`` folder.
-You need to download all of the files for the architecture(s) you are building
-for. For example, if you are building for 32-bit Linux and 64-bit Windows,
-download all files starting with ``linux32`` and ``win64``. GitHub should sort
-files alphabetically, so all the files you need should be next to each other.
-
-.. note::
-
-  * Any files containing "allegro" in their filename are only necessary for
-    building `stonesense`. If you are not building Stonesense, you don't have to
-    download these, as they are larger than any other listed files.
-
-It is recommended that you create a build folder and run CMake to verify that
-you have downloaded everything at this point, assuming your download machine has
-CMake installed. This involves running a "generate" batch script on Windows, or
-a command starting with ``cmake .. -G Ninja`` on Linux and macOS, following the
-instructions in the sections above. CMake should automatically locate files that
-you placed in ``CMake/downloads``, and use them instead of attempting to
-download them.
diff --git a/docs/dev/Contributing.rst b/docs/dev/Contributing.rst
index f503d9126..5235b1c0f 100644
--- a/docs/dev/Contributing.rst
+++ b/docs/dev/Contributing.rst
@@ -27,8 +27,7 @@ modify. GitHub has several documentation pages on these topics, including:
 
 In general, if you are not sure where or how to make a change, or would like
 advice before attempting to make a change, please see `support` for ways to
-contact maintainers - DFHack-specific channels such as IRC or Bay12 are
-preferred. If you are interested in addressing an issue reported on the
+contact maintainers. If you are interested in addressing an issue reported on the
 :issue:`issue tracker <>`, you can start a discussion there if you prefer.
 
 The sections below cover some guidelines that contributions should follow:
@@ -36,11 +35,24 @@ The sections below cover some guidelines that contributions should follow:
 .. contents::
   :local:
 
+General contribution guidelines
+-------------------------------
+* If convenient, compile on multiple platforms when changing anything that
+  compiles. Our CI should catch anything that fails to build, but checking in
+  advance can sometimes let you know of any issues sooner.
+* Update documentation when applicable - see `docs-standards` for details.
+* Update ``docs/changelog.txt`` and ``docs/about/Authors.rst`` when applicable. See
+  `build-changelog` for more information on the changelog format.
+* Submit ideas and bug reports as :issue:`issues on GitHub <>`.
+  Posts in the forum thread or on Disord can easily get missed or forgotten.
+* Work on :issue:`reported problems <?q=is:open+-label:idea>`
+  will take priority over ideas or suggestions.
+
 Code format
 -----------
 * Four space indents for C++. Never use tabs for indentation in any language.
 * LF (Unix style) line terminators
-* Avoid trailing whitespace
+* No trailing whitespace
 * UTF-8 encoding
 * For C++:
 
@@ -86,27 +98,13 @@ Pull request guidelines
   or add "WIP" to the title. Otherwise, your pull request may be reviewed and/or
   merged prematurely.
 
-General contribution guidelines
--------------------------------
-* If convenient, compile on multiple platforms when changing anything that
-  compiles. Our CI should catch anything that fails to build, but checking in
-  advance can sometimes let you know of any issues sooner.
-* Update documentation when applicable - see `docs-standards` for details.
-* Update ``docs/changelog.txt`` and ``docs/about/Authors.rst`` when applicable. See
-  `build-changelog` for more information on the changelog format.
-* Submit ideas and bug reports as :issue:`issues on GitHub <>`.
-  Posts in the forum thread can easily get missed or forgotten.
-* Work on :issue:`reported problems <?q=is:open+-label:idea>`
-  will take priority over ideas or suggestions.
-
-
 Other ways to help
 ==================
 DFHack is a software project, but there's a lot more to it than programming.
 If you're not comfortable programming, you can help by:
 
 * reporting bugs and incomplete documentation
-* improving the documentation
+* improving the documentation (C++ api is rife)
 * finding third-party scripts to add
 * writing tutorials for newbies
 
diff --git a/docs/dev/Dev-intro.rst b/docs/dev/Dev-intro.rst
index 25861862e..9253795eb 100644
--- a/docs/dev/Dev-intro.rst
+++ b/docs/dev/Dev-intro.rst
@@ -8,6 +8,7 @@ likely the most straightforward choice.
 
 Other pages that may be relevant include:
 
+- `building-dfhack-index`
 - `contributing`
 - `documentation`
 - `license`
@@ -16,6 +17,8 @@ Other pages that may be relevant include:
 .. contents:: Contents
     :local:
 
+.. _architectural-diagrams:
+
 Architecture diagrams
 ---------------------
 
@@ -28,6 +31,9 @@ together:
   :target: https://drive.google.com/file/d/1-2yeNMC7WHgMfZ9iQsDQ0dEbLukd_xyU
   :align: center
 
+As seen in the diagram Dwarf Fortress utilizes the SDL library, this provides us with an easy to isolate
+injection point for DFHack.
+
 .. image:: https://drive.google.com/uc?export=download&id=1--JoEQbzKpVUOkRKDD9HxvuCqtom780F
   :alt: DFHack tool call graph
   :target: https://drive.google.com/file/d/1--JoEQbzKpVUOkRKDD9HxvuCqtom780F
@@ -62,10 +68,9 @@ Run `plug` at the DFHack prompt for a list of all plugins included in DFHack.
 Scripts
 -------
 
-DFHack scripts can currently be written in Lua or Ruby. The `Lua API <lua-api>`
-is more complete and currently better-documented, however. Referring to existing
-scripts as well as the API documentation can be helpful when developing new
-scripts.
+DFHack scripts are written in Lua, with a `well-documented library <lua-api>`.
+Referring to existing scripts as well as the API documentation can be helpful
+when developing new scripts.
 
 Scripts included in DFHack live in a separate
 :source-scripts:`scripts repository <>`. This can be found in the ``scripts``
diff --git a/docs/dev/Documentation.rst b/docs/dev/Documentation.rst
index 6ac5ef382..07242d698 100644
--- a/docs/dev/Documentation.rst
+++ b/docs/dev/Documentation.rst
@@ -289,22 +289,15 @@ it should be written in plain text. Any reStructuredText markup will not be proc
 if present, will be shown verbatim to the player (which is probably not what you want).
 
 For external scripts, the short description comes from a comment on the first line
-(the comment marker and extra whitespace is stripped). For Lua, this would look like:
+(the comment marker and extra whitespace is stripped):
 
 .. code-block:: lua
 
     -- A short description of my cool script.
 
-and for Ruby scripts it would look like:
-
-.. code-block:: ruby
-
-    # A short description of my cool script.
-
-The main help text for an external script needs to appear between two markers. For
-Lua, these markers are ``[====[`` and ``]====]``, and for Ruby they are ``=begin`` and
-``=end``. The documentation standards above still apply to external tools, but there is
-no need to include backticks for links or monospaced fonts. Here is a Lua example for an
+The main help text for an external script needs to appear between two markers -- ``[====[``
+and ``]====]``. The documentation standards above still apply to external tools, but there is
+no need to include backticks for links or monospaced fonts. Here is an example for an
 entire script header::
 
     -- Inventory management for adventurers.
@@ -434,35 +427,7 @@ Sphinx to build the docs:
 Using CMake
 -----------
 
-Enabling the ``BUILD_DOCS`` CMake option will cause the documentation to be built
-whenever it changes as part of the normal DFHack build process. There are several
-ways to do this:
-
-* When initially running CMake, add ``-DBUILD_DOCS:bool=ON`` to your ``cmake``
-  command. For example::
-
-    cmake .. -DCMAKE_BUILD_TYPE:string=Release -DBUILD_DOCS:bool=ON -DCMAKE_INSTALL_PREFIX=<path to DF>
-
-* If you have already run CMake, you can simply run it again from your build
-  folder to update your configuration::
-
-    cmake .. -DBUILD_DOCS:bool=ON
-
-* You can edit the ``BUILD_DOCS`` setting in CMakeCache.txt directly
-
-* You can use the CMake GUI or ``ccmake`` to change the ``BUILD_DOCS`` setting
-
-* On Windows, if you prefer to use the batch scripts, you can run
-  ``generate-msvc-gui.bat`` and set ``BUILD_DOCS`` through the GUI. If you are
-  running another file, such as ``generate-msvc-all.bat``, you will need to edit
-  the batch script to add the flag. You can also run ``cmake`` on the command line,
-  similar to other platforms.
-
-By default, both HTML and text docs are built by CMake. The generated
-documentation is stored in ``docs/html`` and ``docs/text`` (respectively) in the
-root DFHack folder, and they will both be installed to ``hack/docs`` when you
-install DFHack. The html and txt files will intermingle, but will not interfere
-with one another.
+See our page on `build options <building-documentation>`
 
 Running Sphinx manually
 -----------------------
diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst
index 83a99e5e6..fa7094b40 100644
--- a/docs/dev/Lua API.rst	
+++ b/docs/dev/Lua API.rst	
@@ -306,7 +306,32 @@ All types and the global object have the following features:
 * ``type._identity``
 
   Contains a lightuserdata pointing to the underlying
-  ``DFHack::type_instance`` object.
+  ``DFHack::type_identity`` object.
+
+All compound types (structs, classes, unions, and the global object) support:
+
+* ``type._fields``
+
+  Contains a table mapping field names to descriptions of the type's fields,
+  including data members and functions. Iterating with ``pairs()`` returns data
+  fields in the order they are defined in the type. Functions and globals may
+  appear in an arbitrary order.
+
+  Each entry contains the following fields:
+
+  * ``name``: the name of the field (matches the ``_fields`` table key)
+  * ``offset``: for data members, the position of the field relative to the start of the type, in bytes
+  * ``count``: for arrays, the number of elements
+  * ``mode``: implementation detail. See ``struct_field_info::Mode`` in ``DataDefs.h``.
+
+  Each entry may also contain the following fields, depending on its type:
+
+  * ``type_name``: present for most fields; a string representation of the field's type
+  * ``type``: the type object matching the field's type; present if such an object exists
+    (e.g. present for DF types, absent for primitive types)
+  * ``type_identity``: present for most fields; a lightuserdata pointing to the field's underlying ``DFHack::type_identity`` object
+  * ``index_enum``, ``ref_target``: the type object corresponding to the field's similarly-named XML attribute, if present
+  * ``union_tag_field``, ``union_tag_attr``, ``original_name``: the string value of the field's similarly-named XML attribute, if present
 
 Types excluding the global object also support:
 
@@ -659,7 +684,7 @@ Persistent configuration storage
 --------------------------------
 
 This api is intended for storing configuration options in the world itself.
-It probably should be restricted to data that is world-dependent.
+It is intended for data that is world-dependent.
 
 Entries are identified by a string ``key``, but it is also possible to manage
 multiple entries with the same key; their identity is determined by ``entry_id``.
@@ -692,10 +717,8 @@ Every entry has a mutable string ``value``, and an array of 7 mutable ``ints``.
   otherwise the existing one is simply updated.
   Returns *entry, did_create_new*
 
-Since the data is hidden in data structures owned by the DF world,
-and automatically stored in the save game, these save and retrieval
-functions can just copy values in memory without doing any actual I/O.
-However, currently every entry has a 180+-byte dead-weight overhead.
+The data is kept in memory, so no I/O occurs when getting or saving keys. It is
+all written to a json file in the game save directory when the game is saved.
 
 It is also possible to associate one bit per map tile with an entry,
 using these two methods:
@@ -950,56 +973,61 @@ Screens
   Returns the topmost viewscreen. If ``skip_dismissed`` is *true*,
   ignores screens already marked to be removed.
 
-* ``dfhack.gui.getFocusString(viewscreen)``
+* ``dfhack.gui.getFocusStrings(viewscreen)``
+
+  Returns a table of string representations of the current UI focuses.
+  The strings have a "screen/foo/bar/baz..." format e.g..::
+
+    [1] = "dwarfmode/Info/CREATURES/CITIZEN"
+    [2] = "dwardmode/Squads"
 
-  Returns a string representation of the current focus position
-  in the ui. The string has a "screen/foo/bar/baz..." format.
+* ``dfhack.gui.matchFocusString(focus_string[, viewscreen])``
+
+  Returns ``true`` if the given ``focus_string`` is found in the current
+  focus strings, or as a prefix to any of the focus strings, or ``false``
+  if no match is found. Matching is case insensitive. If ``viewscreen`` is
+  specified, gets the focus strings to match from the given viewscreen.
 
 * ``dfhack.gui.getCurFocus([skip_dismissed])``
 
   Returns the focus string of the current viewscreen.
 
-* ``dfhack.gui.getViewscreenByType(type [, depth])``
+* ``dfhack.gui.getViewscreenByType(type[, depth])``
 
   Returns the topmost viewscreen out of the top ``depth`` viewscreens with
   the specified type (e.g. ``df.viewscreen_titlest``), or ``nil`` if none match.
   If ``depth`` is not specified or is less than 1, all viewscreens are checked.
 
+* ``dfhack.gui.getDFViewscreen([skip_dismissed[, viewscreen]])``
+
+  Returns the topmost viewscreen not owned by DFHack. If ``skip_dismissed`` is
+  ``true``, ignores screens already marked to be removed. If ``viewscreen`` is
+  specified, starts the scan at the given viewscreen.
+
 General-purpose selections
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * ``dfhack.gui.getSelectedWorkshopJob([silent])``
-
-  When a job is selected in :kbd:`q` mode, returns the job, else
-  prints error unless silent and returns *nil*.
-
 * ``dfhack.gui.getSelectedJob([silent])``
-
-  Returns the job selected in a workshop or unit/jobs screen.
-
 * ``dfhack.gui.getSelectedUnit([silent])``
-
-  Returns the unit selected via :kbd:`v`, :kbd:`k`, unit/jobs, or
-  a full-screen item view of a cage or suchlike.
-
 * ``dfhack.gui.getSelectedItem([silent])``
-
-  Returns the item selected via :kbd:`v` ->inventory, :kbd:`k`, :kbd:`t`, or
-  a full-screen item view of a container. Note that in the
-  last case, the highlighted *contained item* is returned, not
-  the container itself.
-
 * ``dfhack.gui.getSelectedBuilding([silent])``
-
-  Returns the building selected via :kbd:`q`, :kbd:`t`, :kbd:`k` or :kbd:`i`.
-
+* ``dfhack.gui.getSelectedCivZone([silent])``
+* ``dfhack.gui.getSelectedStockpile([silent])``
 * ``dfhack.gui.getSelectedPlant([silent])``
 
-  Returns the plant selected via :kbd:`k`.
+  Returns the currently selected in-game object or the indicated thing
+  associated with the selected in-game object. For example, Calling
+  ``getSelectedJob`` when a building is selected will return the job associated
+  with the building (e.g. the ``ConstructBuilding`` job). If ``silent`` is
+  ommitted or set to ``false`` and a selected object cannot be found, then an
+  error is printed to the console.
 
 * ``dfhack.gui.getAnyUnit(screen)``
 * ``dfhack.gui.getAnyItem(screen)``
 * ``dfhack.gui.getAnyBuilding(screen)``
+* ``dfhack.gui.getAnyCivZone(screen)``
+* ``dfhack.gui.getAnyStockpile(screen)``
 * ``dfhack.gui.getAnyPlant(screen)``
 
   Similar to the corresponding ``getSelected`` functions, but operate on the
@@ -1025,11 +1053,13 @@ Fortress mode
   Same as ``resetDwarfmodeView``, but also recenter if position is valid. If ``pause`` is false, skip pausing. Respects
   ``RECENTER_INTERFACE_SHUTDOWN_MS`` in DF's ``init.txt`` (the delay before input is recognized when a recenter occurs.)
 
-* ``dfhack.gui.revealInDwarfmodeMap(pos[,center])``
-  ``dfhack.gui.revealInDwarfmodeMap(x,y,z[,center])``
+* ``dfhack.gui.revealInDwarfmodeMap(pos[,center[,highlight]])``
+  ``dfhack.gui.revealInDwarfmodeMap(x,y,z[,center[,highlight]])``
 
-  Centers the view on the given coordinates. If ``center`` is true, make sure the
-  position is in the exact center of the view, else just bring it on screen.
+  Centers the view on the given coordinates. If ``center`` is true, make sure
+  the position is in the exact center of the view, else just bring it on screen.
+  If ``highlight`` is true, then mark the target tile with a pulsing highlight
+  until the player clicks somewhere else.
 
   ``pos`` can be a ``df.coord`` instance or a table assignable to a ``df.coord`` (see `lua-api-table-assignment`),
   e.g.::
@@ -1110,10 +1140,12 @@ Announcements
 
   If you want a guaranteed announcement without parsing, use ``dfhack.gui.showAutoAnnouncement`` instead.
 
-* ``dfhack.gui.getMousePos()``
+* ``dfhack.gui.getMousePos([allow_out_of_bounds])``
 
   Returns the map coordinates of the map tile the mouse is over as a table of
-  ``{x, y, z}``. If the cursor is not over the map, returns ``nil``.
+  ``{x, y, z}``. If the cursor is not over a valid tile, returns ``nil``. To
+  allow the function to return coordinates outside of the map, set
+  ``allow_out_of_bounds`` to ``true``.
 
 Other
 ~~~~~
@@ -1139,6 +1171,10 @@ Job module
 
   Prints info about the job item.
 
+* ``dfhack.job.removeJob(job)``
+
+  Cancels a job, cleans up all references to it, and removes it from the world.
+
 * ``dfhack.job.getGeneralRef(job, type)``
 
   Searches for a general_ref with the given type.
@@ -1195,6 +1231,15 @@ Job module
   if there are any jobs with ``first_id <= id < job_next_id``,
   a lua list containing them.
 
+* ``dfhack.job.attachJobItem(job, item, role, filter_idx, insert_idx)``
+
+  Attach a real item to this job. If the item is intended to satisfy a job_item
+  filter, the index of that filter should be passed in ``filter_idx``; otherwise,
+  pass ``-1``. Similarly, if you don't care where the item is inserted, pass
+  ``-1`` for ``insert_idx``. The ``role`` param is a ``df.job_item_ref.T_role``.
+  If the item needs to be brought to the job site, then the value should be
+  ``df.job_item_ref.T_role.Hauled``.
+
 * ``dfhack.job.isSuitableItem(job_item, item_type, item_subtype)``
 
   Does basic sanity checks to verify if the suggested item type matches
@@ -1322,9 +1367,16 @@ Units module
 * ``dfhack.units.isTame(unit)``
 * ``dfhack.units.isTamable(unit)``
 * ``dfhack.units.isDomesticated(unit)``
+* ``dfhack.units.isMarkedForTraining(unit)``
+* ``dfhack.units.isMarkedForTaming(unit)``
+* ``dfhack.units.isMarkedForWarTraining(unit)``
+* ``dfhack.units.isMarkedForHuntTraining(unit)``
 * ``dfhack.units.isMarkedForSlaughter(unit)``
+* ``dfhack.units.isMarkedForGelding(unit)``
+* ``dfhack.units.isGeldable(unit)``
 * ``dfhack.units.isGelded(unit)``
 * ``dfhack.units.isEggLayer(unit)``
+* ``dfhack.units.isEggLayerRace(unit)``
 * ``dfhack.units.isGrazer(unit)``
 * ``dfhack.units.isMilkable(unit)``
 
@@ -1342,7 +1394,7 @@ Units module
 
   The unit is available for adoption.
 
-
+* ``dfhack.units.isPet(unit)``
 * ``dfhack.units.isOpposedToLife(unit)``
 * ``dfhack.units.hasExtravision(unit)``
 * ``dfhack.units.isBloodsucker(unit)``
@@ -1403,6 +1455,23 @@ Units module
   Note that ``pos2xyz()`` cannot currently be used to convert coordinate objects to
   the arguments required by this function.
 
+* ``dfhack.units.getUnitByNobleRole(role_name)``
+
+  Returns the unit assigned to the given noble role, if any. ``role_name`` must
+  be one of the position codes associated with the active fort or civilization
+  government. For example: ``CAPTAIN_OF_THE_GUARD``, ``MAYOR``, or ``BARON``.
+  Note that if more than one unit has the role, only the first will be
+  returned. See ``getUnitsByNobleRole`` below for retrieving all units with a
+  particular role.
+
+* ``dfhack.units.getUnitsByNobleRole(role_name)``
+
+  Returns a list of units (possibly empty) assigned to the given noble role.
+
+* ``dfhack.units.getCitizens([ignore_sanity])``
+
+  Returns a list of all living citizens.
+
 * ``dfhack.units.teleport(unit, pos)``
 
   Moves the specified unit and any riders to the target coordinates, setting
@@ -1447,6 +1516,11 @@ Units module
 
   Computes the effective attribute value, including curse effect.
 
+* ``dfhack.units.casteFlagSet(race, caste, flag)``
+
+  Returns whether the given ``df.caste_raw_flags`` flag is set for the given
+  race and caste.
+
 * ``dfhack.units.getMiscTrait(unit, type[, create])``
 
   Finds (or creates if requested) a misc trait object with the given id.
@@ -1536,6 +1610,12 @@ Units module
   Currently only one dream per unit is supported by Dwarf Fortress.
   Support for multiple dreams may be added in future versions of Dwarf Fortress.
 
+* ``dfhack.units.getReadableName(unit)``
+
+  Returns a string that includes the language name of the unit (if any), the
+  race of the unit, whether it is trained for war or hunting, and any
+  syndrome-given descriptions (such as "necromancer").
+
 * ``dfhack.units.getStressCategory(unit)``
 
   Returns a number from 0-6 indicating stress. 0 is most stressed; 6 is least.
@@ -1549,6 +1629,24 @@ Units module
 
   Returns a table of the cutoffs used by the above stress level functions.
 
+Military module
+~~~~~~~~~~~~~~~~~~~
+
+* ``dfhack.military.makeSquad(assignment_id)``
+
+  Creates a new squad associated with the assignment (ie ``df::entity_position_assignment``, via ``id``) and returns it.
+  Fails if a squad already exists that is associated with that assignment, or if the assignment is not a fort mode player controlled squad.
+  Note: This function does not name the squad: consider setting a nickname (under ``squad.name.nickname``), and/or filling out the ``language_name`` object at ``squad.name``.
+  The returned squad is otherwise complete and requires no more setup to work correctly.
+
+* ``dfhack.military.updateRoomAssignments(squad_id, assignment_id, squad_use_flags)``
+
+  Sets the sleep, train, indiv_eq, and squad_eq flags when training at a barracks.
+
+* ``dfhack.military.getSquadName(squad_id)``
+
+  Returns the name of a squad as a string.
+
 Action Timer API
 ~~~~~~~~~~~~~~~~
 
@@ -1697,9 +1795,17 @@ Items module
 
   Calculates the base value for an item of the specified type and material.
 
-* ``dfhack.items.getValue(item)``
+* ``dfhack.items.getValue(item[, caravan_state])``
+
+  Calculates the value of an item. If a ``df.caravan_state`` object is given
+  (from ``df.global.plotinfo.caravans`` or
+  ``df.global.main_interface.trade.mer``), then the value is modified by civ
+  properties and any trade agreements that might be in effect.
 
-  Calculates the Basic Value of an item, as seen in the View Item screen.
+* ``dfhack.items.isRequestedTradeGood(item[, caravan_state])``
+
+  Returns whether a caravan will pay extra for the given item. If caravan_state
+  is not given, checks all active caravans.
 
 * ``dfhack.items.createItem(item_type, item_subtype, mat_type, mat_index, unit)``
 
@@ -1715,7 +1821,16 @@ Items module
 
 * ``dfhack.items.canTradeWithContents(item)``
 
-  Checks whether the item and all items it contains, if any, can be traded.
+  Returns false if the item or any contained items cannot be traded.
+
+* ``canTradeAnyWithContents(item)``
+
+  Returns true if the item is empty and can be traded or if the item contains
+  any item that can be traded.
+
+* ``dfhack.items.markForTrade(item, depot)``
+
+  Marks the given item for trade at the given depot.
 
 * ``dfhack.items.isRouteVehicle(item)``
 
@@ -1770,6 +1885,10 @@ Maps module
 
   Returns the biome info struct for the given global map region.
 
+  ``dfhack.maps.getBiomeType(region_coord2d)`` or ``getBiomeType(x,y)``
+
+  Returns the biome_type for the given global map region.
+
 * ``dfhack.maps.enableBlockUpdates(block[,flow,temperature])``
 
   Enables updates for liquid flow or temperature, unless already active.
@@ -1789,16 +1908,17 @@ Maps module
 
 * ``dfhack.maps.getTileBiomeRgn(coords)``, or ``getTileBiomeRgn(x,y,z)``
 
-  Returns *x, y* for use with ``getRegionBiome``.
+  Returns *x, y* for use with ``getRegionBiome`` and ``getBiomeType``.
 
 * ``dfhack.maps.getPlantAtTile(pos)``, or ``getPlantAtTile(x,y,z)``
 
   Returns the plant struct that owns the tile at the specified position.
 
-* ``dfhack.maps.canWalkBetween(pos1, pos2)``
+* ``dfhack.maps.getWalkableGroup(pos)``
 
-  Checks if a dwarf may be able to walk between the two tiles,
-  using a pathfinding cache maintained by the game.
+  Returns the walkability group for the given tile position. A return value of
+  ``0`` indicates that the tile is not walkable. The data comes from a
+  pathfinding cache maintained by DF.
 
   .. note::
     This cache is only updated when the game is unpaused, and thus
@@ -1807,6 +1927,10 @@ Maps module
     take into account anything that depends on the actual units, like
     burrows, or the presence of invaders.
 
+* ``dfhack.maps.canWalkBetween(pos1, pos2)``
+
+  Checks if both positions are walkable and also share a walkability group.
+
 * ``dfhack.maps.hasTileAssignment(tilemask)``
 
   Checks if the tile_bitmask object is not *nil* and contains any set bits; returns *true* or *false*.
@@ -1827,9 +1951,11 @@ Maps module
 Burrows module
 --------------
 
-* ``dfhack.burrows.findByName(name)``
+* ``dfhack.burrows.findByName(name[, ignore_final_plus])``
 
-  Returns the burrow pointer or *nil*.
+  Returns the burrow pointer or *nil*. if ``ignore_final_plus`` is ``true``,
+  then ``+`` characters at the end of the names are ignored, both for the
+  specified ``name`` and the names of the burrows that it matches against.
 
 * ``dfhack.burrows.clearUnits(burrow)``
 
@@ -1882,9 +2008,9 @@ General
 
   Searches for a specific_ref with the given type.
 
-* ``dfhack.buildings.setOwner(item,unit)``
+* ``dfhack.buildings.setOwner(civzone,unit)``
 
-  Replaces the owner of the building. If unit is *nil*, removes ownership.
+  Replaces the owner of the civzone. If unit is *nil*, removes ownership.
   Returns *false* in case of error.
 
 * ``dfhack.buildings.getSize(building)``
@@ -1920,9 +2046,11 @@ General
 
   Returns the number of tiles included by extents, or defval.
 
-* ``dfhack.buildings.containsTile(building, x, y[, room])``
+* ``dfhack.buildings.containsTile(building, x, y)``
 
-  Checks if the building contains the specified tile, either directly, or as room.
+  Checks if the building contains the specified tile. If the building contains extents,
+  then the extents are checked. Otherwise, returns whether the x and y map coordinates
+  are within the building's bounding box.
 
 * ``dfhack.buildings.hasSupport(pos,size)``
 
@@ -1989,6 +2117,11 @@ Low-level building creation functions:
   Destroys the building, or queues a deconstruction job.
   Returns *true* if the building was destroyed and deallocated immediately.
 
+* ``dfhack.buildings.notifyCivzoneModified(building)``
+
+  Rebuilds the civzone <-> overlapping building association mapping.
+  Call after changing extents or modifying size in some fashion
+
 * ``dfhack.buildings.markedForRemoval(building)``
 
   Returns *true* if the building is marked for removal (with :kbd:`x`), *false*
@@ -2261,6 +2394,18 @@ a table with the following possible fields:
     Specifies that the tile should be shaded with *fg/bg*.
   ``tile_fg, tile_bg``
     If specified, overrides *tile_color* and supplies shading colors directly.
+  ``keep_lower``
+    If set to true, will not overwrite the background tile when filling in
+    the foreground tile.
+  ``write_to_lower``
+    If set to true, the specified ``tile`` will be written to the background
+    instead of the foreground.
+  ``top_of_text``
+    If set to true, the specified ``tile`` will have the top half of the specified
+    ``ch`` character superimposed over the lower half of the tile.
+  ``bottom_of_text``
+    If set to true, the specified ``tile`` will have the bottom half of the specified
+    ``ch`` character superimposed over the top half of the tile.
 
 Alternatively, it may be a pre-parsed native object with the following API:
 
@@ -2392,13 +2537,13 @@ Supported callbacks and fields are:
   ``_STRING``
     Maps to an integer in range 0-255. Duplicates a separate "STRING_A???" code for convenience.
 
-  ``_MOUSE_L, _MOUSE_R``
-    If the left or right mouse button is being pressed.
+  ``_MOUSE_L, _MOUSE_R, _MOUSE_M``
+    If the left, right, and/or middle mouse button was just pressed.
 
-  ``_MOUSE_L_DOWN, _MOUSE_R_DOWN``
-    If the left or right mouse button was just pressed.
+  ``_MOUSE_L_DOWN, _MOUSE_R_DOWN, _MOUSE_M_DOWN``
+    If the left, right, and/or middle mouse button is being held down.
 
-  If this method is omitted, the screen is dismissed on receival of the ``LEAVESCREEN`` key.
+  If this method is omitted, the screen is dismissed on reception of the ``LEAVESCREEN`` key.
 
 * ``function screen:onGetSelectedUnit()``
 * ``function screen:onGetSelectedItem()``
@@ -2446,6 +2591,67 @@ a ``dfhack.penarray`` instance to cache their output.
 
   ``bufferx`` and ``buffery`` default to 0.
 
+
+Textures module
+---------------
+
+In order for the game to render a particular tile (graphic), it needs to know the
+``texpos`` - the position in the vector of the registered game textures (also the
+graphical tile id passed as the ``tile`` field in a `Pen <lua-screen-pen>`).
+Adding new textures to the vector is not difficult, but the game periodically
+deletes textures that are in the vector, and that's a problem since it
+invalidates the ``texpos`` value that used to point to that texture.
+The ``textures`` module solves this problem by providing a stable handle instead of a
+raw ``texpos``. When we need to draw a particular tile, we can look up the current
+``texpos`` value via the handle.
+Texture module can register textures in two ways: to reserved and dynamic ranges.
+Reserved range is a limit buffer in a game texture vector, that will never be wiped.
+It is good for static assets, which need to be loaded at the very beginning and will be used during the process running.
+In other cases, it is better to use dynamic range.
+If reserved range buffer limit has been reached, dynamic range will be used by default.
+
+* ``loadTileset(file, tile_px_w, tile_px_h[, reserved])``
+
+  Loads a tileset from the image ``file`` with give tile dimensions in pixels. The
+  image will be sliced in row major order. Returns an array of ``TexposHandle``.
+  ``reserved`` is optional boolean argument, which indicates texpos range.
+  ``true`` - reserved, ``false`` - dynamic (default).
+
+  Example usage::
+
+    local logo_textures = dfhack.textures.loadTileset('hack/data/art/dfhack.png', 8, 12)
+    local first_texposhandle = logo_textures[1]
+
+* ``getTexposByHandle(handle)``
+
+  Get the current ``texpos`` for the given ``TexposHandle``. Always use this method to
+  get the ``texpos`` for your texture. ``texpos`` can change when game textures are
+  reset, but the handle will be the same.
+
+* ``createTile(pixels, tile_px_w, tile_px_h[, reserved])``
+
+  Create and register a new texture with the given tile dimensions and an array of
+  ``pixels`` in row major order. Each pixel is an integer representing color in packed
+  RBGA format (for example, #0022FF11). Returns a ``TexposHandle``.
+  ``reserved`` is optional boolean argument, which indicates texpos range.
+  ``true`` - reserved, ``false`` - dynamic (default).
+
+* ``createTileset(pixels, texture_px_w, texture_px_h, tile_px_w, tile_px_h[, reserved])``
+
+  Create and register a new texture with the given texture dimensions and an array of
+  ``pixels`` in row major order. Then slice it into tiles with the given tile
+  dimensions. Each pixel is an integer representing color in packed RBGA format (for
+  example #0022FF11). Returns an array of ``TexposHandle``.
+  ``reserved`` is optional boolean argument, which indicates texpos range.
+  ``true`` - reserved, ``false`` - dynamic (default).
+
+* ``deleteHandle(handle)``
+
+  ``handle`` here can be single ``TexposHandle`` or an array of ``TexposHandle``.
+  Deletes all metadata and texture(s) related to the given handle(s). The handles
+  become invalid after this call.
+
+
 Filesystem module
 -----------------
 
@@ -2616,6 +2822,11 @@ and are only documented here for completeness:
   The oldval, newval or delta arguments may be used to specify additional constraints.
   Returns: *found_index*, or *nil* if end reached.
 
+* ``dfhack.internal.cxxDemangle(mangled_name)``
+
+  Decodes a mangled C++ symbol name. Returns the demangled name on success, or
+  ``nil, error_message`` on failure.
+
 * ``dfhack.internal.getDir(path)``
 
   Lists files/directories in a directory.
@@ -2687,6 +2898,67 @@ and are only documented here for completeness:
 
   Returns a numeric identifier of the current thread.
 
+* ``dfhack.internal.msizeAddress(address)``
+
+  Returns the allocation size of an address.
+  Does not require a heap snapshot. This function will crash on an invalid pointer.
+  Windows only.
+
+* ``dfhack.internal.getHeapState()``
+
+  Returns the state of the heap. 0 == ok or empty, 1 == heap bad ptr, 2 == heap bad begin, 3 == heap bad node.
+  Does not require a heap snapshot. This may be unsafe to use directly from lua if the heap is corrupt.
+  Windows only.
+
+* ``dfhack.internal.heapTakeSnapshot()``
+
+  Clears any existing heap snapshot, and takes an internal heap snapshot for later consumption.
+  Windows only.
+  Returns the same values as getHeapState()
+
+* ``dfhack.internal.isAddressInHeap(address)``
+
+  Checks if an address is a member of the heap. It may be dangling.
+  Requires a heap snapshot.
+
+* ``dfhack.internal.isAddressActiveInHeap(address)``
+
+  Checks if an address is a member of the heap, and actively in use (ie valid).
+  Requires a heap snapshot.
+
+* ``dfhack.internal.isAddressUsedAfterFreeInHeap(address)``
+
+  Checks if an address is a member of the heap, but is not currently allocated (ie use after free).
+  Requires a heap snapshot.
+  Note that Windows eagerly removes freed pointers from the heap, so this is unlikely to trigger.
+
+* ``dfhack.internal.getAddressSizeInHeap(address)``
+
+  Gets the allocated size of a member of the heap. Useful for detecting misaligns, as this does not return block size.
+  Requires a heap snapshot.
+
+* ``dfhack.internal.getRootAddressOfHeapObject(address)``
+
+  Gets the base heap allocation address of a address that lies internally within a piece of allocated memory.
+  Eg, if you have a heap allocated struct and call this function on the address of the second member,
+  it will return the address of the struct.
+  Returns 0 if the address is not found.
+  Requires a heap snapshot.
+
+* ``dfhack.internal.getClipboardTextCp437()``
+
+  Gets the system clipboard text (and converts text to CP437 encoding).
+
+* ``dfhack.internal.setClipboardTextCp437(text)``
+
+  Sets the system clipboard text from a CP437 string.
+
+* ``dfhack.internal.getSuppressDuplicateKeyboardEvents()``
+* ``dfhack.internal.setSuppressDuplicateKeyboardEvents(suppress)``
+
+  Gets and sets the flag for whether to suppress DF key events when a DFHack
+  keybinding is matched and a command is launched.
+
 .. _lua-core-context:
 
 Core interpreter context
@@ -2821,6 +3093,9 @@ environment by the mandatory init file dfhack.lua:
     COLOR_LIGHTBLUE, COLOR_LIGHTGREEN, COLOR_LIGHTCYAN, COLOR_LIGHTRED,
     COLOR_LIGHTMAGENTA, COLOR_YELLOW, COLOR_WHITE
 
+  ``COLOR_GREY`` and ``COLOR_DARKGREY`` can also be spelled ``COLOR_GRAY`` and
+  ``COLOR_DARKGRAY``.
+
 * State change event codes, used by ``dfhack.onStateChange``
 
   Available only in the `core context <lua-core-context>`, as is the event itself:
@@ -2890,6 +3165,11 @@ environment by the mandatory init file dfhack.lua:
   set to the value of ``default_value``, which defaults to ``{}`` if not set.
   The new or existing value of ``t[key]`` is then returned.
 
+* ``ensure_keys(t, key...)``
+
+  Walks a series of keys, creating any missing keys as empty tables. The new or
+  existing table from the last specified key is returned from the function.
+
 .. _lua-string:
 
 String class extensions
@@ -3072,6 +3352,20 @@ utils
 
   Exactly like ``erase_sorted_key``, but if field is specified, takes the key from ``item[field]``.
 
+* ``utils.search_text(text,search_tokens)``
+
+  Returns true if all the search tokens are found within ``text``. The text and
+  search tokens are normalized to lower case and special characters (e.g. ``A``
+  with a circle on it) are converted to their "basic" forms (e.g. ``a``).
+  ``search_tokens`` can be a string or a table of strings. If it is a string,
+  it is split into space-separated tokens before matching. The search tokens
+  are treated literally, so any special regular expression characters do not
+  need to be escaped. If ``utils.FILTER_FULL_TEXT`` is ``true``, then the
+  search tokens can match any part of ``text``. If it is ``false``, then the
+  matches must happen at the beginning of words within ``text``. You can change
+  the value of ``utils.FILTER_FULL_TEXT`` in `gui/control-panel` on the
+  "Preferences" tab.
+
 * ``utils.call_with_string(obj,methodname,...)``
 
   Allocates a temporary string object, calls ``obj:method(tmp,...)``, and
@@ -3282,6 +3576,13 @@ parameters.
   ``tonumber(arg)``. If ``arg_name`` is specified, it is used to make error
   messages more useful.
 
+* ``argparse.boolean(arg, arg_name)``
+
+  Converts ``string.lower(arg)`` from "yes/no/on/off/true/false/etc..." to a lua
+  boolean. Throws if the value can't be converted, otherwise returns
+  ``true``/``false``. If ``arg_name`` is specified, it is used to make error
+  messages more useful.
+
 dumper
 ======
 
@@ -3295,17 +3596,20 @@ function:
   argument specifies the indentation step size in spaces. For
   the other arguments see the original documentation link above.
 
+.. _helpdb:
+
 helpdb
 ======
 
 Unified interface for DFHack tool help text. Help text is read from the rendered
-text in ``hack/docs/docs/``. If no rendered text exists, help is read from the
-script sources (for scripts) or the string passed to the ``PluginCommand``
+text in ``hack/docs/docs/tools``. If no rendered text exists, help is read from
+the script sources (for scripts) or the string passed to the ``PluginCommand``
 initializer (for plugins). See `documentation` for details on how DFHack's help
 system works.
 
-The database is lazy-loaded when an API method is called. It rechecks its help
-sources for updates if an API method has not been called in the last 60 seconds.
+The database is loaded when DFHack initializes, but can be explicitly refreshed
+with a call to ``helpdb.refresh()`` if docs are added/changed during a play
+session.
 
 Each entry has several properties associated with it:
 
@@ -3321,6 +3625,10 @@ Each entry has several properties associated with it:
 - Long help, the entire contents of the associated help file.
 - A list of tags that define the groups that the entry belongs to.
 
+* ``helpdb.refresh()``
+
+  Scan for changes in available commands and their documentation.
+
 * ``helpdb.is_entry(str)``, ``helpdb.is_entry(list)``
 
   Returns whether the given string (or list of strings) is an entry (are all
@@ -3649,7 +3957,17 @@ Misc
 
 * ``CLEAR_PEN``
 
-  The black pen used to clear the screen.
+  The black pen used to clear the screen. In graphics mode, it will clear the
+  foreground and set the background to the standard black tile.
+
+* ``TRANSPARENT_PEN``
+
+  A pen that will clear all textures from the UI layer, making the tile transparent.
+
+* ``KEEP_LOWER_PEN``
+
+  A pen that will write tiles over existing background tiles instead of clearing
+  them.
 
 * ``simulateInput(screen, keys...)``
 
@@ -3661,6 +3979,14 @@ Misc
   of keycodes to *true* or *false*. For instance, it is possible to use the
   table passed as argument to ``onInput``.
 
+  You can send mouse clicks as will by setting the ``_MOUSE_L`` key or other
+  mouse-related pseudo-keys documented with the ``screen:onInput(keys)``
+  function above. Note that if you are simulating a click at a specific spot on
+  the screen, you must set ``df.global.gps.mouse_x`` and
+  ``df.global.gps.mouse_y`` if you are clicking on the interface layer or
+  ``df.global.gps.precise_mouse_x`` and ``df.global.gps.precise_mouse_y`` if
+  you are clicking on the map.
+
 * ``mkdims_xy(x1,y1,x2,y2)``
 
   Returns a table containing the arguments as fields, and also ``width`` and
@@ -3686,6 +4012,12 @@ Misc
   Wraps ``dfhack.screen.getKeyDisplay`` in order to allow using strings for the keycode argument.
 
 
+* ``invert_color(color, bold)``
+
+  This inverts the brightness of ``color``. If this color is coming from a pen's
+  foreground color, include ``pen.bold`` in ``bold`` for this to work properly.
+
+
 ViewRect class
 --------------
 
@@ -3916,8 +4248,13 @@ The class has the following methods:
 * ``view:getMousePos([view_rect])``
 
   Returns the mouse *x,y* in coordinates local to the given ViewRect (or
-  ``frame_body`` if no ViewRect is passed) if it is within its clip area,
-  or nothing otherwise.
+  ``frame_body`` if no ViewRect is passed) if it is within its clip area, or
+  nothing otherwise.
+
+* ``view:getMouseFramePos()``
+
+  Returns the mouse *x,y* in coordinates local to ``frame_rect`` if it is
+  within its clip area, or nothing otherwise.
 
 * ``view:updateLayout([parent_rect])``
 
@@ -4000,7 +4337,7 @@ The class has the following methods:
 Screen class
 ------------
 
-This is a View subclass intended for use as a stand-alone dialog or screen.
+This is a View subclass intended for use as a stand-alone modal dialog or screen.
 It adds the following methods:
 
 * ``screen:isShown()``
@@ -4068,6 +4405,158 @@ It adds the following methods:
 
   Defined as callbacks for native code.
 
+ZScreen class
+-------------
+
+A screen subclass that allows multi-layer interactivity. For example, a DFHack
+GUI tool implemented as a ZScreen can allow the player to interact with the
+underlying map, or even other DFHack ZScreen windows! That is, even when the
+DFHack tool window is visible, players will be able to use vanilla designation
+tools, select units, and scan/drag the map around.
+
+At most one ZScreen can have input focus at a time. That ZScreen's widgets
+will have a chance to handle the input before anything else. If unhandled, the
+input skips all unfocused ZScreens under that ZScreen and is passed directly to
+the first non-ZScreen viewscreen. There are class attributes that can be set to
+control what kind of unhandled input is passed to the lower layers.
+
+If multiple ZScreens are visible and the player scrolls or left/right clicks on
+a visible element of a non-focused ZScreen, that ZScreen will be given focus.
+This allows multiple DFHack GUI tools to be usable at the same time. If the
+mouse is clicked away from the ZScreen widgets, that ZScreen loses focus. If no
+ZScreen has focus, all input is passed directly through to the first underlying
+non-ZScreen viewscreen.
+
+For a ZScreen with keyboard focus, if :kbd:`Esc` or the right mouse button is
+pressed, and the ZScreen widgets don't otherwise handle them, then the ZScreen
+is dismissed.
+
+All this behavior is implemented in ``ZScreen:onInput()``, which subclasses
+**must not override**. Instead, ZScreen subclasses should delegate all input
+processing to subviews. Consider using a `Window class`_ widget subview as your
+top level input processor.
+
+When rendering, the parent viewscreen is automatically rendered first, so
+subclasses do not have to call ``self:renderParent()``. Calls to ``logic()``
+(a world "tick" when playing the game) are also passed through, so the game
+progresses normally and can be paused/unpaused as normal by the player. Note
+that passing ``logic()`` calls through to the underlying map is required for
+allowing the player to drag the map with the mouse. ZScreen subclasses can set
+attributes that control whether the game is paused when the ZScreen is shown and
+whether the game is forced to continue being paused while the ZScreen is shown.
+If pausing is forced, child ``Window`` widgets will show a force-pause indicator
+to show which tool is forcing the pausing.
+
+ZScreen provides the following functions:
+
+* ``zscreen:raise()``
+
+  Raises the ZScreen to the top of the viewscreen stack, gives it keyboard
+  focus, and returns a reference to ``self``. A common pattern is to check if a
+  tool dialog is already active when the tool command is run and raise the
+  existing dialog if it exists or show a new dialog if it doesn't. See the
+  sample code below for an example.
+
+* ``zscreen:isMouseOver()``
+
+  The default implementation iterates over the direct subviews of the ZScreen
+  subclass (which usually only includes a single Window subview) and sees if
+  ``getMouseFramePos()`` returns a position for any of them. Subclasses can
+  override this function if that logic is not appropriate.
+
+* ``zscreen:hasFocus()``
+
+  Whether the ZScreen has keyboard focus. Subclasses will generally not need to
+  check this because they can assume if they are getting input, then they have
+  focus.
+
+ZScreen subclasses can set the following attributes:
+
+* ``defocusable`` (default: ``true``)
+
+  Whether the ZScreen loses keyboard focus when the player clicks on an area
+  of the screen other than the tool window. If the player clicks on a different
+  ZScreen window, focus still transfers to that other ZScreen.
+
+* ``initial_pause`` (default: ``DEFAULT_INITIAL_PAUSE or not pass_mouse_clicks``)
+
+  Whether to pause the game when the ZScreen is shown. If not explicitly set,
+  this attribute will be true if the system-wide ``DEFAULT_INITIAL_PAUSE`` is
+  ``true`` (which is its default value) or if the ``pass_mouse_clicks`` attribute
+  is ``false`` (see below). It depends on ``pass_mouse_clicks`` because if the
+  player normally pauses/unpauses the game with the mouse, they will not be able
+  to pause the game like they usually do while the ZScreen has focus.
+  ``DEFAULT_INITIAL_PAUSE`` can be customized permanently via `gui/control-panel`
+  or set for the session by running a command like::
+
+    :lua require('gui.widgets').DEFAULT_INITIAL_PAUSE = false
+
+* ``force_pause`` (default: ``false``)
+
+  Whether to ensure the game *stays* paused while the ZScreen is shown,
+  regardless of whether it has input focus.
+
+* ``pass_pause`` (default: ``true``)
+
+  Whether to pass the pause key to the lower viewscreens if it is not handled
+  by this ZScreen.
+
+* ``pass_movement_keys`` (default: ``false``)
+
+  Whether to pass the map movement keys to the lower viewscreens if they are not
+  handled by this ZScreen.
+
+* ``pass_mouse_clicks`` (default: ``true``)
+
+  Whether to pass mouse clicks to the lower viewscreens if they are not handled
+  by this ZScreen.
+
+Here is an example skeleton for a ZScreen tool window::
+
+    local gui = require('gui')
+    local widgets = require('gui.widgets')
+
+    MyWindow = defclass(MyWindow, widgets.Window)
+    MyWindow.ATTRS {
+        frame_title='My Window',
+        frame={w=50, h=45},
+        resizable=true, -- if resizing makes sense for your dialog
+        resize_min={w=50, h=20}, -- try to allow users to shrink your windows
+    }
+
+    function MyWindow:init()
+        self:addviews{
+          -- add subview widgets here
+        }
+    end
+
+    function MyWindow:onInput(keys)
+        -- if required
+    end
+
+    MyScreen = defclass(MyScreen, gui.ZScreen)
+    MyScreen.ATTRS {
+        focus_path='myscreen',
+        -- set pause and passthrough attributes as appropriate
+        -- (but most tools can use the defaults)
+    }
+
+    function MyScreen:init()
+        self:addviews{MyWindow{}}
+    end
+
+    function MyScreen:onDismiss()
+        view = nil
+    end
+
+    view = view and view:raise() or MyScreen{}:show()
+
+ZScreenModal class
+------------------
+
+A ZScreen convenience subclass that sets the attributes to something
+appropriate for modal dialogs. The game is force paused, and no input is passed
+through to the underlying viewscreens.
 
 FramedScreen class
 ------------------
@@ -4086,18 +4575,38 @@ A framed screen has the following attributes:
 
 There are the following predefined frame style tables:
 
-* ``GREY_FRAME``
+* ``FRAME_WINDOW``
+
+  A frame suitable for a draggable, optionally resizable window.
+
+* ``FRAME_PANEL``
+
+  A frame suitable for a static (non-draggable, non-resizable) panel.
+
+* ``FRAME_MEDIUM``
+
+  A frame suitable for overlay widget panels.
 
-  A plain grey-colored frame.
+* ``FRAME_THIN``
 
-* ``BOUNDARY_FRAME``
+  A frame suitable for floating tooltip panels that need the DFHack signature.
 
-  The same frame as used by the usual full-screen DF views, like dwarfmode.
+* ``FRAME_BOLD``
 
-* ``GREY_LINE_FRAME``
+  A frame suitable for a non-draggable panel meant to capture the user's focus,
+  like an important notification, confirmation dialog or error message.
 
-  A frame consisting of grey lines, similar to the one used by titan announcements.
+* ``FRAME_INTERIOR``
 
+  A frame suitable for light interior accent elements. This frame does *not*
+  have a visible ``DFHack`` signature on it, so it must not be used as the most
+  external frame for a DFHack-owned UI.
+
+* ``FRAME_INTERIOR_MEDIUM``
+
+  A copy of ``FRAME_MEDIUM`` that lacks the ``DFHack`` signature. Suitable for
+  panels that are part of a larger widget cluster. Must *not* be used as the
+  most external frame for a DFHack-owned UI.
 
 gui.widgets
 ===========
@@ -4178,15 +4687,15 @@ Has attributes:
   Called from ``postComputeFrame``.
 
 * ``draggable = bool`` (default: ``false``)
-* ``drag_anchors = {}`` (default: ``{title=true, frame=false, body=false}``)
+* ``drag_anchors = {}`` (default: ``{title=true, frame=false/true, body=true}``)
 * ``drag_bound = 'frame' or 'body'`` (default: ``'frame'``)
 * ``on_drag_begin = function()`` (default: ``nil``)
-* ``on_drag_end = function(bool)`` (default: ``nil``)
+* ``on_drag_end = function(success, new_frame)`` (default: ``nil``)
 
   If ``draggable`` is set to ``true``, then the above attributes come into play
   when the panel is dragged around the screen, either with the mouse or the
   keyboard. ``drag_anchors`` sets which parts of the panel can be clicked on
-  with the left mouse button to start dragging. ``drag_bound`` configures
+  with the left mouse button to start dragging. The frame is a drag anchor by default only if ``resizable`` (below) is ``false``. ``drag_bound`` configures
   whether the frame of the panel (if any) can be dragged outside the containing
   parent's boundary. The body will never be draggable outside of the parent,
   but you can allow the frame to cross the boundary by setting ``drag_bound`` to
@@ -4195,13 +4704,15 @@ Has attributes:
   otherwise. Dragging can be canceled by right clicking while dragging with the
   mouse, hitting :kbd:`Esc` (while dragging with the mouse or keyboard), or by
   calling ``Panel:setKeyboaredDragEnabled(false)`` (while dragging with the
-  keyboard).
+  keyboard). If it is more convenient to do so, you can choose to override the
+  ``panel:onDragBegin`` and/or the ``panel:onDragEnd`` methods instead of
+  setting the ``on_drag_begin`` and/or ``on_drag_end`` attributes.
 
 * ``resizable = bool`` (default: ``false``)
 * ``resize_anchors = {}`` (default: ``{t=false, l=true, r=true, b=true}``
 * ``resize_min = {}`` (default: w and h from the ``frame``, or ``{w=5, h=5}``)
 * ``on_resize_begin = function()`` (default: ``nil``)
-* ``on_resize_end = function(bool)`` (default: ``nil``)
+* ``on_resize_end = function(success, new_frame)`` (default: ``nil``)
 
   If ``resizable`` is set to ``true``, then the player can click the mouse on
   any edge specified in ``resize_anchors`` and drag the border to resize the
@@ -4215,6 +4726,9 @@ Has attributes:
   Dragging can be canceled by right clicking while resizing with the mouse,
   hitting :kbd:`Esc` (while resizing with the mouse or keyboard), or by calling
   ``Panel:setKeyboardResizeEnabled(false)`` (while resizing with the keyboard).
+  If it is more convenient to do so, you can choose to override the
+  ``panel:onResizeBegin`` and/or the ``panel:onResizeEnd`` methods instead of
+  setting the ``on_resize_begin`` and/or ``on_resize_end`` attributes.
 
 * ``autoarrange_subviews = bool`` (default: ``false``)
 * ``autoarrange_gap = int`` (default: ``0``)
@@ -4259,6 +4773,15 @@ Has functions:
   commit the new window size or :kbd:`Esc` to cancel. If resizing is canceled,
   then the window size from before the resize operation is restored.
 
+* ``panel:onDragBegin()``
+* ``panel:onDragEnd(success, new_frame)``
+* ``panel:onResizeBegin()``
+* ``panel:onResizeEnd(success, new_frame)``
+
+The default implementations of these methods call the associated attribute (if
+set). You can override them in a subclass if that is more convenient than
+setting the attributes.
+
 Double clicking:
 
 If the panel is resizable and the user double-clicks on the top edge (the frame
@@ -4286,6 +4809,13 @@ Subclass of Panel; automatically adjusts its own frame height and width to the
 minimum required to show its subviews. Pairs nicely with a parent Panel that has
 ``autoarrange_subviews`` enabled.
 
+It has the following attributes:
+
+:auto_height: Sets self.frame.h from the positions and height of its subviews
+              (default is ``true``).
+:auto_width: Sets self.frame.w from the positions and width of its subviews
+             (default is ``false``).
+
 Pages class
 -----------
 
@@ -4338,9 +4868,10 @@ calling ``setFocus(true)`` on the field object.
 If an activation ``key`` is specified, the ``EditField`` will manage its own
 focus. It will start in the unfocused state, and pressing the activation key
 will acquire keyboard focus. Pressing the Enter key will release keyboard focus
-and then call the ``on_submit`` callback. Pressing the Escape key will also
-release keyboard focus, but first it will restore the text that was displayed
-before the ``EditField`` gained focus and then call the ``on_change`` callback.
+and then call the ``on_submit`` callback. Pressing the Escape key (or r-clicking
+with the mouse) will also release keyboard focus, but first it will restore the
+text that was displayed before the ``EditField`` gained focus and then call the
+``on_change`` callback.
 
 The ``EditField`` cursor can be moved to where you want to insert/remove text.
 You can click where you want the cursor to move or you can use any of the
@@ -4350,6 +4881,12 @@ following keyboard hotkeys:
 - Ctrl-B/Ctrl-F: move the cursor one word back or forward.
 - Ctrl-A/Ctrl-E: move the cursor to the beginning/end of the text.
 
+The widget also supports integration with the system clipboard:
+
+- Ctrl-C: copy current text to the system clipboard
+- Ctrl-X: copy current text to the system clipboard and clear text in widget
+- Ctrl-V: paste text from the system clipboard (text is converted to cp437)
+
 The ``EditField`` class also provides the following functions:
 
 * ``editfield:setCursor([cursor_pos])``
@@ -4430,7 +4967,9 @@ It has the following attributes:
 
 :text_pen: Specifies the pen for active text.
 :text_dpen: Specifies the pen for disabled text.
-:text_hpen: Specifies the pen for text hovered over by the mouse, if a click handler is registered.
+:text_hpen: Specifies the pen for text hovered over by the mouse, if a click
+            handler is registered. By default, this will invert the foreground
+            and background colors.
 :disabled: Boolean or a callback; if true, the label is disabled.
 :enabled: Boolean or a callback; if false, the label is disabled.
 :auto_height: Sets self.frame.h from the text height.
@@ -4462,14 +5001,17 @@ containing newlines, or a table with the following possible fields:
   Specifies the number of character positions to advance on the line
   before rendering the token.
 
-* ``token.tile = pen``
+* ``token.tile``, ``token.htile``
 
-  Specifies a pen to paint as one tile before the main part of the token.
+  Specifies a pen or texture index (or a function that returns a pen or texture
+  index) to paint as one tile before the main part of the token. If ``htile``
+  is specified, that is used instead of ``tile`` when the Label is hovered over
+  with the mouse.
 
 * ``token.width = ...``
 
-  If specified either as a value or a callback, the text field is padded
-  or truncated to the specified number.
+  If specified either as a value or a callback, the text (or tile) field is
+  padded or truncated to the specified number.
 
 * ``token.pad_char = '?'``
 
@@ -4492,10 +5034,10 @@ containing newlines, or a table with the following possible fields:
 
   Same as the attributes of the label itself, but applies only to the token.
 
-* ``token.pen``, ``token.dpen``
+* ``token.pen``, ``token.dpen``, ``token.hpen``
 
-  Specify the pen and disabled pen to be used for the token's text.
-  The field may be either the pen itself, or a callback that returns it.
+  Specify the pen, disabled pen, and hover pen to be used for the token's text.
+  The fields may be either the pen itself, or a callback that returns it.
 
 * ``token.on_activate``
 
@@ -4533,8 +5075,20 @@ The Label widget implements the following methods:
 
   This method takes the number of lines to scroll as positive or negative
   integers or one of the following keywords: ``+page``, ``-page``,
-  ``+halfpage``, or ``-halfpage``. It returns the number of lines that were
-  actually scrolled (negative for scrolling up).
+  ``+halfpage``, ``-halfpage``, ``home``, or ``end``. It returns the number of
+  lines that were actually scrolled (negative for scrolling up).
+
+* ``label:shouldHover()``
+
+  This method returns whether or not this widget should show a hover effect,
+  generally you want to return ``true`` if there is some type of mouse handler
+  present. For example, for a ``HotKeyLabel``::
+
+    function HotkeyLabel:shouldHover()
+        -- When on_activate is set, text should also hover on mouseover
+        return HotkeyLabel.super.shouldHover(self) or self.on_activate
+    end
+
 
 WrappedLabel class
 ------------------
@@ -4590,6 +5144,16 @@ It has the following attributes:
 :on_activate: If specified, it is the callback that will be called whenever
     the hotkey is pressed or the label is clicked.
 
+The HotkeyLabel widget implements the following methods:
+
+* ``hotkeylabel:setLabel(label)``
+
+    Updates the label without altering the hotkey text.
+
+* ``hotkeylabel:setOnActivate(on_activate)``
+
+    Updates the on_activate callback.
+
 CycleHotkeyLabel class
 ----------------------
 
@@ -4599,12 +5163,22 @@ cycle through by pressing a specified hotkey or clicking on the text.
 It has the following attributes:
 
 :key: The hotkey keycode to display, e.g. ``'CUSTOM_A'``.
+:key_back: Similar to ``key``, but will cycle backwards (optional)
+:key_sep: If specified, will be used to customize how the activation key is
+          displayed. See ``token.key_sep`` in the ``Label`` documentation.
 :label: The string (or a function that returns a string) to display after the
     hotkey.
 :label_width: The number of spaces to allocate to the ``label`` (for use in
     aligning a column of ``CycleHotkeyLabel`` labels).
-:options: A list of strings or tables of ``{label=string, value=string}``.
-    String options use the same string for the label and value.
+:label_below: If ``true``, then the option value will appear below the label
+    instead of to the right of it. Defaults to ``false``.
+:option_gap: The size of the gap between the label text and the option value.
+    Default is ``1``. If set to ``0``, there'll be no gap between the strings.
+    If ``label_below`` == ``true``, negative values will shift the value leftwards.
+:options: A list of strings or tables of
+    ``{label=string or fn, value=val[, pen=pen]}``. String options use the same
+    string for the label and value and use the default pen. The optional ``pen``
+    element could be a color like ``COLOR_RED``.
 :initial_option: The value or numeric index of the initial option.
 :on_change: The callback to call when the selected option changes. It is called
     as ``on_change(new_option_value, old_option_value)``.
@@ -4614,9 +5188,16 @@ the ``option_idx`` instance variable.
 
 The CycleHotkeyLabel widget implements the following methods:
 
-* ``cyclehotkeylabel:cycle()``
+* ``cyclehotkeylabel:cycle([backwards])``
 
     Cycles the selected option and triggers the ``on_change`` callback.
+    If ``backwards`` is defined and is truthy, the cycle direction will be reversed
+
+* ``cyclehotkeylabel:setOption(value_or_index, call_on_change)``
+
+    Sets the current option to the option with the specified value or
+    index. If ``call_on_change`` is set to ``true``, then the ``on_change``
+    callback is triggered.
 
 * ``cyclehotkeylabel:getOptionLabel([option_idx])``
 
@@ -4628,11 +5209,55 @@ The CycleHotkeyLabel widget implements the following methods:
     Retrieves the option value at the given index, or the value of the
     currently selected option if no index is given.
 
-ToggleHotkeyLabel
------------------
+* ``cyclehotkeylabel:getOptionPen([option_idx])``
+
+    Retrieves the option pen at the given index, or the pen of the currently
+    selected option if no index is given. If an option was defined as just a
+    string, then this function will return ``nil`` for that option.
+
+ToggleHotkeyLabel class
+-----------------------
 
 This is a specialized subclass of CycleHotkeyLabel that has two options:
-``On`` (with a value of ``true``) and ``Off`` (with a value of ``false``).
+``On`` (with a value of ``true``) and ``Off`` (with a value of ``false``). The
+``On`` option is rendered in green.
+
+HelpButton class
+----------------
+
+A 3x1 tile button with a question mark on it, intended to represent a help
+icon. Clicking on the icon will launch `gui/launcher` with a given command
+string, showing the help text for that command.
+
+It has the following attributes:
+
+:command: The command to load in `gui/launcher`.
+
+ConfigureButton class
+---------------------
+
+A 3x1 tile button with a gear mark on it, intended to represent a configure
+icon. Clicking on the icon will run the given callback.
+
+It has the following attributes:
+
+:on_click: The function on run when the icon is clicked.
+
+BannerPanel class
+-----------------
+
+This is a Panel subclass that prints a distinctive banner along the far left
+and right columns of the widget frame. Note that this is not a "proper" frame
+since it doesn't have top or bottom borders. Subviews of this panel should
+inset their frames one tile from the left and right edges.
+
+TextButton class
+----------------
+
+This is a BannerPanel subclass that wraps a HotkeyLabel with some decorators on
+the sides to make it look more like a button, suitable for both graphics and
+ASCII modes. All HotkeyLabel parameters passed to the constructor are passed
+through to the wrapped HotkeyLabel.
 
 List class
 ----------
@@ -4643,6 +5268,8 @@ item to call the ``on_submit`` callback for that item.
 It has the following attributes:
 
 :text_pen: Specifies the pen for deselected list entries.
+:text_hpen: Specifies the pen for entries that the mouse is hovered over.
+            Defaults to swapping the background/foreground colors.
 :cursor_pen: Specifies the pen for the selected entry.
 :inactive_pen: If specified, used for the cursor when the widget is not active.
 :icon_pen: Default pen for icons.
@@ -4653,6 +5280,10 @@ It has the following attributes:
             key/click and calls the callback as ``on_submit(index,choice)``.
 :on_submit2: Shift-click callback; if specified, the list reacts to the click and
              calls the callback as ``on_submit2(index,choice)``.
+:on_double_click: Mouse double click callback; if specified, the list reacts to the
+            click and calls the callback as ``on_double_click(index,choice)``.
+:on_double_click2: Shift-double click callback; if specified, the list reacts to the click and
+             calls the callback as ``on_double_click2(index,choice)``.
 :row_height: Height of every row in text lines.
 :icon_width: If not *nil*, the specified number of character columns
              are reserved to the left of the list item for the icons.
@@ -4714,7 +5345,7 @@ FilteredList class
 ------------------
 
 This widget combines List, EditField and Label into a combo-box like
-construction that allows filtering the list by subwords of its items.
+construction that allows filtering the list.
 
 In addition to passing through all attributes supported by List, it
 supports:
@@ -4723,6 +5354,7 @@ supports:
 :edit_below: If true, the edit field is placed below the list instead of above.
 :edit_key: If specified, the edit field is disabled until this key is pressed.
 :edit_ignore_keys: If specified, will be passed to the filter edit field as its ``ignore_keys`` attribute.
+:edit_on_change: If specified, will be passed to the filter edit field as its ``on_change`` attribute.
 :edit_on_char: If specified, will be passed to the filter edit field as its ``on_char`` attribute.
 :not_found_label: Specifies the text of the label shown when no items match the filter.
 
@@ -4762,6 +5394,90 @@ The widget implements:
 
   Same as with an ordinary list.
 
+Filter behavior:
+
+By default, the filter matches substrings that start at the beginning of a word
+(or after any punctuation). You can instead configure filters to match any
+substring across the full text with a command like::
+
+  :lua require('utils').FILTER_FULL_TEXT=true
+
+TabBar class
+------------
+
+This widget implements a set of one or more tabs to allow navigation between groups of content. Tabs automatically wrap on
+the width of the window and will continue rendering on the next line(s) if all tabs cannot fit on a single line.
+
+:key: Specifies a keybinding that can be used to switch to the next tab.
+      Defaults to ``CUSTOM_CTRL_T``.
+:key_back: Specifies a keybinding that can be used to switch to the previous
+      tab. Defaults to ``CUSTOM_CTRL_Y``.
+:labels: A table of strings; entry representing the label text for a single tab. The order of the entries
+         determines the order the tabs will appear in.
+:on_select: Callback executed when a tab is selected. It receives the selected tab index as an argument. The provided function
+            should update the value of whichever variable your script uses to keep track of the currently selected tab.
+:get_cur_page: The function used by the TabBar to determine which Tab is currently selected. The function you provide should
+               return an integer that corresponds to the non-zero index of the currently selected Tab (i.e. whatever variable
+               you update in your ``on_select`` callback)
+:active_tab_pens: A table of pens used to render active tabs. See the default implementation in widgets.lua for an example
+                  of how to construct the table. Leave unspecified to use the default pens.
+:inactive_tab_pens: A table of pens used to render inactive tabs. See the default implementation in widgets.lua for an example
+                    of how to construct the table. Leave unspecified to use the default pens.
+:get_pens: A function used to determine which pens should be used to render a tab. Receives the index of the tab as the first
+           argument and the TabBar widget itself as the second. The default implementation, which will handle most situations,
+           returns ``self.active_tab_pens``, if ``self.get_cur_page() == idx``, otherwise returns ``self.inactive_tab_pens``.
+
+Tab class
+---------
+
+This widget implements a single clickable tab and is the main component of the TabBar widget. Usage of the ``TabBar``
+widget does not require direct usage of ``Tab``.
+
+:id: The id of the tab.
+:label: The text displayed on the tab.
+:on_select: Callback executed when the tab is selected.
+:get_pens: A function that is used during ``Tab:onRenderBody`` to determine the pens that should be used for drawing. See the
+           usage of ``Tab`` in ``TabBar:init()`` for an example. See the default value of ``active_tab_pens`` or ``inactive_tab_pens``
+           in ``TabBar`` for an example of how to construct pens.
+
+RangeSlider class
+-----------------
+
+This widget implements a mouse-interactable range-slider. The player can move its two handles to set minimum and maximum values
+to define a range, or they can drag the bar itself to move both handles at once.
+The parent widget owns the range values, and can control them independently (e.g. with ``CycleHotkeyLabels``). If the range values change, the ``RangeSlider`` appearance will adjust automatically.
+
+:num_stops: Used to specify the number of "notches" in the range slider, the places where handles can stop.
+            (this should match the parents' number of options)
+:get_left_idx_fn: The function used by the RangeSlider to get the notch index on which to display the left handle.
+:get_right_idx_fn: The function used by the RangeSlider to get the notch index on which to display the right handle.
+:on_left_change: Callback executed when moving the left handle.
+:on_right_change: Callback executed when moving the right handle.
+
+
+gui.textures
+============
+
+This module contains convenience methods for accessing default DFHack graphic assets.
+Pass the ``offset`` in tiles (in row major position) to get a particular tile from the
+asset. ``offset`` 0 is the first tile.
+
+* ``tp_green_pin(offset)`` tileset: ``hack/data/art/green-pin.png``
+* ``tp_red_pin(offset)`` tileset: ``hack/data/art/red-pin.png``
+* ``tp_icons(offset)`` tileset: ``hack/data/art/icons.png``
+* ``tp_on_off(offset)`` tileset: ``hack/data/art/on-off.png``
+* ``tp_control_panel(offset)`` tileset: ``hack/data/art/control-panel.png``
+* ``tp_border_thin(offset)`` tileset: ``hack/data/art/border-thin.png``
+* ``tp_border_medium(offset)`` tileset: ``hack/data/art/border-medium.png``
+* ``tp_border_bold(offset)`` tileset: ``hack/data/art/border-bold.png``
+* ``tp_border_panel(offset)`` tileset: ``hack/data/art/border-panel.png``
+* ``tp_border_window(offset)`` tileset: ``hack/data/art/order-window.png``
+
+Example usage::
+
+  local textures = require('gui.textures')
+  local first_border_texpos = textures.tp_border_thin(1)
+
 
 .. _lua-plugins:
 
@@ -4900,51 +5616,6 @@ Native functions provided by the `buildingplan` plugin:
 * ``void doCycle()`` runs a check for whether buildings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
 * ``void scheduleCycle()`` schedules a cycle to be run during the next non-paused game frame. Can be called multiple times while the game is paused and only one cycle will be scheduled.
 
-burrows
-=======
-
-The `burrows` plugin implements extended burrow manipulations.
-
-Events:
-
-* ``onBurrowRename.foo = function(burrow)``
-
-  Emitted when a burrow might have been renamed either through
-  the game UI, or ``renameBurrow()``.
-
-* ``onDigComplete.foo = function(job_type,pos,old_tiletype,new_tiletype,worker)``
-
-  Emitted when a tile might have been dug out. Only tracked if the
-  auto-growing burrows feature is enabled.
-
-Native functions:
-
-* ``renameBurrow(burrow,name)``
-
-  Renames the burrow, emitting ``onBurrowRename`` and updating auto-grow state properly.
-
-* ``findByName(burrow,name)``
-
-  Finds a burrow by name, using the same rules as the plugin command line interface.
-  Namely, trailing ``'+'`` characters marking auto-grow burrows are ignored.
-
-* ``copyUnits(target,source,enable)``
-
-  Applies units from ``source`` burrow to ``target``. The ``enable``
-  parameter specifies if they are to be added or removed.
-
-* ``copyTiles(target,source,enable)``
-
-  Applies tiles from ``source`` burrow to ``target``. The ``enable``
-  parameter specifies if they are to be added or removed.
-
-* ``setTilesByKeyword(target,keyword,enable)``
-
-  Adds or removes tiles matching a predefined keyword. The keyword
-  set is the same as used by the command line.
-
-The lua module file also re-exports functions from ``dfhack.burrows``.
-
 .. _cxxrandom-api:
 
 cxxrandom
@@ -5404,6 +6075,13 @@ sort
 The `sort <sort>` plugin does not export any native functions as of now.
 Instead, it calls Lua code to perform the actual ordering of list items.
 
+tiletypes
+=========
+
+* ``bool tiletypes_setTile(pos, shape, material, special, variant)`` where
+  the parameters are enum values from ``df.tiletype_shape``,
+  ``df.tiletype_material``, etc. Returns whether the conversion succeeded.
+
 .. _xlsxreader-api:
 
 xlsxreader
@@ -5549,9 +6227,9 @@ General script API
 
   Note that the ``dfhack.run_script()`` function allows Lua errors to propagate to the caller.
 
-  To run other types of commands (such as built-in commands, plugin commands, or
-  Ruby scripts), see ``dfhack.run_command()``. Note that this is slightly slower
-  than ``dfhack.run_script()`` for Lua scripts.
+  To run other types of commands (i.e. built-in commands or commands provided by plugins),
+  see ``dfhack.run_command()``. Note that this is slightly slower than ``dfhack.run_script()``
+  when running Lua scripts.
 
 * ``dfhack.script_help([name, [extension]])``
 
@@ -5655,9 +6333,13 @@ Enabling and disabling scripts
 ==============================
 
 Scripts can choose to recognize the built-in ``enable`` and ``disable`` commands
-by including the following line anywhere in their file::
+by including the following line near the top of their file::
+
+    --@enable = true
+    --@module = true
 
-    --@ enable = true
+Note that enableable scripts must also be `modules <reqscript>` so their
+``isEnabled()`` functions can be called from outside the script.
 
 When the ``enable`` and ``disable`` commands are invoked, the ``dfhack_flags``
 table passed to the script will have the following fields set:
@@ -5672,7 +6354,8 @@ command.
 
 Example usage::
 
-    --@ enable = true
+    --@enable = true
+    --@module = true
 
     enabled = enabled or false
     function isEnabled()
@@ -5726,9 +6409,9 @@ all script modules.
 Save init script
 ================
 
-If a save directory contains a file called ``raw/init.lua``, it is
+If a save directory contains a file called ``init.lua``, it is
 automatically loaded and executed every time the save is loaded.
-The same applies to any files called ``raw/init.d/*.lua``. Every
+The same applies to any files called ``init.d/*.lua``. Every
 such script can define the following functions to be called by dfhack:
 
 * ``function onStateChange(op) ... end``
diff --git a/docs/dev/Memory-research.rst b/docs/dev/Memory-research.rst
index c4c7aeb63..2ee47bb05 100644
--- a/docs/dev/Memory-research.rst
+++ b/docs/dev/Memory-research.rst
@@ -50,7 +50,7 @@ Plugins
 
 There are a few development plugins useful for low-level memory research. They
 are not built by default, but can be built by setting the ``BUILD_DEVEL``
-`CMake option <compile-build-options>`. These include:
+`CMake option <build-options>`. These include:
 
 - ``check-structures-sanity``, which performs sanity checks on the given DF
   object. Note that this will crash in several cases, some intentional, so using
@@ -85,7 +85,7 @@ You should not count on DF being stable when using this.
 
 DFHack's implementation of sizecheck is currently only tested on Linux, although
 it probably also works on macOS. It can be built with the ``BUILD_SIZECHECK``
-`CMake option <compile-build-options>`, which produces a ``libsizecheck``
+`CMake option <build-options>`, which produces a ``libsizecheck``
 library installed in the ``hack`` folder. On Linux, passing ``--sc`` as the
 first argument to the ``dfhack`` launcher script will load this library on
 startup. On other platforms, or when passing a different argument to the
diff --git a/docs/dev/compile/Compile.rst b/docs/dev/compile/Compile.rst
new file mode 100644
index 000000000..5e605e391
--- /dev/null
+++ b/docs/dev/compile/Compile.rst
@@ -0,0 +1,443 @@
+.. highlight:: shell
+
+.. _compile:
+
+###########
+Compilation
+###########
+
+DFHack builds are available for all supported platforms; see `installing` for
+installation instructions. If you are a DFHack end-user, modder, or plan on
+writing scripts [lua] (not plugins), it is generally recommended (and easier) to use
+these `builds <https://github.com/DFHack/dfhack/releases>`_ instead of compiling DFHack from source.
+
+However, if you are looking to develop plugins, work on the DFHack core, make
+complex changes to DF-structures, or anything else that requires compiling
+DFHack from source, this document will walk you through the build process. Note
+that some steps may be unconventional compared to other projects, so be sure to
+pay close attention if this is your first time compiling DFHack.
+
+.. contents:: Contents
+  :local:
+  :depth: 2
+
+.. _compile-how-to-get-the-code:
+
+How to get the code
+===================
+DFHack uses Git for source control; instructions for installing Git can be found
+in the platform-specific sections below. The code is hosted on
+`GitHub <https://github.com/DFHack/dfhack>`_, and can be downloaded with::
+
+    git clone --recursive https://github.com/DFHack/dfhack
+    cd dfhack
+
+If your version of Git does not support the ``--recursive`` flag, you will need
+to omit it and run ``git submodule update --init`` after entering the dfhack
+directory.
+
+This will check out the code on the default branch of the GitHub repo, currently
+``develop``, which may be unstable. If you want code for the latest stable
+release, you can check out the ``master`` branch instead::
+
+    git checkout master
+    git submodule update
+
+In general, a single DFHack clone is suitable for development - most Git
+operations such as switching branches can be done on an existing clone. If you
+find yourself cloning DFHack frequently as part of your development process, or
+getting stuck on anything else Git-related, feel free to reach out to us for
+assistance.
+
+.. admonition:: Offline builds
+
+  If you plan to build DFHack on a machine without an internet connection (or
+  with an unreliable connection), see `note-offline-builds` for additional
+  instructions.
+
+.. admonition:: Working with submodules
+
+  DFHack uses submodules extensively to manage its subprojects (including the
+  ``scripts`` folder and DF-structures in ``library/xml``). Failing to keep
+  submodules in sync when switching between branches can result in build errors
+  or scripts that don't work. In general, you should always update submodules
+  whenever you switch between branches in the main DFHack repo with
+  ``git submodule update``. (If you are working on bleeding-edge DFHack and
+  have checked out the master branch of some submodules, running ``git pull``
+  in those submodules is also an option.)
+
+  Rarely, we add or remove submodules. If there are any changes to the existence
+  of submodules when you switch between branches, you should run
+  ``git submodule update --init`` instead (adding ``--init`` to the above
+  command).
+
+  Some common errors that can arise when failing to update submodules include:
+
+  * ``fatal: <some path> does not exist`` when performing Git operations
+  * Build errors, particularly referring to structures in the ``df::`` namespace
+    or the ``library/include/df`` folder
+  * ``Not a known DF version`` when starting DF
+  * ``Run 'git submodule update --init'`` when running CMake
+
+  Submodules are a particularly confusing feature of Git. The
+  `Git Book <https://git-scm.com/book/en/v2/Git-Tools-Submodules>`_ has a
+  thorough explanation of them (as well as of many other aspects of Git) and
+  is a recommended resource if you run into any issues. Other DFHack developers
+  are also able to help with any submodule-related (or Git-related) issues
+  you may encounter.
+
+All Platforms
+=============
+Before you can compile the code you'll need to configure your build with cmake. Some IDEs can do this
+for you, but it's more common to do it from the command line. Windows developers can refer to the
+Windows section below for batch files that can be used to avoid opening a terminal/command-prompt.
+
+You should seek cmake's documentation online or via ``cmake --help`` to see how the command works. See
+the `build-options` page for help finding the DFHack build options relevant to you.
+
+Before compiling code, you'll of course need code to compile. This **will include** the submodules, so
+be sure you've read the section about getting the code.
+
+.. _compile-linux:
+
+Linux
+=====
+On Linux, DFHack acts as a library that shadows parts of the SDL API using LD_PRELOAD.
+
+Build
+-----
+Building is fairly straightforward. Enter the ``build`` folder (or create an
+empty folder in the DFHack directory to use instead) and start the build like this::
+
+    cd build
+    cmake .. -G Ninja -DCMAKE_BUILD_TYPE:string=Release -DCMAKE_INSTALL_PREFIX=<path to DF>
+    ninja install  # or ninja -jX install to specify the number of cores (X) to use
+
+<path to DF> should be a path to a copy of Dwarf Fortress, of the appropriate
+version for the DFHack you are building. This will build the library along
+with the normal set of plugins and install them into your DF folder.
+
+Alternatively, you can use ccmake instead of cmake::
+
+    cd build
+    ccmake .. -G Ninja
+    ninja install
+
+This will show a curses-based interface that lets you set all of the
+extra options. You can also use a cmake-friendly IDE like KDevelop 4
+or the cmake-gui program.
+
+.. _compile-windows:
+
+Windows
+=======
+There are several different batch files in the ``win32`` and ``win64``
+subfolders in the ``build`` folder, along with a script that's used for picking
+the DF path. Use the subfolder corresponding to the architecture that you want
+to build for.
+
+First, run ``set_df_path.vbs`` and point the dialog that pops up at
+a suitable DF installation which is of the appropriate version for the DFHack
+you are compiling. The result is the creation of the file ``DF_PATH.txt`` in
+the build directory. It contains the full path to the destination directory.
+You could therefore also create this file manually - or copy in a pre-prepared
+version - if you prefer.
+
+Next, run one of the scripts with ``generate`` prefix. These create the MSVC
+solution file(s):
+
+* ``all`` will create a solution with everything enabled (and the kitchen sink).
+* ``gui`` will pop up the CMake GUI and let you choose what to build.
+  This is probably what you want most of the time. Set the options you are interested
+  in, then hit configure, then generate. More options can appear after the configure step.
+* ``minimal`` will create a minimal solution with just the bare necessities -
+  the main library and standard plugins.
+* ``release`` will create a solution with everything that should be included in
+  release builds of DFHack. Note that this includes documentation, which requires
+  Python.
+
+Then you can either open the solution with MSVC or use one of the msbuild scripts.
+
+Visual Studio IDE
+-----------------
+After running the CMake generate script you will have a new folder called VC2022
+or VC2022_32, depending on the architecture you specified. Open the file
+``dfhack.sln`` inside that folder. If you have multiple versions of Visual
+Studio installed, make sure you open with Visual Studio 2022.
+
+The first thing you must then do is change the build type. It defaults to Debug,
+but this cannot be used on Windows. Debug is not binary-compatible with DF.
+If you try to use a debug build with DF, you'll only get crashes and for this
+reason the Windows "debug" scripts actually do RelWithDebInfo builds.
+After loading the Solution, change the Build Type to either ``Release``
+or ``RelWithDebInfo``.
+
+Then build the ``INSTALL`` target listed under ``CMakePredefinedTargets``.
+
+Command Line
+------------
+In the build directory you will find several ``.bat`` files:
+
+* Scripts with ``build`` prefix will only build DFHack.
+* Scripts with ``install`` prefix will build DFHack and install it to the previously selected DF path.
+* Scripts with ``package`` prefix will build and create a .zip package of DFHack.
+
+Compiling from the command line is generally the quickest and easiest option.
+Modern Windows terminal emulators such as `Cmder <https://cmder.app/>`_ or
+`Windows Terminal <https://github.com/microsoft/terminal>`_ provide a better
+experience by providing more scrollback and larger window sizes.
+
+.. _compile-macos:
+
+macOS
+=====
+DFHack functions similarly on macOS and Linux, and the majority of the
+information above regarding the build process (CMake and Ninja) applies here
+as well.
+
+DFHack can officially be built on macOS only with GCC 4.8 or 7. Anything newer than 7
+will require you to perform extra steps to get DFHack to run (see `osx-new-gcc-notes`),
+and your build will likely not be redistributable.
+
+Building
+--------
+
+* Get the DFHack source as per section `compile-how-to-get-the-code`, above.
+* Set environment variables
+
+  Homebrew (if installed elsewhere, replace /usr/local with ``$(brew --prefix)``)::
+
+    export CC=/usr/local/bin/gcc-7
+    export CXX=/usr/local/bin/g++-7
+
+  Macports::
+
+    export CC=/opt/local/bin/gcc-mp-7
+    export CXX=/opt/local/bin/g++-mp-7
+
+  Change the version numbers appropriately if you installed a different version of GCC.
+
+  If you are confident that you have GCC in your path, you can omit the absolute paths::
+
+    export CC=gcc-7
+    export CXX=g++-7
+
+  (adjust as needed for different GCC installations)
+
+* Build DFHack::
+
+    mkdir build-osx
+    cd build-osx
+    cmake .. -G Ninja -DCMAKE_BUILD_TYPE:string=Release -DCMAKE_INSTALL_PREFIX=<path to DF>
+    ninja install  # or ninja -jX install to specify the number of cores (X) to use
+
+  <path to DF> should be a path to a copy of Dwarf Fortress, of the appropriate
+  version for the DFHack you are building.
+
+.. _osx-new-gcc-notes:
+
+Notes for GCC 8+ or OS X 10.10+ users
+-------------------------------------
+
+If you have issues building on OS X 10.10 (Yosemite) or above, try defining
+the following environment variable::
+
+    export MACOSX_DEPLOYMENT_TARGET=10.9
+
+If you build with a GCC version newer than 7, DFHack will probably crash
+immediately on startup, or soon after. To fix this, you will need to replace
+``hack/libstdc++.6.dylib`` with a symlink to the ``libstdc++.6.dylib`` included
+in your version of GCC::
+
+  cd <path to df>/hack && mv libstdc++.6.dylib libstdc++.6.dylib.orig &&
+  ln -s [PATH_TO_LIBSTDC++] .
+
+For example, with GCC 6.3.0, ``PATH_TO_LIBSTDC++`` would be::
+
+  /usr/local/Cellar/gcc@6/6.3.0/lib/gcc/6/libstdc++.6.dylib  # for 64-bit DFHack
+  /usr/local/Cellar/gcc@6/6.3.0/lib/gcc/6/i386/libstdc++.6.dylib  # for 32-bit DFHack
+
+**Note:** If you build with a version of GCC that requires this, your DFHack
+build will *not* be redistributable. (Even if you copy the ``libstdc++.6.dylib``
+from your GCC version and distribute that too, it will fail on older OS X
+versions.) For this reason, if you plan on distributing DFHack, it is highly
+recommended to use GCC 4.8 or 7.
+
+.. _osx-m1-notes:
+
+Notes for M1 users
+------------------
+
+Alongside the above, you will need to follow these additional steps to get it
+running on Apple silicon.
+
+Install an x86 copy of ``homebrew`` alongside your existing one. `This
+stackoverflow answer <https://stackoverflow.com/a/64951025>`__ describes the
+process.
+
+Follow the normal macOS steps to install ``cmake`` and ``gcc`` via your x86 copy of
+``homebrew``. Note that this will install a GCC version newer than 7, so see
+`osx-new-gcc-notes`.
+
+In your terminal, ensure you have your path set to the correct homebrew in
+addition to the normal ``CC`` and ``CXX`` flags above::
+
+  export PATH=/usr/local/bin:$PATH
+
+Windows cross compiling from Linux (running DF inside docker)
+=============================================================
+
+.. highlight:: bash
+
+You can use docker to build DFHack for Windows. These instructions were developed
+on a Linux host system.
+
+.. contents::
+  :local:
+  :depth: 1
+
+Step 1: prepare a build container
+---------------------------------
+
+On your Linux host, install and run the docker daemon and then run these commands::
+
+    xhost +local:root
+    docker run -it --env="DISPLAY" --env="QT_X11_NO_MITSHM=1" --volume=/tmp/.X11-unix:/tmp/.X11-unix --user buildmaster --name dfhack-win ghcr.io/dfhack/build-env:msvc
+
+The ``xhost`` command and ``--env`` parameters are there so you can eventually
+run Dwarf Fortress from the container and have it display on your host.
+
+Step 2: build DFHack
+--------------------
+
+The ``docker run`` command above will give you a shell prompt (as the ``buildmaster`` user) in the
+container. Inside the container, run the following commands::
+
+    git clone https://github.com/DFHack/dfhack.git
+    cd dfhack
+    git submodule update --init
+    cd build
+    dfhack-configure windows 64 Release
+    dfhack-make
+
+Inside the ``dfhack-*`` scripts there are several commands that set up the wine
+server. Each invocation of a Windows tool will cause wine to run in the container.
+Preloading the wineserver and telling it not to exit will speed configuration and
+compilation up considerably (approx. 10x). You can configure and build DFHack
+with regular ``cmake`` and ``ninja`` commands, but your build will go much slower.
+
+Step 3: copy Dwarf Fortress to the container
+--------------------------------------------
+
+First, create a directory in the container to house the Dwarf Fortress binary and
+assets::
+
+    mkdir ~/df
+
+If you can just download Dwarf Fortress directly into the container, then that's fine.
+Otherwise, you can do something like this in your host Linux environment to copy an
+installed version to the container::
+
+    cd ~/.steam/steam/steamapps/common/Dwarf\ Fortress/
+    docker cp . dfhack-win:df/
+
+Step 4: install DFHack and run DF
+---------------------------------
+
+Back in the container, run the following commands::
+
+    cd dfhack/build
+    cmake .. -DCMAKE_INSTALL_PREFIX=/home/buildmaster/df
+    ninja install
+    cd ~/df
+    wine64 "Dwarf Fortress.exe"
+
+Other notes
+-----------
+
+Closing your shell will kick you out of the container. Run this command on your Linux
+host when you want to reattach::
+
+    docker start -ai dfhack-win
+
+If you edit code and need to rebuild, run ``dfhack-make`` and then ``ninja install``.
+That will handle all the wineserver management for you.
+
+Cross-compiling windows files for running DF in Steam for Linux
+===============================================================
+
+.. highlight:: bash
+
+If you wish, you can use Docker to build just the Windows files to copy to your
+existing Steam installation on Linux.
+
+.. contents::
+  :local:
+  :depth: 1
+
+Step 1: Get dfhack, and run the build script
+--------------------------------------------
+
+Check out ``dfhack`` into another directory, and run the build script::
+
+   git clone https://github.com/DFHack/dfhack.git
+   cd dfhack
+   git submodule update --init --recursive
+   cd build
+   ./build-win64-from-linux.sh
+
+The script will mount your host's ``dfhack`` directory to docker, use it to
+build the artifacts in ``build/win64-cross``, and put all the files needed to
+install in ``build/win64-cross/output``.
+
+If you need to run ``docker`` using ``sudo``, run the script using ``sudo``
+rather than directly::
+
+  sudo ./build-win64-from-linux.sh
+
+Step 2: install dfhack to your Steam DF install
+-----------------------------------------------
+As the script will tell you, you can then copy the files into your DF folder::
+
+   # Optional -- remove the old hack directory in case we leave files behind
+   rm ~/.local/share/Steam/steamapps/common/"Dwarf Fortress"/hack
+   cp -r win64-cross/output/* ~/.local/share/Steam/steamapps/common/"Dwarf Fortress"/
+
+Afterward, just run DF as normal.
+
+.. _note-offline-builds:
+
+Building DFHack Offline
+=======================
+As of 0.43.05, DFHack downloads several files during the build process, depending
+on your target OS and architecture. If your build machine's internet connection
+is unreliable, or nonexistent, you can download these files in advance.
+
+First, you must locate the files you will need. These can be found in the
+`dfhack-bin repo <https://github.com/DFHack/dfhack-bin/releases>`_. Look for the
+most recent version number *before or equal to* the DF version which you are
+building for. For example, suppose "0.43.05" and "0.43.07" are listed. You should
+choose "0.43.05" if you are building for 0.43.05 or 0.43.06, and "0.43.07" if
+you are building for 0.43.07 or 0.43.08.
+
+Then, download all of the files you need, and save them to ``<path to DFHack
+clone>/CMake/downloads/<any filename>``. The destination filename you choose
+does not matter, as long as the files end up in the ``CMake/downloads`` folder.
+You need to download all of the files for the architecture(s) you are building
+for. For example, if you are building for 32-bit Linux and 64-bit Windows,
+download all files starting with ``linux32`` and ``win64``. GitHub should sort
+files alphabetically, so all the files you need should be next to each other.
+
+.. note::
+
+  * Any files containing "allegro" in their filename are only necessary for
+    building `stonesense`. If you are not building Stonesense, you don't have to
+    download these, as they are larger than any other listed files.
+
+It is recommended that you create a build folder and run CMake to verify that
+you have downloaded everything at this point, assuming your download machine has
+CMake installed. This involves running a "generate" batch script on Windows, or
+a command starting with ``cmake .. -G Ninja`` on Linux and macOS, following the
+instructions in the sections above. CMake should automatically locate files that
+you placed in ``CMake/downloads``, and use them instead of attempting to
+download them.
diff --git a/docs/dev/compile/Dependencies.rst b/docs/dev/compile/Dependencies.rst
new file mode 100644
index 000000000..da8728b9b
--- /dev/null
+++ b/docs/dev/compile/Dependencies.rst
@@ -0,0 +1,337 @@
+.. _build-dependencies:
+
+############
+Dependencies
+############
+
+The most immediate consideration is of course that DFHack is meant to be installed into an **existing DF folder**.
+So it is prudent that one is ready.
+
+.. contents:: Contents
+  :local:
+  :depth: 2
+
+Build Dependencies
+------------------
+
+..
+    DFHack is quite large, so I've attempted to
+    leave some sort of bread crumbs for each
+    mentionable aspect.
+
+Many of DFHack's build dependencies are included in the repository as git submodules,
+however there are some system dependencies as well. They are as follows:
+
+System packages:
+
+* SDL (libsdl 1.2, not sdl2).
+* cmake
+* Perl
+* Python
+
+  * Sphinx
+* git (required for `contributions <https://github.com/DFHack/dfhack/pulls>`_)
+* ccache (**optional**, but recommended to improve build times)
+* OpenGL headers (**optional**: to build `stonesense`)
+* zlib (compression library used for `xlsxreader-api` -> `quickfort`)
+* build system (e.g. gcc & ninja, or Visual Studio)
+
+..
+    maybe the below should be talked about next to the bullet point??
+
+**SDL** is used as an injection point which you can see more about in DFHack's `architectural <architectural-diagrams>` documentation & diagrams.
+
+Perl packages:
+
+* XML::LibXML
+* XML::LibXSLT
+
+These perl packages are used in code generation. DFHack has many structures that are reverse engineered, we use xml
+files to define and update these structures. Then during the configuration process [running cmake] these xml files are
+used to generate C++ source code to define these structures for use in plugins and scripts.
+
+
+Installing
+----------
+
+.. contents::
+  :local:
+  :depth: 2
+
+.. _linux-dependency-instructions:
+
+Linux
+=====
+
+Here are some package install commands for various distributions:
+
+* On Arch linux::
+
+    pacman -Sy gcc cmake ccmake ninja git dwarffortress zlib perl-xml-libxml perl-xml-libxslt
+
+  * The ``dwarffortress`` package provides the necessary SDL packages.
+  * For the required Perl modules: ``perl-xml-libxml`` and ``perl-xml-libxslt`` (or through ``cpan``)
+
+* On Ubuntu::
+
+    apt-get install gcc cmake ninja-build git zlib1g-dev libsdl1.2-dev libxml-libxml-perl libxml-libxslt-perl
+
+  * Other Debian-based distributions should have similar requirements.
+
+* On Fedora::
+
+    yum install gcc-c++ cmake ninja-build git zlib-devel SDL-devel perl-core perl-XML-LibXML perl-XML-LibXSLT ruby
+
+To build DFHack, you need GCC 4.8 or newer. GCC 4.8 has the benefit of avoiding
+`libstdc++ compatibility issues <linux-incompatible-libstdcxx>`, but can be hard
+to obtain on modern distributions, and working around these issues is done
+automatically by the ``dfhack`` launcher script. As long as your system-provided
+GCC is new enough, it should work. Note that extremely new GCC versions may not
+have been used to build DFHack yet, so if you run into issues with these, please
+let us know (e.g. by opening a GitHub issue).
+
+Before you can build anything, you'll also need ``cmake``. It is advisable to
+also get ``ccmake`` on distributions that split the cmake package into multiple
+parts. As mentioned above, ``ninja`` is recommended (many distributions call
+this package ``ninja-build``).
+
+You will need pthread; most systems should have this already. Note that older
+CMake versions may have trouble detecting pthread, so if you run into
+pthread-related errors and pthread is installed, you may need to upgrade CMake,
+either by downloading it from `cmake.org <https://cmake.org/download/>`_ or
+through your package manager, if possible.
+
+Building 32-bit Binaries
+~~~~~~~~~~~~~~~~~~~~~~~~
+If you want to compile 32-bit DFHack on 64-bit distributions, you'll need the
+multilib development tools and libraries:
+
+* ``gcc-multilib`` and ``g++-multilib``
+* If you have installed a non-default version of GCC - for example, GCC 4.8 on a
+  distribution that defaults to 5.x - you may need to add the version number to
+  the multilib packages.
+
+  * For example, ``gcc-4.8-multilib`` and ``g++-4.8-multilib`` if installing for GCC 4.8
+    on a system that uses a later GCC version.
+  * This is definitely required on Ubuntu/Debian, check if using a different distribution.
+
+* ``zlib1g-dev:i386`` (or a similar i386 zlib-dev package)
+
+Note that installing a 32-bit GCC on 64-bit systems (e.g. ``gcc:i386`` on
+Debian) will typically *not* work, as it depends on several other 32-bit
+libraries that conflict with system libraries. Alternatively, you might be able
+to use ``lxc`` to
+:forums:`create a virtual 32-bit environment <139553.msg5435310#msg5435310>`.
+
+.. _linux-incompatible-libstdcxx:
+
+Incompatible libstdc++
+~~~~~~~~~~~~~~~~~~~~~~
+When compiling DFHack yourself, it builds against your system libstdc++. When
+Dwarf Fortress runs, it uses a libstdc++ shipped in the ``libs`` folder, which
+comes from GCC 4.8 and is incompatible with code compiled with newer GCC
+versions. As of DFHack 0.42.05-alpha1, the ``dfhack`` launcher script attempts
+to fix this by automatically removing the DF-provided libstdc++ on startup.
+In rare cases, this may fail and cause errors such as:
+
+.. code-block:: text
+
+   ./libs/Dwarf_Fortress: /pathToDF/libs/libstdc++.so.6: version
+       `GLIBCXX_3.4.18' not found (required by ./hack/libdfhack.so)
+
+The easiest way to fix this is generally removing the libstdc++ shipped with
+DF, which causes DF to use your system libstdc++ instead::
+
+    cd /path/to/DF/
+    rm libs/libstdc++.so.6
+
+Note that distributing binaries compiled with newer GCC versions may result in
+the opposite compatibility issue: users with *older* GCC versions may encounter
+similar errors. This is why DFHack distributes both GCC 4.8 and GCC 7 builds. If
+you are planning on distributing binaries to other users, we recommend using an
+older GCC (but still at least 4.8) version if possible.
+
+.. _windows-dependency-instructions:
+
+Windows
+=======
+
+DFHack must be built with the Microsoft Visual C++ 2022 toolchain (aka MSVC v143)
+for ABI compatibility with Dwarf Fortress v50.
+
+With Choco
+~~~~~~~~~~
+Many of the dependencies are simple enough to download and install via the
+`chocolatey`_ package manager on the command line.
+
+Here are some package install commands::
+
+    choco install cmake
+    choco install ccache
+    choco install strawberryperl
+    choco install python
+    choco install sphinx
+
+    # Visual Studio
+    choco install visualstudio2022community --params "--add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended"
+    # OR
+    # Build Tools for Visual Studio
+    choco install visualstudio2022buildtools --params "--add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended"
+
+If you already have Visual Studio 2022 or the Build Tools installed, you may
+need to modify the installed version to include the workload components
+listed in the manual installation section, as chocolatey will not amend
+the existing install.
+
+.. _chocolatey: https://chocolatey.org/install
+
+Manually
+~~~~~~~~
+If you prefer to install manually rather than using Chocolatey, details and
+requirements are as below. If you do install manually, please ensure you
+have all **executables searchable in your PATH variable**.
+
+.. contents::
+  :local:
+  :depth: 1
+
+CMake
+^^^^^
+You can get the win32 installer version from
+`the official site <https://cmake.org/download/>`_.
+It has the usual installer wizard. Make sure you let it add its binary folder
+to your binary search PATH so the tool can be later run from anywhere.
+
+Perl / Strawberry Perl
+^^^^^^^^^^^^^^^^^^^^^^
+For the code generation stage of the build process, you'll need Perl 5 with
+**XML::LibXML** and **XML::LibXSLT**. `Strawberry Perl <http://strawberryperl.com>`_ is
+recommended as it includes all of the required packages in a single easy
+install.
+
+After install, ensure Perl is in your user's PATH. This can be edited from
+``Control Panel -> System -> Advanced System Settings -> Environment Variables``.
+
+The following directories must be in your PATH, in this order:
+
+* ``<path to perl>\c\bin``
+* ``<path to perl>\perl\site\bin``
+* ``<path to perl>\perl\bin``
+* ``<path to perl>\perl\vendor\lib\auto\XML\LibXML`` (path may only be required on some systems)
+
+Be sure to close and re-open any existing ``cmd.exe`` windows after updating
+your PATH.
+
+If you already have a different version of Perl installed (for example, from Cygwin),
+you can run into some trouble. Either remove the other Perl install from PATH, or
+install XML::LibXML and XML::LibXSLT for it using CPAN.
+
+Python
+^^^^^^
+See the `Python`_ website.
+
+.. _Python: https://www.python.org/downloads/
+
+Sphinx
+^^^^^^
+See the `Sphinx`_ website.
+
+.. _Sphinx: https://www.sphinx-doc.org/en/master/usage/installation.html
+
+.. _install-visual-studio:
+
+Visual Studio
+^^^^^^^^^^^^^
+The required toolchain can be installed as a part of either the `Visual Studio 2022 IDE`_
+or the `Build Tools for Visual Studio 2022`_. If you already have a preferred code
+editor, the Build Tools will be a smaller install. You may need to log into (or create)
+a Microsoft account in order to download Visual Studio.
+
+.. _Visual Studio 2022 IDE: https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030&passive=false
+.. _Build Tools for Visual Studio 2022: https://my.visualstudio.com/Downloads?q=Build%20Tools%20for%20Visual%20Studio%202022
+
+
+Build Tools [Without Visual Studio]
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Click `Build Tools for Visual Studio 2022`_ and you will be prompted to login to your Microsoft account.
+Then you should be redirected to a page with various download options with 2022
+in their name. If this redirect doesn't occur, just copy, paste, and enter the
+download link again and you should see the options.
+
+You want to select the most up-to-date version -- as of writing this is
+"Build Tools for Visual Studio 2022 (version 17.4)". "LTSC" is an extended
+support variant and is not required for our purposes.
+
+When installing, select the "Desktop Development with C++" workload and ensure that the following are checked:
+
+- MSVC v143 - VS 2022 C++ x64/x86 build tools
+- C++ CMake tools for Windows
+- At least one Windows SDK (for example, Windows 11 SDK 10.0.22621).
+
+.. _mac-dependency-instructions:
+
+macOS
+=====
+
+DFHack can officially be built on macOS only with GCC 4.8 or 7. Anything newer than 7
+will require you to perform extra steps to get DFHack to run (see `osx-new-gcc-notes`),
+and your build will likely not be redistributable.
+
+#. Download and unpack a copy of the latest DF
+#. Install Xcode from the Mac App Store
+
+#. Install the XCode Command Line Tools by running the following command::
+
+    xcode-select --install
+
+#. Install dependencies
+
+    It is recommended to use Homebrew instead of MacPorts, as it is generally
+    cleaner, quicker, and smarter. For example, installing MacPort's GCC will
+    install more than twice as many dependencies as Homebrew's will, and all in
+    both 32-bit and 64-bit variants. Homebrew also doesn't require constant use
+    of ``sudo``.
+
+    Using `Homebrew <https://brew.sh/>`_ (recommended)::
+
+        brew tap homebrew/versions
+        brew install git
+        brew install cmake
+        brew install ninja
+        brew install gcc@7
+
+    Using `MacPorts <https://www.macports.org>`_::
+
+        sudo port install gcc7 +universal cmake +universal git-core +universal ninja +universal
+
+    Macports will take some time - maybe hours.  At some point it may ask
+    you to install a Java environment; let it do so.
+
+#. Install Perl dependencies
+
+  * Using system Perl
+
+    * ``sudo cpan``
+
+      If this is the first time you've run cpan, you will need to go through the setup
+      process. Just stick with the defaults for everything and you'll be fine.
+
+      If you are running OS X 10.6 (Snow Leopard) or earlier, good luck!
+      You'll need to open a separate Terminal window and run::
+
+        sudo ln -s /usr/include/libxml2/libxml /usr/include/libxml
+
+    * ``install XML::LibXML``
+    * ``install XML::LibXSLT``
+
+  * In a separate, local Perl install
+
+    Rather than using system Perl, you might also want to consider
+    the Perl manager, `Perlbrew <https://perlbrew.pl>`_.
+
+    This manages Perl 5 locally under ``~/perl5/``, providing an easy
+    way to install Perl and run CPAN against it without ``sudo``.
+    It can maintain multiple Perl installs and being local has the
+    benefit of easy migration and insulation from OS issues and upgrades.
+
+    See https://perlbrew.pl/ for more details.
diff --git a/docs/dev/compile/Options.rst b/docs/dev/compile/Options.rst
new file mode 100644
index 000000000..b314e9db2
--- /dev/null
+++ b/docs/dev/compile/Options.rst
@@ -0,0 +1,153 @@
+.. _build-options:
+
+#############
+Build Options
+#############
+
+.. contents:: Typical Options
+  :local:
+  :depth: 1
+
+There are a variety of other settings which you can find in CMakeCache.txt in
+your build folder or by running ``ccmake`` (or another CMake GUI). Most
+DFHack-specific settings begin with ``BUILD_`` and control which parts of DFHack
+are built.
+
+Typical usage may look like::
+
+    # Plugin development with updated documentation
+    cmake ./ -G Ninja -B builds/debug-info/ -DCMAKE_INSTALL_PREFIX=<path to DF> -DCMAKE_BUILD_TYPE:string=RelWithDebInfo -DBUILD_DOCS:bool=ON -DBUILD_PLUGINS=1
+    # Core DFHack only
+    cmake ../ -G Ninja -DCMAKE_INSTALL_PREFIX=<path to DF> -DCMAKE_BUILD_TYPE:string=RelWithDebInfo -DBUILD_TESTS -DBUILD_DOCS:0 -DBUILD_PLUGINS=0
+
+.. admonition:: Modifying Build Options
+
+    You can typically run new cmake commands from your build directory to turn on/off options.
+    Of course the generator selection is not something you can change, but the rest are.
+
+    Additionally, you can edit the build settings in CMakeCache.txt. You also have cmake's
+    configuration utility ``ccmake``.
+
+Generator
+=========
+For the uninitiated, the generator is what allows cmake to, of course, generate
+visual studio solution & project files, a makefile, or anything else.
+Your selection of generator comes down to preference and availability.
+
+Visual Studio
+-------------
+To generate visual studio project files, you'll need to select a particular version of
+visual studio, and match that to your system's generator list viewed with ``cmake --help``
+
+example::
+
+    cmake .. -G "Visual Studio 17 2022"
+
+Ninja
+-----
+The generally preferred build system where available.
+
+example::
+
+    cmake .. -G Ninja
+
+Install Location
+================
+This is the location where DFHack will be installed.
+
+Variable: ``CMAKE_INSTALL_PREFIX``
+
+Usage::
+
+    cmake .. -DCMAKE_INSTALL_PREFIX=<path to df>
+
+The path to df will of course depend on your system. If the directory exists it is
+recommended to use ``~/.dwarffortress`` to avoid permission troubles.
+
+Build type
+==========
+This is the type of build you want. This controls what information about symbols and
+line numbers the debugger will have available to it.
+
+Variable: ``CMAKE_BUILD_TYPE``
+
+Usage::
+
+    cmake .. -DCMAKE_BUILD_TYPE:string=RelWithDebInfo
+
+Options:
+
+* Release
+* RelWithDebInfo
+
+Target architecture (32/64-bit)
+===============================
+You can set this if you need 32-bit binaries or are looking to be explicit about
+building 64-bit.
+
+Variable: ``DFHACK_BUILD_ARCH``
+
+Usage::
+
+    cmake .. -DDFHACK_BUILD_ARCH=32
+
+Options:
+
+* '32'
+* '64' (default option)
+
+Library
+=======
+This will only be useful if you're looking to avoid building the library core, as it builds by default.
+
+Variable: ``BUILD_LIBRARY``
+
+Usage::
+
+    cmake .. -DBUILD_LIBRARY:bool=OFF
+    cmake .. -DBUILD_LIBRARY=0
+
+Testing
+=======
+Regression testing will be arriving in the future, but for now there are only tests written in lua.
+
+Variables:
+
+* ``BUILD_TESTING`` (will build unit tests, in the future)
+* ``BUILD_TESTS`` (installs lua tests)
+
+Usage::
+
+    cmake .. -DBUILD_TESTS:bool=ON
+    cmake .. -DBUILD_TESTS=1
+
+Plugins
+=======
+If you're doing plugin development.
+
+Variable: ``BUILD_PLUGINS``
+
+Usage::
+
+    cmake .. -DBUILD_PLUGINS:bool=ON
+    cmake .. -DBUILD_PLUGINS=1
+
+.. _building-documentation:
+
+Documentation
+=============
+If you need to build documentation. Documentation can be built as HTML, and PDF,
+but there are also plain text files generated for in-game.
+
+Variable: ``BUILD_DOCS``
+
+Usage::
+
+    cmake .. -DBUILD_DOCS:bool=ON
+    cmake .. -DBUILD_DOCS=1
+
+
+The generated documentation is stored in ``docs/html`` and ``docs/text`` (respectively)
+in the root DFHack folder, and they will both be installed to ``hack/docs`` when you
+install DFHack. The html and txt files will intermingle, but will not interfere with
+one another.
diff --git a/docs/dev/compile/index.rst b/docs/dev/compile/index.rst
new file mode 100644
index 000000000..0504bd8fb
--- /dev/null
+++ b/docs/dev/compile/index.rst
@@ -0,0 +1,14 @@
+.. _building-dfhack-index:
+
+===============
+Building DFHack
+===============
+
+Those seeking to compile the source code for DFHack, and or plugins, can refer to the following help pages.
+
+.. toctree::
+   :maxdepth: 2
+
+   /docs/dev/compile/Dependencies
+   /docs/dev/compile/Compile
+   /docs/dev/compile/Options
diff --git a/docs/dev/index.rst b/docs/dev/index.rst
index 26d094ec8..01436033c 100644
--- a/docs/dev/index.rst
+++ b/docs/dev/index.rst
@@ -1,3 +1,5 @@
+
+
 ========================
 DFHack development guide
 ========================
@@ -8,7 +10,7 @@ These are pages relevant to people developing for DFHack.
    :maxdepth: 1
 
    /docs/dev/Dev-intro
-   /docs/dev/Compile
+   /docs/dev/compile/index
    /docs/dev/Contributing
    /docs/dev/Documentation
    /docs/api/index
diff --git a/docs/dev/overlay-dev-guide.rst b/docs/dev/overlay-dev-guide.rst
index bce623180..b5b6cf0e3 100644
--- a/docs/dev/overlay-dev-guide.rst
+++ b/docs/dev/overlay-dev-guide.rst
@@ -90,12 +90,19 @@ The ``overlay.OverlayWidget`` superclass defines the following class attributes:
     This will be filled in with the display name of your widget, in case you
     have multiple widgets with the same implementation but different
     configurations.
+- ``version``
+    You can set this to any string. If the version string of a loaded widget
+    does not match the saved settings for that widget, then the configuration
+    for the widget (position, enabled status) will be reset to defaults.
 - ``default_pos`` (default: ``{x=-2, y=-2}``)
     Override this attribute with your desired default widget position. See
     the `overlay` docs for information on what positive and negative numbers
     mean for the position. Players can change the widget position at any time
     via the `overlay position <overlay>` command, so don't assume that your
     widget will always be at the default position.
+- ``default_enabled`` (default: ``false``)
+    Override this attribute if the overlay should be enabled by default if it
+    does not already have a state stored in ``dfhack-config/overlay.json``.
 - ``viewscreens`` (default: ``{}``)
     The list of viewscreens that this widget should be associated with. When
     one of these viewscreens is on top of the viewscreen stack, your widget's
@@ -106,7 +113,11 @@ The ``overlay.OverlayWidget`` superclass defines the following class attributes:
     ``dwarfmode`` and the adventure mode map viewscreen would be
     ``dungeonmode``. If there is only one viewscreen that this widget is
     associated with, it can be specified as a string instead of a list of
-    strings with a single element.
+    strings with a single element. If you only want your widget to appear in
+    certain contexts, you can specify a focus path, in the same syntax as the
+    `keybinding` command. For example, ``dwarfmode/Info/CREATURES/CITIZEN`` will
+    ensure the overlay widget is only displayed when the "Citizens" subtab under
+    the "Units" panel is active.
 - ``hotspot`` (default: ``false``)
     If set to ``true``, your widget's ``overlay_onupdate`` function will be
     called whenever the `overlay` plugin's ``plugin_onupdate()`` function is
@@ -124,11 +135,10 @@ The ``overlay.OverlayWidget`` superclass defines the following class attributes:
     seconds) that your widget can take to react to changes in information and
     not annoy the player. Set to 0 to be called at the maximum rate. Be aware
     that running more often than you really need to will impact game FPS,
-    especially if your widget can run while the game is unpaused.
-- ``always_enabled`` (default: ``false``)
-    Set this to ``true`` if you don't want to let the user disable the widget.
-    This is useful for widgets that are controlled purely through their
-    triggers. See `gui/pathable` for an example.
+    especially if your widget can run while the game is unpaused. If you change
+    the value of this attribute dynamically, it may not be noticed until the
+    previous timeout expires. However, if you need a burst of high-frequency
+    updates, set it to ``0`` and it will be noticed immediately.
 
 Registering a widget with the overlay framework
 ***********************************************
@@ -147,8 +157,8 @@ declared like this::
 
 When the `overlay` plugin is enabled, it scans all plugins and scripts for
 this table and registers the widgets on your behalf. Plugin lua code is loaded
-with ``require()`` and script lua code is loaded with `reqscript`. If your
-widget is in a script, ensure your script can be
+with ``require()`` and script lua code is loaded with ``reqscript()``.
+If your widget is in a script, ensure your script can be
 `loaded as a module <reqscript>`, or else the widget will not be discoverable.
 The widget is enabled on load if it was enabled the last time the `overlay`
 plugin was loaded, and the widget's position is restored according to the state
@@ -170,7 +180,8 @@ script.
 Note that reloading a script does not clear its global environment. This is fine
 if you are changing existing functions or adding new ones. If you remove a
 global function or other variable from the source, though, it will stick around
-in your script's global environment until you restart DF.
+in your script's global environment until you restart DF or run
+`devel/clear-script-env`.
 
 Scripts
 *******
@@ -179,7 +190,7 @@ Scripts
 #. If the script is not in your `script-paths`, install your script (see the
    `modding-guide` for help setting up a dev environment so that you don't need
    to reinstall your scripts after every edit).
-#. Call ``:lua require('plugins.overlay').reload()`` to reload your overlay
+#. Call ``:lua require('plugins.overlay').rescan()`` to reload your overlay
    widget
 
 Plugins
@@ -190,7 +201,7 @@ Plugins
    :file:`hack/lua/plugins/`
 #. If you have changed the compiled plugin, `reload` it
 #. If you have changed the lua code, run ``:lua reload('plugins.mypluginname')``
-#. Call ``:lua require('plugins.overlay').reload()`` to reload your overlay
+#. Call ``:lua require('plugins.overlay').rescan()`` to reload your overlay
    widget
 
 Troubleshooting
@@ -201,10 +212,10 @@ check that:**
 
 #. ``OVERLAY_WIDGETS`` is declared, is global (not ``local``), and contains your
    widget class
-#. (if a script> your script is `declared as a module <reqscript>`
+#. (if a script) your script is `declared as a module <reqscript>`
    (``--@ module = true``) and it does not have side effects when loaded as a
    module (i.e. you check ``dfhack_flags.module`` and return before executing
-   any statements if the value is ``true``
+   any statements if the value is ``true``)
 #. your code does not have syntax errors -- run
    ``:lua ~reqscript('myscriptname')`` (if a script) or
    ``:lua ~require('plugins.mypluginname')`` (if a plugin) and make sure there
@@ -234,13 +245,17 @@ the :kbd:`Alt`:kbd:`Z` hotkey is hit::
     }
 
     function MessageWidget:init()
-        self.label = widgets.Label{text=''}
-        self:addviews{self.label}
+        self:addviews{
+            widgets.Label{
+                view_id='label',
+                text='',
+            },
+        }
     end
 
     function MessageWidget:overlay_onupdate()
         local text = getImportantMessage() -- defined in the host script/plugin
-        self.label:setText(text)
+        self.subviews.label:setText(text)
         self.frame.w = #text
     end
 
@@ -327,7 +342,7 @@ screen (by default, but the player can move it wherever).
 
     OVERLAY_WIDGETS = {menu=HotspotMenuWidget}
 
-    MenuScreen = defclass(MenuScreen, gui.Screen)
+    MenuScreen = defclass(MenuScreen, gui.ZScreen)
     MenuScreen.ATTRS{
         focus_path='hotspot/menu',
         hotspot_frame=DEFAULT_NIL,
@@ -342,11 +357,9 @@ screen (by default, but the player can move it wherever).
         -- ...
 
         self:addviews{
-            widgets.ResizingPanel{
-                autoarrange_subviews=true,
+            widgets.Window{
                 frame=frame,
-                frame_style=gui.GREY_LINE_FRAME,
-                frame_background=gui.CLEAR_PEN,
+                autoarrange_subviews=true,
                 subviews={
                     -- ...
                     },
@@ -354,15 +367,3 @@ screen (by default, but the player can move it wherever).
             },
         }
     end
-
-    function MenuScreen:onInput(keys)
-        if keys.LEAVESCREEN then
-            self:dismiss()
-            return true
-        end
-        return self:inputToSubviews(keys)
-    end
-
-    function MenuScreen:onRenderFrame(dc, rect)
-        self:renderParent()
-    end
diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst
deleted file mode 100644
index bcb7c77ec..000000000
--- a/docs/guides/examples-guide.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-.. _config-examples-guide:
-.. _dfhack-examples-guide:
-
-DFHack config file examples
-===========================
-
-The :source:`hack/examples <data/examples>` folder contains ready-to-use
-examples of various DFHack configuration files. You can use them by copying them
-to appropriate folders where DFHack and its plugins can find them (details
-below). You can use them unmodified, or you can customize them to better suit
-your preferences.
-
-The ``init/`` subfolder
------------------------
-
-The :source:`init/ <data/examples/init>` subfolder contains useful DFHack
-`init-files` that you can copy into your :file:`dfhack-config/init` folder --
-the same directory as ``dfhack.init``.
-
-.. _onMapLoad-dreamfort-init:
-
-:source:`onMapLoad_dreamfort.init <data/examples/init/onMapLoad_dreamfort.init>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This is the config file that comes with the `dreamfort` set of blueprints, but
-it is useful (and customizable) for any fort. It includes the following config:
-
-- Calls `ban-cooking` for items that have important alternate uses and should
-  not be cooked. This configuration is only set when a fortress is first
-  started, so later manual changes will not be overridden.
-- Automates calling of various fort maintenance scripts, like `cleanowned` and
-  `fix/stuckdoors`.
-- Keeps your manager orders intelligently ordered with `orders` ``sort`` so no
-  orders block other orders from ever getting completed.
-- Periodically enqueues orders to shear and milk shearable and milkable pets.
-- Sets up `autofarm` to grow 30 units of every crop, except for pig tails, which
-  is set to 150 units to support the textile industry.
-- Sets up `seedwatch` to protect 30 of every type of seed.
-- Configures `prioritize` to automatically boost the priority of important and
-  time-sensitive tasks that could otherwise get ignored in busy forts, like
-  hauling food, tanning hides, storing items in vehicles, pulling levers, and
-  removing constructions.
-- Optimizes `autobutcher` settings for raising geese, alpacas, sheep, llamas,
-  and pigs. Adds sensible defaults for all other animals, including dogs and
-  cats. There are instructions in the file for customizing the settings for
-  other combinations of animals. These settings are also only set when a
-  fortress is first started, so any later changes you make to autobutcher
-  settings won't be overridden.
-- Enables `automelt`, `tailor`, `zone`, `nestboxes`, and `autonestbox`.
diff --git a/docs/guides/index.rst b/docs/guides/index.rst
index 95f9ff32a..6660dfae5 100644
--- a/docs/guides/index.rst
+++ b/docs/guides/index.rst
@@ -8,7 +8,5 @@ These pages are detailed guides covering DFHack tools.
    :maxdepth: 1
 
    /docs/guides/modding-guide
-   /docs/guides/examples-guide
    /docs/guides/quickfort-library-guide
    /docs/guides/quickfort-user-guide
-   /docs/guides/quickfort-alias-guide
diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 9fe62bf6a..297e8482a 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -8,71 +8,132 @@ DFHack modding guide
 What is the difference between a script and a mod?
 --------------------------------------------------
 
-A script is a single file that can be run as a command in DFHack, like something
-that modifies or displays game data on request. A mod is something you install
-to get persistent behavioural changes in the game and/or add new content. Mods
-can contain and use scripts in addition to (or instead of) modifications to the
-DF game raws.
-
-DFHack scripts are written in Lua. If you don't already know Lua, there's a
-great primer at `lua.org <https://www.lua.org/pil/contents.html>`__.
+Well, sometimes there is no difference. A mod is anything you add to the game,
+which can be graphics overrides, content in the raws, DFHack scripts, any, or
+all. There are already resources out there for
+`raws modding <https://dwarffortresswiki.org/index.php/Modding>`__, so this
+guide will focus more on scripts, both standalone and as an extension to
+raws-based mods.
+
+A DFHack script is a Lua file that can be run as a command in
+DFHack. Scripts can do pretty much anything, from displaying information to
+enforcing new game mechanics. If you don't already know Lua, there's a great
+primer at `lua.org <https://www.lua.org/pil/contents.html>`__.
 
 Why not just mod the raws?
 --------------------------
 
 It depends on what you want to do. Some mods *are* better to do in just the
-raws. You don't need DFHack to add a new race or modify attributes, for example.
-However, DFHack scripts can do many things that you just can't do in the raws,
-like make a creature that trails smoke. Some things *could* be done in the raws,
-but writing a script is less hacky, easier to maintain, easier to extend, and is
-not prone to side-effects. A great example is adding a syndrome when a reaction
-is performed. If done in the raws, you have to create an exploding boulder to
-apply the syndrome. DFHack scripts can add the syndrome directly and with much
-more flexibility. In the end, complex mods will likely require a mix of raw
-modding and DFHack scripting.
+raws. You don't need DFHack to add a new race or modify attributes. However,
+DFHack scripts can do many things that you just can't do in the raws, like make
+a creature that trails smoke or launch a unit into the air when they are hit
+with a certain type of projectile. Some things *could* be done in the raws, but
+a script is better (e.g. easier to maintain, easier to extend, and/or not prone
+to side-effects). A great example is adding a syndrome when a reaction
+is performed. If done in the raws, you have to create an exploding boulder as
+an intermediary to apply the syndrome. DFHack scripts can add the syndrome
+directly and with much more flexibility. In the end, complex mods will likely
+require a mix of raw modding and DFHack scripting.
+
+The structure of a mod
+----------------------
+
+In the example below, we'll use a mod name of ``example-mod``. I'm sure your
+mods will have more creative names! Mods have a basic structure that looks like
+this::
+
+    info.txt
+    graphics/...
+    objects/...
+    blueprints/...
+    scripts_modactive/example-mod.lua
+    scripts_modactive/internal/example-mod/...
+    scripts_modinstalled/...
+    README.md (optional)
+
+Let's go through that line by line.
+
+- The :file:`info.txt` file contains metadata about your mod that DF will
+    display in-game. You can read more about this file in the
+    `Official DF Modding Guide <https://bay12games.com/dwarves/modding_guide.html>`__.
+- Modifications to the game raws (potentially with custom raw tokens) go in
+    the :file:`graphics/` and :file:`objects/` folders. You can read more about
+    the files that go in these directories on the :wiki:`Modding` wiki page.
+- Any `quickfort` blueprints included with your mod go in the
+    :file:`blueprints` folder. Note that your mod can *just* be blueprints and
+    nothing else if you like.
+- A control script in :file:`scripts_modactive/` directory that handles
+    system-level event hooks (e.g. reloading state when a world is loaded),
+    registering `overlays <overlay-dev-guide>`, and
+    `enabling/disabling <script-enable-api>` your mod. You can put other
+    scripts in this directory as well if you want them to appear as runnable
+    DFHack commands when your mod is active for the current world. Lua modules
+    that your main scripts use, but which don't need to be directly runnable by
+    the player, should go in a subdirectory under
+    :file:`scripts_modactive/internal/` so they don't show up in the DFHack
+    `launcher <gui/launcher>` command autocomplete lists.
+- Scripts that you want to be available before a world is loaded (i.e. on the
+    DF title screen) or that you want to be runnable in any world, regardless
+    of whether your mod is active, should go in the
+    :file:`scripts_modinstalled/` folder. You can also have an :file:`internal/`
+    subfolder in here for private modules if you like.
+- Finally, a :file:`README.md` file that has more information about your mod.
+    If you develop your mod using version control (recommended!), that
+    :file:`README.md` file can also serve as your git repository documentation.
+
+These files end up in a subdirectory under :file:`mods/` when players copy them
+in or install them from the
+`Steam Workshop <https://steamcommunity.com/app/975370/workshop/>`__, and in
+:file:`data/installed_mods/` when the mod is selected as "active" for the first
+time.
+
+What if I just want to distribute a simple script?
+--------------------------------------------------
+
+If your mod is just a script with no raws modifications, things get a bit
+simpler. All you need is::
+
+    info.txt
+    scripts_modinstalled/yourscript.lua
+    README.md (optional)
+
+Adding your script to the :file:`scripts_modinstalled/` folder will allow
+DFHack to find it and add your mod to the `script-paths`. Your script will be
+runnable from the title screen and in any loaded world, regardless of whether
+your mod is explicitly "active".
 
 A mod-maker's development environment
 -------------------------------------
 
-While you're writing your mod, you need a place to store your in-development
-scripts that will:
+Create a folder for development somewhere outside your Dwarf Fortress
+installation directory (e.g. ``/path/to/mymods/``). If you work on multiple
+mods, you might want to make a subdirectory for each mod.
 
-- be directly runnable by DFHack
-- not get lost when you upgrade DFHack
+If you have changes to the raws, you'll have to copy them into DF's
+``data/installed_mods/`` folder to have them take effect, but you can set
+things up so that scripts are run directly from your dev directory. This way,
+you can edit your scripts and have the changes available in the game
+immediately: no copying, no restarting.
 
-The recommended approach is to create a directory somewhere outside of your DF
-installation (let's call it "/path/to/own-scripts") and do all your script
-development in there.
+How does this magic work? Just add a line like this to your
+``dfhack-config/script-paths.txt`` file::
 
-Inside your DF installation folder, there is a file named
-:file:`dfhack-config/script-paths.txt`. If you add a line like this to that
-file::
-
-    +/path/to/own-scripts
+    +/path/to/mymods/example-mod/scripts_modinstalled
 
 Then that directory will be searched when you run DFHack commands from inside
 the game. The ``+`` at the front of the path means to search that directory
-first, before any other script directory (like :file:`hack/scripts` or
-:file:`raw/scripts`). That way, your latest changes will always be used instead
-of older copies that you may have installed in a DF directory.
-
-For scripts with the same name, the `order of precedence <script-paths>` will
-be:
-
-1. ``own-scripts/``
-2. ``dfhack-config/scripts/``
-3. ``data/save/*/raw/scripts/``
-4. ``raw/scripts/``
-5. ``hack/scripts/``
+first, before any other script directory (like :file:`hack/scripts` or other
+versions of your mod in the DF mod folders).
 
 The structure of the game
 -------------------------
 
-"The game" is in the global variable `df <lua-df>`. The game's memory can be
-found in ``df.global``, containing things like the list of all items, whether to
-reindex pathfinding, et cetera. Also relevant to us in ``df`` are the various
-types found in the game, e.g. ``df.pronoun_type`` which we will be using in this
-guide. We'll explore more of the game structures below.
+"The game" is in the global variable `df <lua-df>`. Most of the information
+relevant to a script is found in ``df.global.world``, which contains things
+like the list of all items, whether to reindex pathfinding, et cetera. Also
+relevant to us are the various data types found in the game, e.g.
+``df.pronoun_type`` which we will be using in this guide. We'll explore more of
+the game structures below.
 
 Your first script
 -----------------
@@ -84,8 +145,8 @@ First line, we get the unit::
 
     local unit = dfhack.gui.getSelectedUnit()
 
-If no unit is selected, an error message will be printed (which can be silenced
-by passing ``true`` to ``getSelectedUnit``) and ``unit`` will be ``nil``.
+If no unit is selected, ``unit`` will be ``nil`` and an error message will be
+printed (which can be silenced by passing ``true`` to ``getSelectedUnit``).
 
 If ``unit`` is ``nil``, we don't want the script to run anymore::
 
@@ -95,33 +156,32 @@ If ``unit`` is ``nil``, we don't want the script to run anymore::
 
 Now, the field ``sex`` in a unit is an integer, but each integer corresponds to
 a string value ("it", "she", or "he"). We get this value by indexing the
-bidirectional map ``df.pronoun_type``. Indexing the other way, incidentally,
-with one of the strings, will yield its corresponding number. So::
+bidirectional map ``df.pronoun_type``. Indexing the other way, with one of the
+strings, will yield its corresponding number. So::
 
     local pronounTypeString = df.pronoun_type[unit.sex]
     print(pronounTypeString)
 
-Simple. Save this as a Lua file in your own scripts directory and run it as
-shown before when a unit is selected in the Dwarf Fortress UI.
+Simple. Save this as a Lua file in your own scripts directory and run it from
+`gui/launcher` when a unit is selected in the Dwarf Fortress UI.
 
-Exploring DF structures
------------------------
+Exploring DF state
+------------------
 
 So how could you have known about the field and type we just used? Well, there
 are two main tools for discovering the various fields in the game's data
 structures. The first is the ``df-structures``
 `repository <https://github.com/DFHack/df-structures>`__ that contains XML files
-describing the contents of the game's structures. These are complete, but
+describing the layouts of the game's structures. These are complete, but
 difficult to read (for a human). The second option is the `gui/gm-editor`
-script, an interactive data explorer. You can run the script while objects like
-units are selected to view the data within them. You can also run
-``gui/gm-editor scr`` to view the data for the current screen. Press :kbd:`?`
-while the script is active to view help.
+interface, an interactive data explorer. You can run the script while objects
+like units are selected to view the data within them. Press :kbd:`?` while the
+script is active to view help.
 
 Familiarising yourself with the many structs of the game will help with ideas
 immensely, and you can always ask for help in the `right places <support>`.
 
-Detecting triggers
+Reacting to events
 ------------------
 
 The common method for injecting new behaviour into the game is to define a
@@ -131,7 +191,7 @@ provides two libraries for this, ``repeat-util`` and `eventful <eventful-api>`.
 frames (paused or unpaused), ticks (unpaused), in-game days, months, or years.
 If you need to be aware the instant something happens, you'll need to run a
 check once a tick. Be careful not to do this gratuitously, though, since
-running that often can slow down the game!
+running callbacks too often can slow down the game!
 
 ``eventful``, on the other hand, is much more performance-friendly since it will
 only call your callback when a relevant event happens, like a reaction or job
@@ -328,7 +388,8 @@ Then, let's make a ``repeat-util`` callback for once a tick::
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()
 
 Let's iterate over every active unit, and for every unit, iterate over their
-worn items to calculate how much we are going to take from their on-foot movement timers::
+worn items to calculate how much we are going to take from their on-foot
+movement timers::
 
     for _, unit in ipairs(df.global.world.units.active) do
         local amount = 0
@@ -342,82 +403,89 @@ worn items to calculate how much we are going to take from their on-foot movemen
         end
         -- Subtract amount from on-foot movement timers if not on ground
         if not unit.flags1.on_ground then
-            dfhack.units.subtractActionTimers(unit, amount, df.unit_action_type_group.MovementFeet)
+            dfhack.units.subtractActionTimers(unit, amount,
+                    df.unit_action_type_group.MovementFeet)
         end
     end
 
-The structure of a full mod
----------------------------
-
-For reference, `Tachy Guns <https://www.github.com/wolfboyft/tachy-guns>`__ is a
-full mod that conforms to this guide.
-
-Create a folder for mod projects somewhere outside your Dwarf Fortress
-installation directory (e.g. ``/path/to/mymods/``) and use your mod IDs as the
-names for the mod folders within it. In the example below, we'll use a mod ID of
-``example-mod``. I'm sure your mods will have more creative names! The
-``example-mod`` mod will be developed in the ``/path/to/mymods/example-mod/``
-directory and has a basic structure that looks like this::
-
-    raw/init.d/example-mod.lua
-    raw/objects/...
-    raw/scripts/example-mod.lua
-    raw/scripts/example-mod/...
-    README.md
+Putting it all together
+-----------------------
 
-Let's go through that line by line.
+Ok, you're all set up! Now, let's take a look at an example
+``scripts_modinstalled/example-mod.lua`` file::
 
-* A short (one-line) script in ``raw/init.d/`` to initialise your
-  mod when a save is loaded.
-* Modifications to the game raws (potentially with custom raw tokens) go in
-  ``raw/objects/``.
-* A control script in ``raw/scripts/`` that handles enabling and disabling your
-  mod.
-* A subfolder for your mod under ``raw/scripts/`` will contain all the internal
-  scripts and/or modules used by your mod.
+    -- main file for example-mod
 
-It is a good idea to use a version control system to organize changes to your
-mod code. You can create a separate Git repository for each of your mods. The
-``README.md`` file will be your mod help text when people browse to your online
-repository.
+    -- these lines indicate that the script supports the "enable"
+    -- API so you can start it by running "enable example-mod" and
+    -- stop it by running "disable example-mod"
+    --@module = true
+    --@enable = true
 
-Unless you want to install your ``raw/`` folder into your DF game folder every
-time you make a change to your scripts, you should add your development scripts
-directory to your script paths in ``dfhack-config/script-paths.txt``::
+    -- this is the help text that will appear in `help` and
+    -- `gui/launcher`. see possible tags here:
+    -- https://docs.dfhack.org/en/latest/docs/Tags.html
+    --[====[
+    example-mod
+    ===========
 
-    +/path/to/mymods/example-mod/raw/scripts/
+    Tags: fort | gameplay
 
-Ok, you're all set up! Now, let's take a look at an example
-``raw/scripts/example-mod.lua`` file::
+    Short one-sentence description ...
 
-    -- main setup and teardown for example-mod
-    -- this next line indicates that the script supports the "enable"
-    -- API so you can start it by running "enable example-mod" and stop
-    -- it by running "disable example-mod"
-    --@ enable = true
+    Longer description ...
 
-    local usage = [[
     Usage
     -----
 
         enable example-mod
         disable example-mod
-    ]]
+    ]====]
+
     local repeatUtil = require('repeat-util')
     local eventful = require('plugins.eventful')
 
     -- you can reference global values or functions declared in any of
     -- your internal scripts
-    local moduleA = reqscript('example-mod/module-a')
-    local moduleB = reqscript('example-mod/module-b')
-    local moduleC = reqscript('example-mod/module-c')
-    local moduleD = reqscript('example-mod/module-d')
+    local moduleA = reqscript('internal/example-mod/module-a')
+    local moduleB = reqscript('internal/example-mod/module-b')
+    local moduleC = reqscript('internal/example-mod/module-c')
+    local moduleD = reqscript('internal/example-mod/module-d')
+
+    local GLOBAL_KEY = 'example-mod'
 
     enabled = enabled or false
-    local modId = 'example-mod'
+
+    function isEnabled()
+        -- this function is for the enabled API, the script won't show up on the
+        -- control panel without it
+        return enabled
+    end
+
+    dfhack.onStateChange[GLOBAL_KEY] = function(sc)
+        if sc == SC_MAP_UNLOADED then
+            dfhack.run_command('disable', 'example-mod')
+
+            -- ensure our mod doesn't try to enable itself when a different
+            -- world is loaded where we are *not* active
+            dfhack.onStateChange[GLOBAL_KEY] = nil
+
+            return
+        end
+
+        if sc ~= SC_MAP_LOADED or df.global.gamemode ~= df.game_mode.DWARF then
+            return
+        end
+
+        dfhack.run_command('enable', 'example-mod')
+    end
+
+    if dfhack_flags.module then
+        return
+    end
 
     if not dfhack_flags.enable then
-        print(usage)
+        print(dfhack.script_help())
         print()
         print(('Example mod is currently '):format(
                 enabled and 'enabled' or 'disabled'))
@@ -473,23 +541,17 @@ Ok, you're all set up! Now, let's take a look at an example
         enabled = false
     end
 
-You can call ``enable example-mod`` and ``disable example-mod`` yourself while
-developing, but for end users you can start your mod automatically from
-``raw/init.d/example-mod.lua``::
-
-    dfhack.run_command('enable example-mod')
-
-Inside ``raw/scripts/example-mod/module-a.lua`` you could have code like this::
+Inside ``scripts_modinstalled/internal/example-mod/module-a.lua`` you could
+have code like this::
 
     --@ module = true
-    -- The above line is required for reqscript to work
 
     function onLoad() -- global variables are exported
         -- do initialization here
     end
 
-    -- this is an internal function: local functions/variables
-    -- are not exported
+    -- this is a local function: local functions/variables
+    -- are not accessible to other scripts.
     local function usedByOnTick(unit)
         -- ...
     end
@@ -500,6 +562,6 @@ Inside ``raw/scripts/example-mod/module-a.lua`` you could have code like this::
         end
     end
 
-The `reqscript <reqscript>` function reloads scripts that have changed, so you can modify
-your scripts while DF is running and just disable/enable your mod to load the
-changes into your ongoing game!
+The `reqscript <reqscript>` function reloads scripts that have changed, so you
+can modify your scripts while DF is running and just disable/enable your mod to
+load the changes into your ongoing game!
diff --git a/docs/guides/quickfort-alias-guide.rst b/docs/guides/quickfort-alias-guide.rst
deleted file mode 100644
index a89e6f338..000000000
--- a/docs/guides/quickfort-alias-guide.rst
+++ /dev/null
@@ -1,875 +0,0 @@
-.. _quickfort-alias-guide:
-
-Quickfort keystroke alias reference
-===================================
-
-Aliases allow you to use simple words to represent complicated key sequences
-when configuring buildings and stockpiles in quickfort ``#query`` and
-``#config`` blueprints.
-
-For example, say you have the following ``#build`` and ``#place`` blueprints::
-
-    #build masonry workshop
-    ~, ~,~,`,`,`
-    ~,wm,~,`,`,`
-    ~, ~,~,`,`,`
-
-    #place stockpile for mason
-    ~,~,~,s,s,s
-    ~,~,~,s,s,s
-    ~,~,~,s,s,s
-
-and you want to configure the stockpile to hold only non-economic ("other")
-stone and to give to the adjacent mason workshop. You could write the
-key sequences directly::
-
-    #query configure stockpile with expanded key sequences
-    ~,~,~,s{Down 5}deb{Right}{Down 2}p^,`,`
-    ~,~,~,g{Left 2}&,                   `,`
-    ~,~,~,`,                            `,`
-
-or you could use aliases::
-
-    #query configure stockpile with aliases
-    ~,~,~,otherstone,`,`
-    ~,~,~,give2left, `,`
-    ~,~,~,`,         `,`
-
-If the stockpile had only a single tile, you could also replay both aliases in
-a single cell::
-
-    #query configure mason with multiple aliases in one cell
-    ~,~,~,{otherstone}{give2left},`,`
-    ~,~,~,`,                      `,`
-    ~,~,~,`,                      `,`
-
-With aliases, blueprints are much easier to read and understand. They also
-save you from having to copy the same long key sequences everywhere.
-
-Alias definition files
-----------------------
-
-DFHack comes with a library of aliases for you to use that are always
-available when you run a ``#query`` blueprint. Many blueprints can be built
-with just those aliases. This "standard alias library" is stored in
-:source:`data/quickfort/aliases-common.txt` (installed under the ``hack`` folder
-in your DFHack installation). The aliases in that file are described at the
-`bottom of this document <quickfort-alias-library>`.
-
-Please do not edit the aliases in the standard library directly. The file will
-get overwritten when DFHack is updated and you'll lose your changes. Instead,
-add your custom aliases to :source:`dfhack-config/quickfort/aliases.txt` or
-directly to your blueprints in an `#aliases <quickfort-aliases-blueprints>`
-section. Your custom alias definitions take precedence over any definitions in
-the standard library.
-
-Alias syntax and usage
-----------------------
-
-The syntax for defining aliases is::
-
-    aliasname: expansion
-
-Where ``aliasname`` is at least two letters or digits long (dashes and
-underscores are also allowed) and ``expansion`` is whatever you would type
-into the DF UI.
-
-You use an alias by typing its name into a ``#query`` blueprint cell where you
-want it to be applied. You can use an alias by itself or as part of a larger
-sequence, potentially with other aliases. If the alias is the only text in the
-cell, the alias name is matched and its expansion is used. If the alias has
-other keys before or after it, the alias name must be surrounded in curly
-brackets (:kbd:`{` and :kbd:`}`). An alias can be surrounded in curly brackets
-even if it is the only text in the cell, it just isn't necessary. For example,
-the following blueprint uses the ``aliasname`` alias by itself in the first
-two rows and uses it as part of a longer sequence in the third row::
-
-    #query apply alias 'aliasname' in three different ways
-    aliasname
-    {aliasname}
-    literaltext{aliasname}literaltext
-
-For a more concrete example of an alias definition, a simple alias that
-configures a stockpile to have no bins (:kbd:`C`) and no barrels (:kbd:`E`)
-assigned to it would look like this::
-
-    nocontainers: CE
-
-The alias definition can also contain references to other aliases by including
-the alias names in curly brackets. For example, ``nocontainers`` could be
-equivalently defined like this::
-
-    nobins: C
-    nobarrels: E
-    nocontainers: {nobins}{nobarrels}
-
-Aliases used in alias definitions *must* be surrounded by curly brackets, even
-if they are the only text in the definition::
-
-    alias1: text1
-    alias2: alias1
-    alias3: {alias1}
-
-Here, ``alias1`` and ``alias3`` expand to ``text1``, but ``alias2`` expands to
-the literal text ``alias1``.
-
-Keycodes
-~~~~~~~~
-
-Non-printable characters, like the arrow keys, are represented by their
-keycode name and are also surrounded by curly brackets, like ``{Right}`` or
-``{Enter}``. Keycodes are used exactly like aliases -- they just have special
-expansions that you wouldn't be able to write yourself. In order to avoid
-naming conflicts between aliases and keycodes, the convention is to start
-aliases with a lowercase letter.
-
-Any keycode name from the DF interface definition file
-(data/init/interface.txt) is valid, but only a few keycodes are actually
-useful for blueprints::
-
-    Up
-    Down
-    Left
-    Right
-    Enter
-    ESC
-    Backspace
-    Space
-    Tab
-
-There is also one pseudo-keycode that quickfort recognizes::
-
-    Empty
-
-which has an empty expansion. It is primarily useful for defining blank default values for `Sub-aliases`_.
-
-Repetitions
-~~~~~~~~~~~
-
-Anything enclosed within curly brackets can also have a number, indicating how
-many times that alias or keycode should be repeated. For example:
-``{togglesequence 9}`` or ``{Down 5}`` will repeat the ``togglesequence``
-alias nine times and the ``Down`` keycode five times, respectively.
-
-Modifier keys
-~~~~~~~~~~~~~
-
-Ctrl, Alt, and Shift modifiers can be specified for the next key by adding
-them into the key sequence. For example, Alt-h is written as ``{Alt}h``.
-
-Shorthand characters
-~~~~~~~~~~~~~~~~~~~~
-
-Some frequently-used keycodes are assigned shorthand characters. Think of them
-as single-character aliases that don't need to be surrounded in curly
-brackets::
-
-    &   expands to {Enter}
-    @   expands to {Shift}{Enter}
-    ~   expands to {Alt}
-    !   expands to {Ctrl}
-    ^   expands to {ESC}
-
-If you need literal versions of the shorthand characters, surround them in
-curly brackets, for example: use ``{!}`` for a literal exclamation point.
-
-Built-in aliases
-~~~~~~~~~~~~~~~~
-
-Most aliases that come with DFHack are in ``aliases-common.txt``, but there is
-one alias built into the code for the common shorthand for "make room"::
-
-    r+  expands to r+{Enter}
-
-This needs special code support since ``+`` can't normally be used in alias
-names. You can use it just like any other alias, either by itself in a cell
-(``r+``) or surrounded in curly brackets (``{r+}``).
-
-Sub-aliases
-~~~~~~~~~~~
-
-You can specify sub-aliases that will only be defined while the current alias
-is being resolved. This is useful for "injecting" custom behavior into the
-middle of a larger alias. As a simple example, the ``givename`` alias is defined
-like this::
-
-    givename: !n{name}&
-
-Note the use of the ``name`` alias inside of the ``givename`` expansion. In your
-``#query`` blueprint, you could write something like this, say, while over your
-main drawbridge::
-
-    {givename name="Front Gate"}
-
-The value that you give the sub-alias ``name`` will be used when the
-``givename`` alias is expanded. Without sub-aliases, we'd have to define
-``givename`` like this::
-
-    givenameprefix: !n
-    givenamesuffix: &
-
-and use it like this::
-
-    {givenameprefix}Front Gate{givenamesuffix}
-
-which is more difficult to write and more difficult to understand.
-
-A handy technique is to define an alias with some sort of default
-behavior and then use sub-aliases to override that behavior as necessary. For
-example, here is a simplified version of the standard ``quantum`` alias that
-sets up quantum stockpiles::
-
-    quantum_enable: {enableanimals}{enablefood}{enablefurniture}...
-    quantum: {linksonly}{nocontainers}{quantum_enable}
-
-You can use the default behavior of ``quantum_enable`` by just using the
-``quantum`` alias by itself. But you can override ``quantum_enable`` to just
-enable furniture for some specific stockpile like this::
-
-    {quantum quantum_enable={enablefurniture}}
-
-If an alias uses a sub-alias in its expansion, but the sub-alias is not defined
-when the alias is used, quickfort will halt the ``#query`` blueprint with an
-error. If you want your aliases to work regardless of whether sub-aliases are
-defined, then you must define them with default values like ``quantum_enable``
-above. If a default value should be blank, like the ``name`` sub-alias used by
-the ``givename`` alias above, define it with the ``{Empty}`` pesudo-keycode::
-
-    name: {Empty}
-
-Sub-aliases must be in one of the following formats::
-
-    subaliasname=keyswithnospaces
-    subaliasname="keys with spaces or {aliases}"
-    subaliasname={singlealias}
-
-If you specify both a sub-alias and a number of repetitions, the number for
-repetitions goes last, right before the :kbd:`}`::
-
-    {alias subaliasname=value repetitions}
-
-Beyond query mode
------------------
-``#query`` blueprints normally do things in DF :kbd:`q`\uery mode, but nobody
-said that we have to *stay* in query mode. ``#query`` blueprints send
-arbitrary key sequences to Dwarf Fortress. Anything you can do by typing keys
-into DF, you can do in a ``#query`` blueprint. It is absolutely fine to
-temporarily exit out of query mode, go into, say, hauling or zone or hotkey
-mode, and do whatever needs to be done.
-
-You just have to make certain to exit out of that alternate mode and get back
-into :kbd:`q`\uery mode at the end of the key sequence. That way quickfort can
-continue on configuring the next tile -- a tile configuration that assumes the
-game is still in query mode.
-
-For example, here is the standard library alias for giving a name to a zone::
-
-    namezone: ^i{givename}^q
-
-The first :kbd:`\^` exits out of query mode. Then :kbd:`i` enters zones mode.
-We then reuse the standard alias for giving something a name. Finally, we exit
-out of zones mode with another :kbd:`\^` and return to :kbd:`q`\uery mode.
-
-.. _quickfort-alias-library:
-
-The DFHack standard alias library
----------------------------------
-
-DFHack comes with many useful aliases for you to use in your blueprints. Many
-blueprints can be built with just these aliases alone, with no custom aliases
-required.
-
-This section goes through all aliases provided by the DFHack standard alias
-library, discussing their intended usage and detailing sub-aliases that you
-can define to customize their behavior.
-
-If you do define your own custom aliases in
-``dfhack-config/quickfort/aliases.txt``, try to build on library alias
-components. For example, if you create an alias to modify particular furniture
-stockpile settings, start your alias with ``{furnitureprefix}`` instead of
-``s{Down 2}``. Using library prefixes will allow library sub-aliases to work
-with your aliases just like they do with library aliases. In this case, using
-``{furnitureprefix}`` will allow your stockpile customization alias to work
-with both stockpiles and hauling routes.
-
-Note that some aliases use the DFHack-provided search prompts. If you get errors
-while running ``#query`` blueprints, ensure the DFHack `search-plugin` plugin is
-enabled.
-
-Naming aliases
-~~~~~~~~~~~~~~
-
-These aliases give descriptive names to workshops, levers, stockpiles, zones,
-etc. Dwarf Fortress building, stockpile, and zone names have a maximum length
-of 20 characters.
-
-========  ===========
-Alias     Sub-aliases
-========  ===========
-givename  name
-namezone  name
-========  ===========
-
-``givename`` works anywhere you can hit Ctrl-n to customize a name, like when
-the cursor is over buildings and stockpiles. Example::
-
-    #place
-    f(10x2)
-
-    #query
-    {booze}{givename name=booze}
-
-``namezone`` is intended to be used when over an activity zone. It includes
-commands to get into zones mode, set the zone name, and get back to query
-mode. Example::
-
-    #zone
-    n(2x2)
-
-    #query
-    {namezone name="guard dog pen"}
-
-Quantum stockpile aliases
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-These aliases make it easy to create :wiki:`minecart stop-based quantum stockpiles <Quantum_stockpile#The_Minecart_Stop>`.
-
-+----------------------+------------------+
-| Alias                | Sub-aliases      |
-+======================+==================+
-| quantum              | | name           |
-|                      | | quantum_enable |
-+----------------------+------------------+
-| quantumstopfromnorth | | name           |
-+----------------------+ | stop_name      |
-| quantumstopfromsouth | | route_enable   |
-+----------------------+                  |
-| quantumstopfromeast  |                  |
-+----------------------+                  |
-| quantumstopfromwest  |                  |
-+----------------------+------------------+
-| sp_link              | | move           |
-|                      | | move_back      |
-+----------------------+------------------+
-| quantumstop          | | name           |
-|                      | | stop_name      |
-|                      | | route_enable   |
-|                      | | move           |
-|                      | | move_back      |
-|                      | | sp_links       |
-+----------------------+------------------+
-
-The idea is to use a minecart on a track stop to dump an infinite number of
-items into a receiving "quantum" stockpile, which significantly simplifies
-stockpile management. These aliases configure the quantum stockpile and
-hauling route that make it all work. Here is a complete example for quantum
-stockpiling weapons, armor, and ammunition. It has a 3x1 feeder stockpile on
-the bottom (South), the trackstop in the center, and the quantum stockpile on
-the top (North). Note that the feeder stockpile is the only stockpile that
-needs to be configured to control which types of items end up in the quantum
-stockpile. By default, the hauling route and quantum stockpile itself simply
-accept whatever is put into them.
-
-::
-
-    #place
-     ,c
-     ,
-    pdz(3x1)
-
-    #build
-     ,
-     ,trackstopN
-
-    #query message(remember to assign a minecart to the new route)
-     ,quantum
-     ,quantumstopfromsouth
-    nocontainers
-
-The ``quantum`` alias configures a 1x1 stockpile to be a quantum stockpile. It
-bans all containers and prevents the stockpile from being manually filled. By
-default, it also enables storage of all item categories (except corpses and
-refuse), so it doesn't really matter what letter you use to place the
-stockpile. :wiki:`Refuse` is excluded by default since otherwise clothes and
-armor in the quantum stockpile would rot away. If you want corpses or bones in
-your quantum stockpile, use :kbd:`y` and/or :kbd:`r` to place the stockpile
-and the ``quantum`` alias will just enable the remaining types. If you *do*
-enable refuse in your quantum stockpile, be sure you avoid putting useful
-clothes or armor in there!
-
-The ``quantumstopfromsouth`` alias is run over the track stop and configures
-the hauling route, again, allowing all item categories into the minecart by
-default so any item that can go into the feeder stockpile can then be placed
-in the minecart. It also links the hauling route with the feeder stockpile to
-the South.The track stop does not need to be fully constructed before the
-``#query`` blueprint is run, but the feeder stockpile needs to exist so we can
-link to it. This means that the three blueprints above can be run one right
-after another, without any dwarven labor in between them, and the quantum
-stockpile will work properly.
-
-Finally, the ``nocontainers`` alias simply configures the feeder stockpile to
-not have any containers (which would just get in the way here). If we wanted
-to be more specific about what item types we want in the quantum stockpile, we
-could configure the feeder stockpile further, for example with standard
-`stockpile adjustment aliases <quickfort-stockpile-aliases>`.
-
-After the blueprints are run, the last step is to manually assign a minecart
-to the newly-defined hauling route.
-
-You can define sub-aliases to customize how these aliases work, for example to
-have fine-grained control over what item types are enabled for the route and
-quantum stockpile. We'll go over those options below, but first, here is an
-example for how to just give names to everything::
-
-    #query message(remember to assign a minecart to the new route)
-     ,{quantum name="armory quantum"}
-     ,{quantumstopfromsouth name="Armory quantum" stop_name="Armory quantum stop"}{givename name="armory dumper"}
-    {givename name="armory feeder"}
-
-All ``name`` sub-aliases are completely optional, of course. Keep in mind that
-hauling route names have a maximum length of 22 characters, hauling route stop
-names have a maximum length of 21 characters, and all other names have a
-maximum length of 20 characters.
-
-If you want to be absolutely certain that nothing ends up in your quantum
-stockpile other than what you've configured in the feeder stockpile, you can
-set the ``quantum_enable`` sub-alias for the ``quantum`` alias. This can
-prevent, for example, somebody's knocked-out tooth from being considered part
-of your furniture quantum stockpile when it happened to land on it during a
-fistfight::
-
-    #query
-    {quantum name="furniture quantum" quantum_enable={enablefurniture}}
-
-You can have similar control over the hauling route if you need to be more
-selective about what item types are allowed into the minecart. If you have
-multiple specialized quantum stockpiles that use a common feeder pile, for
-example, you can set the ``route_enable`` sub-alias::
-
-    #query
-    {quantumstopfromsouth name="Steel bar quantum" route_enable="{enablebars}{steelbars}"}
-
-Any of the `stockpile configuration aliases <quickfort-stockpile-aliases>` can
-be used for either the ``quantum_enable`` or ``route_enable`` sub-aliases.
-Experienced Dwarf Fortress players may be wondering how the same aliases can
-work in both contexts since the keys for entering the configuration screen
-differ. Fear not! There is some sub-alias magic at work here. If you define
-your own stockpile configuration aliases, you can use the magic yourself by
-building your aliases on the ``*prefix`` aliases described later in this
-guide.
-
-Finally, the ``quantumstop`` alias is a more general version of the simpler
-``quantumstopfrom*`` aliases. The ``quantumstopfrom*`` aliases assume that a
-single feeder stockpile is orthogonally adjacent to your track stop (which is
-how most people set them up). If your feeder stockpile is somewhere further
-away, or you have multiple feeder stockpiles to link, you can use the
-``quantumstop`` alias directly. In addition to the sub-aliases used in the
-``quantumstopfrom*`` alias, you can define the ``move`` and ``move_back``
-sub-aliases, which let you specify the cursor keys required to move from the
-track stop to the (single) feeder stockpile and back again, respectively::
-
-    #query
-    {quantumstop move="{Right 2}{Up}" move_back="{Down}{Left 2}"}
-
-If you have multiple stockpiles to link, define the ``sp_links`` sub-alias,
-which can chain several ``sp_link`` aliases together, each with their own
-movement configuration::
-
-    #query
-    {quantumstop sp_links="{sp_link move=""{Right}{Up}"" move_back=""{Down}{Left}""}{sp_link move=""{Right}{Down}"" move_back=""{Up}{Left}""}"}
-
-Note the doubled quotes for quoted elements that are within the outer quotes.
-
-Farm plots
-~~~~~~~~~~
-
-Sets a farm plot to grow the first or last type of seed in the list of
-available seeds for all four seasons. The last seed is usually Plump helmet
-spawn, suitable for post-embark. But if you only have one seed type, that'll
-be grown instead.
-
-+------------------+
-| Alias            |
-+==================+
-| growlastcropall  |
-+------------------+
-| growfirstcropall |
-+------------------+
-
-Instead of these aliases, though, it might be more useful to use the DFHack
-`autofarm` plugin.
-
-Stockpile configuration utility aliases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-================  ===========
-Alias             Sub-aliases
-================  ===========
-linksonly
-maxbins
-maxbarrels
-nobins
-nobarrels
-nocontainers
-give2up
-give2down
-give2left
-give2right
-give10up
-give10down
-give10left
-give10right
-give              move
-togglesequence
-togglesequence2
-forbidsearch      search
-permitsearch      search
-togglesearch      search
-masterworkonly    prefix
-artifactonly      prefix
-togglemasterwork  prefix
-toggleartifact    prefix
-================  ===========
-
-``linksonly``, ``maxbins``, ``maxbarrels``, ``nobins``, ``nobarrels``, and
-``nocontainers`` set the named basic properties on stockpiles. ``nocontainers``
-sets bins and barrels to 0, but does not affect wheelbarrows since the hotkeys
-for changing the number of wheelbarrows depend on whether you have DFHack's
-``tweak max-wheelbarrow`` enabled. It is better to set the number of
-wheelbarrows via the `quickfort` ``stockpiles_max_wheelbarrows`` setting (set to
-``0`` by default), or explicitly when you define the stockpile in the ``#place``
-blueprint.
-
-The ``give*`` aliases set a stockpile to give to a workshop or another
-stockpile located at the indicated number of tiles in the indicated direction
-from the current tile. For example, here we use the ``give2down`` alias to
-connect an ``otherstone`` stockpile with a mason workshop::
-
-    #place
-    s,s,s,s,s
-    s, , , ,s
-    s, , , ,s
-    s, , , ,s
-    s,s,s,s,s
-
-    #build
-    `,`,`,`,`
-    `, , , ,`
-    `, ,wm,,`
-    `, , , ,`
-    `,`,`,`,`
-
-    #query
-     , ,give2down
-    otherstone
-
-and here is a generic stone stockpile that gives to a stockpile that only
-takes flux::
-
-    #place
-    s(10x1)
-    s(10x10)
-
-    #query
-    flux
-    ,
-    give2up
-
-If you want to give to some other tile that is not already covered by the
-``give2*`` or ``give10*`` aliases, you can use the generic ``give`` alias and
-specify the movement keys yourself in the ``move`` sub-alias. Here is how to
-give to a stockpile or workshop one z-level above, 9 tiles to the left, and 14
-tiles down::
-
-    #query
-    {give move="<{Left 9}{Down 14}"}
-
-``togglesequence`` and ``togglesequence2`` send ``{Down}{Enter}`` or
-``{Down 2}{Enter}`` to toggle adjacent (or alternating) items in a list. This
-is useful when toggling a bunch of related item types in the stockpile config.
-For example, the ``dye`` alias in the standard alias library needs to select
-four adjacent items::
-
-    dye: {foodprefix}b{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
-
-``forbidsearch``, ``permitsearch``, and ``togglesearch`` use the DFHack
-`search-plugin` plugin to forbid or permit a filtered list, or toggle the first
-(or only) item in the list. Specify the search string in the ``search``
-sub-alias. Be sure to move the cursor over to the right column before invoking
-these aliases. The search filter will be cleared before this alias completes.
-
-Finally, the ``masterwork`` and ``artifact`` group of aliases configure the
-corresponding allowable core quality for the stockpile categories that have
-them. This alias is used to implement category-specific aliases below, like
-``artifactweapons`` and ``forbidartifactweapons``.
-
-.. _quickfort-stockpile-aliases:
-
-Stockpile adjustment aliases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-For each stockpile item category, there are three standard aliases:
-
-* ``*prefix`` aliases enter the stockpile configuration screen and position
-  the cursor at a particular item category in the left-most column, ready for
-  further keys that configure the elements within that category. All other
-  stockpile adjustment aliases are built on these prefixes. You can use them
-  yourself to create stockpile adjustment aliases that aren't already covered
-  by the standard library aliases. Using the library prefix instead of
-  creating your own also allows your stockpile configuration aliases to be
-  used for both stockpiles and hauling routes. For example, here is the
-  library definition for ``booze``::
-
-    booze: {foodprefix}b{Right}{Down 5}p{Down}p^
-
-* ``enable*`` aliases enter the stockpile configuration screen, enable all
-  subtypes of the named category, and exit the stockpile configuration screen
-* ``disable*`` aliases enter the stockpile configuration screen, disable all
-  subtypes of the named category, and exit the stockpile configuration screen
-
-====================  ====================  =====================
-Prefix                Enable                Disable
-====================  ====================  =====================
-animalsprefix         enableanimals         disableanimals
-foodprefix            enablefood            disablefood
-furnitureprefix       enablefurniture       disablefurniture
-corpsesprefix         enablecorpses         disablecorpses
-refuseprefix          enablerefuse          disablerefuse
-stoneprefix           enablestone           disablestone
-ammoprefix            enableammo            disableammo
-coinsprefix           enablecoins           disablecoins
-barsprefix            enablebars            disablebars
-gemsprefix            enablegems            disablegems
-finishedgoodsprefix   enablefinishedgoods   disablefinishedgoods
-leatherprefix         enableleather         disableleather
-clothprefix           enablecloth           disablecloth
-woodprefix            enablewood            disablewood
-weaponsprefix         enableweapons         disableweapons
-armorprefix           enablearmor           disablearmor
-sheetprefix           enablesheet           disablesheet
-====================  ====================  =====================
-
-Then, for each item category, there are aliases that manipulate interesting
-subsets of that category:
-
-* Exclusive aliases forbid everything within a category and then enable only
-  the named item type (or named class of items)
-* ``forbid*`` aliases forbid the named type and leave the rest of the
-  stockpile untouched.
-* ``permit*`` aliases permit the named type and leave the rest of the
-  stockpile untouched.
-
-Note that for specific item types (items in the third stockpile configuration
-column), you can only toggle the item type on and off. Aliases can't know
-whether sending the ``{Enter}`` key will enable or disable the type. The
-``forbid*`` aliases that affect these item types assume the item type was
-enabled and toggle it off. Likewise, the ``permit*`` aliases assume the item
-type was disabled and toggle it on. If the item type is not in the expected
-enabled/disabled state when the alias is run, the aliases will not behave
-properly.
-
-Animal stockpile adjustments
-````````````````````````````
-
-===========  ===========  ============
-Exclusive    Forbid       Permit
-===========  ===========  ============
-cages        forbidcages  permitcages
-traps        forbidtraps  permittraps
-===========  ===========  ============
-
-Food stockpile adjustments
-``````````````````````````
-
-===============  ====================  ====================
-Exclusive        Forbid                Permit
-===============  ====================  ====================
-preparedfood     forbidpreparedfood    permitpreparedfood
-unpreparedfish   forbidunpreparedfish  permitunpreparedfish
-plants           forbidplants          permitplants
-booze            forbidbooze           permitbooze
-seeds            forbidseeds           permitseeds
-dye              forbiddye             permitdye
-tallow           forbidtallow          permittallow
-miscliquid       forbidmiscliquid      permitmiscliquid
-wax              forbidwax             permitwax
-===============  ====================  ====================
-
-Furniture stockpile adjustments
-```````````````````````````````
-
-===================  =========================  =========================
-Exclusive            Forbid                     Permit
-===================  =========================  =========================
-pots                 forbidpots                 permitpots
-bags
-buckets              forbidbuckets              permitbuckets
-sand                 forbidsand                 permitsand
-masterworkfurniture  forbidmasterworkfurniture  permitmasterworkfurniture
-artifactfurniture    forbidartifactfurniture    permitartifactfurniture
-===================  =========================  =========================
-
-Notes:
-
-* The ``bags`` alias excludes coffers and other boxes by forbidding all
-  materials other than cloth, yarn, silk, and leather. Therefore, it is
-  difficult to create ``forbidbags`` and ``permitbags`` without affecting other
-  types of furniture stored in the same stockpile.
-
-* Because of the limitations of Dwarf Fortress, ``bags`` cannot distinguish
-  between empty bags and bags filled with gypsum powder.
-
-Refuse stockpile adjustments
-````````````````````````````
-
-===========  ==================  ==================
-Exclusive    Forbid              Permit
-===========  ==================  ==================
-corpses      forbidcorpses       permitcorpses
-rawhides     forbidrawhides      permitrawhides
-tannedhides  forbidtannedhides   permittannedhides
-skulls       forbidskulls        permitskulls
-bones        forbidbones         permitbones
-shells       forbidshells        permitshells
-teeth        forbidteeth         permitteeth
-horns        forbidhorns         permithorns
-hair         forbidhair          permithair
-usablehair   forbidusablehair    permitusablehair
-craftrefuse  forbidcraftrefuse   permitcraftrefuse
-===========  ==================  ==================
-
-Notes:
-
-* ``usablehair`` Only hair and wool that can make usable clothing is included,
-  i.e. from sheep, llamas, alpacas, and trolls.
-* ``craftrefuse`` includes everything a craftsdwarf or tailor can use: skulls,
-  bones, shells, teeth, horns, and "usable" hair/wool (defined above).
-
-Stone stockpile adjustments
-```````````````````````````
-
-=============  ====================  ====================
-Exclusive      Forbid                Permit
-=============  ====================  ====================
-metal          forbidmetal           permitmetal
-iron           forbidiron            permitiron
-economic       forbideconomic        permiteconomic
-flux           forbidflux            permitflux
-plaster        forbidplaster         permitplaster
-coalproducing  forbidcoalproducing   permitcoalproducing
-otherstone     forbidotherstone      permitotherstone
-bauxite        forbidbauxite         permitbauxite
-clay           forbidclay            permitclay
-=============  ====================  ====================
-
-Ammo stockpile adjustments
-``````````````````````````
-
-==============  ====================  ====================
-Exclusive       Forbid                Permit
-==============  ====================  ====================
-bolts
-\               forbidmetalbolts
-\               forbidwoodenbolts
-\               forbidbonebolts
-masterworkammo  forbidmasterworkammo  permitmasterworkammo
-artifactammo    forbidartifactammo    permitartifactammo
-==============  ====================  ====================
-
-Bar stockpile adjustments
-`````````````````````````
-
-===========  ==================
-Exclusive    Forbid
-===========  ==================
-bars         forbidbars
-metalbars    forbidmetalbars
-ironbars     forbidironbars
-steelbars    forbidsteelbars
-pigironbars  forbidpigironbars
-otherbars    forbidotherbars
-coal         forbidcoal
-potash       forbidpotash
-ash          forbidash
-pearlash     forbidpearlash
-soap         forbidsoap
-blocks       forbidblocks
-===========  ==================
-
-Gem stockpile adjustments
-`````````````````````````
-
-===========  ================
-Exclusive    Forbid
-===========  ================
-roughgems    forbidroughgems
-roughglass   forbidroughglass
-cutgems      forbidcutgems
-cutglass     forbidcutglass
-cutstone     forbidcutstone
-===========  ================
-
-Finished goods stockpile adjustments
-````````````````````````````````````
-
-=======================  =============================  =============================
-Exclusive                Forbid                         Permit
-=======================  =============================  =============================
-stonetools
-woodentools
-crafts                   forbidcrafts                   permitcrafts
-goblets                  forbidgoblets                  permitgoblets
-masterworkfinishedgoods  forbidmasterworkfinishedgoods  permitmasterworkfinishedgoods
-artifactfinishedgoods    forbidartifactfinishedgoods    permitartifactfinishedgoods
-=======================  =============================  =============================
-
-Cloth stockpile adjustments
-```````````````````````````
-
-================  ======================  ======================
-Exclusive         Forbid                  Permit
-================  ======================  ======================
-thread            forbidthread            permitthread
-adamantinethread  forbidadamantinethread  permitadamantinethread
-cloth             forbidcloth             permitcloth
-adamantinecloth   forbidadamantinecloth   permitadamantinecloth
-================  ======================  ======================
-
-Notes:
-
-* ``thread`` and ``cloth`` refers to all materials that are not adamantine.
-
-Weapon stockpile adjustments
-````````````````````````````
-
-=================  ========================  =======================
-Exclusive          Forbid                    Permit
-=================  ========================  =======================
-\                  forbidweapons             permitweapons
-\                  forbidtrapcomponents      permittrapcomponents
-metalweapons       forbidmetalweapons        permitmetalweapons
-\                  forbidstoneweapons        permitstoneweapons
-\                  forbidotherweapons        permitotherweapons
-ironweapons        forbidironweapons         permitironweapons
-bronzeweapons      forbidbronzeweapons       permitbronzeweapons
-copperweapons      forbidcopperweapons       permitcopperweapons
-steelweapons       forbidsteelweapons        permitsteelweapons
-masterworkweapons  forbidmasterworkweapons   permitmasterworkweapons
-artifactweapons    forbidartifactweapons     permitartifactweapons
-=================  ========================  =======================
-
-Armor stockpile adjustments
-```````````````````````````
-
-===============  ======================  =====================
-Exclusive        Forbid                  Permit
-===============  ======================  =====================
-metalarmor       forbidmetalarmor        permitmetalarmor
-otherarmor       forbidotherarmor        permitotherarmor
-ironarmor        forbidironarmor         permitironarmor
-bronzearmor      forbidbronzearmor       permitbronzearmor
-copperarmor      forbidcopperarmor       permitcopperarmor
-steelarmor       forbidsteelarmor        permitsteelarmor
-masterworkarmor  forbidmasterworkarmor   permitmasterworkarmor
-artifactarmor    forbidartifactarmor     permitartifactarmor
-===============  ======================  =====================
diff --git a/docs/guides/quickfort-library-guide.rst b/docs/guides/quickfort-library-guide.rst
index 157bb10a1..e1c3e6b91 100644
--- a/docs/guides/quickfort-library-guide.rst
+++ b/docs/guides/quickfort-library-guide.rst
@@ -5,7 +5,7 @@ Quickfort blueprint library
 ===========================
 
 This guide contains a high-level overview of the blueprints available in the
-:source:`quickfort blueprint library <data/blueprints/library>`.
+:source:`quickfort blueprint library <data/blueprints>`.
 
 Each file is hyperlinked to its online version so you can see exactly what the
 blueprints do before you run them. Also, if you use `gui/quickfort`, you will
@@ -18,8 +18,8 @@ Whole fort blueprint sets
 These files contain the plans for entire fortresses. Each file has one or more
 help sections that walk you through how to build the fort, step by step.
 
-- :source:`library/dreamfort.csv <data/blueprints/library/dreamfort.csv>`
-- :source:`library/quickfortress.csv <data/blueprints/library/quickfortress.csv>`
+- :source:`library/dreamfort.csv <data/blueprints/dreamfort.csv>`
+- :source:`library/quickfortress.csv <data/blueprints/quickfortress.csv>`
 
 .. _dreamfort:
 
@@ -28,103 +28,117 @@ Dreamfort
 
 Dreamfort is a fully functional, self-sustaining fortress with defenses,
 farming, a complete set of workshops, self-managing quantum stockpiles, a grand
-dining hall, hospital, jail, fresh water well system, guildhalls, noble suites,
-and bedrooms for hundreds of dwarves. It also comes with manager work orders to
-automate basic fort needs, such as food, booze, and item production. It can
-function by itself or as the core of a larger, more ambitious fortress. Read the
-high-level walkthrough by running ``quickfort run library/dreamfort.csv`` and
-list the walkthroughs for the individual levels by running ``quickfort list -l
-dreamfort -m notes`` or ``gui/quickfort dreamfort notes``.
+dining hall, hospital (werecreature-ready), library, temple, jail, fresh water
+well system, guildhalls, noble suites, and bedrooms for hundreds of dwarves. It
+also comes with manager work orders to automate basic fort needs, such as food,
+booze, and item production. It can function by itself or as the core of a
+larger, more ambitious fortress. Read the walkthrough by running
+`gui/quickfort`, searching for ``dreamfort help``, and selecting the blueprints.
 
 Dreamfort blueprints are available for easy viewing and copying `online
-<https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP>`__.
+<https://drive.google.com/drive/folders/1dsmvnzbOKsyFS3DCj0F8ibSnMhVHEjdV>`__.
 
 The online spreadsheets also include `embark profile suggestions
-<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=149144025>`__,
+<https://docs.google.com/spreadsheets/d/15TDBebP8rBNvsFbezb9xuKPmGWNzv7j4XZWq1AsfCio/edit#gid=149144025>`__,
 a complete `example embark profile
-<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1727884387>`__,
+<https://docs.google.com/spreadsheets/d/15TDBebP8rBNvsFbezb9xuKPmGWNzv7j4XZWq1AsfCio/edit#gid=1727884387>`__,
 and a convenient `checklist
-<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569>`__
-from which you can copy the ``quickfort`` commands.
+<https://docs.google.com/spreadsheets/d/15TDBebP8rBNvsFbezb9xuKPmGWNzv7j4XZWq1AsfCio/edit#gid=1459509569>`__
+that you can use to track your progress.
 
 If you like, you can download a fully built Dreamfort-based fort from
 :dffd:`dffd <15434>`, load it, and explore it interactively.
 
-Visual overview
-```````````````
-
 Here are annotated screenshots of the major Dreamfort levels (or click `here
-<https://drive.google.com/drive/folders/14KdE2E2wQKj4F_E-NAe3G3E4x1wiWtrc>`__
+<https://drive.google.com/drive/folders/1_gtMQAqa13zZjGkf3fiY3CNEuRpt_WF2>`__
 for a slideshow).
 
 Surface level
-\\\\\\\\\\\\\
+`````````````
 
-.. image:: https://drive.google.com/uc?export=download&id=1YL_vQJLB2YnUEFrAg9y3HEdFq3Wpw9WP
+.. image:: https://drive.google.com/uc?export=download&id=1dlu3nmwQszav-ZaTx-ac28wrcaYBQc_t
   :alt: Annotated screenshot of the dreamfort surface level
-  :target: https://drive.google.com/file/d/1YL_vQJLB2YnUEFrAg9y3HEdFq3Wpw9WP
+  :target: https://drive.google.com/file/d/1dlu3nmwQszav-ZaTx-ac28wrcaYBQc_t
   :align: center
 
 Farming level
-\\\\\\\\\\\\\
+`````````````
 
-.. image:: https://drive.google.com/uc?export=download&id=1fBC3G5Y888l4tVe5REAyAd_zeojADVme
+.. image:: https://drive.google.com/uc?export=download&id=1vDaedLcgoexUdKREUz75ZXQi0ZSdwWwj
   :alt: Annotated screenshot of the dreamfort farming level
-  :target: https://drive.google.com/file/d/1fBC3G5Y888l4tVe5REAyAd_zeojADVme
+  :target: https://drive.google.com/file/d/1vDaedLcgoexUdKREUz75ZXQi0ZSdwWwj
   :align: center
 
 Industry level
-\\\\\\\\\\\\\\
+``````````````
 
-.. image:: https://drive.google.com/uc?export=download&id=1emMaHHCaUPcdRbkLQqvr-0ZCs2tdM5X7
+.. image:: https://drive.google.com/uc?export=download&id=1c8YTHxTgJY5tUII-BOWdLhmDFAHwIOEs
   :alt: Annotated screenshot of the dreamfort industry level
-  :target: https://drive.google.com/file/d/1emMaHHCaUPcdRbkLQqvr-0ZCs2tdM5X7
+  :target: https://drive.google.com/file/d/1c8YTHxTgJY5tUII-BOWdLhmDFAHwIOEs
   :align: center
 
-Services level
-\\\\\\\\\\\\\\
+Services levels (4 deep)
+````````````````````````
 
-.. image:: https://drive.google.com/uc?export=download&id=13vDIkTVOZGkM84tYf4O5nmRs4VZdE1gh
+.. image:: https://drive.google.com/uc?export=download&id=1RQMy_zYQWM5GN7-zjn6LoLWmnrJjkxPM
   :alt: Annotated screenshot of the dreamfort services level
-  :target: https://drive.google.com/file/d/13vDIkTVOZGkM84tYf4O5nmRs4VZdE1gh
+  :target: https://drive.google.com/file/d/1RQMy_zYQWM5GN7-zjn6LoLWmnrJjkxPM
   :align: center
-.. image:: https://drive.google.com/uc?export=download&id=1jlGr6tAhS8i-XFTz8gowTZBhXcfjfL_L
-  :alt: Annotated screenshot of the dreamfort cistern
-  :target: https://drive.google.com/file/d/1jlGr6tAhS8i-XFTz8gowTZBhXcfjfL_L
+
+Services waterway:
+
+.. image:: https://drive.google.com/uc?export=download&id=1SXknicNS13Dkq1A_8QLoK8OMxdolw-BY
+  :alt: Annotated screenshot of the dreamfort waterway
+  :target: https://drive.google.com/file/d/1SXknicNS13Dkq1A_8QLoK8OMxdolw-BY
   :align: center
 
-.. _example-plumbing-to-fill-cisterns:
+**Example plumbing to fill cisterns**
+
+If you are routing water to fill the cisterns, you can do it like this (1
+z-level below the preceding screenshot)
+
+.. image:: https://drive.google.com/uc?export=download&id=1paXqPJ-7h9_jG_eNXU1z5GGvR0J8C0uJ
+  :alt: Annotated screenshot of an example aqueduct addition to the dreamfort cisterns
+  :target: https://drive.google.com/file/d/1paXqPJ-7h9_jG_eNXU1z5GGvR0J8C0uJ
+  :align: center
 
-Example plumbing to fill cisterns
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Cistern drain (keep open while you're digging out the aquifer tap):
 
-.. image:: https://drive.google.com/uc?export=download&id=1GvhX_pVDOlmqTi2OujoBqCG_qX36ExAv
-  :alt: Annotated screenshot of an example aqueduct addition to the dreamfort cistern
-  :target: https://drive.google.com/file/d/1GvhX_pVDOlmqTi2OujoBqCG_qX36ExAv
+.. image:: https://drive.google.com/uc?export=download&id=1SwSluJcN_kOrCYPdcFOfJ13wEDvZGcJe
+  :alt: Annotated screenshot of an example drainage addition to the dreamfort cisterns
+  :target: https://drive.google.com/file/d/1SwSluJcN_kOrCYPdcFOfJ13wEDvZGcJe
   :align: center
 
 Guildhall level
-\\\\\\\\\\\\\\\
+```````````````
 
-.. image:: https://drive.google.com/uc?export=download&id=17jHiCKeZm6FSS-CI4V0r0GJZh09nzcO_
+.. image:: https://drive.google.com/uc?export=download&id=1mt66QOkfBqFLtw6AJKU6GNYmhB72XSJG
   :alt: Annotated screenshot of the dreamfort guildhall level
-  :target: https://drive.google.com/file/d/17jHiCKeZm6FSS-CI4V0r0GJZh09nzcO_
+  :target: https://drive.google.com/file/d/1mt66QOkfBqFLtw6AJKU6GNYmhB72XSJG
   :align: center
 
 Noble suites
-\\\\\\\\\\\\
+````````````
 
-.. image:: https://drive.google.com/uc?export=download&id=1IBqCf6fF3lw7sHiBE_15Euubysl5AAiS
+.. image:: https://drive.google.com/uc?export=download&id=16XRb1w5zFoyVq2LBMx_aCwOyjFq7GULc
   :alt: Annotated screenshot of the dreamfort noble suites
-  :target: https://drive.google.com/file/d/1IBqCf6fF3lw7sHiBE_15Euubysl5AAiS
+  :target: https://drive.google.com/file/d/16XRb1w5zFoyVq2LBMx_aCwOyjFq7GULc
   :align: center
 
 Apartments
-\\\\\\\\\\
+``````````
 
-.. image:: https://drive.google.com/uc?export=download&id=1mDQQXG8BnXqasRGFC9R5N6xNALiswEyr
+.. image:: https://drive.google.com/uc?export=download&id=16-NXlodLIQjeZUMSmsWRafeytwU2dXQo
   :alt: Annotated screenshot of the dreamfort apartments
-  :target: https://drive.google.com/file/d/1mDQQXG8BnXqasRGFC9R5N6xNALiswEyr
+  :target: https://drive.google.com/file/d/16-NXlodLIQjeZUMSmsWRafeytwU2dXQo
+  :align: center
+
+Crypt
+`````
+
+.. image:: https://drive.google.com/uc?export=download&id=16iT_ho7BIRPD_eofuxdlVQ4FunR1Li23
+  :alt: Annotated screenshot of the dreamfort crypt
+  :target: https://drive.google.com/file/d/16iT_ho7BIRPD_eofuxdlVQ4FunR1Li23
   :align: center
 
 The Quick Fortress
@@ -149,21 +163,21 @@ these ``#dig`` blueprints can only mark undug wall tiles for mining, they are
 best used underground. They won't do much on the surface, where there aren't
 many walls.
 
-- :source:`library/layout-helpers/mark_up_left.csv <data/blueprints/library/layout-helpers/mark_up_left.csv>`
-- :source:`library/layout-helpers/mark_up_right.csv <data/blueprints/library/layout-helpers/mark_up_right.csv>`
-- :source:`library/layout-helpers/mark_down_right.csv <data/blueprints/library/layout-helpers/mark_down_right.csv>`
-- :source:`library/layout-helpers/mark_down_left.csv <data/blueprints/library/layout-helpers/mark_down_left.csv>`
+- :source:`library/layout-helpers/mark_up_left.csv <data/blueprints/layout-helpers/mark_up_left.csv>`
+- :source:`library/layout-helpers/mark_up_right.csv <data/blueprints/layout-helpers/mark_up_right.csv>`
+- :source:`library/layout-helpers/mark_down_right.csv <data/blueprints/layout-helpers/mark_down_right.csv>`
+- :source:`library/layout-helpers/mark_down_left.csv <data/blueprints/layout-helpers/mark_down_left.csv>`
 
 Bedrooms
 --------
 
 These are popular bedroom layouts from the :wiki:`Bedroom design` page on the
-wiki. Each file has ``#dig``, ``#build``, and ``#query`` blueprints to dig the
-rooms, build the furniture, and configure the beds as bedrooms, respectively.
+wiki. Each file has blueprints to dig the rooms, zone them as bedrooms, and
+build the furniture.
 
-- :source:`library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv <data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv>`
-- :source:`library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv <data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv>`
-- :source:`library/bedrooms/28-3-Modified_Windmill_Villas.csv <data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv>`
+- :source:`library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv <data/blueprints/bedrooms/48-4-Raynard_Whirlpool_Housing.csv>`
+- :source:`library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv <data/blueprints/bedrooms/95-9-Hactar1_3_Branch_Tree.csv>`
+- :source:`library/bedrooms/28-3-Modified_Windmill_Villas.csv <data/blueprints/bedrooms/28-3-Modified_Windmill_Villas.csv>`
 
 Tombs
 -----
@@ -171,28 +185,28 @@ Tombs
 These blueprints have burial plot layouts for fortress that expect a lot of
 casualties.
 
-- :source:`library/tombs/Mini_Saracen.csv <data/blueprints/library/tombs/Mini_Saracen.csv>`
-- :source:`library/tombs/The_Saracen_Crypts.csv <data/blueprints/library/tombs/The_Saracen_Crypts.csv>`
+- :source:`library/tombs/Mini_Saracen.csv <data/blueprints/tombs/Mini_Saracen.csv>`
+- :source:`library/tombs/The_Saracen_Crypts.csv <data/blueprints/tombs/The_Saracen_Crypts.csv>`
 
 Exploratory mining
 ------------------
 
 Several mining patterns to choose from when searching for gems or ores. The
-patterns can be repeated up or down z-levels (via quickfort's ``--repeat``
-commandline option) for exploring through the depths.
+patterns can be repeated up or down z-levels (via `gui/quickfort`\'s
+:kbd:`r`\epeat functionality) for exploring through the depths.
 
-- :source:`library/exploratory-mining/tunnels.csv <data/blueprints/library/exploratory-mining/tunnels.csv>`
-- :source:`library/exploratory-mining/vertical-mineshafts.csv <data/blueprints/library/exploratory-mining/vertical-mineshafts.csv>`
-- :source:`library/exploratory-mining/connected-mineshafts.csv <data/blueprints/library/exploratory-mining/connected-mineshafts.csv>`
+- :source:`library/exploratory-mining/tunnels.csv <data/blueprints/exploratory-mining/tunnels.csv>`
+- :source:`library/exploratory-mining/vertical-mineshafts.csv <data/blueprints/exploratory-mining/vertical-mineshafts.csv>`
+- :source:`library/exploratory-mining/connected-mineshafts.csv <data/blueprints/exploratory-mining/connected-mineshafts.csv>`
 
 Miscellaneous
 -------------
 
 Extra blueprints that are useful in specific situations.
 
-- :source:`library/aquifer_tap.csv <data/blueprints/library/aquifer_tap.csv>`
-- :source:`library/embark.csv <data/blueprints/library/embark.csv>`
-- :source:`library/pump_stack.csv <data/blueprints/library/pump_stack.csv>`
+- :source:`library/aquifer_tap.csv <data/blueprints/aquifer_tap.csv>`
+- :source:`library/embark.csv <data/blueprints/embark.csv>`
+- :source:`library/pump_stack.csv <data/blueprints/pump_stack.csv>`
 
 Light aquifer tap
 ~~~~~~~~~~~~~~~~~
@@ -200,14 +214,19 @@ Light aquifer tap
 The aquifer tap helps you create a safe, everlasting source of fresh water from
 a light aquifer. See the step-by-step guide, including information on how to
 create a drainage system so your dwarves don't drown when digging the tap, by
-running ``quickfort run library/aquifer_tap.csv -n /help``.
+running the ``library/aquifer_tap.csv`` ``/help`` blueprint.
 
 You can see how to nullify the water pressure (so you don't flood your fort) in
-the `Dreamfort screenshot above <example-plumbing-to-fill-cisterns>`.
+the Dreamfort cistern screenshot above: `Services levels (4 deep)`_.
 
 The blueprint spreadsheet is also available
 `online <https://docs.google.com/spreadsheets/d/1kwuCipF9FYAHNP9C_XlMpqVseaPu4SmL9YLUSQkbW4s/edit#gid=611877584>`__.
 
+.. image:: https://drive.google.com/uc?export=download&id=11bzEF615QTyTNbN8A8M4UYi1YWtqPuCf
+  :alt: Annotated screenshot of the aquifer tap
+  :target: https://drive.google.com/file/d/11bzEF615QTyTNbN8A8M4UYi1YWtqPuCf
+  :align: center
+
 Post-embark
 ~~~~~~~~~~~
 
@@ -220,8 +239,8 @@ Pump stack
 ~~~~~~~~~~
 
 The pump stack blueprints help you move water and magma up to more convenient
-locations in your fort. See the step-by-step guide for using it by running
-``quickfort run library/pump_stack.csv -n /help``.
+locations in your fort. See the step-by-step guide for using it by running the
+``library/pump_stack.csv`` ``/help`` blueprint.
 
 The blueprint spreadsheet is also available
 `online <https://docs.google.com/spreadsheets/d/1TP2n-W-O9f30Dtl6yoTcn6yczWQRu11iM7U6TEE9634/edit#gid=0>`__.
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 6f606c43a..e4b337cc4 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1,133 +1,119 @@
 .. _quickfort-blueprint-guide:
 .. _quickfort-user-guide:
+.. _quickfort-alias-guide:
 
 Quickfort blueprint creation guide
 ==================================
 
-`Quickfort <quickfort>` is a DFHack script that helps you build fortresses from
+`Quickfort <quickfort>` is a DFHack tool that helps you build fortresses from
 "blueprint" .csv and .xlsx files. Many applications exist to edit these files,
 such as MS Excel and `Google Sheets <https://sheets.new>`__. Most layout and
-building-oriented DF commands are supported through the use of multiple files or
-spreadsheets, each describing a different phase of DF construction: designation,
-building, placing stockpiles/zones, and setting configuration.
+building-oriented DF actions are supported through the use of multiple files or
+spreadsheets, each describing a different phase of DF construction: designating
+digging, defining zones, placing stockpiles, and building.
 
 The original idea came from :wiki:`Valdemar's <User:Valdemar>` auto-designation
 macro. Joel Thornton reimplemented the core logic in Python and extended its
 functionality with `Quickfort 2.0 <https://github.com/joelpt/quickfort>`__. This
 DFHack-native implementation, called "DFHack Quickfort" or just "quickfort",
-builds upon Quickfort 2.0's formats and features. Any blueprint that worked in
-Python Quickfort 2.0 should work with DFHack Quickfort. DFHack Quickfort
-interacts with Dwarf Fortress memory structures directly, allowing for
+builds upon Quickfort 2.0's formats and features, preserving compatibility with
+existing blueprints (where possible -- DF itself has changed since then). In
+contrast with the earlier quickfort implementations, which interacted with DF
+by simulating keyboard input, DFHack Quickfort calls lower-level API functions
+to designate tiles and configure buildings. This allows for nearly
 instantaneous blueprint application, error checking and recovery, and many other
 advanced features.
 
-This guide focuses on DFHack Quickfort's capabilities and teaches players how
-to understand and create blueprint files. Some of the text was originally
-written by Joel Thornton, reused here with his permission.
+This guide focuses on DFHack Quickfort's capabilities and blueprint syntax, and
+teaches players how to understand and create blueprint files. Some of the text
+was originally written by Joel Thornton, reused here with his permission.
 
-For those just looking to apply existing blueprints, check out the `quickfort
-command's documentation <quickfort>` for syntax. There are also many
-ready-to-use blueprints available in the ``blueprints/library`` subfolder in
-your DFHack installation. Browse them on your computer or
-:source:`online <data/blueprints/library>`, or run `gui/quickfort` to browse
-and apply them to your fort!
+If you are just looking to apply existing blueprints to your fort, check out
+`gui/quickfort` (or `quickfort` for the commandline version). There are many
+ready-to-use blueprints available in the `quickfort-library-guide` distributed
+with DFHack.
 
 Before you become an expert at writing blueprints, though, you should know that
 the easiest way to make a quickfort blueprint is to build your plan "for real"
-in Dwarf Fortress and then export your map using the DFHack `blueprint` plugin.
-You can apply those blueprints as-is in your next fort, or you can fine-tune
-them with additional features from this guide.
+in Dwarf Fortress and then export that section of your map using
+`gui/blueprint`. You can apply those blueprints as-is in your next fort, or you
+can fine-tune them with additional features from this guide.
 
 See the `Links`_ section for more information and online resources.
 
-
 .. contents:: Table of Contents
    :local:
    :depth: 2
 
+Feature summary
+---------------
 
-Features
---------
-
--  General
+- General
 
-   -  Manages blueprints to handle all phases of DF construction
-   -  Supports .csv and multi-worksheet .xlsx blueprint files
-   -  Near-instant application, even for very large and complex blueprints
-   -  Blueprints can span multiple z-levels
-   -  You can package all blueprints and keystroke aliases needed for an entire
-      fortress in a single file for easy sharing
-   -  "meta" blueprints that simplify the application of sequences of blueprints
-   -  Undo functionality for dig, build, place, and zone blueprints
-   -  Rotate blueprints or flip them around to your preference when you apply
-      them to the map
-   -  Automatic cropping of blueprints so you don't get errors if the blueprint
-      extends off the map
-   -  Can generate manager orders for everything required by a build blueprint
-   -  Includes a library of ready-to-use blueprints
-   -  Blueprint debugging features
+    - Blueprint modes for all phases of fort design
+    - Read blueprints from .csv or multi-worksheet .xlsx files
+    - Near-instant application, even for very large and complex blueprints
+    - Blueprints can span multiple z-levels
+    - Easy sharing of blueprints with multi-blueprint files
+    - Scripted application of sequences of blueprints
+    - Undo applied blueprints
+    - Rotate blueprints or flip them around
+    - Automatic cropping of blueprints that extend off the map
+    - Generate manager orders for items required by a blueprint
+    - Includes a library of ready-to-use blueprints
+    - Blueprint debugging
 
--  Dig mode
+- Dig mode
 
-   -  Supports all types of designations, including dumping/forbidding items and
+    - Supports all types of designations, including dumping/forbidding items and
       setting traffic settings
-   -  Supports setting dig priorities
-   -  Supports applying dig blueprints in marker mode
-   -  Handles carving arbitrarily complex minecart tracks, including tracks that
+    - Supports setting dig priorities
+    - Supports applying dig blueprints in marker mode
+    - Handles carving arbitrarily complex minecart tracks, including tracks that
       cross other tracks
 
--  Build mode
+- Zone and place modes
 
-   -  Fully integrated with DFHack buildingplan: you can place buildings before
-      manufacturing building materials and you can use the buildingplan UI for
-      setting materials preferences
-   -  Designate entire constructions in mid-air without having to wait for each
+    - Define zones and stockpiles of any shape, not just rectangles
+    - Configurable numbers of bins, barrels and wheelbarrows assigned to created
+      stockpiles
+    - Automatic splitting of stockpiles that exceed maximum dimension limits
+    - Create and attach locations to zones
+    - Full control over stockpile configuration based on the `stockpiles`
+      settings library
+    - Configurable zone/location settings, such as the pit/pond toggle or
+      hospital supply quantities
+
+- Build mode
+
+    - Integrated with DFHack `buildingplan`: you can place buildings before
+      manufacturing building materials and you can use the `buildingplan` UI
+      for setting materials and quality preferences
+    - Designate entire constructions in mid-air without having to wait for each
       tile to become supported
-   -  Automatic expansion of building footprints to their minimum dimensions, so
+    - Automatic expansion of building footprints to their minimum dimensions, so
       only the center tile of a multi-tile building needs to be recorded in the
       blueprint
-   -  Tile occupancy and validity checking so, for example, buildings that
-      cannot be placed on a target tile will be skipped instead of messing up
-      the blueprint. Blueprints that are only partially applied for any reason
-      (e.g. you need to dig out some more tiles) can be safely reapplied to
-      build the remaining buildings.
-   -  Relaxed rules for farm plot and road placement: you can still place the
+    - Tile occupancy and validity checking so, for example, buildings that
+      cannot be placed on a target tile will be skipped instead of causing
+      errors and interrupting the blueprint. Blueprints that are only partially
+      applied for any reason (e.g. you need to dig out some more tiles) can be
+      safely reapplied to build the remaining buildings.
+    - Relaxed rules for farm plot and road placement: you can still place the
       building even if an invalid tile (e.g. stone tiles for farm plots) splits
       the designated area into two disconnected parts
-   -  Intelligent boundary detection for adjacent buildings of the same type
+    - Intelligent boundary detection for adjacent buildings of the same type
       (e.g. a 6x6 block of ``wj`` cells will be correctly split into 4 jeweler's
       workshops)
+    - Set building properties (such as a name)
+    - Can attach and configure track stops as part of hauling routes
 
--  Place and zone modes
+- Burrow mode
 
-   -  Define stockpiles and zones of any shape, not just rectangles
-   -  Configurable numbers of bins, barrels and wheelbarrows assigned to created
-      stockpiles
-   -  Automatic splitting of stockpiles and zones that exceed maximum dimension
-      limits
-   -  Fully configurable zone settings, such as pit/pond and hospital supply
-      counts
-
--  Query mode
-
-   -  Send arbitrary keystroke sequences to the UI -- *anything* you can do
-      through the UI is supported
-   -  Supports aliases to simplify frequent keystroke combos
-   -  Includes a library of pre-made and tested aliases to simplify most common
-      tasks, such as configuring stockpiles for important item types or creating
-      hauling routes for quantum stockpiles.
-   -  Supports expanding aliases in other aliases for easy management of common
-      subsequences
-   -  Supports repeating key sequences a specified number of times
-   -  Skips sending keys when the cursor is over a tile that does not have a
-      stockpile or building, so missing buildings won't desynchronize your
-      blueprint
-   -  Instant halting of query blueprint application when keystroke errors are
-      detected, such as when a mistake in a key sequence leaves us stuck in a
-      submenu, to make query blueprints easier to debug
+    - Supports creating, adding to, and subtracting from burrows.
 
-Creating blueprints
--------------------
+Introduction to blueprints
+--------------------------
 
 We recommend using a spreadsheet editor such as Excel, `Google
 Sheets <https://sheets.new>`__, or `LibreOffice <https://www.libreoffice.org>`__
@@ -136,73 +122,92 @@ to edit blueprint files, but any text editor will do.
 The format of Quickfort-compatible blueprint files is straightforward. The first
 line (or upper-left cell) of the spreadsheet should look like this::
 
-   #dig
+    #dig
 
-The keyword ``dig`` tells Quickfort we are going to be using the Designations
-menu in DF. The following "mode" keywords are understood:
+The keyword ``dig`` tells Quickfort we are going to be specifying designations.
+The following "mode" keywords are understood:
 
 ==============  ===========
 Blueprint mode  Description
 ==============  ===========
-dig             Designations menu (:kbd:`d`)
-build           Build menu (:kbd:`b`)
-place           Place stockpiles menu (:kbd:`p`)
-zone            Activity zones menu (:kbd:`i`)
-query           Set building tasks/prefs menu (:kbd:`q`)
+dig             Designations (digging, traffic, dumping, etc.)
+build           Constructions, buildings, and furniture
+place           Stockpiles
+zone            Activity zones
 ==============  ===========
 
 If no modeline appears in the first cell, Quickfort assumes that it's looking at
 a ``#dig`` blueprint.
 
 There are also other modes that don't directly correspond to Dwarf Fortress
-menus, but we'll talk about those `later <quickfort-other-modes>`.
+design operations, but we'll talk about those `later <quickfort-other-modes>`.
 
 If you like, you may enter a comment after the mode keyword. This comment will
-appear in the output of ``quickfort list`` when run from the ``DFHack#`` prompt
-or in the dialog window when running `gui/quickfort`. You can use this space for
-explanations, attribution, etc.::
+appear in the output of ``quickfort list`` or in the dialog window when running
+`gui/quickfort`. You can use this space for explanations, attribution, etc.::
 
-   #dig grand dining room
+    #dig grand dining room
 
 Below this line, begin entering keys in each spreadsheet cell that represent
 what you want designated in the corresponding game map tile. For example, we
 could dig out a 4x4 room like so (spaces are used as column separators here for
 readability, but a real .csv file would have commas)::
 
-   #dig
-   d d d d #
-   d d d d #
-   d d d d #
-   d d d d #
-   # # # # #
+    #dig
+    d d d d #
+    d d d d #
+    d d d d #
+    d d d d #
+    # # # # #
+
+The letter ``d`` here stands for "dig". The character sequences in these
+blueprints are based on the old (pre-v50) keyboard shortcuts for the various DF
+menus. Please see the `quickfort_guide_appendix` below for a full reference.
 
 Note the :kbd:`#` symbols at the right end of each row and below the last row.
 These are completely optional, but can be helpful to make the row and column
 positions clear.
 
-Once the dwarves have that dug out, let's build a walled-in bedroom within our
-dug-out area::
-
-   #build
-   Cw Cw Cw Cw #
-   Cw b  h  Cw #
-   Cw       Cw #
-   Cw Cw    Cw #
-   #  #  #  #  #
-
-Note my generosity -- in addition to the bed (:kbd:`b`) I've built a container
-(:kbd:`h`) here for the dwarf as well. You must use the full series of keys
-needed to build something in each cell, e.g. :kbd:`C`:kbd:`w` indicates we
-should enter DF's constructions submenu (:kbd:`C`) and select walls (:kbd:`w`).
-
-I'd also like to place a booze stockpile in the 2 unoccupied tiles in the room::
-
-   #place Place a food stockpile
-   ` ` ` ` #
-   ` ~ ~ ` #
-   ` f f ` #
-   ` `   ` #
-   # # # # #
+Once the dwarves have that dug out, let's zone it as a bedroom::
+
+    #zone
+    b b b b #
+    b b b b #
+    b b b b #
+    b b b b #
+    # # # # #
+
+This looks very similar to the ``#dig`` blueprint above, but with ``b``\s
+instead of ``d``\s. The ``b``\s mark the area for a ``b``\edroom zone just like
+the ``#dig`` blueprint marked the area for digging. It's important to wait
+until after the area is completely dug out before applying further blueprints
+since zones can't be applied to hidden tiles and furniture can't be built in
+undug walls.
+
+Now, let's add some walls and furniture::
+
+    #build
+    Cw Cw Cw Cw #
+    Cw b  h  Cw #
+    Cw       Cw #
+    Cw Cw    Cw #
+    #  #  #  #  #
+
+The :kbd:`C`:kbd:`w` cells represent the constructed walls, leaving space for a
+door that we might want to add later. Quickfort uses `buildingplan` for
+managing buildings, so the walls will be built out of whatever matches the
+current buildingplan filter set for walls. Also note my generosity -- in
+addition to the bed (:kbd:`b`) I've built a container (:kbd:`h`) for this lucky
+dwarf.
+
+Finally, let's place a booze stockpile in the 2 unoccupied tiles in the room::
+
+    #place personal booze stockpile
+    ` ` ` ` #
+    ` ~ ~ ` #
+    ` f f{name="bedroom booze"}:=booze
+    ` `   ` #
+    # # # # #
 
 This illustration may be a little hard to understand. The two :kbd:`f`
 characters are in row 3, columns 2 and 3. All the other cells are empty. QF
@@ -213,99 +218,73 @@ multilayer or fortress-wide blueprint layouts as "chalk lines".
 QF is smart enough to recognize this as a 2x1 food stockpile, and creates it as
 such rather than as two 1x1 food stockpiles. Quickfort treats any connected
 region of identical designations as a single entity. The tiles can be connected
-orthogonally or diagonally, just as long as they are touching.
+orthogonally or diagonally, just as long as they are touching. You can also
+treat disconnected segments as belonging to the same stockpile, but we'll get
+into `Label syntax`_ later.
 
-Lastly, let's turn the bed into a bedroom and set the food stockpile to hold
-only booze.
+Now what's all that business attached to the second ``f``? The part between the
+curly brackets specifies properties, in this case the name that we want to give
+the stockpile. The remaining part, from the colon (``:``) onward, applies the
+``booze`` preset from the `stockpiles` library. That will configure the
+stockpile to accept only booze. You can use presets (along with other options
+that we'll go over later) to configure stockpiles however you want, directly
+from the ``#place`` blueprint.
 
-::
-
-   #query
-   ` ` ` ` #
-   ` r&  ` #
-   ` booze #
-   ` ` ` ` #
-   # # # # #
-
-In row 2, column 2 we have ``r&``. This sends the :kbd:`r` key to DF when the
-cursor is over the bed, causing us to "make room" and :kbd:`Enter`, represented
-by special ``&`` alias, to indicate that we're done setting the size (the
-default room size is fine here).
-
-In column 2, row 3 we have ``booze``. This is one of many alias keywords defined
-in the included :source:`aliases library <data/quickfort/aliases-common.txt>`.
-This particular alias sets a food stockpile to accept only booze. It sends the
-keys needed to navigate DF's stockpile settings menu, and then it sends an
-Escape character to exit back to the map. It is important to exit out of any
-menus that you enter while in query mode so that the cursor can move to the next
-tile when it is done with the current tile.
-
-If there weren't an alias named ``booze`` then the literal characters
-:kbd:`b`:kbd:`o`:kbd:`o`:kbd:`z`:kbd:`e` would have been sent, so be sure to
-spell those aliases correctly!
-
-You can save a lot of time and effort by using aliases instead of adding all
-key sequences directly to your blueprints. For more details, check out the
-`quickfort-alias-guide`. You can also see examples of aliases being used in the
-query blueprints in the
-:source:`DFHack blueprint library <data/blueprints/library>`. You can create
-your own aliases by adding them to :source:`dfhack-config/quickfort/aliases.txt`
-in your DFHack folder or you can package them
-`together with your blueprint files <quickfort-aliases-blueprints>`.
+And that's it! You now have a series of blueprints that you can "stamp" across your fort to quickly build new bedrooms.
 
 Area expansion syntax
 ~~~~~~~~~~~~~~~~~~~~~
 
 In Quickfort, the following blueprints are equivalent::
 
-   #dig a 3x3 area
-   d d d #
-   d d d #
-   d d d #
-   # # # #
+    #dig a 3x3 area
+    d d d #
+    d d d #
+    d d d #
+    # # # #
 
-   #dig the same area with d(3x3) specified in row 1, col 1
-   d(3x3)#
-   ` ` ` #
-   ` ` ` #
-   # # # #
+    #dig the same area with d(3x3) specified in row 1, col 1
+    d(3x3)#
+    ` ` ` #
+    ` ` ` #
+    # # # #
 
 The second example uses Quickfort's "area expansion syntax", which takes the
 form::
 
-   keys(WxH)
+    text(WxH)
 
 Note that area expansion syntax can only specify rectangular areas. If you want
 to create extent-based structures (e.g. farm plots or stockpiles) in different
 shapes, use the first format above. For example::
 
-   #place A single L shaped food stockpile
-   f f ` ` #
-   f f ` ` #
-   f f f f #
-   f f f f #
-   # # # # #
+    #place A single L shaped food stockpile
+    f f ` ` #
+    f f ` ` #
+    f f f f #
+    f f f f #
+    # # # # #
 
 Area expansion syntax also sets boundaries, which can be useful if you want
 adjacent, but separate, stockpiles of the same type::
 
-   #place Two touching but separate food stockpiles
-   f(2x2)  #
-   ~ ~ ` ` #
-   f(4x2)  #
-   ~ ~ ~ ~ #
-   # # # # #
+    #place Two touching but separate food stockpiles
+    f(2x2)  #
+    ~ ~ ` ` #
+    f(4x2)  #
+    ~ ~ ~ ~ #
+    # # # # #
 
 As mentioned previously, :kbd:`~` characters are ignored as comment characters
 and can be used for visualizing the blueprint layout. This blueprint can be
 equivalently written as::
 
-   #place Two touching but separate food stockpiles
-   f(2x2)  #
-   ~ ~ ` ` #
-   f f f f #
-   f f f f #
-   # # # # #
+    #place Two touching but separate food stockpiles
+    f(2x2)  #
+    ~ ~ ` ` #
+    f f f f #
+    f f f f #
+    # # # # #
 
 since the area expansion syntax of the upper stockpile prevents it from
 combining with the lower, freeform syntax stockpile.
@@ -313,25 +292,76 @@ combining with the lower, freeform syntax stockpile.
 Area expansion syntax can also be used for buildings which have an adjustable
 size, like bridges. The following blueprints are equivalent::
 
-   #build a 4x2 bridge from row 1, col 1
-   ga(4x2)  `  #
-   `  `  `  `  #
-   #  #  #  #  #
+    #build a 4x2 bridge from row 1, col 1
+    ga(4x2)  `  #
+    `  `  `  `  #
+    #  #  #  #  #
 
-   #build a 4x2 bridge from row 1, col 1
-   ga ga ga ga #
-   ga ga ga ga #
-   #  #  #  #  #
+    #build a 4x2 bridge from row 1, col 1
+    ga ga ga ga #
+    ga ga ga ga #
+    #  #  #  #  #
 
 If it is convenient to do so, you can place the cell with the expansion syntax
 in any corner of the resulting rectangle. Just use negative numbers to indicate
 which direction the designation should expand in. For example, the previous
 blueprint could also be written as::
 
-   #build a 4x2 bridge from row 2, col 4
-   `  `  `  `  #
-   ga(4x-2) `  #
-   #  #  #  #  #
+    #build a 4x2 bridge from row 2, col 4
+    `  `  `  `  #
+    ga(4x-2) `  #
+    #  #  #  #  #
+
+Property syntax
+~~~~~~~~~~~~~~~
+
+Many things you can designate with `quickfort` are configurable. All buildings,
+stockpiles, and zones, for example, can be named. These configuration elements
+are expressed as properties.
+
+Properties are written between curly brackets (``{}``). There can be multiple
+properties defined between those brackets, separated by spaces. Each property
+has a name and a value, with an equal sign to connect them. If a property value
+has a space within it, it should be surrounded by double quotes (``"``).
+
+If you have defined the area of something over multiple spreadsheet cells, you
+can specify properties in just one of those cells and they will apply to the
+whole object. You can even split properties up among multiple cells if that is
+more convenient. If you are using expansion syntax, the expansion part always
+goes last.
+
+Here's an example of a seed stockpile that is configured to take from a seed feeder stockpile::
+
+    #place
+    f{name=Seeds links_only=true}:=seeds(3x2)
+
+    f
+    f{name="Seeds feeder" give_to=Seeds}:=seeds
+    f{containers=0}
+
+Different modes and different types may have different properties that you can
+configure. See the `quickfort_guide_appendix` for a full list.
+
+Label syntax
+~~~~~~~~~~~~
+
+Labels are different from the ``name`` property. They are only used internally
+by Quickfort to associate tiles with a particular zones or stockpiles. This is
+useful for when you want to define two touching zones or stockpiles of the same
+type(s), but you can't use expansion syntax because they are non-rectangular.
+It is also useful for marking two *disconnected* regions as belonging to the
+same zone or stockpile. Note that every tile in the zone or stockpile must be
+marked with the same label::
+
+    #place two touching stockpiles of the same type
+    f/feed f/feed f/feed{name="Seeds feeder" containers=0}:=seeds
+    f/feed f      f/feed
+    f      f      f{name=Seeds links_only=true take_from="Seeds feeder"}:=seeds
+
+    #zone one pasture in two disconnected regions
+    n/slots n/slots n/slots
+
+    n/slots{name="Pasture slots"}(3x1)
 
 Automatic area expansion
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -340,19 +370,19 @@ Buildings larger than 1x1, like workshops, can be represented in any of three
 ways. You can designate just their center tile with empty cells around it to
 leave room for the footprint, like this::
 
-   #build a mason workshop in row 2, col 2 that will occupy the 3x3 area
-   ` `  ` #
-   ` wm ` #
-   ` `  ` #
-   # #  # #
+    #build a stonecutter workshop in row 2, col 2 that will occupy the 3x3 area
+    ` `  ` #
+    ` wm ` #
+    ` `  ` #
+    # #  # #
 
 Or you can fill out the entire footprint like this::
 
-   #build a mason workshop
-   wm wm wm #
-   wm wm wm #
-   wm wm wm #
-   #  #  #  #
+    #build a stonecutter workshop
+    wm wm wm #
+    wm wm wm #
+    wm wm wm #
+    #  #  #  #
 
 This format may be verbose for regular workshops, but it can be very helpful for
 laying out structures like screw pump towers and waterwheels, whose "center
@@ -360,18 +390,18 @@ point" can be non-obvious.
 
 Or you can use area expansion syntax::
 
-   #build a mason workshop
-   wm(3x3)  #
-   `  `  `  #
-   `  `  `  #
-   #  #  #  #
+    #build a stonecutter workshop
+    wm(3x3)  #
+    `  `  `  #
+    `  `  `  #
+    #  #  #  #
 
 This style can be convenient for laying out multiple buildings of the same type.
 If you are building a large-scale block factory, for example, this will create
-20 mason workshops all in a row::
+20 stonecutter workshops all in a row::
 
-   #build line of 20 mason workshops
-   wm(60x3)
+    #build line of 20 stonecutter workshops
+    wm(60x3)
 
 Quickfort will intelligently break large areas of the same designation into
 appropriately-sized chunks.
@@ -385,15 +415,15 @@ each floor.
 
 ::
 
-   #dig Stairs leading down to a small room below
-   j  `  `  #
-   `  `  `  #
-   `  `  `  #
-   #> #  #  #
-   u  d  d  #
-   d  d  d  #
-   d  d  d  #
-   #  #  #  #
+    #dig Stairs leading down to a small room below
+    j  `  `  #
+    `  `  `  #
+    `  `  `  #
+    #> #  #  #
+    u  d  d  #
+    d  d  d  #
+    d  d  d  #
+    #  #  #  #
 
 The marker must appear in the first column of the row to be recognized, just
 like a modeline.
@@ -406,39 +436,45 @@ You can go up or down multiple levels by adding a number after the ``<`` or
     #>2
     r(10x10)
 
+#dig mode
+---------
+
+``#dig`` blueprints are normally the first step in any design. They define the
+boundaries and layouts for the blueprints for later stages of construction. Despite their name, ``#dig`` blueprints are for more than just digging. They also handle smoothing, carving, traffic designations, and marking items on the ground for dumping, forbidding, or other similar tags. See the full list of supported designations in the `#dig mode reference`_.
+
 .. _quickfort-dig-priorities:
 
 Dig priorities
 ~~~~~~~~~~~~~~
 
-DF designation priorities are supported for ``#dig`` blueprints. The full syntax
-is ``[letter][number][expansion]``, where if the ``letter`` is not specified,
+DF designation priorities are supported in ``#dig`` blueprints. The full syntax
+is ``[symbol][number][expansion]``, where if the ``symbol`` is not specified,
 ``d`` is assumed, and if ``number`` is not specified, ``4`` is assumed (the
-default priority). So each of these blueprints is equivalent::
-
-   #dig dig the interior of the room at high priority
-   d  d  d  d  d  #
-   d  d1 d1 d1 d  #
-   d  d1 d1 d1 d  #
-   d  d1 d1 d1 d  #
-   d  d  d  d  d  #
-   #  #  #  #  #  #
-
-   #dig dig the interior of the room at high priority
-   d  d  d  d  d  #
-   d  d1(3x3)  d  #
-   d  `  `  `  d  #
-   d  `  `  `  d  #
-   d  d  d  d  d  #
-   #  #  #  #  #  #
-
-   #dig dig the interior of the room at high priority
-   4  4  4  4  4  #
-   4  1  1  1  4  #
-   4  1  1  1  4  #
-   4  1  1  1  4  #
-   4  4  4  4  4  #
-   #  #  #  #  #  #
+default priority). So all of these blueprints are equivalent::
+
+    #dig dig the interior of the room at high priority
+    d  d  d  d  d  #
+    d  d1 d1 d1 d  #
+    d  d1 d1 d1 d  #
+    d  d1 d1 d1 d  #
+    d  d  d  d  d  #
+    #  #  #  #  #  #
+
+    #dig dig the interior of the room at high priority
+    d  d  d  d  d  #
+    d  d1(3x3)  d  #
+    d  `  `  `  d  #
+    d  `  `  `  d  #
+    d  d  d  d  d  #
+    #  #  #  #  #  #
+
+    #dig dig the interior of the room at high priority
+    4  4  4  4  4  #
+    4  1  1  1  4  #
+    4  1  1  1  4  #
+    4  1  1  1  4  #
+    4  4  4  4  4  #
+    #  #  #  #  #  #
 
 Marker mode
 ~~~~~~~~~~~
@@ -449,67 +485,237 @@ any other designation letter to indicate that the tile should be designated in
 marker mode. For example, to dig out the perimeter of a room, but leave the
 center of the room marked for digging later::
 
-   #dig
-   d  d  d  d d #
-   d md md md d #
-   d md md md d #
-   d md md md d #
-   d  d  d  d d #
-   #  #  #  # # #
+    #dig
+    d  d  d  d d #
+    d md md md d #
+    d md md md d #
+    d md md md d #
+    d  d  d  d d #
+    #  #  #  # # #
 
-Then you can use "Toggle Standard/Marking" (:kbd:`d`:kbd:`M`) to convert the
-center tiles to regular designations at your leisure.
+Then you can use DF's "Toggle Standard/Marking" icons (DF calls them
+"blueprints", but hopefully that won't get too confusing in this context) to
+convert the center tiles to regular designations at your leisure.
 
 To apply an entire dig blueprint in marker mode, regardless of what the
 blueprint itself says, you can set the global quickfort setting
-``force_marker_mode`` to ``true`` before you apply the blueprint.
+``force_marker_mode`` to ``true`` before you apply the blueprint by running
+``quickfort set force_marker_mode true``.
 
-Note that the in-game UI setting "Standard/Marker Only" (:kbd:`d`:kbd:`m`) does
-not have any effect on quickfort.
+Note that the state of the in-game vanilla button that you use to draw
+designations in either Standard or "Blueprint" mode does not have any effect on
+`quickfort`.
 
-Stockpiles and zones
-~~~~~~~~~~~~~~~~~~~~
+Carved minecart tracks
+~~~~~~~~~~~~~~~~~~~~~~
+
+In the game, you carve a minecart track by specifying a beginning and ending
+tile, and the game "adds" the designation to the tiles in between. You cannot
+designate single tiles because DF needs a multi-tile track to figure out which
+direction the track should go on each tile. For example to carve two track
+segments that cross each other, you might use the cursor to designate a line of
+three vertical tiles like this::
+
+    ` start here ` #
+    ` `          ` #
+    ` end here   ` #
+    # #          # #
+
+Then to carve the cross, you'd do a horizontal segment::
+
+    `          ` `        #
+    start here ` end here #
+    `          ` `        #
+    #          # #        #
+
+This will result in a carved track that would be equivalent to a constructed
+track of the form::
+
+    #build
+    `      trackS    `      #
+    trackE trackNSEW trackW #
+    `      trackN    `      #
+    #      #         #      #
+
+Quickfort supports both styles of specification for carving tracks with ``#dig``
+blueprints. You can use the "additive" style to carve tracks in segments or you
+can use the ``track`` aliases to specify the track tile by tile. To designate
+track segments, use area expansion syntax with a height or width of 1::
+
+    #dig
+    `      T(1x3) ` #
+    T(3x1) `      ` #
+    `      `      ` #
+    #      #      # #
+
+"But wait!", I can hear you say, "How do you designate a track corner that opens
+to the South and East? You can't put both T(1xH) and T(Wx1) in the same cell!"
+This is true, but you can specify both width and height greater than 1, and for
+tracks, QF interprets it as an upper-left corner extending to the right W tiles
+and down H tiles. For example, to carve a track in a closed ring, you'd write::
+
+    #dig
+    T(3x3) ` T(1x3) #
+    `      ` `      #
+    T(3x1) ` `      #
+    #      # #      #
+
+You can also use negative numbers in the expansion syntax to indicate corners
+that are not upper-left corners. This blueprint will also carve a closed ring::
+
+    #dig
+    T(3x3) ` `        #
+    `      ` `        #
+    `      ` T(-3x-3) #
+    #      # #        #
+
+Or you could use the aliases to specify tile by tile::
+
+    #dig
+    trackSE trackEW trackSW #
+    trackNS `       trackNS #
+    trackNE trackEW trackNW #
+    #       #       #       #
+
+The aliases can also be used to designate a solid block of track. This is
+especially useful for obliterating low-quality engravings so you can re-smooth
+and re-engrave with higher quality. For example, you could use the following
+sequence of blueprints to ensure a 10x10 floor area contains only masterwork
+engravings::
+
+    #dig smooth floor
+    s(10x10)
+    #dig engrave floor
+    e(10x10)
+    #dig erase low-quality engravings
+    trackNSEW(10x10)
+
+The tracks only remove low-quality engravings since quickfort won't designate
+masterwork engravings for destruction (unless forced to by a commandline
+parameter). You would run (and let your dwarves complete the jobs for) the
+sequence of blueprints until no tiles are designated by the "erase" blueprint.
 
-It is very common to have stockpiles that accept multiple categories of items or
-zones that permit more than one activity. Although it is perfectly valid to
-declare a single-purpose stockpile or zone and then modify it with a ``#query``
-blueprint, quickfort also supports directly declaring all the types in the
-``#place`` and ``#zone`` blueprints. For example, to declare a 20x10 stockpile
-that accepts both corpses and refuse, you could write::
+#zone mode
+----------
 
-   #place refuse heap
-   yr(20x10)
+Zones define how regions of your fort should be treated. They are also the
+anchor point for "locations" like taverns and hospitals. Unlike stockpiles or
+buildings, zones can overlap, which can lead to some interesting layouts. See
+the full list of zone symbols in the `#zone mode reference`_.
 
-And similarly, to declare a zone that is a pasture, a fruit picking area, and a
-meeting area all at once::
+Zone designation syntax
+~~~~~~~~~~~~~~~~~~~~~~~
 
-   #zone main pasture and picnic area
-   nmg(10x10)
+A zone is declared with a symbol followed by optional properties::
+
+    #zone a single tile garbage dump zone
+    d
+
+    #zone a single tile garbage dump zone named "The Dump"
+    d{name="The Dump"}
+
+    #zone interrogation room
+    o{name=Interrogation assigned_unit=sheriff}
+
+    #zone a small inactive pond zone
+    p{name="Fill me" pond=true active=false}(3x3)
+
+If you want multiple zones that have the same footprint, they can be declared
+from the same cell::
+
+    #zone pasture and training area
+    n{name="Main pasture"}t{name="Pet training area"}(14x10)
+
+or from different corners of the same rectangle::
+
+    #zone pasture and training area
+    n{name="Main pasture"}(10x2)
+    t{name="Pet training area"}(10x-2)
+
+and you can use this technique to achieve partial overlap, of course. The only configuration that can't be specified in a single blueprint is multiple non-rectangular zones that are partially overlapping. You will have to use multiple ``#zone`` blueprints to achieve that.
+
+You can also use labels (see `Label syntax`_ above) to separate adjacent
+non-rectangular zones that happen to be of the same type or to combine
+disconnected regions into a single zone.
+
+Locations, locations, locations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Hospitals, guildhalls, taverns, libraries, and temples are locations. You can
+declare a location in the properties for a zone::
+
+    #zone metalcrafter hall
+    m{location=guildhall profession=metalcrafter}(7x7)
+
+You can attach multiple zones to a single location by giving the location a
+label (not a name -- you can name zones, but you can't directly name locations)
+and then using that label for each of the zones you want to attach::
+
+    #zone tavern and rented room
+    b{location=tavern/bigpub name="Rent me"}(3x1)
+    h{location=tavern/bigpub name="Central pub" allow=residents}(25x40)
+
+Note that the label ("bigpub" in this case) will never appear in-game. It is only used in the context of the blueprint to identify a common location.
+
+#place mode
+-----------
+
+``#place`` mode is dedicated to stockpiles, which are a major design element in any fortress.
+
+Stockpile designation syntax
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Just like zones, stockpiles can have properties like names or lists of other stockpiles to take from. Unlike zones, stockpiles can have configuration specifiers for exactly what types of items to accept. The full syntax looks like this::
+
+    types/label{properties}:configuration(expansion)
+
+with every component other than the type being optional. You're already
+familiar with `Property syntax`_, `Label syntax`_, and
+`Area expansion syntax`_, so let's focus in on the remaining elements.
+
+Stockpile types
+~~~~~~~~~~~~~~~
+
+The type of stockpile corresponds to the category of items it accepts. Some types will cause the stockpile to accept bins or barrels. See the full list in the `#place mode reference`_.
+
+It is very common to have stockpiles that accept multiple categories of items.
+Although it is perfectly valid to declare a single-purpose stockpile,
+`quickfort` also supports directly declaring all the categories at once. For
+example, to declare a 20x10 stockpile that accepts both corpses and refuse, you
+could write::
+
+    #place refuse heap
+    yr(20x10)
 
 The order of the individual letters doesn't matter. If you want to configure the
-stockpile from scratch in a ``#query`` blueprint, you can place unconfigured
-"custom" stockpiles with (:kbd:`c`). It is more efficient, though, to place
-stockpiles using the keys that represent the categories of items that you want
-to store, and then only use a ``#query`` blueprint if you need fine-grained
-customization.
+stockpile from scratch, you can place unconfigured "custom" stockpiles with (:kbd:`c`).
 
 .. _quickfort-place-containers:
 
-Stockpile bins, barrels, and wheelbarrows
-`````````````````````````````````````````
+Bins, barrels, and wheelbarrows
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Quickfort has global settings for default values for the number of bins,
 barrels, and wheelbarrows assigned to stockpiles, but these numbers can be set
-for individual stockpiles as well.
+for individual stockpiles as well in the properties.
 
-To set the number of bins, barrels, or wheelbarrows, just add a number after the
-letter that indicates what type of stockpile it is. For example::
+Individual properties for ``bins``, ``barrels``, and ``wheelbarrows`` are
+supported. You can also set them all at once with the ``containers`` alias (it
+usually just makes sense to set this to 0 when you don't want any containers of
+any type). For example::
 
     #place a stone stockpile with 5 wheelbarrows
-    s5(3x3)
+    s{wheelbarrows=5}(3x3)
 
     #place a bar, ammo, weapon, and armor stockpile with 20 bins
-    bzpd20(5x5)
+    bzpd{bins=20}(5x5)
+
+    #place a weapon stockpile with no bins
+    p{containers=0}(9x2)
+
+That last one could have equivalently used ``bins=0``, but sometimes you just
+don't want to have to think about which stockpile types take which type of
+container.
 
 If the specified number exceeds the number of available stockpile tiles, the
 number of available tiles is used. For wheelbarrows, that limit is reduced by 1
@@ -517,264 +723,201 @@ to ensure there is at least one non-wheelbarrow tile available in the stockpile.
 Otherwise no stone would ever be brought to the stockpile since all tiles would
 be occupied by wheelbarrows!
 
-Quickfort figures out which container type is being set by looking at the letter
-that comes just before the number. For example ``zf10`` means 10 barrels in a
-stockpile that accepts both ammo and food, whereas ``z10f`` means 10 bins. If
-the stockpile category doesn't usually use any container type, like refuse or
-corpses, wheelbarrows are assumed::
+Generating manager orders for a ``#place`` blueprint with explicitly set
+container/wheelbarrow counts will enqueue manager orders for the specified
+number of containers or wheelbarrows, even if that number exceeds the in-game
+size of the stockpile. For example, the following blueprint will enqueue orders
+for 10 rock pots, even though the stockpile only has 9 tiles::
+
+    #place
+    f{barrels=10}(3x3)
 
-    #place a corpse stockpile with 3 wheelbarrows
-    y3(3x3)
+Stockpile configuration
+~~~~~~~~~~~~~~~~~~~~~~~
 
-Note that if you are not using expansion syntax, each tile of the stockpile must
-have the same text. Otherwise the stockpile boundaries will not be detected
-properly::
+Quickfort uses the `stockpiles` plugin and `stockpiles-library` to configure
+stockpile settings, and provides a syntax that is easy to write in a blueprint
+yet still allows you to access the full power of the `stockpiles` command.
 
-    #place a non-rectangular animal stockpile with 5 wheelbarrows
-    a5,a5,a5,a5
-    a5,  ,  ,a5
-    a5,  ,  ,a5
-    a5,a5,a5,a5
+The syntax is::
 
-Running ``quickfort orders`` on a ``#place`` blueprint with explicitly set
-container/wheelbarrow counts will enqueue manager orders for the specified
-number of containers or wheelbarrows, even if that number exceeds the in-game
-size of the stockpile. For example, ``quickfort orders`` on the following
-blueprint will enqueue 10 rock pots, even though the stockpile only has 9
-tiles::
+    : <op> <preset_name> [/<filter>] [<op> <preset_name> [/<filter>]...]
+
+``<op>`` is one of ``=``, ``-``, or ``+``, representing the three `stockpiles`
+import modes: ``set``, ``disable``, or ``enable``, respectively. Note that if
+you are using an ``=`` op, then it should go first in the list. Any ``=``
+configuration segment will override anything that comes before it.
+
+For example, a blueprint like::
 
     #place
-    f10(3x3)
+    f:=booze(5x4)
 
-Zone detailed configuration
-```````````````````````````
+would be equivalent to creating a 5x4 food stockpile in the UI, then selecting it and running this command::
 
-Detailed configuration for zones, such as the pit/pond toggle, can also be set
-by mimicking the hotkeys used to set them. Note that gather flags default to
-true, so specifying them in a blueprint will turn the toggles off. If you need
-to set configuration from multiple zone subscreens, separate the key sections
-with :kbd:`^`. Note the special syntax for setting hospital supply levels, which
-have no in-game hotkeys::
+    stockpiles import --mode=set booze
 
-   #zone a combination hospital and shrub (but not fruit) gathering zone
-   gGtf^hH{hospital buckets=5 splints=20}(10x10)
+you can also add a slash (``/``) and a comma-separated list of filter strings
+to customize the settings further::
 
-The valid hospital settings (and their maximum values) are::
+    #place
+    p{name="Metal weapons"}:-cat_weapons/other/(7x3)
 
-    thread   (1500000)
-    cloth    (1000000)
-    splints  (100)
-    crutches (100)
-    plaster  (15000)
-    buckets  (100)
-    soap     (15000)
+Note that the "op" in this case lets us disable the matched preset, which in
+this case is the "Other materials" types in the Weapons category. This
+configuration is equivalent to the `stockpiles` command::
 
-To toggle the ``active`` flag for zones, add an :kbd:`a` character to the
-string. For example, to create a *disabled* pond zone (that you later intend to
-carefully fill with 3-depth water for a dwarven bathtub)::
+    stockpiles import --mode=disable cat_weapons --filter=other/
 
-   #zone disabled pond zone
-   apPf(1x3)
+And we can chain multiple `stockpiles` commands together by adding another "op"
+character and another preset::
 
-Minecart tracks
-~~~~~~~~~~~~~~~
+    #place
+    p{name="Steel weapons"}:-cat_weapons/mats/,other/+steelweapons(7x3)
 
-There are two ways to produce minecart tracks, and they are handled very
-differently by the game. You can carve them into hard natural floors or you can
-construct them out of building materials. Constructed tracks are conceptually
-simpler, so we'll start with them.
-
-Constructed tracks
-``````````````````
-
-Quickfort supports the designation of track stops and rollers in ``#build``
-blueprints. You can build a track stop with :kbd:`C`:kbd:`S` and some number of
-:kbd:`d` and :kbd:`a` characters for selecting dump direction and friction. You
-can build a roller with :kbd:`M`:kbd:`r` and some number of :kbd:`s` and
-:kbd:`q` characters for direction and speed. However, this can get confusing
-very quickly and is very difficult to read in a blueprint. Moreover, constructed
-track segments don't even have keys associated with them at all!
-
-To solve this problem, Quickfort provides the following keywords for use in
-build blueprints::
-
-   -- Track segments --
-   trackN
-   trackS
-   trackE
-   trackW
-   trackNS
-   trackNE
-   trackNW
-   trackSE
-   trackSW
-   trackEW
-   trackNSE
-   trackNSW
-   trackNEW
-   trackSEW
-   trackNSEW
-
-   -- Track/ramp segments --
-   trackrampN
-   trackrampS
-   trackrampE
-   trackrampW
-   trackrampNS
-   trackrampNE
-   trackrampNW
-   trackrampSE
-   trackrampSW
-   trackrampEW
-   trackrampNSE
-   trackrampNSW
-   trackrampNEW
-   trackrampSEW
-   trackrampNSEW
-
-   -- Horizontal and vertical roller segments --
-   rollerH
-   rollerV
-   rollerNS
-   rollerSN
-   rollerEW
-   rollerWE
-
-   Note: append up to four 'q' characters to roller keywords to set roller
-   speed. E.g. a roller that propels from East to West at the slowest speed can
-   be specified with 'rollerEWqqqq'.
-
-   -- Track stops that (optionally) dump to the N/S/E/W --
-   trackstop
-   trackstopN
-   trackstopS
-   trackstopE
-   trackstopW
-
-   Note: append up to four 'a' characters to trackstop keywords to set friction
-   amount. E.g. a stop that applies the smallest amount of friction can be
-   specified with 'trackstopaaaa'.
-
-As an example, you can create an E-W track with stops at each end that dump to
-their outside directions with the following blueprint::
-
-   #build Example track
-   trackstopW trackEW trackEW trackEW trackstopE
-
-Note that the **only** way to build track and track/ramp segments is with the
-keywords. The UI method of using :kbd:`+` and :kbd:`-` keys to select the track
-type from a list does not work since DFHack Quickfort doesn't actually send keys
-to the UI to build buildings. The text in your spreadsheet cells is mapped
-directly onto DFHack API calls. Only ``#query`` blueprints send actual keycodes
-to the UI.
-
-Carved tracks
-`````````````
+which corresponds to running these two commands::
 
-In the game, you carve a minecart track by specifying a beginning and ending
-tile and the game "adds" the designation to the tiles in between. You cannot
-designate single tiles because DF needs a multi-tile track to figure out which
-direction the track should go on each tile. For example to carve two track
-segments that cross each other, you might use the cursor to designate a line of
-three vertical tiles like this::
+    stockpiles import --mode=disable cat_weapons --filter=mats/,other/
+    stockpiles import --mode=enable steelweapons
 
-   ` start here ` #
-   ` `          ` #
-   ` end here   ` #
-   # #          # #
+With the combination of the library presets and custom filter strings, you can
+configure any stockpile any way you like!
 
-Then to carve the cross, you'd do a horizontal segment::
+#build mode
+-----------
 
-   `          ` `        #
-   start here ` end here #
-   `          ` `        #
-   #          # #        #
+``#build`` mode handles buildings, furniture (which are also "buildings"
+according to DF), constructions (including constructed tracks), and hauling
+routes.
 
-This will result in a carved track that would be equivalent to a constructed
-track of the form::
+Building designation syntax
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-   #build
-   `      trackS    `      #
-   trackE trackNSEW trackW #
-   `      trackN    `      #
-   #      #         #      #
+Other than names, most buildings do not have any extra properties. See the
+`#build mode reference`_ for those that do.
 
-Quickfort supports both styles of specification for carving tracks with ``#dig``
-blueprints. You can use the "additive" style to carve tracks in segments or you
-can use the aliases to specify the track tile by tile. To designate track
-segments, use area expansion syntax with a height or width of 1::
+The syntax otherwise looks just like stockpiles, except that it only makes
+sense to have a single symbol to indicate what to build on that tile::
 
-   #dig
-   `      T(1x3) ` #
-   T(3x1) `      ` #
-   `      `      ` #
-   #      #      # #
+    symbol{properties}:configuration(expansion)
 
-"But wait!", I can hear you say, "How do you designate a track corner that opens
-to the South and East? You can't put both T(1xH) and T(Wx1) in the same cell!"
-This is true, but you can specify both width and height greater than 1, and for
-tracks, QF interprets it as an upper-left corner extending to the right W tiles
-and down H tiles. For example, to carve a track in a closed ring, you'd write::
+Here's an example of a simple 5x5 square of flooring::
 
-   #dig
-   T(3x3) ` T(1x3) #
-   `      ` `      #
-   T(3x1) ` `      #
-   #      # #      #
+    #build
+    Cf(5x5)
 
-You can also use negative numbers in the expansion syntax to indicate corners
-that are not upper-left corners. This blueprint will also carve a closed ring::
+or a named Jeweler's workshop that takes from specific stockpiles::
 
-   #dig
-   T(3x3) ` `        #
-   `      ` `        #
-   `      ` T(-3x-3) #
-   #      # #        #
+    #build
+    wj{name="Encrusting center" take_from="Furniture,Gem storage"}
 
-Or you could use the aliases to specify tile by tile::
+The ``:configuration`` part is only relevant for hauling routes, which we'll go
+over in the next section.
 
-   #dig
-   trackSE trackEW trackSW #
-   trackNS `       trackNS #
-   trackNE trackEW trackNW #
-   #       #       #       #
+Hauling route definitions
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The aliases can also be used to designate a solid block of track. This is
-especially useful for obliterating low-quality engravings so you can re-smooth
-and re-engrave with higher quality. For example, you could use the following
-sequence of blueprints to ensure a 10x10 floor area contains only masterwork
-engravings::
+Hauling routes are defined by properties and configuration attached to track
+stops. You can define a single-stop hauling route for a quantum stockpile as
+easily as a multi-stop stone quarry transportation line. The stockpile-like
+``:configuration`` part of the syntax controls which item types are considered
+"desired" for the hauling route stop. If it's not specified, then all item
+types are accepted. This is the most common case since most hauling route
+contents are filtered by the stockpiles that the stops take from, but the
+flexibility is there for when multiple stops take different items from the same
+stockpile, or when a stop only wants a subset of items from a stockpile.
 
-    #dig smooth floor
-    s(10x10)
-    #dig engrave floor
-    e(10x10)
-    #dig erase low-quality engravings
-    trackNSEW(10x10)
+Here is a common setup for a quantum stone stockpile::
 
-The tracks only remove low-quality engravings since quickfort won't designate
-masterwork engravings for destruction (unless forced to by a commandline
-parameter). You would run (and let your dwarves complete the jobs for) the
-sequence of blueprints until no tiles are designated by the "erase" blueprint.
+    #place
+    s{name="Stone quantum" quantum=true} ~ s5{name="Stone feeder"}(3x3)
+    #build
+    ~ trackstopW{take_from="Stone feeder" route="Stone dumper"}
+
+This sets up the quantum stockpile and the feeder stockpile in the ``#place``
+blueprint, followed by the trackstop and the hauling route configuration in the
+``#build`` blueprint. The ``route`` property is the name of the hauling route
+to create (or attach to if it already exists). If you are applying a quantum
+stockpile blueprint more than once in a fort, be sure to *avoid* defining the
+``route`` property so that each application of the blueprint creates a unique
+hauling route. Two quantum stockpiles on the same route will not function
+properly (since one of the stops will be missing a minecart).
+
+Let's look at a slightly more complicated setup where we sort the stone into
+different output quantum stockpiles::
+
+    #place
+    s{name="Other stone quantum" quantum=true}    ~ s5e{name="Rock feeder"}(3x3)
+    s{name="Ore/clay stone quantum" quantum=true} ~
+    s{name="Gem quantum" quantum=true}            ~
+    #build
+    ~ trackstopW{take_from="Rock feeder" route="Other stone"}:=otherstone
+    ~ trackstopW{take_from="Rock feeder" route="Ore/clay"}:=cat_stone-otherstone
+    ~ trackstopW{take_from="Rock feeder" route="Gems"}:=cat_gems
+
+You can see how we make use of the stockpile-style configuration syntax to
+fine-tune the items desired by the hauling route stop.
+
+Finally, let's make a series of stops on a common hauling route. There is
+nothing particularly special about this example. If the ``route`` property
+names an existing route, the stop will be added to that route::
+
+    #dig
+    trackE trackEW trackEW trackW
+    #build
+    trackstop{route="Tick tock"} ~ ~ trackstop{route="Tick tock"}
+
+These two track stops (which do not dump their contents) simply exist on a
+common route at the ends of a connected carved track.
+
+#burrow mode
+------------
+
+``#burrow`` mode can create, extend, and remove tiles from burrows.
+
+Burrow designation syntax
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The syntax should look familiar by now::
+
+    symbol{properties}(expansion)
+
+See the `#burrow mode reference`_ for symbol and property definitions.
+
+Here's how to create (or add to, if a burrow by that name already exists) a
+5x5 burrow named ``Inside+``. It will also register this burrow with
+`gui/civ-alert` if no burrow has yet been registered::
+
+    #burrow
+    a{create=true name=Inside+ civalert=true}(5x5)
+
+Why the trailing ``+``? That's to indicate to the `burrow` plugin that the
+burrow should grow as adjacent tiles are dug out.
+
+Similarly, here is how to erase a tile from all burrows that currently include
+it::
+
+    #burrow
+    e
 
 .. _quickfort-modeline:
 
 Modeline markers
-~~~~~~~~~~~~~~~~
+----------------
 
 The modeline has some additional optional components that we haven't talked
 about yet. You can:
 
--  give a blueprint a label by adding a ``label()`` marker
--  set a cursor offset and/or cursor placement hint by adding a ``start()``
-   marker
--  hide a blueprint from being listed with a ``hidden()`` marker
--  register a message to be displayed after the blueprint is successfully
-   applied with a ``message()`` marker
+- give a blueprint a label by adding a ``label()`` marker
+- set a cursor offset and/or cursor placement hint by adding a ``start()``
+  marker
+- hide a blueprint from being listed with a ``hidden()`` marker
+- register a message to be displayed after the blueprint is successfully
+  applied with a ``message()`` marker
 
 The full modeline syntax, when all optional elements are specified, is::
 
-   #mode label(mylabel) start(X;Y;STARTCOMMENT) hidden() message(mymessage) comment
+    #mode label(mylabel) start(X;Y;startcomment) hidden() message(mymessage) comment
 
 Note that all elements are optional except for the initial ``#mode`` (though, as
 mentioned in the first section, if a modeline doesn't appear at all in the first
@@ -782,117 +925,177 @@ cell of a spreadsheet, the blueprint is interpreted as a ``#dig`` blueprint with
 no optional markers). Here are a few examples of modelines with optional
 elements before we discuss them in more detail::
 
-   #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
-   #build label(noblebedroom) start(10;15)
-   #query label(configstockpiles) No explicit 'start()' means cursor is at upper left corner
-   #meta label(digwholefort) start(center of stairs on surface)
-   #dig label(digdining) hidden() called by the digwholefort meta blueprint
-   #zone label(pastures) message(remember to assign animals to the new pastures)
+    #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
+    #build label(noblebedroom) No explicit 'start()' so cursor is in upper left
+    #meta label(digwholefort) start(center of stairs on surface)
+    #dig label(dig_dining) hidden() called by the digwholefort meta blueprint
+    #zone label(pastures) message(remember to assign animals to the pastures)
 
 .. _quickfort-label:
 
 Blueprint labels
-````````````````
-
-Labels are displayed in the ``quickfort list`` output and are used for
-addressing specific blueprints when there are multiple blueprints in a single
-file or spreadsheet sheet (see `Packaging a set of blueprints`_ below). If a
-blueprint has no label, the label becomes the ordinal of the blueprint's
-position in the file or sheet. For example, the label of the first blueprint
-will be "1" if it is not otherwise set, the label of the second blueprint will
-be "2" if it is not otherwise set, etc. Labels that are explicitly defined must
-start with a letter to ensure the auto-generated labels don't conflict with
-user-defined labels.
+~~~~~~~~~~~~~~~~
+
+Labels are displayed in the blueprint selection dialog and the output of
+``quickfort list`` and are used for addressing specific blueprints when there
+are multiple blueprints in a single file or spreadsheet sheet (see
+`Packaging a set of blueprints`_ below). If a blueprint has no label, the label
+becomes the ordinal of the blueprint's position in the file or sheet. For
+example, the label of the first blueprint will be "1" if it is not otherwise
+set, the label of the second blueprint will be "2" if it is not otherwise set,
+etc. Labels that are explicitly defined must start with a letter to ensure the
+auto-generated labels don't conflict with user-defined labels.
 
 .. _quickfort-start:
 
 Start positions
-```````````````
+~~~~~~~~~~~~~~~
 
 Start positions specify a cursor offset for a particular blueprint, simplifying
 the task of blueprint alignment. This is very helpful for blueprints that are
 based on a central staircase, but it comes in handy whenever a blueprint has an
 obvious "center". For example::
 
-   #build start(2;2;center of workshop) label(masonw) a mason workshop
-   wm wm wm #
-   wm wm wm #
-   wm wm wm #
-   #  #  #  #
+    #build start(2;2;center of workshop) label(stonew) a stonecutter workshop
+    wm wm wm #
+    wm wm wm #
+    wm wm wm #
+    #  #  #  #
 
 will build the workshop *centered* on the cursor, not down and to the right of
 the cursor.
 
 The two numbers specify the column and row (or 1-based X and Y offset) where the
 cursor is expected to be when you apply the blueprint. Position ``1;1`` is the
-top left cell. The optional comment will show up in the ``quickfort list``
-output and should contain information about where to position the cursor. If the
-start position is ``1;1``, you can omit the numbers and just add a comment
-describing where to put the cursor. This is also useful for meta blueprints that
-don't actually care where the cursor is, but that refer to other blueprints that
-have fully-specified ``start()`` markers. For example, a meta blueprint that
-refers to the ``masonw`` blueprint above could look like this::
+top left cell. The optional comment will show up in the blueprint listings and
+should contain information about where to position the cursor. If the start
+position is ``1;1``, you can omit the numbers and just add a comment describing
+where to put the cursor. This is also useful for meta blueprints that don't
+actually care where the cursor is, but that refer to other blueprints that have
+fully-specified ``start()`` markers. For example, a meta blueprint that refers to the ``stonew`` blueprint above could look like this::
 
-   #meta start(center of workshop) a mason workshop
-   /masonw
+    #meta start(center of workshop) a stonecutter workshop
+    /stonew
 
 You can use semicolons, commas, or spaces to separate the elements of the
-``start()`` marker, whatever is most convenient.
+``start()`` marker, whichever you prefer.
 
 .. _quickfort-hidden:
 
 Hiding blueprints
-`````````````````
+~~~~~~~~~~~~~~~~~
 
-A blueprint with a ``hidden()`` marker won't appear in ``quickfort list`` output
-unless the ``--hidden`` flag is specified. The primary reason for hiding a
-blueprint (rather than, say, deleting it or moving it out of the ``blueprints/``
-folder) is if a blueprint is intended to be run as part of a larger sequence
-managed by a `meta blueprint <quickfort-meta>`.
+A blueprint with a ``hidden()`` marker won't appear in the blueprint listings
+unless hidden blueprints are specifically requested. The primary reason for
+hiding a blueprint (rather than, say, deleting it or moving it out of the
+``blueprints/`` folder) is if a blueprint is intended to be run as part of a
+larger sequence managed by a `meta blueprint <quickfort-meta>`.
 
 .. _quickfort-message:
 
 Messages
-````````
+~~~~~~~~
 
 A blueprint with a ``message()`` marker will display a message after the
-blueprint is applied with ``quickfort run``. This is useful for reminding
-players to take manual steps that cannot be automated, like assigning minecarts
-to a route, or listing the next step in a series of blueprints. For long or
-multi-part messages, you can embed newlines::
+blueprint is applied. This is useful for reminding players to take manual steps
+that cannot be automated, like assigning minecarts to a route, or listing the
+next step in a series of blueprints. For long or multi-part messages, you can
+embed newlines::
 
-   "#meta label(surface1) message(This would be a good time to start digging the industry level.
-   Once the area is clear, continue with /surface2.) clear the embark site and set up pastures"
+    "#meta label(surface1) message(This would be a good time to start digging the industry level.
+    Once the area is clear, continue with /surface2.) clear the embark site and set up pastures"
 
 The quotes surrounding the cell text are only necessary if you are writing a
 .csv file by hand. Spreadsheet applications will surround multi-line text with
 quotes automatically when they save/export the file.
 
+.. _quickfort-other-modes:
+
+Other blueprint modes
+---------------------
+
+There are a few additional blueprint modes that become useful when you are
+sharing your blueprints with others or managing complex blueprint sets. Instead
+of mapping tile positions to map modifications like the basic modes do, these
+"blueprints" have specialized, higher-level uses:
+
+==============  ===========
+Blueprint mode  Description
+==============  ===========
+notes           Display long messages, such as help text or blueprint
+                walkthroughs
+ignore          Hide a section of your spreadsheet from quickfort, useful for
+                scratch space or personal notes
+meta            Script sequences of blueprints together, transform them, and/or
+                repeat them across multiple z-levels
+==============  ===========
+
+.. _quickfort-notes:
+
+#notes mode
+~~~~~~~~~~~
+
+Sometimes you just want to record some information about your blueprints, such
+as when to apply them, what preparations you need to make, or what the
+blueprints contain. The `message() <quickfort-message>` modeline marker is
+useful for small, single-line messages, but a ``#notes`` blueprint is more
+convenient for long messages or messages that span many lines. The lines in a
+``#notes`` blueprint are output as if they were contained within one large
+multi-line ``message()`` marker. For example, the following (empty) ``#meta``
+blueprint::
+
+    "#meta label(help) message(This is the help text for the blueprint set
+    contained in this file.
+
+    First, make sure that you embark in...) blueprint set walkthrough"
+
+could more naturally be written as a ``#notes`` blueprint::
+
+    #notes label(help) blueprint set walkthrough
+    This is the help text for the blueprint set
+    contained in this file
+
+    First, make sure that you embark in...
+
+The ``#meta`` blueprint is all squashed into a single spreadsheet cell, using
+embedded newlines. Each line of the ``#notes`` "blueprint", however, is in a
+separate cell, allowing for much easier viewing and editing.
+
+#ignore mode
+~~~~~~~~~~~~
+
+If you don't want some data to be visible to quickfort at all, use an
+``#ignore`` blueprint. All lines until the next modeline in the file or sheet
+will be completely ignored. This can be useful for personal notes, scratch
+space, or temporarily "commented out" blueprints.
+
 .. _quickfort-meta:
 
-Meta blueprints
-~~~~~~~~~~~~~~~
+#meta mode
+~~~~~~~~~~
+
+``#meta`` blueprints are blueprints that control how other blueprints are
+applied. For example, meta blueprints can bundle a group of other blueprints so
+that they can be run with a single command. They can also encode logic, like
+rotating the blueprint or duplicating it across a specified number of z-levels.
 
-Meta blueprints are blueprints that control how other blueprints are applied.
-For example, meta blueprints can bundle a group of other blueprints so that they
-can be run with a single command. They can also encode logic, like rotating the
-blueprint or duplicating it across a specified number of z-levels.
+Scripting blueprints together
+`````````````````````````````
 
 A common scenario where meta blueprints are useful is when you have several
 phases to link together. For example you might:
 
 1.  Apply a dig blueprint to designate dig areas
 #.  Wait for miners to dig
+#.  **Apply another dig blueprint** to designate traffic costs
+#.  **Apply a zone blueprint** to designate zones
+#.  **Apply a place buildprint** to designate and configure stockpiles
 #.  **Apply a build buildprint** to designate buildings
-#.  **Apply a place buildprint** to designate stockpiles
-#.  **Apply a query blueprint** to configure stockpiles
-#.  Wait for buildings to get built
-#.  Apply a different query blueprint to configure rooms
 
-Those three "apply"s in the middle might as well get done in one command instead
-of three. A ``#meta`` blueprint can help with that. A meta blueprint refers to
+Those last four "apply"s might as well get done in one command instead of four.
+A ``#meta`` blueprint can help with that. A meta blueprint refers to
 other blueprints in the same file by their label (see the `Modeline markers`_
-section above) in the same format used by the `quickfort` command:
+section) in the same format used by the `quickfort` command:
 ``<sheet name>/<label>``, or just ``/<label>`` for blueprints in .csv files or
 blueprints in the same spreadsheet sheet as the ``#meta`` blueprint that
 references them.
@@ -900,40 +1103,35 @@ references them.
 A few examples might make this clearer. Say you have a .csv file with blueprints
 that prepare bedrooms for your dwarves::
 
-   #dig label(bed1) dig out the rooms
-   ...
-   #build label(bed2) build the furniture
-   ...
-   #place label(bed3) add food stockpiles
-   ...
-   #query label(bed4) configure stockpiles
-   ...
-   #query label(bed5) set the built beds as rooms
-   ...
+    #dig label(bed1) dig out the rooms
+    ...
+    #zone label(bed2) declare bedroom zones
+    ...
+    #place label(bed3) add food stockpiles
+    ...
+    #build label(bed4) build the furniture
+    ...
 
 Note how I've given them all labels so we can address them safely. If I hadn't
 given them labels, they would receive default labels of "1", "2", "3", etc, but
 those labels would change if I ever add more blueprints at the top. This is not
-a problem if we're just running the blueprints individually from the
-``quickfort list`` command, but meta blueprints need a label name that isn't
-going to change over time.
+a problem if we're just running the blueprints individually from
+`gui/quickfort` or the ``quickfort list`` command, but meta blueprints need a
+label name that isn't going to change over time.
 
-So let's add a meta blueprint to this file that will combine the middle three
+So let's add a meta blueprint to this file that will combine the last three
 blueprints into one::
 
-   "#meta label(bed234) combines build, place, and stockpile config blueprints"
-   /bed2
-   /bed3
-   /bed4
+    "#meta label(bed234) combines zone, place, and build blueprints"
+    /bed2
+    /bed3
+    /bed4
 
 Now your sequence is shortened to:
 
 1.  Run /bed1 to designate dig areas
 #.  Wait for miners to dig
-#.  **Run /bed234 meta buildprint** to build buildings and designate/configure
-    stockpiles
-#.  Wait for buildings to get built
-#.  Run /bed5 to configure the rooms as bedrooms
+#.  **Run /bed234 meta buildprint** to declare zones, place stockpiles, and build furniture
 
 You can use meta blueprints to lay out your fortress at a larger scale as well.
 The ``#<`` and ``#>`` notation is valid in meta blueprints, so you can, for
@@ -957,43 +1155,38 @@ dig_bedrooms   one #dig blueprint, no label
 We can add a sheet named "dig_all" with the following contents (we're expecting
 a big fort, so we're digging 5 levels of bedrooms)::
 
-   #meta dig the whole fortress
-   dig_farming/1
-   #>
-   dig_industry/1
-   #>
-   dig_dining/main
-   #>
-   dig_dining/basement
-   #>
-   dig_dining/waterway
-   #>
-   dig_dining/cistern
-   #>
-   dig_guildhall/1
-   #>
-   dig_suites/1
-   #>
-   dig_bedrooms/1 repeat(down 5)
+    #meta label(dig_it) dig the whole fortress
+    dig_farming/1
+    #>
+    dig_industry/1
+    #>
+    dig_dining/main
+    #>
+    dig_dining/basement
+    #>
+    dig_dining/waterway
+    #>
+    dig_dining/cistern
+    #>
+    dig_guildhall/1
+    #>
+    dig_suites/1
+    #>
+    dig_bedrooms/1 repeat(down 5)
 
 Note that for blueprints without an explicit label, we still need to address
 them by their auto-generated numeric label.
 
-The command to run the meta blueprint above would be::
-
-    quickfort run myfort.xlsx -n dig_all
-
 It's worth repeating that ``#meta`` blueprints can only refer to blueprints that
 are defined in the same file. This means that all blueprints that a meta
 blueprint needs to run must be in sheets within the same .xlsx spreadsheet or
 concatenated into the same .csv file.
 
 You can then hide the blueprints that you now manage with the meta blueprint
-from ``quickfort list`` by adding a ``hidden()`` marker to their modelines. That
-way the output of ``quickfort list`` won't be cluttered by blueprints that you
-don't need to run directly. If you ever *do* need to access the meta-managed
-blueprints individually, you can still see them with
-``quickfort list --hidden``.
+from the blueprint selection lists by adding a ``hidden()`` marker to their
+modelines. That way, the blueprint lists won't be cluttered by blueprints that
+you don't need to run directly. If you ever *do* need to access the meta-managed
+blueprints individually, you can still see them by toggling the "Hidden" setting in the `gui/quickfort` load dialog or with ``quickfort list --hidden``.
 
 Meta markers
 ````````````
@@ -1072,163 +1265,14 @@ Transforming build blueprints will also change the properties of buildings that
 care about direction. For example, a bridge that opens to the North, rotated
 clockwise, will open to the East when applied to the map.
 
-Direction keys that move the cursor on the map will also be transformed. For
-example, the keys ``g{Up 4}&`` that would cause a stockpile to give to a
-workshop 4 tiles to the North become ``g{Right 4}&`` when played back on a
-clockwise-rotated ``#query`` blueprint. Direction keys that don't move the map
-cursor, for example when on the stockpile configuration screen, are not changed
-by blueprint rotation.
-
-.. _quickfort-other-modes:
-
-Other blueprint modes
-~~~~~~~~~~~~~~~~~~~~~
-
-In addition to the powerful ``#meta`` mode described above, there are a few
-additional blueprint modes that become useful when you are sharing your
-blueprints with others or managing complex blueprint sets. Instead of mapping
-tile positions to map modifications like the basic modes do, these "blueprints"
-have specialized, higher-level uses:
-
-==============  ===========
-Blueprint mode  Description
-==============  ===========
-config          Play back key sequences that are not related to map tiles
-notes           Display long messages, such as help text or blueprint
-                walkthroughs
-aliases         Define aliases that can be used by other ``#query`` blueprints
-                in the same file
-ignore          Hide a section of your spreadsheet from quickfort, useful for
-                scratch space or personal notes
-==============  ===========
-
-.. _quickfort-config-blueprints:
-
-Config blueprints
-`````````````````
-
-A ``#config`` blueprint is used to send unfiltered keystrokes directly to the
-DF UI without interacting with specific map tiles. They have access to the same
-keystroke aliases as ``#query`` blueprints, but ``#config`` blueprints differ
-from ``#query`` blueprints in a few critical ways:
-
-- Whereas the "home" mode for ``#query`` blueprints is the "query" mode
-  (:kbd:`q`), ``#config`` blueprints start on the default map screen -- the view
-  you have when you're looking at the map with no sidebar visible. The keystroke
-  or alias sequence in each spreadsheet cell in a ``#config`` blueprint must
-  begin and end on the default map screen.
-- The cursor position is not set for ``#config`` blueprints. This means that it
-  doesn't matter what spreadsheet cell you put your text in. The blueprint cell
-  location does not correspond to a map tile.
-
-A ``#config`` blueprint is best used for accessing game menus that are not
-associated with map tiles, such as the hotkey menu (:kbd:`H`), the military
-menu (:kbd:`m`), or the standing orders menu (:kbd:`o`). In other words, use a
-``#config`` blueprint when you want to configure the game itself, not the tiles
-on the map. A ``#config`` blueprint is better for these menus than a ``#query``
-blueprint because the cursor can jump around in unpredictable ways when
-accessing these non-cursor modes and then re-entering query mode. This will
-cause quickfort to detect a ``#query`` blueprint error and stop executing.
-Also, ``#query`` blueprints will skip playing back a key sequence entirely if
-it doesn't detect a building or zone on the target tile. A ``#config``
-blueprint doesn't need a building or zone to exist in order to run.
-
-Note that you *can* enter any mode you want during a ``#config`` blueprint
-keystroke sequence (as long as you get back to the default map screen by the end
-of the sequence), even modes that provide a cursor on the screen. It's just that
-the position of that cursor is not guaranteed to be on any specific tile. If you
-need access to a cursor, you probably should be using a ``#query`` blueprint
-instead.
-
-.. _quickfort-notes:
-
-Notes blueprints
-````````````````
-
-Sometimes you just want to record some information about your blueprints, such
-as when to apply them, what preparations you need to make, or what the
-blueprints contain. The `message() <quickfort-message>` modeline marker is
-useful for small, single-line messages, but a ``#notes`` blueprint is more
-convenient for long messages or messages that span many lines. The lines in a
-``#notes`` blueprint are output as if they were contained within one large
-multi-line ``message()`` marker. For example, the following (empty) ``#meta``
-blueprint::
-
-   "#meta label(help) message(This is the help text for the blueprint set
-   contained in this file.
-
-   First, make sure that you embark in...) blueprint set walkthrough"
-
-could more naturally be written as a ``#notes`` blueprint::
-
-   #notes label(help) blueprint set walkthrough
-   This is the help text for the blueprint set
-   contained in this file
-
-   First, make sure that you embark in...
-
-The ``#meta`` blueprint is all squashed into a single spreadsheet cell, using
-embedded newlines. Each line of the ``#notes`` "blueprint", however, is in a
-separate cell, allowing for much easier viewing and editing.
-
-.. _quickfort-aliases-blueprints:
-
-Aliases blueprints
-``````````````````
-
-There are keystroke aliases that `come with DFHack <quickfort-alias-guide>` that
-are usable by all blueprints, and you have the ability to define custom aliases
-in :source:`dfhack-config/quickfort/aliases.txt` that are visible to all your
-blueprints as well. An ``#aliases`` blueprint can define custom aliases that are
-only visible to the current ``.csv`` or ``.xlsx`` file. Packaging aliases in the
-same file that uses them is convenient for specialized aliases that are only
-useful to a particular blueprint. Also, if you want to share your blueprint with
-others, defining your aliases in an ``#aliases`` blueprint will help your
-blueprint to work "out of the box", and you won't need others to add your custom
-aliases to their ``dfhack-config/quickfort/aliases.txt`` files.
-
-Although we're calling them "blueprints", ``#aliases`` blueprints are not actual
-blueprints, and they don't show up when you run ``quickfort list``. The aliases
-are just automatically read in when you run any ``#query`` blueprint that is
-defined in the same file.
-
-Aliases can be in either of two formats, and you can mix formats freely within
-the same ``#aliases`` section. The first format is the same as what is used in
-the ``aliases.txt`` files::
-
-    #aliases
-    aliasname: aliasdefinition
-
-Aliases in this format must appear in the first column of a row.
-
-The second format has the alias name in the first column and the alias
-definition in the second column, with no ``:`` separator::
-
-    #aliases
-    aliasname,aliasdefinition
-
-There can be multiple #aliases sections defined in a .csv file or .xlsx
-spreadsheet. The aliases are simply combined into one list. If an alias is
-defined multiple times, the last definition wins.
-
-See the `quickfort-alias-guide` for help with the alias definition syntax.
-
-Ignore blueprints
-`````````````````
-
-If you don't want some data to be visible to quickfort at all, use an
-``#ignore`` blueprint. All lines until the next modeline in the file or sheet
-will be completely ignored. This can be useful for personal notes, scratch
-space, or temporarily "commented out" blueprints.
-
 .. _quickfort-packaging:
 
 Packaging a set of blueprints
 -----------------------------
 
-A complete specification for a section of your fortress may contain 5 or more
-separate blueprints, one for each "phase" of construction (dig, build, place
-stockpiles, designate zones, and query adjustments).
+A complete specification for a section of your fortress may contain 4 or more
+separate blueprints, one for each "phase" of construction (dig, zone, place,
+build).
 
 To manage all the separate blueprints, it is often convenient to keep related
 blueprints in a single file. For .xlsx spreadsheets, you can keep each blueprint
@@ -1246,75 +1290,57 @@ than a directory of files.
 
 For example, you can write multiple blueprints in one file like this::
 
-   #dig label(bed1)
-   d d d d #
-   d d d d #
-   d d d d #
-   d d d d #
-   # # # # #
-   #build label(bed2)
-   b   f h #
-           #
-           #
-   n       #
-   # # # # #
-   #place label(bed3)
+    #dig label(bed1)
+    d d d d #
+    d d d d #
+    d d d d #
+    d d d d #
+    # # # # #
+    #zone label(bed2)
+    b(4x4)  #
+            #
+            #
+            #
+    # # # # #
+    #place label(bed3)
+            #
+    f(2x2)  #
+            #
            #
-   f(2x2)  #
-           #
-           #
-   # # # # #
-   #query label(bed4)
-           #
-   booze   #
-           #
-           #
-   # # # # #
-   #query label(bed5)
-   r{+ 3}& #
-           #
-           #
-           #
-   # # # # #
+     # # # # #
+    #build label(bed4)
+    b   f h #
+            #
+            #
+    t c     #
+    # # # # #
 
 Of course, you could still choose to keep your blueprints in separate files and
 just give related blueprints similar names::
 
-   bedroom.1.dig.csv
-   bedroom.2.build.csv
-   bedroom.3.place.csv
-   bedroom.4.query.csv
-   bedroom.5.query2.csv
+    bedroom.1.dig.csv
+    bedroom.2.zone.csv
+    bedroom.3.place.csv
+    bedroom.4.build.csv
 
 The naming and organization is completely up to you.
 
 Buildingplan integration
 ------------------------
 
-Buildingplan is a DFHack plugin that keeps building construction jobs in a
+`buildingplan` is a DFHack plugin that keeps building construction jobs in a
 suspended state until the materials required for the job are available. This
 prevents a building designation from being canceled when a dwarf picks up the
-job but can't find the materials.
-
-As long as the `buildingplan` plugin is enabled, quickfort will use it to manage
-construction. The buildingplan plugin has an `"enabled" setting
-<buildingplan-settings>` for each building type, but those settings only apply
-to buildings created through the buildingplan user interface. Quickfort will
-still use buildingplan to plan buildings even if the buildingplan UI says that
-building type is not "enabled".
-
-In addition, buildingplan has a "quickfort_mode" setting for compatibility with
-legacy Python Quickfort. This setting has no effect on DFHack Quickfort, which
-will use buildingplan to manage everything designated in a ``#build`` blueprint
-regardless of the buildingplan UI settings.
-
-However, quickfort *does* use `buildingplan's filters <buildingplan-filters>`
-for each building type. For example, you can use the buildingplan UI to set the
-type of stone you want your walls made out of. Or you can specify that all
+job but can't find the materials. `quickfort` uses `buildingplan` to manage
+construction.
+
+This means that `buildingplan's filters <buildingplan>` will be used for each
+building type. For example, you can use the buildingplan UI to set the type of
+stone you want your walls made out of. Or you can specify that all
 buildingplan-managed chairs and tables must be of Masterful quality. The current
 filter settings are saved with planned buildings when the ``#build`` blueprint
-is run. This means you can set the filters the way you want for one blueprint,
-run the blueprint, and then freely change them again for the next blueprint,
+is run. You can set the filters the way you want for one blueprint, run the
+blueprint, and then freely change the filters again for the next blueprint,
 even if the first set of buildings haven't been built yet.
 
 Note that buildings are still constructed immediately if you already have the
@@ -1323,19 +1349,10 @@ materials. However, with buildingplan you now have the freedom to apply
 jobs will be fulfilled whenever the materials become available.
 
 Since it can be difficult to figure out exactly what source materials you need
-for a ``#build`` blueprint, quickfort supplies the ``orders`` command. It
-enqueues manager orders for everything that the buildings in a ``#build``
-blueprint require. See the `next section <generating-manager-orders>`_ for more
-details on this.
-
-Alternately, if you know you only need a few types of items, the `workflow`
-plugin can be configured to build those items continuously for as long as they
-are needed.
-
-If you do not want to enable the buildingplan plugin, run ``quickfort orders``
-and make sure all manager orders are fulfilled before applying a ``#build``
-blueprint. Otherwise you will get job cancellation spam when the buildings can't
-be built with available materials.
+for a ``#build`` blueprint, quickfort can autogenerate manager orders for
+everything that a blueprint requires. See `Generating manager orders`_ for more
+details on this. You can apply a blueprint, then the planned buildings will be
+built as your dwarves fulfill the orders.
 
 Generating manager orders
 -------------------------
@@ -1357,8 +1374,8 @@ number of blocks you need divided by four (rounded up). You might end up with a
 few extra blocks, but not too many.
 
 If you want your constructions to be in a consistent color, be sure to choose a
-rock type for all of your 'Make rock blocks' orders by selecting the order and
-hitting :kbd:`d`. You might want to set the rock type for other non-block orders
+rock type for all of your 'Make rock blocks' orders in the manager orders
+screen. You might also want to set the rock type for other non-block orders
 to something different if you fear running out of the type of rock that you want
 to use for blocks. You should also set the `buildingplan` material filter for
 construction building types to that type of rock as well so other blocks you
@@ -1370,11 +1387,11 @@ Extra Manager Orders
 In ``#build`` blueprints, there are a few building types that will generate
 extra manager orders for related materials:
 
--  Track stops will generate an order for a minecart
--  Traction benches will generate orders for a table, mechanism, and rope
--  Levers will generate an order for an extra two mechanisms for connecting the
-   lever to a target
--  Cage traps will generate an order for a cage
+- Track stops will generate an order for a minecart
+- Traction benches will generate orders for a table, mechanism, and rope
+- Levers will generate an order for an extra two mechanisms for connecting the
+  lever to a target
+- Cage traps will generate an order for a cage
 
 
 Stockpiles in ``#place`` blueprints that `specify wheelbarrow or container
@@ -1384,32 +1401,28 @@ number of bins, pots, or wheelbarrows.
 Tips and tricks
 ---------------
 
--  During blueprint application, especially query blueprints, don't click the
-   mouse on the DF window or type any keys. They can change the state of the
-   game while the blueprint is being applied, resulting in strange errors.
-
--  After digging out an area, you may wish to smooth and/or engrave the area
-   before starting the build phase, as dwarves may be unable to access walls or
-   floors that are behind/under built objects.
-
--  If you are designating more than one level for digging at a time, you can
-   make your miners more efficient by using marker mode on all levels but one.
-   This prevents your miners from digging out a few tiles on one level, then
-   running down/up the stairs to do a few tiles on an adjacent level. With only
-   one level "live" and all other levels in marker mode, your miners can
-   concentrate on one level at a time. You just have to remember to "unmark" a
-   new level when your miners are done with their current one. Alternately, if
-   you have a chokepoint between levels (e.g. a central staircase), you can set
-   the chokepoint to be dug at a lower priority than all the other tiles on the
-   level. This will ensure your miners complete digging out a level before
-   continuing on to the next.
-
--  As of DF 0.34.x, it is no longer possible to build doors (:kbd:`d`) at the
-   same time that you build adjacent walls (:kbd:`C`:kbd:`w`). Doors must now be
-   built *after* adjacent walls are constructed. This does not affect the more
-   common case where walls exist as a side-effect of having dug-out a room in a
-   ``#dig`` blueprint, but if you are building your own walls, be aware that
-   walls must be built before you run the blueprint to designate attached doors.
+- After digging out an area, you may wish to smooth and/or engrave the area
+  before starting the build phase, as dwarves may be unable to access walls or
+  floors that are behind/under built objects.
+
+- If you are designating more than one level for digging at a time, you can
+  make your miners more efficient by using marker mode on all levels but one.
+  This prevents your miners from digging out a few tiles on one level, then
+  running down/up the stairs to do a few tiles on an adjacent level. With only
+  one level "live" and all other levels in marker mode, your miners can
+  concentrate on one level at a time. You just have to remember to "unmark" a
+  new level when your miners are done with their current one. Alternately, if
+  you have a chokepoint between levels (e.g. a central staircase), you can set
+  the chokepoint to be dug at a lower priority than all the other tiles on the
+  level. This will ensure your miners complete digging out a level before
+  continuing on to the next.
+
+- As of DF 0.34.x, it is no longer possible to build doors at the same time
+  that you build adjacent walls. Doors must now be built *after* adjacent
+  walls are constructed. This does not affect the more common case where walls
+  exist as a side-effect of having dug-out a room in a ``#dig`` blueprint, but
+  if you are building your own walls, be aware that walls must be built before
+  you run the blueprint to designate attached doors.
 
 - Quickfort is a very powerful tool. See the `case study <dreamfort-case-study>`
   below for more ideas on how to build awesome blueprints!
@@ -1417,20 +1430,16 @@ Tips and tricks
 Caveats and limitations
 -----------------------
 
--  If you use the the ``bags`` alias, be aware that the game does not
-   differentiate between empty and full bags. Therefore, you can get bags of
-   gypsum power in your "bags" stockpile unless you are careful to assign all
-   your gypsum to your hospital.
-
--  Weapon traps and upright spear/spike traps can currently only be built with a
-   single weapon.
+- Weapon traps and upright spear/spike traps can currently only be built with a
+  single weapon.
 
--  Pressure plates can be built, but they cannot be usefully configured yet.
+- Pressure plates can be built, but they cannot be usefully configured yet.
 
--  Building instruments is not yet supported.
+- Building instruments is not yet supported.
 
--  DFHack Quickfort is a large project, and there are bound to be bugs! Please
-   report them at the :issue:`DFHack issue tracker <>` so they can be addressed.
+- DFHack Quickfort is a large project, and there are bound to be bugs! If you
+  run into any, please report them at the :issue:`DFHack issue tracker <>` so
+  they can be addressed.
 
 .. _dreamfort-case-study:
 
@@ -1458,21 +1467,21 @@ Dreamfort blueprint set. Then we'll walk through the spreadsheets for each of
 the fort levels in turn, calling out feature usage examples and explaining the
 parts that might not be obvious just from looking at them.
 
-If you haven't built Dreamfort before, maybe try an embark in a flat area and
-take it for a spin! It will help put the following sections in context. There is
-also a pre-built Dreamfort available for download on
+If you haven't built Dreamfort before, maybe try an embark in a relatively flat
+area and take it for a spin! It will help put the following sections in
+context. There is also a pre-built Dreamfort available for download on
 :dffd:`dffd <15434>` if you just want an interactive reference.
 
 Dreamfort organization and packaging
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The Dreamfort blueprints are distributed with DFHack as
-:source:`one large .csv file <data/blueprints/library/dreamfort.csv>`, but
+:source:`one large .csv file <data/blueprints/dreamfort.csv>`, but
 editing in that format would be frustrating. Instead, the blueprints are
 edited `online as Google drive spreadsheets
-<https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP>`__.
+<https://drive.google.com/drive/folders/1dsmvnzbOKsyFS3DCj0F8ibSnMhVHEjdV>`__.
 Either the .csv file or the .xlsx files can be read and applied by quickfort,
-but it made more sense to distribute the blueprints as a .csv so users would
+but it made more sense to distribute the blueprints as a .csv so players would
 only have to remember one filename. Also, .csv files are text-based, which works
 more naturally with the DFHack source control system. We use the
 `xlsx2csv <https://github.com/dilshod/xlsx2csv>`__ utility to do the conversion
@@ -1488,30 +1497,20 @@ walkthrough and other useful details. This is the first sheet in each
 spreadsheet so it will be selected by default if the user doesn't specify a
 label name. For example, just running ``quickfort run
 library/dreamfort.csv`` will display Dreamfort's `introduction text
-<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw>`__.
+<https://docs.google.com/spreadsheets/d/15TDBebP8rBNvsFbezb9xuKPmGWNzv7j4XZWq1AsfCio>`__.
 
 Do not neglect writing the help text! Not only will it give others a chance to
 use your blueprints appropriately, but the help you write will remind *you* what
 you were thinking when you wrote the blueprint in the first place.
 
-.. topic:: Tip
-
-    Include custom alias definitions in the same file as the blueprint.
-
-If any blueprint in the set uses custom aliases that other users won't have in
-their :source:`data/quickfort/aliases-common.txt` files, be sure to define them
-in the blueprint itself in an `quickfort-aliases-blueprints` section. Then other
-people can use your blueprint right away without having to manually copy aliases
-into their personal :source:`dfhack-config/quickfort/aliases.txt` files.
-
 The surface_ level: how to manage complexity
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. _surface: https://docs.google.com/spreadsheets/d/1vlxOuDOTsjsZ5W45Ri1kJKgp3waFo8r505LfZVg5wkU
+.. _surface: https://docs.google.com/spreadsheets/d/17HfnCJY4WDPlLdiLuUNc0gwyf6BiSdayndjvFYXzS7c
 
-.. image:: https://drive.google.com/uc?export=download&id=1YL_vQJLB2YnUEFrAg9y3HEdFq3Wpw9WP
+.. image:: https://drive.google.com/uc?export=download&id=1dlu3nmwQszav-ZaTx-ac28wrcaYBQc_t
   :alt: Annotated screenshot of the dreamfort surface level
-  :target: https://drive.google.com/file/d/1YL_vQJLB2YnUEFrAg9y3HEdFq3Wpw9WP
+  :target: https://drive.google.com/file/d/1dlu3nmwQszav-ZaTx-ac28wrcaYBQc_t
   :align: center
 
 For smaller blueprints, packaging and usability are not really that important -
@@ -1519,9 +1518,9 @@ just write it, run it, and you're done. However, as your blueprints become
 larger and more detailed, there are some best practices that can help you deal
 with the added complexity. Dreamfort's surface level is many steps long since
 there are trees to be cleared, holes to be dug, flooring to be laid, and
-bridges to be built, and each step requires the previous step to be completely
-finished before it can begin. Therefore, a lot of thought went into minimizing
-the toil associated with applying so many blueprints.
+bridges to be linked to control levers, and each step requires the previous
+step to be completely finished before it can begin. Therefore, a lot of thought
+went into minimizing the toil associated with applying so many blueprints.
 
 .. topic:: Tip
 
@@ -1532,13 +1531,13 @@ The single most effective way to make your blueprint sets easier to use is to
 group them with `meta blueprints <quickfort-meta>`. For the Dreamfort set of
 blueprints, each logical "step" generally takes more than one blueprint. For
 example, with ``#meta`` blueprints, setting up pastures with a ``#zone``
-blueprint, placing starting stockpiles with a ``#place`` blueprint, building
-starting workshops with a ``#build`` blueprint, and configuring the stockpiles
-with a ``#query`` blueprint can all be done with a single command. Bundling
-blueprints with ``#meta`` blueprints reduced the number of steps in Dreamfort
-from 61 to 30, and it also made it much clearer to see which blueprints can be
-applied at once without unpausing the game. Check out dreamfort_surface's "`meta
-<https://docs.google.com/spreadsheets/d/1vlxOuDOTsjsZ5W45Ri1kJKgp3waFo8r505LfZVg5wkU/edit#gid=972927200>`__"
+blueprint, placing starting stockpiles with a ``#place`` blueprint, and building
+starting workshops with a ``#build`` blueprint can all be done with a single
+command. Bundling blueprints with ``#meta`` blueprints reduced the number of
+steps in Dreamfort from 100 to about 25, and it also made it much clearer to
+see which blueprints can be applied at once without unpausing the game. Check
+out dreamfort_surface's "`meta
+<https://docs.google.com/spreadsheets/d/17HfnCJY4WDPlLdiLuUNc0gwyf6BiSdayndjvFYXzS7c/edit#gid=972927200>`__"
 sheet to see how much meta blueprints can simplify your life.
 
 You can define `as many blueprints as you want <quickfort-packaging>` on one
@@ -1550,25 +1549,27 @@ having a bird's eye view of your entire plan in one sheet.
     Keep the blueprint list uncluttered by using ``hidden()`` markers.
 
 If a blueprint is bundled into a meta blueprint, it does not need to appear in
-the ``quickfort list`` output since you won't be running it directly. Add a
-`hidden() marker <quickfort-hidden>` to those blueprints to keep the list
-output tidy. You can still access hidden blueprints with ``quickfort list
---hidden`` if you need to -- for example to reapply a partially completed
-``#build`` blueprint -- but now they won’t clutter up the normal blueprint list.
+the `gui/quickfort` blueprint load dialog or ``quickfort list`` output since
+you won't be running it directly. Add a `hidden() marker <quickfort-hidden>` to
+those blueprints to keep the list output tidy. You can still access hidden
+blueprints by toggling the "Hidden" setting in `gui/quickfort` or by passing the
+``--hidden`` option to ``quickfort list`` if you need to, for example to
+reapply a partially completed ``#build`` blueprint, but now they won’t clutter
+up the normal blueprint list.
 
 .. topic:: Tip
 
     Name your blueprints with a common prefix so you can find them easily.
 
 This goes for both the file name and the `modeline label() <quickfort-label>`.
-Searching and filtering is implemented for both the
-``quickfort list`` command and the quickfort interactive dialog. If you give
-related blueprints a common prefix, it makes it easy to set the filters to
-display just the blueprints that you're interested in. If you have a lot of
-blueprints, this can save you a lot of time. Dreamfort uses the level name as a
-prefix for the labels, like "surface1", "surface2", "farming1", etc. So if I’m
-in the middle of applying the surface blueprints, I’d set the filter to
-``dreamfort surface`` to just display the relevant blueprints.
+Searching and filtering is implemented for both `gui/quickfort` and the
+``quickfort list`` command. If you give related blueprints a common prefix, it
+makes it easy to set the filters to display just the blueprints that you're
+interested in. If you have a lot of blueprints, this can save you a lot of
+time. Dreamfort uses the level name as a prefix for the labels, like
+"surface1", "surface2", "farming1", etc. So if I’m in the middle of applying
+the surface blueprints, I’d set the filter to ``dreamfort surface`` to just
+display the relevant blueprints.
 
 .. topic:: Tip
 
@@ -1588,7 +1589,7 @@ sheet, like in surface's meta sheet.
 things to include in messages are:
 
 * The name of the next blueprint to apply and when to run it
-* Whether ``quickfort orders`` should be run for the current or an upcoming step
+* Whether orders should be generated for the current or an upcoming step
 * Any actions that you have to perform manually after running the blueprint,
   like assigning minecarts to hauling routes or pasturing animals in
   newly-created zones
@@ -1597,136 +1598,99 @@ These things are just too easy to forget. Adding a ``message()`` can save you
 from time-wasting mistakes. Note that ``message()`` markers can still appear on
 the ``hidden()`` blueprints, and they'll still get shown when the blueprint is
 run via a ``#meta`` blueprint. For an example of this, check out the `zones
-sheet <https://docs.google.com/spreadsheets/d/1vlxOuDOTsjsZ5W45Ri1kJKgp3waFo8r505LfZVg5wkU/edit#gid=1226136256>`__
+sheet <https://docs.google.com/spreadsheets/d/17HfnCJY4WDPlLdiLuUNc0gwyf6BiSdayndjvFYXzS7c/edit#gid=1226136256>`__
 where the pastures are defined.
 
 The farming_ level: fun with stockpiles
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. _farming: https://docs.google.com/spreadsheets/d/1iuj807iGVk6vsfYY4j52v9_-wsszA1AnFqoxeoehByg
+.. _farming: https://docs.google.com/spreadsheets/d/1RZ67upSpQx7hX-AkqiFXVJl8o5GGdDX1WDOJNz-wOiA
 
-.. image:: https://drive.google.com/uc?export=download&id=1fBC3G5Y888l4tVe5REAyAd_zeojADVme
+.. image:: https://drive.google.com/uc?export=download&id=1vDaedLcgoexUdKREUz75ZXQi0ZSdwWwj
   :alt: Annotated screenshot of the dreamfort farming level
-  :target: https://drive.google.com/file/d/1fBC3G5Y888l4tVe5REAyAd_zeojADVme
+  :target: https://drive.google.com/file/d/1vDaedLcgoexUdKREUz75ZXQi0ZSdwWwj
   :align: center
 
 It is usually convenient to store closely associated blueprints in the same
 spreadsheet. The farming level is very closely tied to the surface because the
-miasma vents dug on the surface have to perfectly line up with where waste
-products are placed on the farming level. However, surface is a separate z-level
+miasma vents dug on the surface have to perfectly line up with where rottables
+can accumulate on the farming level. However, surface is a separate z-level
 and, more importantly, already has many many blueprints of its own. Farming is
 therefore split into a separate file.
 
 .. topic:: Tip
 
-    Automate stockpile chains when you can, and write ``message()`` reminders
-    when you can't.
-
-The farming level starts doing interesting things with ``#query`` blueprints and
-stockpiles. Note the `careful customization
-<https://docs.google.com/spreadsheets/d/1iuj807iGVk6vsfYY4j52v9_-
-wsszA1AnFqoxeoehByg/edit#gid=486506218>`__ of the food stockpiles and the
-stockpile chains set up with the ``give*`` aliases. This is so when multiple
-stockpiles can hold the same item, the largest can keep the smaller ones filled.
-For example the ``give2up`` alias funnels seeds from the seeds feeder pile to
-the container-enabled seed storage pile. If you have multiple stockpiles holding
-the same type on different z-levels, though, this can be tricky to set up with a
-blueprint. Here, the jugs and pots stockpiles must be manually linked to the
-quantum stockpile on the industry level, since we can't know beforehand how many
-z-levels away that is. Note how we call that out in the ``#query`` blueprint's
-``message()``.
+    Automate stockpile chains with the ``take_from`` and ``give_to`` properties.
+
+The farming level starts doing interesting things with stockpiles in its
+``#place`` blueprints. Note the `careful customization
+<https://docs.google.com/spreadsheets/d/1RZ67upSpQx7hX-AkqiFXVJl8o5GGdDX1WDOJNz-wOiA/edit#gid=1174337781>`__
+of the food stockpiles and the stockpile chains set up with the ``take_from``
+and ``give_to`` properties. For example, the "Seeds" stockpile is set to
+``link_only=true`` and the "Seeds feeder" stockpile has ``containers=0`` and
+``give_to=Seeds``. This minimizes container churn for the common task of seed
+recovery. When finding the named stockpiles to link, quickfort will search the
+other stockpiles created in the same blueprint first. If no stockpiles by that
+name are found, then existing stockpiles/workshops are searched. This is how
+many of the stockpiles on this level are configured to take from the starter
+stockpiles on the surface.
 
 .. topic:: Tip
 
-    Use aliases to set up hauling routes and quantum stockpiles.
+    Quantum stockpiles are super easy to define, if you want to use them.
 
-Hauling routes are notoriously fiddly to set up, but they can be automated with
-blueprints. Check out the Southern area of the ``#place`` and ``#query``
-blueprints for how the quantum refuse dump is configured with simple aliases
-from the alias library.
+Hauling routes are notoriously fiddly to set up by hand, but they can be easily
+automated with blueprints. Check out the Southern area of the ``#place`` and
+``#build`` blueprints for how the quantum refuse dump is configured with simple
+``take_from`` and ``route`` properties attached to the track stop.
 
-The industry_ level: when not to use aliases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The industry_ level: advanced linking
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. _industry: https://docs.google.com/spreadsheets/d/1gvTJxxRxZ5V4vXkqwhL-qlr_lXCNt8176TK14m4kSOU
+.. _industry: https://docs.google.com/spreadsheets/d/16nzXGrznQmtkrmQv7FeKsVYnv8SSA7eBl1M-97NmuQk
 
-.. image:: https://drive.google.com/uc?export=download&id=1emMaHHCaUPcdRbkLQqvr-0ZCs2tdM5X7
+.. image:: https://drive.google.com/uc?export=download&id=1c8YTHxTgJY5tUII-BOWdLhmDFAHwIOEs
   :alt: Annotated screenshot of the dreamfort industry level
-  :target: https://drive.google.com/file/d/1emMaHHCaUPcdRbkLQqvr-0ZCs2tdM5X7
+  :target: https://drive.google.com/file/d/1c8YTHxTgJY5tUII-BOWdLhmDFAHwIOEs
   :align: center
 
-The industry level is densely packed and has more complicated examples of
-stockpile configurations and quantum dumps. However, what I'd like to call out
-first are the key sequences that are *not* in aliases.
+The industry level is densely packed and has more intracate stockpile and
+hauling route configuration.
 
 .. topic:: Tip
 
-     Don't use aliases for ad-hoc cursor movements.
-
-It may be tempting to put all query blueprint key sequences into aliases to make
-them easier to edit, keep them all in one place, and make them reusable, but
-some key sequences just aren't very valuable as aliases.
+    Name things.
 
-`Check out <https://docs.google.com/spreadsheets/d/1gvTJxxRxZ5V4vXkqwhL-qlr_lXCNt8176TK14m4kSOU/edit#gid=787640554>`__
-the Eastern (goods) and Northern (stone and gems) quantum stockpiles -- cells
-I19 and R10. They give to the jeweler's workshop to prevent the jeweler from
-using the gems held in reserve for strange moods. The keys are not aliased since
-they're dependent on the relative positions of the tiles where they are
-interpreted, which is easiest to see in the blueprint itself. Also, if you move
-the workshop, it's easier to fix the stockpile link right there in the blueprint
-instead of editing a separate alias definition.
-
-There are also good examples in the ``#query`` blueprint for how to use the
-``permit`` and ``forbid`` stockpile aliases.
+In order to be a target for a stockpile or workshop link, the stockpile or
+building must have a name. That's not the only reason you should give things
+names, though. The game is just much easier to play when stockpiles and key
+buildings have descriptive names. Which lever controls the bridge named "Right
+outer gate"? You can click on that bridge, click on "show linked buildings",
+zoom to the lever, and click on the lever. Or you can scan your mouse over the
+levers and click on the lever with the same name as the target bridge. You can
+always edit names in-game, but blueprints are a great way to automate this task.
 
 .. topic:: Tip
 
-     Put all configuration that must be applied in a particular order in the
-     same spreadsheet cell.
-
-Most of the baseline aliases distributed with DFHack fall into one of three
-categories:
+    You can give to or take from multiple sources.
 
-1. Make a stockpile accept only a particular item type in a category
-2. Permit an item type, but do not otherwise change the stockpile configuration
-3. Forbid an item type, but do not otherwise change the stockpile configuration
+Some of the feeder stockpiles on this level are split up so that no one item
+type can fill the whole pile. The track stops that drive the quantum stockpiles
+have to take from all of them at once. When specifying multiple link targets
+that have spaces in their names, remember to surround the whole list with
+quotes. For example::
 
-If you have a stockpile that covers multiple tiles, it might seem natural to put
-one alias per spreadsheet cell. The aliases still all get applied to the
-stockpile, and with only one alias per cell, you can just type the alias name
-and avoid having to use the messier-looking ``{aliasname}`` syntax::
-
-    #place Declare a food stockpile
-    f(3x3)
-    #query Incorrectly configure a food stockpile to accept tallow and dye
-    tallow
-    permitdye
-
-However, in quickfort there are no guarantees about which cell will be
-processed first. In the example above, we obviously intend for the food
-stockpile to have tallow exclusively permitted, then to add dye. It could happen
-that the two aliases are applied in the opposite order, though, and we'd end up
-with dye being permitted, then everything (including dye) being forbidden, and,
-finally, tallow being enabled. To make sure you always get what you want, write
-order-sensitive aliases on the same line::
-
-    #place Declare a food stockpile
-    f(3x3)
-    #query Properly configure a food stockpile to accept tallow and dye
-    {tallow}{permitdye}
-
-You can see a more complex example of this with the ``meltables`` stockpiles in
-the `lower left corner <https://docs.google.com/spreadsheets/d/1gvTJxxRxZ5V4vXkqwhL-qlr_lXCNt8176TK14m4kSOU/edit#gid=787640554>`__
-of the industry level.
+    #build
+    trackstopW{name="Goods/wood dumper" take_from="Wood feeder,Goods feeder,Furniture feeder" route="Goods/wood quantum"}
 
 The services_ level: handling multi-level dig blueprints
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. _services: https://docs.google.com/spreadsheets/d/1IBy6_pGEe6WSBCLukDz_5I-4vi_mpHuJJyOp2j6SJlY
+.. _services: https://docs.google.com/spreadsheets/d/1xu8vNKGlGDN9L3MVB4qp2Ytef9oAWvuET6RkuZXmCaE
 
-.. image:: https://drive.google.com/uc?export=download&id=13vDIkTVOZGkM84tYf4O5nmRs4VZdE1gh
+.. image:: https://drive.google.com/uc?export=download&id=1RQMy_zYQWM5GN7-zjn6LoLWmnrJjkxPM
   :alt: Annotated screenshot of the dreamfort services level
-  :target: https://drive.google.com/file/d/13vDIkTVOZGkM84tYf4O5nmRs4VZdE1gh
+  :target: https://drive.google.com/file/d/1RQMy_zYQWM5GN7-zjn6LoLWmnrJjkxPM
   :align: center
 
 Services is a multi-level blueprint that includes a well cistern beneath the
@@ -1738,27 +1702,32 @@ priorities <quickfort-dig-priorities>`.
 
     Use dig priorities to control ramp creation.
 
-We can `ensure <https://docs.google.com/spreadsheets/d/1IBy6_pGEe6WSBCLukDz_5I-4vi_mpHuJJyOp2j6SJlY/edit#gid=962076234>`__
+We can `ensure <https://docs.google.com/spreadsheets/d/1xu8vNKGlGDN9L3MVB4qp2Ytef9oAWvuET6RkuZXmCaE/edit#gid=1706912296>`__
 the bottom level is carved out before the layer above is channeled by assigning
-the channel designations lower priorities (the ``h5``\s in the third layer --
-scroll down).
+the channel designations lower priorities (the ``h5``\s in the lower layers --
+scroll down on the blueprint spreadsheet). This works here because there is
+only a single column of higher-priority stairs for a dwarf to dig down to get
+below the lower-priority channels. If the dig area has multiple tiles exposed,
+it is harder to control dig order since a second dwarf may not have access to
+any higher-priority tiles and may start digging the lower-priority designations
+prematurely.
 
 An alternative is to have a follow-up blueprint that removes any undesired
 ramps. We did this on the
-`surface <https://docs.google.com/spreadsheets/d/1vlxOuDOTsjsZ5W45Ri1kJKgp3waFo8r505LfZVg5wkU/edit#gid=1790750180>`__
+`surface <https://docs.google.com/spreadsheets/d/17HfnCJY4WDPlLdiLuUNc0gwyf6BiSdayndjvFYXzS7c/edit#gid=1790750180>`__
 and
-`farming <https://docs.google.com/spreadsheets/d/1iuj807iGVk6vsfYY4j52v9_-wsszA1AnFqoxeoehByg/edit#gid=436537058>`__
+`farming <https://docs.google.com/spreadsheets/d/1RZ67upSpQx7hX-AkqiFXVJl8o5GGdDX1WDOJNz-wOiA/edit#gid=436537058>`__
 levels with the miasma vents since it would be too complicated to synchronize
-the digging between the two layers.
+simultaneous digging of the two layers.
 
 The guildhall_ level: avoiding smoothing issues
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. _guildhall: https://docs.google.com/spreadsheets/d/1wwKcOpEW-v_kyEnFyXS0FTjvLwJsyWbCUmEGaXWxJyU
+.. _guildhall: https://docs.google.com/spreadsheets/d/1DltZIHkw7zpNiQdSvXLcHdbwdttPwl35pVpBUYy90TA
 
-.. image:: https://drive.google.com/uc?export=download&id=17jHiCKeZm6FSS-CI4V0r0GJZh09nzcO_
+.. image:: https://drive.google.com/uc?export=download&id=1mt66QOkfBqFLtw6AJKU6GNYmhB72XSJG
   :alt: Annotated screenshot of the dreamfort guildhall level
-  :target: https://drive.google.com/file/d/17jHiCKeZm6FSS-CI4V0r0GJZh09nzcO_
+  :target: https://drive.google.com/file/d/1mt66QOkfBqFLtw6AJKU6GNYmhB72XSJG
   :align: center
 
 The goal of this level is to provide rooms for ``locations`` like guildhalls,
@@ -1777,24 +1746,65 @@ blocks a corner, or if a line of statues blocks a wall segment, it forces the
 player to smooth before building the statues. Otherwise they have to bother with
 temporarily removing statues to smooth the walls behind them.
 
-The beds_ levels: multi level meta blueprints
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The suites_ level: balance of flexibility
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. _beds: https://docs.google.com/spreadsheets/d/1QNHORq6YmYfuVVMP5yGAFCQluary_JbgZ-UXACqKs9g
+.. _suites: https://docs.google.com/spreadsheets/d/1pZ5mnYzzYLSni-LA3rfHZ6dFX8n7rTW088iBwsCI7N4
 
-.. image:: https://drive.google.com/uc?export=download&id=1IBqCf6fF3lw7sHiBE_15Euubysl5AAiS
+.. image:: https://drive.google.com/uc?export=download&id=16XRb1w5zFoyVq2LBMx_aCwOyjFq7GULc
   :alt: Annotated screenshot of the dreamfort noble suites
-  :target: https://drive.google.com/file/d/1IBqCf6fF3lw7sHiBE_15Euubysl5AAiS
+  :target: https://drive.google.com/file/d/16XRb1w5zFoyVq2LBMx_aCwOyjFq7GULc
   :align: center
 
-.. image:: https://drive.google.com/uc?export=download&id=1mDQQXG8BnXqasRGFC9R5N6xNALiswEyr
+In designing this level, we needed to choose between two approaches:
+
+1. Create rooms with specific, pre-determined purposes, laying out furniture
+   and zoning with appropriate types
+#. Lay out each room the same so each can serve any purpose
+
+Each has pros and cons. The first option reduces more toil by pre-creating the
+zones. If we go this route, we can also auto-assign the rooms to the various
+roles (if they exist when the blueprint is run). Each room can be customized
+for its intended purpose: offices can look like offices, bedrooms could look
+like bedrooms, and so on. However, if the needs of the fort don't correspond to
+the pre-determined layouts, or if the needs of the fort *change* significantly,
+then the blueprint can become more of a hinderance than a help.
+
+As you can see from the screenshot, we went with option 2. The ability to
+re-zone arbitrarily to meet changing noble needs was too great of a benefit to
+ignore. The downside, of course, is that you have to zone and assign your own
+rooms. However, as soon as you gain a barony or a duchy, you'd be doing that
+anyway with option 1.
+
+With option 2, if you need a "better" bedroom, you'd just expand the zone to
+cover the neighboring "unit". Satisfying the monarch is also simple: plop down
+a new suites level and assign each block of 4 rooms to one zone. four units for
+the bedroom, four for the office, four for the dining hall, and four for the
+tomb. Smooth and engrave and you're done. Of course, more asthetic-minded
+players are always free to design custom areas too. These blueprints are
+designed to be functional more than beautiful.
+
+The beds_ and crypt_ levels: copy and paste and repeat
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. _beds: https://docs.google.com/spreadsheets/d/1pZ5mnYzzYLSni-LA3rfHZ6dFX8n7rTW088iBwsCI7N4
+
+.. _crypt: https://docs.google.com/spreadsheets/d/1yTr48EFgXIoswhzL2RXpzUBvY8Sa-XKEacf6zXriZvM
+
+.. image:: https://drive.google.com/uc?export=download&id=16-NXlodLIQjeZUMSmsWRafeytwU2dXQo
   :alt: Annotated screenshot of the dreamfort apartments
-  :target: https://drive.google.com/file/d/1mDQQXG8BnXqasRGFC9R5N6xNALiswEyr
+  :target: https://drive.google.com/file/d/16-NXlodLIQjeZUMSmsWRafeytwU2dXQo
   :align: center
 
-The suites and apartments blueprints are straightforward. The only fancy bit
-is the meta blueprint that digs the stack of apartment levels, which brings us
-to our final tip:
+.. image:: https://drive.google.com/uc?export=download&id=16iT_ho7BIRPD_eofuxdlVQ4FunR1Li23
+  :alt: Annotated screenshot of the dreamfort crypt
+  :target: https://drive.google.com/file/d/16iT_ho7BIRPD_eofuxdlVQ4FunR1Li23
+  :align: center
+
+The apartments and crypt blueprints are straightforward, other than the sheer
+number of zones. Copy-paste in Google Sheets was used heavily here. The only
+fancy bit is the meta blueprint that digs the stack of apartment levels, which
+brings us to our final tip:
 
 .. topic:: Tip
 
@@ -1805,34 +1815,443 @@ aquifer between the farming and industry levels, and we can't know beforehand
 how many z-levels we need to skip. We can, however, automate the digging of
 everything from the industry level down, including designating all apartment
 levels at once. See the
-`#meta <https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=284974597>`__
+`#meta <https://docs.google.com/spreadsheets/d/15TDBebP8rBNvsFbezb9xuKPmGWNzv7j4XZWq1AsfCio/edit#gid=284974597>`__
 blueprint in the `Dreamfort help spreadsheet
-<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=0>`__
+<https://docs.google.com/spreadsheets/d/15TDBebP8rBNvsFbezb9xuKPmGWNzv7j4XZWq1AsfCio>`__
 for how it uses a ``repeat()`` marker for the ``/apartments1`` blueprint to
-apply it to five z-levels at once.
+apply it to three z-levels at once.
 
 That's it! I hope this guide was useful to you. Please leave feedback on the
-forums if you have ideas on how this guide (or the dreamfort blueprints) can be
-improved!
+forums or on the DFHack Discord server if you have ideas on how this guide (or
+the dreamfort blueprints themselves) can be improved!
 
 Links
 -----
 
 **Quickfort links:**
 
--  `Quickfort command reference <quickfort>`
--  `quickfort-alias-guide`
--  `blueprint-library-guide`
--  :forums:`Quickfort forum thread <176889>`
--  :issue:`DFHack issue tracker <>`
--  :source:`Blueprint library source <data/blueprints/library>`
--  :source-scripts:`Quickfort source code <internal/quickfort>`
+- `Quickfort command reference <quickfort>`
+- `blueprint-library-guide`
+- :forums:`Quickfort forum thread <176889>`
+- :issue:`DFHack issue tracker <>`
+- :source:`Blueprint library source <data/blueprints>`
+- :source-scripts:`Quickfort source code <internal/quickfort>`
 
 **Related tools:**
 
--  DFHack's `blueprint plugin <blueprint>` can generate blueprints from actual
-   DF maps.
--  DFHack's `buildingplan plugin <buildingplan>` sets material and quality
-   constraints for quickfort-placed buildings.
--  `Python Quickfort <http://joelpt.net/quickfort>`__ is the previous,
-   Python-based implementation that DFHack's quickfort script was inspired by.
+- DFHack's `blueprint plugin <blueprint>` can generate blueprints from actual
+  DF maps.
+- DFHack's `buildingplan plugin <buildingplan>` sets material and quality
+  constraints for quickfort-placed buildings.
+- `Python Quickfort <http://joelpt.net/quickfort>`__ is the previous,
+  Python-based implementation that DFHack's quickfort script was inspired by.
+
+.. _quickfort_guide_appendix:
+
+Appendix: Symbols and properties
+--------------------------------
+
+#dig mode reference
+~~~~~~~~~~~~~~~~~~~
+
+=============  =======
+Symbol         Meaning
+=============  =======
+``d``          dig (mine out walls but leave the floors)
+``h``          channel (empty tile with a ramp in the z-level below)
+``u``          up stair
+``j``          down stair
+``i``          up/down stair
+``r``          ramp (produces empty tile in the z-level above)
+``z``          remove up stairs/ramps
+``t``          chop trees
+``p``          gather plants
+``s``          smooth walls or floors
+``e``          engrave smoothed walls or floors
+``F``          carve fortification
+``T``          carve track
+``v``          toggle whether engraving details are visible
+``M``          toggle marker (called "blueprints" by the DF interface)
+``n``          remove construction
+``x``          remove designation
+``bc``         claim items on this tile
+``bf``         forbid items on this tile
+``bm``         melt items on this tile
+``bM``         remove melt flag from items on this tile
+``bd``         dump items on this tile
+``bD``         remove dump flag from items on this tile
+``bh``         hide items on this tile
+``bH``         unhide items on this tile
+``oh``         set high traffic
+``on``         set normal traffic
+``ol``         set low traffic
+``or``         set restricted traffic
+``trackN``     carve track that extends to the north
+``trackS``     carve track that extends to the south
+``trackE``     carve track that extends to the east
+``trackW``     carve track that extends to the west
+``trackNS``    carve track that extends to the north and south
+``trackEW``    carve track that extends to the east and west
+``trackNE``    carve track that extends to the north and east (corner)
+``trackNW``    carve track that extends to the north and west (corner)
+``trackSE``    carve track that extends to the south and east (corner)
+``trackSW``    carve track that extends to the south and west (corner)
+``trackNSE``   carve track that extends to the north, south, and east (tee)
+``trackNSW``   carve track that extends to the north, south, and west (tee)
+``trackNEW``   carve track that extends to the north, east, and west (tee)
+``trackSEW``   carve track that extends to the south, east, and west (tee)
+``trackNSEW``  carve track that extends in all directions (cross)
+=============  =======
+
+You can carve a track over an existing natural ramp to allow a minecart to
+safely traverse z-levels. You can write  ``trackramp<dir>`` instead of
+``track<dir>`` (e.g. ``trackrampSW``) for clarity in blueprints where this is
+the intention. The actual designation produced by ``track<dir>`` and
+``trackramp<dir>`` is identical.
+
+#zone mode reference
+~~~~~~~~~~~~~~~~~~~~
+
+======  =================  ==========
+Symbol  Type               Properties
+======  =================  ==========
+``m``   meeting area
+``b``   bedroom
+``h``   dining hall
+``n``   pen/pasture
+``p``   pit/pond           ``pond``: if set to ``true``, then the zone is a pond
+``w``   water source
+``j``   dungeon
+``f``   fishing
+``s``   sand
+``o``   office
+``D``   dormitory
+``B``   barracks
+``a``   archery range      ``shoot_from``: can be any of: ``west``, ``left``,
+                           ``east``, ``right``, ``north``, ``top``, ``south``,
+                           or ``bottom``. defaults to ``west``.
+``d``   garbage dump
+``t``   animal training
+``T``   tomb               ``pets``: if set to ``true`` then pets are allowed.
+                           ``citizens``: if set to ``false`` then citizens are
+                           not allowed.
+``g``   gather/pick fruit  ``pick_trees``, ``pick_shrubs``, ``gather_fallen``:
+                           all are set to ``true`` by default. set to ``false``
+                           to disable.
+``c``   clay
+======  =================  ==========
+
+In addition to the type-specific properties listed above, all zones support the
+following properties:
+
+=================  ===========
+Property           Description
+=================  ===========
+``name``           the name of the zone
+``active``         if set to ``false`` then the zone is deactivated
+``assigned_unit``  if set to the name of a noble position (like ``manager`` or
+                   ``bookkeeper`` or ``sheriff``) then the zone will be
+                   assigned to the unit appointed to the indicated noble
+                   position (if any). if the fort has progressed to the point
+                   that the sheriff role has been replaced by the captain of
+                   the guard, then ``assigned_unit=sheriff`` will be
+                   interpreted as ``assigned_unit=captain_of_the_guard``.
+``location``       the type of location to create and attach the zone to: one
+                   of: ``hospital``, ``guildhall``, ``tavern``, ``library``, or
+                   ``temple``. To attach multiple zones to the same location,
+                   specify a label after the location type and use the same
+                   label for all attached zones. For example:
+                   ``location=tavern/mainpub``.
+``allow``          (only if ``location`` is also set) sets the access
+                   restriction for the attached location: one of: ``visitors``,
+                   ``residents``, ``citizens``, or ``members``. defaults to
+                   ``visitors``.
+``profession``     (only if ``location=guildhall``) sets the profession of the
+                   guildhall. See possilbe values with ``:lua @df.profession``.
+                   For example: ``profession=metalsmith``.
+``desired_*``      (only if the location is set to the relevant type) sets the
+                   desired number of stocked items for the attached location.
+                   See the table below for details.
+=================  ===========
+
+Here are the desired items that can be specified for each location type:
+
+=============  ===========
+Location type  Properties
+=============  ===========
+tavern         ``desired_goblets`` (defaults to ``10``),
+               ``desired_instruments`` (defaults to ``5``)
+hospital       ``desired_splints`` (defaults to ``5``), ``desired_thread``
+               (defaults to ``5``), ``desired_cloth`` (defaults to ``5``),
+               ``desired_crutches`` (defaults to ``5``), ``desired_powder``
+               (defaults to ``5``), ``desired_buckets`` (defaults to ``2``),
+               ``desired_soap`` (defaults to ``5``)
+library        ``desired_paper`` (defaults to ``10``)
+temple         ``desired_instruments`` (defaults to ``5``)
+=============  ===========
+
+#place mode reference
+~~~~~~~~~~~~~~~~~~~~~
+
+The symbol or symbols used to declare a stockpile determine which item
+categories are enabled by default as well as which stockpile containers (e.g.
+bins/barrels/wheelbarrows) are assigned to the stockpile by default.
+
+======  ===============  ==========
+Symbol  Type             Containers
+======  ===============  ==========
+``a``   animal
+``f``   food             barrels
+``u``   furniture
+``n``   coins            bins
+``y``   corpses
+``r``   refuse
+``s``   stone            wheelbarrows
+``w``   wood
+``e``   gem              bins
+``b``   bars and blocks  bins
+``h``   cloth            bins
+``l``   leather          bins
+``z``   ammo             bins
+``S``   sheets           bins
+``g``   finished goods   bins
+``p``   weapons          bins
+``d``   armor            bins
+``c``   custom
+======  ===============  ==========
+
+All stockpiles support the following properties:
+
+================  ===========
+Property          Description
+================  ===========
+``name``          the name of the stockpile
+``take_from``     comma-separated list of names or building ids of stockpiles
+                  or workshops that the stockpile takes from
+``give_to``       comma-separated list of names or building ids of stockpiles
+                  or workshops that the stockpile gives to
+``links_only``    if set to ``true`` then the stockpile will only take from
+                  links
+``barrels``       the number of desired barrels
+``bins``          the number of desired bins
+``wheelbarrows``  the number of desired wheelbarrows
+``containers``    sets the desired numbers for barrels, bins, and wheelbarrows.
+                  this is most useful to set all desired container counts to 0.
+``quantum``       if set to ``true``, then sets ``containers=0 links_only=true``
+``automelt``      if set to ``true``, enables the corresponding `logistics`
+                  feature
+``autotrade``     if set to ``true``, enables the corresponding `logistics`
+                  feature
+``autodump``      if set to ``true``, enables the corresponding `logistics`
+                  feature
+``autotrain``     if set to ``true``, enables the corresponding `logistics`
+                  feature
+================  ===========
+
+Note that specifying building IDs in ``take_from`` or ``give_to`` lists is
+primarily useful when dynamically generating `quickfort` blueprints and
+applying them via the API. You will not generally know the ID of a stockpile or
+building when writing a blueprint by hand or when preparing a blueprint to
+apply in a different fort.
+
+#build mode reference
+~~~~~~~~~~~~~~~~~~~~~
+
+In addition to the type-specific properties listed below, all building types
+accept the ``name`` property.
+
+Moreover, all workshops and furnaces accept the ``max_general_orders``
+property, which sets the maximum number of general workorders that the building
+can accept, and the ``take_from`` and ``give_to`` properties, which are
+comma-separated lists of names or building ids (the same as the correponding
+stockpile properties above).
+
+================= ============================= ==========
+Symbol            Type                          Properties
+================= ============================= ==========
+``a``             armor stand
+``b``             bed
+``c``             seat
+``n``             burial receptacle
+``d``             door
+``x``             floodgate
+``H``             floor hatch
+``W``             wall grate
+``G``             floor grate
+``B``             vertical bars
+``~b``            floor bars
+``f``             cabinet
+``h``             container
+``r``             weapon rack
+``s``             statue
+``~s``            slab
+``t``             table
+``g``             bridge (retracting)
+``gw``            bridge (raises to north)
+``gd``            bridge (raises to east)
+``gx``            bridge (raises to south)
+``ga``            bridge (raises to west)
+``l``             well
+``y``             glass window
+``Y``             gem window
+``D``             trade depot
+``Msu``           screw pump (pumps from north)
+``Msk``           screw pump (pumps from east)
+``Msm``           screw pump (pumps from south)
+``Msh``           screw pump (pumps from west)
+``Mw``            water wheel (vertical)
+``Mws``           water wheel (horizontal)
+``Mg``            gear assembly
+``Mh``            horizontal axle (east-west)
+``Mhs``           horizontal axle (north-south)
+``Mv``            vertical axle
+``rollerNS``      roller (pushes to south)      ``speed``: one of ``50000``,
+                                                ``40000``, ``30000``,
+                                                ``20000``, or ``10000``.
+                                                defaults to ``50000``.
+``rollerEW``      roller (pushes to west)       ``speed``
+``rollerSN``      roller (pushes to north)      ``speed``
+``rollerWE``      roller (pushes to east)       ``speed``
+``S``             support
+``m``             animal trap
+``v``             restraint
+``j``             cage
+``A``             archery target
+``R``             traction bench
+``N``             nest box
+``~h``            hive                          if ``do_install`` is set to
+                                                ``true`` then a bee colony will
+                                                be installed. if ``do_gather``
+                                                is set to ``true`` then hive
+                                                products will be gathered.
+``~a``            offering place
+``~c``            bookcase
+``F``             display furniture
+``p``             farm plot                     if ``seasonal_fertilize`` is
+                                                set to ``true`` then the plots
+                                                will be configured for seasonal
+                                                fertilization
+``o``             paved road
+``O``             dirt road
+``k``             vermin catcher
+``we``            leather works
+``wq``            quern
+``wM``            millstone
+``wo``            loom
+``wk``            clothier
+``wb``            bowyer
+``wc``            carpenter
+``wf``            metalsmith
+``wv``            magma forge
+``wj``            jeweler
+``wm``            stoneworker
+``wu``            butcher
+``wn``            tanner
+``wr``            craftsdwarf
+``ws``            siege workshop
+``wt``            mechanic
+``wl``            still
+``ww``            farmer
+``wz``            kitchen
+``wh``            fishery
+``wy``            ashery
+``wd``            dyer
+``wS``            soap maker
+``wp``            screw press
+``ew``            wood furnace
+``es``            smelter
+``el``            magma smelter
+``eg``            glass furnace
+``ea``            magma glass furnace
+``ek``            kiln
+``en``            magma kiln
+``ib``            ballista
+``ic``            catapult
+``Cw``            wall
+``Cf``            floor
+``Cr``            ramp
+``Cu``            up stair
+``Cd``            down stair
+``Cx``            up/down stair
+``CF``            fortification
+``trackstop``     track stop (no dumping)       ``friction``: one of ``50000``,
+                                                ``10000``, ``500``, ``50``, or
+                                                ``10``. defaults to ``50000``.
+                                                ``take_from``: create a hauling
+                                                route stop on this track stop
+                                                and make it take from the given
+                                                comma-separated list of
+                                                stockpile names or stockpile
+                                                building ids. ``route``: add
+                                                this route stop to the named
+                                                route. if no route of this name
+                                                exists, it will be created. If
+                                                no route name is given, a new
+                                                route is always created.
+``trackstopN``    track stop (dump to north)    ``friction``, ``take_from``,
+                                                ``route``
+``trackstopS``    track stop (dump to south)    ``friction``, ``take_from``,
+                                                ``route``
+``trackstopE``    track stop (dump to east)     ``friction``, ``take_from``,
+                                                ``route``
+``trackstopW``    track stop (dump to west)     ``friction``, ``take_from``,
+                                                ``route``
+``Ts``            stone-fall trap
+``Tw``            weapon trap
+``Tl``            lever
+``Tp``            pressure plate
+``Tc``            cage trap
+``TS``            upright spear/spike
+``trackN``        track to the N
+``trackS``        track to the S
+``trackE``        track to the E
+``trackW``        track to the W
+``trackNS``       track to the N, S
+``trackEW``       track to the E, W
+``trackNE``       track corner to the N, E
+``trackNW``       track corner to the N, W
+``trackSE``       track corner to the S, E
+``trackSW``       track corner to the S, W
+``trackNSE``      track tee to the N, S, E
+``trackNSW``      track tee to the N, S, W
+``trackNEW``      track tee to the N, E, W
+``trackSEW``      track tee to the S, E, W
+``trackNSEW``     track cross
+``trackrampN``    track ramp to the N
+``trackrampS``    track ramp to the S
+``trackrampE``    track ramp to the E
+``trackrampW``    track ramp to the W
+``trackrampNS``   track ramp to the N, S
+``trackrampEW``   track ramp to the E, W
+``trackrampNE``   track ramp corner to the N, E
+``trackrampNW``   track ramp corner to the N, W
+``trackrampSE``   track ramp corner to the S, E
+``trackrampSW``   track ramp corner to the S, W
+``trackrampNSE``  track ramp tee to the N, S, E
+``trackrampNSW``  track ramp tee to the N, S, W
+``trackrampNEW``  track ramp tee to the N, E, W
+``trackrampSEW``  track ramp tee to the S, E, W
+``trackrampNSEW`` track ramp cross
+================= ============================= ==========
+
+#burrow mode reference
+~~~~~~~~~~~~~~~~~~~~~~
+
+====== ======= ==========
+Symbol Meaning Properties
+====== ======= ==========
+``a``  add     ``name``: if set, will add to an existing burrow of this name.
+               ``create``: if set to ``true``, will create a burrow with the
+               specified ``name`` if it doesn't already exist.
+               ``civalert``: if set to ``true``, will register this burrow with
+               `gui/civ-alert` if no burrow has already been registered.
+               ``autochop_clear``: if set to ``true``, register the burrow with
+               `autochop` so that all trees in the burrow are immediately
+               chopped down, regardless of how many logs are in stock.
+               ``autochop_chop``: if set to ``true``, register the burrow with
+               ``autochop`` so that woodcutting activity is constrained to this
+               burrow (and others marked for ``chop``).
+``e``  erase   ``name``: if set, will only affect the first burrow of the given
+               name. if not set, will affect all burrows that cover the given
+               tiles.
+====== ======= ==========
diff --git a/docs/images/gm-editor.png b/docs/images/gm-editor.png
index 24546a710..117cb7031 100644
Binary files a/docs/images/gm-editor.png and b/docs/images/gm-editor.png differ
diff --git a/docs/images/liquids.png b/docs/images/liquids.png
deleted file mode 100644
index da70a058b..000000000
Binary files a/docs/images/liquids.png and /dev/null differ
diff --git a/docs/images/search-stockpile.png b/docs/images/search-stockpile.png
deleted file mode 100644
index a0e837875..000000000
Binary files a/docs/images/search-stockpile.png and /dev/null differ
diff --git a/docs/images/search.png b/docs/images/search.png
deleted file mode 100644
index 384c3c533..000000000
Binary files a/docs/images/search.png and /dev/null differ
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index 1ce32fcbe..e8a39f781 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -2,7 +2,7 @@ add-spatter
 ===========
 
 .. dfhack-tool::
-    :summary: Make tagged reactions produce contaminants.
+    :summary: Add poisons and magical effects to weapons.
     :tags: adventure fort gameplay items
     :no-command:
 
diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
index 1a4aa4f91..4a0d64ae1 100644
--- a/docs/plugins/autobutcher.rst
+++ b/docs/plugins/autobutcher.rst
@@ -18,8 +18,8 @@ watch list. Units will be ignored if they are:
 Creatures who will not reproduce (because they're not interested in the
 opposite sex or have been gelded) will be butchered before those who will.
 Older adults and younger children will be butchered first if the population
-is above the target (defaults are: 1 male kid, 5 female kids, 1 male adult,
-5 female adults). Note that you may need to set a target above 1 to have a
+is above the target (defaults are: 2 male kids, 4 female kids, 2 male adults,
+4 female adults). Note that you may need to set a target above 1 to have a
 reliable breeding population due to asexuality etc. See `fix-ster` if this is a
 problem.
 
@@ -34,7 +34,7 @@ Usage
 ``autobutcher autowatch``
     Automatically add all new races (animals you buy from merchants, tame
     yourself, or get from migrants) to the watch list using the default target
-    counts.
+    counts. This option is enabled by default.
 ``autobutcher noautowatch``
     Stop auto-adding new races to the watch list.
 ``autobutcher target <fk> <mk> <fa> <ma> all|new|<race> [<race> ...]``
@@ -70,7 +70,7 @@ Usage
 ``autobutcher list_export``
     Print commands required to set the current settings in another fort.
 
-To see a list of all races, run this command:
+To see a list of all races, run this command::
 
     devel/query --table df.global.world.raws.creatures.all --search ^creature_id --maxdepth 1
 
@@ -108,4 +108,3 @@ fortress::
     autobutcher target 2 2 4 2 ALPACA SHEEP LLAMA
     autobutcher target 5 5 6 2 PIG
     autobutcher target 0 0 0 0 new
-    autobutcher autowatch
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index 6b51b85cb..7ac95f588 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -4,9 +4,18 @@ autochop
 .. dfhack-tool::
     :summary: Auto-harvest trees when low on stockpiled logs.
     :tags: fort auto plants
-    :no-command:
 
-This plugin can designate trees for chopping when your stocks are low on logs.
+This plugin can automatically designate trees for chopping when your stocks are
+low on logs. It can also ensure specified burrows are kept clear of trees, so,
+for example, caravans always have a path to your depot and trees won't grow
+close to your walls, giving invaders an unexpected path into your fort.
+
+Autochop checks your stock of logs and designates appropriate trees for chopping
+once every in-game day. Logs that are forbidden or inaccessible (e.g. in hidden
+parts of the map, under water, etc.) are not counted towards your target. Trees
+that are inaccessible are likewise never designated.
+
+Please see `gui/autochop` for the interactive configuration dialog.
 
 Usage
 -----
@@ -14,14 +23,64 @@ Usage
 ::
 
     enable autochop
+    autochop [status]
+    autochop (designate|undesignate)
+    autochop target <max> [<min>]
+    autochop (chop|nochop) <burrow>[,<burrow>...]
+    autochop (clearcut|noclearcut) <burrow>[,<burrow>...]
+    autochop (protect|unprotect) <type>[,<type>...] <burrow>[,<burrow>...]
+
+Examples
+--------
+
+Ensure we always have about 200 logs in stock, harvested from accessible trees
+anywhere on the map::
+
+    enable autochop
+
+Ensure we always have about 500 logs in stock, harvested from a burrow named
+"TreeFarm". Also ensure the caravan pathway and the area around the outer wall
+("CaravanPath" and "OuterWall") are always clear::
+
+    enable autochop
+    autochop target 500
+    autochop chop TreeFarm
+    autochop clearcut CaravanPath,OuterWall
+
+Clear all non-food-producing trees out of a burrow ("PicnicArea") intended to
+contain only food-producing trees::
+
+    autochop clearcut PicnicArea
+    autochop protect brewable,edible,cookable PicnicArea
+    autochop designate
+
+Commands
+--------
+
+``status``
+    Show current configuration and relevant statistics.
+
+``designate``
+    Designate trees for chopping right now according to the current
+    configuration. This works even if ``autochop`` is not currently enabled.
+
+``undesignate``
+    Undesignates all trees.
 
-Then, open the settings menu with :kbd:`c` from the designations menu (the
-option appears when you have "Chop Down Trees" selected with :kbd:`d`-:kbd:`t`).
+``target <max> [<min>]``
+    Set the target range for the number of logs you want to have in stock. If a
+    minimum amount is not specified, it defaults to 20% less than the maximum.
+    The default target is ``200`` (with a corresponding minimum of ``160``).
 
-Set your desired thresholds and enable autochopping with :kbd:`a`.
+``(no)chop <burrow>[,<burrow>...]``
+    Instead of choosing trees across the whole game map, restrict tree cutting
+    to the given burrows. Burrows can be specified by name or internal ID.
 
-You can also restrict autochopping to specific burrows. Highlight a burrow name
-with the Up/Down arrow keys and hit :kbd:`Enter` to mark it as the autochop
-burrrow.
+``(no)clearcut <burrow>[,<burrow>...]``
+    Ensure the given burrows are always clear of trees. As soon as a tree
+    appears in any of these burrows, it is designated for chopping at priority
+    2.
 
-Autochop checks your stock of logs and designates trees once every in game day.
+``(un)protect <type>[,<type>...] <burrow>[,<burrow>...]``
+    Choose whether to exclude trees from chopping that produce any of the given
+    types of food. Valid types are: ``brewable``, ``edible``, and ``cookable``.
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index 40fd4d996..4584791bd 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -20,9 +20,11 @@ Usage
 anything your civilization can produce, such as "dress" or "mitten".
 
 When invoked without parameters, it shows a summary of all managed clothing
-orders. When invoked with a material and item, but without a quantity, it shows
+orders, and the overall clothing situation in your fort.
+When invoked with a material and item, but without a quantity, it shows
 the current configuration for that material and item.
 
+
 Examples
 --------
 
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 03e10db9c..facf70ca9 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -2,48 +2,32 @@ autodump
 ========
 
 .. dfhack-tool::
-    :summary: Automatically set items in a stockpile to be dumped.
-    :tags: fort armok fps productivity items stockpiles
-    :no-command:
-
-.. dfhack-command:: autodump
-    :summary: Teleports items marked for dumping to the cursor position.
+    :summary: Instantly gather or destroy items marked for dumping.
+    :tags: fort armok fps items
 
 .. dfhack-command:: autodump-destroy-here
-    :summary: Destroy items marked for dumping under the cursor.
-
-.. dfhack-command:: autodump-destroy-item
-    :summary: Destroys the selected item.
+    :summary: Destroy items marked for dumping under the keyboard cursor.
 
-When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
-stockpiles. When the ``autodump`` option is selected for the stockpile, any
-items placed in the stockpile will automatically be designated to be dumped.
+This tool can instantly move all unforbidden items marked for dumping to the
+tile under the keyboard cursor. After moving the items, the dump flag is unset
+and the forbid flag is set, just as if it had been dumped normally. Be aware
+that dwarves that are en route to pick up the item for dumping may still come
+and move the item to your dump zone.
 
-When invoked as a command, it can instantly move all unforbidden items marked
-for dumping to the tile under the cursor. After moving the items, the dump flag
-is unset and the forbid flag is set, just as if it had been dumped normally. Be
-aware that dwarves that are en route to pick up the item for dumping may still
-come and move the item to your dump zone.
-
-The cursor must be placed on a floor tile so the items can be dumped there.
+The keyboard cursor must be placed on a floor tile so the items can be dumped
+there.
 
 Usage
 -----
 
 ::
 
-    enable autodump
     autodump [<options>]
     autodump-destroy-here
-    autodump-destroy-item
 
 ``autodump-destroy-here`` is an alias for ``autodump destroy-here`` and is
 intended for use as a keybinding.
 
-``autodump-destroy-item`` destroys only the selected item. The item may be
-selected in the :kbd:`k` list or in the container item list. If called again
-before the game is resumed, cancels destruction of the item.
-
 Options
 -------
 
@@ -67,5 +51,5 @@ Examples
     Teleports items marked for dumping to the cursor position.
 ``autodump destroy``
     Destroys all unforbidden items marked for dumping
-``autodump-destroy-item``
-    Destroys the selected item.
+``autodump-destroy-here``
+    Destroys items on the selected tile that are marked for dumping.
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index d4112c6c0..5beb7260e 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -3,7 +3,7 @@ autogems
 
 .. dfhack-tool::
     :summary: Automatically cut rough gems.
-    :tags: fort auto workorders
+    :tags: unavailable
     :no-command:
 
 .. dfhack-command:: autogems-reload
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
deleted file mode 100644
index 09c3c2f8f..000000000
--- a/docs/plugins/autohauler.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-autohauler
-==========
-
-.. dfhack-tool::
-    :summary: Automatically manage hauling labors.
-    :tags: fort auto labors
-
-Similar to `autolabor`, but instead of managing all labors, autohauler only
-addresses hauling labors, leaving the assignment of skilled labors entirely up
-to you. You can use the in-game `manipulator` UI or an external tool like Dwarf
-Therapist to do so.
-
-Idle dwarves who are not on active military duty will be assigned the hauling
-labors; everyone else (including those currently hauling) will have the hauling
-labors removed. This is to encourage every dwarf to do their assigned skilled
-labors whenever possible, but resort to hauling when those jobs are not
-available. This also implies that the user will have a very tight skill
-assignment, with most skilled labors only being assigned to just a few dwarves
-and almost every non-military dwarf having at least one skilled labor assigned.
-
-Autohauler allows a skill to be used as a flag to exempt a dwarf from
-autohauler's effects. By default, this is the unused ALCHEMIST labor, but it
-can be changed by the user.
-
-Autohauler uses DFHack's `debug` functionality to display information about the changes it makes. The amount of
-information displayed can be controlled through appropriate use of the ``debugfilter`` command.
-
-Usage
------
-
-``enable autohauler``
-    Start managing hauling labors. This is normally all you need to do.
-    Autohauler works well on default settings.
-``autohauler status``
-    Show autohauler status and status of fort dwarves.
-``autohauler <labor> haulers``
-    Set whether a particular labor should be assigned to haulers.
-``autohauler <labor> allow|forbid``
-    Set whether a particular labor should mark a dwarf as exempt from hauling.
-    By default, only the ``ALCHEMIST`` labor is set to ``forbid``.
-``autohauler reset-all|<labor> reset``
-    Reset a particular labor (or all labors) to their default
-    haulers/allow/forbid state.
-``autohauler list``
-    Show the active configuration for all labors.
-``autohauler frameskip <number>``
-    Set the number of frames between runs of autohauler.
-
-Examples
---------
-
-``autohauler HAUL_STONE haulers``
-    Set stone hauling as a hauling labor (this is already the default).
-``autohauler RECOVER_WOUNDED allow``
-    Allow the "Recover wounded" labor to be manually assigned by the player. By
-    default it is automatically given to haulers.
-``autohauler MINE forbid``
-    Don't assign hauling labors to dwarves with the Mining labor enabled.
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index 4b92e5fd8..73d5feac5 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -18,8 +18,31 @@ untouched by autolabor.
 
 .. warning::
 
-    autolabor will override any manual changes you make to labors while it is
-    enabled, including through other tools such as Dwarf Therapist.
+    **This plugin is still being tested. Use at your own risk.**
+
+    The algorithms that autolabor uses to choose labor assignments have *not* been updated for version 50 of
+    Dwarf Fortress. There is no particular guarantee that the labor assignments autolabor is making are optimal,
+    and it is entirely possible that the assignments it makes will lead to unforeseen consequences. You should
+    monitor what your dwarves are doing, and more importantly not doing, when using autolabor.
+
+    At this time there is no way to easily see what labors are being assigned to whom, as there is no longer
+    any vanilla means for seeing the labor assignment table. Until `manipulator` is once again available,
+    probably the best way to see what autolabor is doing is to use
+    `Dwarf Therapist <https://github.com/Dwarf-Therapist/Dwarf-Therapist>`_. You can also increase autolabor's
+    logging level using the `debugfilter<debug>` command (setting either ``debug`` or ``trace`` level for the
+    ``cycle`` mode) but be warned that this may generate a large amount of console spam, especially in a large fort.
+
+    When it is enabled, autolabor automatically disables the work detail system. You cannot
+    use autolabor and work details at the same time. If you attempt to open the work detail screen while
+    autolabor is active, a warning box should appear advising you that autolabor is managing labors and preventing
+    you from making any changes on that screen.
+
+    Finally, should you disable autolabor, autolabor will automatically reenable the vanilla work detail system.
+    However, the work detail system only updates labors when the work detail screen is open and some change is
+    made on that screen. Therefore, if you choose to disable autolabor, you should probably immediately
+    thereafter open the work details screen and make some change to force the game to recompute all labor
+    assignments based on the vanilla algorithm. At this time, it is not possible for autolabor to do this
+    automatically.
 
 Usage
 -----
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
deleted file mode 100644
index ac1b3a1da..000000000
--- a/docs/plugins/automaterial.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-automaterial
-============
-
-.. dfhack-tool::
-    :summary: Sorts building materials by recent usage.
-    :tags: fort design productivity buildings map
-    :no-command:
-
-This plugin makes building constructions (walls, floors, fortifications, etc)
-much easier by saving you from having to trawl through long lists of materials
-each time you place one.
-
-It moves the last used material for a given construction type to the top of the
-list, if there are any left. So if you build a wall with chalk blocks, the next
-time you place a wall the chalk blocks will be at the top of the list,
-regardless of distance (it only does this in "grouped" mode, as individual item
-lists could be huge). This means you can place most constructions without having
-to search for your preferred material type.
-
-Usage
------
-
-::
-
-    enable automaterial
-
-.. image:: ../images/automaterial-mat.png
-
-Pressing :kbd:`a` while highlighting any material will enable that material for
-"auto select" for this construction type. You can enable multiple materials. Now
-the next time you place this type of construction, the plugin will automatically
-choose materials for you from the kinds you enabled. If there is enough to
-satisfy the whole placement, you won't be prompted with the material screen at
-all -- the construction will be placed and you will be back in the construction
-menu.
-
-When choosing the construction placement, you will see a couple of options:
-
-.. image:: ../images/automaterial-pos.png
-
-Use :kbd:`a` here to temporarily disable the material autoselection, e.g. if you
-need to go to the material selection screen so you can toggle some materials on
-or off.
-
-The other option (auto type selection, off by default) can be toggled on with
-:kbd:`t`. If you toggle this option on, instead of returning you to the main
-construction menu after selecting 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.
-
-The ``automaterial`` plugin also enables extra construction placement modes,
-such as designating areas larger than 10x10 and allowing you to designate hollow
-rectangles instead of the default filled ones.
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
deleted file mode 100644
index 12e3412e2..000000000
--- a/docs/plugins/automelt.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-automelt
-========
-
-.. dfhack-tool::
-    :summary: Quickly designate items to be melted.
-    :tags: fort productivity items stockpiles
-    :no-command:
-
-When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
-stockpiles. When the ``automelt`` option is selected for the stockpile, any
-items placed in the stockpile will automatically be designated to be melted.
-
-Usage
------
-
-::
-
-    enable automelt
diff --git a/docs/plugins/autoslab.rst b/docs/plugins/autoslab.rst
new file mode 100644
index 000000000..a947f7bbe
--- /dev/null
+++ b/docs/plugins/autoslab.rst
@@ -0,0 +1,23 @@
+autoslab
+========
+
+.. dfhack-tool::
+    :summary: Automatically engrave slabs for ghostly citizens.
+    :tags: fort auto workorders
+    :no-command:
+
+Automatically queue orders to engrave slabs of existing ghosts. Will only queue
+an order if there is no existing slab with that unit's memorial engraved and
+there is not already an existing work order to engrave a slab for that unit.
+Make sure you have spare slabs on hand for engraving! If you run
+`orders import library/rockstock <orders>`, you'll be sure to always have
+some slabs in stock.
+
+Usage
+-----
+
+``enable autoslab``
+    Enables the plugin and starts checking for ghosts that need memorializing.
+
+``disable autoslab``
+    Disables the plugin.
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
deleted file mode 100644
index f355d40ef..000000000
--- a/docs/plugins/autotrade.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-autotrade
-=========
-
-.. dfhack-tool::
-    :summary: Quickly designate items to be traded.
-    :tags: fort productivity items stockpiles
-    :no-command:
-
-When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
-stockpiles. When the ``autotrade`` option is selected for the stockpile, any
-items placed in the stockpile will automatically be designated to be traded.
-
-Usage
------
-
-::
-
-    enable autotrade
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 6c38a6152..6d2e9154f 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -9,12 +9,19 @@ With ``blueprint``, you can export the structure of a portion of your fortress
 in a blueprint file that you (or anyone else) can later play back with
 `gui/quickfort`.
 
-Blueprints are ``.csv`` or ``.xlsx`` files created in the ``blueprints``
+Blueprints are ``.csv`` or ``.xlsx`` files created in the ``dfhack-config/blueprints``
 subdirectory of your DF folder. The map area to turn into a blueprint is either
 selected interactively with the ``gui/blueprint`` command or, if the GUI is not
 used, starts at the active cursor location and extends right and down for the
 requested width and height.
 
+.. admonition:: Note
+
+    blueprint is still in the process of being updated for the new version of
+    DF. Stockpiles (the "place" phase), zones (the "zone" phase), building
+    configuration (the "query" phase), and game configuration (the "config"
+    phase) are not yet supported.
+
 Usage
 -----
 
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
index 12f49fbbe..ae38cb3d9 100644
--- a/docs/plugins/building-hacks.rst
+++ b/docs/plugins/building-hacks.rst
@@ -3,7 +3,7 @@ building-hacks
 
 .. dfhack-tool::
     :summary: Provides a Lua API for creating powered workshops.
-    :tags: fort gameplay buildings
+    :tags: unavailable
     :no-command:
 
 See `building-hacks-api` for more details.
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index ef159443d..b1e77a80d 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -2,91 +2,198 @@ buildingplan
 ============
 
 .. dfhack-tool::
-    :summary: Plan building construction before you have materials.
-    :tags: fort design buildings
-
-This plugin adds a planning mode for building placement. You can then place
-furniture, constructions, and other buildings before the required materials are
-available, and they will be created in a suspended state. Buildingplan will
-periodically scan for appropriate items, and the jobs will be unsuspended when
-the items are available.
-
-This is very useful when combined with manager work orders or `workflow` -- you
-can set a constraint to always have one or two doors/beds/tables/chairs/etc.
-available, and place as many as you like. Materials are used to build the
-planned buildings as they are produced, with minimal space dedicated to
-stockpiles.
+    :summary: Plan building layouts with or without materials.
+    :tags: fort design productivity buildings
+
+Buildingplan allows you to place furniture, constructions, and other buildings,
+regardless of whether the required materials are available. This allows you to
+focus purely on design elements when you are laying out your fort, and defers
+item production concerns to a more convenient time.
+
+Buildingplan is an alternative to the vanilla building placement UI. It appears
+after you have selected the type of building, furniture, or construction that
+you want to place in the vanilla build menu. Buildingplan then takes over for
+the actual placement step. If the placed building requires materials that
+aren't available yet, it will be created in a suspended state. Buildingplan will
+periodically scan for appropriate items and attach them to the planned
+building. Once all items are attached, the construction job will be unsuspended
+and a dwarf will come and build the building. If you have the `unsuspend`
+overlay enabled (it is enabled by default), then buildingplan-suspended
+buildings will be tagged with a clock graphic in graphics mode or a ``P``
+marker in ASCII mode, as opposed to the ``x`` marker for "regular" suspended
+buildings. If you have `suspendmanager` running, then buildings will be left
+suspended when their items are all attached and ``suspendmanager`` will
+unsuspend them for construction when it is safe to do so.
+
+If you want to impose restrictions on which items are chosen for the buildings,
+buildingplan has full support for quality and material filters (see `below
+<Setting quality and material filters>`_). This lets you create layouts with a
+consistent color, if that is part of your design.
+
+If you just care about the heat sensitivity of the building, you can set the
+building to be fire- or magma-proof in the placement UI screen. This makes it
+very easy to ensure that your pump stacks and floodgates, for example, are
+magma-safe.
+
+Buildingplan works well in conjuction with other design tools like
+`gui/quickfort`, which allow you to apply a building layout from a blueprint.
+You can apply very large, complicated layouts, and the buildings will simply be
+built when your dwarves get around to producing the needed materials. If you
+set filters in the buildingplan UI before applying the blueprint, the filters
+will be applied to the blueprint buildings, just as if you had planned them
+from the buildingplan placement UI.
+
+One way to integrate buildingplan into your gameplay is to create manager
+workorders to ensure you always have a few blocks/doors/beds/etc. available. You
+can then place as many of each building as you like. Items will be used to
+build the planned buildings as they are produced, with minimal space dedicated
+to stockpiles. The DFHack `orders` library can help with setting these manager
+workorders up for you.
+
+If you don't want to use the ``buildingplan`` interface for the building you're
+currently trying to place, you can hit :kbd:`Alt`:kbd:`M` or click on the
+minimize toggle in the upper right corner of the panel. If you do not wish to
+ever use the ``buildingplan`` interface, you can turn off the
+``buildingplan.planner`` overlay in `gui/control-panel` (on the "Overlays"
+tab). Be sure to keep the ``buildingplan`` "System service" itself enabled in
+`gui/control-panel` since if you turn it off, existing planned buildings in
+saved forts will stop functioning.
 
 Usage
 -----
 
 ::
 
-    enable buildingplan
-    buildingplan set
-    buildingplan set <setting> true|false
+    buildingplan [status]
+    buildingplan set <setting> (true|false)
+    buildingplan reset
+
+Examples
+--------
+
+``buildingplan``
+    Print a report of current settings, which kinds of buildings are planned,
+    and what kinds of materials the buildings are waiting for.
+
+``buildingplan set boulders false``
+    When finding items to satisfy "building materials" requirements, don't
+    select boulders. Use blocks or logs (if enabled) instead.
 
-Running ``buildingplan set`` without parameters displays the current settings.
+``buildingplan reset``
+    Reset all settings and filters to their defaults. This command does not affect
+    existing planned buildings.
 
 .. _buildingplan-settings:
 
 Global settings
 ---------------
 
-The buildingplan plugin has global settings that can be set from the UI
-(:kbd:`G` from any building placement screen, for example:
-:kbd:`b`:kbd:`a`:kbd:`G`). These settings can also be set via the
-``buildingplan set`` command. The available settings are:
+The buildingplan plugin has several global settings that affect what materials
+can be chosen when attaching items to planned buildings:
 
-``all_enabled`` (default: false)
-    Enable planning mode for all building types.
 ``blocks``, ``boulders``, ``logs``, ``bars`` (defaults: true, true, true, false)
     Allow blocks, boulders, logs, or bars to be matched for generic "building
     material" items.
-``quickfort_mode`` (default: false)
-    Enable compatibility mode for the legacy Python Quickfort (this setting is
-    not required for DFHack `quickfort`)
 
-The settings for ``blocks``, ``boulders``, ``logs``, and ``bars`` are saved with
-your fort, so you only have to set them once and they will be persisted in your
-save.
+These settings are saved with your fort, so you only have to set them once and
+they will be persisted in your save.
 
 If you normally embark with some blocks on hand for early workshops, you might
 want to add this line to your ``dfhack-config/init/onMapLoad.init`` file to
-always configure buildingplan to just use blocks for buildings and
+always configure `buildingplan` to just use blocks for buildings and
 constructions::
 
-    on-new-fortress buildingplan set boulders false; buildingplan set logs false
-
-.. _buildingplan-filters:
-
-Item filtering
---------------
-
-While placing a building, you can set filters for what materials you want the
-building made out of, what quality you want the component items to be, and
-whether you want the items to be decorated.
-
-If a building type takes more than one item to construct, use
-:kbd:`Ctrl`:kbd:`Left` and :kbd:`Ctrl`:kbd:`Right` to select the item that you
-want to set filters for. Any filters that you set will be used for all buildings
-of the selected type placed from that point onward (until you set a new filter
-or clear the current one). Buildings placed before the filters were changed will
-keep the filter values that were set when the building was placed.
+    on-new-fortress buildingplan set boulders false
+    on-new-fortress buildingplan set logs false
+
+Building placement
+------------------
+
+Once you have selected a building type to build in the vanilla build menu, the
+`buildingplan` placement UI appears as an `overlay` widget, covering the
+vanilla building placement panel.
+
+For basic usage, you don't need to change any settings. Just click to place
+buildings of the selected type and right click to exit building mode. Any
+buildings that require materials that you don't have on hand will be suspended
+and built when the items are available.
+
+When building constructions, you'll get a few extra options, like whether the
+construction area should be hollow or what types of stairs you'd like at the
+top and bottom of a stairwell. Also, unlike other buildings, it is ok if some
+tiles selected in the construction area are not appropriate for building. For
+example, if you want to fill an area with flooring, you can select the entire
+area, and any tiles with existing buildings or walls will simply be skipped.
+
+Some building types will have other options available as well, such as a
+selector for how many weapons you want in weapon traps or whether you want your
+built cages to not have any occupants.
+
+Setting quality and material filters
+++++++++++++++++++++++++++++++++++++
+
+If you want to set restrictions on the items chosen to complete the planned
+building, you can click on the "[any material]" link next to the item name or
+select the item with the :kbd:`q` or :kbd:`Q` keys and hit :kbd:`f` to bring up
+the filter dialog.
+
+You can select whether the item must be decorated, and you can drag the ends of
+the "Item quality" slider to set your desired quality range. Note that blocks,
+boulders, logs, and bars don't have a quality, and the quality options are
+disabled for those types. As you change the quality settings, the number of
+currently available matched items of each material is adjusted in the materials
+list.
+
+You can click on specific materials to allow only items of those materials when
+building the current type of building. You can also allow or disallow entire
+categories of materials by clicking on the "Type" options on the left. Note
+that it is perfectly fine to choose materials that currently show zero quantity.
+`buildingplan` will patiently wait for items made of materials you have
+selected to become available.
+
+Choosing specific items
++++++++++++++++++++++++
+
+If you want to choose specific items instead of using the filters, click on the
+"Choose items" selector or hit :kbd:`z` before placing the building. You can
+choose to be prompted for every item ("Manually") or you can have it
+automatically select the type of item that you last chose for this building
+type. The list you are prompted with is sorted by most recently used materials
+for that building type by default, but you can change to sort by name or by
+available quantity by clicking on the "Sort by" selector or hitting :kbd:`R`.
+The configuration for whether you would like to choose specific items is saved
+per building type and will be restored when you plan more of that building type.
+
+You can select the maximum quantity of a specified item by clicking on the item
+name or selecting it with the arrow keys and hitting :kbd:`Enter`. You can
+instead select items one at a time by Ctrl-clicking (:kbd:`Shift`:kbd:`Right`)
+to increment or Ctrl-Shift-clicking (:kbd:`Shift`:kbd:`Left`) to decrement.
+
+Once you are satisfied with your choices, click on the large green button or hit
+:kbd:`C` to continue building. Note that you don't have to select all the items
+that the building needs. Any remaining items will be automatically chosen from
+other available items (or from items produced in the future if not all items
+are available yet). If there are multiple item types to choose for the current
+building, one dialog will appear per item type.
+
+Building status
+---------------
 
-For example, you can be sure that all your constructed walls are the same color
-by setting a filter to accept only certain types of stone.
+When viewing a planned building, a separate `overlay` widget appears on the
+building info sheet, showing you which items have been attached and which items
+are still pending. For a pending item, you can see its position in the
+fulfillment queue. You need to manufacture these items for them to be attached
+to the building. If there is a particular building that you need built ASAP,
+you can click on the "make top priority" button (or hit :kbd:`Ctrl`:kbd:`T`) to
+bump the items for this building to the front of their respective queues.
 
-Quickfort mode
---------------
+Note that each item type and filter configuration has its own queue, so even if
+an item is in queue position 1, there may be other queues that snag the needed
+item first.
 
-If you use the external Python Quickfort to apply building blueprints instead of
-the native DFHack `quickfort` script, you must enable Quickfort mode. This
-temporarily enables buildingplan for all building types and adds an extra blank
-screen after every building placement. This "dummy" screen is needed for Python
-Quickfort to interact successfully with Dwarf Fortress.
+Lever linking
+-------------
 
-Note that Quickfort mode is only for compatibility with the legacy Python
-Quickfort. The DFHack `quickfort` script does not need this Quickfort mode to be
-enabled. The `quickfort` script will successfully integrate with buildingplan as
-long as the buildingplan plugin itself is enabled.
+When linking levers, `buildingplan` extends the vanilla panel by offering
+control over which mechanisms are chosen for installation at the lever and at
+the target. Heat safety filters are provided for convenience.
diff --git a/docs/plugins/burrow.rst b/docs/plugins/burrow.rst
new file mode 100644
index 000000000..f84f02989
--- /dev/null
+++ b/docs/plugins/burrow.rst
@@ -0,0 +1,115 @@
+burrow
+======
+
+.. dfhack-tool::
+    :summary: Quickly adjust burrow tiles and units.
+    :tags: fort auto design productivity units
+
+This tool has two modes. When enabled, it monitors burrows with names that end
+in ``+``. If a wall at the edge of such a burrow is dug out, the burrow will be
+automatically extended to include the newly-revealed adjacent walls. If a miner
+digs into an open space, such as a cavern, the open space will *not* be
+included in the burrow.
+
+When run as a command, it can quickly adjust which tiles and/or units are
+associated with the burrow.
+
+Usage
+-----
+
+::
+
+    enable burrow
+    burrow tiles|units clear <target burrow> [<target burrow> ...] [<options>]
+    burrow tiles|units set|add|remove <target burrow> <burrow> [...] [<options>]
+    burrow tiles box-add|box-remove <target burrow> [<pos>] [<pos>] [<options>]
+    burrow tiles flood-add|flood-remove <target burrow> [<options>]
+
+The burrows can be referenced by name or by the internal numeric burrow ID. If
+referenced by name, the first burrow that matches the name (case sensitive)
+will be targeted. If a burrow name ends in ``+`` (to indicate that it should be
+auto-expanded), the final ``+`` does not need to be specified on the
+commandline.
+
+For ``set``, ``add``, or ``remove`` commands, instead of a burrow, you can
+specify one of the following all-caps keywords:
+
+- ``ABOVE_GROUND``
+- ``SUBTERRANEAN``
+- ``INSIDE``
+- ``OUTSIDE``
+- ``LIGHT``
+- ``DARK``
+- ``HIDDEN``
+- ``REVEALED``
+
+to add or remove tiles with the corresponding properties.
+
+Flood fill selects tiles spreading out from a starting tile if they:
+
+- match the inside/outside and hidden/revealed properties of the starting tile
+- match the walkability group of the starting tile OR (if the starting tile is
+  walkable) is adjacent to a tile with the same walkability group as the
+  starting tile
+
+When flood adding, the flood fill will also stop at any tiles that have already
+been added to the burrow. Similarly for flood removing, the flood will also
+stop at tiles that are not in the burrow.
+
+Examples
+--------
+
+``enable burrow``
+    Start monitoring burrows that have names ending in '+' and automatically
+    expand them when walls that border the burrows are dug out.
+``burrow tiles clear Safety``
+    Remove all tiles from the burrow named ``Safety`` (in preparation for
+    adding new tiles elsewhere, presumably).
+``burrow units clear Farmhouse Workshops``
+    Remove all units from the burrows named ``Farmhouse`` and ``Workshops``.
+``multicmd burrow tiles set Inside INSIDE; burrow tiles remove Inside HIDDEN``
+    Reset the burrow named ``Inside`` to include all the currently revealed,
+    interior tiles.
+``burrow units set "Core Fort" Peasants Skilled``
+    Clear all units from the burrow named ``Core Fort``, then add units
+    currently assigned to the ``Peasants`` and ``Skilled`` burrows.
+``burrow tiles box-add Safety 0,0,0``
+    Add all tiles to the burrow named ``Safety`` that are within the volume of
+    the box starting at coordinate 0, 0, 0 (the upper left corner of the bottom
+    level) and ending at the current location of the keyboard cursor.
+``burrow tiles flood-add Safety --cur-zlevel``
+    Flood-add the tiles on the current z-level with the same properties as the
+    tile under the keyboard cursor to the burrow named ``Safety``.
+
+Options
+-------
+
+``-c``, ``--cursor <pos>``
+    Indicate the starting position of the box or flood fill. If not specified,
+    the position of the keyboard cursor is used.
+``-z``, ``--cur-zlevel``
+    Restricts a flood fill operation to the currently visible z-level.
+
+Note
+----
+
+If you are auto-expanding a burrow (whose name ends in a ``+``) and the miner
+who is digging to expand the burrow is assigned to that burrow, then 1-wide
+corridors that expand the burrow will have very slow progress. This is because
+the burrow is expanded to include the next dig job only after the miner has
+chosen a next tile to dig, which may be far away. 2-wide cooridors are much
+more efficient when expanding a burrow since the "next" tile to dig will still
+be nearby.
+
+Overlay
+-------
+
+When painting burrows in the vanilla UI, a few extra mouse operations are
+supported. If you box select across multiple z-levels, you will be able to
+select the entire volume instead of just the selected area on the z-level that
+you are currently looking at.
+
+In addition, double-clicking will start a flood fill from the target tile.
+
+The box and flood fill actions respect the UI setting for whether the burrow is
+being added to or erased.
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
deleted file mode 100644
index fb3876e97..000000000
--- a/docs/plugins/burrows.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-burrows
-=======
-
-.. dfhack-tool::
-    :summary: Auto-expand burrows as you dig.
-    :tags: fort auto design productivity map units
-    :no-command:
-
-.. dfhack-command:: burrow
-    :summary: Quickly add units/tiles to burrows.
-
-When a wall inside a burrow with a name ending in ``+`` is dug out, the burrow
-will be extended to newly-revealed adjacent walls.
-
-Usage
------
-
-``burrow enable auto-grow``
-    When a wall inside a burrow with a name ending in '+' is dug out, the burrow
-    will be extended to newly-revealed adjacent walls. This final '+' may be
-    omitted in burrow name args of other ``burrow`` commands. Note that digging
-    1-wide corridors with the miner inside the burrow is SLOW.
-``burrow disable auto-grow``
-    Disables auto-grow processing.
-``burrow clear-unit <burrow> [<burrow> ...]``
-    Remove all units from the named burrows.
-``burrow clear-tiles <burrow> [<burrow> ...]``
-    Remove all tiles from the named burrows.
-``burrow set-units target-burrow <burrow> [<burrow> ...]``
-    Clear all units from the target burrow, then add units from the named source
-    burrows.
-``burrow add-units target-burrow <burrow> [<burrow> ...]``
-    Add units from the source burrows to the target.
-``burrow remove-units target-burrow <burrow> [<burrow> ...]``
-    Remove units in source burrows from the target.
-``burrow set-tiles target-burrow <burrow> [<burrow> ...]``
-    Clear target burrow tiles and add tiles from the names source burrows.
-``burrow add-tiles target-burrow <burrow> [<burrow> ...]``
-    Add tiles from the source burrows to the target.
-``burrow remove-tiles target-burrow <burrow> [<burrow> ...]``
-    Remove tiles in source burrows from the target.
-
-In place of a source burrow, you can use one of the following keywords:
-
-- ``ABOVE_GROUND``
-- ``SUBTERRANEAN``
-- ``INSIDE``
-- ``OUTSIDE``
-- ``LIGHT``
-- ``DARK``
-- ``HIDDEN``
-- ``REVEALED``
-
-to add tiles with the given properties.
diff --git a/docs/plugins/changeitem.rst b/docs/plugins/changeitem.rst
index f7418238a..f452f6a74 100644
--- a/docs/plugins/changeitem.rst
+++ b/docs/plugins/changeitem.rst
@@ -2,7 +2,7 @@ changeitem
 ==========
 
 .. dfhack-tool::
-    :summary: Change item material or base quality.
+    :summary: Change item material, quality, and subtype.
     :tags: adventure fort armok items
 
 By default, a change is only allowed if the existing and desired item materials
diff --git a/docs/plugins/channel-safely.rst b/docs/plugins/channel-safely.rst
index 1b72c93df..c5dbc37f6 100644
--- a/docs/plugins/channel-safely.rst
+++ b/docs/plugins/channel-safely.rst
@@ -52,18 +52,17 @@ Commands
 --------
 
 :runonce:           Run the safety procedures once to set the marker mode of designations.
-:rebuild:           Rebuild the designation group data. Intended for to be used in the event
-                    the marker mode isn't being set correctly (mostly for debugging).
+:rebuild:           Rebuild the designation group data. You should also read Troubleshooting.
 
 Features
 --------
 
 :require-vision:    Toggle whether the dwarves need vision of a tile before channeling to it can be deemed unsafe. (default: enabled)
-:monitor:           Toggle whether to monitor the conditions of active digs. (default: disabled)
+:risk-averse:       Toggles whether to use cave-in prevention. Designations are activated in stages
+                    and their priorities along edges are modified. (default: enabled)
+:monitoring:        Toggle whether to monitor the conditions of active digs. (default: disabled)
 :resurrect:         Toggle whether to resurrect units involved in cave-ins, and if monitor is enabled
                     units who die while digging. (default: disabled)
-:insta-dig:         Toggle whether to use insta-digging on unreachable designations.
-                    Runs on the refresh cycles. (default: disabled)
 
 Settings
 --------
@@ -74,3 +73,13 @@ Settings
 :ignore-threshold:  Sets the priority threshold below which designations are processed. You can set to 1 or 0 to
                     effectively disable the scanning. (default: 5)
 :fall-threshold:    Sets the fall threshold beyond which is considered unsafe. (default: 1)
+
+Troubleshooting
+---------------
+
+If designations aren't switching correctly, try putting the designations into marker mode.
+Then press . (next) or resume. If you're debugging code you'll want these::
+
+    debugfilter set Info channel manager
+    debugfilter set Debug channel plugin
+    debugfilter set Trace channel group
diff --git a/docs/plugins/confirm.rst b/docs/plugins/confirm.rst
index 6679cf4e3..1e6270187 100644
--- a/docs/plugins/confirm.rst
+++ b/docs/plugins/confirm.rst
@@ -5,8 +5,9 @@ confirm
     :summary: Adds confirmation dialogs for destructive actions.
     :tags: fort interface
 
-Now you can get the chance to avoid seizing goods from traders or deleting a
-hauling route in case you hit the key accidentally.
+In the base game, it is frightenly easy to destroy hours of work with a single
+misclick. Now you can avoid the consequences of accidentally disbanding a squad
+(for example), or deleting a hauling route.
 
 Usage
 -----
diff --git a/docs/plugins/design.rst b/docs/plugins/design.rst
new file mode 100644
index 000000000..3cb48343c
--- /dev/null
+++ b/docs/plugins/design.rst
@@ -0,0 +1,10 @@
+design
+======
+
+.. dfhack-tool::
+    :summary: Draws designations in shapes.
+    :tags: fort design dev map
+    :no-command:
+
+This plugin provides a Lua API, but no direct commands. See `gui/design` for
+the user interface.
diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index a10db97df..2055a7572 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -50,7 +50,7 @@ Usage
     Designate circles. The diameter is the number of tiles across the center of
     the circle that you want to dig. See the `digcircle`_ section below for
     options.
-``digtype [<designation>] [-p<number>] [-z]``
+``digtype [<designation>] [-p<number>] [--zup|-u] [--zdown|-zu] [--cur-zlevel|-z] [--hidden|-h] [--no-auto|-a]``
     Designate all vein tiles of the same type as the selected tile. See the
     `digtype`_ section below for options.
 ``digexp [<pattern>] [<filter>] [-p<number>]``
@@ -119,9 +119,11 @@ the last selected parameters.
 digtype
 -------
 
-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.
+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. By default, only designates
+visible tiles, and in the case of dig designation, applies automatic mining to them
+(designates uncovered neighbouring tiles of the same type to be dug).
 
 If an argument is given, the designation of the selected tile is ignored, and
 all appropriate tiles are set to the specified designation.
@@ -143,9 +145,18 @@ Designation options:
 ``clear``
     Clear any designations.
 
-You can also pass a ``-z`` option, which restricts designations to the current
-z-level and down. This is useful when you don't want to designate tiles on the
-same z-levels as your carefully dug fort above.
+Other options:
+
+``-d``, ``--zdown``
+    Only designates tiles on the cursor's z-level and below.
+``-u``, ``--zup``
+    Only designates tiles on the cursor's z-level and above.
+``-z``, ``--cur-zlevel``
+    Only designates tiles on the same z-level as the cursor.
+``-h``, ``--hidden``
+    Allows designation of hidden tiles, and picking a hidden tile as the target type.
+``-a``, ``--no-auto``
+    No automatic mining mode designation - useful if you want to avoid dwarves digging where you don't want them.
 
 digexp
 ------
@@ -179,3 +190,23 @@ Filters:
     Take current designation and apply the selected pattern to it.
 
 After you have a pattern set, you can use ``expdig`` to apply it again.
+
+Overlay
+-------
+
+This tool also provides two overlays that are managed by the `overlay`
+framework. Both have no effect when in graphics mode, but when in ASCII mode,
+they display useful highlights that are otherwise missing from the ASCII mode
+interface.
+
+The ``dig.asciiwarmdamp`` overlay highlights warm tiles red and damp tiles in
+blue. Box selection characters and the keyboard cursor will also
+change color as appropriate when over the warm or damp tile.
+
+The ``dig.asciicarve`` overlay highlights tiles that are designated for
+smoothing, engraving, track carving, or fortification carving. The designations
+blink so you can still see what is underneath them.
+
+Note that due to the limitations of the ASCII mode screen buffer, the
+designation highlights may show through other interface elements that overlap
+the designated area.
diff --git a/docs/plugins/digFlood.rst b/docs/plugins/digFlood.rst
index 57d4584a8..e98b65382 100644
--- a/docs/plugins/digFlood.rst
+++ b/docs/plugins/digFlood.rst
@@ -3,7 +3,7 @@ digFlood
 
 .. dfhack-tool::
     :summary: Digs out veins as they are discovered.
-    :tags: fort auto map
+    :tags: unavailable
 
 Once you register specific vein types, this tool will automatically designate
 tiles of those types of veins for digging as your miners complete adjacent
diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
index ace04e9fc..46db313c6 100644
--- a/docs/plugins/diggingInvaders.rst
+++ b/docs/plugins/diggingInvaders.rst
@@ -3,7 +3,7 @@ diggingInvaders
 
 .. dfhack-tool::
     :summary: Invaders dig and destroy to get to your dwarves.
-    :tags: fort gameplay military units
+    :tags: unavailable
 
 Usage
 -----
diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index c1eb27aef..cd8867ee5 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -3,7 +3,7 @@ dwarfmonitor
 
 .. dfhack-tool::
     :summary: Report on dwarf preferences and efficiency.
-    :tags: fort inspection jobs units
+    :tags: unavailable
 
 It can also show heads-up display widgets with live fort statistics.
 
diff --git a/docs/plugins/dwarfvet.rst b/docs/plugins/dwarfvet.rst
index fa165250d..12d77fef8 100644
--- a/docs/plugins/dwarfvet.rst
+++ b/docs/plugins/dwarfvet.rst
@@ -2,22 +2,34 @@ dwarfvet
 ========
 
 .. dfhack-tool::
-    :summary: Allows animals to be treated at animal hospitals.
+    :summary: Allow animals to be treated at hospitals.
     :tags: fort gameplay animals
 
 Annoyed that your dragons become useless after a minor injury? Well, with
-dwarfvet, injured animals will be treated at an animal hospital, which is simply
-a hospital that is also an animal training zone. Dwarfs with the Animal
-Caretaker labor enabled will come to the hospital to treat animals. Normal
+dwarfvet, injured animals will be treated at a hospital. Dwarfs with the Animal
+Caretaker labor enabled will come to the hospital to treat the animals. Normal
 medical skills are used (and trained), but no experience is given to the Animal
 Caretaker skill itself.
 
+You can enable ``dwarfvet`` in `gui/control-panel`, and you can choose to start
+``dwarfvet`` automatically in new forts in the ``Autostart`` tab.
+
 Usage
 -----
 
-``enable dwarfvet``
-    Enables the plugin.
-``dwarfvet report``
-    Reports all zones that the game considers animal hospitals.
-``dwarfvet report-usage``
-    Reports on animals currently being treated.
+::
+
+    enable dwarfvet
+    dwarfvet [status]
+    dwarfvet now
+
+Examples
+--------
+
+``dwarfvet``
+    Report on how many animals are being treated and how many are in need of
+    treatment.
+
+``dwarfvet now``
+    Assign injured animals to a free floor spot in a nearby hospital,
+    regardless of whether the plugin is enabled.
diff --git a/docs/plugins/embark-assistant.rst b/docs/plugins/embark-assistant.rst
index c7a3f778e..88c4ffccd 100644
--- a/docs/plugins/embark-assistant.rst
+++ b/docs/plugins/embark-assistant.rst
@@ -3,7 +3,7 @@ embark-assistant
 
 .. dfhack-tool::
     :summary: Embark site selection support.
-    :tags: embark fort interface
+    :tags: unavailable
 
 Run this command while the pre-embark screen is displayed to show extended (and
 reasonably correct) resource information for the embark rectangle as well as
diff --git a/docs/plugins/embark-tools.rst b/docs/plugins/embark-tools.rst
index 781d66e90..37a7bf43e 100644
--- a/docs/plugins/embark-tools.rst
+++ b/docs/plugins/embark-tools.rst
@@ -3,7 +3,7 @@ embark-tools
 
 .. dfhack-tool::
     :summary: Extend the embark screen functionality.
-    :tags: embark fort interface
+    :tags: unavailable
 
 Usage
 -----
diff --git a/docs/plugins/faststart.rst b/docs/plugins/faststart.rst
new file mode 100644
index 000000000..b39269e01
--- /dev/null
+++ b/docs/plugins/faststart.rst
@@ -0,0 +1,18 @@
+faststart
+=========
+
+.. dfhack-tool::
+    :summary: Makes the main menu appear sooner.
+    :tags: dfhack interface
+    :no-command:
+
+This plugin accelerates the initial "Loading..." screen that appears when the
+game first starts, so you don't have to wait as long before the Main Menu
+appears and you can start playing.
+
+Usage
+-----
+
+::
+
+    enable faststart
diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
index 0559d4a2f..5bf504fdc 100644
--- a/docs/plugins/fix-unit-occupancy.rst
+++ b/docs/plugins/fix-unit-occupancy.rst
@@ -3,7 +3,7 @@ fix-unit-occupancy
 
 .. dfhack-tool::
     :summary: Fix phantom unit occupancy issues.
-    :tags: fort bugfix map
+    :tags: unavailable
 
 If you see "unit blocking tile" messages that you can't account for
 (:bug:`3499`), this tool can help.
diff --git a/docs/plugins/fixveins.rst b/docs/plugins/fixveins.rst
index 616f84fae..49b2046b6 100644
--- a/docs/plugins/fixveins.rst
+++ b/docs/plugins/fixveins.rst
@@ -3,7 +3,7 @@ fixveins
 
 .. dfhack-tool::
     :summary: Restore missing mineral inclusions.
-    :tags: fort bugfix map
+    :tags: unavailable
 
 This tool can also remove invalid references to mineral inclusions if you broke
 your embark with tools like `tiletypes`.
diff --git a/docs/plugins/follow.rst b/docs/plugins/follow.rst
index 0bf1e4d0f..21b3411a9 100644
--- a/docs/plugins/follow.rst
+++ b/docs/plugins/follow.rst
@@ -3,7 +3,7 @@ follow
 
 .. dfhack-tool::
     :summary: Make the screen follow the selected unit.
-    :tags: fort interface units
+    :tags: unavailable
 
 Once you exit from the current menu or cursor mode, the screen will stay
 centered on the unit. Handy for watching dwarves running around. Deactivated by
diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
index 26ab378ee..18661195a 100644
--- a/docs/plugins/forceequip.rst
+++ b/docs/plugins/forceequip.rst
@@ -3,7 +3,7 @@ forceequip
 
 .. dfhack-tool::
     :summary: Move items into a unit's inventory.
-    :tags: adventure fort animals items military units
+    :tags: unavailable
 
 This tool is typically used to equip specific clothing/armor items onto a dwarf,
 but can also be used to put armor onto a war animal or to add unusual items
diff --git a/docs/plugins/generated-creature-renamer.rst b/docs/plugins/generated-creature-renamer.rst
index 68302dbf5..fc2734d07 100644
--- a/docs/plugins/generated-creature-renamer.rst
+++ b/docs/plugins/generated-creature-renamer.rst
@@ -3,7 +3,7 @@ generated-creature-renamer
 
 .. dfhack-tool::
     :summary: Automatically renames generated creatures.
-    :tags: adventure fort legends units
+    :tags: unavailable
     :no-command:
 
 .. dfhack-command:: list-generated
diff --git a/docs/plugins/hotkeys.rst b/docs/plugins/hotkeys.rst
index 6b2ef3f0c..561a34382 100644
--- a/docs/plugins/hotkeys.rst
+++ b/docs/plugins/hotkeys.rst
@@ -19,14 +19,17 @@ Usage
 Menu overlay widget
 -------------------
 
-The in-game hotkeys menu is registered with the `overlay` framework and can be
-enabled as a hotspot in the upper-left corner of the screen. You can bring up
-the menu by hovering the mouse cursor over the hotspot and can select a command
-to run from the list by clicking on it with the mouse or by using the keyboard
-to select a command with the arrow keys and hitting :kbd:`Enter`.
+The in-game hotkeys menu is registered with the `overlay` framework and appears
+as a DFHack logo in the upper-left corner of the screen. You can bring up the
+menu by clicking on the logo or by hitting the global :kbd:`Ctrl`:kbd:`Shift`:kbd:`c` hotkey. You can select a command to run from
+the list by clicking on it with the mouse or by using the keyboard to select a
+command with the arrow keys and hitting :kbd:`Enter`.
+
+The menu closes automatically when an action is taken or when you click or
+right click anywhere else on the screen.
 
 A short description of the command will appear in a nearby textbox. If you'd
 like to see the full help text for the command or edit the command before
-running, you can open it for editing in `gui/launcher` by right clicking on the
+running, you can open it for editing in `gui/launcher` by shift clicking on the
 command, left clicking on the arrow to the left of the command, or by pressing
 the right arrow key while the command is selected.
diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
index c15f87e26..0c14804af 100644
--- a/docs/plugins/infiniteSky.rst
+++ b/docs/plugins/infiniteSky.rst
@@ -3,7 +3,7 @@ infiniteSky
 
 .. dfhack-tool::
     :summary: Automatically allocate new z-levels of sky
-    :tags: fort design map
+    :tags: unavailable
 
 If enabled, this plugin will automatically allocate new z-levels of sky at the
 top of the map as you build up. Or it can allocate one or many additional levels
diff --git a/docs/plugins/isoworldremote.rst b/docs/plugins/isoworldremote.rst
index 284794f96..82748e36e 100644
--- a/docs/plugins/isoworldremote.rst
+++ b/docs/plugins/isoworldremote.rst
@@ -3,7 +3,7 @@ isoworldremote
 
 .. dfhack-tool::
     :summary: Provides a remote API used by Isoworld.
-    :tags: dev graphics
+    :tags: unavailable
     :no-command:
 
 See `remote` for related remote APIs.
diff --git a/docs/plugins/jobutils.rst b/docs/plugins/jobutils.rst
index 9d083d92f..5e8125585 100644
--- a/docs/plugins/jobutils.rst
+++ b/docs/plugins/jobutils.rst
@@ -5,7 +5,7 @@ jobutils
 
 .. dfhack-tool::
     :summary: Provides commands for interacting with jobs.
-    :tags: fort inspection jobs
+    :tags: unavailable
     :no-command:
 
 .. dfhack-command:: job
diff --git a/docs/plugins/labormanager.rst b/docs/plugins/labormanager.rst
index e3443280d..255de05c4 100644
--- a/docs/plugins/labormanager.rst
+++ b/docs/plugins/labormanager.rst
@@ -3,7 +3,7 @@ labormanager
 
 .. dfhack-tool::
     :summary: Automatically manage dwarf labors.
-    :tags: fort auto labors
+    :tags: unavailable
 
 Labormanager is derived from `autolabor` but uses a completely different
 approach to assigning jobs to dwarves. While autolabor tries to keep as many
diff --git a/docs/plugins/logistics.rst b/docs/plugins/logistics.rst
new file mode 100644
index 000000000..d9aeee067
--- /dev/null
+++ b/docs/plugins/logistics.rst
@@ -0,0 +1,78 @@
+logistics
+=========
+
+.. dfhack-tool::
+    :summary: Automatically mark and route items in monitored stockpiles.
+    :tags: fort auto animals items stockpiles
+
+Commands act upon the stockpile selected in the UI unless another stockpile
+identifier is specified on the commandline.
+
+When the plugin is enabled, it checks stockpiles marked with automelt,
+autotrade, autodump, and/or autotrain features twice every in-game day, and
+will mark valid items/animals in those stockpiles for melting, trading,
+dumping, and/or training, respectively.
+
+For autotrade, items will be marked for trading only when a caravan is
+approaching or is already at the trade depot. Items (or bins that contain
+items) of which a noble has forbidden export will not be marked for trade.
+
+Stockpiles can be registered for ``logistics`` features by toggling the options
+in the `stockpiles` overlay that comes up when you select a stockpile in the UI.
+
+Usage
+-----
+
+::
+
+    enable logistics
+    logistics [status]
+    logistics now
+    logistics add [melt] [trade] [dump] [train] [<options>]
+    logistics clear [all] [<options>]
+
+Examples
+--------
+
+``logistics``
+    Print a summary of all your stockpiles, their ``logistics`` configuration,
+    and the number of items that are designated (or can be designated) by each
+    of the ``logistics`` processors.
+
+``logistics now``
+    Designate items in monitored stockpiles according to the current
+    configuration. This works regardless of whether ``logistics`` is currently
+    enabled.
+
+``logistics add melt``
+    Register the currently selected stockpile for automelting. Meltable items
+    that are brought to this stockpile will be designated for melting.
+
+``logistics add melt trade -s goblinite``
+    Register the stockpile(s) named "goblinite" for automatic melting and
+    automatic trading. Items will be marked for melting, but any items still in
+    the stockpile when a caravan shows up will be brought to the trade depot
+    for trading.
+
+``logistics clear``
+    Unregisters the currently selected stockpile from any monitoring. Any
+    currently designated items will remain designated.
+
+``logistics clear -s 12,15,goblinite``
+    Unregisters the stockpiles with stockpile numbers 12 and 15, along with any
+    stockpiles named "goblinite", from any monitoring.
+
+``logistics clear all``
+    Unregister all stockpiles from any monitoring.
+
+Options
+-------
+
+``-s``, ``--stockpile <name or number>[,<name or number>...]``
+    Causes the command to act upon stockpiles with the given names or numbers
+    instead of the stockpile that is currently selected in the UI. Note that
+    the numbers are the stockpile numbers, not the building ids.
+``-m``, ``--melt-masterworks``
+    If specified with a ``logistics add melt`` command, will configure the
+    stockpile to allow melting of masterworks. By default, masterworks are not
+    marked for melting, even if they are in an automelt stockpile.
diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index f333f3be0..c1268bda5 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -3,7 +3,7 @@ manipulator
 
 .. dfhack-tool::
     :summary: An in-game labor management interface.
-    :tags: fort productivity labors
+    :tags: unavailable
     :no-command:
 
 It is equivalent to the popular Dwarf Therapist utility.
diff --git a/docs/plugins/map-render.rst b/docs/plugins/map-render.rst
index 935fc1010..5dc07c45e 100644
--- a/docs/plugins/map-render.rst
+++ b/docs/plugins/map-render.rst
@@ -3,7 +3,7 @@ map-render
 
 .. dfhack-tool::
     :summary: Provides a Lua API for re-rendering portions of the map.
-    :tags: dev graphics
+    :tags: unavailable
     :no-command:
 
 See `map-render-api` for details.
diff --git a/docs/plugins/misery.rst b/docs/plugins/misery.rst
index b3634d2ac..3bcd5588a 100644
--- a/docs/plugins/misery.rst
+++ b/docs/plugins/misery.rst
@@ -2,18 +2,36 @@ misery
 ======
 
 .. dfhack-tool::
-    :summary: Increase the intensity of negative dwarven thoughts.
-    :tags: fort armok units
+    :summary: Make citizens more miserable.
+    :tags: fort gameplay units
 
-When enabled, negative thoughts that your dwarves have will multiply by the
-specified factor.
+When enabled, all of your citizens receive a negative thought about a
+particularly nasty soapy bath. You can vary the strength of this negative
+thought to increase or decrease the difficulty of keeping your citizens happy.
 
 Usage
 -----
 
+::
+
+    enable misery
+    misery [status]
+    misery <factor>
+    misery clear
+
+The default misery factor is ``2``, which will result in a moderate hit to your
+dwarves' happiness. Larger numbers increase the challenge.
+
+Examples
+--------
+
 ``enable misery``
-    Start multiplying negative thoughts.
-``misery <factor>``
-    Change the multiplicative factor of bad thoughts. The default is ``2``.
+    Start adding bad thoughts about nasty soapy baths to your citizens!
+
+``misery 5``
+    Change the strength of the soapy bath negative thought to something quite
+    large -- this is very challenging to handle!
+
 ``misery clear``
-    Clear away negative thoughts added by ``misery``.
+    Clear away negative thoughts added by ``misery``. Note that this will not
+    clear negative thoughts that your dwarves accumulated "naturally".
diff --git a/docs/plugins/mode.rst b/docs/plugins/mode.rst
index 33173a5d3..35964b783 100644
--- a/docs/plugins/mode.rst
+++ b/docs/plugins/mode.rst
@@ -3,7 +3,7 @@ mode
 
 .. dfhack-tool::
     :summary: See and change the game mode.
-    :tags: armok dev gameplay
+    :tags: unavailable
 
 .. warning::
 
diff --git a/docs/plugins/mousequery.rst b/docs/plugins/mousequery.rst
index 12f4092bd..38e9266e3 100644
--- a/docs/plugins/mousequery.rst
+++ b/docs/plugins/mousequery.rst
@@ -3,7 +3,7 @@ mousequery
 
 .. dfhack-tool::
     :summary: Adds mouse controls to the DF interface.
-    :tags: fort productivity interface
+    :tags: unavailable
 
 Adds mouse controls to the DF interface. For example, with ``mousequery`` you
 can click on buildings to configure them, hold the mouse button to draw dig
diff --git a/docs/plugins/orders.rst b/docs/plugins/orders.rst
index bc15fd175..32708b4c8 100644
--- a/docs/plugins/orders.rst
+++ b/docs/plugins/orders.rst
@@ -8,7 +8,7 @@ orders
 Usage
 -----
 
-``orders orders list``
+``orders list``
     Shows the list of previously exported orders, including the orders library.
 ``orders export <name>``
     Saves all the current manager orders in a file.
@@ -17,13 +17,21 @@ Usage
     manager orders. It will not clear the orders that already exist.
 ``orders clear``
     Deletes all manager orders in the current embark.
+``orders recheck [this]``
+    Sets the status to ``Checking`` (from ``Active``) for all work orders that
+    have conditions that can be re-checked. If the "this" option is passed,
+    only sets the status for the workorder whose condition details page is
+    open. This makes the manager reevaluate its conditions. This is especially
+    useful for an order that had its conditions met when it was started, but
+    the requisite items have since disappeared and the workorder is now
+    generating job cancellation spam.
 ``orders sort``
     Sorts current manager orders by repeat frequency so repeating orders don't
     prevent one-time orders from ever being completed. The sorting order is:
     one-time orders first, then yearly, seasonally, monthly, and finally, daily.
 
 You can keep your orders automatically sorted by adding the following command to
-your ``onMapLoad.init`` file::
+your ``dfhack-config/init/onMapLoad.init`` file::
 
     repeat -name orders-sort -time 1 -timeUnits days -command [ orders sort ]
 
@@ -40,6 +48,20 @@ Examples
     Import manager orders from the library that keep your fort stocked with
     basic essentials.
 
+Overlay
+-------
+
+Orders plugin functionality is directly available when the manager orders screen
+is open via an `overlay` widget. There are hotkeys assigned to export, import,
+sort, and clear. You can also click on the hotkey hints as if they were buttons.
+Clearing will ask for confirmation before acting.
+
+If you want to change where the overlay panel appears, you can move it via
+`gui/overlay`. If you just need to get the overlay out of the way temporarily,
+for example to read a long description of a historical figure when choosing a
+subject for a statue, click on the small arrow in the upper right corner of the
+overlay panel. Click on the arrow again to restore the panel.
+
 The orders library
 ------------------
 
@@ -53,7 +75,7 @@ This collection of orders handles basic fort necessities:
 - prepared meals and food products (and by-products like oil)
 - booze/mead
 - thread/cloth/dye
-- pots/jugs/buckets/mugs
+- pots/bins/jugs/buckets/mugs
 - bags of leather, cloth, silk, and yarn
 - crafts, totems, and shleggings from otherwise unusable by-products
 - mechanisms/cages
@@ -66,7 +88,10 @@ This collection of orders handles basic fort necessities:
 You should import it as soon as you have enough dwarves to perform the tasks.
 Right after the first migration wave is usually a good time.
 
-Armok's note: shleggings? Yes, `shleggings <https://youtu.be/bLN8cOcTjdo>`__.
+Note that the jugs are specifically made out of wood. This is so, as long as you don't may any other "Tools" out of wood, you can have a stockpile just for jugs by restricting a finished goods stockpile to only take wooden tools.
+
+Armok's additional note: "shleggings? Yes,
+`shleggings <https://youtu.be/bLN8cOcTjdo>`__."
 
 :source:`library/furnace <data/orders/furnace.json>`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -90,13 +115,15 @@ Orders are missing for plaster powder until DF :bug:`11803` is fixed.
 This collection adds high-volume smelting jobs for military-grade metal ores and
 produces weapons and armor:
 
-- leather backpacks/waterskins/cloaks/quivers/armor
+- leather backpacks/waterskins/quivers/armor
+- silk cloaks
 - bone/wooden bolts
 - smelting for platinum, silver, steel, bronze, bismuth bronze, and copper (and
   their dependencies)
 - bronze/bismuth bronze/copper bolts
-- platinum/silver/steel/iron/bismuth bronze/bronze/copper weapons and armor,
+- steel/silver/iron/bismuth bronze/bronze/copper weapons and armor,
   with checks to ensure only the best available materials are being used
+- wooden shields (if metal isn't available)
 
 If you set a stockpile to take weapons and armor of less than masterwork quality
 and turn on `automelt` (like what `dreamfort` provides on its industry level),
diff --git a/docs/plugins/overlay.rst b/docs/plugins/overlay.rst
index ab63de67e..fd196158f 100644
--- a/docs/plugins/overlay.rst
+++ b/docs/plugins/overlay.rst
@@ -7,8 +7,8 @@ overlay
 
 The overlay framework manages the on-screen widgets that other tools (including
 3rd party plugins and scripts) can register for display. For a graphical
-configuration interface, please see `gui/overlay`. If you are a developer who
-wants to write an overlay widget, please see the `overlay-dev-guide`.
+configuration interface, please see `gui/control-panel`. If you are a developer
+who wants to write an overlay widget, please see the `overlay-dev-guide`.
 
 Usage
 -----
@@ -66,3 +66,10 @@ For easy reference, the corners can be found at the following coordinates:
 :(-1, 1): top right corner
 :(1, -1): lower left corner
 :(-1, -1): lower right corner
+
+Overlay
+-------
+
+The `overlay` plugin also provides a standard overlay itself:
+``title_version``, which displays the DFHack version on the DF title screen,
+along with quick links to `quickstart-guide` and `gui/control-panel`.
diff --git a/docs/plugins/petcapRemover.rst b/docs/plugins/petcapRemover.rst
index 62959e731..2aef993d0 100644
--- a/docs/plugins/petcapRemover.rst
+++ b/docs/plugins/petcapRemover.rst
@@ -3,7 +3,7 @@ petcapRemover
 
 .. dfhack-tool::
     :summary: Modify the pet population cap.
-    :tags: fort animals
+    :tags: unavailable
 
 In vanilla DF, pets will not reproduce unless the population is below 50 and the
 number of children of that species is below a certain percentage. This plugin
diff --git a/docs/plugins/plants.rst b/docs/plugins/plants.rst
index f0a4f4af5..d35579e1d 100644
--- a/docs/plugins/plants.rst
+++ b/docs/plugins/plants.rst
@@ -5,7 +5,7 @@ plants
 
 .. dfhack-tool::
     :summary: Provides commands that interact with plants.
-    :tags: adventure fort armok map plants
+    :tags: unavailable
     :no-command:
 
 .. dfhack-command:: plant
diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
index 701a656b5..d6d4c8272 100644
--- a/docs/plugins/power-meter.rst
+++ b/docs/plugins/power-meter.rst
@@ -3,7 +3,7 @@ power-meter
 
 .. dfhack-tool::
     :summary: Allow pressure plates to measure power.
-    :tags: fort gameplay buildings
+    :tags: unavailable
     :no-command:
 
 If you run `gui/power-meter` while building a pressure plate, the pressure
diff --git a/docs/plugins/preserve-tombs.rst b/docs/plugins/preserve-tombs.rst
new file mode 100644
index 000000000..2f01162c6
--- /dev/null
+++ b/docs/plugins/preserve-tombs.rst
@@ -0,0 +1,23 @@
+preserve-tombs
+==============
+
+.. dfhack-tool::
+    :summary: Preserve tomb assignments when assigned units die.
+    :tags: fort bugfix
+
+If you find that the tombs you assign to units get unassigned from them when
+they die (e.g. your nobles), this tool can help fix that.
+
+Usage
+-----
+
+``enable preserve-tombs``
+    enable the plugin
+``preserve-tombs [status]``
+    check the status of the plugin, and if the plugin is enabled,
+    lists all currently tracked tomb assignments
+``preserve-tombs now``
+    forces an immediate update of the tomb assignments. This plugin
+    automatically updates the tomb assignments once every 100 ticks.
+
+This tool runs in the background.
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index 4628d11c8..68ec3d9b1 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -11,8 +11,8 @@ prospector
 .. dfhack-command:: prospect
    :summary: Shows a summary of resources that exist on the map.
 
-It can also calculate an estimate of resources available in the selected embark
-area.
+It can also calculate an estimate of resources available in the currently
+highlighted embark area.
 
 Usage
 -----
diff --git a/docs/plugins/rename.rst b/docs/plugins/rename.rst
index 137cf56a4..a002fc4e4 100644
--- a/docs/plugins/rename.rst
+++ b/docs/plugins/rename.rst
@@ -3,7 +3,7 @@ rename
 
 .. dfhack-tool::
     :summary: Easily rename things.
-    :tags: adventure fort productivity buildings stockpiles units
+    :tags: unavailable
 
 Use `gui/rename` for an in-game interface.
 
diff --git a/docs/plugins/rendermax.rst b/docs/plugins/rendermax.rst
index ee909fd9a..d09014cb2 100644
--- a/docs/plugins/rendermax.rst
+++ b/docs/plugins/rendermax.rst
@@ -3,7 +3,7 @@ rendermax
 
 .. dfhack-tool::
     :summary: Modify the map lighting.
-    :tags: adventure fort gameplay graphics
+    :tags: unavailable
 
 This plugin provides a collection of OpenGL lighting filters that affect how the
 map is drawn to the screen.
diff --git a/docs/plugins/reveal.rst b/docs/plugins/reveal.rst
index bbcc07b6b..2f4ebb5d8 100644
--- a/docs/plugins/reveal.rst
+++ b/docs/plugins/reveal.rst
@@ -17,7 +17,7 @@ reveal
    :summary: Switch between reveal and unreveal.
 
 .. dfhack-command:: revflood
-   :summary: Hide everything, then reveal tiles with a path to the cursor.
+   :summary: Hide everything, then reveal tiles with a path to a unit.
 
 .. dfhack-command:: nopause
    :summary: Disable pausing.
@@ -44,9 +44,10 @@ Usage
     where (for example) you abandoned with the fort revealed and no longer need
     the saved map data when you load a new fort.
 ``revflood``
-    Hide everything, then reveal tiles with a path to the cursor. This allows
-    reparing maps that you accidentally saved while they were revealed. Note
-    that tiles behind constructed walls are also revealed as a workaround for
+    Hide everything, then reveal tiles with a path to the keyboard cursor (if
+    enabled) or the selected unit (if a unit is selected) or else a random citizen.
+    This allows reparing maps that you accidentally saved while they were revealed.
+    Note that tiles behind constructed walls are also revealed as a workaround for
     :bug:`1871`.
 ``nopause 1|0``
     Disables pausing (both manual and automatic) with the exception of the pause
diff --git a/docs/plugins/ruby.rst b/docs/plugins/ruby.rst
deleted file mode 100644
index f1fafbb36..000000000
--- a/docs/plugins/ruby.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-.. _rb:
-
-ruby
-====
-
-.. dfhack-tool::
-    :summary: Allow Ruby scripts to be executed as DFHack commands.
-    :tags: dev
-    :no-command:
-
-.. dfhack-command:: rb
-   :summary: Eval() a ruby string.
-
-.. dfhack-command:: rb_eval
-   :summary: Eval() a ruby string.
-
-Usage
------
-
-::
-
-    enable ruby
-    rb "ruby expression"
-    rb_eval "ruby expression"
-    :rb ruby expression
-
-Example
--------
-
-``:rb puts df.unit_find(:selected).name``
-    Print the name of the selected unit.
diff --git a/docs/plugins/search.rst b/docs/plugins/search.rst
deleted file mode 100644
index e588e3196..000000000
--- a/docs/plugins/search.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-.. _search-plugin:
-
-search
-======
-
-.. dfhack-tool::
-    :summary: Adds search capabilities to the UI.
-    :tags: fort productivity interface
-    :no-command:
-
-Search options are added to the Stocks, Animals, Trading, Stockpile, Noble
-assignment candidates), Military (position candidates), Burrows (unit list),
-Rooms, Announcements, Job List, and Unit List screens all get hotkeys that allow
-you to dynamically filter the displayed lists.
-
-Usage
------
-
-::
-
-    enable search
-
-.. image:: ../images/search.png
-
-Searching works the same way as the search option in :guilabel:`Move to Depot`.
-You will see the Search option displayed on screen with a hotkey
-(usually :kbd:`s`). Pressing it lets you start typing a query and the relevant
-list will start filtering automatically.
-
-Pressing :kbd:`Enter`, :kbd:`Esc` or the arrow keys will return you to browsing
-the now filtered list, which still functions as normal. You can clear the filter
-by either going back into search mode and backspacing to delete it, or pressing
-the "shifted" version of the search hotkey while browsing the list (e.g. if the
-hotkey is :kbd:`s`, then hitting :kbd:`Shift`:kbd:`s` will clear any filter).
-
-Leaving any screen automatically clears the filter.
-
-In the Trade screen, the actual trade will always only act on items that are
-actually visible in the list; the same effect applies to the Trade Value numbers
-displayed by the screen. Because of this, the :kbd:`t` key is blocked while
-search is active, so you have to reset the filters first. Pressing
-:kbd:`Alt`:kbd:`C` will clear both search strings.
-
-In the stockpile screen the option only appears if the cursor is in the
-rightmost list:
-
-.. image:: ../images/search-stockpile.png
-
-Note that the 'Permit XXX'/'Forbid XXX' keys conveniently operate only on items
-actually shown in the rightmost list, so it is possible to select only fat or
-tallow by forbidding fats, then searching for fat/tallow, and using Permit Fats
-again while the list is filtered.
diff --git a/docs/plugins/seedwatch.rst b/docs/plugins/seedwatch.rst
index b41f3a977..12a728c51 100644
--- a/docs/plugins/seedwatch.rst
+++ b/docs/plugins/seedwatch.rst
@@ -5,42 +5,47 @@ seedwatch
     :summary: Manages seed and plant cooking based on seed stock levels.
     :tags: fort auto plants
 
-Each seed type can be assigned a target. If the number of seeds of that type
-falls below that target, then the plants and seeds of that type will be excluded
-from cookery. If the number rises above the target + 20, then cooking will be
-allowed.
+Unlike brewing and other kinds of processing, cooking plants does not produce
+a usable seed. By default, all plants are allowed to be cooked. This often leads
+to the situation where dwarves have no seeds left to plant crops with because
+they cooked all the relevant plants. Seedwatch protects you from this problem.
 
-The plugin needs a fortress to be loaded and will deactivate automatically
-otherwise. You have to reactivate with ``enable seedwatch`` after you load a
-fort.
+Each seed type can be assigned a target stock amount. If the number of seeds of
+that type falls below that target, then the plants and seeds of that type will
+be protected from cookery. If the number rises above the target + 20, then
+cooking will be allowed again.
 
 Usage
 -----
 
 ``enable seedwatch``
-    Start managing seed and plant cooking. By default, no types are watched.
-    You have to add them with further ``seedwatch`` commands.
+    Start managing seed and plant cooking. By default, all types are watched
+    with a target of ``30``, but you can adjust the list or even
+    ``seedwatch clear`` it and start your own if you like.
+``seedwatch [status]``
+    Display whether seedwatch is enabled and prints out the watch list, along
+    with the current seed counts.
 ``seedwatch <type> <target>``
     Adds the specified type to the watchlist (if it's not already there) and
     sets the target number of seeds to the specified number. You can pass the
     keyword ``all`` instead of a specific type to set the target for all types.
-``seedwatch <type>``
-    Removes the specified type from the watch list.
+    If you set the target to ``0``, it removes the specified type from the
+    watch list.
 ``seedwatch clear``
-    Clears all types from the watch list.
-``seedwatch info``
-    Display whether seedwatch is enabled and prints out the watch list.
+    Clears all types from the watch list. Same as ``seedwatch all 0``.
 
-To print out a list of all plant types, you can run this command::
+To see a list of all plant types that you might want to set targets for, you can
+run this command::
 
     devel/query --table df.global.world.raws.plants.all --search ^id --maxdepth 1
 
 Examples
 --------
 
-``seedwatch all 30``
-    Adds all seeds to the watch list and sets the targets to 30.
+``enable seedwatch``
+    Adds all seeds to the watch list, sets the targets to 30, and starts
+    monitoring your seed stock levels.
 ``seedwatch MUSHROOM_HELMET_PLUMP 50``
     Add Plump Helmets to the watch list and sets the target to 50.
-``seedwatch MUSHROOM_HELMET_PLUMP``
+``seedwatch MUSHROOM_HELMET_PLUMP 0``
     removes Plump Helmets from the watch list.
diff --git a/docs/plugins/siege-engine.rst b/docs/plugins/siege-engine.rst
index d01fc524c..4707ad5e8 100644
--- a/docs/plugins/siege-engine.rst
+++ b/docs/plugins/siege-engine.rst
@@ -3,7 +3,7 @@ siege-engine
 
 .. dfhack-tool::
     :summary: Extend the functionality and usability of siege engines.
-    :tags: fort gameplay buildings
+    :tags: unavailable
     :no-command:
 
 Siege engines in DF haven't been updated since the game was 2D, and can only aim
diff --git a/docs/plugins/sort.rst b/docs/plugins/sort.rst
index f5bce9bae..eb3e20663 100644
--- a/docs/plugins/sort.rst
+++ b/docs/plugins/sort.rst
@@ -2,59 +2,159 @@ sort
 ====
 
 .. dfhack-tool::
-    :summary: Sort lists shown in the DF interface.
+    :summary: Search and sort lists shown in the DF interface.
     :tags: fort productivity interface
     :no-command:
 
-.. dfhack-command:: sort-items
-   :summary: Sort the visible item list.
+The ``sort`` tool provides search and sort functionality for lists displayed in
+the DF interface.
 
-.. dfhack-command:: sort-units
-   :summary: Sort the visible unit list.
+Searching and sorting functionality is provided by `overlay` widgets, and
+widgets for individual lists can be moved via `gui/overlay` or turned on or off
+via `gui/control-panel`.
 
-Usage
------
+Squad assignment overlay
+------------------------
 
-::
+You can search for a dwarf by name by typing in the Search field. The search
+field is always focused, so any lowercase letter you type will appear there.
 
-    sort-items <property> [<property> ...]
-    sort-units <property> [<property> ...]
+The squad assignment screen can be sorted by name, by arrival order, by stress,
+by various military-related skills, or by long-term military potential.
 
-Both commands sort the visible list using the given sequence of comparisons.
-Each property can be prefixed with a ``<`` or ``>`` character to indicate
-whether elements that don't have the given property defined go first or last
-(respectively) in the sorted list.
+If sorted by "melee effectiveness" (the default), then the citizens are sorted
+according to how well they will perform in battle when using the weapon they
+have the most skill in. The effectiveness rating also takes into account
+physical and mental attributes as well as general fighting (non-weapon) skills.
 
-Examples
---------
+The "ranged effectiveness" sort order does a similar sort for expected
+effectiveness with a crossbow. This sort also takes into account relevant
+physical and mental attributes.
 
-``sort-items material type quality``
-    Sort a list of items by material, then by type, then by quality
-``sort-units profession name``
-    Sort a list of units by profession, then by name
+The "effectiveness" sorts are the ones you should be using if you need the best
+squad you can make right now. The numbers to the left of the unit list indicate
+exactly how effective that dwarf is expected to be. Light green numbers
+indicate the best of the best, while red numbers indicate dwarves that will not
+be effective in the military in their current state (though see "melee
+potential" and "ranged potential" sorts below for predictions about future
+effectiveness).
 
-Properties
-----------
+The "arrival order" sorts your citizens according to the most recent time they
+entered your map. The numbers on the left indicate the relative arrival order,
+and the numbers for the group of dwarves that most recently entered the map
+will be at the top and be colored bright green. If you run this sort after you
+get a new group of migrants, the migrant wave will be colored bright green.
+Dwarves that arrived earlier will have numbers in yellow, and your original
+dwarves (if any still survive and have never left and re-entered the map) will
+have numbers in red.
 
-Items can be sorted by the following properties:
+The "stress" sort order will bring your most stressed dwarves to the top, ready
+for addition to a :wiki:`therapy squad <Stress#Recovering_unhappy_dwarves>` to
+help improve their mood.
 
-- ``type``
-- ``description``
-- ``base_quality``
-- ``quality``
-- ``improvement``
-- ``wear``
-- ``material``
+Similarly, sorting by "need for training" will show you the dwarves that are
+feeling the most unfocused because they are having their military training
+needs unmet.
 
-Units can be sorted by the following properties:
+Both "stress" and "need for training" sorts use the dwarf happiness indicators
+to show how dire the dwarf's situation is and how much their mood might be
+improved if you add them to an appropriate squad.
 
-- ``name``
-- ``age``
-- ``arrival``
-- ``noble``
-- ``profession``
-- ``profession_class``
-- ``race``
-- ``squad``
-- ``squad_position``
-- ``happiness``
+If sorting is done by "melee potential", then citizens are arranged based on
+genetic predispositions in physical and mental attributes, as well as body
+size. Dwarves (and other humanoid creatures) with higher ratings are expected
+to be more effective in melee combat if they train their attributes to their
+genetic maximum.
+
+Similarly, the "ranged potential" sort orders citizens by genetic
+predispositions in physical and mental attributes that are relevant to ranged
+combat. Dwarves (and other humanoid creatures) with higher rating are expected
+to be more effective in ranged combat if they train their attributes to the
+maximum.
+
+The squad assignment panel also offers options for filtering which dwarves are
+shown. Each filter option can by cycled through "Include", "Only", and
+"Exclude" settings. "Include" does no filtering, "Only" shows only units that
+match the filter, and "Exclude" shows only units that do *not* match the filter.
+
+The following filters are provided:
+
+- Units that are assigned to other squads
+- Elected and appointed officials (e.g. mayor, priests, tavern keepers, etc.)
+- Nobility (e.g. monarch, barons, counts, etc.)
+- Mothers with infants (you may not want mothers using their babies as shields)
+- Weak mental fortitude (units that have facets and values that indicate that
+  they will react poorly to the stresses of battle)
+- Critically injured (units that have lost their ability to see, grasp weapons,
+  or walk)
+
+"Melee skill effectiveness", "ranged skill effectiveness", "melee combat potential"
+and "ranged combat potential" are explained in detail here:
+https://www.reddit.com/r/dwarffortress/comments/163kczo/enhancing_military_candidate_selection_part_3/
+"Mental stability" is explained here:
+https://www.reddit.com/r/dwarffortress/comments/1617s11/enhancing_military_candidate_selection_part_2/
+
+Info tabs overlay
+-----------------
+
+The Info overlay adds search support to many of the fort-wide "Info" panels
+(e.g. "Creatures", "Tasks", etc.). When searching for units, you can search by
+name (with either English or native language last names), profession, or
+special status (like "necromancer"). If there is text in the second column, you
+can search for that text as well. This is often a job name or a status, like
+"caged". The work animal assignment page can also filter by squad or burrow
+membership.
+
+Work animals overlay
+--------------------
+
+In addition to the search and filter widgets provided by the Info tabs overlay,
+the work animal assignment screen has an additional overlay that annotates each
+visible unit with the number of work animals that unit already has.
+
+Interrogation overlay
+---------------------
+
+In the interrogation and conviction screens under the "Justice" tab, you can
+search for units by name. You can also filter by the classification of the
+unit. The classification groups are ordered by how likely a member of that
+group is to be involved in a plot. The groups are: All, Risky visitors, Other
+visitors, Residents, Citizens, Animals, Deceased, and Others. "Risky" visitors are those who are especially likely to be involved in plots, such as criminals,
+necromancers, necromancer experiments, and intelligent undead.
+
+On the interrogations screen, you can also filter units by whether they have
+already been interrogated.
+
+Candidates overlay
+------------------
+
+When you select the button to choose a candidate to assign to a noble role on
+the nobles screen, you can search for units by name, profession, or any of the
+skills in which they have achieved at least "novice" level. For example, when
+assigning a broker, you can search for "appraisal" to find candidates that have
+at least some appraisal skill.
+
+Location selection overlay
+--------------------------
+
+When choosing the type of guildhall or temple to dedicate, you can search for
+the relevant profession, religion, or deity by name. For temples, you can also
+search for the "spheres" associated with the deity or religion, such as
+"wealth" or "lies".
+
+You can also choose whether to filter out temple or guildhall types that you
+have already established.
+
+Slab engraving overlay
+----------------------
+
+When choosing a unit to engrave a slab for, you can search for units by name,
+either in their native language or in English (though only their native name
+will be displayed). This overlay also adds a filter for showing only units that
+would need a slab in order to prevent them rising as a ghost.
+
+World overlay
+-------------
+
+Searching is supported for the Artifacts list when viewing the world map (where
+you can initiate raids).
diff --git a/docs/plugins/steam-engine.rst b/docs/plugins/steam-engine.rst
index 6560ae714..5ef4ab873 100644
--- a/docs/plugins/steam-engine.rst
+++ b/docs/plugins/steam-engine.rst
@@ -3,7 +3,7 @@ steam-engine
 
 .. dfhack-tool::
     :summary: Allow modded steam engine buildings to function.
-    :tags: fort gameplay buildings
+    :tags: unavailable
     :no-command:
 
 The steam-engine plugin detects custom workshops with the string
diff --git a/docs/plugins/stockflow.rst b/docs/plugins/stockflow.rst
index 9ce91eaca..95eba213c 100644
--- a/docs/plugins/stockflow.rst
+++ b/docs/plugins/stockflow.rst
@@ -3,7 +3,7 @@ stockflow
 
 .. dfhack-tool::
     :summary: Queue manager jobs based on free space in stockpiles.
-    :tags: fort auto stockpiles workorders
+    :tags: unavailable
 
 With this plugin, the fortress bookkeeper can tally up free space in specific
 stockpiles and queue jobs through the manager to produce items to fill the free
diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst
index e7f02f970..7d4ec050b 100644
--- a/docs/plugins/stockpiles.rst
+++ b/docs/plugins/stockpiles.rst
@@ -1,53 +1,526 @@
-.. _stocksettings:
-
 stockpiles
 ==========
 
 .. dfhack-tool::
-    :summary: Import and export stockpile settings.
+    :summary: Import, export, or modify stockpile settings.
     :tags: fort design productivity stockpiles
-    :no-command:
 
-.. dfhack-command:: copystock
-   :summary: Copies the configuration of the selected stockpile.
+Commands act upon the stockpile selected in the UI unless another stockpile
+identifier is specified on the commandline.
 
-.. dfhack-command:: savestock
-   :summary: Exports the configuration of the selected stockpile.
+Usage
+-----
 
-.. dfhack-command:: loadstock
-   :summary: Imports the configuration of the selected stockpile.
+::
 
-When the plugin is enabled, the :kbd:`q` menu of each stockpile will have an
-option for saving or loading the stockpile settings. See `gui/stockpiles` for
-an in-game interface.
+    stockpiles [status]
+    stockpiles list [<search>]
+    stockpiles import <name> [<options>]
+    stockpiles export <name> [<options>]
 
-Usage
------
+Exported stockpile settings are saved in the ``dfhack-config/stockpiles``
+folder, where you can view and delete them, if desired. Names can only
+contain numbers, letters, periods, and underscores.
 
-``enable stockpiles``
-    Add a hotkey that you can hit to easily save and load settings from
-    stockpiles selected in :kbd:`q` mode.
-``copystock``
-    Copies the parameters of the currently highlighted stockpile to the custom
-    stockpile settings and switches to custom stockpile placement mode,
-    effectively allowing you to copy/paste stockpiles easily.
-``savestock <filename>``
-    Saves the currently highlighted stockpile's settings to a file in your
-    Dwarf Fortress folder. This file can be used to copy settings between game
-    saves or players.
-``loadstock <filename>``
-    Loads a saved stockpile settings file and applies it to the currently
-    selected stockpile.
-
-Filenames with spaces are not supported. Generated materials, divine metals,
-etc. are not saved as they are different in every world.
+The names of library settings files are all prefixed by the string ``library/``.
+You can specify library files explicitly by including the prefix, or you can
+just write the short name to use a player-exported file by that name if it
+exists, and the library file if it doesn't.
 
 Examples
 --------
 
-``savestock food_settings.dfstock``
-    Export the stockpile settings for the stockpile currently selected in
-    :kbd:`q` mode to a file named ``food_settings.dfstock``.
-``loadstock food_settings.dfstock``
-    Set the selected stockpile settings to those saved in the
-    ``food_settings.dfstock`` file.
+``stockpiles``
+    Shows the list of all your stockpiles and some relevant statistics.
+``stockpiles list``
+    Shows the list of previously exported stockpile settings files, including
+    the stockpile configuration library.
+``stockpiles list plants``
+    Shows the list of exported stockpile settings files that include the
+    substring ``plants``.
+``stockpiles import library/plants``
+    Imports the library ``plants`` settings file into the currently selected
+    stockpile.
+``stockpiles import plants``
+    Imports a player-exported settings file named ``plants``, or the library
+    ``plants`` settings file if a player-exported file by that name doesn't
+    exist.
+``stockpiles import -m enable plants``
+    Enables plants in the selected stockpile.
+``stockpiles import -m disable cat_food -f tallow``
+    Disables all tallow in the selected food stockpile.
+``stockpiles export mysettings``
+    Export the settings for the currently selected stockpile to a file named
+    ``dfhack-config/stockpiles/mysettings.dfstock``.
+``stockpiles export mysettings -i categories,types``
+    Export the stockpile category and item settings, but ignore the container
+    and general settings. This allows you to import the configuration later
+    without touching the container and general settings of the target
+    stockpile.
+
+Options
+-------
+
+``-s``, ``--stockpile <name or id>``
+    Specify a specific stockpile by name or internal ID instead of using the
+    stockpile currently selected in the UI.
+``-i``, ``--include <comma separated list of elements to include>``
+    When exporting, you can include this option to select only specific elements
+    of the stockpile to record. If not specified, everything is included. When
+    the file is later imported, only the included settings will be modified. The
+    options are explained below in the next section.
+``-m``, ``--mode (set|enable|disable)``
+    When importing, choose the algorithm used to apply the settings. In ``set``
+    mode (the default), the stockpile is cleared and the settings in the file
+    are enabled. In ``enable`` mode, enabled settings in the file are *added*
+    to the stockpile, but no other settings are changed. In ``disable`` mode,
+    enabled settings in the file are *removed* from the current stockpile
+    configuration, and nothing else is changed.
+``-f``, ``--filter <search>[,<search>...]``
+    When importing, only modify the settings that contain at least one of the
+    given substrings.
+
+Configuration elements
+----------------------
+
+The different configuration elements you can include in an exported settings
+file are:
+
+:containers: Max bins, max barrels, and num wheelbarrows.
+:general: Whether the stockpile takes from links only and whether organic
+    and/or inorganic materials are allowed.
+:categories: The top-level categories of items that are enabled for the
+    stockpile, like Ammo, Finished goods, or Stone.
+:types: The elements below the categories, which include the sub-categories, the
+    specific item types, and any toggles the category might have (like Prepared
+    meals for the Food category).
+
+Overlay
+-------
+
+This plugin provides a panel that appears when you select a stockpile via an
+`overlay` widget. You can use it to easily toggle `logistics` plugin features
+like autotrade, automelt, or autotrain. There are also buttons along the top frame for:
+
+- minimizing the panel (if it is in the way of the vanilla stockpile
+  configuration widgets)
+- showing help for the overlay widget in `gui/launcher` (this page)
+- configuring advanced settings for the stockpile, such as whether automelt
+  will melt masterworks
+
+.. _stockpiles-library:
+
+The stockpiles settings library
+-------------------------------
+
+DFHack comes with a library of useful stockpile settings files that are ready
+for import. If the stockpile configuration that you need isn't directly
+represented, you can often use the ``enable`` and ``disable`` modes and/or
+the ``filter`` option to transform an existing saved stockpile setting. Some
+stockpile configurations can only be achieved with filters since the stockpile
+lists are different for each world. For example, to disable all tallow in your
+main food stockpile, you'd run this command::
+
+    stockpiles import cat_food -m disable -f tallow
+
+Top-level categories
+~~~~~~~~~~~~~~~~~~~~
+
+Each stockpile category has a file that allows you to enable or disable the
+entire category, or with a filter, any matchable subset thereof::
+
+    cat_ammo
+    cat_animals
+    cat_armor
+    cat_bars_blocks
+    cat_cloth
+    cat_coins
+    cat_corpses
+    cat_finished_goods
+    cat_food
+    cat_furniture
+    cat_gems
+    cat_leather
+    cat_refuse
+    cat_sheets
+    cat_stone
+    cat_weapons
+    cat_wood
+
+In addition, there are files for ``all``, which includes all categories except
+refuse and corpses (mirroring the "all" configuration in-game), and
+``everything``, which really includes all categories.
+
+For many of the categories, there are also flags, subcategory prefixes, and
+item properties that you can match with filters. In addition, there are
+normally at least a few convenient pre-made settings files that manipulate
+interesting category subsets.
+
+Cross-category stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Settings files::
+
+    artifacts
+    masterworks
+
+Example command for a meltable weapons stockpile::
+
+    stockpiles import cat_weapons
+    stockpiles import -m disable cat_weapons -f other/
+    stockpiles import -m disable artifacts
+    stockpiles import -m disable masterworks
+
+Ammo stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Subcategory prefixes::
+
+    type/
+    mats/
+    other/
+    core/
+    total/
+
+Settings files::
+
+    bolts
+    metalammo
+    boneammo
+    woodammo
+
+Example commands for a stockpile of metal bolts::
+
+    stockpiles import cat_ammo -f mats/,core/,total/
+    stockpiles import -m enable bolts
+
+Animal stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Flags::
+
+    cages
+    traps
+
+Properties::
+
+    tameable
+
+Settings files::
+
+    cages
+    traps
+
+Example commands for a stockpile of empty cages::
+
+    stockpiles import cages
+
+Or, using the flag for the same effect::
+
+    stockpiles import cat_animals -f cages
+
+Armor stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Flags and subcategory prefixes::
+
+    nouse
+    canuse
+    body/
+    head/
+    feet/
+    hands/
+    legs/
+    shield/
+    mats/
+    other/
+    core/
+    total/
+
+Settings files::
+
+    metalarmor
+    otherarmor
+    ironarmor
+    bronzearmor
+    copperarmor
+    steelarmor
+    usablearmor
+    unusablearmor
+
+Example commands for a stockpile of sub-masterwork meltable armor::
+
+    stockpiles import cat_armor
+    stockpiles import -m disable -f other/,core/mas,core/art cat_armor
+
+Bar stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Subcategory prefixes::
+
+    mats/bars/
+    other/bars/
+    mats/blocks/
+    other/blocks/
+
+Settings files::
+
+    bars
+    metalbars
+    ironbars
+    pigironbars
+    steelbars
+    otherbars
+    coal
+    potash
+    ash
+    pearlash
+    soap
+    blocks
+
+Example commands for a stockpile of blocks::
+
+    stockpiles import blocks
+
+Cloth stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Subcategory prefixes::
+
+    thread/silk/
+    thread/plant/
+    thread/yarn/
+    thread/metal/
+    cloth/silk/
+    cloth/plant/
+    cloth/yarn/
+    cloth/metal/
+
+Settings files::
+
+    thread
+    adamantinethread
+    cloth
+    adamantinecloth
+
+Notes:
+
+* ``thread`` and ``cloth`` settings files set all materials that are not
+    adamantine.
+
+Corpse stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Properties::
+
+    tameable
+
+Finished goods stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Subcategory prefixes::
+
+    type/
+    mats/
+    other/
+    core/
+    total/
+
+Settings files::
+
+    stonetools
+    woodtools
+    crafts
+    goblets
+    toys
+
+Example commands for a toy stockpile::
+
+    stockpiles import cat_finished_goods -f mats/,other/,core/,total/
+    stockpiles import -m enable toys
+
+Food stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Flags and subcategory prefixes::
+
+    preparedmeals
+    meat/
+    fish/prepared/
+    fish/unprepared/
+    egg/
+    plants/
+    drink/plant/
+    drink/animal/
+    cheese/plant/
+    cheese/animal/
+    seeds/
+    leaves/
+    powder/plant/
+    powder/animal/
+    glob/
+    liquid/plant/
+    liquid/animal/
+    liquid/misc/
+    paste/
+    pressed/
+
+Settings files::
+
+    preparedmeals
+    unpreparedfish
+    plants
+    booze
+    seeds
+    dye
+    miscliquid
+    wax
+
+Example commands for a kitchen ingredients stockpile::
+
+    stockpiles import cat_food -f meat/,fish/prepared/,egg/,cheese/,leaves/,powder/,glob/,liquid/plant/,paste/,pressed/
+    stockpiles import cat_food -m enable -f milk,royal_jelly
+    stockpiles import dye -m disable
+    stockpiles import cat_food -m disable -f tallow,thread,liquid/misc/
+
+Furniture stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Subcategory prefixes::
+
+    type/
+    mats/
+    other/
+    core/
+    total/
+
+Settings files::
+
+    pots
+    barrels
+    bags
+    buckets
+    sand
+
+* Because of the limitations of Dwarf Fortress, ``bags`` cannot distinguish
+  between empty bags and bags filled with gypsum powder.
+
+Example commands for a sand bag stockpile::
+
+    stockpiles import cat_furniture
+    stockpiles import cat_furniture -m disable -f type/
+    stockpiles import sand -m enable
+
+Gem stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Subcategory prefixes::
+
+    mats/rough/
+    mats/cut/
+    other/rough/
+    other/cut/
+
+Settings files::
+
+    roughgems
+    roughglass
+    cutgems
+    cutglass
+    cutstone
+
+Refuse stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Flags and subcategory prefixes::
+
+    rawhide/fresh
+    rawhide/rotten
+    type/
+    corpses/
+    bodyparts/
+    skulls/
+    bones/
+    hair/
+    shells/
+    teeth/
+    horns/
+
+Properties::
+
+    tameable
+
+Settings files::
+
+    rawhides
+    tannedhides
+    usablehair
+
+Notes:
+
+* ``usablehair`` Only hair and wool that can make usable clothing is included,
+  i.e. from sheep, llamas, alpacas, and trolls.
+
+Example commands for a craftable refuse stockpile::
+
+    stockpiles import cat_refuse -f skulls/,bones/,shells',teeth/,horns/
+    stockpiles import usablehair -m enable
+
+Sheet stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Subcategory prefixes::
+
+    paper/
+    parchment/
+
+Stone stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Settings files::
+
+    metalore
+    ironore
+    economic
+    flux
+    plasterproducing
+    coalproducing
+    otherstone
+    bauxite
+    clay
+
+Weapon stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Flags and subcategory prefixes::
+
+    nouse
+    canuse
+    type/weapon/
+    type/trapcomp/
+    mats/
+    other/
+    core/
+    total/
+
+Settings files::
+
+    metalweapons
+    stoneweapons
+    otherweapons
+    trapcomponents
+    ironweapons
+    silverweapons
+    bronzeweapons
+    copperweapons
+    steelweapons
+    platinumweapons
+    adamantineweapons
+    usableweapons
+    unusableweapons
+
+Example commands for a non-metallic trap components stockpile::
+
+    stockpiles import cat_weapons
+    stockpiles import cat_weapons -m disable -f type/weapon/
+    stockpiles metalweapons -m disable
diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
index 03eb3a72c..af5228b12 100644
--- a/docs/plugins/stocks.rst
+++ b/docs/plugins/stocks.rst
@@ -3,7 +3,7 @@ stocks
 
 .. dfhack-tool::
     :summary: Enhanced fortress stock management interface.
-    :tags: fort productivity items
+    :tags: unavailable
 
 When the plugin is enabled, two new hotkeys become available:
 
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
index 23c20ef0a..714de0378 100644
--- a/docs/plugins/stonesense.rst
+++ b/docs/plugins/stonesense.rst
@@ -13,8 +13,6 @@ Usage
 
 ``stonesense`` or ``ssense``
     Open the visualiser in a new window.
-``ssense overlay``
-    Overlay DF window, replacing the map area.
 
 The viewer window has read-only access to the game, and can follow the game view
 or be moved independently. Configuration for stonesense can be set in the
@@ -24,10 +22,6 @@ unable to see the edges of the map with the overlay active, try decreasing the
 value for ``SEGMENTSIZE_XY`` -- normal values are ``50`` to ``80``, depending
 on your screen resolution.
 
-If you replace the map section of your DF window with ``ssense overlay``, be
-aware that it's not (yet) suitable for use as your only interface. Use DF's
-``[PRINT_MODE:2D]`` init option (in ``data/init/init.txt``) for stability.
-
 .. figure:: ../images/stonesense-roadtruss.jpg
    :align: center
    :target: http://www.bay12forums.com/smf/index.php?topic=48172.msg3198664#msg3198664
diff --git a/docs/plugins/strangemood.rst b/docs/plugins/strangemood.rst
index 7aabda93d..f99be26eb 100644
--- a/docs/plugins/strangemood.rst
+++ b/docs/plugins/strangemood.rst
@@ -10,30 +10,30 @@ Usage
 
 ::
 
-    stangemood [<options>]
+    strangemood [<options>]
 
-Examples
---------
+Example
+-------
 
-``strangemood -force -unit -type secretive -skill armorsmith``
+``strangemood --force --unit --type secretive --skill armorsmith``
     Trigger a strange mood for the selected unit that will cause them to become
     a legendary armorsmith.
 
 Options
 -------
 
-``-force``
+``--force``
     Ignore normal strange mood preconditions (no recent mood, minimum moodable
     population, artifact limit not reached, etc.).
-``-unit``
+``--unit``
     Make the strange mood strike the selected unit instead of picking one
     randomly. Unit eligibility is still enforced (unless ``-force`` is also
     specified).
-``-type <type>``
+``--type <type>``
     Force the mood to be of a particular type instead of choosing randomly based
     on happiness. Valid values are "fey", "secretive", "possessed", "fell", and
     "macabre".
-``-skill <skill>``
+``--skill <skill>``
     Force the mood to use a specific skill instead of choosing the highest
     moodable skill. Valid values are "miner", "carpenter", "engraver", "mason",
     "tanner", "weaver", "clothier", "weaponsmith",  "armorsmith", "metalsmith",
diff --git a/docs/plugins/tailor.rst b/docs/plugins/tailor.rst
index af7d253b2..7396102f8 100644
--- a/docs/plugins/tailor.rst
+++ b/docs/plugins/tailor.rst
@@ -5,16 +5,15 @@ tailor
     :summary: Automatically keep your dwarves in fresh clothing.
     :tags: fort auto workorders
 
-Whenever the bookkeeper updates stockpile records, this plugin will scan the
-fort. If there are fresh cloths available, dwarves who are wearing tattered
-clothing will have their rags confiscated (in the same manner as the
-`cleanowned` tool) so that they'll reequip with replacement clothes.
+Once a day, this plugin will scan the clothing situation in the fort. If there
+are fresh cloths available, dwarves who are wearing tattered clothing will have
+their rags confiscated (in the same manner as the `cleanowned` tool) so that
+they'll reequip with replacement clothes.
 
-If there are not enough clothes available, manager orders will be generated
-to manufacture some more. ``tailor`` will intelligently create orders using
-raw materials that you have on hand in the fort. For example, if you have
-lots of silk, but no cloth, then ``tailor`` will order only silk clothing to
-be made.
+If there are not enough clothes available, manager orders will be generated to
+manufacture some more. ``tailor`` will intelligently create orders using raw
+materials that you have on hand in the fort. For example, if you have lots of
+silk, but no cloth, then ``tailor`` will order only silk clothing to be made.
 
 Usage
 -----
@@ -22,7 +21,8 @@ Usage
 ::
 
     enable tailor
-    tailor status
+    tailor [status]
+    tailor now
     tailor materials <material> [<material> ...]
 
 By default, ``tailor`` will prefer using materials in this order::
@@ -30,12 +30,32 @@ By default, ``tailor`` will prefer using materials in this order::
     silk cloth yarn leather
 
 but you can use the ``tailor materials`` command to restrict which materials
-are used, and in what order.
+are used, and in what order. ``tailor`` supports adamantine cloth (using the
+keyword ``adamantine``) but does not use it by default, as most players find
+adamantine too precious to routinely make into cloth. ``tailor`` does not
+support modded "cloth" types which utilize custom reactions to making clothing
+out of those cloth types.
 
-Example
--------
+Examples
+--------
+
+``enable tailor``
+    Start replacing tattered clothes with default settings.
+
+``tailor now``
+    Run a scan and order cycle right now, regardless of whether the plugin is
+    enabled.
 
 ``tailor materials silk cloth yarn``
     Restrict the materials used for automatically manufacturing clothing to
     silk, cloth, and yarn, preferred in that order. This saves leather for
     other uses, like making armor.
+
+Note
+----
+
+The reason for the limitation on modded cloth-like materials is
+because custom reactions do not support the in-game mechanic
+which allows a manager order to specify a different size for clothing items.
+This mechanic only works for reactions that use the default make-clothing or
+make-armor reactions, and is a limitation of the game itself.
diff --git a/docs/plugins/title-folder.rst b/docs/plugins/title-folder.rst
index a6c7ee63c..b6a250e73 100644
--- a/docs/plugins/title-folder.rst
+++ b/docs/plugins/title-folder.rst
@@ -3,7 +3,7 @@ title-folder
 
 .. dfhack-tool::
     :summary: Displays the DF folder name in the window title bar.
-    :tags: interface
+    :tags: unavailable
     :no-command:
 
 Usage
diff --git a/docs/plugins/title-version.rst b/docs/plugins/title-version.rst
deleted file mode 100644
index 307a4da18..000000000
--- a/docs/plugins/title-version.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-title-version
-=============
-
-.. dfhack-tool::
-    :summary: Displays the DFHack version on DF's title screen.
-    :tags: interface
-    :no-command:
-
-Usage
------
-
-::
-
-    enable title-version
diff --git a/docs/plugins/trackstop.rst b/docs/plugins/trackstop.rst
deleted file mode 100644
index 3ca47f465..000000000
--- a/docs/plugins/trackstop.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-trackstop
-=========
-
-.. dfhack-tool::
-    :summary: Add dynamic configuration options for track stops.
-    :tags: fort gameplay buildings
-    :no-command:
-
-When enabled, this plugin adds a :kbd:`q` menu for track stops, which is
-completely blank in vanilla DF. This allows you to view and/or change the track
-stop's friction and dump direction settings, using the keybindings from the
-track stop building interface.
-
-Usage
------
-
-::
-
-    enable trackstop
diff --git a/docs/plugins/tubefill.rst b/docs/plugins/tubefill.rst
index 80282f6d9..ff668f8df 100644
--- a/docs/plugins/tubefill.rst
+++ b/docs/plugins/tubefill.rst
@@ -5,7 +5,11 @@ tubefill
     :summary: Replenishes mined-out adamantine.
     :tags: fort armok map
 
-Veins that were originally hollow will be left alone.
+This tool replaces mined-out tiles of adamantine spires with fresh, undug
+adamantine walls, ready to be re-harvested. Empty tiles within the spire that
+used to contain special gemstones, obsidian, water, or magma will also be
+replaced with fresh adamantine. Adamantine spires that were originally hollow
+will be left hollow. See below for more details.
 
 Usage
 -----
diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index aa1ad578b..69c93bb60 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -3,7 +3,7 @@ tweak
 
 .. dfhack-tool::
     :summary: A collection of tweaks and bugfixes.
-    :tags: adventure fort armok bugfix fps interface
+    :tags: unavailable
 
 Usage
 -----
diff --git a/docs/plugins/work-now.rst b/docs/plugins/work-now.rst
new file mode 100644
index 000000000..5eddf7c9f
--- /dev/null
+++ b/docs/plugins/work-now.rst
@@ -0,0 +1,19 @@
+.. _worknow:
+
+work-now
+========
+
+.. dfhack-tool::
+    :summary: Reduce the time that dwarves idle after completing a job.
+    :tags: fort auto jobs
+
+After finishing a job, dwarves will wander away for a while before picking up a
+new job. This plugin will automatically poke them to pick up a new task quicker.
+
+Usage
+-----
+
+::
+
+    enable work-now
+    work-now [status]
diff --git a/docs/plugins/workNow.rst b/docs/plugins/workNow.rst
deleted file mode 100644
index 55004bca2..000000000
--- a/docs/plugins/workNow.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-workNow
-=======
-
-.. dfhack-tool::
-    :summary: Reduce the time that dwarves idle after completing a job.
-    :tags: fort auto labors
-
-After finishing a job, dwarves will wander away for a while before picking up a
-new job. This plugin will automatically poke the game to assign dwarves to new
-tasks.
-
-Usage
------
-
-``workNow``
-    Print current plugin status.
-``workNow 0``
-    Stop monitoring and poking.
-``workNow 1``
-    Poke the game to assign dwarves to tasks whenever the game is paused.
-``workNow 2``
-    Poke the game to assign dwarves to tasks whenever a dwarf finishes a job.
diff --git a/docs/plugins/workflow.rst b/docs/plugins/workflow.rst
index 822b525f9..323dd6ed4 100644
--- a/docs/plugins/workflow.rst
+++ b/docs/plugins/workflow.rst
@@ -3,7 +3,7 @@ workflow
 
 .. dfhack-tool::
     :summary: Manage automated item production rules.
-    :tags: fort auto jobs
+    :tags: unavailable
 
 Manage repeat jobs according to stock levels. `gui/workflow` provides a simple
 front-end integrated in the game UI.
diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
index 0f77e1d3e..26e170a58 100644
--- a/docs/plugins/zone.rst
+++ b/docs/plugins/zone.rst
@@ -3,7 +3,7 @@ zone
 
 .. dfhack-tool::
     :summary: Manage activity zones, cages, and the animals therein.
-    :tags: fort productivity animals buildings
+    :tags: unavailable
 
 Usage
 -----
@@ -157,3 +157,32 @@ cages and then place one pen/pasture activity zone above them, covering all
 cages you want to use. Then use ``zone set`` (like with ``assign``) and run
 ``zone tocages <filter>``. ``tocages`` can be used together with ``nick`` or
 ``remnick`` to adjust nicknames while assigning to cages.
+
+Overlay
+-------
+
+Advanced unit selection is available via an `overlay` widget that appears when
+you select a cage, restraint, pasture zone, or pit/pond zone.
+
+In the window that pops up when you click the hotkey hint or hit the hotkey on your keyboard, you can:
+
+- search for units by name
+- sort or filter by status (Assigned here, Pastured elsewhere, On restraint, On
+    display in cage, In movable cage, or Roaming)
+- sort or filter by disposition (Pet, Domesticated, Partially trained, Wild
+    (trainable), Wild (untrainable), or Hostile)
+- sort by gender
+- sort by name
+- filter by whether the unit lays eggs
+- filter by whether the unit needs a grazing area
+
+The window is fully navigatable via keyboard or mouse. Hit Enter or click on a
+unit to assign/unassign it to the currently selected zone or building. Shift
+click to assign/unassign a range of units.
+
+You can also keep the window open and click around on different cages,
+restraints, pastures, or pit/ponds, so you can manage multiple buildings/zones
+without having to close and reopen the window.
+
+Just like all other overlays, you can disable this one in `gui/control-panel` on
+the Overlays tab if you don't want the option of using it.
diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
index 0cd732988..a981bf984 100644
--- a/docs/sphinx_extensions/dfhack/changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -16,18 +16,19 @@ CHANGELOG_PATHS = (
 CHANGELOG_PATHS = (os.path.join(DFHACK_ROOT, p) for p in CHANGELOG_PATHS)
 
 CHANGELOG_SECTIONS = [
-    'New Plugins',
-    'New Scripts',
-    'New Tweaks',
+    'New Tools',
+    'New Plugins', # deprecated
+    'New Scripts', # deprecated
+    'New Tweaks', # deprecated
     'New Features',
-    'New Internal Commands',
+    'New Internal Commands', # deprecated
     'Fixes',
     'Misc Improvements',
     'Removed',
     'API',
     'Internals',
     'Lua',
-    'Ruby',
+    'Ruby', # deprecated, but still here so old changelogs build
     'Structures',
     'Documentation',
 ]
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 836bab217..6c65e5918 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -140,7 +140,8 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
         anchor = to_anchor(self.get_tool_name_from_docname())
         tags = self.env.domaindata['tag-repo']['doctags'][docname]
         indexdata = (name, self.options.get('summary', ''), '', docname, anchor, 0)
-        self.env.domaindata['all']['objects'].append(indexdata)
+        if 'unavailable' not in tags:
+            self.env.domaindata['all']['objects'].append(indexdata)
         for tag in tags:
             self.env.domaindata[tag]['objects'].append(indexdata)
 
diff --git a/index.rst b/index.rst
index af0f76052..9ebc010eb 100644
--- a/index.rst
+++ b/index.rst
@@ -15,9 +15,10 @@ Quick Links
 
 * `Downloads <https://www.github.com/DFHack/dfhack/releases>`_
 * `Installation guide <installing>`
+* `quickstart`
 * `Getting help <support>`
 * :source:`Source code <>`
-    (**important:** read `compile` before attempting to build from source.)
+    (**important:** read `building-dfhack-index` before attempting to build from source.)
 
 User Manual
 ===========
@@ -26,6 +27,7 @@ User Manual
    :maxdepth: 2
 
    /docs/Introduction
+   /docs/Quickstart
    /docs/Installing
    /docs/Core
    /docs/Tools
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 8c0992a79..e9ec8f717 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -1,17 +1,19 @@
 project(dfapi)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.21)
 
 # prevent CMake warnings about INTERFACE_LINK_LIBRARIES vs LINK_INTERFACE_LIBRARIES
 cmake_policy(SET CMP0022 NEW)
 
 # build options
-option(BUILD_DEVEL "Install/package files required for development(For SDK)." OFF)
 if(UNIX)
     option(CONSOLE_NO_CATCH "Make the console not catch 'CTRL+C' events for easier debugging." OFF)
 endif()
 
-include_directories(proto)
-include_directories(include)
+# Generation
+set(CODEGEN_OUT ${dfapi_SOURCE_DIR}/include/df/codegen.out.xml)
+
+file(GLOB GENERATE_INPUT_SCRIPTS ${dfapi_SOURCE_DIR}/xml/*.pm ${dfapi_SOURCE_DIR}/xml/*.xslt)
+file(GLOB GENERATE_INPUT_XMLS ${dfapi_SOURCE_DIR}/xml/df.*.xml)
 
 execute_process(COMMAND ${PERL_EXECUTABLE} xml/list.pl xml ${dfapi_SOURCE_DIR}/include/df ";"
     WORKING_DIRECTORY ${dfapi_SOURCE_DIR}
@@ -19,6 +21,32 @@ execute_process(COMMAND ${PERL_EXECUTABLE} xml/list.pl xml ${dfapi_SOURCE_DIR}/i
 
 set_source_files_properties(${GENERATED_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE GENERATED TRUE)
 
+add_custom_command(
+    OUTPUT ${CODEGEN_OUT}
+    BYPRODUCTS ${GENERATED_HDRS}
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xml/codegen.pl
+        ${CMAKE_CURRENT_SOURCE_DIR}/xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/df
+    MAIN_DEPENDENCY ${dfapi_SOURCE_DIR}/xml/codegen.pl
+    COMMENT "Generating codegen.out.xml and df/headers"
+    DEPENDS ${GENERATE_INPUT_XMLS} ${GENERATE_INPUT_SCRIPTS}
+)
+
+if(NOT("${CMAKE_GENERATOR}" STREQUAL Ninja))
+    # use BYPRODUCTS instead under Ninja to avoid rebuilds
+    list(APPEND CODEGEN_OUT ${GENERATED_HDRS})
+endif()
+
+add_custom_target(generate_headers DEPENDS ${CODEGEN_OUT})
+
+include_directories(include)
+
+add_subdirectory(xml)
+
+if(BUILD_LIBRARY)
+
+include_directories(proto)
+
 set(MAIN_HEADERS
     include/Internal.h
     include/DFHack.h
@@ -61,6 +89,7 @@ set(MAIN_SOURCES
     ColorText.cpp
     CompilerWorkAround.cpp
     DataDefs.cpp
+    DataIdentity.cpp
     Debug.cpp
     Error.cpp
     VTableInterpose.cpp
@@ -70,7 +99,6 @@ set(MAIN_SOURCES
     LuaApi.cpp
     DataStatics.cpp
     DataStaticsCtor.cpp
-    DataStaticsFields.cpp
     MiscUtils.cpp
     Types.cpp
     PluginManager.cpp
@@ -95,7 +123,6 @@ endif()
 
 set(MAIN_SOURCES_WINDOWS
     ${CONSOLE_SOURCES}
-    Hooks-windows.cpp
     Hooks.cpp
     PlugLoad-windows.cpp
     Process-windows.cpp
@@ -108,14 +135,12 @@ endif()
 
 set(MAIN_SOURCES_LINUX
     ${CONSOLE_SOURCES}
-    Hooks-linux.cpp
     PlugLoad-posix.cpp
     Process-linux.cpp
 )
 
 set(MAIN_SOURCES_DARWIN
     ${CONSOLE_SOURCES}
-    Hooks-darwin.cpp
     PlugLoad-posix.cpp
     Process-darwin.cpp
 )
@@ -124,6 +149,8 @@ set(MODULE_HEADERS
     include/modules/Buildings.h
     include/modules/Burrows.h
     include/modules/Constructions.h
+    include/modules/DFSDL.h
+    include/modules/DFSteam.h
     include/modules/Designations.h
     include/modules/EventManager.h
     include/modules/Filesystem.h
@@ -136,11 +163,13 @@ set(MODULE_HEADERS
     include/modules/MapCache.h
     include/modules/Maps.h
     include/modules/Materials.h
+    include/modules/Military.h
     include/modules/Once.h
     include/modules/Persistence.h
     include/modules/Random.h
     include/modules/Renderer.h
     include/modules/Screen.h
+    include/modules/Textures.h
     include/modules/Translation.h
     include/modules/Units.h
     include/modules/World.h
@@ -150,6 +179,8 @@ set(MODULE_SOURCES
     modules/Buildings.cpp
     modules/Burrows.cpp
     modules/Constructions.cpp
+    modules/DFSDL.cpp
+    modules/DFSteam.cpp
     modules/Designations.cpp
     modules/EventManager.cpp
     modules/Filesystem.cpp
@@ -161,11 +192,13 @@ set(MODULE_SOURCES
     modules/MapCache.cpp
     modules/Maps.cpp
     modules/Materials.cpp
+    modules/Military.cpp
     modules/Once.cpp
     modules/Persistence.cpp
     modules/Random.cpp
     modules/Renderer.cpp
     modules/Screen.cpp
+    modules/Textures.cpp
     modules/Translation.cpp
     modules/Units.cpp
     modules/World.cpp
@@ -180,8 +213,7 @@ foreach(GROUP other a b c d e f g h i j k l m n o p q r s t u v w x y z)
         set(STATIC_FIELDS_INC_FILENAME "df/static.fields-${GROUP}.inc")
     endif()
     file(WRITE ${STATIC_FIELDS_FILENAME}.tmp
-        "#define STATIC_FIELDS_GROUP\n"
-        "#include \"../DataStaticsFields.cpp\"\n"
+        "#include \"DataStaticsFields.inc\"\n"
         "#include \"${STATIC_FIELDS_INC_FILENAME}\"\n"
     )
     execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -258,45 +290,20 @@ add_custom_target(generate_proto_core DEPENDS ${PROJECT_PROTO_TMP_FILES})
 # Merge headers into sources
 set_source_files_properties( ${PROJECT_HEADERS} PROPERTIES HEADER_FILE_ONLY TRUE )
 list(APPEND PROJECT_SOURCES ${PROJECT_HEADERS})
-
-# Generation
 list(APPEND PROJECT_SOURCES ${GENERATED_HDRS})
 
-file(GLOB GENERATE_INPUT_SCRIPTS ${dfapi_SOURCE_DIR}/xml/*.pm ${dfapi_SOURCE_DIR}/xml/*.xslt)
-file(GLOB GENERATE_INPUT_XMLS ${dfapi_SOURCE_DIR}/xml/df.*.xml)
-
-set(CODEGEN_OUT ${dfapi_SOURCE_DIR}/include/df/codegen.out.xml)
-if(NOT("${CMAKE_GENERATOR}" STREQUAL Ninja))
-    # use BYPRODUCTS instead under Ninja to avoid rebuilds
-    list(APPEND CODEGEN_OUT ${GENERATED_HDRS})
-endif()
-
-add_custom_command(
-    OUTPUT ${CODEGEN_OUT}
-    BYPRODUCTS ${GENERATED_HDRS}
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xml/codegen.pl
-        ${CMAKE_CURRENT_SOURCE_DIR}/xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/df
-    MAIN_DEPENDENCY ${dfapi_SOURCE_DIR}/xml/codegen.pl
-    COMMENT "Generating codegen.out.xml and df/headers"
-    DEPENDS ${GENERATE_INPUT_XMLS} ${GENERATE_INPUT_SCRIPTS}
-)
-
-add_custom_target(generate_headers
-    DEPENDS ${dfapi_SOURCE_DIR}/include/df/codegen.out.xml)
-
 if(REMOVE_SYMBOLS_FROM_DF_STUBS)
     if(UNIX)
         # Don't produce debug info for generated stubs
-        set_source_files_properties(DataStatics.cpp DataStaticsCtor.cpp DataStaticsFields.cpp ${STATIC_FIELDS_FILES}
+        set_source_files_properties(DataStatics.cpp DataStaticsCtor.cpp ${STATIC_FIELDS_FILES}
             PROPERTIES COMPILE_FLAGS "-g0 -O1")
     else(WIN32)
-        set_source_files_properties(DataStatics.cpp DataStaticsCtor.cpp DataStaticsFields.cpp ${STATIC_FIELDS_FILES}
+        set_source_files_properties(DataStatics.cpp DataStaticsCtor.cpp ${STATIC_FIELDS_FILES}
             PROPERTIES COMPILE_FLAGS "/O1 /bigobj")
     endif()
 else()
     if(WIN32)
-        set_source_files_properties(DataStatics.cpp DataStaticsCtor.cpp DataStaticsFields.cpp ${STATIC_FIELDS_FILES}
+        set_source_files_properties(DataStatics.cpp DataStaticsCtor.cpp ${STATIC_FIELDS_FILES}
             PROPERTIES COMPILE_FLAGS "/Od /bigobj")
     endif()
 endif()
@@ -368,8 +375,7 @@ add_executable(binpatch binpatch.cpp)
 target_link_libraries(binpatch dfhack-md5)
 
 if(WIN32)
-    # name the resulting library SDL.dll on Windows
-    set_target_properties(dfhack PROPERTIES OUTPUT_NAME "SDL" )
+    set_target_properties(dfhack PROPERTIES OUTPUT_NAME "dfhooks" )
     set_target_properties(dfhack PROPERTIES COMPILE_FLAGS "/FI\"Export.h\"" )
     set_target_properties(dfhack-client PROPERTIES COMPILE_FLAGS "/FI\"Export.h\"" )
 else()
@@ -428,10 +434,6 @@ if(UNIX)
     install(TARGETS dfhooks
         LIBRARY DESTINATION .
         RUNTIME DESTINATION .)
-else()
-    # On windows, copy the renamed SDL so DF can still run.
-    install(PROGRAMS ${dfhack_SOURCE_DIR}/package/windows/win${DFHACK_BUILD_ARCH}/SDLreal.dll
-        DESTINATION ${DFHACK_LIBRARY_DESTINATION})
 endif()
 
 # install the main lib
@@ -439,33 +441,22 @@ install(TARGETS dfhack
     LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION}
     RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION})
 
-# install the offset file
-install(FILES xml/symbols.xml
-    DESTINATION ${DFHACK_DATA_DESTINATION})
-
 install(TARGETS dfhack-run dfhack-client binpatch
     LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION}
     RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION})
 
-install(DIRECTORY lua/
-    DESTINATION ${DFHACK_LUA_DESTINATION}
-    FILES_MATCHING PATTERN "*.lua")
+endif(BUILD_LIBRARY)
 
-install(DIRECTORY ${dfhack_SOURCE_DIR}/patches
-    DESTINATION ${DFHACK_DATA_DESTINATION}
-    FILES_MATCHING PATTERN "*.dif")
+# install the offset file
+if(INSTALL_DATA_FILES)
+    install(FILES xml/symbols.xml
+        DESTINATION ${DFHACK_DATA_DESTINATION})
 
-# Unused for so long that it's not even relevant now...
-if(BUILD_DEVEL)
-    if(WIN32)
-        install(TARGETS dfhack
-            ARCHIVE DESTINATION ${DFHACK_DEVLIB_DESTINATION})
-    endif()
-    # note the ending '/'. This means *contents* of the directory are installed
-    # without the '/', the directory itself is installed
-    install(DIRECTORY include/
-        DESTINATION ${DFHACK_INCLUDES_DESTINATION}
-        FILES_MATCHING PATTERN "*.h" PATTERN "*.inc" )
-endif()
+    install(DIRECTORY lua/
+        DESTINATION ${DFHACK_LUA_DESTINATION}
+        FILES_MATCHING PATTERN "*.lua")
 
-add_subdirectory(xml)
+    install(DIRECTORY ${dfhack_SOURCE_DIR}/patches
+        DESTINATION ${DFHACK_DATA_DESTINATION}
+        FILES_MATCHING PATTERN "*.dif")
+endif()
diff --git a/library/Console-windows.cpp b/library/Console-windows.cpp
index 515d89911..20d943b18 100644
--- a/library/Console-windows.cpp
+++ b/library/Console-windows.cpp
@@ -508,6 +508,7 @@ bool Console::init(bool)
     inited = true;
     // DOESN'T WORK - locks up DF!
     // ForceForegroundWindow(d->MainWindow);
+    hide();
     return true;
 }
 // FIXME: looks awfully empty, doesn't it?
diff --git a/library/Core.cpp b/library/Core.cpp
index 1e76baffe..1d4f52a56 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -35,7 +35,6 @@ distribution.
 #include <forward_list>
 #include <type_traits>
 #include <cstdarg>
-using namespace std;
 
 #include "Error.h"
 #include "MemAccess.h"
@@ -49,9 +48,12 @@ using namespace std;
 #include "VersionInfo.h"
 #include "PluginManager.h"
 #include "ModuleFactory.h"
+#include "modules/DFSDL.h"
+#include "modules/DFSteam.h"
 #include "modules/EventManager.h"
 #include "modules/Filesystem.h"
 #include "modules/Gui.h"
+#include "modules/Textures.h"
 #include "modules/World.h"
 #include "modules/Persistence.h"
 #include "RemoteServer.h"
@@ -59,12 +61,10 @@ using namespace std;
 #include "LuaTools.h"
 #include "DFHackVersion.h"
 
-#include "MiscUtils.h"
-
 using namespace DFHack;
 
-#include "df/ui.h"
-#include "df/ui_sidebar_menus.h"
+#include "df/plotinfost.h"
+#include "df/gamest.h"
 #include "df/world.h"
 #include "df/world_data.h"
 #include "df/interfacest.h"
@@ -84,7 +84,7 @@ using namespace DFHack;
 #include <condition_variable>
 #include "md5wrapper.h"
 
-#include "SDL_events.h"
+#include <SDL_events.h>
 
 #ifdef LINUX_BUILD
 #include <dlfcn.h>
@@ -97,13 +97,16 @@ using df::global::world;
 // FIXME: A lot of code in one file, all doing different things... there's something fishy about it.
 
 static bool parseKeySpec(std::string keyspec, int *psym, int *pmod, std::string *pfocus = NULL);
-size_t loadScriptFiles(Core* core, color_ostream& out, const vector<std::string>& prefix, const std::string& folder);
+size_t loadScriptFiles(Core* core, color_ostream& out, const std::vector<std::string>& prefix, const std::string& folder);
 
 namespace DFHack {
 
 DBG_DECLARE(core,keybinding,DebugCategory::LINFO);
 DBG_DECLARE(core,script,DebugCategory::LINFO);
 
+static const std::string CONFIG_PATH = "dfhack-config/";
+static const std::string CONFIG_DEFAULTS_PATH = "hack/data/dfhack-config-defaults/";
+
 class MainThread {
 public:
     //! MainThread::suspend keeps the main DF thread suspended from Core::Init to
@@ -141,6 +144,7 @@ struct Core::Private
     std::thread hotkeythread;
 
     bool last_autosave_request{false};
+    bool last_manual_save_request{false};
     bool was_load_save{false};
 };
 
@@ -154,9 +158,9 @@ struct CommandDepthCounter
 };
 thread_local int CommandDepthCounter::depth = 0;
 
-void Core::cheap_tokenise(string const& input, vector<string> &output)
+void Core::cheap_tokenise(std::string const& input, std::vector<std::string>& output)
 {
-    string *cur = NULL;
+    std::string *cur = NULL;
     size_t i = 0;
 
     // Check the first non-space character
@@ -228,7 +232,7 @@ void fHKthread(void * iodata)
     PluginManager * plug_mgr = ((IODATA*) iodata)->plug_mgr;
     if(plug_mgr == 0 || core == 0)
     {
-        cerr << "Hotkey thread has croaked." << endl;
+        std::cerr << "Hotkey thread has croaked." << std::endl;
         return;
     }
     bool keep_going = true;
@@ -250,10 +254,10 @@ void fHKthread(void * iodata)
 struct sortable
 {
     bool recolor;
-    string name;
-    string description;
+    std::string name;
+    std::string description;
     //FIXME: Nuke when MSVC stops failing at being C++11 compliant
-    sortable(bool recolor_,const string& name_,const string & description_): recolor(recolor_), name(name_), description(description_){};
+    sortable(bool recolor_,const std::string& name_,const std::string & description_): recolor(recolor_), name(name_), description(description_){};
     bool operator <(const sortable & rhs) const
     {
         if( name < rhs.name )
@@ -262,14 +266,14 @@ struct sortable
     };
 };
 
-static string dfhack_version_desc()
+static std::string dfhack_version_desc()
 {
-    stringstream s;
+    std::stringstream s;
     s << Version::dfhack_version() << " ";
     if (Version::is_release())
         s << "(release)";
     else
-        s << "(development build " << Version::git_description() << ")";
+        s << "(git: " << Version::git_commit(true) << ")";
     s << " on " << (sizeof(void*) == 8 ? "x86_64" : "x86");
     if (strlen(Version::dfhack_build_id()))
         s << " [build ID: " << Version::dfhack_build_id() << "]";
@@ -278,11 +282,11 @@ static string dfhack_version_desc()
 
 namespace {
     struct ScriptArgs {
-        const string *pcmd;
-        vector<string> *pargs;
+        const std::string *pcmd;
+        std::vector<std::string> *pargs;
     };
     struct ScriptEnableState {
-        const string *pcmd;
+        const std::string *pcmd;
         bool pstate;
     };
 }
@@ -301,7 +305,7 @@ static bool init_run_script(color_ostream &out, lua_State *state, void *info)
     return true;
 }
 
-static command_result runLuaScript(color_ostream &out, std::string name, vector<string> &args)
+static command_result runLuaScript(color_ostream &out, std::string name, std::vector<std::string> &args)
 {
     ScriptArgs data;
     data.pcmd = &name;
@@ -336,53 +340,29 @@ static command_result enableLuaScript(color_ostream &out, std::string name, bool
     return ok ? CR_OK : CR_FAILURE;
 }
 
-static command_result runRubyScript(color_ostream &out, PluginManager *plug_mgr, std::string filename, vector<string> &args)
-{
-    if (!plug_mgr->ruby || !plug_mgr->ruby->is_enabled())
-        return CR_FAILURE;
-
-    // ugly temporary patch for https://github.com/DFHack/dfhack/issues/1146
-    string cwd = Filesystem::getcwd();
-    if (filename.find(cwd) == 0)
-    {
-        filename = filename.substr(cwd.size());
-        while (!filename.empty() && (filename[0] == '/' || filename[0] == '\\'))
-            filename = filename.substr(1);
-    }
-
-    std::string rbcmd = "$script_args = [";
-    for (size_t i = 0; i < args.size(); i++)
-        rbcmd += "'" + args[i] + "', ";
-    rbcmd += "]\n";
-
-    rbcmd += "catch(:script_finished) { load '" + filename + "' }";
-
-    return plug_mgr->ruby->eval_ruby(out, rbcmd.c_str());
-}
-
 command_result Core::runCommand(color_ostream &out, const std::string &command)
 {
     if (!command.empty())
     {
-        vector <string> parts;
+        std::vector <std::string> parts;
         Core::cheap_tokenise(command,parts);
         if(parts.size() == 0)
             return CR_NOT_IMPLEMENTED;
 
-        string first = parts[0];
+        std::string first = parts[0];
         parts.erase(parts.begin());
 
         if (first[0] == '#')
             return CR_OK;
 
-        cerr << "Invoking: " << command << endl;
+        std::cerr << "Invoking: " << command << std::endl;
         return runCommand(out, first, parts);
     }
     else
         return CR_NOT_IMPLEMENTED;
 }
 
-bool is_builtin(color_ostream &con, const string &command) {
+bool is_builtin(color_ostream &con, const std::string &command) {
     CoreSuspender suspend;
     auto L = Lua::Core::State;
     Lua::StackUnwinder top(L);
@@ -403,7 +383,7 @@ bool is_builtin(color_ostream &con, const string &command) {
     return lua_toboolean(L, -1);
 }
 
-void get_commands(color_ostream &con, vector<string> &commands) {
+void get_commands(color_ostream &con, std::vector<std::string> &commands) {
     CoreSuspender suspend;
     auto L = Lua::Core::State;
     Lua::StackUnwinder top(L);
@@ -449,10 +429,10 @@ static bool try_autocomplete(color_ostream &con, const std::string &first, std::
     return false;
 }
 
-bool Core::addScriptPath(string path, bool search_before)
+bool Core::addScriptPath(std::string path, bool search_before)
 {
-    lock_guard<mutex> lock(script_path_mutex);
-    vector<string> &vec = script_paths[search_before ? 0 : 1];
+    std::lock_guard<std::mutex> lock(script_path_mutex);
+    std::vector<std::string> &vec = script_paths[search_before ? 0 : 1];
     if (std::find(vec.begin(), vec.end(), path) != vec.end())
         return false;
     if (!Filesystem::isdir(path))
@@ -461,13 +441,19 @@ bool Core::addScriptPath(string path, bool search_before)
     return true;
 }
 
-bool Core::removeScriptPath(string path)
+bool Core::setModScriptPaths(const std::vector<std::string> &mod_script_paths) {
+    std::lock_guard<std::mutex> lock(script_path_mutex);
+    script_paths[2] = mod_script_paths;
+    return true;
+}
+
+bool Core::removeScriptPath(std::string path)
 {
-    lock_guard<mutex> lock(script_path_mutex);
+    std::lock_guard<std::mutex> lock(script_path_mutex);
     bool found = false;
     for (int i = 0; i < 2; i++)
     {
-        vector<string> &vec = script_paths[i];
+        std::vector<std::string> &vec = script_paths[i];
         while (1)
         {
             auto it = std::find(vec.begin(), vec.end(), path);
@@ -482,31 +468,31 @@ bool Core::removeScriptPath(string path)
 
 void Core::getScriptPaths(std::vector<std::string> *dest)
 {
-    lock_guard<mutex> lock(script_path_mutex);
+    std::lock_guard<std::mutex> lock(script_path_mutex);
     dest->clear();
-    string df_path = this->p->getPath();
-    for (auto it = script_paths[0].begin(); it != script_paths[0].end(); ++it)
-        dest->push_back(*it);
-    dest->push_back(df_path + "/dfhack-config/scripts");
+    std::string df_path = this->p->getPath() + "/";
+    for (auto & path : script_paths[0])
+        dest->emplace_back(path);
+    dest->push_back(df_path + CONFIG_PATH + "scripts");
     if (df::global::world && isWorldLoaded()) {
-        string save = World::ReadWorldFolder();
+        std::string save = World::ReadWorldFolder();
         if (save.size())
-            dest->push_back(df_path + "/data/save/" + save + "/raw/scripts");
+            dest->emplace_back(df_path + "save/" + save + "/scripts");
     }
-    dest->push_back(df_path + "/raw/scripts");
-    dest->push_back(df_path + "/hack/scripts");
-    for (auto it = script_paths[1].begin(); it != script_paths[1].end(); ++it)
-        dest->push_back(*it);
+    dest->emplace_back(df_path + "hack/scripts");
+    for (auto & path : script_paths[2])
+        dest->emplace_back(path);
+    for (auto & path : script_paths[1])
+        dest->emplace_back(path);
 }
 
-
-string Core::findScript(string name)
+std::string Core::findScript(std::string name)
 {
-    vector<string> paths;
+    std::vector<std::string> paths;
     getScriptPaths(&paths);
     for (auto it = paths.begin(); it != paths.end(); ++it)
     {
-        string path = *it + "/" + name;
+        std::string path = *it + "/" + name;
         if (Filesystem::isfile(path))
             return path;
     }
@@ -516,7 +502,7 @@ string Core::findScript(string name)
 bool loadScriptPaths(color_ostream &out, bool silent = false)
 {
     using namespace std;
-    string filename("dfhack-config/script-paths.txt");
+    std::string filename(CONFIG_PATH + "script-paths.txt");
     ifstream file(filename);
     if (!file)
     {
@@ -524,7 +510,7 @@ bool loadScriptPaths(color_ostream &out, bool silent = false)
             out.printerr("Could not load %s\n", filename.c_str());
         return false;
     }
-    string raw;
+    std::string raw;
     int line = 0;
     while (getline(file, raw))
     {
@@ -535,7 +521,7 @@ bool loadScriptPaths(color_ostream &out, bool silent = false)
         if (!(ss >> ch) || ch == '#')
             continue;
         ss >> ws; // discard whitespace
-        string path;
+        std::string path;
         getline(ss, path);
         if (ch == '+' || ch == '-')
         {
@@ -548,6 +534,21 @@ bool loadScriptPaths(color_ostream &out, bool silent = false)
     return true;
 }
 
+static void loadModScriptPaths(color_ostream &out) {
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+    std::vector<std::string> mod_script_paths;
+    Lua::CallLuaModuleFunction(out, L, "script-manager", "get_mod_script_paths", 0, 1,
+            Lua::DEFAULT_LUA_LAMBDA,
+            [&](lua_State *L) {
+                Lua::GetVector(L, mod_script_paths);
+            });
+    DEBUG(script,out).print("final mod script paths:\n");
+    for (auto & path : mod_script_paths)
+        DEBUG(script,out).print("  %s\n", path.c_str());
+    Core::getInstance().setModScriptPaths(mod_script_paths);
+}
+
 static std::map<std::string, state_change_event> state_change_event_map;
 static void sc_event_map_init() {
     if (!state_change_event_map.size())
@@ -584,7 +585,7 @@ static std::string sc_event_name (state_change_event id) {
     return "SC_UNKNOWN";
 }
 
-void help_helper(color_ostream &con, const string &entry_name) {
+void help_helper(color_ostream &con, const std::string &entry_name) {
     CoreSuspender suspend;
     auto L = Lua::Core::State;
     Lua::StackUnwinder top(L);
@@ -602,7 +603,7 @@ void help_helper(color_ostream &con, const string &entry_name) {
     }
 }
 
-void tags_helper(color_ostream &con, const string &tag) {
+void tags_helper(color_ostream &con, const std::string &tag) {
     CoreSuspender suspend;
     auto L = Lua::Core::State;
     Lua::StackUnwinder top(L);
@@ -620,11 +621,11 @@ void tags_helper(color_ostream &con, const string &tag) {
     }
 }
 
-void ls_helper(color_ostream &con, const vector<string> &params) {
-    vector<string> filter;
+void ls_helper(color_ostream &con, const std::vector<std::string> &params) {
+    std::vector<std::string> filter;
     bool skip_tags = false;
     bool show_dev_commands = false;
-    string exclude_strs = "";
+    std::string exclude_strs = "";
 
     bool in_exclude = false;
     for (auto str : params) {
@@ -660,7 +661,7 @@ void ls_helper(color_ostream &con, const vector<string> &params) {
     }
 }
 
-command_result Core::runCommand(color_ostream &con, const std::string &first_, vector<string> &parts)
+command_result Core::runCommand(color_ostream &con, const std::string &first_, std::vector<std::string> &parts)
 {
     std::string first = first_;
     CommandDepthCounter counter;
@@ -736,7 +737,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
             {
                 if (p->size() && (*p)[0] == '-')
                 {
-                    if (p->find('a') != string::npos)
+                    if (p->find('a') != std::string::npos)
                         all = true;
                 }
             }
@@ -785,6 +786,8 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
                     }
                 }
 
+                part = GetAliasCommand(part, true);
+
                 Plugin * plug = (*plug_mgr)[part];
 
                 if(!plug)
@@ -824,7 +827,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
                 if (!plug->can_be_enabled()) continue;
 
                 con.print(
-                    "%20s\t%-3s%s\n",
+                    "%21s  %-3s%s\n",
                     (plug->getName()+":").c_str(),
                     plug->is_enabled() ? "on" : "off",
                     plug->can_set_enabled() ? "" : " (controlled internally)"
@@ -895,8 +898,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         }
         con << parts[0];
         bool builtin = is_builtin(con, parts[0]);
-        string lua_path = findScript(parts[0] + ".lua");
-        string ruby_path = findScript(parts[0] + ".rb");
+        std::string lua_path = findScript(parts[0] + ".lua");
         Plugin *plug = plug_mgr->getPluginByCommand(parts[0]);
         if (builtin)
         {
@@ -915,10 +917,6 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         {
             con << " is a Lua script: " << lua_path << std::endl;
         }
-        else if (ruby_path.size())
-        {
-            con << " is a Ruby script: " << ruby_path << std::endl;
-        }
         else
         {
             con << " is not a recognized command." << std::endl;
@@ -957,31 +955,31 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         {
             std::vector<std::string> list = ListKeyBindings(parts[1]);
             if (list.empty())
-                con << "No bindings." << endl;
+                con << "No bindings." << std::endl;
             for (size_t i = 0; i < list.size(); i++)
-                con << "  " << list[i] << endl;
+                con << "  " << list[i] << std::endl;
         }
         else
         {
-            con << "Usage:" << endl
-                << "  keybinding list <key>" << endl
-                << "  keybinding clear <key>[@context]..." << endl
-                << "  keybinding set <key>[@context] \"cmdline\" \"cmdline\"..." << endl
-                << "  keybinding add <key>[@context] \"cmdline\" \"cmdline\"..." << endl
-                << "Later adds, and earlier items within one command have priority." << endl
-                << "Supported keys: [Ctrl-][Alt-][Shift-](A-Z, 0-9, F1-F12, `, or Enter)." << endl
-                << "Context may be used to limit the scope of the binding, by" << endl
-                << "requiring the current context to have a certain prefix." << endl
-                << "Current UI context is: "
-                << Gui::getFocusString(Core::getTopViewscreen()) << endl;
+            con << "Usage:" << std::endl
+                << "  keybinding list <key>" << std::endl
+                << "  keybinding clear <key>[@context]..." << std::endl
+                << "  keybinding set <key>[@context] \"cmdline\" \"cmdline\"..." << std::endl
+                << "  keybinding add <key>[@context] \"cmdline\" \"cmdline\"..." << std::endl
+                << "Later adds, and earlier items within one command have priority." << std::endl
+                << "Supported keys: [Ctrl-][Alt-][Shift-](A-Z, 0-9, F1-F12, `, or Enter)." << std::endl
+                << "Context may be used to limit the scope of the binding, by" << std::endl
+                << "requiring the current context to have a certain prefix." << std::endl
+                << "Current UI context is: " << std::endl
+                << join_strings("\n", Gui::getCurFocus(true)) << std::endl;
         }
     }
     else if (first == "alias")
     {
         if (parts.size() >= 3 && (parts[0] == "add" || parts[0] == "replace"))
         {
-            const string &name = parts[1];
-            vector<string> cmd(parts.begin() + 2, parts.end());
+            const std::string &name = parts[1];
+            std::vector<std::string> cmd(parts.begin() + 2, parts.end());
             if (!AddAlias(name, cmd, parts[0] == "replace"))
             {
                 con.printerr("Could not add alias %s - already exists\n", name.c_str());
@@ -1001,15 +999,15 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
             auto aliases = ListAliases();
             for (auto p : aliases)
             {
-                con << p.first << ": " << join_strings(" ", p.second) << endl;
+                con << p.first << ": " << join_strings(" ", p.second) << std::endl;
             }
         }
         else
         {
-            con << "Usage: " << endl
-                << "  alias add|replace <name> <command...>" << endl
-                << "  alias delete|clear <name> <command...>" << endl
-                << "  alias list" << endl;
+            con << "Usage: " << std::endl
+                << "  alias add|replace <name> <command...>" << std::endl
+                << "  alias delete|clear <name> <command...>" << std::endl
+                << "  alias list" << std::endl;
         }
     }
     else if (first == "fpause")
@@ -1035,7 +1033,11 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
     }
     else if (first == "die")
     {
+#ifdef WIN32
+        TerminateProcess(GetCurrentProcess(),666);
+#else
         std::_Exit(666);
+#endif
     }
     else if (first == "kill-lua")
     {
@@ -1062,8 +1064,8 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         }
         else
         {
-            con << "Usage:" << endl
-                << "  script <filename>" << endl;
+            con << "Usage:" << std::endl
+                << "  script <filename>" << std::endl;
             return CR_WRONG_USAGE;
         }
     }
@@ -1089,13 +1091,13 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
     {
         if (parts.empty() || parts[0] == "help" || parts[0] == "?")
         {
-            con << "Usage: sc-script add|remove|list|help SC_EVENT [path-to-script] [...]" << endl;
-            con << "Valid event names (SC_ prefix is optional):" << endl;
+            con << "Usage: sc-script add|remove|list|help SC_EVENT [path-to-script] [...]" << std::endl;
+            con << "Valid event names (SC_ prefix is optional):" << std::endl;
             for (int i = SC_WORLD_LOADED; i <= SC_UNPAUSED; i++)
             {
                 std::string name = sc_event_name((state_change_event)i);
                 if (name != "SC_UNKNOWN")
-                    con << "  " << name << endl;
+                    con << "  " << name << std::endl;
             }
             return CR_OK;
         }
@@ -1105,7 +1107,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
                 parts.push_back("");
             if (parts[1].size() && sc_event_id(parts[1]) == SC_UNKNOWN)
             {
-                con << "Unrecognized event name: " << parts[1] << endl;
+                con << "Unrecognized event name: " << parts[1] << std::endl;
                 return CR_WRONG_USAGE;
             }
             for (auto it = state_change_scripts.begin(); it != state_change_scripts.end(); ++it)
@@ -1124,13 +1126,13 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         {
             if (parts.size() < 3 || (parts.size() >= 4 && parts[3] != "-save"))
             {
-                con << "Usage: sc-script add EVENT path-to-script [-save]" << endl;
+                con << "Usage: sc-script add EVENT path-to-script [-save]" << std::endl;
                 return CR_WRONG_USAGE;
             }
             state_change_event evt = sc_event_id(parts[1]);
             if (evt == SC_UNKNOWN)
             {
-                con << "Unrecognized event: " << parts[1] << endl;
+                con << "Unrecognized event: " << parts[1] << std::endl;
                 return CR_FAILURE;
             }
             bool save_specific = (parts.size() >= 4 && parts[3] == "-save");
@@ -1139,7 +1141,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
             {
                 if (script == *it)
                 {
-                    con << "Script already registered" << endl;
+                    con << "Script already registered" << std::endl;
                     return CR_FAILURE;
                 }
             }
@@ -1150,13 +1152,13 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         {
             if (parts.size() < 3 || (parts.size() >= 4 && parts[3] != "-save"))
             {
-                con << "Usage: sc-script remove EVENT path-to-script [-save]" << endl;
+                con << "Usage: sc-script remove EVENT path-to-script [-save]" << std::endl;
                 return CR_WRONG_USAGE;
             }
             state_change_event evt = sc_event_id(parts[1]);
             if (evt == SC_UNKNOWN)
             {
-                con << "Unrecognized event: " << parts[1] << endl;
+                con << "Unrecognized event: " << parts[1] << std::endl;
                 return CR_FAILURE;
             }
             bool save_specific = (parts.size() >= 4 && parts[3] == "-save");
@@ -1169,13 +1171,13 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
             }
             else
             {
-                con << "Unrecognized script" << endl;
+                con << "Unrecognized script" << std::endl;
                 return CR_FAILURE;
             }
         }
         else
         {
-            con << "Usage: sc-script add|remove|list|help SC_EVENT [path-to-script] [...]" << endl;
+            con << "Usage: sc-script add|remove|list|help SC_EVENT [path-to-script] [...]" << std::endl;
             return CR_WRONG_USAGE;
         }
     }
@@ -1197,13 +1199,13 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
                 if (!svc)
                     continue;
 
-                file << "// Plugin: " << plug->getName() << endl;
+                file << "// Plugin: " << plug->getName() << std::endl;
                 svc->dumpMethods(file);
             }
         }
         else
         {
-            con << "Usage: devel/dump-rpc \"filename\"" << endl;
+            con << "Usage: devel/dump-rpc \"filename\"" << std::endl;
             return CR_WRONG_USAGE;
         }
     }
@@ -1220,16 +1222,14 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         }
         else if (res == CR_NOT_IMPLEMENTED)
         {
-            string completed;
-            string filename = findScript(first + ".lua");
+            std::string completed;
+            std::string filename = findScript(first + ".lua");
             bool lua = filename != "";
             if ( !lua ) {
                 filename = findScript(first + ".rb");
             }
             if ( lua )
                 res = runLuaScript(con, first, parts);
-            else if ( filename != "" && plug_mgr->ruby && plug_mgr->ruby->is_enabled() )
-                res = runRubyScript(con, plug_mgr, filename, parts);
             else if ( try_autocomplete(con, first, completed) )
                 res = CR_NOT_IMPLEMENTED;
             else
@@ -1253,29 +1253,36 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         }
         else if (res == CR_NEEDS_CONSOLE)
             con.printerr("%s needs an interactive console to work.\n"
-                          "Please run this command from the DFHack terminal.\n", first.c_str());
+                          "Please run this command from the DFHack console.\n\n"
+#ifdef WIN32
+                          "You can show the console with the 'show' command."
+#else
+                          "The console is accessible when you run DF from the commandline\n"
+                          "via the './dfhack' script."
+#endif
+                          "\n", first.c_str());
         return res;
     }
 
     return CR_OK;
 }
 
-bool Core::loadScriptFile(color_ostream &out, string fname, bool silent)
+bool Core::loadScriptFile(color_ostream &out, std::string fname, bool silent)
 {
     if(!silent) {
         INFO(script,out) << "Loading script: " << fname << std::endl;
-        cerr << "Loading script: " << fname << std::endl;
+        std::cerr << "Loading script: " << fname << std::endl;
     }
-    ifstream script(fname.c_str());
+    std::ifstream script(fname.c_str());
     if ( !script.good() )
     {
         if(!silent)
             out.printerr("Error loading script: %s\n", fname.c_str());
         return false;
     }
-    string command;
+    std::string command;
     while(script.good()) {
-        string temp;
+        std::string temp;
         getline(script,temp);
         bool doMore = false;
         if ( temp.length() > 0 ) {
@@ -1302,18 +1309,27 @@ bool Core::loadScriptFile(color_ostream &out, string fname, bool silent)
 static void run_dfhack_init(color_ostream &out, Core *core)
 {
     CoreSuspender lock;
-    if (!df::global::world || !df::global::ui || !df::global::gview)
+    if (!df::global::world || !df::global::plotinfo || !df::global::gview)
     {
         out.printerr("Key globals are missing, skipping loading dfhack.init.\n");
         return;
     }
 
     // load baseline defaults
-    core->loadScriptFile(out, "dfhack-config/init/default.dfhack.init", false);
+    core->loadScriptFile(out, CONFIG_PATH + "init/default.dfhack.init", false);
 
     // load user overrides
     std::vector<std::string> prefixes(1, "dfhack");
-    loadScriptFiles(core, out, prefixes, "dfhack-config/init");
+    loadScriptFiles(core, out, prefixes, CONFIG_PATH + "init");
+
+    // show the terminal if requested
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+    Lua::CallLuaModuleFunction(out, L, "dfhack", "getHideConsoleOnStartup", 0, 1,
+        Lua::DEFAULT_LUA_LAMBDA, [&](lua_State* L) {
+            if (!lua_toboolean(L, -1))
+                core->getConsole().show();
+        }, false);
 }
 
 // Load dfhack.init in a dedicated thread (non-interactive console mode)
@@ -1329,14 +1345,14 @@ void fInitthread(void * iodata)
 // A thread function... for the interactive console.
 void fIOthread(void * iodata)
 {
-    static const char * HISTORY_FILE = "dfhack-config/dfhack.history";
+    static const std::string HISTORY_FILE = CONFIG_PATH + "dfhack.history";
 
     IODATA * iod = ((IODATA*) iodata);
     Core * core = iod->core;
     PluginManager * plug_mgr = ((IODATA*) iodata)->plug_mgr;
 
     CommandHistory main_history;
-    main_history.load(HISTORY_FILE);
+    main_history.load(HISTORY_FILE.c_str());
 
     Console & con = core->getConsole();
     if (plug_mgr == 0)
@@ -1359,25 +1375,25 @@ void fIOthread(void * iodata)
 
     while (true)
     {
-        string command = "";
+        std::string command = "";
         int ret;
         while ((ret = con.lineedit("[DFHack]# ",command, main_history))
                 == Console::RETRY);
         if(ret == Console::SHUTDOWN)
         {
-            cerr << "Console is shutting down properly." << endl;
+            std::cerr << "Console is shutting down properly." << std::endl;
             return;
         }
         else if(ret == Console::FAILURE)
         {
-            cerr << "Console caught an unspecified error." << endl;
+            std::cerr << "Console caught an unspecified error." << std::endl;
             continue;
         }
         else if(ret)
         {
             // a proper, non-empty command was entered
             main_history.add(command);
-            main_history.save(HISTORY_FILE);
+            main_history.save(HISTORY_FILE.c_str());
         }
 
         auto rv = core->runCommand(con, command);
@@ -1399,7 +1415,7 @@ Core::~Core()
 }
 
 Core::Core() :
-    d(dts::make_unique<Private>()),
+    d(std::make_unique<Private>()),
     script_path_mutex{},
     HotkeyMutex{},
     HotkeyCond{},
@@ -1418,6 +1434,7 @@ Core::Core() :
     memset(&(s_mods), 0, sizeof(s_mods));
 
     // set up hotkey capture
+    suppress_duplicate_keyboard_events = true;
     hotkey_set = NO;
     last_world_data_ptr = NULL;
     last_local_map_ptr = NULL;
@@ -1425,13 +1442,12 @@ Core::Core() :
     top_viewscreen = NULL;
 
     color_ostream::log_errors_to_stderr = true;
-
 };
 
 void Core::fatal (std::string output)
 {
     errorstate = true;
-    stringstream out;
+    std::stringstream out;
     out << output ;
     if (output[output.size() - 1] != '\n')
         out << '\n';
@@ -1443,12 +1459,9 @@ void Core::fatal (std::string output)
         con.print("\n");
     }
     fprintf(stderr, "%s\n", out.str().c_str());
-#ifndef LINUX_BUILD
-    out << "Check file stderr.log for details\n";
-    MessageBox(0,out.str().c_str(),"DFHack error!", MB_OK | MB_ICONERROR);
-#else
-    cout << "DFHack fatal error: " << out.str() << std::endl;
-#endif
+    out << "Check file stderr.log for details.\n";
+    std::cout << "DFHack fatal error: " << out.str() << std::endl;
+    DFSDL::DFSDL_ShowSimpleMessageBox(0x10 /* SDL_MESSAGEBOX_ERROR */, "DFHack error!", out.str().c_str(), NULL);
 
     bool is_headless = bool(getenv("DFHACK_HEADLESS"));
     if (is_headless)
@@ -1466,16 +1479,12 @@ std::string Core::getHackPath()
 #endif
 }
 
-bool Core::Init()
-{
-    if(started)
-        return true;
-    if(errorstate)
-        return false;
+df::viewscreen * Core::getTopViewscreen() {
+    return getInstance().top_viewscreen;
+}
 
-    // Lock the CoreSuspendMutex until the thread exits or call Core::Shutdown
-    // Core::Update will temporary unlock when there is any commands queued
-    MainThread::suspend().lock();
+bool Core::InitMainThread() {
+    Filesystem::init();
 
     // Re-route stdout and stderr again - DF seems to set up stdout and
     // stderr.txt on Windows as of 0.43.05. Also, log before switching files to
@@ -1485,16 +1494,20 @@ bool Core::Init()
         // this is handled as appropriate in Console-posix.cpp
         fprintf(stdout, "dfhack: redirecting stdout to stdout.log (again)\n");
         if (!freopen("stdout.log", "w", stdout))
-            cerr << "Could not redirect stdout to stdout.log" << endl;
+            std::cerr << "Could not redirect stdout to stdout.log" << std::endl;
     #endif
     fprintf(stderr, "dfhack: redirecting stderr to stderr.log\n");
     if (!freopen("stderr.log", "w", stderr))
-        cerr << "Could not redirect stderr to stderr.log" << endl;
+        std::cerr << "Could not redirect stderr to stderr.log" << std::endl;
 
-    Filesystem::init();
+    std::cerr << "DFHack build: " << Version::git_description() << "\n"
+         << "Starting with working directory: " << Filesystem::getcwd() << std::endl;
 
-    cerr << "DFHack build: " << Version::git_description() << "\n"
-         << "Starting with working directory: " << Filesystem::getcwd() << endl;
+    std::cerr << "Binding to SDL.\n";
+    if (!DFSDL::init(con)) {
+        fatal("cannot bind SDL libraries");
+        return false;
+    }
 
     // find out what we are...
     #ifdef LINUX_BUILD
@@ -1502,8 +1515,8 @@ bool Core::Init()
     #else
         const char * path = "hack\\symbols.xml";
     #endif
-    auto local_vif = dts::make_unique<DFHack::VersionInfoFactory>();
-    cerr << "Identifying DF version.\n";
+    auto local_vif = std::make_unique<DFHack::VersionInfoFactory>();
+    std::cerr << "Identifying DF version.\n";
     try
     {
         local_vif->loadFile(path);
@@ -1518,7 +1531,7 @@ bool Core::Init()
         return false;
     }
     vif = std::move(local_vif);
-    auto local_p = dts::make_unique<DFHack::Process>(*vif);
+    auto local_p = std::make_unique<DFHack::Process>(*vif);
     local_p->ValidateDescriptionOS();
     vinfo = local_p->getDescriptor();
 
@@ -1544,8 +1557,8 @@ bool Core::Init()
                 "recompile.\n"
                 "More details can be found in stderr.log in this folder.\n"
             );
-            cout << msg << endl;
-            cerr << msg << endl;
+            std::cout << msg << std::endl;
+            std::cerr << msg << std::endl;
             fatal("Not a known DF version - XML version mismatch (see console or stderr.log)");
         }
         else
@@ -1555,13 +1568,27 @@ bool Core::Init()
         errorstate = true;
         return false;
     }
-    cerr << "Version: " << vinfo->getVersion() << endl;
+    std::cerr << "Version: " << vinfo->getVersion() << std::endl;
     p = std::move(local_p);
 
     // Init global object pointers
     df::global::InitGlobals();
 
-    cerr << "Initializing Console.\n";
+    return true;
+}
+
+bool Core::InitSimulationThread()
+{
+    if(started)
+        return true;
+    if(errorstate)
+        return false;
+
+    // Lock the CoreSuspendMutex until the thread exits or call Core::Shutdown
+    // Core::Update will temporary unlock when there is any commands queued
+    MainThread::suspend().lock();
+
+    std::cerr << "Initializing Console.\n";
     // init the console.
     bool is_text_mode = (init && init->display.flag.is_set(init_display_flags::TEXT));
     bool is_headless = bool(getenv("DFHACK_HEADLESS"));
@@ -1577,29 +1604,29 @@ bool Core::Init()
             }
             else
             {
-                cerr << "endwin(): bind failed" << endl;
+                std::cerr << "endwin(): bind failed" << std::endl;
             }
         }
         else
         {
-            cerr << "Headless mode requires PRINT_MODE:TEXT" << endl;
+            std::cerr << "Headless mode requires PRINT_MODE:TEXT" << std::endl;
         }
 #else
-        cerr << "Headless mode not supported on Windows" << endl;
+        std::cerr << "Headless mode not supported on Windows" << std::endl;
 #endif
     }
     if (is_text_mode && !is_headless)
     {
-        cerr << "Console is not available. Use dfhack-run to send commands.\n";
+        std::cerr << "Console is not available. Use dfhack-run to send commands.\n";
         if (!is_text_mode)
         {
-            cout << "Console disabled.\n";
+            std::cout << "Console disabled.\n";
         }
     }
     else if(con.init(false))
-        cerr << "Console is running.\n";
+        std::cerr << "Console is running.\n";
     else
-        cerr << "Console has failed to initialize!\n";
+        std::cerr << "Console has failed to initialize!\n";
 /*
     // dump offsets to a file
     std::ofstream dump("offsets.log");
@@ -1612,46 +1639,44 @@ bool Core::Init()
     // initialize data defs
     virtual_identity::Init(this);
 
+    // create config directory if it doesn't already exist
+    if (!Filesystem::mkdir_recursive(CONFIG_PATH))
+        con.printerr("Failed to create config directory: '%s'\n", CONFIG_PATH.c_str());
+
     // copy over default config files if necessary
     std::map<std::string, bool> config_files;
     std::map<std::string, bool> default_config_files;
-    if (Filesystem::listdir_recursive("dfhack-config", config_files, 10, false) != 0)
-        con.printerr("Failed to list directory: dfhack-config");
-    else if (Filesystem::listdir_recursive("dfhack-config/default", default_config_files, 10, false) != 0)
-        con.printerr("Failed to list directory: dfhack-config/default");
+    if (Filesystem::listdir_recursive(CONFIG_PATH, config_files, 10, false) != 0)
+        con.printerr("Failed to list directory: '%s'\n", CONFIG_PATH.c_str());
+    else if (Filesystem::listdir_recursive(CONFIG_DEFAULTS_PATH, default_config_files, 10, false) != 0)
+        con.printerr("Failed to list directory: '%s'\n", CONFIG_DEFAULTS_PATH.c_str());
     else
     {
         // ensure all config file directories exist before we start copying files
-        for (auto it = default_config_files.begin(); it != default_config_files.end(); ++it)
-        {
+        for (auto &entry : default_config_files) {
             // skip over files
-            if (!it->second)
+            if (!entry.second)
                 continue;
-            std::string dirname = "dfhack-config/" + it->first;
+            std::string dirname = CONFIG_PATH + entry.first;
             if (!Filesystem::mkdir_recursive(dirname))
-            {
                 con.printerr("Failed to create config directory: '%s'\n", dirname.c_str());
-            }
         }
 
         // copy files from the default tree that don't already exist in the config tree
-        for (auto it = default_config_files.begin(); it != default_config_files.end(); ++it)
-        {
+        for (auto &entry : default_config_files) {
             // skip over directories
-            if (it->second)
+            if (entry.second)
                 continue;
-            std::string filename = it->first;
-            if (config_files.find(filename) == config_files.end())
-            {
-                std::string src_file = std::string("dfhack-config/default/") + filename;
+            std::string filename = entry.first;
+            if (!config_files.count(filename)) {
+                std::string src_file = CONFIG_DEFAULTS_PATH + filename;
                 if (!Filesystem::isfile(src_file))
                     continue;
-                std::string dest_file = std::string("dfhack-config/") + filename;
+                std::string dest_file = CONFIG_PATH + filename;
                 std::ifstream src(src_file, std::ios::binary);
                 std::ofstream dest(dest_file, std::ios::binary);
-                if (!src.good() || !dest.good())
-                {
-                    con.printerr("Copy failed: %s\n", filename.c_str());
+                if (!src.good() || !dest.good()) {
+                    con.printerr("Copy failed: '%s'\n", filename.c_str());
                     continue;
                 }
                 dest << src.rdbuf();
@@ -1670,12 +1695,18 @@ bool Core::Init()
         return false;
     }
 
+    if (DFSteam::init(con)) {
+        std::cerr << "Found Steam.\n";
+        DFSteam::launchSteamDFHackIfNecessary(con);
+    }
+    std::cerr << "Initializing textures.\n";
+    Textures::init(con);
     // create mutex for syncing with interactive tasks
-    cerr << "Initializing Plugins.\n";
+    std::cerr << "Initializing plugins.\n";
     // create plugin manager
     plug_mgr = new PluginManager(this);
     plug_mgr->init();
-    cerr << "Starting the TCP listener.\n";
+    std::cerr << "Starting the TCP listener.\n";
     auto listen = ServerMain::listen(RemoteClient::GetDefaultPort());
     IODATA *temp = new IODATA;
     temp->core = this;
@@ -1683,7 +1714,7 @@ bool Core::Init()
 
     if (!is_text_mode || is_headless)
     {
-        cerr << "Starting IO thread.\n";
+        std::cerr << "Starting IO thread.\n";
         // create IO thread
         d->iothread = std::thread{fIOthread, (void*)temp};
     }
@@ -1693,19 +1724,19 @@ bool Core::Init()
         d->iothread = std::thread{fInitthread, (void*)temp};
     }
 
-    cerr << "Starting DF input capture thread.\n";
+    std::cerr << "Starting DF input capture thread.\n";
     // set up hotkey capture
     d->hotkeythread = std::thread(fHKthread, (void *) temp);
     started = true;
     modstate = 0;
 
     if (!listen.get())
-        cerr << "TCP listen failed.\n";
+        std::cerr << "TCP listen failed.\n";
 
-    if (df::global::ui_sidebar_menus)
+    if (df::global::game)
     {
-        vector<string> args;
-        const string & raw = df::global::ui_sidebar_menus->command_line.original;
+        std::vector<std::string> args;
+        const std::string & raw = df::global::game->command_line.original;
         size_t offset = 0;
         while (offset < raw.size())
         {
@@ -1719,7 +1750,7 @@ bool Core::Init()
             else
             {
                 size_t next = raw.find(" ", offset);
-                if (next == string::npos)
+                if (next == std::string::npos)
                 {
                     args.push_back(raw.substr(offset));
                     offset = raw.size();
@@ -1733,12 +1764,12 @@ bool Core::Init()
         }
         for (auto it = args.begin(); it != args.end(); )
         {
-            const string & first = *it;
+            const std::string & first = *it;
             if (first.length() > 0 && first[0] == '+')
             {
-                vector<string> cmd;
+                std::vector<std::string> cmd;
                 for (it++; it != args.end(); it++) {
-                    const string & arg = *it;
+                    const std::string & arg = *it;
                     if (arg.length() > 0 && arg[0] == '+')
                     {
                         break;
@@ -1748,12 +1779,12 @@ bool Core::Init()
 
                 if (runCommand(con, first.substr(1), cmd) != CR_OK)
                 {
-                    cerr << "Error running command: " << first.substr(1);
+                    std::cerr << "Error running command: " << first.substr(1);
                     for (auto it2 = cmd.begin(); it2 != cmd.end(); it2++)
                     {
-                        cerr << " \"" << *it2 << "\"";
+                        std::cerr << " \"" << *it2 << "\"";
                     }
-                    cerr << "\n";
+                    std::cerr << "\n";
                 }
             }
             else
@@ -1763,14 +1794,9 @@ bool Core::Init()
         }
     }
 
-    cerr << "DFHack is running.\n";
+    std::cerr << "DFHack is running.\n";
 
-    {
-        auto L = Lua::Core::State;
-        Lua::StackUnwinder top(L);
-        Lua::CallLuaModuleFunction(con, L, "script-manager", "reload");
-        onStateChange(con, SC_CORE_INITIALIZED);
-    }
+    onStateChange(con, SC_CORE_INITIALIZED);
 
     return true;
 }
@@ -1787,7 +1813,7 @@ bool Core::setHotkeyCmd( std::string cmd )
 /// removes the hotkey command and gives it to the caller thread
 std::string Core::getHotkeyCmd( bool &keep_going )
 {
-    string returner;
+    std::string returner;
     std::unique_lock<std::mutex> lock(HotkeyMutex);
     HotkeyCond.wait(lock, [this]() -> bool {return this->hotkey_set;});
     if (hotkey_set == SHUTDOWN) {
@@ -1842,6 +1868,11 @@ void *Core::GetData( std::string key )
     }
 }
 
+Core& Core::getInstance() {
+    static Core instance;
+    return instance;
+}
+
 bool Core::isSuspended(void)
 {
     return ownerThread.load() == std::this_thread::get_id();
@@ -1874,7 +1905,8 @@ void Core::doUpdate(color_ostream &out)
         strict_virtual_cast<df::viewscreen_savegamest>(screen);
 
     // save data (do this before updating last_world_data_ptr and triggering unload events)
-    if ((df::global::ui->main.autosave_request && !d->last_autosave_request) ||
+    if ((df::global::game && df::global::game->main_interface.options.do_manual_save && !d->last_manual_save_request) ||
+        (df::global::plotinfo && df::global::plotinfo->main.autosave_request && !d->last_autosave_request) ||
         (is_load_save && !d->was_load_save && strict_virtual_cast<df::viewscreen_savegamest>(screen)))
     {
         doSaveData(out);
@@ -1936,7 +1968,10 @@ void Core::doUpdate(color_ostream &out)
     // Execute per-frame handlers
     onUpdate(out);
 
-    d->last_autosave_request = df::global::ui->main.autosave_request;
+    if (df::global::game && df::global::plotinfo) {
+        d->last_autosave_request = df::global::plotinfo->main.autosave_request;
+        d->last_manual_save_request = df::global::game->main_interface.options.do_manual_save;
+    }
     d->was_load_save = is_load_save;
 
     out << std::flush;
@@ -1956,7 +1991,7 @@ int Core::Update()
         if(!started)
         {
             // Initialize the core
-            Init();
+            InitSimulationThread();
             if(errorstate)
                 return -1;
         }
@@ -2010,22 +2045,22 @@ void getFilesWithPrefixAndSuffix(const std::string& folder, const std::string& p
     return;
 }
 
-size_t loadScriptFiles(Core* core, color_ostream& out, const vector<std::string>& prefix, const std::string& folder) {
-    static const string suffix = ".init";
-    vector<string> scriptFiles;
+size_t loadScriptFiles(Core* core, color_ostream& out, const std::vector<std::string>& prefix, const std::string& folder) {
+    static const std::string suffix = ".init";
+    std::vector<std::string> scriptFiles;
     for ( size_t a = 0; a < prefix.size(); a++ ) {
         getFilesWithPrefixAndSuffix(folder, prefix[a], ".init", scriptFiles);
     }
     std::sort(scriptFiles.begin(), scriptFiles.end(),
-              [&](const string &a, const string &b) {
-        string a_base = a.substr(0, a.size() - suffix.size());
-        string b_base = b.substr(0, b.size() - suffix.size());
+              [&](const std::string &a, const std::string &b) {
+        std::string a_base = a.substr(0, a.size() - suffix.size());
+        std::string b_base = b.substr(0, b.size() - suffix.size());
         return a_base < b_base;
     });
     size_t result = 0;
     for ( size_t a = 0; a < scriptFiles.size(); a++ ) {
         result++;
-        string path = "";
+        std::string path = "";
         if (folder != ".")
             path = folder + "/";
         core->loadScriptFile(out, path + scriptFiles[a], false);
@@ -2036,10 +2071,10 @@ size_t loadScriptFiles(Core* core, color_ostream& out, const vector<std::string>
 namespace DFHack {
     namespace X {
         typedef state_change_event Key;
-        typedef vector<string> Val;
-        typedef pair<Key,Val> Entry;
-        typedef vector<Entry> EntryVector;
-        typedef map<Key,Val> InitVariationTable;
+        typedef std::vector<std::string> Val;
+        typedef std::pair<Key,Val> Entry;
+        typedef std::vector<Entry> EntryVector;
+        typedef std::map<Key,Val> InitVariationTable;
 
         EntryVector computeInitVariationTable(void* none, ...) {
             va_list list;
@@ -2054,7 +2089,7 @@ namespace DFHack {
                     const char *v = va_arg(list, const char *);
                     if (!v || !v[0])
                         break;
-                    val.push_back(string(v));
+                    val.emplace_back(v);
                 }
                 result.push_back(Entry(key,val));
             }
@@ -2079,18 +2114,18 @@ void Core::handleLoadAndUnloadScripts(color_ostream& out, state_change_event eve
 
     if (!df::global::world)
         return;
-    std::string rawFolder = "data/save/" + (df::global::world->cur_savegame.save_dir) + "/raw/";
+
+    std::string rawFolder = !isWorldLoaded() ? "" : "save/" + World::ReadWorldFolder() + "/init";
 
     auto i = table.find(event);
     if ( i != table.end() ) {
         const std::vector<std::string>& set = i->second;
 
         // load baseline defaults
-        this->loadScriptFile(out, "dfhack-config/init/default." + set[0] + ".init", false);
+        this->loadScriptFile(out, CONFIG_PATH + "init/default." + set[0] + ".init", false);
 
-        loadScriptFiles(this, out, set, "dfhack-config/init");
+        loadScriptFiles(this, out, set, CONFIG_PATH + "init");
         loadScriptFiles(this, out, set, rawFolder);
-        loadScriptFiles(this, out, set, rawFolder + "objects/");
     }
 
     for (auto it = state_change_scripts.begin(); it != state_change_scripts.end(); ++it)
@@ -2138,13 +2173,32 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
 
     switch (event)
     {
+    case SC_CORE_INITIALIZED:
+    {
+        loadModScriptPaths(out);
+        auto L = Lua::Core::State;
+        Lua::StackUnwinder top(L);
+        Lua::CallLuaModuleFunction(con, L, "helpdb", "refresh");
+        Lua::CallLuaModuleFunction(con, L, "script-manager", "reload");
+        break;
+    }
     case SC_WORLD_LOADED:
+    {
+        loadModScriptPaths(out);
+        auto L = Lua::Core::State;
+        Lua::StackUnwinder top(L);
+        Lua::CallLuaModuleFunction(con, L, "script-manager", "reload", 1, 0,
+            [](lua_State* L) {
+                Lua::Push(L, true);
+            });
+        // fallthrough
+    }
     case SC_WORLD_UNLOADED:
     case SC_MAP_LOADED:
     case SC_MAP_UNLOADED:
         if (world && world->cur_savegame.save_dir.size())
         {
-            std::string save_dir = "data/save/" + world->cur_savegame.save_dir;
+            std::string save_dir = "save/" + world->cur_savegame.save_dir;
             std::string evtlogpath = save_dir + "/events-dfhack.log";
             std::ofstream evtlog;
             evtlog.open(evtlogpath, std::ios_base::app);  // append
@@ -2171,6 +2225,7 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
                 evtlog << std::endl;
             }
         }
+        break;
     default:
         break;
     }
@@ -2181,6 +2236,11 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
         std::cerr << "loaded map in prerelease build" << std::endl;
     }
 
+    if (event == SC_WORLD_LOADED)
+    {
+        doLoadData(out);
+    }
+
     EventManager::onStateChange(out, event);
 
     buildings_onStateChange(out, event);
@@ -2194,10 +2254,10 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
     if (event == SC_WORLD_UNLOADED)
     {
         Persistence::Internal::clear();
-    }
-    if (event == SC_WORLD_LOADED)
-    {
-        doLoadData(out);
+        loadModScriptPaths(out);
+        auto L = Lua::Core::State;
+        Lua::StackUnwinder top(L);
+        Lua::CallLuaModuleFunction(con, L, "script-manager", "reload");
     }
 }
 
@@ -2248,6 +2308,9 @@ int Core::Shutdown ( void )
     }
     // invalidate all modules
     allModules.clear();
+    Textures::cleanup();
+    DFSDL::cleanup();
+    DFSteam::cleanup(getConsole());
     memset(&(s_mods), 0, sizeof(s_mods));
     d.reset();
     return -1;
@@ -2258,38 +2321,39 @@ int Core::Shutdown ( void )
 #define KEY_F0      0410        /* Function keys.  Space for 64 */
 #define KEY_F(n)    (KEY_F0+(n))    /* Value of function key n */
 
+// returns true if the event has been handled
 bool Core::ncurses_wgetch(int in, int & out)
 {
     if(!started)
     {
         out = in;
-        return true;
+        return false;
     }
     if(in >= KEY_F(1) && in <= KEY_F(8))
     {
 /* TODO: understand how this changes for v50
         int idx = in - KEY_F(1);
         // FIXME: copypasta, push into a method!
-        if(df::global::ui && df::global::gview)
+        if(df::global::plotinfo && df::global::gview)
         {
             df::viewscreen * ws = Gui::getCurViewscreen();
             if (strict_virtual_cast<df::viewscreen_dwarfmodest>(ws) &&
-                df::global::ui->main.mode != ui_sidebar_mode::Hotkeys &&
-                df::global::ui->main.hotkeys[idx].cmd == df::ui_hotkey::T_cmd::None)
+                df::global::plotinfo->main.mode != ui_sidebar_mode::Hotkeys &&
+                df::global::plotinfo->main.hotkeys[idx].cmd == df::ui_hotkey::T_cmd::None)
             {
-                setHotkeyCmd(df::global::ui->main.hotkeys[idx].name);
-                return false;
+                setHotkeyCmd(df::global::plotinfo->main.hotkeys[idx].name);
+                return true;
             }
             else
             {
                 out = in;
-                return true;
+                return false;
             }
         }
 */
     }
     out = in;
-    return true;
+    return false;
 }
 
 bool Core::DFH_ncurses_key(int key)
@@ -2297,126 +2361,100 @@ bool Core::DFH_ncurses_key(int key)
     if (getenv("DFHACK_HEADLESS"))
         return true;
     int dummy;
-    return !ncurses_wgetch(key, dummy);
+    return ncurses_wgetch(key, dummy);
 }
 
-int UnicodeAwareSym(const SDL::KeyboardEvent& ke)
-{
-    // Assume keyboard layouts don't change the order of numbers:
-    if( '0' <= ke.ksym.sym && ke.ksym.sym <= '9') return ke.ksym.sym;
-    if(SDL::K_F1 <= ke.ksym.sym && ke.ksym.sym <= SDL::K_F12) return ke.ksym.sym;
-
-    // These keys are mapped to the same control codes as Ctrl-?
-    switch (ke.ksym.sym)
-    {
-        case SDL::K_RETURN:
-        case SDL::K_KP_ENTER:
-        case SDL::K_TAB:
-        case SDL::K_ESCAPE:
-        case SDL::K_DELETE:
-            return ke.ksym.sym;
-        default:
-            break;
-    }
-
-    int unicode = ke.ksym.unicode;
-
-    // convert Ctrl characters to their 0x40-0x5F counterparts:
-    if (unicode < ' ')
-    {
-        unicode += 'A' - 1;
-    }
-
-    // convert A-Z to their a-z counterparts:
-    if('A' <= unicode && unicode <= 'Z')
-    {
-        unicode += 'a' - 'A';
-    }
-
-    // convert various other punctuation marks:
-    if('\"' == unicode) unicode = '\'';
-    if('+' == unicode) unicode = '=';
-    if(':' == unicode) unicode = ';';
-    if('<' == unicode) unicode = ',';
-    if('>' == unicode) unicode = '.';
-    if('?' == unicode) unicode = '/';
-    if('{' == unicode) unicode = '[';
-    if('|' == unicode) unicode = '\\';
-    if('}' == unicode) unicode = ']';
-    if('~' == unicode) unicode = '`';
-
-    return unicode;
+bool Core::getSuppressDuplicateKeyboardEvents() {
+    return suppress_duplicate_keyboard_events;
 }
 
+void Core::setSuppressDuplicateKeyboardEvents(bool suppress) {
+    DEBUG(keybinding).print("setting suppress_duplicate_keyboard_events to %s\n",
+        suppress ? "true" : "false");
+    suppress_duplicate_keyboard_events = suppress;
+}
 
-//MEMO: return false if event is consumed
-int Core::DFH_SDL_Event(SDL::Event* ev)
+// returns true if the event is handled
+bool Core::DFH_SDL_Event(SDL_Event* ev)
 {
+    static std::map<int, bool> hotkey_states;
+
     // do NOT process events before we are ready.
-    if(!started) return true;
-    if(!ev)
-        return true;
+    if (!started || !ev)
+        return false;
 
-    if(ev->type == SDL::ET_ACTIVEEVENT && ev->active.gain)
-    {
+    if (ev->type == SDL_WINDOWEVENT && ev->window.event == SDL_WINDOWEVENT_FOCUS_GAINED) {
         // clear modstate when gaining focus in case alt-tab was used when
         // losing focus and modstate is now incorrectly set
         modstate = 0;
-        return true;
+        return false;
     }
 
-    if(ev->type == SDL::ET_KEYDOWN || ev->type == SDL::ET_KEYUP)
-    {
-        auto ke = (SDL::KeyboardEvent *)ev;
-
-        if (ke->ksym.sym == SDL::K_LSHIFT || ke->ksym.sym == SDL::K_RSHIFT)
-            modstate = (ev->type == SDL::ET_KEYDOWN) ? modstate | DFH_MOD_SHIFT : modstate & ~DFH_MOD_SHIFT;
-        else if (ke->ksym.sym == SDL::K_LCTRL || ke->ksym.sym == SDL::K_RCTRL)
-            modstate = (ev->type == SDL::ET_KEYDOWN) ? modstate | DFH_MOD_CTRL : modstate & ~DFH_MOD_CTRL;
-        else if (ke->ksym.sym == SDL::K_LALT || ke->ksym.sym == SDL::K_RALT)
-            modstate = (ev->type == SDL::ET_KEYDOWN) ? modstate | DFH_MOD_ALT : modstate & ~DFH_MOD_ALT;
-        else if(ke->state == SDL::BTN_PRESSED && !hotkey_states[ke->ksym.sym])
-        {
-            hotkey_states[ke->ksym.sym] = true;
-
-            // Use unicode so Windows gives the correct value for the
-            // user's Input Language
-            if(ke->ksym.unicode && ((ke->ksym.unicode & 0xff80) == 0))
-            {
-                int key = UnicodeAwareSym(*ke);
-                SelectHotkey(key, modstate);
-            }
-            else
-            {
-                // Pretend non-ascii characters don't happen:
-                SelectHotkey(ke->ksym.sym, modstate);
+    if (ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP) {
+        auto &ke = ev->key;
+        auto &sym = ke.keysym.sym;
+
+        if (sym == SDLK_LSHIFT || sym == SDLK_RSHIFT)
+            modstate = (ev->type == SDL_KEYDOWN) ? modstate | DFH_MOD_SHIFT : modstate & ~DFH_MOD_SHIFT;
+        else if (sym == SDLK_LCTRL || sym == SDLK_RCTRL)
+            modstate = (ev->type == SDL_KEYDOWN) ? modstate | DFH_MOD_CTRL : modstate & ~DFH_MOD_CTRL;
+        else if (sym == SDLK_LALT || sym == SDLK_RALT)
+            modstate = (ev->type == SDL_KEYDOWN) ? modstate | DFH_MOD_ALT : modstate & ~DFH_MOD_ALT;
+        else if (ke.state == SDL_PRESSED && !hotkey_states[sym])
+        {
+            // the check against hotkey_states[sym] ensures we only process keybindings once per keypress
+            DEBUG(keybinding).print("key down: sym=%d (%c)\n", sym, sym);
+            bool handled = SelectHotkey(sym, modstate);
+            if (handled) {
+                hotkey_states[sym] = true;
+                if (modstate & (DFH_MOD_CTRL | DFH_MOD_ALT)) {
+                    DEBUG(keybinding).print("modifier key detected; not inhibiting SDL key down event\n");
+                    return false;
+                }
+                DEBUG(keybinding).print("%sinhibiting SDL key down event\n",
+                    suppress_duplicate_keyboard_events ? "" : "not ");
+                return suppress_duplicate_keyboard_events;
             }
         }
-        else if(ke->state == SDL::BTN_RELEASED)
+        else if (ke.state == SDL_RELEASED)
         {
-            hotkey_states[ke->ksym.sym] = false;
+            DEBUG(keybinding).print("key up: sym=%d (%c)\n", sym, sym);
+            hotkey_states[sym] = false;
         }
     }
-    return true;
-    // do stuff with the events...
+    else if (ev->type == SDL_TEXTINPUT) {
+        auto &te = ev->text;
+        DEBUG(keybinding).print("text input: '%s' (modifiers: %s%s%s)\n",
+            te.text,
+            modstate & DFH_MOD_SHIFT ? "Shift" : "",
+            modstate & DFH_MOD_CTRL ? "Ctrl" : "",
+            modstate & DFH_MOD_ALT ? "Alt" : "");
+        if (strlen(te.text) == 1 && hotkey_states[te.text[0]]) {
+            DEBUG(keybinding).print("%sinhibiting SDL text event\n",
+                suppress_duplicate_keyboard_events ? "" : "not ");
+            return suppress_duplicate_keyboard_events;
+        }
+    }
+
+    return false;
 }
 
 bool Core::SelectHotkey(int sym, int modifiers)
 {
     // Find the topmost viewscreen
-    if (!df::global::gview || !df::global::ui)
+    if (!df::global::gview || !df::global::plotinfo)
         return false;
 
     df::viewscreen *screen = &df::global::gview->view;
     while (screen->child)
         screen = screen->child;
 
-    if (sym == SDL::K_KP_ENTER)
-        sym = SDL::K_RETURN;
+    if (sym == SDLK_KP_ENTER)
+        sym = SDLK_RETURN;
 
     std::string cmd;
 
-    DEBUG(keybinding).print("checking hotkeys for sym=%d, modifiers=%x\n", sym, modifiers);
+    DEBUG(keybinding).print("checking hotkeys for sym=%d (%c), modifiers=%x\n", sym, sym, modifiers);
 
     {
         std::lock_guard<std::mutex> lock(HotkeyMutex);
@@ -2432,11 +2470,13 @@ bool Core::SelectHotkey(int sym, int modifiers)
                                         binding.modifiers, modifiers);
                 continue;
             }
-            string focusString = Gui::getFocusString(screen);
-            if (!binding.focus.empty() && !prefix_matches(binding.focus, focusString)) {
-                DEBUG(keybinding).print("skipping keybinding due to focus string mismatch: '%s' !~ '%s'\n",
-                                        focusString.c_str(), binding.focus.c_str());
-                continue;
+            if (!binding.focus.empty()) {
+                if (!Gui::matchFocusString(binding.focus)) {
+                    std::vector<std::string> focusStrings = Gui::getCurFocus(true);
+                    DEBUG(keybinding).print("skipping keybinding due to focus string mismatch: '%s' !~ '%s'\n",
+                        join_strings(", ", focusStrings).c_str(), binding.focus.c_str());
+                    continue;
+                }
             }
             if (!plug_mgr->CanInvokeHotkey(binding.command[0], screen)) {
                 DEBUG(keybinding).print("skipping keybinding due to hotkey guard rejection (command: '%s')\n",
@@ -2451,7 +2491,7 @@ bool Core::SelectHotkey(int sym, int modifiers)
 
         if (cmd.empty()) {
             // Check the hotkey keybindings
-            int idx = sym - SDL::K_F1;
+            int idx = sym - SDLK_F1;
             if(idx >= 0 && idx < 8)
             {
 /* TODO: understand how this changes for v50
@@ -2459,10 +2499,10 @@ bool Core::SelectHotkey(int sym, int modifiers)
                     idx += 8;
 
                 if (strict_virtual_cast<df::viewscreen_dwarfmodest>(screen) &&
-                    df::global::ui->main.mode != ui_sidebar_mode::Hotkeys &&
-                    df::global::ui->main.hotkeys[idx].cmd == df::ui_hotkey::T_cmd::None)
+                    df::global::plotinfo->main.mode != ui_sidebar_mode::Hotkeys &&
+                    df::global::plotinfo->main.hotkeys[idx].cmd == df::ui_hotkey::T_cmd::None)
                 {
-                    cmd = df::global::ui->main.hotkeys[idx].name;
+                    cmd = df::global::plotinfo->main.hotkeys[idx].name;
                 }
 */
             }
@@ -2509,22 +2549,22 @@ static bool parseKeySpec(std::string keyspec, int *psym, int *pmod, std::string
     }
 
     if (keyspec.size() == 1 && keyspec[0] >= 'A' && keyspec[0] <= 'Z') {
-        *psym = SDL::K_a + (keyspec[0]-'A');
+        *psym = SDLK_a + (keyspec[0]-'A');
         return true;
     } else if (keyspec.size() == 1 && keyspec[0] == '`') {
-        *psym = SDL::K_BACKQUOTE;
+        *psym = SDLK_BACKQUOTE;
         return true;
     } else if (keyspec.size() == 1 && keyspec[0] >= '0' && keyspec[0] <= '9') {
-        *psym = SDL::K_0 + (keyspec[0]-'0');
+        *psym = SDLK_0 + (keyspec[0]-'0');
         return true;
     } else if (keyspec.size() == 2 && keyspec[0] == 'F' && keyspec[1] >= '1' && keyspec[1] <= '9') {
-        *psym = SDL::K_F1 + (keyspec[1]-'1');
+        *psym = SDLK_F1 + (keyspec[1]-'1');
         return true;
     } else if (keyspec.size() == 3 && keyspec.substr(0, 2) == "F1" && keyspec[2] >= '0' && keyspec[2] <= '2') {
-        *psym = SDL::K_F10 + (keyspec[2]-'0');
+        *psym = SDLK_F10 + (keyspec[2]-'0');
         return true;
     } else if (keyspec == "Enter") {
-        *psym = SDL::K_RETURN;
+        *psym = SDLK_RETURN;
         return true;
     } else
         return false;
@@ -2655,8 +2695,8 @@ bool Core::RunAlias(color_ostream &out, const std::string &name,
         return false;
     }
 
-    const string &first = aliases[name][0];
-    vector<string> parts(aliases[name].begin() + 1, aliases[name].end());
+    const std::string &first = aliases[name][0];
+    std::vector<std::string> parts(aliases[name].begin() + 1, aliases[name].end());
     parts.insert(parts.end(), parameters.begin(), parameters.end());
     result = runCommand(out, first, parts);
     return true;
@@ -2668,13 +2708,14 @@ std::map<std::string, std::vector<std::string>> Core::ListAliases()
     return aliases;
 }
 
-std::string Core::GetAliasCommand(const std::string &name, const std::string &default_)
+std::string Core::GetAliasCommand(const std::string &name, bool ignore_params)
 {
     std::lock_guard<std::recursive_mutex> lock(alias_mutex);
-    if (IsAlias(name))
-        return join_strings(" ", aliases[name]);
-    else
-        return default_;
+    if (!IsAlias(name) || aliases[name].empty())
+        return name;
+    if (ignore_params)
+        return aliases[name][0];
+    return join_strings(" ", aliases[name]);
 }
 
 /////////////////
diff --git a/library/DFHackVersion.cpp b/library/DFHackVersion.cpp
index 7746ebece..42aac251e 100644
--- a/library/DFHackVersion.cpp
+++ b/library/DFHackVersion.cpp
@@ -1,6 +1,8 @@
 #define NO_DFHACK_VERSION_MACROS
 #include "DFHackVersion.h"
 #include "git-describe.h"
+#include <string>
+
 namespace DFHack {
     namespace Version {
         int dfhack_abi_version()
@@ -27,9 +29,10 @@ namespace DFHack {
         {
             return DFHACK_GIT_DESCRIPTION;
         }
-        const char *git_commit()
+        const char* git_commit(bool short_hash)
         {
-            return DFHACK_GIT_COMMIT;
+            static std::string shorty(DFHACK_GIT_COMMIT, 0, 7);
+            return short_hash ? shorty.c_str() : DFHACK_GIT_COMMIT;
         }
         const char *git_xml_commit()
         {
diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp
index f376edc6a..cd261d50f 100644
--- a/library/DataDefs.cpp
+++ b/library/DataDefs.cpp
@@ -213,12 +213,12 @@ std::string pointer_identity::getFullName()
 
 std::string container_identity::getFullName(type_identity *item)
 {
-    return "<" + (item ? item->getFullName() : std::string("void")) + ">";
+    return '<' + (item ? item->getFullName() : std::string("void")) + '>';
 }
 
 std::string ptr_container_identity::getFullName(type_identity *item)
 {
-    return "<" + (item ? item->getFullName() : std::string("void")) + "*>";
+    return '<' + (item ? item->getFullName() : std::string("void")) + std::string("*>");
 }
 
 std::string bit_container_identity::getFullName(type_identity *)
diff --git a/library/DataStaticsFields.cpp b/library/DataIdentity.cpp
similarity index 60%
rename from library/DataStaticsFields.cpp
rename to library/DataIdentity.cpp
index 8318b523d..c041b009d 100644
--- a/library/DataStaticsFields.cpp
+++ b/library/DataIdentity.cpp
@@ -1,24 +1,26 @@
 #include <stddef.h>
 
+#include <condition_variable>
 #include <fstream>
-
-#ifndef STATIC_FIELDS_GROUP
-#include "DataDefs.h"
-#endif
+#include <mutex>
+#include <string>
+#include <vector>
 
 #include "DataFuncs.h"
+#include "DataIdentity.h"
 
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Winvalid-offsetof"
-#endif
+// the space after the uses of "type" in OPAQUE_IDENTITY_TRAITS_NAME is _required_
+// without it the macro generates a syntax error when type is a template specification
 
 namespace df {
 #define NUMBER_IDENTITY_TRAITS(category, type, name) \
     category##_identity<type> identity_traits<type>::identity(name);
 #define INTEGER_IDENTITY_TRAITS(type, name) NUMBER_IDENTITY_TRAITS(integer, type, name)
 #define FLOAT_IDENTITY_TRAITS(type) NUMBER_IDENTITY_TRAITS(float, type, #type)
+#define OPAQUE_IDENTITY_TRAITS_NAME(type, name) \
+    opaque_identity identity_traits<type >::identity(sizeof(type), allocator_noassign_fn<type >, name)
+#define STL_OPAQUE_IDENTITY_TRAITS(type) OPAQUE_IDENTITY_TRAITS_NAME(std::type, #type)
 
-#ifndef STATIC_FIELDS_GROUP
     INTEGER_IDENTITY_TRAITS(char,               "char");
     INTEGER_IDENTITY_TRAITS(signed char,        "int8_t");
     INTEGER_IDENTITY_TRAITS(unsigned char,      "uint8_t");
@@ -42,25 +44,12 @@ namespace df {
     stl_bit_vector_identity identity_traits<std::vector<bool> >::identity;
     bit_array_identity identity_traits<BitArray<int> >::identity;
 
-    static void *fstream_allocator_fn(void *out, const void *in) {
-        if (out) { /* *(T*)out = *(const T*)in;*/ return NULL; }
-        else if (in) { delete (std::fstream*)in; return (std::fstream*)in; }
-        else return new std::fstream();
-    }
-    opaque_identity identity_traits<std::fstream>::identity(
-        sizeof(std::fstream), fstream_allocator_fn, "fstream");
+    STL_OPAQUE_IDENTITY_TRAITS(condition_variable);
+    STL_OPAQUE_IDENTITY_TRAITS(fstream);
+    STL_OPAQUE_IDENTITY_TRAITS(mutex);
+    STL_OPAQUE_IDENTITY_TRAITS(future<void>);
+    STL_OPAQUE_IDENTITY_TRAITS(function<void()>);
+    STL_OPAQUE_IDENTITY_TRAITS(optional<std::function<void()> >);
 
     buffer_container_identity buffer_container_identity::base_instance;
-#endif
-#undef NUMBER_IDENTITY_TRAITS
-#undef INTEGER_IDENTITY_TRAITS
-#undef FLOAT_IDENTITY_TRAITS
 }
-
-#define TID(type) (&identity_traits< type >::identity)
-
-#define FLD(mode, name) struct_field_info::mode, #name, offsetof(CUR_STRUCT, name)
-#define GFLD(mode, name) struct_field_info::mode, #name, (size_t)&df::global::name
-#define METHOD(mode, name) struct_field_info::mode, #name, 0, wrap_function(&CUR_STRUCT::name)
-#define METHOD_N(mode, func, name) struct_field_info::mode, #name, 0, wrap_function(&CUR_STRUCT::func)
-#define FLD_END struct_field_info::END
diff --git a/library/DataStatics.cpp b/library/DataStatics.cpp
index 275cae584..fe60e5454 100644
--- a/library/DataStatics.cpp
+++ b/library/DataStatics.cpp
@@ -6,7 +6,7 @@
 
 #include "df/world.h"
 #include "df/world_data.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 
 #include "DataIdentity.h"
 
diff --git a/library/Debug.cpp b/library/Debug.cpp
index 9b13af168..dafbeb5ce 100644
--- a/library/Debug.cpp
+++ b/library/Debug.cpp
@@ -26,6 +26,7 @@ redistribute it freely, subject to the following restrictions:
 #include "Debug.h"
 #include "DebugManager.h"
 
+#include <algorithm>
 #include <chrono>
 #include <iomanip>
 #include <thread>
diff --git a/library/Hooks-darwin.cpp b/library/Hooks-darwin.cpp
deleted file mode 100644
index 418cf5472..000000000
--- a/library/Hooks-darwin.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-
-#include <stdio.h>
-#include <dlfcn.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/shm.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <vector>
-#include <string>
-#include <map>
-
-typedef struct interpose_s
-{
-  void *new_func;
-  void *orig_func;
-} interpose_t;
-
-#include "DFHack.h"
-#include "Core.h"
-#include "Hooks.h"
-#include "SDL_events.h"
-#include <iostream>
-
-/*static const interpose_t interposers[] __attribute__ ((section("__DATA, __interpose"))) =
-{
-     { (void *)DFH_SDL_Init,  (void *)SDL_Init  },
-     { (void *)DFH_SDL_PollEvent, (void *)SDL_PollEvent },
-     { (void *)DFH_SDL_Quit, (void *)SDL_Quit },
-     { (void *)DFH_SDL_NumJoysticks, (void *)SDL_NumJoysticks },
-
-};*/
-
-#define DYLD_INTERPOSE(_replacement,_replacee) \
-    __attribute__((used)) static struct{ const void* replacment; const void* replacee; } \
-    _interpose_##_replacee __attribute__ ((section ("__DATA,__interpose"))) = \
-    { (const void*)(unsigned long)&_replacement, (const void*)(unsigned long)&_replacee };
-
-DYLD_INTERPOSE(DFH_SDL_Init,SDL_Init);
-DYLD_INTERPOSE(DFH_SDL_PollEvent,SDL_PollEvent);
-DYLD_INTERPOSE(DFH_SDL_Quit,SDL_Quit);
-DYLD_INTERPOSE(DFH_SDL_NumJoysticks,SDL_NumJoysticks);
-DYLD_INTERPOSE(DFH_wgetch,wgetch);
-
-/*******************************************************************************
-*                           SDL part starts here                               *
-*******************************************************************************/
-
-#define SDL_APPMOUSEFOCUS       0x01            /**< The app has mouse coverage */
-#define SDL_APPINPUTFOCUS       0x02            /**< The app has input focus */
-#define SDL_APPACTIVE           0x04            /**< The application is active */
-static uint8_t (*_SDL_GetAppState)(void) = 0;
-DFhackCExport uint8_t SDL_GetAppState(void)
-{
-    return _SDL_GetAppState();
-}
-
-// hook - called for each game tick (or more often)
-DFhackCExport int DFH_SDL_NumJoysticks(void)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    return c.Update();
-}
-
-// hook - called at program exit
-static void (*_SDL_Quit)(void) = 0;
-DFhackCExport void DFH_SDL_Quit(void)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    c.Shutdown();
-
-    SDL_Quit();
-}
-
-// called by DF to check input events
-static int (*_SDL_PollEvent)(SDL::Event* event) = 0;
-DFhackCExport int DFH_SDL_PollEvent(SDL::Event* event)
-{
-    pollevent_again:
-    // if SDL returns 0 here, it means there are no more events. return 0
-    int orig_return = SDL_PollEvent(event);
-    if(!orig_return || (!(SDL_GetAppState() & SDL_APPINPUTFOCUS) &&
-            (event->type == SDL::ET_KEYDOWN || event->type == SDL::ET_KEYUP)))
-        return 0;
-    // otherwise we have an event to filter
-    else if( event != 0 )
-    {
-        DFHack::Core & c = DFHack::Core::getInstance();
-        // if we consume the event, ask SDL for more.
-        if(!c.DFH_SDL_Event(event))
-            goto pollevent_again;
-    }
-    return orig_return;
-}
-
-static int (*_SDL_PushEvent)(SDL::Event* event) = 0;
-DFhackCExport int SDL_PushEvent(SDL::Event* event)
-{
-    return _SDL_PushEvent(event);
-}
-
-struct WINDOW;
-DFhackCExport int DFH_wgetch(WINDOW *win)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    wgetch_again:
-    int in = wgetch(win);
-    int out;
-    if(c.ncurses_wgetch(in, out))
-    {
-        // not consumed, give to DF
-        return out;
-    }
-    else
-    {
-        // consumed, repeat
-        goto wgetch_again;
-    }
-}
-
-void dlsym_bind_or_exit(void **target, const char *name)
-{
-    void *sym = dlsym(RTLD_NEXT, name);
-    if (sym)
-    {
-        if (*target && *target != sym)
-        {
-            fprintf(stderr, "warning: rebinding symbol %s from %p to %p\n",
-                name, *target, sym);
-        }
-        *target = sym;
-    }
-    else
-    {
-        fprintf(stderr, "Fatal: Could not find symbol: %s\n", name);
-        fprintf(stdout, "dfhack: something went horribly wrong\n"
-            "Check stderr.log for details\n");
-        exit(1);
-    }
-}
-
-
-// New SDL functions starting in r5
-static vPtr (*_SDL_CreateRGBSurface)(uint32_t flags, int width, int height, int depth,
-                                     uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = 0;
-DFhackCExport vPtr SDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth,
-                                     uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask)
-{
-    return _SDL_CreateRGBSurface(flags, width, height, depth, Rmask, Gmask, Bmask, Amask);
-}
-
-static vPtr (*_SDL_CreateRGBSurfaceFrom)(vPtr pixels, int width, int height, int depth, int pitch,
-                                         uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = 0;
-DFhackCExport vPtr SDL_CreateRGBSurfaceFrom(vPtr pixels, int width, int height, int depth, int pitch,
-                                         uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask)
-{
-    return _SDL_CreateRGBSurfaceFrom(pixels, width, height, depth, pitch, Rmask, Gmask, Bmask, Amask);
-}
-
-static void (*_SDL_FreeSurface)(vPtr surface) = 0;
-DFhackCExport void SDL_FreeSurface(vPtr surface)
-{
-    _SDL_FreeSurface(surface);
-}
-
-static vPtr (*_SDL_ConvertSurface)(vPtr surface, vPtr format, uint32_t flags) = 0;
-DFhackCExport vPtr SDL_ConvertSurface(vPtr surface, vPtr format, uint32_t flags)
-{
-    return _SDL_ConvertSurface(surface, format, flags);
-}
-
-static int (*_SDL_LockSurface)(vPtr surface) = 0;
-DFhackCExport int SDL_LockSurface(vPtr surface)
-{
-    return _SDL_LockSurface(surface);
-}
-
-static void (*_SDL_UnlockSurface)(vPtr surface) = 0;
-DFhackCExport void SDL_UnlockSurface(vPtr surface)
-{
-    _SDL_UnlockSurface(surface);
-}
-
-static uint8_t (*_SDL_GetMouseState)(int *, int *) = 0;
-DFhackCExport uint8_t SDL_GetMouseState(int *x, int *y)
-{
-    return _SDL_GetMouseState(x,y);
-}
-
-static void * (*_SDL_GetVideoSurface)( void ) = 0;
-DFhackCExport void * SDL_GetVideoSurface(void)
-{
-    return _SDL_GetVideoSurface();
-}
-
-static int (*_SDL_UpperBlit)(DFHack::DFSDL_Surface* src, DFHack::DFSDL_Rect* srcrect, DFHack::DFSDL_Surface* dst, DFHack::DFSDL_Rect* dstrect) = 0;
-DFhackCExport int SDL_UpperBlit(DFHack::DFSDL_Surface* src, DFHack::DFSDL_Rect* srcrect, DFHack::DFSDL_Surface* dst, DFHack::DFSDL_Rect* dstrect)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    if ( c.isValid() && dstrect != NULL && dstrect->h != 0 && dstrect->w != 0 )
-    {
-        DFHack::Graphic* g = c.getGraphic();
-        DFHack::DFTileSurface* ov = g->Call(dstrect->x/dstrect->w, dstrect->y/dstrect->h);
-
-        if ( ov != NULL )
-        {
-            if ( ov->paintOver )
-            {
-                _SDL_UpperBlit(src, srcrect, dst, dstrect);
-            }
-
-            DFHack::DFSDL_Rect* dstrect2 = new DFHack::DFSDL_Rect;
-            dstrect2->x = dstrect->x;
-            dstrect2->y = dstrect->y;
-            dstrect2->w = dstrect->w;
-            dstrect2->h = dstrect->h;
-
-            if ( ov->dstResize != NULL )
-            {
-                DFHack::DFSDL_Rect* r = (DFHack::DFSDL_Rect*)ov->dstResize;
-                dstrect2->x += r->x;
-                dstrect2->y += r->y;
-                dstrect2->w += r->w;
-                dstrect2->h += r->h;
-            }
-
-            int result = _SDL_UpperBlit(ov->surface, ov->rect, dst, dstrect2);
-            delete dstrect2;
-            return result;
-        }
-    }
-
-    return _SDL_UpperBlit(src, srcrect, dst, dstrect);
-}
-
-static int (*_SDL_SemWait)(vPtr) = 0;
-DFhackCExport int SDL_SemWait(vPtr sem)
-{
-    return _SDL_SemWait(sem);
-}
-
-static int (*_SDL_SemPost)(vPtr) = 0;
-DFhackCExport int SDL_SemPost(vPtr sem)
-{
-    return _SDL_SemPost(sem);
-}
-
-// hook - called at program start, initialize some stuffs we'll use later
-static int (*_SDL_Init)(uint32_t flags) = 0;
-DFhackCExport int DFH_SDL_Init(uint32_t flags)
-{
-    // reroute stderr
-    fprintf(stderr,"dfhack: attempting to hook in\n");
-    // we don't reroute stdout until  we figure out if this should be done at all
-    // See: Console-posix.cpp
-
-    // find real functions
-    fprintf(stderr,"dfhack: saving real SDL functions\n");
-
-    #define bind(sym) dlsym_bind_or_exit((void**)&_##sym, #sym)
-    bind(SDL_Init);
-    bind(SDL_Quit);
-    bind(SDL_PollEvent);
-    bind(SDL_PushEvent);
-
-    bind(SDL_UpperBlit);
-    bind(SDL_CreateRGBSurface);
-    bind(SDL_CreateRGBSurfaceFrom);
-    bind(SDL_FreeSurface);
-    bind(SDL_ConvertSurface);
-    bind(SDL_LockSurface);
-    bind(SDL_UnlockSurface);
-    bind(SDL_GetMouseState);
-    bind(SDL_GetVideoSurface);
-
-    bind(SDL_SemWait);
-    bind(SDL_SemPost);
-    bind(SDL_GetAppState);
-    #undef bind
-
-    fprintf(stderr, "dfhack: saved real SDL functions\n");
-    assert(_SDL_Init && _SDL_Quit && _SDL_PollEvent);
-    fprintf(stderr, "dfhack: hooking successful\n");
-
-    // prevent any subprocesses from trying to load libdfhack.dylib
-    setenv("DYLD_INSERT_LIBRARIES", "", 1);
-
-    int ret = SDL_Init(flags);
-    return ret;
-}
diff --git a/library/Hooks-linux.cpp b/library/Hooks-linux.cpp
deleted file mode 100644
index 7a0cdf947..000000000
--- a/library/Hooks-linux.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-
-#include <stdio.h>
-#include <dlfcn.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/shm.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <vector>
-#include <string>
-#include <map>
-
-#include "DFHack.h"
-#include "Core.h"
-#include "Hooks.h"
-#include <iostream>
-
-/*******************************************************************************
-*                           SDL part starts here                               *
-*******************************************************************************/
-// hook - called for each game tick (or more often)
-DFhackCExport int SDL_NumJoysticks(void)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    return c.Update();
-}
-
-// hook - called at program exit
-static void (*_SDL_Quit)(void) = 0;
-DFhackCExport void SDL_Quit(void)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    c.Shutdown();
-    if(_SDL_Quit)
-    {
-        _SDL_Quit();
-    }
-}
-
-// called by DF to check input events
-static int (*_SDL_PollEvent)(SDL::Event* event) = 0;
-DFhackCExport int SDL_PollEvent(SDL::Event* event)
-{
-    pollevent_again:
-    // if SDL returns 0 here, it means there are no more events. return 0
-    int orig_return = _SDL_PollEvent(event);
-    if(!orig_return)
-        return 0;
-    // otherwise we have an event to filter
-    else if( event != 0 )
-    {
-        DFHack::Core & c = DFHack::Core::getInstance();
-        // if we consume the event, ask SDL for more.
-        if(!c.DFH_SDL_Event(event))
-            goto pollevent_again;
-    }
-    return orig_return;
-}
-
-struct WINDOW;
-DFhackCExport int wgetch(WINDOW *win)
-{
-    if (getenv("DFHACK_HEADLESS"))
-    {
-        return 0;
-    }
-    static int (*_wgetch)(WINDOW * win) = (int (*)( WINDOW * )) dlsym(RTLD_NEXT, "wgetch");
-    if(!_wgetch)
-    {
-        exit(EXIT_FAILURE);
-    }
-    DFHack::Core & c = DFHack::Core::getInstance();
-    wgetch_again:
-    int in = _wgetch(win);
-    int out;
-    if(c.ncurses_wgetch(in, out))
-    {
-        // not consumed, give to DF
-        return out;
-    }
-    else
-    {
-        // consumed, repeat
-        goto wgetch_again;
-    }
-}
-
-// hook - called at program start, initialize some stuffs we'll use later
-static int (*_SDL_Init)(uint32_t flags) = 0;
-DFhackCExport int SDL_Init(uint32_t flags)
-{
-    // find real functions
-    _SDL_Init = (int (*)( uint32_t )) dlsym(RTLD_NEXT, "SDL_Init");
-    _SDL_Quit = (void (*)( void )) dlsym(RTLD_NEXT, "SDL_Quit");
-    _SDL_PollEvent = (int (*)(SDL::Event*))dlsym(RTLD_NEXT,"SDL_PollEvent");
-
-    // check if we got them
-    if(_SDL_Init && _SDL_Quit && _SDL_PollEvent)
-    {
-        fprintf(stderr,"dfhack: hooking successful\n");
-    }
-    else
-    {
-        // bail, this would be a disaster otherwise
-        fprintf(stderr,"dfhack: something went horribly wrong\n");
-        exit(1);
-    }
-
-    int ret = _SDL_Init(flags);
-    return ret;
-}
diff --git a/library/Hooks-windows.cpp b/library/Hooks-windows.cpp
deleted file mode 100644
index d3f39b969..000000000
--- a/library/Hooks-windows.cpp
+++ /dev/null
@@ -1,838 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#define DFhackCExport extern "C" __declspec(dllexport)
-
-#include <windows.h>
-#include <stdint.h>
-#include <mutex>
-#include <vector>
-#include <string>
-#include "Core.h"
-#include "Hooks.h"
-#include <stdio.h>
-
-#include "tinythread.h"
-#include "modules/Graphic.h"
-
-/*************************************************************************/
-// extremely boring wrappers beyond this point. Only fix when broken
-
-// we don't know which of the SDL functions will be called first... so we
-// just catch the first one and init all our function pointers at that time
-static void InitSDLPointers(void);
-static std::once_flag inited;
-
-/// wrappers for SDL 1.2 functions used in 40d16
-/***** Condition variables
-
-SDL_CreateCond
-    SDL_cond * SDLCALL SDL_CreateCond(void);
-SDL_CondSignal
-    int SDLCALL SDL_CondSignal(SDL_cond *cond);
-SDL_CondWait
-    int SDLCALL SDL_CondWait(SDL_cond *cond, SDL_mutex *mut);
-SDL_DestroyCond
-    void SDLCALL SDL_DestroyCond(SDL_cond *cond);
-*/
-static vPtr (*_SDL_CreateCond)() = 0;
-DFhackCExport vPtr SDL_CreateCond()
-{
-    return _SDL_CreateCond();
-}
-
-static int (*_SDL_CondSignal)( vPtr ) = 0;
-DFhackCExport int SDL_CondSignal( vPtr cond )
-{
-    return _SDL_CondSignal(cond);
-}
-
-static int (*_SDL_CondWait)( vPtr,vPtr ) = 0;
-DFhackCExport int SDL_CondWait( vPtr cond, vPtr mutex )
-{
-    return _SDL_CondWait(cond, mutex);
-}
-
-static void (*_SDL_DestroyCond)( vPtr ) = 0;
-DFhackCExport void SDL_DestroyCond( vPtr cond )
-{
-    _SDL_DestroyCond(cond);
-}
-
-/***** mutexes
-
-SDL_CreateMutex
-    SDL_mutex * SDLCALL SDL_CreateMutex(void);
-SDL_mutexP
-    int SDLCALL SDL_mutexP(SDL_mutex *mutex);
-SDL_DestroyMutex
-    void SDLCALL SDL_DestroyMutex(SDL_mutex *mutex);
-*/
-static vPtr (*_SDL_CreateMutex)(void) = 0;
-DFhackCExport vPtr SDL_CreateMutex(void)
-{
-    return _SDL_CreateMutex();
-}
-
-static int (*_SDL_mutexP)(vPtr mutex) = 0;
-DFhackCExport int SDL_mutexP(vPtr mutex)
-{
-    return _SDL_mutexP(mutex);
-}
-
-static int (*_SDL_mutexV)(vPtr mutex) = 0;
-DFhackCExport int SDL_mutexV(vPtr mutex)
-{
-    return _SDL_mutexV(mutex);
-}
-
-static void (*_SDL_DestroyMutex)(vPtr mutex) = 0;
-DFhackCExport void SDL_DestroyMutex(vPtr mutex)
-{
-    _SDL_DestroyMutex(mutex);
-}
-
-
-/***** timers
-
-SDL_AddTimer
-    SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, SDL_NewTimerCallback callback, void *param);
-SDL_RemoveTimer
-    SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID t);
-SDL_GetTicks
-    Uint32 SDLCALL SDL_GetTicks(void);
-*/
-static vPtr (*_SDL_AddTimer)(uint32_t interval, fPtr callback, vPtr param) = 0;
-DFhackCExport vPtr SDL_AddTimer(uint32_t interval, fPtr callback, vPtr param)
-{
-    return _SDL_AddTimer(interval, callback, param);
-}
-
-static bool (*_SDL_RemoveTimer)(vPtr timer) = 0;
-DFhackCExport bool SDL_RemoveTimer(vPtr timer)
-{
-    return _SDL_RemoveTimer(timer);
-}
-
-static uint32_t (*_SDL_GetTicks)(void) = 0;
-DFhackCExport uint32_t SDL_GetTicks(void)
-{
-    return _SDL_GetTicks();
-}
-
-/***** Surfaces
-SDL_CreateRGBSurface
-    SDL_Surface * SDLCALL SDL_CreateRGBSurface
-        (Uint32 flags, int width, int height, int depth,
-        Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-
-SDL_CreateRGBSurfaceFrom
-    SDL_Surface * SDLCALL SDL_CreateRGBSurfaceFrom
-        (void *pixels, int width, int height, int depth, int pitch,
-        Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-
-SDL_FreeSurface
-    void SDLCALL SDL_FreeSurface(SDL_Surface *surface);
-
-SDL_ConvertSurface
-    SDL_Surface * SDLCALL SDL_ConvertSurface
-        (SDL_Surface *src, SDL_PixelFormat *fmt, Uint32 flags);
-
-SDL_LockSurface
-    int SDLCALL SDL_LockSurface(SDL_Surface *surface);
-
-SDL_UnlockSurface
-    void SDLCALL SDL_UnlockSurface(SDL_Surface *surface);
-*/
-
-static vPtr (*_SDL_CreateRGBSurface)(uint32_t flags, int width, int height, int depth,
-                                     uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = 0;
-DFhackCExport vPtr SDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth,
-                                     uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask)
-{
-    return _SDL_CreateRGBSurface(flags, width, height, depth, Rmask, Gmask, Bmask, Amask);
-}
-
-static vPtr (*_SDL_CreateRGBSurfaceFrom)(vPtr pixels, int width, int height, int depth, int pitch,
-                                         uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = 0;
-DFhackCExport vPtr SDL_CreateRGBSurfaceFrom(vPtr pixels, int width, int height, int depth, int pitch,
-                                         uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask)
-{
-    return _SDL_CreateRGBSurfaceFrom(pixels, width, height, depth, pitch, Rmask, Gmask, Bmask, Amask);
-}
-
-static void (*_SDL_FreeSurface)(vPtr surface) = 0;
-DFhackCExport void SDL_FreeSurface(vPtr surface)
-{
-    _SDL_FreeSurface(surface);
-}
-
-static vPtr (*_SDL_ConvertSurface)(vPtr surface, vPtr format, uint32_t flags) = 0;
-DFhackCExport vPtr SDL_ConvertSurface(vPtr surface, vPtr format, uint32_t flags)
-{
-    return _SDL_ConvertSurface(surface, format, flags);
-}
-
-static int (*_SDL_LockSurface)(vPtr surface) = 0;
-DFhackCExport int SDL_LockSurface(vPtr surface)
-{
-    return _SDL_LockSurface(surface);
-}
-
-static void (*_SDL_UnlockSurface)(vPtr surface) = 0;
-DFhackCExport void SDL_UnlockSurface(vPtr surface)
-{
-    _SDL_UnlockSurface(surface);
-}
-
-/***** More surface stuff
-SDL_MapRGB
-     Uint32 SDLCALL SDL_MapRGB
-        (const SDL_PixelFormat * const format, const Uint8 r, const Uint8 g, const Uint8 b);
-
-SDL_SaveBMP_RW
-    int SDLCALL SDL_SaveBMP_RW
-        (SDL_Surface *surface, SDL_RWops *dst, int freedst);
-
-SDL_SetAlpha
-    int SDLCALL SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha);
-
-SDL_SetColorKey
-    int SDLCALL SDL_SetColorKey(SDL_Surface *surface, Uint32 flag, Uint32 key);
-
-SDL_GetVideoInfo
-    const SDL_VideoInfo * SDLCALL SDL_GetVideoInfo(void);
-
-SDL_SetVideoMode
-    SDL_Surface * SDLCALL SDL_SetVideoMode
-        (int width, int height, int bpp, Uint32 flags);
-
-SDL_UpperBlit
-    int SDLCALL SDL_UpperBlit
-        (SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect);
-*/
-
-static uint32_t (*_SDL_MapRGB)(vPtr pixelformat, uint8_t r, uint8_t g, uint8_t b) = 0;
-DFhackCExport uint32_t SDL_MapRGB(vPtr pixelformat, uint8_t r, uint8_t g, uint8_t b)
-{
-    return _SDL_MapRGB(pixelformat,r,g,b);
-}
-
-static int (*_SDL_SaveBMP_RW)(vPtr surface, vPtr dst, int freedst) = 0;
-DFhackCExport int SDL_SaveBMP_RW(vPtr surface, vPtr dst, int freedst)
-{
-    return _SDL_SaveBMP_RW(surface,dst,freedst);
-}
-
-static int (*_SDL_SetAlpha)(vPtr surface, uint32_t flag, uint8_t alpha) = 0;
-DFhackCExport int SDL_SetAlpha(vPtr surface, uint32_t flag, uint8_t alpha)
-{
-    return _SDL_SetAlpha(surface,flag,alpha);
-}
-
-static int (*_SDL_SetColorKey)(vPtr surface, uint32_t flag, uint32_t key) = 0;
-DFhackCExport int SDL_SetColorKey(vPtr surface, uint32_t flag, uint32_t key)
-{
-    return _SDL_SetColorKey(surface,flag,key);
-}
-
-static vPtr (*_SDL_GetVideoInfo)(void) = 0;
-DFhackCExport vPtr SDL_GetVideoInfo(void)
-{
-    return _SDL_GetVideoInfo();
-}
-
-static vPtr (*_SDL_SetVideoMode)(int width, int height, int bpp, uint32_t flags) = 0;
-DFhackCExport vPtr SDL_SetVideoMode(int width, int height, int bpp, uint32_t flags)
-{
-    return _SDL_SetVideoMode(width, height, bpp, flags);
-}
-
-static int (*_SDL_UpperBlit)(DFHack::DFSDL_Surface* src, DFHack::DFSDL_Rect* srcrect, DFHack::DFSDL_Surface* dst, DFHack::DFSDL_Rect* dstrect) = 0;
-DFhackCExport int SDL_UpperBlit(DFHack::DFSDL_Surface* src, DFHack::DFSDL_Rect* srcrect, DFHack::DFSDL_Surface* dst, DFHack::DFSDL_Rect* dstrect)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    if ( c.isValid() && dstrect != NULL && dstrect->h != 0 && dstrect->w != 0 )
-    {
-        DFHack::Graphic* g = c.getGraphic();
-        DFHack::DFTileSurface* ov = g->Call(dstrect->x/dstrect->w, dstrect->y/dstrect->h);
-
-        if ( ov != NULL )
-        {
-            if ( ov->paintOver )
-            {
-                _SDL_UpperBlit(src, srcrect, dst, dstrect);
-            }
-
-            DFHack::DFSDL_Rect* dstrect2 = new DFHack::DFSDL_Rect;
-            dstrect2->x = dstrect->x;
-            dstrect2->y = dstrect->y;
-            dstrect2->w = dstrect->w;
-            dstrect2->h = dstrect->h;
-
-            if ( ov->dstResize != NULL )
-            {
-                DFHack::DFSDL_Rect* r = (DFHack::DFSDL_Rect*)ov->dstResize;
-                dstrect2->x += r->x;
-                dstrect2->y += r->y;
-                dstrect2->w += r->w;
-                dstrect2->h += r->h;
-            }
-
-            int result = _SDL_UpperBlit(ov->surface, ov->rect, dst, dstrect2);
-            delete dstrect2;
-            return result;
-        }
-    }
-
-    return _SDL_UpperBlit(src, srcrect, dst, dstrect);
-}
-
-/***** Even more surface
-SDL_GL_GetAttribute
-    int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int* value);
-
-SDL_GL_SetAttribute
-    int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);
-
-SDL_WM_SetCaption
-    void SDLCALL SDL_WM_SetCaption(const char *title, const char *icon);
-
-SDL_WM_SetIcon
-    void SDLCALL SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);
-
-SDL_FillRect
-    int SDLCALL SDL_FillRect(SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color);
-*/
-
-
-static void * (*_SDL_GetVideoSurface)( void ) = 0;
-DFhackCExport void * SDL_GetVideoSurface(void)
-{
-    return _SDL_GetVideoSurface();
-}
-
-static void * (*_SDL_DisplayFormat)( void * surface ) = 0;
-DFhackCExport void * SDL_DisplayFormat(void *surface)
-{
-    return _SDL_DisplayFormat(surface);
-}
-
-// SDL_Surface *SDL_DisplayFormatAlpha(SDL_Surface *surface);
-static void * (*_SDL_DisplayFormatAlpha)( void * surface ) = 0;
-DFhackCExport void * SDL_DisplayFormatAlpha(void *surface)
-{
-    return _SDL_DisplayFormatAlpha(surface);
-}
-
-//void SDL_GetRGBA(Uint32 pixel, SDL_PixelFormat *fmt, Uint8 *r, Uint8 *g, Uint8 *b, Uint8 *a);
-
-static void (*_SDL_GetRGBA)(uint32_t pixel, void * fmt, uint8_t * r, uint8_t * g, uint8_t * b, uint8_t *a) = 0;
-DFhackCExport void SDL_GetRGBA(uint32_t pixel, void * fmt, uint8_t * r, uint8_t * g, uint8_t * b, uint8_t *a)
-{
-    return _SDL_GetRGBA(pixel, fmt, r, g, b, a);
-}
-
-static int (*_SDL_GL_GetAttribute)(int attr, int * value) = 0;
-DFhackCExport int SDL_GL_GetAttribute(int attr, int * value)
-{
-    return _SDL_GL_GetAttribute(attr,value);
-}
-
-static int (*_SDL_GL_SetAttribute)(int attr, int value) = 0;
-DFhackCExport int SDL_GL_SetAttribute(int attr, int value)
-{
-    return _SDL_GL_SetAttribute(attr,value);
-}
-
-static void (*_SDL_WM_SetCaption)(const char *title, const char *icon) = 0;
-DFhackCExport void SDL_WM_SetCaption(const char *title, const char *icon)
-{
-    //_SDL_WM_SetCaption("DwarfHacked the Fortress of Hacks",icon);
-    _SDL_WM_SetCaption(title,icon);
-}
-
-static void (*_SDL_WM_SetIcon)(vPtr icon, uint8_t *mask) = 0;
-DFhackCExport void SDL_WM_SetIcon(vPtr icon, uint8_t *mask)
-{
-    _SDL_WM_SetIcon(icon, mask);
-}
-
-static int (*_SDL_FillRect)(vPtr dst, vPtr dstrect, uint32_t color) = 0;
-DFhackCExport int SDL_FillRect(vPtr dst, vPtr dstrect, uint32_t color)
-{
-    return _SDL_FillRect(dst,dstrect,color);
-}
-
-/***** Events and input
-SDL_EnableKeyRepeat
-    int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
-SDL_EnableUNICODE
-    int SDLCALL SDL_EnableUNICODE(int enable);
-SDL_GetKeyState
-    Uint8 * SDLCALL SDL_GetKeyState(int *numkeys);
-SDL_PollEvent
-    int SDLCALL SDL_PollEvent(SDL_Event *event);
-SDL_PushEvent
-    int SDLCALL SDL_PushEvent(SDL_Event *event);
-*/
-
-static int (*_SDL_EnableKeyRepeat)(int delay, int interval) = 0;
-DFhackCExport int SDL_EnableKeyRepeat(int delay, int interval)
-{
-    return _SDL_EnableKeyRepeat(delay, interval);
-}
-
-static int (*_SDL_EnableUNICODE)(int enable) = 0;
-DFhackCExport int SDL_EnableUNICODE(int enable)
-{
-    if(!enable)
-    {
-        fprintf(stderr, "SDL_EnableUNICODE turned off.  Keybindings may break.\n");
-    }
-    return _SDL_EnableUNICODE(enable);
-}
-
-static uint8_t * (*_SDL_GetKeyState)(int* numkeys) = 0;
-DFhackCExport uint8_t * SDL_GetKeyState(int* numkeys)
-{
-    return _SDL_GetKeyState(numkeys);
-}
-
-// called by DF to check input events
-static int (*_SDL_PollEvent)(SDL::Event* event) = 0;
-DFhackCExport int SDL_PollEvent(SDL::Event* event)
-{
-    pollevent_again:
-    // if SDL returns 0 here, it means there are no more events. return 0
-    int orig_return = _SDL_PollEvent(event);
-    if(!orig_return)
-        return 0;
-    // otherwise we have an event to filter
-    else if( event != 0 )
-    {
-        DFHack::Core & c = DFHack::Core::getInstance();
-        // if we consume the event, ask SDL for more.
-        if(!c.DFH_SDL_Event(event))
-            goto pollevent_again;
-    }
-    return orig_return;
-}
-
-static int (*_SDL_PushEvent)(SDL::Event* event) = 0;
-DFhackCExport int SDL_PushEvent(SDL::Event* event)
-{
-    return _SDL_PushEvent(event);
-}
-
-/***** error handling
-SDL_GetError
-    char * SDLCALL SDL_GetError(void);
-SDL_SetError
-    extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
-SDL_ClearError
-    extern DECLSPEC void SDLCALL SDL_ClearError(void);
-SDL_Error
-    extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
-*/
-
-static char * (*_SDL_GetError)(void) = 0;
-DFhackCExport char * SDL_GetError(void)
-{
-    return _SDL_GetError();
-}
-
-static void (*_SDL_SetError)(const char *fmt, ...) = 0;
-DFhackCExport void SDL_SetError(const char *fmt, ...) Wformat(printf,1,2)
-{
-    char buf[1024];
-    va_list args;
-    va_start(args,fmt);
-    vsnprintf(buf, sizeof(buf) - 1 ,fmt,args);
-    va_end(args);
-    _SDL_SetError(buf);
-}
-
-static void (*_SDL_ClearError)(void) = 0;
-DFhackCExport void SDL_ClearError(void)
-{
-    _SDL_ClearError();
-}
-
-static void (*_SDL_Error)(int code) = 0;
-DFhackCExport void SDL_Error(int code)
-{
-    _SDL_Error(code);
-}
-
-/***** symbol resolution
-SDL_LoadFunction
-    extern DECLSPEC void * SDLCALL SDL_LoadFunction(void *handle, const char *name);
-SDL_LoadObject
-    extern DECLSPEC void * SDLCALL SDL_LoadObject(const char *sofile);
-SDL_UnloadObject
-    extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
-*/
-
-static void * (*_SDL_LoadFunction)(vPtr handle, const char *name) = 0;
-DFhackCExport void * SDL_LoadFunction(vPtr handle, const char *name)
-{
-    return _SDL_LoadFunction(handle, name);
-}
-
-extern "C" static vPtr (*_SDL_LoadObject)(const char *sofile) = 0;
-DFhackCExport vPtr SDL_LoadObject(const char *sofile)
-{
-    return _SDL_LoadObject(sofile);
-}
-
-static void (*_SDL_UnloadObject)(vPtr handle) = 0;
-DFhackCExport void SDL_UnloadObject(vPtr handle)
-{
-    _SDL_UnloadObject(handle);
-}
-
-/***** r/w
-SDL_ReadBE32
-    extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops *src);
-SDL_ReadLE16
-    extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops *src);
-SDL_ReadLE32
-    extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops *src);
-*/
-
-static uint32_t (*_SDL_ReadBE32)(vPtr src) = 0;
-DFhackCExport uint32_t SDL_ReadBE32(vPtr src)
-{
-    return _SDL_ReadBE32(src);
-}
-
-static uint16_t (*_SDL_ReadLE16)(vPtr src) = 0;
-DFhackCExport uint16_t SDL_ReadLE16(vPtr src)
-{
-    return _SDL_ReadLE16(src);
-}
-
-static uint32_t (*_SDL_ReadLE32)(vPtr src) = 0;
-DFhackCExport uint32_t SDL_ReadLE32(vPtr src)
-{
-    return _SDL_ReadLE32(src);
-}
-
-/***** Misc
-SDL_RWFromFile
-    SDL_RWops * SDLCALL SDL_RWFromFile(const char *file, const char *mode);
-SDL_SetModuleHandle
-    void SDLCALL SDL_SetModuleHandle(void *hInst);
-SDL_ShowCursor
-    int SDLCALL SDL_ShowCursor(int toggle);
-SDL_strlcpy
-    size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen);
-*/
-
-static vPtr (*_SDL_RWFromFile)(const char* file, const char *mode) = 0;
-DFhackCExport vPtr SDL_RWFromFile(const char* file, const char *mode)
-{
-    return _SDL_RWFromFile(file, mode);
-}
-
-static void (*_SDL_SetModuleHandle)(vPtr hInst) = 0;
-DFhackCExport void SDL_SetModuleHandle(vPtr hInst)
-{
-    _SDL_SetModuleHandle(hInst);
-}
-
-static int (*_SDL_ShowCursor)(int toggle) = 0;
-DFhackCExport int SDL_ShowCursor(int toggle)
-{
-    return _SDL_ShowCursor(toggle);
-}
-
-static size_t (*_SDL_strlcpy)(char *dst, const char *src, size_t maxlen) = 0;
-DFhackCExport size_t SDL_strlcpy(char *dst, const char *src, size_t maxlen)
-{
-    if(!_SDL_strlcpy)
-    {
-        HMODULE realSDLlib =  LoadLibrary("SDLreal.dll");
-        if(!realSDLlib)
-        {
-            exit(-111);
-        }
-        _SDL_strlcpy = (size_t (*)(char*, const char*, size_t))GetProcAddress(realSDLlib,"SDL_strlcpy");
-    }
-    return _SDL_strlcpy(dst,src,maxlen);
-}
-
-/***** The real meat of this
-SDL_Init
-SDL_Quit
-SDL_GL_SwapBuffers
-    void SDLCALL SDL_GL_SwapBuffers(void);
-*/
-
-
-// hook - called at program exit
-static void (*_SDL_Quit)(void) = 0;
-DFhackCExport void SDL_Quit(void)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    c.Shutdown();
-    if(_SDL_Quit)
-    {
-        _SDL_Quit();
-    }
-}
-// this is supported from 0.31.04 forward
-DFhackCExport int SDL_NumJoysticks(void)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    return c.Update();
-}
-
-static void (*_SDL_GL_SwapBuffers)(void) = 0;
-DFhackCExport void SDL_GL_SwapBuffers(void)
-{
-    InitSDLPointers();
-    _SDL_GL_SwapBuffers();
-}
-
-// hook - called every tick in the 2D mode of DF
-static int (*_SDL_Flip)(void * some_ptr) = 0;
-DFhackCExport int SDL_Flip(void * some_ptr)
-{
-    InitSDLPointers();
-    return _SDL_Flip(some_ptr);
-}
-
-static int (*_SDL_Init)(uint32_t flags) = 0;
-DFhackCExport int SDL_Init(uint32_t flags)
-{
-    InitSDLPointers();
-    return _SDL_Init(flags);
-}
-
-/*
-MORE CRAP
-*/
-static void * (*_SDL_CreateSemaphore)(uint32_t initial_value) = 0;
-DFhackCExport void *SDL_CreateSemaphore(uint32_t initial_value)
-{
-    InitSDLPointers();
-    return _SDL_CreateSemaphore(initial_value);
-}
-
-static vPtr (*_SDL_CreateThread)(int (*fn)(void *), void *data) = 0;
-DFhackCExport  vPtr SDL_CreateThread(int (*fn)(void *), void *data)
-{
-    InitSDLPointers();
-    return _SDL_CreateThread(fn,data);
-}
-
-
-static void (*_SDL_Delay)(uint32_t ms) = 0;
-DFhackCExport void SDL_Delay(uint32_t ms)
-{
-    InitSDLPointers();
-    _SDL_Delay(ms);
-}
-
-static void (*_SDL_DestroySemaphore)(void *sem) = 0;
-DFhackCExport void SDL_DestroySemaphore(void *sem)
-{
-    InitSDLPointers();
-    _SDL_DestroySemaphore(sem);
-}
-
-static vPtr (*_SDL_ListModes)(vPtr format, uint32_t flags) = 0;
-DFhackCExport vPtr SDL_ListModes(vPtr format, uint32_t flags)
-{
-    InitSDLPointers();
-    return _SDL_ListModes(format, flags);
-}
-
-static uint8_t (*_SDL_GetAppState)(void) = 0;
-DFhackCExport uint8_t SDL_GetAppState(void)
-{
-    InitSDLPointers();
-    return _SDL_GetAppState();
-}
-
-static uint8_t (*_SDL_GetMouseState)(int *, int *) = 0;
-DFhackCExport uint8_t SDL_GetMouseState(int *x, int *y)
-{
-    InitSDLPointers();
-    return _SDL_GetMouseState(x,y);
-}
-
-static int (*_SDL_InitSubSystem)(uint32_t flags) = 0;
-DFhackCExport int SDL_InitSubSystem(uint32_t flags)
-{
-    InitSDLPointers();
-    return _SDL_InitSubSystem(flags);
-}
-
-static int (*_SDL_SemPost)(void *sem) = 0;
-DFhackCExport int SDL_SemPost(void *sem)
-{
-    InitSDLPointers();
-    return _SDL_SemPost(sem);
-}
-
-static int (*_SDL_SemTryWait)(void *sem) = 0;
-DFhackCExport int SDL_SemTryWait(void *sem)
-{
-    InitSDLPointers();
-    return _SDL_SemTryWait(sem);
-}
-
-static int (*_SDL_SemWait)(void *sem) = 0;
-DFhackCExport int SDL_SemWait(void *sem)
-{
-    InitSDLPointers();
-    return _SDL_SemWait(sem);
-}
-
-static uint32_t (*_SDL_ThreadID)(void) = 0;
-DFhackCExport uint32_t SDL_ThreadID(void)
-{
-    InitSDLPointers();
-    return _SDL_ThreadID();
-}
-
-static char* (*_SDL_getenv)(const char *name) = 0;
-DFhackCExport char* SDL_getenv(const char *name)
-{
-    InitSDLPointers();
-    return _SDL_getenv(name);
-}
-
-static size_t (*_SDL_strlcat)(char *dst, const char *src, size_t maxlen) = 0;
-DFhackCExport size_t SDL_strlcat(char *dst, const char *src, size_t maxlen)
-{
-    InitSDLPointers();
-    return _SDL_strlcat(dst, src, maxlen);
-}
-
-void FirstCall()
-{
-    // reroute stdout and stderr
-    freopen("stdout.log", "w", stdout);
-    freopen("stderr.log", "w", stderr);
-    HMODULE realSDLlib =  LoadLibrary("SDLreal.dll");
-    if(!realSDLlib)
-    {
-        MessageBox(0,"Can't load SDLreal.dll\n","Error", MB_OK);
-        fprintf(stderr, "Can't load SDLreal.dll\n");
-        return;
-    }
-    fprintf(stderr, "FirstCall()\n");
-    // stuff for DF
-    _SDL_AddTimer = (void*(*)(uint32_t, void*, void*)) GetProcAddress(realSDLlib,"SDL_AddTimer");
-    _SDL_CondSignal = (int (*)(vPtr))GetProcAddress(realSDLlib,"SDL_CondSignal");
-    _SDL_CondWait = (int (*)(vPtr, vPtr))GetProcAddress(realSDLlib,"SDL_CondWait");
-    _SDL_ConvertSurface = (void*(*)(void*, void*, uint32_t))GetProcAddress(realSDLlib,"SDL_ConvertSurface");
-    _SDL_CreateCond = (vPtr(*)())GetProcAddress(realSDLlib,"SDL_CreateCond");
-    _SDL_CreateMutex = (vPtr(*)())GetProcAddress(realSDLlib,"SDL_CreateMutex");
-    _SDL_CreateRGBSurface = (void*(*)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t))GetProcAddress(realSDLlib,"SDL_CreateRGBSurface");
-    _SDL_CreateRGBSurfaceFrom = (void*(*)(void*, int, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t))GetProcAddress(realSDLlib,"SDL_CreateRGBSurfaceFrom");
-    _SDL_DestroyCond = (void (*)(vPtr))GetProcAddress(realSDLlib,"SDL_DestroyCond");
-    _SDL_DestroyMutex = (void (*)(vPtr))GetProcAddress(realSDLlib,"SDL_DestroyMutex");
-    _SDL_EnableKeyRepeat = (int (*)(int, int))GetProcAddress(realSDLlib,"SDL_EnableKeyRepeat");
-    _SDL_EnableUNICODE = (int (*)(int))GetProcAddress(realSDLlib,"SDL_EnableUNICODE");
-    _SDL_GetVideoSurface = (void*(*)())GetProcAddress(realSDLlib,"SDL_GetVideoSurface");
-    _SDL_DisplayFormat = (void * (*) (void *))GetProcAddress(realSDLlib,"SDL_DisplayFormat");
-    _SDL_DisplayFormatAlpha = (void * (*) (void *))GetProcAddress(realSDLlib,"SDL_DisplayFormatAlpha");
-    _SDL_GetRGBA = (void (*) (uint32_t, void *, uint8_t *, uint8_t *, uint8_t *, uint8_t *))GetProcAddress(realSDLlib,"SDL_GetRGBA");
-    _SDL_FreeSurface = (void (*)(void*))GetProcAddress(realSDLlib,"SDL_FreeSurface");
-    _SDL_GL_GetAttribute = (int (*)(int, int*))GetProcAddress(realSDLlib,"SDL_GL_GetAttribute");
-    _SDL_GL_SetAttribute = (int (*)(int, int))GetProcAddress(realSDLlib,"SDL_GL_SetAttribute");
-    _SDL_GL_SwapBuffers = (void (*)())GetProcAddress(realSDLlib,"SDL_GL_SwapBuffers");
-    _SDL_GetError = (char*(*)())GetProcAddress(realSDLlib,"SDL_GetError");
-    _SDL_GetKeyState = (uint8_t*(*)(int*))GetProcAddress(realSDLlib,"SDL_GetKeyState");
-    _SDL_GetTicks = (uint32_t (*)())GetProcAddress(realSDLlib,"SDL_GetTicks");
-    _SDL_GetVideoInfo = (void*(*)())GetProcAddress(realSDLlib,"SDL_GetVideoInfo");
-    _SDL_Init = (int (*)(uint32_t))GetProcAddress(realSDLlib,"SDL_Init");
-    _SDL_Flip = (int (*)( void * )) GetProcAddress(realSDLlib, "SDL_Flip");
-    _SDL_LockSurface = (int (*)(void*))GetProcAddress(realSDLlib,"SDL_LockSurface");
-    _SDL_MapRGB = (uint32_t (*)(void*, uint8_t, uint8_t, uint8_t))GetProcAddress(realSDLlib,"SDL_MapRGB");
-    _SDL_PollEvent = (int (*)(SDL::Event*))GetProcAddress(realSDLlib,"SDL_PollEvent");
-    _SDL_PushEvent = (int (*)(SDL::Event*))GetProcAddress(realSDLlib,"SDL_PushEvent");
-    _SDL_Quit = (void (*)())GetProcAddress(realSDLlib,"SDL_Quit");
-    _SDL_RWFromFile = (void*(*)(const char*, const char*))GetProcAddress(realSDLlib,"SDL_RWFromFile");
-    _SDL_RemoveTimer = (bool (*)(void*))GetProcAddress(realSDLlib,"SDL_RemoveTimer");
-    _SDL_SaveBMP_RW = (int (*)(void*, void*, int))GetProcAddress(realSDLlib,"SDL_SaveBMP_RW");
-    _SDL_SetAlpha = (int (*)(void*, uint32_t, uint8_t))GetProcAddress(realSDLlib,"SDL_SetAlpha");
-    _SDL_SetColorKey = (int (*)(void*, uint32_t, uint32_t))GetProcAddress(realSDLlib,"SDL_SetColorKey");
-    _SDL_SetModuleHandle = (void (*)(void*))GetProcAddress(realSDLlib,"SDL_SetModuleHandle");
-    _SDL_SetVideoMode = (void*(*)(int, int, int, uint32_t))GetProcAddress(realSDLlib,"SDL_SetVideoMode");
-    _SDL_ShowCursor = (int (*)(int))GetProcAddress(realSDLlib,"SDL_ShowCursor");
-    _SDL_UnlockSurface = (void (*)(void*))GetProcAddress(realSDLlib,"SDL_UnlockSurface");
-    _SDL_UpperBlit = (int (*)(DFHack::DFSDL_Surface*, DFHack::DFSDL_Rect*, DFHack::DFSDL_Surface*, DFHack::DFSDL_Rect*))GetProcAddress(realSDLlib,"SDL_UpperBlit");
-    _SDL_WM_SetCaption = (void (*)(const char*, const char*))GetProcAddress(realSDLlib,"SDL_WM_SetCaption");
-    _SDL_WM_SetIcon = (void (*)(void*, uint8_t*))GetProcAddress(realSDLlib,"SDL_WM_SetIcon");
-    _SDL_mutexP = (int (*)(vPtr))GetProcAddress(realSDLlib,"SDL_mutexP");
-    _SDL_mutexV = (int (*)(vPtr))GetProcAddress(realSDLlib,"SDL_mutexV");
-    _SDL_strlcpy = (size_t (*)(char*, const char*, size_t))GetProcAddress(realSDLlib,"SDL_strlcpy");
-
-    // stuff for SDL_Image
-    _SDL_ClearError = (void (*)())GetProcAddress(realSDLlib,"SDL_ClearError");
-    _SDL_Error = (void (*)(int))GetProcAddress(realSDLlib,"SDL_Error");
-    _SDL_LoadFunction = (void*(*)(vPtr, const char*))GetProcAddress(realSDLlib,"SDL_LoadFunction");
-    _SDL_LoadObject = (vPtr(*)(const char*))GetProcAddress(realSDLlib,"SDL_LoadObject");
-    _SDL_ReadBE32 = (uint32_t (*)(void*))GetProcAddress(realSDLlib,"SDL_ReadBE32");
-    _SDL_ReadLE16 = (uint16_t (*)(void*))GetProcAddress(realSDLlib,"SDL_ReadLE16");
-    _SDL_ReadLE32 = (uint32_t (*)(void*))GetProcAddress(realSDLlib,"SDL_ReadLE32");
-    _SDL_SetError = (void (*)(const char*, ...))GetProcAddress(realSDLlib,"SDL_SetError");
-    _SDL_UnloadObject = (void (*)(vPtr))GetProcAddress(realSDLlib,"SDL_UnloadObject");
-    _SDL_FillRect = (int (*)(void*,void*,uint32_t))GetProcAddress(realSDLlib,"SDL_FillRect");
-
-    // new in DF 0.31.04
-    _SDL_CreateSemaphore = (void* (*)(uint32_t))GetProcAddress(realSDLlib,"SDL_CreateSemaphore");
-    _SDL_CreateThread = (vPtr (*)(int (*fn)(void *), void *data))GetProcAddress(realSDLlib,"SDL_CreateThread");
-    _SDL_Delay = (void (*)(uint32_t))GetProcAddress(realSDLlib,"SDL_Delay");
-    _SDL_DestroySemaphore = (void (*)(void *))GetProcAddress(realSDLlib,"SDL_DestroySemaphore");
-    _SDL_GetAppState = (uint8_t (*)(void))GetProcAddress(realSDLlib,"SDL_GetAppState");
-    _SDL_GetMouseState = (uint8_t (*)(int *, int *))GetProcAddress(realSDLlib,"SDL_GetMouseState");
-    _SDL_InitSubSystem = (int (*)(uint32_t))GetProcAddress(realSDLlib,"SDL_InitSubSystem");
-    _SDL_SemPost = (int (*)(void *))GetProcAddress(realSDLlib,"SDL_SemPost");
-    _SDL_SemTryWait = (int (*)(void *))GetProcAddress(realSDLlib,"SDL_SemTryWait");
-    _SDL_SemWait = (int (*)(void *))GetProcAddress(realSDLlib,"SDL_SemWait");
-    _SDL_ThreadID = (uint32_t (*)(void))GetProcAddress(realSDLlib,"SDL_ThreadID");
-
-    // new in DF 0.43.05
-    _SDL_getenv = (char* (*)(const char*))GetProcAddress(realSDLlib,"SDL_getenv");
-    _SDL_strlcat = (size_t (*)(char*, const char*, size_t))GetProcAddress(realSDLlib,"SDL_strlcat");
-
-    // new in DF v50.01
-    _SDL_ListModes = (void *(*)(void*, uint32_t))GetProcAddress(realSDLlib,"SDL_ListModes");
-
-    _SDL_EnableUNICODE(1);
-
-    fprintf(stderr,"Initized HOOKS!\n");
-}
-
-void InitSDLPointers()
-{
-    std::call_once(inited, [](){ FirstCall(); });
-}
diff --git a/library/Hooks.cpp b/library/Hooks.cpp
index 36af2617c..31a8ec749 100644
--- a/library/Hooks.cpp
+++ b/library/Hooks.cpp
@@ -1,33 +1,65 @@
 #include "Core.h"
 #include "Export.h"
 
-// called before main event loop starts
+#include "df/gamest.h"
+
+static bool disabled = false;
+
+// called from the main thread before the simulation thread is started
+// and the main event loop is initiated
 DFhackCExport void dfhooks_init() {
-    DFHack::Core::getInstance().Init();
+    if (getenv("DFHACK_DISABLE")) {
+        fprintf(stdout, "dfhack: DFHACK_DISABLE detected in environment; disabling\n");
+        disabled = true;
+        return;
+    }
+
+    // we need to init DF globals before we can check the commandline
+    if (!DFHack::Core::getInstance().InitMainThread() || !df::global::game)
+        return;
+    const std::string & cmdline = df::global::game->command_line.original;
+    if (cmdline.find("--disable-dfhack") != std::string::npos) {
+        fprintf(stdout, "dfhack: --disable-dfhack specified on commandline; disabling\n");
+        disabled = true;
+    }
 }
 
-// called after main event loops exits
+// called from the main thread after the main event loops exits
 DFhackCExport void dfhooks_shutdown() {
+    if (disabled)
+        return;
     DFHack::Core::getInstance().Shutdown();
 }
 
-// called in the main event loop
+// called from the simulation thread in the main event loop
 DFhackCExport void dfhooks_update() {
+    if (disabled)
+        return;
     DFHack::Core::getInstance().Update();
 }
 
-// called just before adding the macro recording/playback overlay
+// called from the simulation thread just before adding the macro
+// recording/playback overlay
 DFhackCExport void dfhooks_prerender() {
+    if (disabled)
+        return;
     // TODO: render overlay widgets that are not attached to a viewscreen
 }
 
-// called for each SDL event, if true is returned, then the event has been
-// consumed and further processing shouldn't happen
-DFhackCExport bool dfhooks_sdl_event(SDL::Event* event) {
+// called from the main thread for each SDL event. if true is returned, then
+// the event has been consumed and further processing shouldn't happen
+DFhackCExport bool dfhooks_sdl_event(SDL_Event* event) {
+    if (disabled)
+        return false;
     return DFHack::Core::getInstance().DFH_SDL_Event(event);
 }
-// called for each utf-8 char read from the ncurses input
+
+// called from the main thread for each utf-8 char read from the ncurses input
 // key is positive for ncurses keys and negative for everything else
+// if true is returned, then the event has been consumed and further processing
+// shouldn't happen
 DFhackCExport bool dfhooks_ncurses_key(int key) {
+    if (disabled)
+        return false;
     return DFHack::Core::getInstance().DFH_ncurses_key(key);
 }
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 1352b7f1a..93291592d 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -55,8 +55,10 @@ distribution.
 #include "modules/MapCache.h"
 #include "modules/Maps.h"
 #include "modules/Materials.h"
+#include "modules/Military.h"
 #include "modules/Random.h"
 #include "modules/Screen.h"
+#include "modules/Textures.h"
 #include "modules/Translation.h"
 #include "modules/Units.h"
 #include "modules/World.h"
@@ -159,6 +161,26 @@ static bool get_int_field(lua_State *L, T *pf, int idx, const char *name, int de
     return !nil;
 }
 
+template<class T>
+static bool get_int_or_closure_field(lua_State *L, T *pf, int idx, const char *name, int defval)
+{
+    lua_getfield(L, idx, name);
+    bool nil = lua_isnil(L, -1);
+    if (nil) {
+        *pf = T(defval);
+    } else if (lua_isnumber(L, -1)) {
+        *pf = T(lua_tointeger(L, -1));
+    } else if (lua_isfunction(L, -1)) {
+        lua_call(L, 0, 1);
+        *pf = T(lua_tointeger(L, -1));
+        lua_pop(L, 1);
+    } else {
+        luaL_error(L, "Field %s is not a number or closure function.", name);
+    }
+    lua_pop(L, 1);
+    return !nil;
+}
+
 static bool get_char_field(lua_State *L, char *pf, int idx, const char *name, char defval)
 {
     lua_getfield(L, idx, name);
@@ -176,6 +198,17 @@ static bool get_char_field(lua_State *L, char *pf, int idx, const char *name, ch
     }
 }
 
+static bool get_bool_field(lua_State *L, bool *pf, int idx, const char *name, bool defval) {
+    lua_getfield(L, idx, name);
+    bool nil = lua_isnil(L, -1);
+    if (nil)
+        *pf = defval;
+    else
+        *pf = lua_toboolean(L, -1);
+    lua_pop(L, 1);
+    return !nil;
+}
+
 static void decode_pen(lua_State *L, Pen &pen, int idx)
 {
     idx = lua_absindex(L, idx);
@@ -194,7 +227,7 @@ static void decode_pen(lua_State *L, Pen &pen, int idx)
     else pen.bold = lua_toboolean(L, -1);
     lua_pop(L, 1);
 
-    get_int_field(L, &pen.tile, idx, "tile", 0);
+    get_int_or_closure_field(L, &pen.tile, idx, "tile", 0);
 
     bool tcolor = get_int_field(L, &pen.tile_fg, idx, "tile_fg", 7);
     tcolor = get_int_field(L, &pen.tile_bg, idx, "tile_bg", 0) || tcolor;
@@ -207,6 +240,11 @@ static void decode_pen(lua_State *L, Pen &pen, int idx)
         pen.tile_mode = (lua_toboolean(L, -1) ? Pen::CharColor : Pen::AsIs);
         lua_pop(L, 1);
     }
+
+    get_bool_field(L, &pen.keep_lower, idx, "keep_lower", false);
+    get_bool_field(L, &pen.write_to_lower, idx, "write_to_lower", false);
+    get_bool_field(L, &pen.top_of_text, idx, "top_of_text", false);
+    get_bool_field(L, &pen.bottom_of_text, idx, "bottom_of_text", false);
 }
 
 /**************************************************
@@ -461,7 +499,7 @@ static void OpenPersistent(lua_State *state)
 
 static int DFHACK_MATINFO_TOKEN = 0;
 
-void Lua::Push(lua_State *state, MaterialInfo &info)
+void Lua::Push(lua_State *state, const MaterialInfo &info)
 {
     if (!info.isValid())
     {
@@ -826,6 +864,23 @@ static void make_pen_table(lua_State *L, Pen &pen)
                 lua_pushboolean(L, false); lua_setfield(L, -2, "tile_color");
                 break;
         }
+
+        if (pen.keep_lower) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "keep_lower");
+        }
+        if (pen.write_to_lower) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "write_to_lower");
+        }
+        if (pen.top_of_text) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "top_of_text");
+        }
+        if (pen.bottom_of_text) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "bottom_of_text");
+        }
     }
 }
 
@@ -1313,8 +1368,8 @@ static CommandHistory * ensureCommandHistory(std::string id,
 
 static int getCommandHistory(lua_State *state)
 {
-    std::string id = lua_tostring(state, 1);
-    std::string src_file = lua_tostring(state, 2);
+    std::string id = luaL_checkstring(state, 1);
+    std::string src_file = luaL_checkstring(state, 2);
     std::vector<std::string> entries;
     ensureCommandHistory(id, src_file)->getEntries(entries);
     Lua::PushVector(state, entries);
@@ -1342,6 +1397,13 @@ static void OpenModule(lua_State *state, const char *mname,
     lua_pop(state, 1);
 }
 
+static void OpenModule(lua_State *state, const char *mname, const luaL_Reg *reg2)
+{
+    luaL_getsubtable(state, lua_gettop(state), mname);
+    luaL_setfuncs(state, reg2, 0);
+    lua_pop(state, 1);
+}
+
 #define WRAPM(module, function) { #function, df::wrap_function(module::function,true) }
 #define WRAP(function) { #function, df::wrap_function(function,true) }
 #define WRAPN(name, function) { #name, df::wrap_function(function,true) }
@@ -1443,8 +1505,9 @@ static int gui_getDwarfmodeViewDims(lua_State *state)
 
 static int gui_getMousePos(lua_State *L)
 {
-    auto pos = Gui::getMousePos();
-    if (pos.isValid())
+    bool allow_out_of_bounds = lua_toboolean(L, 1);
+    df::coord pos = Gui::getMousePos(allow_out_of_bounds);
+    if ((allow_out_of_bounds && pos.z >= 0) || pos.isValid())
         Lua::Push(L, pos);
     else
         lua_pushnil(L);
@@ -1453,17 +1516,20 @@ static int gui_getMousePos(lua_State *L)
 
 static const LuaWrapper::FunctionReg dfhack_gui_module[] = {
     WRAPM(Gui, getCurViewscreen),
-    WRAPM(Gui, getFocusString),
-    WRAPM(Gui, getCurFocus),
+    WRAPM(Gui, getDFViewscreen),
     WRAPM(Gui, getSelectedWorkshopJob),
     WRAPM(Gui, getSelectedJob),
     WRAPM(Gui, getSelectedUnit),
     WRAPM(Gui, getSelectedItem),
     WRAPM(Gui, getSelectedBuilding),
+    WRAPM(Gui, getSelectedCivZone),
+    WRAPM(Gui, getSelectedStockpile),
     WRAPM(Gui, getSelectedPlant),
     WRAPM(Gui, getAnyUnit),
     WRAPM(Gui, getAnyItem),
     WRAPM(Gui, getAnyBuilding),
+    WRAPM(Gui, getAnyCivZone),
+    WRAPM(Gui, getAnyStockpile),
     WRAPM(Gui, getAnyPlant),
     WRAPM(Gui, writeToGamelog),
     WRAPM(Gui, makeAnnouncement),
@@ -1477,9 +1543,24 @@ static const LuaWrapper::FunctionReg dfhack_gui_module[] = {
     WRAPM(Gui, refreshSidebar),
     WRAPM(Gui, inRenameBuilding),
     WRAPM(Gui, getDepthAt),
+    WRAPM(Gui, matchFocusString),
     { NULL, NULL }
 };
 
+static int gui_getFocusStrings(lua_State *state) {
+    df::viewscreen *r = Lua::GetDFObject<df::viewscreen>(state, 1);
+    std::vector<std::string> focusStrings = Gui::getFocusStrings(r);
+    Lua::PushVector(state, focusStrings);
+    return 1;
+}
+
+static int gui_getCurFocus(lua_State *state) {
+    bool skip_dismissed = lua_toboolean(state, 1);
+    std::vector<std::string> cur_focus = Gui::getCurFocus(skip_dismissed);
+    Lua::PushVector(state, cur_focus);
+    return 1;
+}
+
 static int gui_autoDFAnnouncement(lua_State *state)
 {
     bool rv;
@@ -1580,11 +1661,19 @@ static int gui_revealInDwarfmodeMap(lua_State *state)
     switch (lua_gettop(state))
     {
         default:
+        case 5:
+            rv = Gui::revealInDwarfmodeMap(CheckCoordXYZ(state, 1, false), lua_toboolean(state, 4), lua_toboolean(state, 5));
+            break;
         case 4:
             rv = Gui::revealInDwarfmodeMap(CheckCoordXYZ(state, 1, false), lua_toboolean(state, 4));
             break;
         case 3:
-            rv = Gui::revealInDwarfmodeMap(CheckCoordXYZ(state, 1, false));
+            if (lua_isboolean(state, 3)) {
+                Lua::CheckDFAssign(state, &p, 1);
+                rv = Gui::revealInDwarfmodeMap(p, lua_toboolean(state, 2), lua_toboolean(state, 3));
+            }
+            else
+                rv = Gui::revealInDwarfmodeMap(CheckCoordXYZ(state, 1, false));
             break;
         case 2:
             Lua::CheckDFAssign(state, &p, 1);
@@ -1605,6 +1694,8 @@ static const luaL_Reg dfhack_gui_funcs[] = {
     { "pauseRecenter", gui_pauseRecenter },
     { "revealInDwarfmodeMap", gui_revealInDwarfmodeMap },
     { "getMousePos", gui_getMousePos },
+    { "getFocusStrings", gui_getFocusStrings },
+    { "getCurFocus", gui_getCurFocus },
     { NULL, NULL }
 };
 
@@ -1624,6 +1715,7 @@ static bool jobItemEqual(const df::job_item *job1, const df::job_item *job2)
 }
 
 static const LuaWrapper::FunctionReg dfhack_job_module[] = {
+    WRAPM(Job,attachJobItem),
     WRAPM(Job,cloneJobStruct),
     WRAPM(Job,printItemDetails),
     WRAPM(Job,printJobDetails),
@@ -1670,6 +1762,81 @@ static const luaL_Reg dfhack_job_funcs[] = {
     { NULL, NULL }
 };
 
+/***** Textures module *****/
+
+static int textures_loadTileset(lua_State *state)
+{
+    std::string file = luaL_checkstring(state, 1);
+    auto tile_w = luaL_checkint(state, 2);
+    auto tile_h = luaL_checkint(state, 3);
+    bool reserved = lua_isboolean(state, 4) ? lua_toboolean(state, 4) : false;
+    auto handles = Textures::loadTileset(file, tile_w, tile_h, reserved);
+    Lua::PushVector(state, handles);
+    return 1;
+}
+
+static int textures_getTexposByHandle(lua_State *state)
+{
+    auto handle = luaL_checkunsigned(state, 1);
+    auto texpos = Textures::getTexposByHandle(handle);
+    if (texpos == -1) {
+        lua_pushnil(state);
+    } else {
+        Lua::Push(state, texpos);
+    }
+    return 1;
+}
+
+static int textures_deleteHandle(lua_State *state)
+{
+    if (lua_isinteger(state,1)) {
+        auto handle = luaL_checkunsigned(state, 1);
+        Textures::deleteHandle(handle);
+    } else if (lua_istable(state,1)) {
+        std::vector<TexposHandle> handles;
+        Lua::GetVector(state, handles);
+        for (auto& handle: handles) {
+            Textures::deleteHandle(handle);
+        }
+    }
+    return 0;
+}
+
+static int textures_createTile(lua_State *state)
+{
+    std::vector<uint32_t> pixels;
+    Lua::GetVector(state, pixels);
+    auto tile_w = luaL_checkint(state, 2);
+    auto tile_h = luaL_checkint(state, 3);
+    bool reserved = lua_isboolean(state, 4) ? lua_toboolean(state, 4) : false;
+    auto handle = Textures::createTile(pixels, tile_w, tile_h, reserved);
+    Lua::Push(state, handle);
+    return 1;
+}
+
+static int textures_createTileset(lua_State *state)
+{
+    std::vector<uint32_t> pixels;
+    Lua::GetVector(state, pixels);
+    auto texture_w = luaL_checkint(state, 2);
+    auto texture_h = luaL_checkint(state, 3);
+    auto tile_w = luaL_checkint(state, 4);
+    auto tile_h = luaL_checkint(state, 5);
+    bool reserved = lua_isboolean(state, 6) ? lua_toboolean(state, 6) : false;
+    auto handles = Textures::createTileset(pixels, texture_w, texture_h, tile_w, tile_h, reserved);
+    Lua::PushVector(state, handles);
+    return 1;
+}
+
+static const luaL_Reg dfhack_textures_funcs[] = {
+    { "loadTileset", textures_loadTileset },
+    { "getTexposByHandle", textures_getTexposByHandle },
+    { "deleteHandle", textures_deleteHandle },
+    { "createTile", textures_createTile },
+    { "createTileset", textures_createTileset },
+    { NULL, NULL }
+};
+
 /***** Units module *****/
 
 static const LuaWrapper::FunctionReg dfhack_units_module[] = {
@@ -1705,14 +1872,22 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, isTame),
     WRAPM(Units, isTamable),
     WRAPM(Units, isDomesticated),
+    WRAPM(Units, isMarkedForTraining),
+    WRAPM(Units, isMarkedForTaming),
+    WRAPM(Units, isMarkedForWarTraining),
+    WRAPM(Units, isMarkedForHuntTraining),
     WRAPM(Units, isMarkedForSlaughter),
+    WRAPM(Units, isMarkedForGelding),
+    WRAPM(Units, isGeldable),
     WRAPM(Units, isGelded),
     WRAPM(Units, isEggLayer),
+    WRAPM(Units, isEggLayerRace),
     WRAPM(Units, isGrazer),
     WRAPM(Units, isMilkable),
     WRAPM(Units, isForest),
     WRAPM(Units, isMischievous),
     WRAPM(Units, isAvailableForAdoption),
+    WRAPM(Units, isPet),
     WRAPM(Units, hasExtravision),
     WRAPM(Units, isOpposedToLife),
     WRAPM(Units, isBloodsucker),
@@ -1740,6 +1915,7 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, getNemesis),
     WRAPM(Units, getPhysicalAttrValue),
     WRAPM(Units, getMentalAttrValue),
+    WRAPM(Units, casteFlagSet),
     WRAPM(Units, getMiscTrait),
     WRAPM(Units, getAge),
     WRAPM(Units, getKillCount),
@@ -1757,7 +1933,6 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, getGoalType),
     WRAPM(Units, getGoalName),
     WRAPM(Units, isGoalAchieved),
-    WRAPM(Units, getSquadName),
     WRAPM(Units, getPhysicalDescription),
     WRAPM(Units, getRaceName),
     WRAPM(Units, getRaceNamePlural),
@@ -1766,6 +1941,7 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, getRaceBabyNameById),
     WRAPM(Units, getRaceChildName),
     WRAPM(Units, getRaceChildNameById),
+    WRAPM(Units, getReadableName),
     WRAPM(Units, getMainSocialActivity),
     WRAPM(Units, getMainSocialEvent),
     WRAPM(Units, getStressCategory),
@@ -1776,6 +1952,7 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, multiplyGroupActionTimers),
     WRAPM(Units, setActionTimers),
     WRAPM(Units, setGroupActionTimers),
+    WRAPM(Units, getUnitByNobleRole),
     { NULL, NULL }
 };
 
@@ -1853,6 +2030,25 @@ static int units_getUnitsInBox(lua_State *state)
     return 2;
 }
 
+static int units_getCitizens(lua_State *L) {
+    bool ignore_sanity = lua_toboolean(L, -1); // defaults to false
+
+    std::vector<df::unit *> citizens;
+    if (Units::getCitizens(citizens, ignore_sanity)) {
+        Lua::PushVector(L, citizens);
+        return 1;
+    }
+    return 0;
+}
+
+static int units_getUnitsByNobleRole(lua_State *L) {
+    std::string role_name = luaL_checkstring(L, -1);
+    std::vector<df::unit *> units;
+    Units::getUnitsByNobleRole(units, role_name);
+    Lua::PushVector(L, units);
+    return 1;
+}
+
 static int units_getStressCutoffs(lua_State *L)
 {
     lua_newtable(L);
@@ -1866,10 +2062,21 @@ static const luaL_Reg dfhack_units_funcs[] = {
     { "getOuterContainerRef", units_getOuterContainerRef },
     { "getNoblePositions", units_getNoblePositions },
     { "getUnitsInBox", units_getUnitsInBox },
+    { "getCitizens", units_getCitizens },
+    { "getUnitsByNobleRole", units_getUnitsByNobleRole},
     { "getStressCutoffs", units_getStressCutoffs },
     { NULL, NULL }
 };
 
+/***** Military Module *****/
+
+static const LuaWrapper::FunctionReg dfhack_military_module[] = {
+    WRAPM(Military, makeSquad),
+    WRAPM(Military, updateRoomAssignments),
+    WRAPM(Military, getSquadName),
+    { NULL, NULL }
+};
+
 /***** Items module *****/
 
 static bool items_moveToGround(df::item *item, df::coord pos)
@@ -1932,12 +2139,16 @@ static const LuaWrapper::FunctionReg dfhack_items_module[] = {
     WRAPM(Items, getSubtypeDef),
     WRAPM(Items, getItemBaseValue),
     WRAPM(Items, getValue),
+    WRAPM(Items, isRequestedTradeGood),
     WRAPM(Items, createItem),
     WRAPM(Items, checkMandates),
     WRAPM(Items, canTrade),
     WRAPM(Items, canTradeWithContents),
+    WRAPM(Items, canTradeAnyWithContents),
+    WRAPM(Items, markForTrade),
     WRAPM(Items, isRouteVehicle),
     WRAPM(Items, isSquadEquipment),
+    WRAPM(Items, getCapacity),
     WRAPN(moveToGround, items_moveToGround),
     WRAPN(moveToContainer, items_moveToContainer),
     WRAPN(moveToInventory, items_moveToInventory),
@@ -2029,6 +2240,7 @@ static const LuaWrapper::FunctionReg dfhack_maps_module[] = {
     WRAPM(Maps, enableBlockUpdates),
     WRAPM(Maps, getGlobalInitFeature),
     WRAPM(Maps, getLocalInitFeature),
+    WRAPM(Maps, getWalkableGroup),
     WRAPM(Maps, canWalkBetween),
     WRAPM(Maps, spawnFlow),
     WRAPN(hasTileAssignment, hasTileAssignment),
@@ -2105,6 +2317,13 @@ static int maps_getPlantAtTile(lua_State *L)
     return 1;
 }
 
+static int maps_getBiomeType(lua_State *L)
+{
+    auto pos = CheckCoordXY(L, 1, true);
+    lua_pushinteger(L, Maps::getBiomeType(pos.x, pos.y));
+    return 1;
+}
+
 static const luaL_Reg dfhack_maps_funcs[] = {
     { "isValidTilePos", maps_isValidTilePos },
     { "isTileVisible", maps_isTileVisible },
@@ -2115,6 +2334,7 @@ static const luaL_Reg dfhack_maps_funcs[] = {
     { "getRegionBiome", maps_getRegionBiome },
     { "getTileBiomeRgn", maps_getTileBiomeRgn },
     { "getPlantAtTile", maps_getPlantAtTile },
+    { "getBiomeType", maps_getBiomeType },
     { NULL, NULL }
 };
 
@@ -2196,8 +2416,8 @@ static const luaL_Reg dfhack_burrows_funcs[] = {
 
 /***** Buildings module *****/
 
-static bool buildings_containsTile(df::building *bld, int x, int y, bool room) {
-    return Buildings::containsTile(bld, df::coord2d(x,y), room);
+static bool buildings_containsTile(df::building *bld, int x, int y) {
+    return Buildings::containsTile(bld, df::coord2d(x,y));
 }
 
 static const LuaWrapper::FunctionReg dfhack_buildings_module[] = {
@@ -2213,12 +2433,14 @@ static const LuaWrapper::FunctionReg dfhack_buildings_module[] = {
     WRAPM(Buildings, constructWithItems),
     WRAPM(Buildings, constructWithFilters),
     WRAPM(Buildings, deconstruct),
+    WRAPM(Buildings, notifyCivzoneModified),
     WRAPM(Buildings, markedForRemoval),
     WRAPM(Buildings, getRoomDescription),
     WRAPM(Buildings, isActivityZone),
     WRAPM(Buildings, isPenPasture),
     WRAPM(Buildings, isPitPond),
     WRAPM(Buildings, isActive),
+    WRAPM(Buildings, completebuild),
     { NULL, NULL }
 };
 
@@ -2448,6 +2670,17 @@ static int screen_findGraphicsTile(lua_State *L)
     }
 }
 
+static int screen_raise(lua_State *L) {
+    df::viewscreen *screen = dfhack_lua_viewscreen::get_pointer(L, 1, false);
+
+    // remove screen from the stack so it doesn't get returned as an output
+    lua_remove(L, 1);
+
+    Screen::raise(screen);
+
+    return 0;
+}
+
 static int screen_hideGuard(lua_State *L) {
     df::viewscreen *screen = dfhack_lua_viewscreen::get_pointer(L, 1, false);
     luaL_checktype(L, 2, LUA_TFUNCTION);
@@ -2505,14 +2738,29 @@ static int screen_doSimulateInput(lua_State *L)
     int sz = lua_rawlen(L, 2);
     std::set<df::interface_key> keys;
 
+    char str = '\0';
     for (int j = 1; j <= sz; j++)
     {
         lua_rawgeti(L, 2, j);
-        keys.insert((df::interface_key)lua_tointeger(L, -1));
+        df::interface_key k = (df::interface_key)lua_tointeger(L, -1);
+        if (!str && k > df::interface_key::STRING_A000 && k <= df::interface_key::STRING_A255)
+            str = Screen::keyToChar(k);
+        keys.insert(k);
         lua_pop(L, 1);
     }
 
+    // if we're injecting a text keybinding, ensure it is reflected in the enabler text buffer
+    std::string prev_input;
+    if (str) {
+        prev_input = (const char *)&df::global::enabler->last_text_input[0];
+        df::global::enabler->last_text_input[0] = str;
+        df::global::enabler->last_text_input[1] = '\0';
+    }
+
     screen->feed(&keys);
+
+    if (str)
+        strcpy((char *)&df::global::enabler->last_text_input[0], prev_input.c_str());
     return 0;
 }
 
@@ -2538,6 +2786,7 @@ static int screen_charToKey(lua_State *L)
     return 1;
 }
 
+/*
 static int screen_zoom(lua_State *L)
 {
     using df::global::enabler;
@@ -2554,6 +2803,7 @@ static int screen_zoom(lua_State *L)
     enabler->zoom_display(cmd);
     return 0;
 }
+*/
 
 }
 
@@ -2566,6 +2816,7 @@ static const luaL_Reg dfhack_screen_funcs[] = {
     { "paintString", screen_paintString },
     { "fillRect", screen_fillRect },
     { "findGraphicsTile", screen_findGraphicsTile },
+    CWRAP(raise, screen_raise),
     CWRAP(hideGuard, screen_hideGuard),
     CWRAP(show, screen_show),
     CWRAP(dismiss, screen_dismiss),
@@ -2573,7 +2824,7 @@ static const luaL_Reg dfhack_screen_funcs[] = {
     { "_doSimulateInput", screen_doSimulateInput },
     { "keyToChar", screen_keyToChar },
     { "charToKey", screen_charToKey },
-    { "zoom", screen_zoom },
+    //{ "zoom", screen_zoom },
     { NULL, NULL }
 };
 
@@ -2631,13 +2882,9 @@ static int filesystem_listdir_recursive(lua_State *L)
         include_prefix = lua_toboolean(L, 3);
     std::map<std::string, bool> files;
     int err = DFHack::Filesystem::listdir_recursive(dir, files, depth, include_prefix);
-    if (err)
-    {
+    if (err != 0 && err != -1) {
         lua_pushnil(L);
-        if (err == -1)
-            lua_pushfstring(L, "max depth exceeded: %d", depth);
-        else
-            lua_pushstring(L, strerror(err));
+        lua_pushstring(L, strerror(err));
         lua_pushinteger(L, err);
         return 3;
     }
@@ -2736,12 +2983,188 @@ static int8_t getModstate() { return Core::getInstance().getModstate(); }
 static std::string internal_strerror(int n) { return strerror(n); }
 static std::string internal_md5(std::string s) { return md5_wrap.getHashFromString(s); }
 
+struct heap_pointer_info
+{
+    size_t address = 0;
+    size_t size = 0;
+    int status = 0;
+};
+
+//fixed sized, sorted
+static std::vector<heap_pointer_info> heap_data;
+
+//when dfhack upgrades to c++17, this would do well as a std::optional
+static std::pair<bool, heap_pointer_info> heap_find(uintptr_t address)
+{
+    auto it = std::lower_bound(heap_data.begin(), heap_data.end(), address,
+    [](heap_pointer_info t, uintptr_t address)
+    {
+        return t.address < address;
+    });
+
+    if (it == heap_data.end() || it->address != address)
+        return {false, heap_pointer_info()};
+
+    return {true, *it};
+}
+
+//this function only allocates the first time it is called
+static int heap_take_snapshot()
+{
+    #ifdef _WIN32
+    size_t max_entries = 256 * 1024 * 1024 / sizeof(heap_pointer_info);
+
+    //clearing the vector is guaranteed not to deallocate the memory
+    heap_data.clear();
+    heap_data.reserve(max_entries);
+
+    _HEAPINFO hinfo;
+    hinfo._pentry = nullptr;
+    int heap_status = 0;
+
+    while ((heap_status = _heapwalk(&hinfo)) == _HEAPOK && heap_data.size() < max_entries)
+    {
+        heap_pointer_info inf;
+        inf.address = reinterpret_cast<uintptr_t>(hinfo._pentry);
+        inf.size = hinfo._size;
+        inf.status = hinfo._useflag; //0 == _FREEENTRY, 1 == _USEDENTRY
+
+        heap_data.push_back(inf);
+    }
+
+    //sort by address
+    std::sort(heap_data.begin(), heap_data.end(),
+    [](heap_pointer_info t1, heap_pointer_info t2)
+    {
+        return t1.address < t2.address;
+    });
+
+    if (heap_status == _HEAPEMPTY || heap_status == _HEAPEND)
+        return 0;
+
+    if (heap_status == _HEAPBADPTR)
+        return 1;
+
+    if (heap_status == _HEAPBADBEGIN)
+        return 2;
+
+    if (heap_status == _HEAPBADNODE)
+        return 3;
+    #endif
+
+    return 0;
+}
+
+static int get_heap_state()
+{
+    #ifdef _WIN32
+    int heap_status = _heapchk();
+
+    if (heap_status == _HEAPEMPTY || heap_status == _HEAPOK)
+        return 0;
+
+    if (heap_status == _HEAPBADPTR)
+        return 1;
+
+    if (heap_status == _HEAPBADBEGIN)
+        return 2;
+
+    if (heap_status == _HEAPBADNODE)
+        return 3;
+    #endif
+
+    return 0;
+}
+
+static bool is_address_in_heap(uintptr_t ptr)
+{
+    return heap_find(ptr).first;
+}
+
+static bool is_address_active_in_heap(uintptr_t ptr)
+{
+    std::pair<bool, heap_pointer_info> inf = heap_find(ptr);
+
+    if (!inf.first)
+        return false;
+
+    return inf.second.status == 1;
+}
+
+static bool is_address_used_after_free_in_heap(uintptr_t ptr)
+{
+    std::pair<bool, heap_pointer_info> inf = heap_find(ptr);
+
+    if (!inf.first)
+        return false;
+
+    return inf.second.status != 1;
+}
+
+static int get_address_size_in_heap(uintptr_t ptr)
+{
+    std::pair<bool, heap_pointer_info> inf = heap_find(ptr);
+
+    if (!inf.first)
+        return -1;
+
+    return inf.second.size;
+}
+
+//eg if I have a struct, does any address lie within the struct?
+static uintptr_t get_root_address_of_heap_object(uintptr_t ptr)
+{
+    //find the first element strictly greater than our pointer
+    auto it = std::upper_bound(heap_data.begin(), heap_data.end(), ptr, [](uintptr_t ptr, heap_pointer_info t1)
+    {
+        return ptr < t1.address;
+    });
+
+    //if we're at the start of the snapshot, no elements are less than our pointer
+    //therefore it is invalid
+    if (it == heap_data.begin())
+        return 0;
+
+    //get the first element less than or equal to ours
+    it--;
+
+    //our pointer is only valid if we lie in the first pointer lower in memory than it
+    if (ptr >= it->address && ptr < it->address + it->size)
+        return it->address;
+
+    return 0;
+}
+
+//msize crashes if you pass an invalid pointer to it, only use it if you *know* the thing you're looking at
+//is in the heap/valid
+static int msize_address(uintptr_t ptr)
+{
+    #ifdef _WIN32
+    void* vptr = reinterpret_cast<void*>(ptr);
+
+    if (vptr)
+        return _msize(vptr);
+    #endif
+
+    return -1;
+}
+
 static const LuaWrapper::FunctionReg dfhack_internal_module[] = {
     WRAP(getImageBase),
     WRAP(getRebaseDelta),
     WRAP(getModstate),
     WRAPN(strerror, internal_strerror),
     WRAPN(md5, internal_md5),
+    WRAPN(heapTakeSnapshot, heap_take_snapshot),
+    WRAPN(getHeapState, get_heap_state),
+    WRAPN(isAddressInHeap, is_address_in_heap),
+    WRAPN(isAddressActiveInHeap, is_address_active_in_heap),
+    WRAPN(isAddressUsedAfterFreeInHeap, is_address_used_after_free_in_heap),
+    WRAPN(getAddressSizeInHeap, get_address_size_in_heap),
+    WRAPN(getRootAddressOfHeapObject, get_root_address_of_heap_object),
+    WRAPN(msizeAddress, msize_address),
+    WRAP(getClipboardTextCp437),
+    WRAP(setClipboardTextCp437),
     { NULL, NULL }
 };
 
@@ -3030,6 +3453,24 @@ static int internal_diffscan(lua_State *L)
     return 1;
 }
 
+static int internal_cxxDemangle(lua_State *L)
+{
+    std::string mangled = luaL_checkstring(L, 1);
+    std::string status;
+    std::string demangled = cxx_demangle(mangled, &status);
+    if (demangled.length())
+    {
+        lua_pushstring(L, demangled.c_str());
+        return 1;
+    }
+    else
+    {
+        lua_pushnil(L);
+        lua_pushstring(L, status.c_str());
+        return 2;
+    }
+}
+
 static int internal_runCommand(lua_State *L)
 {
     color_ostream *out = NULL;
@@ -3309,13 +3750,23 @@ static int internal_md5file(lua_State *L)
     }
 }
 
+static int internal_getSuppressDuplicateKeyboardEvents(lua_State *L) {
+    Lua::Push(L, Core::getInstance().getSuppressDuplicateKeyboardEvents());
+    return 1;
+}
+
+static int internal_setSuppressDuplicateKeyboardEvents(lua_State *L) {
+    bool suppress = lua_toboolean(L, 1);
+    Core::getInstance().setSuppressDuplicateKeyboardEvents(suppress);
+    return 0;
+}
+
 static const luaL_Reg dfhack_internal_funcs[] = {
     { "getPE", internal_getPE },
     { "getMD5", internal_getmd5 },
     { "getAddress", internal_getAddress },
     { "setAddress", internal_setAddress },
     { "getVTable", internal_getVTable },
-
     { "adjustOffset", internal_adjustOffset },
     { "getMemRanges", internal_getMemRanges },
     { "patchMemory", internal_patchMemory },
@@ -3324,6 +3775,7 @@ static const luaL_Reg dfhack_internal_funcs[] = {
     { "memcmp", internal_memcmp },
     { "memscan", internal_memscan },
     { "diffscan", internal_diffscan },
+    { "cxxDemangle", internal_cxxDemangle },
     { "getDir", filesystem_listdir },
     { "runCommand", internal_runCommand },
     { "getModifiers", internal_getModifiers },
@@ -3337,6 +3789,8 @@ static const luaL_Reg dfhack_internal_funcs[] = {
     { "getCommandDescription", internal_getCommandDescription },
     { "threadid", internal_threadid },
     { "md5File", internal_md5file },
+    { "getSuppressDuplicateKeyboardEvents", internal_getSuppressDuplicateKeyboardEvents },
+    { "setSuppressDuplicateKeyboardEvents", internal_setSuppressDuplicateKeyboardEvents },
     { NULL, NULL }
 };
 
@@ -3357,7 +3811,9 @@ void OpenDFHackApi(lua_State *state)
     luaL_setfuncs(state, dfhack_funcs, 0);
     OpenModule(state, "gui", dfhack_gui_module, dfhack_gui_funcs);
     OpenModule(state, "job", dfhack_job_module, dfhack_job_funcs);
+    OpenModule(state, "textures", dfhack_textures_funcs);
     OpenModule(state, "units", dfhack_units_module, dfhack_units_funcs);
+    OpenModule(state, "military", dfhack_military_module);
     OpenModule(state, "items", dfhack_items_module, dfhack_items_funcs);
     OpenModule(state, "maps", dfhack_maps_module, dfhack_maps_funcs);
     OpenModule(state, "world", dfhack_world_module, dfhack_world_funcs);
diff --git a/library/LuaTools.cpp b/library/LuaTools.cpp
index 5b080ce43..87699641d 100644
--- a/library/LuaTools.cpp
+++ b/library/LuaTools.cpp
@@ -101,7 +101,7 @@ void DFHack::Lua::Push(lua_State *state, const Units::NoblePosition &pos)
     lua_setfield(state, -2, "position");
 }
 
-void DFHack::Lua::Push(lua_State *state, df::coord pos)
+void DFHack::Lua::Push(lua_State *state, const df::coord &pos)
 {
     lua_createtable(state, 0, 3);
     lua_pushinteger(state, pos.x);
@@ -112,7 +112,7 @@ void DFHack::Lua::Push(lua_State *state, df::coord pos)
     lua_setfield(state, -2, "z");
 }
 
-void DFHack::Lua::Push(lua_State *state, df::coord2d pos)
+void DFHack::Lua::Push(lua_State *state, const df::coord2d &pos)
 {
     lua_createtable(state, 0, 2);
     lua_pushinteger(state, pos.x);
@@ -121,19 +121,26 @@ void DFHack::Lua::Push(lua_State *state, df::coord2d pos)
     lua_setfield(state, -2, "y");
 }
 
-void DFHack::Lua::GetVector(lua_State *state, std::vector<std::string> &pvec)
+void DFHack::Lua::GetVector(lua_State *state, std::vector<std::string> &pvec, int idx)
 {
     lua_pushnil(state);   // first key
-    while (lua_next(state, 1) != 0)
+    while (lua_next(state, idx) != 0)
     {
         pvec.push_back(lua_tostring(state, -1));
         lua_pop(state, 1);  // remove value, leave key
     }
 }
 
+static bool trigger_inhibit_l = false;
+static bool trigger_inhibit_r = false;
+static bool trigger_inhibit_m = false;
+static bool inhibit_l = false;
+static bool inhibit_r = false;
+static bool inhibit_m = false;
+
 void DFHack::Lua::PushInterfaceKeys(lua_State *L,
                             const std::set<df::interface_key> &keys) {
-    lua_createtable(L, 0, keys.size() + 5);
+    lua_createtable(L, 0, keys.size() + 7);
 
     for (auto &key : keys)
     {
@@ -154,6 +161,21 @@ void DFHack::Lua::PushInterfaceKeys(lua_State *L,
     }
 
     if (df::global::enabler) {
+        if (!inhibit_l && df::global::enabler->mouse_lbut) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_L");
+            trigger_inhibit_l = true;
+        }
+        if (!inhibit_r && df::global::enabler->mouse_rbut) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_R");
+            trigger_inhibit_r = true;
+        }
+        if (!inhibit_m && df::global::enabler->mouse_mbut) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_M");
+            trigger_inhibit_m = true;
+        }
         if (df::global::enabler->mouse_lbut_down) {
             lua_pushboolean(L, true);
             lua_setfield(L, -2, "_MOUSE_L_DOWN");
@@ -162,20 +184,14 @@ void DFHack::Lua::PushInterfaceKeys(lua_State *L,
             lua_pushboolean(L, true);
             lua_setfield(L, -2, "_MOUSE_R_DOWN");
         }
-        if (df::global::enabler->mouse_lbut) {
-            lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_L");
-            df::global::enabler->mouse_lbut_down = 0;
-        }
-        if (df::global::enabler->mouse_rbut) {
+        if (df::global::enabler->mouse_mbut_down) {
             lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_R");
-            df::global::enabler->mouse_rbut_down = 0;
+            lua_setfield(L, -2, "_MOUSE_M_DOWN");
         }
     }
 }
 
-int DFHack::Lua::PushPosXYZ(lua_State *state, df::coord pos)
+int DFHack::Lua::PushPosXYZ(lua_State *state, const df::coord &pos)
 {
     if (!pos.isValid())
     {
@@ -191,7 +207,7 @@ int DFHack::Lua::PushPosXYZ(lua_State *state, df::coord pos)
     }
 }
 
-int DFHack::Lua::PushPosXY(lua_State *state, df::coord2d pos)
+int DFHack::Lua::PushPosXY(lua_State *state, const df::coord2d &pos)
 {
     if (!pos.isValid())
     {
@@ -1880,9 +1896,17 @@ lua_State *DFHack::Lua::Open(color_ostream &out, lua_State *state)
     luaL_setfuncs(state, dfhack_coro_funcs, 0);
     lua_pop(state, 1);
 
+    // replace some io functions
+    lua_getglobal(state, "io");
+    lua_pushnil(state);
+    lua_setfield(state, -2, "popen");
+    lua_pop(state, 1);
+
     // replace some os functions
     lua_getglobal(state, "os");
     luaL_setfuncs(state, dfhack_os_funcs, 0);
+    lua_pushnil(state);
+    lua_setfield(state, -2, "execute");
     lua_pop(state, 1);
 
     // split the global environment
@@ -2134,4 +2158,26 @@ void DFHack::Lua::Core::Reset(color_ostream &out, const char *where)
         out.printerr("Common lua context stack top left at %d after %s.\n", top, where);
         lua_settop(State, 0);
     }
+
+    if (trigger_inhibit_l) {
+        trigger_inhibit_l = false;
+        inhibit_l = true;
+    }
+    if (trigger_inhibit_r) {
+        trigger_inhibit_r = false;
+        inhibit_r = true;
+    }
+    if (trigger_inhibit_m) {
+        trigger_inhibit_m = false;
+        inhibit_m = true;
+    }
+
+    if (df::global::enabler) {
+        if (!df::global::enabler->mouse_lbut_down)
+            inhibit_l = false;
+        if (!df::global::enabler->mouse_rbut_down)
+            inhibit_r = false;
+        if (!df::global::enabler->mouse_mbut_down)
+            inhibit_m = false;
+    }
 }
diff --git a/library/LuaTypes.cpp b/library/LuaTypes.cpp
index ef69958e0..407dea265 100644
--- a/library/LuaTypes.cpp
+++ b/library/LuaTypes.cpp
@@ -664,6 +664,9 @@ static int meta_global_field_reference(lua_State *state)
     auto field = (struct_field_info*)find_field(state, 2, "reference");
     if (!field)
         field_error(state, 2, "builtin property or method", "reference");
+    void *ptr = *(void**)field->offset;
+    if (!ptr)
+        field_error(state, 2, "global address not known", "reference");
     field_reference(state, field, *(void**)field->offset);
     return 1;
 }
@@ -1288,11 +1291,27 @@ void LuaWrapper::SetFunctionWrappers(lua_State *state, const FunctionReg *reg)
 
 /**
  * Add fields in the array to the UPVAL_FIELDTABLE candidates on the stack.
+ *
+ * flags:
+ *  GLOBALS: if true, pstruct is a global_identity and fields with addresses of 0 are skipped
+ *  RAW: if true, no fields are skipped (supersedes `GLOBALS` flag) and
+ *       special-case fields like OBJ_METHODs are not added to the metatable
+ *
+ * Stack in & out:
+ *  base+1: metatable
+ *  base+2: fields table (to be populated, map of name -> struct_field_info*)
+ *  base+3: field iter table (to be populated, bimap of name <-> integer index)
  */
-static void IndexFields(lua_State *state, int base, struct_identity *pstruct, bool globals)
+namespace IndexFieldsFlags {
+    enum IndexFieldsFlags {
+        GLOBALS = 1 << 0,
+        RAW     = 1 << 1,
+    };
+}
+static void IndexFields(lua_State *state, int base, struct_identity *pstruct, int flags)
 {
     if (pstruct->getParent())
-        IndexFields(state, base, pstruct->getParent(), globals);
+        IndexFields(state, base, pstruct->getParent(), flags);
 
     auto fields = pstruct->getFields();
     if (!fields)
@@ -1312,6 +1331,7 @@ static void IndexFields(lua_State *state, int base, struct_identity *pstruct, bo
 
         bool add_to_enum = true;
 
+        if (!(flags & IndexFieldsFlags::RAW))
         // Handle the field
         switch (fields[i].mode)
         {
@@ -1334,10 +1354,10 @@ static void IndexFields(lua_State *state, int base, struct_identity *pstruct, bo
         }
 
         // Do not add invalid globals to the enumeration order
-        if (globals && !*(void**)fields[i].offset)
+        if ((flags & IndexFieldsFlags::GLOBALS) && !*(void**)fields[i].offset)
             add_to_enum = false;
 
-        if (add_to_enum)
+        if (add_to_enum || (flags & IndexFieldsFlags::RAW))
             AssociateId(state, base+3, ++cnt, name.c_str());
 
         lua_pushlightuserdata(state, (void*)&fields[i]);
@@ -1345,10 +1365,168 @@ static void IndexFields(lua_State *state, int base, struct_identity *pstruct, bo
     }
 }
 
+static void PushTypeIdentity(lua_State *state, const type_identity *id)
+{
+    lua_rawgetp(state, LUA_REGISTRYINDEX, &DFHACK_TYPEID_TABLE_TOKEN);
+    lua_rawgetp(state, -1, id);
+    lua_remove(state, -2);  // TYPEID_TABLE
+}
+
+static void PushFieldInfoSubTable(lua_State *state, const struct_field_info *field)
+{
+    if (!field) {
+        lua_pushnil(state);
+        return;
+    }
+
+    lua_newtable(state);    // new field info
+    Lua::TableInsert(state, "mode", field->mode);
+    Lua::TableInsert(state, "name", field->name);
+    Lua::TableInsert(state, "offset", field->offset);
+    Lua::TableInsert(state, "count", field->count);
+
+    if (field->type) {
+        Lua::TableInsert(state, "type_name", field->type->getFullName());
+
+        lua_pushlightuserdata(state, field->type);
+        lua_setfield(state, -2, "type_identity");
+
+        PushTypeIdentity(state, field->type);
+        lua_setfield(state, -2, "type");
+    }
+
+    if (field->extra) {
+        if (field->extra->index_enum) {
+            PushTypeIdentity(state, field->extra->index_enum);
+            lua_setfield(state, -2, "index_enum");
+        }
+        if (field->extra->ref_target) {
+            PushTypeIdentity(state, field->extra->ref_target);
+            lua_setfield(state, -2, "ref_target");
+        }
+        if (field->extra->union_tag_field) {
+            Lua::TableInsert(state, "union_tag_field", field->extra->union_tag_field);
+        }
+        if (field->extra->union_tag_attr) {
+            Lua::TableInsert(state, "union_tag_attr", field->extra->union_tag_attr);
+        }
+        if (field->extra->original_name) {
+            Lua::TableInsert(state, "original_name", field->extra->original_name);
+        }
+    }
+}
+
+/**
+ * Metamethod: __index for struct._fields
+ *
+ * upvalue 1: name -> struct_field_info* table
+ */
+static int meta_fieldinfo_index(lua_State *state)
+{
+    luaL_checktype(state, -1, LUA_TSTRING);
+
+    lua_gettable(state, lua_upvalueindex(1));
+    auto field = static_cast<const struct_field_info*>(lua_touserdata(state, -1));
+    lua_pop(state, 1);
+    PushFieldInfoSubTable(state, field);
+
+    return 1;
+}
+
+/**
+ * Metamethod: iterator for struct._fields
+ *
+ * upvalue 1: name -> struct_field_info* table
+ * upvalue 3: field table (int <-> name)
+ */
+static int meta_fieldinfo_next(lua_State *state)
+{
+    if (lua_gettop(state) < 2) lua_pushnil(state);
+
+    int len = lua_rawlen(state, UPVAL_FIELDTABLE);
+    int idx = cur_iter_index(state, len+1, 2, 0);
+    if (idx == len)
+        return 0;
+
+    lua_rawgeti(state, UPVAL_FIELDTABLE, idx+1);
+
+    // modified from meta_struct_next:
+    // retrieve the struct_field_info* from the table and convert it
+    lua_dup(state);
+    lua_gettable(state, lua_upvalueindex(1));
+    auto field = static_cast<const struct_field_info*>(lua_touserdata(state, -1));
+    lua_pop(state, 1);
+    PushFieldInfoSubTable(state, field);
+
+    return 2;
+}
+
+static void AddFieldInfoTable(lua_State *state, int ftable_idx, struct_identity *pstruct)
+{
+    Lua::StackUnwinder base{state};
+
+    // metatable
+    lua_newtable(state);
+    int ix_meta = lua_gettop(state);
+
+    // field info table (name -> struct_field_info*)
+    lua_newtable(state);
+    int ix_fieldinfo = lua_gettop(state);
+
+    // field iter table (int <-> name)
+    lua_newtable(state);
+    int ix_fielditer = lua_gettop(state);
+    IndexFields(state, base, pstruct, IndexFieldsFlags::RAW);
+
+    PushStructMethod(state, ix_meta, ix_fielditer, meta_fieldinfo_next);
+    // change upvalue 1 to the field info table since we don't need the original
+    lua_pushvalue(state, ix_fieldinfo);
+    lua_setupvalue(state, -2, 1);
+    SetPairsMethod(state, ix_meta, "__pairs");
+
+    // field table (name -> table representation of struct_field_info)
+    lua_newtable(state);
+    int ix_fields = lua_gettop(state);
+
+    // wrapper table (empty, indexes into field table with metamethods)
+    lua_newtable(state);
+    int ix_wrapper = lua_gettop(state);
+
+    // set up metatable for the wrapper
+    // use field table for __index
+    lua_pushstring(state, "__index");
+    lua_pushvalue(state, ix_fieldinfo);
+    lua_pushcclosure(state, meta_fieldinfo_index, 1);
+    lua_settable(state, ix_meta);
+
+    // use change_error() for __newindex
+    lua_pushstring(state, "__newindex");
+    lua_getfield(state, LUA_REGISTRYINDEX, DFHACK_CHANGEERROR_NAME);
+    lua_settable(state, ix_meta);
+
+    lua_pushvalue(state, ix_meta);
+    lua_setmetatable(state, ix_wrapper);
+
+    // convert field info table (struct_field_info) to field table (lua tables)
+    lua_pushnil(state);  // initial key for next()
+    while (lua_next(state, ix_fieldinfo)) {
+        auto field = static_cast<const struct_field_info*>(lua_touserdata(state, -1));
+        lua_pushvalue(state, -2);  // field name
+        PushFieldInfoSubTable(state, field);
+        lua_settable(state, ix_fields);
+        lua_pop(state, 1); // struct_field_info
+    }
+
+    // lua_pushvalue(state, ix_fields);
+    // freeze_table(state); // TODO: figure out why this creates an __index cycle for nonexistent fields
+    lua_pushvalue(state, ix_wrapper);
+    lua_setfield(state, ftable_idx, "_fields");
+}
+
 void LuaWrapper::IndexStatics(lua_State *state, int meta_idx, int ftable_idx, struct_identity *pstruct)
 {
     // stack: metatable fieldtable
-
+    AddFieldInfoTable(state, ftable_idx, pstruct);
     for (struct_identity *p = pstruct; p; p = p->getParent())
     {
         auto fields = p->getFields();
@@ -1384,8 +1562,7 @@ static void MakeFieldMetatable(lua_State *state, struct_identity *pstruct,
 
     // Index the fields
     lua_newtable(state);
-
-    IndexFields(state, base, pstruct, globals);
+    IndexFields(state, base, pstruct, globals ? IndexFieldsFlags::GLOBALS : 0);
 
     // Add the iteration metamethods
     PushStructMethod(state, base+1, base+3, iterator);
diff --git a/library/LuaWrapper.cpp b/library/LuaWrapper.cpp
index 59bd96732..9d2357c70 100644
--- a/library/LuaWrapper.cpp
+++ b/library/LuaWrapper.cpp
@@ -685,7 +685,8 @@ static int meta_new(lua_State *state)
 
     type_identity *id = get_object_identity(state, 1, "df.new()", true);
 
-    void *ptr;
+    void *ptr = nullptr;
+    std::string err_context;
 
     // Support arrays of primitive types
     if (argc == 2)
@@ -703,11 +704,22 @@ static int meta_new(lua_State *state)
     }
     else
     {
-        ptr = id->allocate();
+        try {
+            ptr = id->allocate();
+        }
+        catch (std::exception &e) {
+            if (e.what()) {
+                err_context = e.what();
+            }
+        }
     }
 
     if (!ptr)
-        luaL_error(state, "Cannot allocate %s", id->getFullName().c_str());
+        luaL_error(state, "Cannot allocate %s%s%s",
+            id->getFullName().c_str(),
+            err_context.empty() ? "" : ": ",
+            err_context.c_str()
+        );
 
     if (lua_isuserdata(state, 1))
     {
@@ -1658,6 +1670,7 @@ static void RenderType(lua_State *state, compound_identity *node)
 
         {
             RenderTypeChildren(state, node->getScopeChildren());
+            IndexStatics(state, ix_meta, ftable, (struct_identity*)node);
 
             lua_pushlightuserdata(state, node);
             lua_setfield(state, ftable, "_identity");
diff --git a/library/MiscUtils.cpp b/library/MiscUtils.cpp
index b959e756e..a90cf1208 100644
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@@ -27,6 +27,8 @@ distribution.
 #include "MiscUtils.h"
 #include "ColorText.h"
 
+#include "modules/DFSDL.h"
+
 #ifndef LINUX_BUILD
 // We don't want min and max macros
 #define NOMINMAX
@@ -34,6 +36,7 @@ distribution.
 #else
     #include <sys/time.h>
     #include <ctime>
+    #include <cxxabi.h>
 #endif
 
 #include <ctype.h>
@@ -470,3 +473,29 @@ DFHACK_EXPORT std::string DF2CONSOLE(DFHack::color_ostream &out, const std::stri
 {
     return out.is_console() ? DF2CONSOLE(in) : in;
 }
+
+DFHACK_EXPORT std::string cxx_demangle(const std::string &mangled_name, std::string *status_out)
+{
+#ifdef __GNUC__
+    int status;
+    char *demangled = abi::__cxa_demangle(mangled_name.c_str(), nullptr, nullptr, &status);
+    std::string out;
+    if (demangled) {
+        out = demangled;
+        free(demangled);
+    }
+    if (status_out) {
+        if (status == 0) *status_out = "success";
+        else if (status == -1) *status_out = "memory allocation failure";
+        else if (status == -2) *status_out = "invalid mangled name";
+        else if (status == -3) *status_out = "invalid arguments";
+        else *status_out = "unknown error";
+    }
+    return out;
+#else
+    if (status_out) {
+        *status_out = "not implemented on this platform";
+    }
+    return "";
+#endif
+}
diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
index 223abfeac..3670755fd 100644
--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@@ -199,7 +199,6 @@ Plugin::Plugin(Core * core, const std::string & path,
     plugin_is_enabled = 0;
     plugin_save_data = 0;
     plugin_load_data = 0;
-    plugin_eval_ruby = 0;
     state = PS_UNLOADED;
     access = new RefLock();
 }
@@ -357,7 +356,6 @@ bool Plugin::load(color_ostream &con)
     plugin_is_enabled = (bool*) LookupPlugin(plug, "plugin_is_enabled");
     plugin_save_data = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_save_data");
     plugin_load_data = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_load_data");
-    plugin_eval_ruby = (command_result (*)(color_ostream &, const char*)) LookupPlugin(plug, "plugin_eval_ruby");
     index_lua(plug);
     plugin_lib = plug;
     commands.clear();
@@ -826,7 +824,6 @@ PluginManager::PluginManager(Core * core) : core(core)
 {
     plugin_mutex = new tthread::recursive_mutex();
     cmdlist_mutex = new tthread::mutex();
-    ruby = NULL;
 }
 
 PluginManager::~PluginManager()
@@ -1035,8 +1032,6 @@ void PluginManager::registerCommands( Plugin * p )
         }
         command_map[name] = p;
     }
-    if (p->plugin_eval_ruby)
-        ruby = p;
     cmdlist_mutex->unlock();
 }
 
@@ -1048,8 +1043,6 @@ void PluginManager::unregisterCommands( Plugin * p )
     {
         command_map.erase(cmds[i].name);
     }
-    if (p->plugin_eval_ruby)
-        ruby = NULL;
     cmdlist_mutex->unlock();
 }
 
diff --git a/library/Process-linux.cpp b/library/Process-linux.cpp
index e50750015..0509f5710 100644
--- a/library/Process-linux.cpp
+++ b/library/Process-linux.cpp
@@ -138,7 +138,7 @@ void Process::getMemRanges( vector<t_memrange> & ranges )
     {
         t_memrange temp;
         temp.name[0] = 0;
-        sscanf(buffer, "%zx-%zx %s %zx %2zx:%2zx %zu %[^\n]",
+        sscanf(buffer, "%zx-%zx %s %zx %zx:%zx %zu %[^\n]",
                &start,
                &end,
                (char*)&permissions,
diff --git a/library/RemoteClient.cpp b/library/RemoteClient.cpp
index 6a8becaae..0aa68eb51 100644
--- a/library/RemoteClient.cpp
+++ b/library/RemoteClient.cpp
@@ -150,7 +150,11 @@ int RemoteClient::GetDefaultPort()
             if (in_file)
             {
                 Json::Value config;
-                in_file >> config;
+                try {
+                    in_file >> config;
+                } catch (const std::exception & e) {
+                    std::cerr << "Error reading remote server config file: " << filename << ": " << e.what() << std::endl;
+                }
                 in_file.close();
                 if (config.isMember("port")) {
                     port = config["port"].asInt();
diff --git a/library/RemoteServer.cpp b/library/RemoteServer.cpp
index 734b80702..72f2a29b5 100644
--- a/library/RemoteServer.cpp
+++ b/library/RemoteServer.cpp
@@ -51,6 +51,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "PassiveSocket.h"
 #include "PluginManager.h"
 #include "MiscUtils.h"
+#include "Debug.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -85,6 +86,7 @@ namespace {
 }
 
 namespace DFHack {
+    DBG_DECLARE(core, socket, DebugCategory::LINFO);
 
     struct BlockGuard {
         std::lock_guard<std::mutex> lock;
@@ -420,17 +422,20 @@ ServerMainImpl::ServerMainImpl(std::promise<bool> promise, int port) :
 
     Json::Value configJson;
 
-    std::ifstream inFile(filename, std::ios_base::in);
-
     bool allow_remote = false;
 
-    if (inFile.is_open())
-    {
-        inFile >> configJson;
-        inFile.close();
-
-        allow_remote = configJson.get("allow_remote", "false").asBool();
+    std::ifstream inFile(filename, std::ios_base::in);
+    try {
+        if (inFile.is_open())
+        {
+            inFile >> configJson;
+            allow_remote = configJson.get("allow_remote", "false").asBool();
+        }
+    } catch (const std::exception & e) {
+        std::cerr << "Error reading remote server config file: " << filename << ": " << e.what() << std::endl;
+        std::cerr << "Reverting to remote server config to defaults" << std::endl;
     }
+    inFile.close();
 
     // rewrite/normalize config file
     configJson["allow_remote"] = allow_remote;
@@ -473,17 +478,33 @@ void ServerMainImpl::threadFn(std::promise<bool> promise, int port)
     CActiveSocket *client = nullptr;
 
     try {
-        while ((client = server.socket.Accept()) != NULL)
+        for (int acceptFail = 0 ; server.socket.IsSocketValid() && acceptFail < 5 ; acceptFail++)
         {
-            BlockGuard lock;
-            ServerConnection::Accepted(client);
-            client = nullptr;
+            if ((client = server.socket.Accept()) != NULL)
+            {
+                BlockGuard lock;
+                ServerConnection::Accepted(client);
+                client = nullptr;
+            }
+            else
+            {
+                WARN(socket).print("Connection failure: %s (%d of %d)\n", server.socket.DescribeError(), acceptFail + 1, 5);
+            }
         }
     } catch(BlockedException &) {
         if (client)
             client->Close();
         delete client;
     }
+
+    if (server.socket.IsSocketValid())
+    {
+        WARN(socket).print("Too many failed accepts, shutting down RemoteServer\n");
+    }
+    else
+    {
+        WARN(socket).print("Listening socket invalid, shutting down RemoteServer\n");
+    }
 }
 
 void ServerMain::block()
diff --git a/library/RemoteTools.cpp b/library/RemoteTools.cpp
index 1d45a19c0..c8fc810c8 100644
--- a/library/RemoteTools.cpp
+++ b/library/RemoteTools.cpp
@@ -59,8 +59,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "LuaTools.h"
 
 #include "DataDefs.h"
-#include "df/ui.h"
-#include "df/ui_advmode.h"
+#include "df/plotinfost.h"
+#include "df/adventurest.h"
 #include "df/world.h"
 #include "df/world_data.h"
 #include "df/unit.h"
@@ -375,11 +375,11 @@ static command_result GetDFVersion(color_ostream &stream,
 static command_result GetWorldInfo(color_ostream &stream,
                                    const EmptyMessage *, GetWorldInfoOut *out)
 {
-    using df::global::ui;
-    using df::global::ui_advmode;
+    using df::global::plotinfo;
+    using df::global::adventure;
     using df::global::world;
 
-    if (!ui || !world || !Core::getInstance().isWorldLoaded())
+    if (!plotinfo || !world || !Core::getInstance().isWorldLoaded())
         return CR_NOT_FOUND;
 
     df::game_type gt = game_type::DWARF_MAIN;
@@ -397,10 +397,10 @@ static command_result GetWorldInfo(color_ostream &stream,
     case game_type::DWARF_RECLAIM:
     case game_type::DWARF_UNRETIRE:
         out->set_mode(GetWorldInfoOut::MODE_DWARF);
-        out->set_civ_id(ui->civ_id);
-        out->set_site_id(ui->site_id);
-        out->set_group_id(ui->group_id);
-        out->set_race_id(ui->race_id);
+        out->set_civ_id(plotinfo->civ_id);
+        out->set_site_id(plotinfo->site_id);
+        out->set_group_id(plotinfo->group_id);
+        out->set_race_id(plotinfo->race_id);
         break;
 
     case game_type::ADVENTURE_MAIN:
@@ -410,10 +410,10 @@ static command_result GetWorldInfo(color_ostream &stream,
         if (auto unit = vector_get(world->units.active, 0))
             out->set_player_unit_id(unit->id);
 
-        if (!ui_advmode)
+        if (!adventure)
             break;
 
-        if (auto nemesis = vector_get(world->nemesis.all, ui_advmode->player_id))
+        if (auto nemesis = vector_get(world->nemesis.all, adventure->player_id))
         {
             if (nemesis->figure)
                 out->set_player_histfig_id(nemesis->figure->id);
@@ -613,7 +613,7 @@ static command_result ListUnits(color_ostream &stream,
 static command_result ListSquads(color_ostream &stream,
                                  const ListSquadsIn *in, ListSquadsOut *out)
 {
-    auto entity = df::historical_entity::find(df::global::ui->group_id);
+    auto entity = df::historical_entity::find(df::global::plotinfo->group_id);
     if (!entity)
         return CR_NOT_FOUND;
 
diff --git a/library/include/Core.h b/library/include/Core.h
index 6c99e62be..b470ebbde 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -40,8 +40,6 @@ distribution.
 #include <mutex>
 #include <thread>
 
-#include "RemoteClient.h"
-
 #define DFH_MOD_SHIFT 1
 #define DFH_MOD_CTRL 2
 #define DFH_MOD_ALT 4
@@ -74,6 +72,17 @@ namespace DFHack
         struct Hide;
     }
 
+    enum command_result
+    {
+        CR_LINK_FAILURE = -3,    // RPC call failed due to I/O or protocol error
+        CR_NEEDS_CONSOLE = -2,   // Attempt to call interactive command without console
+        CR_NOT_IMPLEMENTED = -1, // Command not implemented, or plugin not loaded
+        CR_OK = 0,               // Success
+        CR_FAILURE = 1,          // Failure
+        CR_WRONG_USAGE = 2,      // Wrong arguments or ui state
+        CR_NOT_FOUND = 3         // Target object not found (for RPC mainly)
+    };
+
     enum state_change_event
     {
         SC_UNKNOWN = -1,
@@ -97,10 +106,14 @@ namespace DFHack
         StateChangeScript(state_change_event event, std::string path, bool save_specific = false)
             :event(event), path(path), save_specific(save_specific)
         { }
-        bool operator==(const StateChangeScript& other)
+        bool const operator==(const StateChangeScript& other)
         {
             return event == other.event && path == other.path && save_specific == other.save_specific;
         }
+        bool const operator!=(const StateChangeScript& other)
+        {
+            return !(operator==(other));
+        }
     };
 
     // Core is a singleton. Why? Because it is closely tied to SDL calls. It tracks the global state of DF.
@@ -108,32 +121,15 @@ namespace DFHack
     // Better than tracking some weird variables all over the place.
     class DFHACK_EXPORT Core
     {
-#ifdef _DARWIN
-        friend int  ::DFH_SDL_NumJoysticks(void);
-        friend void ::DFH_SDL_Quit(void);
-        friend int  ::DFH_SDL_PollEvent(SDL::Event *);
-        friend int  ::DFH_SDL_Init(uint32_t flags);
-        friend int  ::DFH_wgetch(WINDOW * w);
-#else
-        friend int  ::SDL_NumJoysticks(void);
-        friend void ::SDL_Quit(void);
-        friend int  ::SDL_PollEvent(SDL::Event *);
-        friend int  ::SDL_Init(uint32_t flags);
-        friend int  ::wgetch(WINDOW * w);
-#endif
         friend void ::dfhooks_init();
         friend void ::dfhooks_shutdown();
         friend void ::dfhooks_update();
         friend void ::dfhooks_prerender();
-        friend bool ::dfhooks_sdl_event(SDL::Event* event);
+        friend bool ::dfhooks_sdl_event(SDL_Event* event);
         friend bool ::dfhooks_ncurses_key(int key);
     public:
         /// Get the single Core instance or make one.
-        static Core& getInstance()
-        {
-            static Core instance;
-            return instance;
-        }
+        static Core& getInstance();
         /// check if the activity lock is owned by this thread
         bool isSuspended(void);
         /// Is everything OK?
@@ -158,10 +154,14 @@ namespace DFHack
         bool loadScriptFile(color_ostream &out, std::string fname, bool silent = false);
 
         bool addScriptPath(std::string path, bool search_before = false);
+        bool setModScriptPaths(const std::vector<std::string> &mod_script_paths);
         bool removeScriptPath(std::string path);
         std::string findScript(std::string name);
         void getScriptPaths(std::vector<std::string> *dest);
 
+        bool getSuppressDuplicateKeyboardEvents();
+        void setSuppressDuplicateKeyboardEvents(bool suppress);
+
         bool ClearKeyBindings(std::string keyspec);
         bool AddKeyBinding(std::string keyspec, std::string cmdline);
         std::vector<std::string> ListKeyBindings(std::string keyspec);
@@ -173,14 +173,14 @@ namespace DFHack
         bool RunAlias(color_ostream &out, const std::string &name,
             const std::vector<std::string> &parameters, command_result &result);
         std::map<std::string, std::vector<std::string>> ListAliases();
-        std::string GetAliasCommand(const std::string &name, const std::string &default_ = "");
+        std::string GetAliasCommand(const std::string &name, bool ignore_params = false);
 
         std::string getHackPath();
 
         bool isWorldLoaded() { return (last_world_data_ptr != NULL); }
         bool isMapLoaded() { return (last_local_map_ptr != NULL && last_world_data_ptr != NULL); }
 
-        static df::viewscreen *getTopViewscreen() { return getInstance().top_viewscreen; }
+        static df::viewscreen *getTopViewscreen();
 
         DFHack::Console &getConsole() { return con; }
 
@@ -203,10 +203,11 @@ namespace DFHack
         struct Private;
         std::unique_ptr<Private> d;
 
-        bool Init();
+        bool InitMainThread();
+        bool InitSimulationThread();
         int Update (void);
         int Shutdown (void);
-        int DFH_SDL_Event(SDL::Event* event);
+        bool DFH_SDL_Event(SDL_Event* event);
         bool ncurses_wgetch(int in, int & out);
         bool DFH_ncurses_key(int key);
 
@@ -239,7 +240,7 @@ namespace DFHack
         std::vector<std::unique_ptr<Module>> allModules;
         DFHack::PluginManager * plug_mgr;
 
-        std::vector<std::string> script_paths[2];
+        std::vector<std::string> script_paths[3];
         std::mutex script_path_mutex;
 
         // hotkey-related stuff
@@ -251,8 +252,8 @@ namespace DFHack
         };
         int8_t modstate;
 
+        bool suppress_duplicate_keyboard_events;
         std::map<int, std::vector<KeyBinding> > key_bindings;
-        std::map<int, bool> hotkey_states;
         std::string hotkey_cmd;
         enum hotkey_set_t {
             NO,
diff --git a/library/include/DFHackVersion.h b/library/include/DFHackVersion.h
index 1b69dfe55..fbf2539bf 100644
--- a/library/include/DFHackVersion.h
+++ b/library/include/DFHackVersion.h
@@ -8,7 +8,7 @@ namespace DFHack {
         int dfhack_abi_version();
 
         const char *git_description();
-        const char *git_commit();
+        const char* git_commit(bool short_hash = false);
         const char *git_xml_commit();
         const char *git_xml_expected_commit();
         bool git_xml_match();
diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index 174156e76..c440c1eb7 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -265,6 +265,7 @@ namespace DFHack
         type_identity *ref_target;
         const char *union_tag_field;
         const char *union_tag_attr;
+        const char *original_name;
     };
 
     struct struct_field_info {
@@ -497,11 +498,29 @@ namespace df
     using DFHack::DfLinkedList;
     using DFHack::DfOtherVectors;
 
+    template<class T>
+    typename std::enable_if<
+        std::is_copy_assignable<T>::value,
+        void*
+    >::type allocator_try_assign(void *out, const void *in) {
+        *(T*)out = *(const T*)in;
+        return out;
+    }
+
+    template<class T>
+    typename std::enable_if<
+        !std::is_copy_assignable<T>::value,
+        void*
+    >::type allocator_try_assign(void *out, const void *in) {
+        // assignment is not possible; do nothing
+        return NULL;
+    }
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
     template<class T>
     void *allocator_fn(void *out, const void *in) {
-        if (out) { *(T*)out = *(const T*)in; return out; }
+        if (out) { return allocator_try_assign<T>(out, in); }
         else if (in) { delete (T*)in; return (T*)in; }
         else return new T();
     }
@@ -514,6 +533,13 @@ namespace df
         else return new T();
     }
 
+    template<class T>
+    void *allocator_noassign_fn(void *out, const void *in) {
+        if (out) { return NULL; }
+        else if (in) { delete (T*)in; return (T*)in; }
+        else return new T();
+    }
+
     template<class T>
     struct identity_traits {
         static compound_identity *get() { return &T::_identity; }
diff --git a/library/include/DataIdentity.h b/library/include/DataIdentity.h
index 711712af7..035f59d4b 100644
--- a/library/include/DataIdentity.h
+++ b/library/include/DataIdentity.h
@@ -25,13 +25,21 @@ distribution.
 #pragma once
 
 #include <deque>
-#include <string>
+#include <future>
+#include <map>
+#include <optional>
 #include <sstream>
+#include <string>
+#include <unordered_map>
 #include <vector>
-#include <map>
 
 #include "DataDefs.h"
 
+namespace std {
+    class condition_variable;
+    class mutex;
+};
+
 /*
  * Definitions of DFHack namespace structs used by generated headers.
  */
@@ -394,6 +402,7 @@ namespace df
 
     template<class T>
     class ro_stl_container_identity : public container_identity {
+    protected:
         const char *name;
 
     public:
@@ -419,6 +428,30 @@ namespace df
         }
     };
 
+    template<class T>
+    class ro_stl_assoc_container_identity : public ro_stl_container_identity<T> {
+        type_identity *key_identity;
+        type_identity *item_identity;
+
+    public:
+        ro_stl_assoc_container_identity(const char *name, type_identity *key, type_identity *item)
+            : ro_stl_container_identity<T>(name, item),
+              key_identity(key),
+              item_identity(item)
+        {}
+
+        virtual std::string getFullName(type_identity*) override {
+            return std::string(ro_stl_assoc_container_identity<T>::name) + "<" + key_identity->getFullName() + ", " + item_identity->getFullName() + ">";
+        }
+
+    protected:
+        virtual void *item_pointer(type_identity *item, void *ptr, int idx) override {
+            auto iter = (*(T*)ptr).begin();
+            for (; idx > 0; idx--) ++iter;
+            return (void*)&iter->second;
+        }
+    };
+
     class bit_array_identity : public bit_container_identity {
     public:
         /*
@@ -516,6 +549,15 @@ namespace df
 #define INTEGER_IDENTITY_TRAITS(type) NUMBER_IDENTITY_TRAITS(integer, type)
 #define FLOAT_IDENTITY_TRAITS(type) NUMBER_IDENTITY_TRAITS(float, type)
 
+// the space after the use of "type" in OPAQUE_IDENTITY_TRAITS is _required_
+// without it the macro generates a syntax error when type is a template specification
+
+#define OPAQUE_IDENTITY_TRAITS(type) \
+    template<> struct DFHACK_EXPORT identity_traits<type > { \
+        static opaque_identity identity; \
+        static opaque_identity *get() { return &identity; } \
+    };
+
     INTEGER_IDENTITY_TRAITS(char);
     INTEGER_IDENTITY_TRAITS(signed char);
     INTEGER_IDENTITY_TRAITS(unsigned char);
@@ -529,6 +571,24 @@ namespace df
     INTEGER_IDENTITY_TRAITS(unsigned long long);
     FLOAT_IDENTITY_TRAITS(float);
     FLOAT_IDENTITY_TRAITS(double);
+    OPAQUE_IDENTITY_TRAITS(std::condition_variable);
+    OPAQUE_IDENTITY_TRAITS(std::fstream);
+    OPAQUE_IDENTITY_TRAITS(std::mutex);
+    OPAQUE_IDENTITY_TRAITS(std::future<void>);
+    OPAQUE_IDENTITY_TRAITS(std::function<void()>);
+    OPAQUE_IDENTITY_TRAITS(std::optional<std::function<void()> >);
+
+#ifdef BUILD_DFHACK_LIB
+    template<typename T>
+    struct DFHACK_EXPORT identity_traits<std::shared_ptr<T>> {
+        static opaque_identity *get() {
+            typedef std::shared_ptr<T> type;
+            static std::string name = std::string("shared_ptr<") + typeid(T).name() + ">";
+            static opaque_identity identity(sizeof(type), allocator_noassign_fn<type>, name);
+            return &identity;
+        }
+    };
+#endif
 
     template<> struct DFHACK_EXPORT identity_traits<bool> {
         static bool_identity identity;
@@ -540,11 +600,6 @@ namespace df
         static stl_string_identity *get() { return &identity; }
     };
 
-    template<> struct DFHACK_EXPORT identity_traits<std::fstream> {
-        static opaque_identity identity;
-        static opaque_identity *get() { return &identity; }
-    };
-
     template<> struct DFHACK_EXPORT identity_traits<char*> {
         static ptr_string_identity identity;
         static ptr_string_identity *get() { return &identity; }
@@ -573,6 +628,7 @@ namespace df
 #undef NUMBER_IDENTITY_TRAITS
 #undef INTEGER_IDENTITY_TRAITS
 #undef FLOAT_IDENTITY_TRAITS
+#undef OPAQUE_IDENTITY_TRAITS
 
     // Container declarations
 
@@ -609,6 +665,14 @@ namespace df
         static container_identity *get();
     };
 
+    template<class KT, class T> struct identity_traits<std::map<KT, T>> {
+        static container_identity *get();
+    };
+
+    template<class KT, class T> struct identity_traits<std::unordered_map<KT, T>> {
+        static container_identity *get();
+    };
+
     template<> struct identity_traits<BitArray<int> > {
         static bit_array_identity identity;
         static bit_container_identity *get() { return &identity; }
@@ -679,6 +743,20 @@ namespace df
         return &identity;
     }
 
+    template<class KT, class T>
+    inline container_identity *identity_traits<std::map<KT, T>>::get() {
+        typedef std::map<KT, T> container;
+        static ro_stl_assoc_container_identity<container> identity("map", identity_traits<KT>::get(), identity_traits<T>::get());
+        return &identity;
+    }
+
+    template<class KT, class T>
+    inline container_identity *identity_traits<std::unordered_map<KT, T>>::get() {
+        typedef std::unordered_map<KT, T> container;
+        static ro_stl_assoc_container_identity<container> identity("unordered_map", identity_traits<KT>::get(), identity_traits<T>::get());
+        return &identity;
+    }
+
     template<class T>
     inline bit_container_identity *identity_traits<BitArray<T> >::get() {
         static bit_array_identity identity(identity_traits<T>::get());
diff --git a/library/include/DataStaticsFields.inc b/library/include/DataStaticsFields.inc
new file mode 100644
index 000000000..97a036b58
--- /dev/null
+++ b/library/include/DataStaticsFields.inc
@@ -0,0 +1,15 @@
+#include <stddef.h>
+
+#include "DataFuncs.h"
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Winvalid-offsetof"
+#endif
+
+#define TID(type) (&identity_traits< type >::identity)
+
+#define FLD(mode, name) struct_field_info::mode, #name, offsetof(CUR_STRUCT, name)
+#define GFLD(mode, name) struct_field_info::mode, #name, (size_t)&df::global::name
+#define METHOD(mode, name) struct_field_info::mode, #name, 0, wrap_function(&CUR_STRUCT::name)
+#define METHOD_N(mode, func, name) struct_field_info::mode, #name, 0, wrap_function(&CUR_STRUCT::func)
+#define FLD_END struct_field_info::END
diff --git a/library/include/Debug.h b/library/include/Debug.h
index 4cad178dc..48e661acc 100644
--- a/library/include/Debug.h
+++ b/library/include/Debug.h
@@ -102,10 +102,12 @@ namespace DFHack {
 
 #ifdef NDEBUG
 /*!
- * Reduce minimum compiled in debug levels if NDEBUG is defined. This is LDEBUG
- * and not LINFO so users can usefully increase logging levels for bug reports.
+ * This is here so we can reduce minimum compiled in debug levels if NDEBUG is
+ * defined if we want to. If LTRACE slows down the binary, we can change it to
+ * LDEBUG (but no lower than that so users can usefully increase logging levels
+ *for bug reports).
  */
-#define DBG_FILTER DFHack::DebugCategory::LDEBUG
+#define DBG_FILTER DFHack::DebugCategory::LTRACE
 #else
 //! Set default compiled in debug levels to include all prints
 #define DBG_FILTER DFHack::DebugCategory::LTRACE
diff --git a/library/include/DebugManager.h b/library/include/DebugManager.h
index 57de0f279..d910efd4a 100644
--- a/library/include/DebugManager.h
+++ b/library/include/DebugManager.h
@@ -42,13 +42,13 @@ class DebugCategory;
 /*!
  * \brief Container holding all registered runtime debug categories
  * Singleton DebugManager is a minor extension to std::vector that allows signal
- * callbacks to be attached from ui code that manages.
+ * callbacks to be attached from plotinfo code that manages.
  *
  * To avoid parallel plugin unload causing issues access to DebugManager must be
  * protected by mutex. The access mutex will be taken when
  * DFHack::DebugCategory::~DebugCategory performs unregister calls to
  * DFHack::DebugManager. The mutex will protect from memory disappearing while
- * ui code is accessing or changing the runtime state.
+ * plotinfo code is accessing or changing the runtime state.
  *
  * Signal emitting happens from a locked contexts. Taking the
  * DFHack::DebugManager::access_mutex_ in a signal callback will results to a
diff --git a/library/include/Hooks.h b/library/include/Hooks.h
index 5856fb44f..fb72fdbe3 100644
--- a/library/include/Hooks.h
+++ b/library/include/Hooks.h
@@ -24,61 +24,11 @@ distribution.
 
 #pragma once
 
-/*
- *  Some much needed SDL fakery.
- */
-
-#include "Pragma.h"
-#include "Export.h"
-#include <string>
-#include <stdint.h>
-
-#include "modules/Graphic.h"
-
-// function and variable pointer... we don't try to understand what SDL does here
-typedef void * fPtr;
-typedef void * vPtr;
-struct WINDOW;
-namespace SDL
-{
-    union Event;
-}
-
-// these functions are here because they call into DFHack::Core and therefore need to
-// be declared as friend functions/known
-#ifdef _DARWIN
-DFhackCExport int DFH_SDL_NumJoysticks(void);
-DFhackCExport void DFH_SDL_Quit(void);
-DFhackCExport int DFH_SDL_PollEvent(SDL::Event* event);
-DFhackCExport int DFH_SDL_Init(uint32_t flags);
-DFhackCExport int DFH_wgetch(WINDOW * win);
-#endif
-DFhackCExport int SDL_NumJoysticks(void);
-DFhackCExport void SDL_Quit(void);
-DFhackCExport int SDL_PollEvent(SDL::Event* event);
-DFhackCExport int SDL_PushEvent(SDL::Event* event);
-DFhackCExport int SDL_Init(uint32_t flags);
-DFhackCExport int wgetch(WINDOW * win);
-
-DFhackCExport int SDL_UpperBlit(DFHack::DFSDL_Surface* src, DFHack::DFSDL_Rect* srcrect, DFHack::DFSDL_Surface* dst, DFHack::DFSDL_Rect* dstrect);
-DFhackCExport vPtr SDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth,
-                                     uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
-DFhackCExport vPtr SDL_CreateRGBSurfaceFrom(vPtr pixels, int width, int height, int depth, int pitch,
-                                         uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
-DFhackCExport void SDL_FreeSurface(vPtr surface);
-DFhackCExport vPtr SDL_ConvertSurface(vPtr surface, vPtr format, uint32_t flags);
-DFhackCExport int SDL_LockSurface(vPtr surface);
-DFhackCExport void SDL_UnlockSurface(vPtr surface);
-DFhackCExport uint8_t SDL_GetMouseState(int *x, int *y);
-DFhackCExport void * SDL_GetVideoSurface(void);
-
-DFhackCExport int SDL_SemWait(vPtr sem);
-DFhackCExport int SDL_SemPost(vPtr sem);
+union SDL_Event;
 
-// new Hooks API
 DFhackCExport void dfhooks_init();
 DFhackCExport void dfhooks_shutdown();
 DFhackCExport void dfhooks_update();
 DFhackCExport void dfhooks_prerender();
-DFhackCExport bool dfhooks_sdl_event(SDL::Event* event);
+DFhackCExport bool dfhooks_sdl_event(SDL_Event* event);
 DFhackCExport bool dfhooks_ncurses_key(int key);
diff --git a/library/include/LuaTools.h b/library/include/LuaTools.h
index 9e1901f03..188d63854 100644
--- a/library/include/LuaTools.h
+++ b/library/include/LuaTools.h
@@ -30,6 +30,8 @@ distribution.
 #include <vector>
 #include <map>
 #include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
 
 #include "df/interfacest.h"
 
@@ -324,10 +326,10 @@ namespace DFHack {namespace Lua {
     inline void Push(lua_State *state, const std::string &str) {
         lua_pushlstring(state, str.data(), str.size());
     }
-    DFHACK_EXPORT void Push(lua_State *state, df::coord obj);
-    DFHACK_EXPORT void Push(lua_State *state, df::coord2d obj);
+    DFHACK_EXPORT void Push(lua_State *state, const df::coord &obj);
+    DFHACK_EXPORT void Push(lua_State *state, const df::coord2d &obj);
     void Push(lua_State *state, const Units::NoblePosition &pos);
-    DFHACK_EXPORT void Push(lua_State *state, MaterialInfo &info);
+    DFHACK_EXPORT void Push(lua_State *state, const MaterialInfo &info);
     DFHACK_EXPORT void Push(lua_State *state, const Screen::Pen &info);
     template<class T> inline void Push(lua_State *state, T *ptr) {
         PushDFObject(state, ptr);
@@ -340,6 +342,56 @@ namespace DFHack {namespace Lua {
 
     DFHACK_EXPORT void PushInterfaceKeys(lua_State *L, const std::set<df::interface_key> &keys);
 
+    DFHACK_EXPORT int PushPosXYZ(lua_State *state, const df::coord &pos);
+    DFHACK_EXPORT int PushPosXY(lua_State *state, const df::coord2d &pos);
+
+    template<typename T>
+    void Push(lua_State *L, const std::set<T> &pset) {
+        lua_createtable(L, 0, pset.size());
+        for (auto &entry : pset) {
+            Lua::Push(L, entry);
+            Lua::Push(L, true);
+            lua_settable(L, -3);
+        }
+    }
+
+    template<typename T_Key, typename T_Hash>
+    void Push(lua_State *L, const std::unordered_set<T_Key, T_Hash> &pset) {
+        lua_createtable(L, 0, pset.size());
+        for (auto &entry : pset) {
+            Lua::Push(L, entry);
+            Lua::Push(L, true);
+            lua_settable(L, -3);
+        }
+    }
+
+    template<typename T_Key, typename T_Value>
+    void Push(lua_State *L, const std::map<T_Key, T_Value> &pmap) {
+        lua_createtable(L, 0, pmap.size());
+        for (auto &entry : pmap) {
+            Lua::Push(L, entry.first);
+            Lua::Push(L, entry.second);
+            lua_settable(L, -3);
+        }
+    }
+
+    template<typename T_Key, typename T_Value>
+    void Push(lua_State *L, const std::unordered_map<T_Key, T_Value> &pmap) {
+        lua_createtable(L, 0, pmap.size());
+        for (auto &entry : pmap) {
+            Lua::Push(L, entry.first);
+            Lua::Push(L, entry.second);
+            lua_settable(L, -3);
+        }
+    }
+
+    template <typename T_Key, typename T_Value>
+    inline void TableInsert(lua_State *state, const T_Key &key, const T_Value &value) {
+        Lua::Push(state, key);
+        Lua::Push(state, value);
+        lua_settable(state, -3);
+    }
+
     template<class T>
     void PushVector(lua_State *state, const T &pvec, bool addn = false)
     {
@@ -358,25 +410,18 @@ namespace DFHack {namespace Lua {
         }
     }
 
-    DFHACK_EXPORT void GetVector(lua_State *state, std::vector<std::string> &pvec);
-
-    DFHACK_EXPORT int PushPosXYZ(lua_State *state, df::coord pos);
-    DFHACK_EXPORT int PushPosXY(lua_State *state, df::coord2d pos);
-
-    template <typename T_Key, typename T_Value>
-    inline void TableInsert(lua_State *state, T_Key key, T_Value value)
-    {
-        Lua::Push(state, key);
-        Lua::Push(state, value);
-        lua_settable(state, -3);
+    template<typename T>
+    requires std::is_arithmetic_v<T>
+    void GetVector(lua_State *state, std::vector<T> &pvec, int idx = 1) {
+        lua_pushnil(state);   // first key
+        while (lua_next(state, idx) != 0)
+        {
+            pvec.push_back(lua_tointeger(state, -1));
+            lua_pop(state, 1);  // remove value, leave key
+        }
     }
 
-    template<typename T_Key, typename T_Value>
-    void Push(lua_State *L, const std::map<T_Key, T_Value> &pmap) {
-        lua_createtable(L, 0, pmap.size());
-        for (auto &entry : pmap)
-            TableInsert(L, entry.first, entry.second);
-    }
+    DFHACK_EXPORT void GetVector(lua_State *state, std::vector<std::string> &pvec, int idx = 1);
 
     DFHACK_EXPORT void CheckPen(lua_State *L, Screen::Pen *pen, int index, bool allow_nil = false, bool allow_color = true);
 
diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index d089640ef..06915fde5 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -23,17 +23,20 @@ distribution.
 */
 
 #pragma once
+
 #include "Export.h"
+
 #include <algorithm>
-#include <iostream>
-#include <iomanip>
 #include <cctype>
 #include <climits>
-#include <stdint.h>
-#include <vector>
-#include <sstream>
 #include <cstdio>
+#include <iomanip>
+#include <iostream>
+#include <map>
 #include <memory>
+#include <sstream>
+#include <stdint.h>
+#include <vector>
 
 #if defined(_MSC_VER)
     #define DFHACK_FUNCTION_SIG __FUNCSIG__
@@ -58,28 +61,6 @@ namespace DFHack {
     class color_ostream;
 }
 
-/*! \namespace dts
- * std.reverse() == dts, The namespace that include forward compatible helpers
- * which can be used from newer standards. The preprocessor check prefers
- * standard version if one is available. The standard version gets imported with
- * using.
- */
-namespace dts {
-//  Check if lib supports the feature test macro or version is over c++14.
-#if __cpp_lib_make_unique < 201304 && __cplusplus < 201402L
-//! Insert c++14 make_unique to be forward compatible. Array versions are
-//! missing
-template<typename T, typename... Args>
-typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T> >::type
-make_unique(Args&&... args)
-{
-    return std::unique_ptr<T>{new T{std::forward<Args>(args)...}};
-}
-#else /* >= c++14 */
-using std::make_unique;
-#endif
-}
-
 template <typename T>
 void print_bits ( T val, std::ostream& out )
 {
@@ -164,8 +145,8 @@ int linear_index(const std::vector<CT*> &vec, FT CT::*field, FT key)
     return -1;
 }
 
-template <typename CT, typename FT>
-int binsearch_index(const std::vector<CT*> &vec, FT CT::*field, FT key, bool exact = true)
+template <typename CT, typename FT, typename MT>
+int binsearch_index(const std::vector<CT*> &vec, FT MT::*field, FT key, bool exact = true)
 {
     // Returns the index of the value >= the key
     int min = -1, max = (int)vec.size();
@@ -242,8 +223,8 @@ unsigned insert_into_vector(std::vector<FT> &vec, FT key, bool *inserted = NULL)
     return pos;
 }
 
-template<typename CT, typename FT>
-unsigned insert_into_vector(std::vector<CT*> &vec, FT CT::*field, CT *obj, bool *inserted = NULL)
+template<typename CT, typename FT, typename MT>
+unsigned insert_into_vector(std::vector<CT*> &vec, FT MT::*field, CT *obj, bool *inserted = NULL)
 {
     unsigned pos = (unsigned)binsearch_index(vec, field, obj->*field, false);
     bool to_ins = (pos >= vec.size() || vec[pos] != obj);
@@ -338,6 +319,24 @@ inline typename T::mapped_type map_find(
     return (it == map.end()) ? defval : it->second;
 }
 
+template <class T, typename Fn>
+static void for_each_(std::vector<T> &v, Fn func)
+{
+    std::for_each(v.begin(), v.end(), func);
+}
+
+template <class T, class V, typename Fn>
+static void for_each_(std::map<T, V> &v, Fn func)
+{
+    std::for_each(v.begin(), v.end(), func);
+}
+
+template <class T, class V, typename Fn>
+static void transform_(const std::vector<T> &src, std::vector<V> &dst, Fn func)
+{
+    std::transform(src.begin(), src.end(), std::back_inserter(dst), func);
+}
+
 DFHACK_EXPORT bool prefix_matches(const std::string &prefix, const std::string &key, std::string *tail = NULL);
 
 template<typename T>
@@ -383,6 +382,22 @@ DFHACK_EXPORT bool split_string(std::vector<std::string> *out,
                                 bool squash_empty = false);
 DFHACK_EXPORT std::string join_strings(const std::string &separator, const std::vector<std::string> &items);
 
+template<typename T>
+inline std::string join_strings(const std::string &separator, T &items) {
+    std::stringstream ss;
+
+    bool first = true;
+    for (auto &item : items) {
+        if (first)
+            first = false;
+        else
+            ss << separator;
+        ss << item;
+    }
+
+    return ss.str();
+}
+
 DFHACK_EXPORT std::string toUpper(const std::string &str);
 DFHACK_EXPORT std::string toLower(const std::string &str);
 DFHACK_EXPORT std::string to_search_normalized(const std::string &str);
@@ -459,3 +474,5 @@ DFHACK_EXPORT std::string UTF2DF(const std::string &in);
 DFHACK_EXPORT std::string DF2UTF(const std::string &in);
 DFHACK_EXPORT std::string DF2CONSOLE(const std::string &in);
 DFHACK_EXPORT std::string DF2CONSOLE(DFHack::color_ostream &out, const std::string &in);
+
+DFHACK_EXPORT std::string cxx_demangle(const std::string &mangled_name, std::string *status_out);
diff --git a/library/include/PluginManager.h b/library/include/PluginManager.h
index 6bef8a74c..5cf8bb390 100644
--- a/library/include/PluginManager.h
+++ b/library/include/PluginManager.h
@@ -35,8 +35,6 @@ distribution.
 #include "Core.h"
 #include "DataFuncs.h"
 
-#include "RemoteClient.h"
-
 typedef struct lua_State lua_State;
 
 namespace tthread
@@ -201,12 +199,6 @@ namespace DFHack
 
         void open_lua(lua_State *state, int table);
 
-        command_result eval_ruby(color_ostream &out, const char* cmd) {
-            if (!plugin_eval_ruby || !is_enabled())
-                return CR_FAILURE;
-            return plugin_eval_ruby(out, cmd);
-        }
-
     private:
         RefLock * access;
         std::vector <PluginCommand> commands;
@@ -244,7 +236,6 @@ namespace DFHack
         command_result (*plugin_onstatechange)(color_ostream &, state_change_event);
         command_result (*plugin_enable)(color_ostream &, bool);
         RPCService* (*plugin_rpcconnect)(color_ostream &);
-        command_result (*plugin_eval_ruby)(color_ostream &, const char*);
         command_result (*plugin_save_data)(color_ostream &);
         command_result (*plugin_load_data)(color_ostream &);
     };
@@ -282,7 +273,6 @@ namespace DFHack
         bool CanInvokeHotkey(const std::string &command, df::viewscreen *top);
         Plugin* operator[] (const std::string name);
         std::size_t size();
-        Plugin *ruby;
 
         std::map<std::string, Plugin*>::iterator begin();
         std::map<std::string, Plugin*>::iterator end();
@@ -308,14 +298,16 @@ namespace DFHack
 };
 
 #define DFHACK_PLUGIN_AUX(m_plugin_name, is_dev) \
+extern "C" { \
     DFhackDataExport const char * plugin_name = m_plugin_name;\
     DFhackDataExport const char * plugin_version = DFHack::Version::dfhack_version();\
     DFhackDataExport const char * plugin_git_description = DFHack::Version::git_description();\
     DFhackDataExport int plugin_abi_version = DFHack::Version::dfhack_abi_version();\
     DFhackDataExport DFHack::Plugin *plugin_self = NULL;\
-    std::vector<std::string> _plugin_globals;\
-    DFhackDataExport std::vector<std::string>* plugin_globals = &_plugin_globals; \
-    DFhackDataExport bool plugin_dev = is_dev;
+    std::vector<std::string> plugin_globals_noptr;\
+    DFhackDataExport std::vector<std::string>* plugin_globals = &plugin_globals_noptr; \
+    DFhackDataExport bool plugin_dev = is_dev; \
+}
 
 /// You have to include DFHACK_PLUGIN("plugin_name") in every plugin you write - just once. Ideally at the top of the main file.
 #ifdef DEV_PLUGIN
diff --git a/library/include/RemoteClient.h b/library/include/RemoteClient.h
index e71b985cd..921d351c3 100644
--- a/library/include/RemoteClient.h
+++ b/library/include/RemoteClient.h
@@ -26,6 +26,7 @@ distribution.
 #include "Pragma.h"
 #include "Export.h"
 #include "ColorText.h"
+#include "Core.h"
 
 class CPassiveSocket;
 class CActiveSocket;
@@ -39,17 +40,6 @@ namespace  DFHack
     using dfproto::IntMessage;
     using dfproto::StringMessage;
 
-    enum command_result
-    {
-        CR_LINK_FAILURE = -3,    // RPC call failed due to I/O or protocol error
-        CR_NEEDS_CONSOLE = -2,   // Attempt to call interactive command without console
-        CR_NOT_IMPLEMENTED = -1, // Command not implemented, or plugin not loaded
-        CR_OK = 0,               // Success
-        CR_FAILURE = 1,          // Failure
-        CR_WRONG_USAGE = 2,      // Wrong arguments or ui state
-        CR_NOT_FOUND = 3         // Target object not found (for RPC mainly)
-    };
-
     enum DFHackReplyCode : int16_t {
         RPC_REPLY_RESULT = -1,
         RPC_REPLY_FAIL = -2,
diff --git a/library/include/SDL_events.h b/library/include/SDL_events.h
deleted file mode 100644
index 80067f07d..000000000
--- a/library/include/SDL_events.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-// Fake - only structs. Shamelessly pilfered from the SDL library.
-// Needed for processing its event types without polluting our namespaces with C garbage
-
-#pragma once
-#include "SDL_keyboard.h"
-
-namespace SDL
-{
-    enum ButtonState
-    {
-        BTN_RELEASED = 0,
-        BTN_PRESSED = 1
-    };
-
-    /** Event enumerations */
-    enum EventType
-    {
-           ET_NOEVENT = 0,         /**< Unused (do not remove) */
-           ET_ACTIVEEVENT,         /**< Application loses/gains visibility */
-           ET_KEYDOWN,             /**< Keys pressed */
-           ET_KEYUP,               /**< Keys released */
-           ET_MOUSEMOTION,         /**< Mouse moved */
-           ET_MOUSEBUTTONDOWN,     /**< Mouse button pressed */
-           ET_MOUSEBUTTONUP,       /**< Mouse button released */
-           ET_JOYAXISMOTION,       /**< Joystick axis motion */
-           ET_JOYBALLMOTION,       /**< Joystick trackball motion */
-           ET_JOYHATMOTION,        /**< Joystick hat position change */
-           ET_JOYBUTTONDOWN,       /**< Joystick button pressed */
-           ET_JOYBUTTONUP,         /**< Joystick button released */
-           ET_QUIT,                /**< User-requested quit */
-           ET_SYSWMEVENT,          /**< System specific event */
-           ET_EVENT_RESERVEDA,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVEDB,     /**< Reserved for future use.. */
-           ET_VIDEORESIZE,         /**< User resized video mode */
-           ET_VIDEOEXPOSE,         /**< Screen needs to be redrawn */
-           ET_EVENT_RESERVED2,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED3,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED4,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED5,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED6,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED7,     /**< Reserved for future use.. */
-           /** Events ET_USEREVENT through ET_MAXEVENTS-1 are for your use */
-           ET_USEREVENT = 24,
-           /** This last event is only for bounding internal arrays
-        *  It is the number of bits in the event mask datatype -- Uint32
-            */
-           ET_NUMEVENTS = 32
-    };
-
-    /** Application visibility event structure */
-     struct ActiveEvent
-    {
-        uint8_t type;     /**< ET_ACTIVEEVENT */
-        uint8_t gain;     /**< Whether given states were gained or lost (1/0) */
-        uint8_t state;    /**< A mask of the focus states */
-    };
-
-    /** Keyboard event structure */
-    struct KeyboardEvent
-    {
-        uint8_t type;     /**< ET_KEYDOWN or ET_KEYUP */
-        uint8_t which;    /**< The keyboard device index */
-        uint8_t state;    /**< BTN_PRESSED or BTN_RELEASED */
-        keysym ksym;
-    };
-
-    /** Mouse motion event structure */
-    struct MouseMotionEvent
-    {
-        uint8_t type;   /**< ET_MOUSEMOTION */
-        uint8_t which;  /**< The mouse device index */
-        uint8_t state;  /**< The current button state */
-        uint16_t x, y;  /**< The X/Y coordinates of the mouse */
-        int16_t xrel;   /**< The relative motion in the X direction */
-        int16_t yrel;   /**< The relative motion in the Y direction */
-    };
-
-    /** Mouse button event structure */
-    struct MouseButtonEvent
-    {
-        uint8_t type;   /**< ET_MOUSEBUTTONDOWN or ET_MOUSEBUTTONUP */
-        uint8_t which;  /**< The mouse device index */
-        uint8_t button; /**< The mouse button index */
-        uint8_t state;  /**< BTN_PRESSED or BTN_RELEASED */
-        uint16_t x, y;  /**< The X/Y coordinates of the mouse at press time */
-    };
-
-    /** Joystick axis motion event structure */
-    struct JoyAxisEvent
-    {
-        uint8_t type;   /**< ET_JOYAXISMOTION */
-        uint8_t which;  /**< The joystick device index */
-        uint8_t axis;   /**< The joystick axis index */
-        int16_t value;  /**< The axis value (range: -32768 to 32767) */
-    };
-
-    /** Joystick trackball motion event structure */
-    struct JoyBallEvent
-    {
-        uint8_t type;   /**< ET_JOYBALLMOTION */
-        uint8_t which;  /**< The joystick device index */
-        uint8_t ball;   /**< The joystick trackball index */
-        int16_t xrel;   /**< The relative motion in the X direction */
-        int16_t yrel;   /**< The relative motion in the Y direction */
-    };
-
-    /** Joystick hat position change event structure */
-    struct JoyHatEvent
-    {
-        uint8_t type;   /**< ET_JOYHATMOTION */
-        uint8_t which;  /**< The joystick device index */
-        uint8_t hat;    /**< The joystick hat index */
-        uint8_t value;  /**< The hat position value:
-                         *   SDL_HAT_LEFTUP   SDL_HAT_UP       SDL_HAT_RIGHTUP
-                         *   SDL_HAT_LEFT     SDL_HAT_CENTERED SDL_HAT_RIGHT
-                         *   SDL_HAT_LEFTDOWN SDL_HAT_DOWN     SDL_HAT_RIGHTDOWN
-                         *  Note that zero means the POV is centered.
-                         */
-    };
-
-    /** Joystick button event structure */
-    struct JoyButtonEvent
-    {
-        uint8_t type;   /**< ET_JOYBUTTONDOWN or ET_JOYBUTTONUP */
-        uint8_t which;  /**< The joystick device index */
-        uint8_t button; /**< The joystick button index */
-        uint8_t state;  /**< BTN_PRESSED or BTN_RELEASED */
-    };
-
-    /** The "window resized" event
-     *  When you get this event, you are responsible for setting a new video
-     *  mode with the new width and height.
-     */
-    struct ResizeEvent
-    {
-        uint8_t type;   /**< ET_VIDEORESIZE */
-        int w;          /**< New width */
-        int h;          /**< New height */
-    };
-
-    /** The "screen redraw" event */
-    struct ExposeEvent
-    {
-        uint8_t type;   /**< ET_VIDEOEXPOSE */
-    };
-
-    /** The "quit requested" event */
-    struct QuitEvent
-    {
-        uint8_t type;   /**< ET_QUIT */
-    };
-
-    /** A user-defined event type */
-    struct UserEvent
-    {
-        uint8_t type;   /**< ETL_USEREVENT through ET_NUMEVENTS-1 */
-        int code;       /**< User defined event code */
-        void *data1;    /**< User defined data pointer */
-        void *data2;    /**< User defined data pointer */
-    };
-
-    /** If you want to use this event, you should include SDL_syswm.h */
-    struct SysWMmsg;
-    struct SysWMEvent
-    {
-        uint8_t type;
-        SysWMmsg *msg;
-    };
-
-    /** General event structure */
-    union Event
-    {
-        uint8_t type;
-        ActiveEvent active;
-        KeyboardEvent key;
-        MouseMotionEvent motion;
-        MouseButtonEvent button;
-        JoyAxisEvent jaxis;
-        JoyBallEvent jball;
-        JoyHatEvent jhat;
-        JoyButtonEvent jbutton;
-        ResizeEvent resize;
-        ExposeEvent expose;
-        QuitEvent quit;
-        UserEvent user;
-        SysWMEvent syswm;
-    };
-}
diff --git a/library/include/SDL_keyboard.h b/library/include/SDL_keyboard.h
deleted file mode 100644
index 1d58bd63f..000000000
--- a/library/include/SDL_keyboard.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-// Fake - only structs. Shamelessly pilfered from the SDL library.
-// Needed for processing its event types without polluting our namespaces with C garbage
-
-#pragma once
-#include "SDL_keysym.h"
-#include <stdint.h>
-
-namespace SDL
-{
-    /** Keysym structure
-     *
-     *  - The scancode is hardware dependent, and should not be used by general
-     *    applications.  If no hardware scancode is available, it will be 0.
-     *
-     *  - The 'unicode' translated character is only available when character
-     *    translation is enabled by the SDL_EnableUNICODE() API.  If non-zero,
-     *    this is a UNICODE character corresponding to the keypress.  If the
-     *    high 9 bits of the character are 0, then this maps to the equivalent
-     *    ASCII character:
-     *      @code
-     *  char ch;
-     *  if ( (keysym.unicode & 0xFF80) == 0 ) {
-     *      ch = keysym.unicode & 0x7F;
-     *  } else {
-     *      An international character..
-     *  }
-     *      @endcode
-     */
-    typedef struct keysym
-    {
-        uint8_t scancode;       /**< hardware specific scancode */
-        Key sym;             /**< SDL virtual keysym */
-        Mod mod;             /**< current key modifiers */
-        uint16_t unicode;         /**< translated character */
-    } keysym;
-
-    /** This is the mask which refers to all hotkey bindings */
-    #define ALL_HOTKEYS     0xFFFFFFFF
-}
diff --git a/library/include/SDL_keysym.h b/library/include/SDL_keysym.h
deleted file mode 100644
index e19f786af..000000000
--- a/library/include/SDL_keysym.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-// Fake - only structs. Shamelessly pilfered from the SDL library.
-// Needed for processing its event types without polluting our namespaces with C garbage
-
-#pragma once
-
-namespace SDL
-{
-    /** What we really want is a mapping of every raw key on the keyboard.
-     *  To support international keyboards, we use the range 0xA1 - 0xFF
-     *  as international virtual keycodes.  We'll follow in the footsteps of X11...
-     *  @brief The names of the keys
-     */
-    enum Key
-    {
-        /** @name ASCII mapped keysyms
-         *  The keyboard syms have been cleverly chosen to map to ASCII
-         */
-        /*@{*/
-        K_UNKNOWN        = 0,
-        K_FIRST      = 0,
-        K_BACKSPACE      = 8,
-        K_TAB        = 9,
-        K_CLEAR      = 12,
-        K_RETURN     = 13,
-        K_PAUSE      = 19,
-        K_ESCAPE     = 27,
-        K_SPACE      = 32,
-        K_EXCLAIM        = 33,
-        K_QUOTEDBL       = 34,
-        K_HASH       = 35,
-        K_DOLLAR     = 36,
-        K_AMPERSAND      = 38,
-        K_QUOTE      = 39,
-        K_LEFTPAREN      = 40,
-        K_RIGHTPAREN     = 41,
-        K_ASTERISK       = 42,
-        K_PLUS       = 43,
-        K_COMMA      = 44,
-        K_MINUS      = 45,
-        K_PERIOD     = 46,
-        K_SLASH      = 47,
-        K_0          = 48,
-        K_1          = 49,
-        K_2          = 50,
-        K_3          = 51,
-        K_4          = 52,
-        K_5          = 53,
-        K_6          = 54,
-        K_7          = 55,
-        K_8          = 56,
-        K_9          = 57,
-        K_COLON      = 58,
-        K_SEMICOLON      = 59,
-        K_LESS       = 60,
-        K_EQUALS     = 61,
-        K_GREATER        = 62,
-        K_QUESTION       = 63,
-        K_AT         = 64,
-        /*
-           Skip uppercase letters
-         */
-        K_LEFTBRACKET    = 91,
-        K_BACKSLASH      = 92,
-        K_RIGHTBRACKET   = 93,
-        K_CARET      = 94,
-        K_UNDERSCORE     = 95,
-        K_BACKQUOTE      = 96,
-        K_a          = 97,
-        K_b          = 98,
-        K_c          = 99,
-        K_d          = 100,
-        K_e          = 101,
-        K_f          = 102,
-        K_g          = 103,
-        K_h          = 104,
-        K_i          = 105,
-        K_j          = 106,
-        K_k          = 107,
-        K_l          = 108,
-        K_m          = 109,
-        K_n          = 110,
-        K_o          = 111,
-        K_p          = 112,
-        K_q          = 113,
-        K_r          = 114,
-        K_s          = 115,
-        K_t          = 116,
-        K_u          = 117,
-        K_v          = 118,
-        K_w          = 119,
-        K_x          = 120,
-        K_y          = 121,
-        K_z          = 122,
-        K_DELETE     = 127,
-        /* End of ASCII mapped keysyms */
-        /*@}*/
-
-        /** @name International keyboard syms */
-        /*@{*/
-        K_WORLD_0        = 160,      /* 0xA0 */
-        K_WORLD_1        = 161,
-        K_WORLD_2        = 162,
-        K_WORLD_3        = 163,
-        K_WORLD_4        = 164,
-        K_WORLD_5        = 165,
-        K_WORLD_6        = 166,
-        K_WORLD_7        = 167,
-        K_WORLD_8        = 168,
-        K_WORLD_9        = 169,
-        K_WORLD_10       = 170,
-        K_WORLD_11       = 171,
-        K_WORLD_12       = 172,
-        K_WORLD_13       = 173,
-        K_WORLD_14       = 174,
-        K_WORLD_15       = 175,
-        K_WORLD_16       = 176,
-        K_WORLD_17       = 177,
-        K_WORLD_18       = 178,
-        K_WORLD_19       = 179,
-        K_WORLD_20       = 180,
-        K_WORLD_21       = 181,
-        K_WORLD_22       = 182,
-        K_WORLD_23       = 183,
-        K_WORLD_24       = 184,
-        K_WORLD_25       = 185,
-        K_WORLD_26       = 186,
-        K_WORLD_27       = 187,
-        K_WORLD_28       = 188,
-        K_WORLD_29       = 189,
-        K_WORLD_30       = 190,
-        K_WORLD_31       = 191,
-        K_WORLD_32       = 192,
-        K_WORLD_33       = 193,
-        K_WORLD_34       = 194,
-        K_WORLD_35       = 195,
-        K_WORLD_36       = 196,
-        K_WORLD_37       = 197,
-        K_WORLD_38       = 198,
-        K_WORLD_39       = 199,
-        K_WORLD_40       = 200,
-        K_WORLD_41       = 201,
-        K_WORLD_42       = 202,
-        K_WORLD_43       = 203,
-        K_WORLD_44       = 204,
-        K_WORLD_45       = 205,
-        K_WORLD_46       = 206,
-        K_WORLD_47       = 207,
-        K_WORLD_48       = 208,
-        K_WORLD_49       = 209,
-        K_WORLD_50       = 210,
-        K_WORLD_51       = 211,
-        K_WORLD_52       = 212,
-        K_WORLD_53       = 213,
-        K_WORLD_54       = 214,
-        K_WORLD_55       = 215,
-        K_WORLD_56       = 216,
-        K_WORLD_57       = 217,
-        K_WORLD_58       = 218,
-        K_WORLD_59       = 219,
-        K_WORLD_60       = 220,
-        K_WORLD_61       = 221,
-        K_WORLD_62       = 222,
-        K_WORLD_63       = 223,
-        K_WORLD_64       = 224,
-        K_WORLD_65       = 225,
-        K_WORLD_66       = 226,
-        K_WORLD_67       = 227,
-        K_WORLD_68       = 228,
-        K_WORLD_69       = 229,
-        K_WORLD_70       = 230,
-        K_WORLD_71       = 231,
-        K_WORLD_72       = 232,
-        K_WORLD_73       = 233,
-        K_WORLD_74       = 234,
-        K_WORLD_75       = 235,
-        K_WORLD_76       = 236,
-        K_WORLD_77       = 237,
-        K_WORLD_78       = 238,
-        K_WORLD_79       = 239,
-        K_WORLD_80       = 240,
-        K_WORLD_81       = 241,
-        K_WORLD_82       = 242,
-        K_WORLD_83       = 243,
-        K_WORLD_84       = 244,
-        K_WORLD_85       = 245,
-        K_WORLD_86       = 246,
-        K_WORLD_87       = 247,
-        K_WORLD_88       = 248,
-        K_WORLD_89       = 249,
-        K_WORLD_90       = 250,
-        K_WORLD_91       = 251,
-        K_WORLD_92       = 252,
-        K_WORLD_93       = 253,
-        K_WORLD_94       = 254,
-        K_WORLD_95       = 255,      /* 0xFF */
-        /*@}*/
-
-        /** @name Numeric keypad */
-        /*@{*/
-        K_KP0        = 256,
-        K_KP1        = 257,
-        K_KP2        = 258,
-        K_KP3        = 259,
-        K_KP4        = 260,
-        K_KP5        = 261,
-        K_KP6        = 262,
-        K_KP7        = 263,
-        K_KP8        = 264,
-        K_KP9        = 265,
-        K_KP_PERIOD      = 266,
-        K_KP_DIVIDE      = 267,
-        K_KP_MULTIPLY    = 268,
-        K_KP_MINUS       = 269,
-        K_KP_PLUS        = 270,
-        K_KP_ENTER       = 271,
-        K_KP_EQUALS      = 272,
-        /*@}*/
-
-        /** @name Arrows + Home/End pad */
-        /*@{*/
-        K_UP         = 273,
-        K_DOWN       = 274,
-        K_RIGHT      = 275,
-        K_LEFT       = 276,
-        K_INSERT     = 277,
-        K_HOME       = 278,
-        K_END        = 279,
-        K_PAGEUP     = 280,
-        K_PAGEDOWN       = 281,
-        /*@}*/
-
-        /** @name Function keys */
-        /*@{*/
-        K_F1         = 282,
-        K_F2         = 283,
-        K_F3         = 284,
-        K_F4         = 285,
-        K_F5         = 286,
-        K_F6         = 287,
-        K_F7         = 288,
-        K_F8         = 289,
-        K_F9         = 290,
-        K_F10        = 291,
-        K_F11        = 292,
-        K_F12        = 293,
-        K_F13        = 294,
-        K_F14        = 295,
-        K_F15        = 296,
-        /*@}*/
-
-        /** @name Key state modifier keys */
-        /*@{*/
-        K_NUMLOCK        = 300,
-        K_CAPSLOCK       = 301,
-        K_SCROLLOCK      = 302,
-        K_RSHIFT     = 303,
-        K_LSHIFT     = 304,
-        K_RCTRL      = 305,
-        K_LCTRL      = 306,
-        K_RALT       = 307,
-        K_LALT       = 308,
-        K_RMETA      = 309,
-        K_LMETA      = 310,
-        K_LSUPER     = 311,      /**< Left "Windows" key */
-        K_RSUPER     = 312,      /**< Right "Windows" key */
-        K_MODE       = 313,      /**< "Alt Gr" key */
-        K_COMPOSE        = 314,      /**< Multi-key compose key */
-        /*@}*/
-
-        /** @name Miscellaneous function keys */
-        /*@{*/
-        K_HELP       = 315,
-        K_PRINT      = 316,
-        K_SYSREQ     = 317,
-        K_BREAK      = 318,
-        K_MENU       = 319,
-        K_POWER      = 320,      /**< Power Macintosh power key */
-        K_EURO       = 321,      /**< Some european keyboards */
-        K_UNDO       = 322,      /**< Atari keyboard has Undo */
-        /*@}*/
-
-        /* Add any other keys here */
-
-        K_LAST
-    };
-
-    /** Enumeration of valid key mods (possibly OR'd together) */
-    enum Mod {
-        KMOD_NONE  = 0x0000,
-        KMOD_LSHIFT= 0x0001,
-        KMOD_RSHIFT= 0x0002,
-        KMOD_LCTRL = 0x0040,
-        KMOD_RCTRL = 0x0080,
-        KMOD_LALT  = 0x0100,
-        KMOD_RALT  = 0x0200,
-        KMOD_LMETA = 0x0400,
-        KMOD_RMETA = 0x0800,
-        KMOD_NUM   = 0x1000,
-        KMOD_CAPS  = 0x2000,
-        KMOD_MODE  = 0x4000,
-        KMOD_RESERVED = 0x8000,
-        KMOD_CTRL  = (KMOD_LCTRL|KMOD_RCTRL),
-        KMOD_SHIFT = (KMOD_LSHIFT|KMOD_RSHIFT),
-        KMOD_ALT   = (KMOD_LALT|KMOD_RALT),
-        KMOD_META  = (KMOD_LMETA|KMOD_RMETA)
-    };
-}
diff --git a/library/include/df/custom/coord.methods.inc b/library/include/df/custom/coord.methods.inc
index 6814be3c2..aa6eda484 100644
--- a/library/include/df/custom/coord.methods.inc
+++ b/library/include/df/custom/coord.methods.inc
@@ -3,7 +3,7 @@ coord(uint16_t _x, uint16_t _y, uint16_t _z) : x(_x), y(_y), z(_z) {}
 
 operator coord2d() const { return coord2d(x,y); }
 
-bool isValid() const { return x != -30000; }
+bool isValid() const { return x >= 0; }
 void clear() { x = y = z = -30000; }
 
 bool operator==(const coord &other) const
diff --git a/library/include/df/custom/coord2d.methods.inc b/library/include/df/custom/coord2d.methods.inc
index 202192bb8..512149ce3 100644
--- a/library/include/df/custom/coord2d.methods.inc
+++ b/library/include/df/custom/coord2d.methods.inc
@@ -1,6 +1,6 @@
 coord2d(uint16_t _x, uint16_t _y) : x(_x), y(_y) {}
 
-bool isValid() const { return x != -30000; }
+bool isValid() const { return x >= 0; }
 void clear() { x = y = -30000; }
 
 bool operator==(const coord2d &other) const
diff --git a/library/include/df/custom/enabler.methods.inc b/library/include/df/custom/enabler.methods.inc
index 26a23a4dd..5cc584bc2 100644
--- a/library/include/df/custom/enabler.methods.inc
+++ b/library/include/df/custom/enabler.methods.inc
@@ -1,6 +1,8 @@
 void zoom_display(df::zoom_commands command) {
-    SDL_SemWait(async_zoom.sem);
+    /*
+    DFHack::DFSDL::DFSDL_SemWait(async_zoom.sem);
     async_zoom.queue.push_back(command);
-    SDL_SemPost(async_zoom.sem);
-    SDL_SemPost(async_zoom.sem_fill);
+    DFHack::DFSDL::DFSDL_SemPost(async_zoom.sem);
+    DFHack::DFSDL::DFSDL_SemPost(async_zoom.sem_fill);
+    */
 }
diff --git a/library/include/modules/Buildings.h b/library/include/modules/Buildings.h
index aa539c02a..6fbe0d6e1 100644
--- a/library/include/modules/Buildings.h
+++ b/library/include/modules/Buildings.h
@@ -108,9 +108,9 @@ DFHACK_EXPORT df::general_ref *getGeneralRef(df::building *building, df::general
 DFHACK_EXPORT df::specific_ref *getSpecificRef(df::building *building, df::specific_ref_type type);
 
 /**
- * Sets the owner unit for the building.
+ * Sets the owner unit for the zone.
  */
-DFHACK_EXPORT bool setOwner(df::building *building, df::unit *owner);
+DFHACK_EXPORT bool setOwner(df::building_civzonest *building, df::unit *owner);
 
 /**
  * Find the building located at the specified tile.
@@ -151,9 +151,11 @@ DFHACK_EXPORT bool checkFreeTiles(df::coord pos, df::coord2d size,
 DFHACK_EXPORT int countExtentTiles(df::building_extents *ext, int defval = -1);
 
 /**
- * Checks if the building contains the specified tile.
+ * Checks if the building contains the specified tile. If the building has
+ * extents, returns whether tile is included within the extents. The x and y in
+ * tile are the map coordinates without the z component.
  */
-DFHACK_EXPORT bool containsTile(df::building *bld, df::coord2d tile, bool room = false);
+DFHACK_EXPORT bool containsTile(df::building *bld, df::coord2d tile);
 
 /**
  * Checks if the area has support from the terrain.
@@ -202,6 +204,11 @@ DFHACK_EXPORT bool deconstruct(df::building *bld);
  */
 DFHACK_EXPORT bool markedForRemoval(df::building *bld);
 
+/**
+ * Rebuilds a civzones building associations after it has been modified
+*/
+DFHACK_EXPORT void notifyCivzoneModified(df::building* bld);
+
 void updateBuildings(color_ostream& out, void* ptr);
 void clearBuildings(color_ostream& out);
 
@@ -230,7 +237,7 @@ DFHACK_EXPORT std::string getRoomDescription(df::building *building, df::unit *u
  * starting at the top left and moving right, row by row,
  * the block's items are checked for anything on the ground within that stockpile.
  */
-class DFHACK_EXPORT StockpileIterator : public std::iterator<std::input_iterator_tag, df::item>
+class DFHACK_EXPORT StockpileIterator
 {
     df::building_stockpilest* stockpile;
     df::map_block* block;
@@ -238,6 +245,12 @@ class DFHACK_EXPORT StockpileIterator : public std::iterator<std::input_iterator
     df::item *item;
 
 public:
+    using iterator_category = std::input_iterator_tag;
+    using value_type = df::item*;
+    using difference_type = std::ptrdiff_t;
+    using pointer = df::item**;
+    using reference = df::item*&;
+
     StockpileIterator() {
         stockpile = NULL;
         block = NULL;
@@ -268,7 +281,6 @@ DFHACK_EXPORT bool isActivityZone(df::building * building);
 DFHACK_EXPORT bool isPenPasture(df::building * building);
 DFHACK_EXPORT bool isPitPond(df::building * building);
 DFHACK_EXPORT bool isActive(df::building * building);
-DFHACK_EXPORT bool isHospital(df::building * building);
 DFHACK_EXPORT bool isAnimalTraining(df::building * building);
 
 DFHACK_EXPORT df::building* findPenPitAt(df::coord coord);
@@ -277,5 +289,10 @@ DFHACK_EXPORT df::building* findPenPitAt(df::coord coord);
  * Returns the units currently in the given cage
  */
 DFHACK_EXPORT bool getCageOccupants(df::building_cagest *cage, std::vector<df::unit*> &units);
+
+/**
+ * Finalizes a new building into the world
+ */
+DFHACK_EXPORT void completebuild(df::building* bld, char in_play);
 }
 }
diff --git a/library/include/modules/Burrows.h b/library/include/modules/Burrows.h
index 49b7df3c1..b2e3e56b4 100644
--- a/library/include/modules/Burrows.h
+++ b/library/include/modules/Burrows.h
@@ -45,7 +45,7 @@ namespace DFHack
 {
 namespace Burrows
 {
-    DFHACK_EXPORT df::burrow *findByName(std::string name);
+    DFHACK_EXPORT df::burrow *findByName(std::string name, bool ignore_final_plus = false);
 
     // Units
     DFHACK_EXPORT void clearUnits(df::burrow *burrow);
diff --git a/library/include/modules/DFSDL.h b/library/include/modules/DFSDL.h
new file mode 100644
index 000000000..c96147dfb
--- /dev/null
+++ b/library/include/modules/DFSDL.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "Export.h"
+#include "ColorText.h"
+
+struct SDL_Surface;
+struct SDL_Rect;
+struct SDL_PixelFormat;
+struct SDL_Window;
+union SDL_Event;
+
+namespace DFHack
+{
+    struct DFTileSurface
+    {
+        bool paintOver; // draw over original tile?
+        SDL_Surface* surface; // from where it should be drawn
+        SDL_Rect* rect; // from which coords (NULL to draw whole surface)
+        SDL_Rect* dstResize; // if not NULL dst rect will be resized (x/y/w/h will be added to original dst)
+    };
+
+/**
+ * The DFSDL module - provides access to SDL functions without actually
+ * requiring build-time linkage to SDL
+ * \ingroup grp_modules
+ * \ingroup grp_dfsdl
+ */
+namespace DFSDL
+{
+
+/**
+ * Call this on DFHack init so we can load the SDL functions. Returns false on
+ * failure.
+ */
+bool init(DFHack::color_ostream &out);
+
+/**
+ * Call this when DFHack is being unloaded.
+ */
+void cleanup();
+
+DFHACK_EXPORT SDL_Surface * DFIMG_Load(const char *file);
+DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
+DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
+DFHACK_EXPORT int DFSDL_UpperBlit(SDL_Surface *src, const SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect);
+DFHACK_EXPORT SDL_Surface * DFSDL_ConvertSurface(SDL_Surface *src, const SDL_PixelFormat *fmt, uint32_t flags);
+DFHACK_EXPORT void DFSDL_FreeSurface(SDL_Surface *surface);
+// DFHACK_EXPORT int DFSDL_SemWait(SDL_sem *sem);
+// DFHACK_EXPORT int DFSDL_SemPost(SDL_sem *sem);
+DFHACK_EXPORT int DFSDL_PushEvent(SDL_Event *event);
+DFHACK_EXPORT void DFSDL_free(void *ptr);
+DFHACK_EXPORT SDL_PixelFormat* DFSDL_AllocFormat(uint32_t pixel_format);
+DFHACK_EXPORT SDL_Surface* DFSDL_CreateRGBSurfaceWithFormat(uint32_t flags, int width, int height, int depth, uint32_t format);
+DFHACK_EXPORT int DFSDL_ShowSimpleMessageBox(uint32_t flags, const char *title, const char *message, SDL_Window *window);
+
+// submitted and returned text is UTF-8
+// see wrapper functions below for cp-437 variants
+DFHACK_EXPORT char * DFSDL_GetClipboardText();
+DFHACK_EXPORT int DFSDL_SetClipboardText(const char *text);
+
+}
+
+// System clipboard -- submitted and returned text must be in CP437
+DFHACK_EXPORT std::string getClipboardTextCp437();
+DFHACK_EXPORT bool setClipboardTextCp437(std::string text);
+
+}
diff --git a/library/include/modules/DFSteam.h b/library/include/modules/DFSteam.h
new file mode 100644
index 000000000..e604294f8
--- /dev/null
+++ b/library/include/modules/DFSteam.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "ColorText.h"
+#include "Export.h"
+
+namespace DFHack
+{
+
+/**
+ * The DFSteam module - provides access to Steam functions without actually
+ * requiring build-time linkage to Steam
+ * \ingroup grp_modules
+ * \ingroup grp_dfsdl
+ */
+namespace DFSteam
+{
+
+/**
+ * Call this on DFHack init so we can load the function pointers. Returns false on
+ * failure.
+ */
+bool init(DFHack::color_ostream& out);
+
+/**
+ * Call this when DFHack is being unloaded.
+ */
+void cleanup(DFHack::color_ostream& out);
+
+DFHACK_EXPORT void launchSteamDFHackIfNecessary(DFHack::color_ostream& out);
+
+}
+}
diff --git a/library/include/modules/Graphic.h b/library/include/modules/Graphic.h
index fa2cc30c6..22a5d4913 100644
--- a/library/include/modules/Graphic.h
+++ b/library/include/modules/Graphic.h
@@ -33,42 +33,11 @@ distribution.
 #include <stdint.h>
 #include "Export.h"
 #include "Module.h"
+#include "DFSDL.h"
 #include <vector>
 
 namespace DFHack
 {
-    // SDL stuff
-    typedef signed short SINT16;
-    typedef struct
-    {
-        int16_t x, y;
-        uint16_t w, h;
-    } DFSDL_Rect;
-    typedef struct
-    {
-        uint32_t flags;
-        void* format; // PixelFormat*
-        int w, h;
-        int pitch;
-        void* pixels;
-        void* userdata; // as far as i could see DF doesnt use this
-        int locked;
-        void* lock_data;
-        DFSDL_Rect clip_rect;
-        void* map;
-        int refcount;
-    } DFSDL_Surface;
-
-    // =========
-    struct DFTileSurface
-    {
-        bool paintOver; // draw over original tile?
-        DFSDL_Surface* surface; // from where it should be drawn
-        DFSDL_Rect* rect; // from which coords (NULL to draw whole surface)
-        DFSDL_Rect* dstResize; // if not NULL dst rect will be resized (x/y/w/h will be added to original dst)
-    };
-
-
     class DFHACK_EXPORT Graphic : public Module
     {
         public:
@@ -83,7 +52,6 @@ namespace DFHack
         private:
             std::vector<DFTileSurface* (*)(int, int)> funcs;
     };
-
 }
 
 #endif
diff --git a/library/include/modules/Gui.h b/library/include/modules/Gui.h
index 3ce2df0eb..7f21b78fc 100644
--- a/library/include/modules/Gui.h
+++ b/library/include/modules/Gui.h
@@ -33,9 +33,10 @@ distribution.
 
 #include "DataDefs.h"
 #include "df/init.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/announcement_type.h"
 #include "df/announcement_flags.h"
+#include "df/building_stockpilest.h"
 #include "df/report_init.h"
 #include "df/report_zoom_type.h"
 #include "df/unit_report_type.h"
@@ -65,7 +66,9 @@ namespace DFHack
      */
     namespace Gui
     {
-        DFHACK_EXPORT std::string getFocusString(df::viewscreen *top);
+        DFHACK_EXPORT std::vector<std::string> getFocusStrings(df::viewscreen *top);
+        DFHACK_EXPORT bool matchFocusString(std::string focus_string, df::viewscreen *top = NULL);
+
 
         // Full-screen item details view
         DFHACK_EXPORT bool item_details_hotkey(df::viewscreen *top);
@@ -102,11 +105,21 @@ namespace DFHack
         DFHACK_EXPORT df::item *getAnyItem(df::viewscreen *top);
         DFHACK_EXPORT df::item *getSelectedItem(color_ostream &out, bool quiet = false);
 
-        // A building is selected via 'q', 't' or 'i' (civzone)
+        // A building is selected via 'q', 't' or 'i' (?)
         DFHACK_EXPORT bool any_building_hotkey(df::viewscreen *top);
         DFHACK_EXPORT df::building *getAnyBuilding(df::viewscreen *top);
         DFHACK_EXPORT df::building *getSelectedBuilding(color_ostream &out, bool quiet = false);
 
+        // A (civ)zone is selected via 'z'
+        DFHACK_EXPORT bool any_civzone_hotkey(df::viewscreen* top);
+        DFHACK_EXPORT df::building_civzonest *getAnyCivZone(df::viewscreen* top);
+        DFHACK_EXPORT df::building_civzonest *getSelectedCivZone(color_ostream& out, bool quiet = false);
+
+        // A stockpile is selected via 'p'
+        DFHACK_EXPORT bool any_stockpile_hotkey(df::viewscreen* top);
+        DFHACK_EXPORT df::building_stockpilest *getAnyStockpile(df::viewscreen* top);
+        DFHACK_EXPORT df::building_stockpilest *getSelectedStockpile(color_ostream& out, bool quiet = false);
+
         // A plant is selected, e.g. via 'k'
         DFHACK_EXPORT bool any_plant_hotkey(df::viewscreen *top);
         DFHACK_EXPORT df::plant *getAnyPlant(df::viewscreen *top);
@@ -137,7 +150,7 @@ namespace DFHack
          */
         DFHACK_EXPORT df::coord getViewportPos();
         DFHACK_EXPORT df::coord getCursorPos();
-        DFHACK_EXPORT df::coord getMousePos();
+        DFHACK_EXPORT df::coord getMousePos(bool allow_out_of_bounds = false);
 
         static const int AREA_MAP_WIDTH = 23;
         static const int MENU_WIDTH = 30;
@@ -152,8 +165,8 @@ namespace DFHack
         DFHACK_EXPORT DwarfmodeDims getDwarfmodeViewDims();
 
         DFHACK_EXPORT void resetDwarfmodeView(bool pause = false);
-        DFHACK_EXPORT bool revealInDwarfmodeMap(int32_t x, int32_t y, int32_t z, bool center = false);
-        DFHACK_EXPORT inline bool revealInDwarfmodeMap(df::coord pos, bool center = false) { return revealInDwarfmodeMap(pos.x, pos.y, pos.z, center); };
+        DFHACK_EXPORT bool revealInDwarfmodeMap(int32_t x, int32_t y, int32_t z, bool center = false, bool highlight = false);
+        DFHACK_EXPORT inline bool revealInDwarfmodeMap(df::coord pos, bool center = false, bool highlight = false) { return revealInDwarfmodeMap(pos.x, pos.y, pos.z, center, highlight); };
         DFHACK_EXPORT bool pauseRecenter(int32_t x, int32_t y, int32_t z, bool pause = true);
         DFHACK_EXPORT inline bool pauseRecenter(df::coord pos, bool pause = true) { return pauseRecenter(pos.x, pos.y, pos.z, pause); };
         DFHACK_EXPORT bool refreshSidebar();
@@ -181,6 +194,9 @@ namespace DFHack
 
         DFHACK_EXPORT df::viewscreen *getViewscreenByIdentity(virtual_identity &id, int n = 1);
 
+        /// Get the top-most underlying DF viewscreen (not owned by DFHack)
+        DFHACK_EXPORT df::viewscreen *getDFViewscreen(bool skip_dismissed = false, df::viewscreen *top = NULL);
+
         /// Get the top-most viewscreen of the given type from the top `n` viewscreens (or all viewscreens if n < 1)
         /// returns NULL if none match
         template <typename T>
@@ -188,8 +204,8 @@ namespace DFHack
             return strict_virtual_cast<T>(getViewscreenByIdentity(T::_identity, n));
         }
 
-        inline std::string getCurFocus(bool skip_dismissed = false) {
-            return getFocusString(getCurViewscreen(skip_dismissed));
+        inline std::vector<std::string> getCurFocus(bool skip_dismissed = false) {
+            return getFocusStrings(getCurViewscreen(skip_dismissed));
         }
 
         /// get the size of the window buffer
diff --git a/library/include/modules/Items.h b/library/include/modules/Items.h
index 7f2c9ce69..05d0049cf 100644
--- a/library/include/modules/Items.h
+++ b/library/include/modules/Items.h
@@ -33,6 +33,8 @@ distribution.
 #include "MemAccess.h"
 
 #include "DataDefs.h"
+#include "df/building_tradedepotst.h"
+#include "df/caravan_state.h"
 #include "df/item.h"
 #include "df/item_type.h"
 #include "df/general_ref.h"
@@ -188,8 +190,8 @@ DFHACK_EXPORT df::proj_itemst *makeProjectile(MapExtras::MapCache &mc, df::item
 /// Gets value of base-quality item with specified type and material
 DFHACK_EXPORT int getItemBaseValue(int16_t item_type, int16_t item_subtype, int16_t mat_type, int32_t mat_subtype);
 
-/// Gets the value of a specific item, ignoring civ values and trade agreements
-DFHACK_EXPORT int getValue(df::item *item);
+/// Gets the value of a specific item, taking into account civ values and trade agreements if a caravan is given
+DFHACK_EXPORT int getValue(df::item *item, df::caravan_state *caravan = NULL);
 
 DFHACK_EXPORT int32_t createItem(df::item_type type, int16_t item_subtype, int16_t mat_type, int32_t mat_index, df::unit* creator);
 
@@ -197,13 +199,21 @@ DFHACK_EXPORT int32_t createItem(df::item_type type, int16_t item_subtype, int16
 DFHACK_EXPORT bool checkMandates(df::item *item);
 /// Checks whether the item can be traded
 DFHACK_EXPORT bool canTrade(df::item *item);
-/// Checks whether the item and all items it contains, if any, can be traded
+/// Returns false if the item or any contained items cannot be traded
 DFHACK_EXPORT bool canTradeWithContents(df::item *item);
+/// Returns true if the item is empty and can be traded or if the item contains any item that can be traded
+DFHACK_EXPORT bool canTradeAnyWithContents(df::item *item);
+/// marks the given item for trade at the given depot
+DFHACK_EXPORT bool markForTrade(df::item *item, df::building_tradedepotst *depot);
+/// Returns true if an active caravan will pay extra for the given item
+DFHACK_EXPORT bool isRequestedTradeGood(df::item *item, df::caravan_state *caravan = NULL);
 
 /// Checks whether the item is an assigned hauling vehicle
 DFHACK_EXPORT bool isRouteVehicle(df::item *item);
 /// Checks whether the item is assigned to a squad
 DFHACK_EXPORT bool isSquadEquipment(df::item *item);
+/// Returns the item's capacity as a storage container
+DFHACK_EXPORT int32_t getCapacity(df::item* item);
 
 }
 }
diff --git a/library/include/modules/Job.h b/library/include/modules/Job.h
index 2a874dc5e..fa10173a0 100644
--- a/library/include/modules/Job.h
+++ b/library/include/modules/Job.h
@@ -101,8 +101,8 @@ namespace DFHack
                                          df::job_item_ref::T_role role,
                                          int filter_idx = -1, int insert_idx = -1);
 
-        DFHACK_EXPORT bool isSuitableItem(df::job_item *item, df::item_type itype, int isubtype);
-        DFHACK_EXPORT bool isSuitableMaterial(df::job_item *item, int mat_type,
+        DFHACK_EXPORT bool isSuitableItem(const df::job_item *item, df::item_type itype, int isubtype);
+        DFHACK_EXPORT bool isSuitableMaterial(const df::job_item *item, int mat_type,
                                               int mat_index,
                                               df::item_type itype);
         DFHACK_EXPORT std::string getName(df::job *job);
diff --git a/library/include/modules/Kitchen.h b/library/include/modules/Kitchen.h
index ec161178e..ab064ac39 100644
--- a/library/include/modules/Kitchen.h
+++ b/library/include/modules/Kitchen.h
@@ -27,11 +27,6 @@ distribution.
 * kitchen settings
 */
 #include "Export.h"
-#include "Module.h"
-#include "Types.h"
-#include "VersionInfo.h"
-#include "Core.h"
-#include "modules/Items.h"
 #include "df/kitchen_exc_type.h"
 
 /**
@@ -58,24 +53,12 @@ DFHACK_EXPORT void allowPlantSeedCookery(int32_t plant_id);
 // add this plant to the exclusion list, if it is not already in it
 DFHACK_EXPORT void denyPlantSeedCookery(int32_t plant_id);
 
-// fills a map with info from the limit info storage entries in the exclusion list
-DFHACK_EXPORT void fillWatchMap(std::map<int32_t, int16_t>& watchMap);
-
-// Finds the index of a limit info storage entry. Returns -1 if not found.
-DFHACK_EXPORT int findLimit(int32_t plant_id);
-
-// removes a limit info storage entry from the exclusion list if it's present
-DFHACK_EXPORT bool removeLimit(int32_t plant_id);
-
-// add a limit info storage item to the exclusion list, or alters an existing one
-DFHACK_EXPORT bool setLimit(int32_t plant_id, int16_t limit);
-
-// clears all limit info storage items from the exclusion list
-DFHACK_EXPORT void clearLimits();
+DFHACK_EXPORT bool isPlantCookeryAllowed(int32_t plant_id);
+DFHACK_EXPORT bool isSeedCookeryAllowed(int32_t plant_id);
 
 DFHACK_EXPORT std::size_t size();
 
-// Finds the index of a kitchen exclusion in ui.kitchen.exc_types. Returns -1 if not found.
+// Finds the index of a kitchen exclusion in plotinfo.kitchen.exc_types. Returns -1 if not found.
 DFHACK_EXPORT int findExclusion(df::kitchen_exc_type type,
     df::item_type item_type, int16_t item_subtype,
     int16_t mat_type, int32_t mat_index);
diff --git a/library/include/modules/Maps.h b/library/include/modules/Maps.h
index 225efae17..9bb1dda25 100644
--- a/library/include/modules/Maps.h
+++ b/library/include/modules/Maps.h
@@ -293,13 +293,13 @@ extern DFHACK_EXPORT df::tiletype *getTileType(int32_t x, int32_t y, int32_t z);
 extern DFHACK_EXPORT df::tile_designation *getTileDesignation(int32_t x, int32_t y, int32_t z);
 extern DFHACK_EXPORT df::tile_occupancy *getTileOccupancy(int32_t x, int32_t y, int32_t z);
 
-inline df::tiletype *getTileType(df::coord pos) {
+inline df::tiletype *getTileType(const df::coord &pos) {
     return getTileType(pos.x, pos.y, pos.z);
 }
-inline df::tile_designation *getTileDesignation(df::coord pos) {
+inline df::tile_designation *getTileDesignation(const df::coord &pos) {
     return getTileDesignation(pos.x, pos.y, pos.z);
 }
-inline df::tile_occupancy *getTileOccupancy(df::coord pos) {
+inline df::tile_occupancy *getTileOccupancy(const df::coord &pos) {
     return getTileOccupancy(pos.x, pos.y, pos.z);
 }
 
@@ -339,6 +339,7 @@ extern DFHACK_EXPORT bool SortBlockEvents(df::map_block *block,
 extern DFHACK_EXPORT bool RemoveBlockEvent(int32_t x, int32_t y, int32_t z, df::block_square_event * which );
 extern DFHACK_EXPORT bool RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square_event * which ); // todo: deprecate me
 
+DFHACK_EXPORT uint16_t getWalkableGroup(df::coord pos);
 DFHACK_EXPORT bool canWalkBetween(df::coord pos1, df::coord pos2);
 DFHACK_EXPORT bool canStepBetween(df::coord pos1, df::coord pos2);
 
@@ -349,8 +350,8 @@ extern DFHACK_EXPORT df::plant *getPlantAtTile(int32_t x, int32_t y, int32_t z);
 
 inline df::plant *getPlantAtTile(df::coord pos) { return getPlantAtTile(pos.x, pos.y, pos.z); }
 
-DFHACK_EXPORT df::enums::biome_type::biome_type GetBiomeType(int world_coord_x, int world_coord_y);
-DFHACK_EXPORT df::enums::biome_type::biome_type GetBiomeTypeWithRef(int world_coord_x, int world_coord_y, int world_ref_y_coord);
+DFHACK_EXPORT df::enums::biome_type::biome_type getBiomeType(int world_coord_x, int world_coord_y);
+DFHACK_EXPORT df::enums::biome_type::biome_type getBiomeTypeWithRef(int world_coord_x, int world_coord_y, int world_ref_y_coord);
 
 }
 
diff --git a/library/include/modules/Materials.h b/library/include/modules/Materials.h
index 74acf5a8d..3cdf146c9 100644
--- a/library/include/modules/Materials.h
+++ b/library/include/modules/Materials.h
@@ -139,25 +139,25 @@ namespace DFHack
         std::string getToken() const;
         std::string toString(uint16_t temp = 10015, bool named = true) const;
 
-        bool isAnyCloth();
+        bool isAnyCloth() const;
 
-        void getMatchBits(df::job_item_flags1 &ok, df::job_item_flags1 &mask);
-        void getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &mask);
-        void getMatchBits(df::job_item_flags3 &ok, df::job_item_flags3 &mask);
+        void getMatchBits(df::job_item_flags1 &ok, df::job_item_flags1 &mask) const;
+        void getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &mask) const;
+        void getMatchBits(df::job_item_flags3 &ok, df::job_item_flags3 &mask) const;
 
         df::craft_material_class getCraftClass();
 
-        bool matches(const MaterialInfo &mat)
+        bool matches(const MaterialInfo &mat) const
         {
             if (!mat.isValid()) return true;
             return (type == mat.type) &&
                    (mat.index == -1 || index == mat.index);
         }
 
-        bool matches(const df::job_material_category &cat);
-        bool matches(const df::dfhack_material_category &cat);
+        bool matches(const df::job_material_category &cat) const;
+        bool matches(const df::dfhack_material_category &cat) const;
         bool matches(const df::job_item &item,
-                     df::item_type itype = df::item_type::NONE);
+                     df::item_type itype = df::item_type::NONE) const;
     };
 
     DFHACK_EXPORT bool parseJobMaterialCategory(df::job_material_category *cat, const std::string &token);
@@ -169,6 +169,9 @@ namespace DFHack
     inline bool operator!= (const MaterialInfo &a, const MaterialInfo &b) {
         return a.type != b.type || a.index != b.index;
     }
+    inline bool operator< (const MaterialInfo &a, const MaterialInfo &b) {
+        return a.type < b.type || (a.type == b.type && a.index < b.index);
+    }
 
     DFHACK_EXPORT bool isSoilInorganic(int material);
     DFHACK_EXPORT bool isStoneInorganic(int material);
diff --git a/library/include/modules/Military.h b/library/include/modules/Military.h
new file mode 100644
index 000000000..8ceb987b5
--- /dev/null
+++ b/library/include/modules/Military.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Export.h"
+#include "DataDefs.h"
+
+#include "df/squad.h"
+
+namespace DFHack
+{
+namespace Military
+{
+
+DFHACK_EXPORT std::string getSquadName(int32_t squad_id);
+DFHACK_EXPORT df::squad* makeSquad(int32_t assignment_id);
+DFHACK_EXPORT void updateRoomAssignments(int32_t squad_id, int32_t civzone_id, df::squad_use_flags flags);
+
+}
+}
diff --git a/library/include/modules/Screen.h b/library/include/modules/Screen.h
index 347df1011..96f1f6642 100644
--- a/library/include/modules/Screen.h
+++ b/library/include/modules/Screen.h
@@ -36,6 +36,8 @@ distribution.
 #include "DataDefs.h"
 #include "df/graphic.h"
 #include "df/viewscreen.h"
+#include "df/building_civzonest.h"
+#include "df/building_stockpilest.h"
 #include "df/zoom_commands.h"
 
 #include "modules/GuiHooks.h"
@@ -84,6 +86,11 @@ namespace DFHack
             } tile_mode;
             int8_t tile_fg, tile_bg;
 
+            bool write_to_lower = false;
+            bool keep_lower = false;
+            bool top_of_text = false;
+            bool bottom_of_text = false;
+
             bool valid() const { return tile >= 0; }
             bool empty() const { return ch == 0 && tile == 0; }
 
@@ -186,7 +193,7 @@ namespace DFHack
         }
 
         /// Wrapper to call enabler->zoom_display from plugins
-        DFHACK_EXPORT void zoom(df::zoom_commands cmd);
+        //DFHACK_EXPORT void zoom(df::zoom_commands cmd);
 
         /// Returns the state of [GRAPHICS:YES/NO]
         DFHACK_EXPORT bool inGraphicsMode();
@@ -222,6 +229,10 @@ namespace DFHack
         DFHACK_EXPORT void dismiss(df::viewscreen *screen, bool to_first = false);
         DFHACK_EXPORT bool isDismissed(df::viewscreen *screen);
         DFHACK_EXPORT bool hasActiveScreens(Plugin *p);
+        DFHACK_EXPORT void raise(df::viewscreen *screen);
+
+        // returns a new set of interface keys that ensures that string input matches the DF text buffer
+        DFHACK_EXPORT std::set<df::interface_key> normalize_text_keys(const std::set<df::interface_key>& keys);
 
         /// Retrieve the string representation of the bound key.
         DFHACK_EXPORT std::string getKeyDisplay(df::interface_key key);
@@ -314,9 +325,10 @@ namespace DFHack
 
             static const int RESTORE_AT_TOP = 0x1;
         private:
-            void extract(df::viewscreen*);
-            void merge(df::viewscreen*);
+            void extract();
+            void merge();
             df::viewscreen* screen;
+            df::viewscreen* prev_parent;
             int flags;
         };
     }
@@ -344,6 +356,7 @@ namespace DFHack
 
         virtual bool is_lua_screen() { return false; }
 
+        virtual bool isFocused() { return true; }
         virtual std::string getFocusString() = 0;
         virtual void onShow() {};
         virtual void onDismiss() {};
@@ -351,6 +364,8 @@ namespace DFHack
         virtual df::item *getSelectedItem() { return nullptr; }
         virtual df::job *getSelectedJob() { return nullptr; }
         virtual df::building *getSelectedBuilding() { return nullptr; }
+        virtual df::building_stockpilest *getSelectedStockpile() { return nullptr; }
+        virtual df::building_civzonest *getSelectedCivZone() { return nullptr; }
         virtual df::plant *getSelectedPlant() { return nullptr; }
 
         static virtual_identity _identity;
@@ -358,6 +373,7 @@ namespace DFHack
 
     class DFHACK_EXPORT dfhack_lua_viewscreen : public dfhack_viewscreen {
         std::string focus;
+        bool defocused = false;
 
         void update_focus(lua_State *L, int idx);
 
@@ -375,8 +391,10 @@ namespace DFHack
         virtual ~dfhack_lua_viewscreen();
 
         static df::viewscreen *get_pointer(lua_State *L, int idx, bool make);
+        static void markInputAsHandled();
 
         virtual bool is_lua_screen() { return true; }
+        virtual bool isFocused() { return !defocused; }
         virtual std::string getFocusString() { return focus; }
 
         virtual void render();
@@ -393,6 +411,8 @@ namespace DFHack
         virtual df::item *getSelectedItem();
         virtual df::job *getSelectedJob();
         virtual df::building *getSelectedBuilding();
+        virtual df::building_civzonest *getSelectedCivZone();
+        virtual df::building_stockpilest *getSelectedStockpile();
         virtual df::plant *getSelectedPlant();
 
         static virtual_identity _identity;
diff --git a/library/include/modules/Textures.h b/library/include/modules/Textures.h
new file mode 100644
index 000000000..b820c3332
--- /dev/null
+++ b/library/include/modules/Textures.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "ColorText.h"
+#include "Export.h"
+
+struct SDL_Surface;
+
+typedef uintptr_t TexposHandle;
+
+namespace DFHack {
+
+/**
+ * The Textures module - loads and provides access to DFHack textures
+ * \ingroup grp_modules
+ * \ingroup grp_textures
+ */
+namespace Textures {
+
+const uint32_t TILE_WIDTH_PX = 8;
+const uint32_t TILE_HEIGHT_PX = 12;
+
+/**
+ * Load texture and get handle.
+ * Keep it to obtain valid texpos.
+ */
+DFHACK_EXPORT TexposHandle loadTexture(SDL_Surface* surface, bool reserved = false);
+
+/**
+ * Load tileset from image file.
+ * Return vector of handles to obtain valid texposes.
+ */
+DFHACK_EXPORT std::vector<TexposHandle> loadTileset(const std::string& file,
+                                                    int tile_px_w = TILE_WIDTH_PX,
+                                                    int tile_px_h = TILE_HEIGHT_PX,
+                                                    bool reserved = false);
+
+/**
+ * Get texpos by handle.
+ * Always use this function, if you need to get valid texpos for your texture.
+ * Texpos can change on game textures reset, but handle will be the same.
+ */
+DFHACK_EXPORT long getTexposByHandle(TexposHandle handle);
+
+/**
+ * Delete all info about texture by TexposHandle
+ */
+DFHACK_EXPORT void deleteHandle(TexposHandle handle);
+
+/**
+ * Create new texture with RGBA32 format and pixels as data in row major order.
+ * Register this texture and return TexposHandle.
+ */
+DFHACK_EXPORT TexposHandle createTile(std::vector<uint32_t>& pixels, int tile_px_w = TILE_WIDTH_PX,
+                                      int tile_px_h = TILE_HEIGHT_PX, bool reserved = false);
+
+/**
+ * Create new textures as tileset with RGBA32 format and pixels as data in row major order.
+ * Register this textures and return vector of TexposHandle.
+ */
+DFHACK_EXPORT std::vector<TexposHandle> createTileset(std::vector<uint32_t>& pixels,
+                                                      int texture_px_w, int texture_px_h,
+                                                      int tile_px_w = TILE_WIDTH_PX,
+                                                      int tile_px_h = TILE_HEIGHT_PX,
+                                                      bool reserved = false);
+
+/**
+ * Call this on DFHack init just once to setup interposed handlers and
+ * init static assets.
+ */
+void init(DFHack::color_ostream& out);
+
+/**
+ * Call this when DFHack is being unloaded.
+ *
+ */
+void cleanup();
+
+} // namespace Textures
+} // namespace DFHack
diff --git a/library/include/modules/Units.h b/library/include/modules/Units.h
index effa7cd1a..11a6c120a 100644
--- a/library/include/modules/Units.h
+++ b/library/include/modules/Units.h
@@ -109,14 +109,22 @@ DFHACK_EXPORT bool isWar(df::unit* unit);
 DFHACK_EXPORT bool isTame(df::unit* unit);
 DFHACK_EXPORT bool isTamable(df::unit* unit);
 DFHACK_EXPORT bool isDomesticated(df::unit* unit);
+DFHACK_EXPORT bool isMarkedForTraining(df::unit* unit);
+DFHACK_EXPORT bool isMarkedForTaming(df::unit* unit);
+DFHACK_EXPORT bool isMarkedForWarTraining(df::unit* unit);
+DFHACK_EXPORT bool isMarkedForHuntTraining(df::unit* unit);
 DFHACK_EXPORT bool isMarkedForSlaughter(df::unit* unit);
+DFHACK_EXPORT bool isMarkedForGelding(df::unit* unit);
+DFHACK_EXPORT bool isGeldable(df::unit* unit);
 DFHACK_EXPORT bool isGelded(df::unit* unit);
 DFHACK_EXPORT bool isEggLayer(df::unit* unit);
+DFHACK_EXPORT bool isEggLayerRace(df::unit* unit);
 DFHACK_EXPORT bool isGrazer(df::unit* unit);
 DFHACK_EXPORT bool isMilkable(df::unit* unit);
 DFHACK_EXPORT bool isForest(df::unit* unit);
 DFHACK_EXPORT bool isMischievous(df::unit *unit);
 DFHACK_EXPORT bool isAvailableForAdoption(df::unit* unit);
+DFHACK_EXPORT bool isPet(df::unit* unit);
 
 DFHACK_EXPORT bool hasExtravision(df::unit *unit);
 DFHACK_EXPORT bool isOpposedToLife(df::unit *unit);
@@ -145,6 +153,9 @@ DFHACK_EXPORT df::unit *getUnit(const int32_t index);
 DFHACK_EXPORT bool getUnitsInBox(std::vector<df::unit*> &units,
     int16_t x1, int16_t y1, int16_t z1,
     int16_t x2, int16_t y2, int16_t z2);
+DFHACK_EXPORT bool getUnitsByNobleRole(std::vector<df::unit *> &units, std::string noble);
+DFHACK_EXPORT df::unit *getUnitByNobleRole(std::string noble);
+DFHACK_EXPORT bool getCitizens(std::vector<df::unit *> &citizens, bool ignore_sanity = false);
 
 DFHACK_EXPORT int32_t findIndexById(int32_t id);
 
@@ -179,11 +190,13 @@ DFHACK_EXPORT std::string getRaceName(df::unit* unit);
 DFHACK_EXPORT std::string getPhysicalDescription(df::unit* unit);
 DFHACK_EXPORT std::string getRaceNamePluralById(int32_t race_id);
 DFHACK_EXPORT std::string getRaceNamePlural(df::unit* unit);
+DFHACK_EXPORT std::string getRaceReadableNameById(int32_t race_id);
+DFHACK_EXPORT std::string getRaceReadableName(df::unit* unit);
 DFHACK_EXPORT std::string getRaceBabyNameById(int32_t race_id);
 DFHACK_EXPORT std::string getRaceBabyName(df::unit* unit);
 DFHACK_EXPORT std::string getRaceChildNameById(int32_t race_id);
 DFHACK_EXPORT std::string getRaceChildName(df::unit* unit);
-
+DFHACK_EXPORT std::string getReadableName(df::unit* unit);
 
 DFHACK_EXPORT double getAge(df::unit *unit, bool true_age = false);
 DFHACK_EXPORT int getKillCount(df::unit *unit);
@@ -216,8 +229,6 @@ DFHACK_EXPORT df::goal_type getGoalType(df::unit *unit, size_t goalIndex = 0);
 DFHACK_EXPORT std::string getGoalName(df::unit *unit, size_t goalIndex = 0);
 DFHACK_EXPORT bool isGoalAchieved(df::unit *unit, size_t goalIndex = 0);
 
-DFHACK_EXPORT std::string getSquadName(df::unit *unit);
-
 DFHACK_EXPORT df::activity_entry *getMainSocialActivity(df::unit *unit);
 DFHACK_EXPORT df::activity_event *getMainSocialEvent(df::unit *unit);
 
diff --git a/library/lua/argparse.lua b/library/lua/argparse.lua
index e094bbb57..0a652f428 100644
--- a/library/lua/argparse.lua
+++ b/library/lua/argparse.lua
@@ -3,7 +3,6 @@
 local _ENV = mkmodule('argparse')
 
 local getopt = require('3rdparty.alt_getopt')
-local guidm = require('gui.dwarfmode')
 
 function processArgs(args, validArgs)
     local result = {}
@@ -174,6 +173,7 @@ end
 
 function coords(arg, arg_name, skip_validation)
     if arg == 'here' then
+        local guidm = require('gui.dwarfmode')  -- globals may not be available yet
         local cursor = guidm.getCursorPos()
         if not cursor then
             arg_error(arg_name,
@@ -196,4 +196,16 @@ function coords(arg, arg_name, skip_validation)
     return pos
 end
 
+local toBool={["true"]=true,["yes"]=true,["y"]=true,["on"]=true,["1"]=true,
+              ["false"]=false,["no"]=false,["n"]=false,["off"]=false,["0"]=false}
+function boolean(arg, arg_name)
+    local arg_lower = string.lower(arg)
+    if toBool[arg_lower] == nil then
+        arg_error(arg_name,
+            'unknown value: "%s"; expected "true", "yes", "false", or "no"', arg)
+    end
+
+    return toBool[arg_lower]
+end
+
 return _ENV
diff --git a/library/lua/dfhack.lua b/library/lua/dfhack.lua
index 4a46040af..059c008d2 100644
--- a/library/lua/dfhack.lua
+++ b/library/lua/dfhack.lua
@@ -38,6 +38,9 @@ COLOR_LIGHTMAGENTA = 13
 COLOR_YELLOW = 14
 COLOR_WHITE = 15
 
+COLOR_GRAY = COLOR_GREY
+COLOR_DARKGRAY = COLOR_DARKGREY
+
 -- Events
 
 if dfhack.is_core_context then
@@ -51,6 +54,18 @@ if dfhack.is_core_context then
     SC_UNPAUSED = 8
 end
 
+-- User-changeable options
+
+dfhack.HIDE_CONSOLE_ON_STARTUP = true
+function dfhack.getHideConsoleOnStartup()
+    return dfhack.HIDE_CONSOLE_ON_STARTUP
+end
+
+dfhack.HIDE_ARMOK_TOOLS = false
+function dfhack.getHideArmokTools()
+    return dfhack.HIDE_ARMOK_TOOLS
+end
+
 -- Error handling
 
 safecall = dfhack.safecall
@@ -321,7 +336,7 @@ end
 function pos2xyz(pos)
     if pos then
         local x = pos.x
-        if x and x ~= -30000 then
+        if x and x >= 0 then
             return x, pos.y, pos.z
         end
     end
@@ -346,7 +361,7 @@ end
 function pos2xy(pos)
     if pos then
         local x = pos.x
-        if x and x ~= -30000 then
+        if x and x >= 0 then
             return x, pos.y
         end
     end
@@ -392,6 +407,14 @@ function ensure_key(t, key, default_value)
     return t[key]
 end
 
+function ensure_keys(t, key, ...)
+    t = ensure_key(t, key)
+    if select('#', ...) > 0 then
+        return ensure_keys(t, ...)
+    end
+    return t
+end
+
 -- String class extentions
 
 -- prefix is a literal string, not a pattern
@@ -657,16 +680,18 @@ function Script:get_flags()
         self.flags_mtime = mtime
         self._flags = {}
         local f = io.open(self.path)
-        local contents = f:read('*all')
-        f:close()
-        for line in contents:gmatch('%-%-@([^\n]+)') do
-            local chunk = load(line, self.path, 't', self._flags)
+        for line in f:lines() do
+            local at_tag = line:match('^%-%-@(.+)')
+            if not at_tag then goto continue end
+            local chunk = load(at_tag, self.path, 't', self._flags)
             if chunk then
                 chunk()
             else
                 dfhack.printerr('Parse error: ' .. line)
             end
+            ::continue::
         end
+        f:close()
     end
     return self._flags
 end
@@ -695,7 +720,19 @@ local valid_script_flags = {
     scripts = {required = false},
 }
 
+local warned_scripts = {}
+
 function dfhack.run_script(name,...)
+    if not warned_scripts[name] then
+        local helpdb = require('helpdb')
+        if helpdb.is_entry(name) and helpdb.get_entry_tags(name).unavailable then
+            warned_scripts[name] = true
+            dfhack.printerr(('UNTESTED WARNING: the "%s" script has not been validated to work well with this version of DF.'):format(name))
+            dfhack.printerr('It may not work as expected, or it may corrupt your game.')
+            qerror('Please run the command again to ignore this warning and proceed.')
+        end
+    end
+
     return dfhack.run_script_with_env(nil, name, nil, ...)
 end
 
@@ -756,7 +793,7 @@ function dfhack.run_script_with_env(envVars, name, flags, ...)
             elseif ((type(v.required) == 'boolean' and v.required) or
                     (type(v.required) == 'function' and v.required(flags))) then
                 if not script_flags[flag] then
-                    local msg = v.error or 'Flag "' .. flag .. '" not recognized'
+                    local msg = v.error or ('Flag "' .. flag .. '" not recognized')
                     error(name .. ': ' .. msg)
                 end
             end
@@ -859,7 +896,7 @@ end
 
 function dfhack.getSavePath()
     if dfhack.isWorldLoaded() then
-        return dfhack.getDFPath() .. '/data/save/' .. df.global.world.cur_savegame.save_dir
+        return dfhack.getDFPath() .. '/save/' .. df.global.world.cur_savegame.save_dir
     end
 end
 
@@ -893,14 +930,14 @@ if dfhack.is_core_context then
             local path = dfhack.getSavePath()
 
             if path and op == SC_WORLD_LOADED then
-                loadInitFile(path, path..'/raw/init.lua')
+                loadInitFile(path, path..'/init.lua')
 
-                local dirlist = dfhack.internal.getDir(path..'/raw/init.d/')
+                local dirlist = dfhack.internal.getDir(path..'/init.d/')
                 if dirlist then
                     table.sort(dirlist)
                     for i,name in ipairs(dirlist) do
                         if string.match(name,'%.lua$') then
-                            loadInitFile(path, path..'/raw/init.d/'..name)
+                            loadInitFile(path, path..'/init.d/'..name)
                         end
                     end
                 end
diff --git a/library/lua/gui.lua b/library/lua/gui.lua
index 31631b469..05d848bb3 100644
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@@ -2,6 +2,7 @@
 
 local _ENV = mkmodule('gui')
 
+local textures = require('gui.textures')
 local utils = require('utils')
 
 local dscreen = dfhack.screen
@@ -9,18 +10,30 @@ local getval = utils.getval
 
 local to_pen = dfhack.pen.parse
 
-CLEAR_PEN = to_pen{tile=909, ch=32, fg=0, bg=0}
+CLEAR_PEN = to_pen{tile=dfhack.internal.getAddress('init') and df.global.init.texpos_border_interior, ch=32, fg=0, bg=0, write_to_lower=true}
+TRANSPARENT_PEN = to_pen{tile=0, ch=0}
+KEEP_LOWER_PEN = to_pen{ch=32, fg=0, bg=0, keep_lower=true}
 
-local FAKE_INPUT_KEYS = {
-    _MOUSE_L = true,
-    _MOUSE_R = true,
+local function set_and_get_undo(field, is_set)
+    local prev_value = df.global.enabler[field]
+    df.global.enabler[field] = is_set and 1 or 0
+    return function() df.global.enabler[field] = prev_value end
+end
+
+local MOUSE_KEYS = {
+    _MOUSE_L = curry(set_and_get_undo, 'mouse_lbut'),
+    _MOUSE_R = curry(set_and_get_undo, 'mouse_rbut'),
+    _MOUSE_M = true,
     _MOUSE_L_DOWN = true,
     _MOUSE_R_DOWN = true,
-    _STRING = true,
+    _MOUSE_M_DOWN = true,
 }
 
+local FAKE_INPUT_KEYS = copyall(MOUSE_KEYS)
+FAKE_INPUT_KEYS._STRING = true
+
 function simulateInput(screen,...)
-    local keys = {}
+    local keys, enabled_mouse_keys = {}, {}
     local function push_key(arg)
         local kv = arg
         if type(arg) == 'string' then
@@ -28,6 +41,10 @@ function simulateInput(screen,...)
             if kv == nil and not FAKE_INPUT_KEYS[arg] then
                 error('Invalid keycode: '..arg)
             end
+            if MOUSE_KEYS[arg] then
+                df.global.enabler.tracking_on = 1
+                enabled_mouse_keys[arg] = true
+            end
         end
         if type(kv) == 'number' then
             keys[#keys+1] = kv
@@ -50,7 +67,16 @@ function simulateInput(screen,...)
             end
         end
     end
+    local undo_fns = {}
+    for mk, fn in pairs(MOUSE_KEYS) do
+        if type(fn) == 'function' then
+            table.insert(undo_fns, fn(enabled_mouse_keys[mk]))
+        end
+    end
     dscreen._doSimulateInput(screen, keys)
+    for _, undo_fn in ipairs(undo_fns) do
+        undo_fn()
+    end
 end
 
 function mkdims_xy(x1,y1,x2,y2)
@@ -477,11 +503,15 @@ end
 function View:getMousePos(view_rect)
     local rect = view_rect or self.frame_body
     local x,y = dscreen.getMousePos()
-    if rect and rect:inClipGlobalXY(x,y) then
+    if rect and x and rect:inClipGlobalXY(x,y) then
         return rect:localXY(x,y)
     end
 end
 
+function View:getMouseFramePos()
+    return self:getMousePos(ViewRect{rect=self.frame_rect})
+end
+
 function View:computeFrame(parent_rect)
     return mkdims_wh(0,0,parent_rect.width,parent_rect.height)
 end
@@ -679,39 +709,266 @@ function Screen:onRender()
     self:render(Painter.new())
 end
 
-------------------------
--- Framed screen object --
-------------------------
+-----------------------------
+-- Z-order swapping screen --
+-----------------------------
+
+DEFAULT_INITIAL_PAUSE = true
+
+ZScreen = defclass(ZScreen, Screen)
+ZScreen.ATTRS{
+    defocusable=true,
+    initial_pause=DEFAULT_NIL,
+    force_pause=false,
+    pass_pause=true,
+    pass_movement_keys=false,
+    pass_mouse_clicks=true,
+}
+
+function ZScreen:preinit(args)
+    if self.ATTRS.initial_pause == nil then
+        args.initial_pause = DEFAULT_INITIAL_PAUSE or
+                (self.ATTRS.pass_mouse_clicks == false)
+    end
+end
+
+function ZScreen:init()
+    self.saved_pause_state = df.global.pause_state
+    if self.initial_pause and dfhack.isMapLoaded() then
+        df.global.pause_state = true
+    end
+    self.defocused = false
+end
+
+function ZScreen:dismiss()
+    ZScreen.super.dismiss(self)
+    if (self.force_pause or self.initial_pause) and dfhack.isMapLoaded() then
+        -- never go from unpaused to paused, just from paused to unpaused
+        df.global.pause_state = df.global.pause_state and self.saved_pause_state
+    end
+end
+
+local NO_LOGIC_SCREENS = {
+    'viewscreen_loadgamest',
+    'viewscreen_adopt_regionst',
+    'viewscreen_export_regionst',
+    'viewscreen_choose_game_typest',
+    'viewscreen_worldst',
+}
+for _,v in ipairs(NO_LOGIC_SCREENS) do
+    if not df[v] then
+        error('invalid class name: ' .. v)
+    end
+    NO_LOGIC_SCREENS[df[v]] = true
+end
+
+-- this is necessary for middle-click map scrolling to function
+function ZScreen:onIdle()
+    if self.force_pause and dfhack.isMapLoaded() then
+        df.global.pause_state = true
+    end
+    if self._native and self._native.parent then
+        local vs_type = dfhack.gui.getDFViewscreen(true)._type
+        if NO_LOGIC_SCREENS[vs_type] then
+            self.force_pause = true
+            self.pass_movement_keys = false
+            self.pass_mouse_clicks = false
+        else
+            self._native.parent:logic()
+        end
+    end
+end
+
+function ZScreen:render(dc)
+    self:renderParent()
+    ZScreen.super.render(self, dc)
+end
+
+function ZScreen:hasFocus()
+    return not self.defocused
+            and dfhack.gui.getCurViewscreen(true) == self._native
+end
+
+function ZScreen:onInput(keys)
+    local has_mouse = self:isMouseOver()
+    if not self:hasFocus() then
+        if has_mouse and
+                (keys._MOUSE_L or keys._MOUSE_R or
+                 keys.CONTEXT_SCROLL_UP or keys.CONTEXT_SCROLL_DOWN or
+                 keys.CONTEXT_SCROLL_PAGEUP or keys.CONTEXT_SCROLL_PAGEDOWN) then
+            self:raise()
+        else
+            self:sendInputToParent(keys)
+            return true
+        end
+    end
+
+    if ZScreen.super.onInput(self, keys) then
+        -- noop
+    elseif self.pass_mouse_clicks and keys._MOUSE_L and not has_mouse then
+        self.defocused = self.defocusable
+        self:sendInputToParent(keys)
+    elseif keys.LEAVESCREEN or keys._MOUSE_R then
+        self:dismiss()
+    else
+        local passit = self.pass_pause and keys.D_PAUSE
+        if not passit and self.pass_mouse_clicks then
+            if keys.CONTEXT_SCROLL_UP or keys.CONTEXT_SCROLL_DOWN or
+                    keys.CONTEXT_SCROLL_PAGEUP or keys.CONTEXT_SCROLL_PAGEDOWN then
+                passit = true
+            else
+                for key in pairs(MOUSE_KEYS) do
+                    if keys[key] then
+                        passit = true
+                        break
+                    end
+                end
+            end
+        end
+        if not passit and self.pass_movement_keys then
+            passit = require('gui.dwarfmode').getMapKey(keys)
+        end
+        if passit then
+            self:sendInputToParent(keys)
+        end
+    end
+    return true
+end
+
+function ZScreen:raise()
+    if self:isDismissed() or self:hasFocus() then
+        return self
+    end
+    dscreen.raise(self)
+    self.defocused = false
+    return self
+end
+
+function ZScreen:isMouseOver()
+    for _,sv in ipairs(self.subviews) do
+        if sv:getMouseFramePos() then return true end
+    end
+end
+
+local function zscreen_get_any(scr, thing)
+    if not scr._native or not scr._native.parent then return nil end
+    return dfhack.gui['getAny'..thing](scr._native.parent)
+end
+function ZScreen:onGetSelectedUnit()
+    return zscreen_get_any(self, 'Unit')
+end
+function ZScreen:onGetSelectedItem()
+    return zscreen_get_any(self, 'Item')
+end
+function ZScreen:onGetSelectedBuilding()
+    return zscreen_get_any(self, 'Building')
+end
+function ZScreen:onGetSelectedStockpile()
+    return zscreen_get_any(self, 'Stockpile')
+end
+function ZScreen:onGetSelectedCivZone()
+    return zscreen_get_any(self, 'CivZone')
+end
+function ZScreen:onGetSelectedPlant()
+    return zscreen_get_any(self, 'Plant')
+end
+
+-- convenience subclass for modal dialogs
+ZScreenModal = defclass(ZScreenModal, ZScreen)
+ZScreenModal.ATTRS{
+    defocusable = false,
+    force_pause = true,
+    pass_pause = false,
+    pass_movement_keys = false,
+    pass_mouse_clicks = false,
+}
+
+-- Framed screen object
+--------------------------
 
 -- Plain grey-colored frame.
+-- deprecated
 GREY_FRAME = {
     frame_pen = to_pen{ ch = ' ', fg = COLOR_BLACK, bg = COLOR_GREY },
     title_pen = to_pen{ fg = COLOR_BLACK, bg = COLOR_WHITE },
     signature_pen = to_pen{ fg = COLOR_BLACK, bg = COLOR_GREY },
 }
 
--- The usual boundary used by the DF screens. Often has fancy pattern in tilesets.
+-- The boundary used by the pre-steam DF screens.
+-- deprecated
 BOUNDARY_FRAME = {
     frame_pen = to_pen{ ch = 0xDB, fg = COLOR_GREY, bg = COLOR_BLACK },
     title_pen = to_pen{ fg = COLOR_BLACK, bg = COLOR_GREY },
     signature_pen = to_pen{ fg = COLOR_BLACK, bg = COLOR_GREY },
 }
 
-GREY_LINE_FRAME = {
+local BASE_FRAME = {
     frame_pen = to_pen{ ch=206, fg=COLOR_GREY, bg=COLOR_BLACK },
-    t_frame_pen = to_pen{ tile=902, ch=205, fg=COLOR_GREY, bg=COLOR_BLACK },
-    l_frame_pen = to_pen{ tile=908, ch=186, fg=COLOR_GREY, bg=COLOR_BLACK },
-    b_frame_pen = to_pen{ tile=916, ch=205, fg=COLOR_GREY, bg=COLOR_BLACK },
-    r_frame_pen = to_pen{ tile=910, ch=186, fg=COLOR_GREY, bg=COLOR_BLACK },
-    lt_frame_pen = to_pen{ tile=901, ch=201, fg=COLOR_GREY, bg=COLOR_BLACK },
-    lb_frame_pen = to_pen{ tile=915, ch=200, fg=COLOR_GREY, bg=COLOR_BLACK },
-    rt_frame_pen = to_pen{ tile=903, ch=187, fg=COLOR_GREY, bg=COLOR_BLACK },
-    rb_frame_pen = to_pen{ tile=917, ch=188, fg=COLOR_GREY, bg=COLOR_BLACK },
     title_pen = to_pen{ fg=COLOR_BLACK, bg=COLOR_GREY },
+    inactive_title_pen = to_pen{ fg=COLOR_GREY, bg=COLOR_BLACK },
     signature_pen = to_pen{ fg=COLOR_GREY, bg=COLOR_BLACK },
+    paused_pen = to_pen{fg=COLOR_RED, bg=COLOR_BLACK},
 }
 
-function paint_frame(dc,rect,style,title)
+
+local function make_frame(tp, double_line)
+    local frame = copyall(BASE_FRAME)
+    frame.t_frame_pen = to_pen{ tile=curry(tp, 2), ch=double_line and 205 or 196, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.l_frame_pen = to_pen{ tile=curry(tp, 8), ch=double_line and 186 or 179, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.b_frame_pen = to_pen{ tile=curry(tp, 16), ch=double_line and 205 or 196, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.r_frame_pen = to_pen{ tile=curry(tp, 10), ch=double_line and 186 or 179, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.lt_frame_pen = to_pen{ tile=curry(tp, 1), ch=double_line and 201 or 218, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.lb_frame_pen = to_pen{ tile=curry(tp, 15), ch=double_line and 200 or 192, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.rt_frame_pen = to_pen{ tile=curry(tp, 3), ch=double_line and 187 or 191, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.rb_frame_pen = to_pen{ tile=curry(tp, 17), ch=double_line and 188 or 217, fg=COLOR_GREY, bg=COLOR_BLACK }
+    return frame
+end
+
+function FRAME_WINDOW(resizable)
+    local frame = make_frame(textures.tp_border_window, true)
+    if not resizable then
+        frame.rb_frame_pen = to_pen{ tile=curry(textures.tp_border_panel, 17), ch=double_line and 188 or 217, fg=COLOR_GREY, bg=COLOR_BLACK }
+    end
+    return frame
+end
+function FRAME_PANEL()
+    return make_frame(textures.tp_border_panel, false)
+end
+function FRAME_MEDIUM()
+    return make_frame(textures.tp_border_medium, false)
+end
+function FRAME_BOLD()
+    return make_frame(textures.tp_border_bold, true)
+end
+function FRAME_THIN()
+    return make_frame(textures.tp_border_thin, false)
+end
+function FRAME_INTERIOR()
+    local frame = make_frame(textures.tp_border_thin, false)
+    frame.signature_pen = false
+    return frame
+end
+function FRAME_INTERIOR_MEDIUM()
+    local frame = make_frame(textures.tp_border_medium, false)
+    frame.signature_pen = false
+    return frame
+end
+
+-- for compatibility with pre-steam code
+GREY_LINE_FRAME = FRAME_PANEL
+
+-- for compatibility with deprecated frame naming scheme
+WINDOW_FRAME = FRAME_WINDOW
+PANEL_FRAME = FRAME_PANEL
+MEDIUM_FRAME = FRAME_MEDIUM
+BOLD_FRAME = FRAME_BOLD
+INTERIOR_FRAME = FRAME_INTERIOR
+INTERIOR_MEDIUM_FRAME = FRAME_INTERIOR_MEDIUM
+
+function paint_frame(dc, rect, style, title, inactive, pause_forced, resizable)
+    if type(style) == 'function' then
+        style = style(resizable)
+    end
     local pen = style.frame_pen
     local x1,y1,x2,y2 = dc.x1+rect.x1, dc.y1+rect.y1, dc.x1+rect.x2, dc.y1+rect.y2
     dscreen.paintTile(style.lt_frame_pen or pen, x1, y1)
@@ -732,7 +989,13 @@ function paint_frame(dc,rect,style,title)
         if #tstr > x2-x1-1 then
             tstr = string.sub(tstr,1,x2-x1-1)
         end
-        dscreen.paintString(style.title_pen or pen, x, y1, tstr)
+        dscreen.paintString(inactive and style.inactive_title_pen or style.title_pen or pen,
+                            x, y1, tstr)
+    end
+
+    if pause_forced then
+        dscreen.paintString(style.paused_pen or style.title_pen or pen,
+                            x1+2, y2, ' PAUSE FORCED ')
     end
 end
 
@@ -767,4 +1030,15 @@ function FramedScreen:onRenderFrame(dc, rect)
     paint_frame(dc,rect,self.frame_style,self.frame_title)
 end
 
+function FramedScreen:onInput(keys)
+    FramedScreen.super.onInput(self, keys)
+    return true -- FramedScreens are modal
+end
+
+-- Inverts the brightness of the color, optionally taking a "bold" parameter,
+-- which you should include if you're reading the fg color of a pen.
+function invert_color(color, bold)
+    color = bold and (color + 8) or color
+    return (color + 8) % 16
+end
 return _ENV
diff --git a/library/lua/gui/buildings.lua b/library/lua/gui/buildings.lua
index 8871346f2..93b0e2182 100644
--- a/library/lua/gui/buildings.lua
+++ b/library/lua/gui/buildings.lua
@@ -4,8 +4,6 @@ local _ENV = mkmodule('gui.buildings')
 
 local gui = require('gui')
 local widgets = require('gui.widgets')
-local dlg = require('gui.dialogs')
-local utils = require('utils')
 
 ARROW = string.char(26)
 
@@ -270,6 +268,7 @@ function BuildingDialog:onInput(keys)
         return true
     end
     self:inputToSubviews(keys)
+    return true
 end
 
 function showBuildingPrompt(title, prompt, on_select, on_cancel, build_filter)
diff --git a/library/lua/gui/dialogs.lua b/library/lua/gui/dialogs.lua
index e5448986f..63f9990c1 100644
--- a/library/lua/gui/dialogs.lua
+++ b/library/lua/gui/dialogs.lua
@@ -4,17 +4,14 @@ local _ENV = mkmodule('gui.dialogs')
 
 local gui = require('gui')
 local widgets = require('gui.widgets')
-local utils = require('utils')
-
-local dscreen = dfhack.screen
 
 MessageBox = defclass(MessageBox, gui.FramedScreen)
 
 MessageBox.focus_path = 'MessageBox'
 
 MessageBox.ATTRS{
-    frame_style = gui.GREY_LINE_FRAME,
-    frame_inset = 1,
+    frame_style = gui.WINDOW_FRAME,
+    frame_inset = {l=1, t=1, b=1, r=0},
     -- new attrs
     on_accept = DEFAULT_NIL,
     on_cancel = DEFAULT_NIL,
@@ -36,13 +33,14 @@ end
 function MessageBox:getWantedFrameSize()
     local label = self.subviews.label
     local width = math.max(self.frame_width or 0, 20, #(self.frame_title or '') + 4)
-    local text_area_width = label:getTextWidth()
-    if label.frame_inset then
-        -- account for scroll icons
-        text_area_width = text_area_width + (label.frame_inset.l or 0)
-        text_area_width = text_area_width + (label.frame_inset.r or 0)
+    local text_area_width = label:getTextWidth() + 1
+    local text_height = label:getTextHeight()
+    local sw, sh = dfhack.screen.getWindowSize()
+    if text_height > sh - 4 then
+        -- account for scrollbar
+        text_area_width = text_area_width + 2
     end
-    return math.max(width, text_area_width), label:getTextHeight()
+    return math.max(width, text_area_width), text_height
 end
 
 function MessageBox:onRenderFrame(dc,rect)
@@ -59,16 +57,17 @@ function MessageBox:onDestroy()
 end
 
 function MessageBox:onInput(keys)
-    if keys.SELECT or keys.LEAVESCREEN then
+    if keys.SELECT or keys.LEAVESCREEN or keys._MOUSE_R then
         self:dismiss()
         if keys.SELECT and self.on_accept then
             self.on_accept()
-        elseif keys.LEAVESCREEN and self.on_cancel then
+        elseif (keys.LEAVESCREEN or keys._MOUSE_R) and self.on_cancel then
             self.on_cancel()
         end
         return true
     end
-    return self:inputToSubviews(keys)
+    self:inputToSubviews(keys)
+    return true
 end
 
 function showMessage(title, text, tcolor, on_close)
@@ -130,14 +129,15 @@ function InputBox:onInput(keys)
             self.on_input(self.subviews.edit.text)
         end
         return true
-    elseif keys.LEAVESCREEN then
+    elseif keys.LEAVESCREEN or keys._MOUSE_R then
         self:dismiss()
         if self.on_cancel then
             self.on_cancel()
         end
         return true
     end
-    return self:inputToSubviews(keys)
+    self:inputToSubviews(keys)
+    return true
 end
 
 function showInputPrompt(title, text, tcolor, input, on_input, on_cancel, min_width)
@@ -219,7 +219,7 @@ end
 function ListBox:onRenderFrame(dc,rect)
     ListBox.super.onRenderFrame(self,dc,rect)
     if self.select2_hint then
-        dc:seek(rect.x1+2,rect.y2):key('SEC_SELECT'):string(': '..self.select2_hint,COLOR_GREY)
+       dc:seek(rect.x1+2,rect.y2):string('Shift-Click', COLOR_LIGHTGREEN):string(': '..self.select2_hint, COLOR_GREY)
     end
 end
 
@@ -231,14 +231,15 @@ function ListBox:getWantedFrameSize()
 end
 
 function ListBox:onInput(keys)
-    if keys.LEAVESCREEN then
+    if keys.LEAVESCREEN or keys._MOUSE_R then
         self:dismiss()
         if self.on_cancel then
             self.on_cancel()
         end
         return true
     end
-    return self:inputToSubviews(keys)
+    self:inputToSubviews(keys)
+    return true
 end
 
 function showListPrompt(title, text, tcolor, choices, on_select, on_cancel, min_width, filter)
diff --git a/library/lua/gui/dwarfmode.lua b/library/lua/gui/dwarfmode.lua
index 7ac29e04e..4c1a73f3a 100644
--- a/library/lua/gui/dwarfmode.lua
+++ b/library/lua/gui/dwarfmode.lua
@@ -29,46 +29,6 @@ SIDEBAR_MODE_KEYS = {
     [df.ui_sidebar_mode.ViewUnits]='D_VIEWUNIT',
 }
 
--- Sends ESC keycodes until we get to dwarfmode/Default and then enters the
--- specified sidebar mode with the corresponding keycode. If we don't get to
--- Default after max_esc presses of ESC (default value is 10), we throw an
--- error. The target sidebar mode must be a member of SIDEBAR_MODE_KEYS
-function enterSidebarMode(sidebar_mode, max_esc)
-    local navkey = SIDEBAR_MODE_KEYS[sidebar_mode]
-    if not navkey then
-        error(('Invalid or unsupported sidebar mode: %s (%s)')
-              :format(sidebar_mode, df.ui_sidebar_mode[sidebar_mode]))
-    end
-    local max_esc_num = tonumber(max_esc)
-    if max_esc and (not max_esc_num or max_esc_num <= 0) then
-        error(('max_esc must be a positive number: got %s')
-              :format(tostring(max_esc)))
-    end
-    local remaining_esc = max_esc_num or 10
-    local focus_string = ''
-    while remaining_esc > 0 do
-        local screen = dfhack.gui.getCurViewscreen(true)
-        focus_string = dfhack.gui.getFocusString(screen)
-        if df.global.ui.main.mode == df.ui_sidebar_mode.Default and
-                focus_string == 'dwarfmode/Default' then
-            if #navkey > 0 then gui.simulateInput(screen, navkey) end
-            if navkey == 'D_DESIGNATE' then
-                -- if the z-level happens to be on the surface, the mode will be
-                -- set to DesignateChopTrees. we need an extra step to get to
-                -- DesignateMine
-                gui.simulateInput(dfhack.gui.getCurViewscreen(true),
-                                 'DESIGNATE_DIG')
-            end
-            return
-        end
-        gui.simulateInput(screen, 'LEAVESCREEN')
-        remaining_esc = remaining_esc - 1
-    end
-    error(('Unable to get into target sidebar mode (%s) from' ..
-           ' current UI viewscreen (%s).'):format(
-                    df.ui_sidebar_mode[sidebar_mode], focus_string))
-end
-
 function getPanelLayout()
     local dims = dfhack.gui.getDwarfmodeViewDims()
     return {
@@ -275,7 +235,7 @@ end
 
 HOTKEY_KEYS = {}
 
-for i,v in ipairs(df.global.ui.main.hotkeys) do
+for i,v in ipairs(df.global.plotinfo.main.hotkeys) do
     HOTKEY_KEYS['D_HOTKEY'..(i+1)] = v
 end
 
@@ -286,6 +246,19 @@ function get_hotkey_target(key)
     end
 end
 
+function getMapKey(keys)
+    for code in pairs(keys) do
+        if MOVEMENT_KEYS[code] or HOTKEY_KEYS[code]
+                or code == '_MOUSE_M_DOWN' or code == '_MOUSE_M'
+                or code == 'ZOOM_OUT' or code == 'ZOOM_IN' then
+            if not HOTKEY_KEYS[code] or get_hotkey_target(code) then
+                return true
+            end
+            return code
+        end
+    end
+end
+
 function Viewport:scrollByKey(key)
     local dx, dy, dz = get_movement_delta(key, 10, 20)
     if dx then
@@ -339,13 +312,9 @@ function DwarfOverlay:selectBuilding(building,cursor,viewport,gap)
 end
 
 function DwarfOverlay:propagateMoveKeys(keys)
-    for code,_ in pairs(keys) do
-        if MOVEMENT_KEYS[code] or HOTKEY_KEYS[code] then
-            if not HOTKEY_KEYS[code] or get_hotkey_target(code) then
-                self:sendInputToParent(code)
-            end
-            return code
-        end
+    local map_key = getMapKey(keys)
+    if map_key then
+        self:sendInputToParent(map_key)
     end
 end
 
@@ -414,124 +383,45 @@ function DwarfOverlay:onAboutToShow(parent)
     end
 end
 
-MenuOverlay = defclass(MenuOverlay, DwarfOverlay)
-
-MenuOverlay.ATTRS {
-    frame_inset = 0,
-    frame_background = gui.CLEAR_PEN,
-
-    -- if sidebar_mode is set, we will enter the specified sidebar mode on show
-    -- and restore the previous sidebar mode on dismiss. otherwise it is up to
-    -- the caller to ensure we are in a sidebar mode where the menu is visible.
-    sidebar_mode = DEFAULT_NIL,
-}
-
-function MenuOverlay:init()
-    if not dfhack.isMapLoaded() then
-        -- sidebar menus are only valid when a fort map is loaded
-        error('A fortress map must be loaded.')
-    end
-
-    if self.sidebar_mode then
-        self.saved_sidebar_mode = df.global.ui.main.mode
-        -- what mode should we restore when this window is dismissed? ideally, we'd
-        -- restore the mode that the user has set, but we should fall back to
-        -- restoring the default mode if either of the following conditions are
-        -- true:
-        -- 1) enterSidebarMode doesn't support getting back into the current mode
-        -- 2) a dfhack viewscreen is currently visible. in this case, we can't trust
-        --    that the current sidebar mode was set by the user. it could just be a
-        --    MenuOverlay subclass that is currently being shown that has set the
-        --    sidebar mode for its own purposes.
-        if not SIDEBAR_MODE_KEYS[self.saved_sidebar_mode]
-                or dfhack.gui.getCurFocus(true):find('^dfhack/') then
-            self.saved_sidebar_mode = df.ui_sidebar_mode.Default
-        end
-
-        enterSidebarMode(self.sidebar_mode)
-    end
-end
-
-function MenuOverlay:computeFrame(parent_rect)
-    return self.df_layout.menu, gui.inset_frame(self.df_layout.menu, self.frame_inset)
-end
-
-function MenuOverlay:onAboutToShow(parent)
-    self:updateLayout()
-    if not self.df_layout.menu then
-        error("The menu panel of dwarfmode is not visible")
-    end
-end
-
-function MenuOverlay:onDismiss()
-    if self.saved_sidebar_mode then
-        enterSidebarMode(self.saved_sidebar_mode)
-    end
-end
-
-function MenuOverlay:render(dc)
-    self:renderParent()
-
-    local menu = self.df_layout.menu
-    if menu then
-        -- Paint signature on the frame.
-        dscreen.paintString(
-            {fg=COLOR_BLACK,bg=COLOR_DARKGREY},
-            menu.x1+1, menu.y2+1, "DFHack"
-        )
-
-        if self.frame_background then
-            dc:fill(menu, self.frame_background)
-        end
-
-        MenuOverlay.super.render(self, dc)
-    end
-end
-
 -- Framework for managing rendering over the map area. This function is intended
--- to be called from a subclass's onRenderBody() function.
+-- to be called from a window's onRenderFrame() function.
 --
--- get_overlay_char_fn takes a coordinate position and an is_cursor boolean and
--- returns the char to render at that position and, optionally, the foreground
--- and background colors to use to draw the char. If nothing should be rendered
--- at that position, the function should return nil. If no foreground color is
--- specified, it defaults to COLOR_GREEN. If no background color is specified,
--- it defaults to COLOR_BLACK.
+-- get_overlay_pen_fn takes a coordinate position and an is_cursor boolean and
+-- returns the pen (and optional char and tile) to render at that position. If
+-- nothing should be rendered at that position, the function should return nil.
 --
 -- bounds_rect has elements {x1, x2, y1, y2} in global map coordinates (not
 -- screen coordinates). The rect is intersected with the visible map viewport to
 -- get the range over which get_overlay_char_fn is called. If bounds_rect is not
 -- specified, the entire viewport is scanned.
 --
--- example call from a subclass:
--- function MyMenuOverlaySubclass:onRenderBody()
---     local function get_overlay_char(pos)
---         return safe_index(self.overlay_chars, pos.z, pos.y, pos.x), COLOR_RED
+-- example call:
+-- function MyMapOverlay:onRenderFrame(dc, rect)
+--     local function get_overlay_pen(pos)
+--         if safe_index(self.overlay_map, pos.z, pos.y, pos.x) then
+--             return COLOR_GREEN, 'X', dfhack.screen.findGraphicsTile('CURSORS', 4, 3)
+--         end
 --     end
---     self:renderMapOverlay(get_overlay_char, self.overlay_bounds)
+--     guidm.renderMapOverlay(get_overlay_pen, self.overlay_bounds)
 -- end
-function MenuOverlay:renderMapOverlay(get_overlay_char_fn, bounds_rect)
-    local vp = self:getViewport()
+function renderMapOverlay(get_overlay_pen_fn, bounds_rect)
+    local vp = Viewport.get()
     local rect = gui.ViewRect{rect=vp,
                               clip_view=bounds_rect and gui.ViewRect{rect=bounds_rect} or nil}
 
-    -- nothing to do if the viewport is completely separate from the bounds_rect
+    -- nothing to do if the viewport is completely disjoint from the bounds_rect
     if rect:isDefunct() then return end
 
-    local dc = gui.Painter.new(self.df_layout.map)
     local z = df.global.window_z
     local cursor = getCursorPos()
     for y=rect.clip_y1,rect.clip_y2 do
         for x=rect.clip_x1,rect.clip_x2 do
             local pos = xyz2pos(x, y, z)
-            local overlay_char, fg_color, bg_color = get_overlay_char_fn(
-                    pos, same_xy(cursor, pos))
-            if not overlay_char then goto continue end
-            local stile = vp:tileToScreen(pos)
-            dc:map(true):seek(stile.x, stile.y):
-                    pen(fg_color or COLOR_GREEN, bg_color or COLOR_BLACK):
-                    char(overlay_char):map(false)
-            ::continue::
+            local overlay_pen, char, tile = get_overlay_pen_fn(pos, same_xy(cursor, pos))
+            if overlay_pen then
+                local stile = vp:tileToScreen(pos)
+                dscreen.paintTile(overlay_pen, stile.x, stile.y, char, tile, true)
+            end
         end
     end
 end
diff --git a/library/lua/gui/materials.lua b/library/lua/gui/materials.lua
index eea881768..112d8f6df 100644
--- a/library/lua/gui/materials.lua
+++ b/library/lua/gui/materials.lua
@@ -5,7 +5,6 @@ local _ENV = mkmodule('gui.materials')
 local gui = require('gui')
 local widgets = require('gui.widgets')
 local dlg = require('gui.dialogs')
-local utils = require('utils')
 
 ARROW = string.char(26)
 
@@ -266,7 +265,8 @@ function MaterialDialog:onInput(keys)
         end
         return true
     end
-    return self:inputToSubviews(keys)
+    self:inputToSubviews(keys)
+    return true
 end
 
 function showMaterialPrompt(title, prompt, on_select, on_cancel, mat_filter)
diff --git a/library/lua/gui/textures.lua b/library/lua/gui/textures.lua
new file mode 100644
index 000000000..6dac234e0
--- /dev/null
+++ b/library/lua/gui/textures.lua
@@ -0,0 +1,93 @@
+-- DFHack textures
+
+local _ENV = mkmodule('gui.textures')
+
+---@alias TexposHandle integer
+
+-- Preloaded DFHack Assets.
+-- Use this handles if you need to get dfhack standard textures.
+---@type table<string, TexposHandle[]>
+local texpos_handles = {
+  green_pin = dfhack.textures.loadTileset('hack/data/art/green-pin.png', 8, 12, true),
+  red_pin = dfhack.textures.loadTileset('hack/data/art/red-pin.png', 8, 12, true),
+  icons = dfhack.textures.loadTileset('hack/data/art/icons.png', 8, 12, true),
+  on_off = dfhack.textures.loadTileset('hack/data/art/on-off.png', 8, 12, true),
+  control_panel = dfhack.textures.loadTileset('hack/data/art/control-panel.png', 8, 12, true),
+  border_thin = dfhack.textures.loadTileset('hack/data/art/border-thin.png', 8, 12, true),
+  border_medium = dfhack.textures.loadTileset('hack/data/art/border-medium.png', 8, 12, true),
+  border_bold = dfhack.textures.loadTileset('hack/data/art/border-bold.png', 8, 12, true),
+  border_panel = dfhack.textures.loadTileset('hack/data/art/border-panel.png', 8, 12, true),
+  border_window = dfhack.textures.loadTileset('hack/data/art/border-window.png', 8, 12, true),
+}
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return integer
+function tp_green_pin(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.green_pin[offset])
+end
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return integer
+function tp_red_pin(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.red_pin[offset])
+end
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return integer
+function tp_icons(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.icons[offset])
+end
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return integer
+function tp_on_off(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.on_off[offset])
+end
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return integer
+function tp_control_panel(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.control_panel[offset])
+end
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return integer
+function tp_border_thin(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.border_thin[offset])
+end
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return integer
+function tp_border_medium(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.border_medium[offset])
+end
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return TexposHandle
+function tp_border_bold(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.border_bold[offset])
+end
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return integer
+function tp_border_panel(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.border_panel[offset])
+end
+
+-- Get valid texpos for preloaded texture in tileset
+---@param offset integer
+---@return integer
+function tp_border_window(offset)
+  return dfhack.textures.getTexposByHandle(texpos_handles.border_window[offset])
+end
+
+return _ENV
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index c3d89c49b..912094fc4 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -4,9 +4,9 @@ local _ENV = mkmodule('gui.widgets')
 
 local gui = require('gui')
 local guidm = require('gui.dwarfmode')
+local textures = require('gui.textures')
 local utils = require('utils')
 
-local dscreen = dfhack.screen
 local getval = utils.getval
 local to_pen = dfhack.pen.parse
 
@@ -87,7 +87,7 @@ Panel.ATTRS {
 
 function Panel:init(args)
     if not self.drag_anchors then
-        self.drag_anchors = {title=true, frame=false, body=false}
+        self.drag_anchors = {title=true, frame=not self.resizable, body=true}
     end
     if not self.resize_anchors then
         self.resize_anchors = {t=false, l=true, r=true, b=true}
@@ -223,9 +223,9 @@ local function Panel_begin_drag(self, drag_offset, resize_edge)
     self.prev_focus_owner = self.focus_group.cur
     self:setFocus(true)
     if self.resize_edge then
-        if self.on_resize_begin then self.on_resize_begin(success) end
+        self:onResizeBegin()
     else
-        if self.on_drag_begin then self.on_drag_begin(success) end
+        self:onDragBegin()
     end
 end
 
@@ -236,11 +236,12 @@ local function Panel_end_drag(self, frame, success)
     else
         self:setFocus(false)
     end
+    local resize_edge = self.resize_edge
     Panel_update_frame(self, frame, true)
-    if self.resize_edge then
-        if self.on_resize_end then self.on_resize_end(success) end
+    if resize_edge then
+        self:onResizeEnd(success, self.frame)
     else
-        if self.on_drag_end then self.on_drag_end(success) end
+        self:onDragEnd(success, self.frame)
     end
 end
 
@@ -273,15 +274,14 @@ end
 
 function Panel:onInput(keys)
     if self.kbd_get_pos then
-        if keys.SELECT or keys.LEAVESCREEN then
-            Panel_end_drag(self, keys.LEAVESCREEN and self.saved_frame or nil,
+        if keys.SELECT or keys.LEAVESCREEN or keys._MOUSE_R then
+            Panel_end_drag(self, not keys.SELECT and self.saved_frame or nil,
                            not not keys.SELECT)
             return true
         end
         for code in pairs(keys) do
             local dx, dy = guidm.get_movement_delta(code, 1, 10)
             if dx then
-                local frame_rect = self.frame_rect
                 local kbd_pos = self.kbd_get_pos()
                 kbd_pos.x = kbd_pos.x + dx
                 kbd_pos.y = kbd_pos.y + dy
@@ -292,19 +292,18 @@ function Panel:onInput(keys)
         return
     end
     if self.drag_offset then
-        if keys._MOUSE_R_DOWN then
+        if keys._MOUSE_R then
             Panel_end_drag(self, self.saved_frame)
-        elseif keys._MOUSE_L then
+        elseif keys._MOUSE_L_DOWN then
             Panel_update_frame(self, Panel_make_frame(self))
         end
         return true
     end
-    if self:inputToSubviews(keys) then
+    if Panel.super.onInput(self, keys) then
         return true
     end
-    if not keys._MOUSE_L_DOWN then return end
-    local rect = self.frame_rect
-    local x,y = self:getMousePos(gui.ViewRect{rect=rect})
+    if not keys._MOUSE_L then return end
+    local x,y = self:getMouseFramePos()
     if not x then return end
 
     if self.resizable and y == 0 then
@@ -430,6 +429,20 @@ end
 
 function Panel:computeFrame(parent_rect)
     local sw, sh = parent_rect.width, parent_rect.height
+    if self.frame then
+        if self.frame.t and self.frame.h and self.frame.t + self.frame.h > sh then
+            self.frame.t = math.max(0, sh - self.frame.h)
+        end
+        if self.frame.b and self.frame.h and self.frame.b + self.frame.h > sh then
+            self.frame.b = math.max(0, sh - self.frame.h)
+        end
+        if self.frame.l and self.frame.w and self.frame.l + self.frame.w > sw then
+            self.frame.l = math.max(0, sw - self.frame.w)
+        end
+        if self.frame.r and self.frame.w and self.frame.r + self.frame.w > sw then
+            self.frame.r = math.max(0, sw - self.frame.w)
+        end
+    end
     return gui.compute_frame_body(sw, sh, self.frame, self.frame_inset,
                                   self.frame_style and 1 or 0)
 end
@@ -465,18 +478,38 @@ end
 function Panel:onRenderFrame(dc, rect)
     Panel.super.onRenderFrame(self, dc, rect)
     if not self.frame_style then return end
-    gui.paint_frame(dc, rect, self.frame_style, self.frame_title)
+    local inactive = self.parent_view and self.parent_view.hasFocus
+            and not self.parent_view:hasFocus()
+    local pause_forced = self.parent_view and self.parent_view.force_pause
+    gui.paint_frame(dc, rect, self.frame_style, self.frame_title, inactive,
+            pause_forced, self.resizable)
     if self.kbd_get_pos then
         local pos = self.kbd_get_pos()
         local pen = to_pen{fg=COLOR_GREEN, bg=COLOR_BLACK}
         dc:seek(pos.x, pos.y):pen(pen):char(string.char(0xDB))
     end
     if self.drag_offset and not self.kbd_get_pos
-            and df.global.enabler.mouse_lbut == 0 then
+            and df.global.enabler.mouse_lbut_down == 0 then
         Panel_end_drag(self, nil, true)
     end
 end
 
+function Panel:onDragBegin()
+    if self.on_drag_begin then self.on_drag_begin() end
+end
+
+function Panel:onDragEnd(success, new_frame)
+    if self.on_drag_end then self.on_drag_end(success, new_frame) end
+end
+
+function Panel:onResizeBegin()
+    if self.on_resize_begin then self.on_resize_begin() end
+end
+
+function Panel:onResizeEnd(success, new_frame)
+    if self.on_resize_end then self.on_resize_end(success, new_frame) end
+end
+
 ------------
 -- Window --
 ------------
@@ -484,7 +517,7 @@ end
 Window = defclass(Window, Panel)
 
 Window.ATTRS {
-    frame_style = gui.GREY_LINE_FRAME,
+    frame_style = gui.WINDOW_FRAME,
     frame_background = gui.CLEAR_PEN,
     frame_inset = 1,
     draggable = true,
@@ -496,6 +529,11 @@ Window.ATTRS {
 
 ResizingPanel = defclass(ResizingPanel, Panel)
 
+ResizingPanel.ATTRS{
+    auto_height = true,
+    auto_width = false,
+}
+
 -- adjust our frame dimensions according to positions and sizes of our subviews
 function ResizingPanel:postUpdateLayout(frame_body)
     local w, h = 0, 0
@@ -516,6 +554,8 @@ function ResizingPanel:postUpdateLayout(frame_body)
     end
     if not self.frame then self.frame = {} end
     local oldw, oldh = self.frame.w, self.frame.h
+    if not self.auto_height then h = oldh end
+    if not self.auto_width then w = oldw end
     self.frame.w, self.frame.h = w, h
     if not self._updateLayoutGuard and (oldw ~= w or oldh ~= h) then
         self._updateLayoutGuard = true -- protect against infinite loops
@@ -616,8 +656,12 @@ function EditField:setCursor(cursor)
 end
 
 function EditField:setText(text, cursor)
+    local old = self.text
     self.text = text
     self:setCursor(cursor)
+    if self.on_change and text ~= old then
+        self.on_change(self.text, old)
+    end
 end
 
 function EditField:postUpdateLayout()
@@ -625,7 +669,7 @@ function EditField:postUpdateLayout()
 end
 
 function EditField:onRenderBody(dc)
-    dc:pen(self.text_pen or COLOR_LIGHTCYAN):fill(0,0,dc.width-1,0)
+    dc:pen(self.text_pen or COLOR_LIGHTCYAN)
 
     local cursor_char = '_'
     if not getval(self.active) or not self.focus or gui.blink_visible(300) then
@@ -654,7 +698,6 @@ function EditField:onRenderBody(dc)
                                 end_pos == #txt and '' or string.char(26))
     end
     dc:advance(self.text_offset):string(txt)
-    dc:string((' '):rep(dc.clip_x2 - dc.x))
 end
 
 function EditField:insert(text)
@@ -675,12 +718,8 @@ function EditField:onInput(keys)
         end
     end
 
-    if self.key and keys.LEAVESCREEN then
-        local old = self.text
+    if self.key and (keys.LEAVESCREEN or keys._MOUSE_R) then
         self:setText(self.saved_text)
-        if self.on_change and old ~= self.saved_text then
-            self.on_change(self.text, old)
-        end
         self:setFocus(false)
         return true
     end
@@ -701,12 +740,6 @@ function EditField:onInput(keys)
             end
         end
         return not not self.key
-    elseif keys._MOUSE_L then
-        local mouse_x, mouse_y = self:getMousePos()
-        if mouse_x then
-            self:setCursor(self.start_pos + mouse_x - (self.text_offset or 0))
-            return true
-        end
     elseif keys._STRING then
         local old = self.text
         if keys._STRING == 0 then
@@ -724,9 +757,6 @@ function EditField:onInput(keys)
                 return self.modal
             end
         end
-        if self.on_change and self.text ~= old then
-            self.on_change(self.text, old)
-        end
         return true
     elseif keys.KEYBOARD_CURSOR_LEFT then
         self:setCursor(self.cursor - 1)
@@ -736,9 +766,10 @@ function EditField:onInput(keys)
                                                find('.*[%w_%-][^%w_%-]')
         self:setCursor(prev_word_end or 1)
         return true
-    elseif keys.CUSTOM_CTRL_A then -- home
-        self:setCursor(1)
-        return true
+    -- commented out until we get HOME key support from DF
+    -- elseif keys.CUSTOM_CTRL_A then -- home
+    --     self:setCursor(1)
+    --     return true
     elseif keys.KEYBOARD_CURSOR_RIGHT then
         self:setCursor(self.cursor + 1)
         return true
@@ -749,6 +780,22 @@ function EditField:onInput(keys)
     elseif keys.CUSTOM_CTRL_E then -- end
         self:setCursor()
         return true
+    elseif keys.CUSTOM_CTRL_C then
+        dfhack.internal.setClipboardTextCp437(self.text)
+        return true
+    elseif keys.CUSTOM_CTRL_X then
+        dfhack.internal.setClipboardTextCp437(self.text)
+        self:setText('')
+        return true
+    elseif keys.CUSTOM_CTRL_V then
+        self:insert(dfhack.internal.getClipboardTextCp437())
+        return true
+    elseif keys._MOUSE_L_DOWN then
+        local mouse_x = self:getMousePos()
+        if mouse_x then
+            self:setCursor(self.start_pos + mouse_x - (self.text_offset or 0))
+            return true
+        end
     end
 
     -- if we're modal, then unconditionally eat all the input
@@ -785,7 +832,7 @@ local function scrollbar_get_max_pos_and_height(scrollbar)
     local frame_body = scrollbar.frame_body
     local scrollbar_body_height = (frame_body and frame_body.height or 3) - 2
 
-    local height = math.max(1, math.floor(
+    local height = math.max(2, math.floor(
         (math.min(scrollbar.elems_per_page, scrollbar.num_elems) * scrollbar_body_height) /
         scrollbar.num_elems))
 
@@ -813,7 +860,9 @@ function Scrollbar:update(top_elem, elems_per_page, num_elems)
 end
 
 local function scrollbar_do_drag(scrollbar)
-    local _,y = scrollbar.frame_body:localXY(dfhack.screen.getMousePos())
+    local x,y = dfhack.screen.getMousePos()
+    if not y then return end
+    x,y = scrollbar.frame_body:localXY(x, y)
     local cur_pos = y - scrollbar.is_dragging
     local max_top = scrollbar.num_elems - scrollbar.elems_per_page + 1
     local max_pos = scrollbar_get_max_pos_and_height(scrollbar)
@@ -828,40 +877,49 @@ local function scrollbar_is_visible(scrollbar)
     return scrollbar.elems_per_page < scrollbar.num_elems
 end
 
-local SCROLLBAR_UP_LEFT_PEN = to_pen{tile=922, ch=47, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_UP_RIGHT_PEN = to_pen{tile=923, ch=92, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_DOWN_LEFT_PEN = to_pen{tile=946, ch=92, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_DOWN_RIGHT_PEN = to_pen{tile=947, ch=47, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_UP_LEFT_PEN = to_pen{tile=930, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_UP_RIGHT_PEN = to_pen{tile=931, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_LEFT_PEN = to_pen{tile=954, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_RIGHT_PEN = to_pen{tile=955, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_UP_LEFT_PEN = to_pen{tile=932, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_UP_RIGHT_PEN = to_pen{tile=933, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_DOWN_LEFT_PEN = to_pen{tile=960, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_DOWN_RIGHT_PEN = to_pen{tile=961, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_LEFT_PEN = to_pen{tile=940, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_RIGHT_PEN = to_pen{tile=941, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_DOWN_LEFT_PEN = to_pen{tile=966, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_DOWN_RIGHT_PEN = to_pen{tile=967, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
-local SCROLLBAR_UP_LEFT_HOVER_PEN = to_pen{tile=924, ch=47, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_UP_RIGHT_HOVER_PEN = to_pen{tile=925, ch=92, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_DOWN_LEFT_HOVER_PEN = to_pen{tile=936, ch=92, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_DOWN_RIGHT_HOVER_PEN = to_pen{tile=937, ch=47, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_UP_LEFT_HOVER_PEN = to_pen{tile=930, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_UP_RIGHT_HOVER_PEN = to_pen{tile=931, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_LEFT_HOVER_PEN = to_pen{tile=954, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_RIGHT_HOVER_PEN = to_pen{tile=955, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_UP_LEFT_HOVER_PEN = to_pen{tile=956, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_UP_RIGHT_HOVER_PEN = to_pen{tile=957, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_DOWN_LEFT_HOVER_PEN = to_pen{tile=968, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_DOWN_RIGHT_HOVER_PEN = to_pen{tile=969, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_LEFT_HOVER_PEN = to_pen{tile=942, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_CENTER_RIGHT_HOVER_PEN = to_pen{tile=943, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_DOWN_LEFT_HOVER_PEN = to_pen{tile=966, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_DOWN_RIGHT_HOVER_PEN = to_pen{tile=967, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_BG_LEFT_PEN = to_pen{tile=934, ch=176, fg=COLOR_DARKGREY, bg=COLOR_BLACK}
-local SCROLLBAR_BAR_BG_RIGHT_PEN = to_pen{tile=935, ch=176, fg=COLOR_DARKGREY, bg=COLOR_BLACK}
+local SBSO = df.global.init.scrollbar_texpos[0] --Scroll Bar Spritesheet Offset / change this to point to a different spritesheet (ui themes, anyone? :p)
+local SCROLLBAR_UP_LEFT_PEN = to_pen{tile=SBSO+0, ch=47, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_UP_RIGHT_PEN = to_pen{tile=SBSO+1, ch=92, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_DOWN_LEFT_PEN = to_pen{tile=SBSO+24, ch=92, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_DOWN_RIGHT_PEN = to_pen{tile=SBSO+25, ch=47, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_UP_LEFT_PEN = to_pen{tile=SBSO+6, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_UP_RIGHT_PEN = to_pen{tile=SBSO+7, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_LEFT_PEN = to_pen{tile=SBSO+30, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_RIGHT_PEN = to_pen{tile=SBSO+31, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_UP_LEFT_PEN = to_pen{tile=SBSO+10, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_UP_RIGHT_PEN = to_pen{tile=SBSO+11, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_DOWN_LEFT_PEN = to_pen{tile=SBSO+22, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_DOWN_RIGHT_PEN = to_pen{tile=SBSO+23, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_LEFT_PEN = to_pen{tile=SBSO+18, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_RIGHT_PEN = to_pen{tile=SBSO+19, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_DOWN_LEFT_PEN = to_pen{tile=SBSO+42, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_DOWN_RIGHT_PEN = to_pen{tile=SBSO+43, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_2TALL_UP_LEFT_PEN = to_pen{tile=SBSO+26, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_2TALL_UP_RIGHT_PEN = to_pen{tile=SBSO+27, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_2TALL_DOWN_LEFT_PEN = to_pen{tile=SBSO+38, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_2TALL_DOWN_RIGHT_PEN = to_pen{tile=SBSO+39, ch=219, fg=COLOR_CYAN, bg=COLOR_BLACK}
+local SCROLLBAR_UP_LEFT_HOVER_PEN = to_pen{tile=SBSO+2, ch=47, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_UP_RIGHT_HOVER_PEN = to_pen{tile=SBSO+3, ch=92, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_DOWN_LEFT_HOVER_PEN = to_pen{tile=SBSO+14, ch=92, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_DOWN_RIGHT_HOVER_PEN = to_pen{tile=SBSO+15, ch=47, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_UP_LEFT_HOVER_PEN = to_pen{tile=SBSO+8, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_UP_RIGHT_HOVER_PEN = to_pen{tile=SBSO+9, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_LEFT_HOVER_PEN = to_pen{tile=SBSO+32, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_RIGHT_HOVER_PEN = to_pen{tile=SBSO+33, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_UP_LEFT_HOVER_PEN = to_pen{tile=SBSO+34, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_UP_RIGHT_HOVER_PEN = to_pen{tile=SBSO+35, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_DOWN_LEFT_HOVER_PEN = to_pen{tile=SBSO+46, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_DOWN_RIGHT_HOVER_PEN = to_pen{tile=SBSO+47, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_LEFT_HOVER_PEN = to_pen{tile=SBSO+20, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_CENTER_RIGHT_HOVER_PEN = to_pen{tile=SBSO+21, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_DOWN_LEFT_HOVER_PEN = to_pen{tile=SBSO+44, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_DOWN_RIGHT_HOVER_PEN = to_pen{tile=SBSO+45, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_2TALL_UP_LEFT_HOVER_PEN = to_pen{tile=SBSO+28, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_2TALL_UP_RIGHT_HOVER_PEN = to_pen{tile=SBSO+29, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_2TALL_DOWN_LEFT_HOVER_PEN = to_pen{tile=SBSO+40, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_2TALL_DOWN_RIGHT_HOVER_PEN = to_pen{tile=SBSO+41, ch=219, fg=COLOR_LIGHTCYAN, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_BG_LEFT_PEN = to_pen{tile=SBSO+12, ch=176, fg=COLOR_DARKGREY, bg=COLOR_BLACK}
+local SCROLLBAR_BAR_BG_RIGHT_PEN = to_pen{tile=SBSO+13, ch=176, fg=COLOR_DARKGREY, bg=COLOR_BLACK}
 
 function Scrollbar:onRenderBody(dc)
     -- don't draw if all elements are visible
@@ -892,6 +950,12 @@ function Scrollbar:onRenderBody(dc)
             if y == starty and y <= midy - 1 then
                 dc:char(nil, hover_bar and SCROLLBAR_BAR_UP_LEFT_HOVER_PEN or SCROLLBAR_BAR_UP_LEFT_PEN)
                 dc:char(nil, hover_bar and SCROLLBAR_BAR_UP_RIGHT_HOVER_PEN or SCROLLBAR_BAR_UP_RIGHT_PEN)
+            elseif y == midy - 0.5 and self.bar_height == 2 then
+                dc:char(nil, hover_bar and SCROLLBAR_BAR_2TALL_UP_LEFT_HOVER_PEN or SCROLLBAR_BAR_2TALL_UP_LEFT_PEN)
+                dc:char(nil, hover_bar and SCROLLBAR_BAR_2TALL_UP_RIGHT_HOVER_PEN or SCROLLBAR_BAR_2TALL_UP_RIGHT_PEN)
+            elseif y == midy + 0.5 and self.bar_height == 2 then
+                dc:char(nil, hover_bar and SCROLLBAR_BAR_2TALL_DOWN_LEFT_HOVER_PEN or SCROLLBAR_BAR_2TALL_DOWN_LEFT_PEN)
+                dc:char(nil, hover_bar and SCROLLBAR_BAR_2TALL_DOWN_RIGHT_HOVER_PEN or SCROLLBAR_BAR_2TALL_DOWN_RIGHT_PEN)
             elseif y == midy - 0.5 then
                 dc:char(nil, hover_bar and SCROLLBAR_BAR_CENTER_UP_LEFT_HOVER_PEN or SCROLLBAR_BAR_CENTER_UP_LEFT_PEN)
                 dc:char(nil, hover_bar and SCROLLBAR_BAR_CENTER_UP_RIGHT_HOVER_PEN or SCROLLBAR_BAR_CENTER_UP_RIGHT_PEN)
@@ -922,7 +986,7 @@ function Scrollbar:onRenderBody(dc)
     if self.is_dragging then
         scrollbar_do_drag(self)
     end
-    if df.global.enabler.mouse_lbut == 0 then
+    if df.global.enabler.mouse_lbut_down == 0 then
         self.last_scroll_ms = 0
         self.is_dragging = false
         self.scroll_spec = nil
@@ -944,7 +1008,7 @@ function Scrollbar:onInput(keys)
         return false
     end
 
-    if self.parent_view:getMousePos() then
+    if self.parent_view and self.parent_view:getMousePos() then
         if keys.CONTEXT_SCROLL_UP then
             self.on_scroll('up_small')
             return true
@@ -959,7 +1023,7 @@ function Scrollbar:onInput(keys)
             return true
         end
     end
-    if not keys._MOUSE_L_DOWN then return false end
+    if not keys._MOUSE_L then return false end
     local _,y = self:getMousePos()
     if not y then return false end
     local scroll_spec = nil
@@ -1042,7 +1106,26 @@ local function is_disabled(token)
            (token.enabled ~= nil and not getval(token.enabled))
 end
 
-function render_text(obj,dc,x0,y0,pen,dpen,disabled)
+-- Make the hover pen -- that is a pen that should render elements that has the
+-- mouse hovering over it. if hpen is specified, it just checks the fields and
+-- returns it (in parsed pen form)
+local function make_hpen(pen, hpen)
+    if not hpen then
+        pen = to_pen(pen)
+
+        -- Swap the foreground and background
+        hpen = dfhack.pen.make(pen.bg, nil, pen.fg + (pen.bold and 8 or 0))
+    end
+
+    -- text_hpen needs a character in order to paint the background using
+    -- Painter:fill(), so let's make it paint a space to show the background
+    -- color
+    local hpen_parsed = to_pen(hpen)
+    hpen_parsed.ch = string.byte(' ')
+    return hpen_parsed
+end
+
+function render_text(obj,dc,x0,y0,pen,dpen,disabled,hpen,hovered)
     local width = 0
     for iline = dc and obj.start_line_num or 1, #obj.text_lines do
         local x, line = 0, obj.text_lines[iline]
@@ -1064,10 +1147,15 @@ function render_text(obj,dc,x0,y0,pen,dpen,disabled)
                 end
             end
 
-            if token.tile then
+            if token.tile or (hovered and token.htile) then
                 x = x + 1
                 if dc then
-                    dc:tile(nil, token.tile)
+                    local tile = hovered and getval(token.htile or token.tile) or getval(token.tile)
+                    local tile_pen = tonumber(tile) and to_pen{tile=tile} or tile
+                    dc:char(nil, tile_pen)
+                    if token.width then
+                        dc:advance(token.width-1)
+                    end
                 end
             end
 
@@ -1077,16 +1165,25 @@ function render_text(obj,dc,x0,y0,pen,dpen,disabled)
 
                 if dc then
                     local tpen = getval(token.pen)
+                    local dcpen = to_pen(tpen or pen)
+
+                    -- If disabled, figure out which dpen to use
                     if disabled or is_disabled(token) then
-                        dc:pen(getval(token.dpen) or tpen or dpen)
+                        dcpen = to_pen(getval(token.dpen) or tpen or dpen)
                         if keypen.fg ~= COLOR_BLACK then
                             keypen.bold = false
                         end
-                    else
-                        dc:pen(tpen or pen)
+
+                        -- if hovered *and* disabled, combine both effects
+                        if hovered then
+                            dcpen = make_hpen(dcpen)
+                        end
+                    elseif hovered then
+                        dcpen = make_hpen(dcpen, getval(token.hpen) or hpen)
                     end
-                end
 
+                    dc:pen(dcpen)
+                end
                 local width = getval(token.width)
                 local padstr
                 if width then
@@ -1161,7 +1258,7 @@ Label = defclass(Label, Widget)
 Label.ATTRS{
     text_pen = COLOR_WHITE,
     text_dpen = COLOR_DARKGREY, -- disabled
-    text_hpen = DEFAULT_NIL, -- highlight - default is text_pen with reversed brightness
+    text_hpen = DEFAULT_NIL, -- hover - default is to invert the fg/bg colors
     disabled = DEFAULT_NIL,
     enabled = DEFAULT_NIL,
     auto_height = true,
@@ -1178,12 +1275,7 @@ function Label:init(args)
 
     self:addviews{self.scrollbar}
 
-    -- use existing saved text if no explicit text was specified. this avoids
-    -- overwriting pre-formatted text that subclasses may have already set
     self:setText(args.text or self.text)
-    if not self.text_hpen then
-        self.text_hpen = ((tonumber(self.text_pen) or tonumber(self.text_pen.fg) or 0) + 8) % 16
-    end
 end
 
 local function update_label_scrollbar(label)
@@ -1231,12 +1323,16 @@ function Label:getTextWidth()
     return self.text_width
 end
 
+-- Overridden by subclasses that also want to add new mouse handlers, see
+-- HotkeyLabel.
+function Label:shouldHover()
+    return self.on_click or self.on_rclick
+end
+
 function Label:onRenderBody(dc)
     local text_pen = self.text_pen
-    if self:getMousePos() and (self.on_click or self.on_rclick) then
-        text_pen = self.text_hpen
-    end
-    render_text(self,dc,0,0,text_pen,self.text_dpen,is_disabled(self))
+    local hovered = self:getMousePos() and self:shouldHover()
+    render_text(self,dc,0,0,text_pen,self.text_dpen,is_disabled(self), self.text_hpen, hovered)
 end
 
 function Label:on_scrollbar(scroll_spec)
@@ -1258,6 +1354,7 @@ end
 
 function Label:scroll(nlines)
     if not nlines then return end
+    local text_height = math.max(1, self:getTextHeight())
     if type(nlines) == 'string' then
         if nlines == '+page' then
             nlines = self.frame_body.height
@@ -1267,12 +1364,15 @@ function Label:scroll(nlines)
             nlines = math.ceil(self.frame_body.height/2)
         elseif nlines == '-halfpage' then
             nlines = -math.ceil(self.frame_body.height/2)
+        elseif nlines == 'home' then
+            nlines = 1 - self.start_line_num
+        elseif nlines == 'end' then
+            nlines = text_height
         else
             error(('unhandled scroll keyword: "%s"'):format(nlines))
         end
     end
     local n = self.start_line_num + nlines
-    local text_height = math.max(1, self:getTextHeight())
     n = math.min(n, text_height - self.frame_body.height + 1)
     n = math.max(n, 1)
     nlines = n - self.start_line_num
@@ -1286,12 +1386,12 @@ function Label:onInput(keys)
     if self:inputToSubviews(keys) then
         return true
     end
-    if keys._MOUSE_L_DOWN and self:getMousePos() and self.on_click then
-        self:on_click()
+    if keys._MOUSE_L and self:getMousePos() and self.on_click then
+        self.on_click()
         return true
     end
-    if keys._MOUSE_R_DOWN and self:getMousePos() and self.on_rclick then
-        self:on_rclick()
+    if keys._MOUSE_R and self:getMousePos() and self.on_rclick then
+        self.on_rclick()
         return true
     end
     for k,v in pairs(self.scroll_keys) do
@@ -1323,6 +1423,10 @@ function WrappedLabel:getWrappedText(width)
     return text_to_wrap:wrap(width - self.indent)
 end
 
+function WrappedLabel:preUpdateLayout()
+    self.saved_start_line_num = self.start_line_num
+end
+
 -- we can't set the text in init() since we may not yet have a frame that we
 -- can get wrapping bounds from.
 function WrappedLabel:postComputeFrame()
@@ -1335,6 +1439,7 @@ function WrappedLabel:postComputeFrame()
         table.insert(text, NEWLINE)
     end
     self:setText(text)
+    self:scroll(self.saved_start_line_num - 1)
 end
 
 ------------------
@@ -1367,6 +1472,25 @@ HotkeyLabel.ATTRS{
 }
 
 function HotkeyLabel:init()
+    self:initializeLabel()
+end
+
+function HotkeyLabel:setOnActivate(on_activate)
+    self.on_activate = on_activate
+    self:initializeLabel()
+end
+
+function HotkeyLabel:setLabel(label)
+    self.label = label
+    self:initializeLabel()
+end
+
+function HotkeyLabel:shouldHover()
+    -- When on_activate is set, text should also hover on mouseover
+    return self.on_activate or HotkeyLabel.super.shouldHover(self)
+end
+
+function HotkeyLabel:initializeLabel()
     self:setText{{key=self.key, key_sep=self.key_sep, text=self.label,
                   on_activate=self.on_activate}}
 end
@@ -1374,12 +1498,130 @@ end
 function HotkeyLabel:onInput(keys)
     if HotkeyLabel.super.onInput(self, keys) then
         return true
-    elseif keys._MOUSE_L_DOWN and self:getMousePos() and self.on_activate then
+    elseif keys._MOUSE_L and self:getMousePos() and self.on_activate
+            and not is_disabled(self) then
         self.on_activate()
         return true
     end
 end
 
+----------------
+-- HelpButton --
+----------------
+
+HelpButton = defclass(HelpButton, Panel)
+
+HelpButton.ATTRS{
+    command=DEFAULT_NIL,
+}
+
+local button_pen_left = to_pen{fg=COLOR_CYAN,
+    tile=curry(textures.tp_control_panel, 7) or nil, ch=string.byte('[')}
+local button_pen_right = to_pen{fg=COLOR_CYAN,
+    tile=curry(textures.tp_control_panel, 8) or nil, ch=string.byte(']')}
+local help_pen_center = to_pen{
+    tile=curry(textures.tp_control_panel, 9) or nil, ch=string.byte('?')}
+local configure_pen_center = dfhack.pen.parse{
+    tile=curry(textures.tp_control_panel, 10) or nil, ch=15} -- gear/masterwork symbol
+
+function HelpButton:preinit(init_table)
+    init_table.frame = init_table.frame or {}
+    init_table.frame.h = init_table.frame.h or 1
+    init_table.frame.w = init_table.frame.w or 3
+end
+
+function HelpButton:init()
+    local command = self.command .. ' '
+
+    self:addviews{
+        Label{
+            frame={t=0, l=0, w=3, h=1},
+            text={
+                {tile=button_pen_left},
+                {tile=help_pen_center},
+                {tile=button_pen_right},
+            },
+            on_click=function() dfhack.run_command('gui/launcher', command) end,
+        },
+    }
+end
+
+---------------------
+-- ConfigureButton --
+---------------------
+
+ConfigureButton = defclass(ConfigureButton, Panel)
+
+ConfigureButton.ATTRS{
+    on_click=DEFAULT_NIL,
+}
+
+function ConfigureButton:preinit(init_table)
+    init_table.frame = init_table.frame or {}
+    init_table.frame.h = init_table.frame.h or 1
+    init_table.frame.w = init_table.frame.w or 3
+end
+
+function ConfigureButton:init()
+    self:addviews{
+        Label{
+            frame={t=0, l=0, w=3, h=1},
+            text={
+                {tile=button_pen_left},
+                {tile=configure_pen_center},
+                {tile=button_pen_right},
+            },
+            on_click=self.on_click,
+        },
+    }
+end
+
+-----------------
+-- BannerPanel --
+-----------------
+
+BannerPanel = defclass(BannerPanel, Panel)
+
+function BannerPanel:onRenderBody(dc)
+    dc:pen(COLOR_RED)
+    for y=0,self.frame_rect.height-1 do
+        dc:seek(0, y):char('[')
+        dc:seek(self.frame_rect.width-1):char(']')
+    end
+end
+
+----------------
+-- TextButton --
+----------------
+
+TextButton = defclass(TextButton, BannerPanel)
+
+function TextButton:init(info)
+    self.label = HotkeyLabel{
+        frame={t=0, l=1, r=1},
+        key=info.key,
+        key_sep=info.key_sep,
+        label=info.label,
+        on_activate=info.on_activate,
+        text_pen=info.text_pen,
+        text_dpen=info.text_dpen,
+        text_hpen=info.text_hpen,
+        disabled=info.disabled,
+        enabled=info.enabled,
+        auto_height=info.auto_height,
+        auto_width=info.auto_width,
+        on_click=info.on_click,
+        on_rclick=info.on_rclick,
+        scroll_keys=info.scroll_keys,
+    }
+
+    self:addviews{self.label}
+end
+
+function TextButton:setLabel(label)
+    self.label:setLabel(label)
+end
+
 ----------------------
 -- CycleHotkeyLabel --
 ----------------------
@@ -1388,45 +1630,48 @@ CycleHotkeyLabel = defclass(CycleHotkeyLabel, Label)
 
 CycleHotkeyLabel.ATTRS{
     key=DEFAULT_NIL,
+    key_back=DEFAULT_NIL,
+    key_sep=': ',
+    option_gap=1,
     label=DEFAULT_NIL,
     label_width=DEFAULT_NIL,
+    label_below=false,
     options=DEFAULT_NIL,
     initial_option=1,
     on_change=DEFAULT_NIL,
 }
 
 function CycleHotkeyLabel:init()
-    -- initialize option_idx
-    for i in ipairs(self.options) do
-        if self.initial_option == self:getOptionValue(i) then
-            self.option_idx = i
-            break
-        end
-    end
-    if not self.option_idx then
-        if self.options[self.initial_option] then
-            self.option_idx = self.initial_option
-        end
-    end
-    if not self.option_idx then
-        error(('cannot find option with value or index: "%s"')
-              :format(self.initial_option))
+    self:setOption(self.initial_option)
+
+    if self.label_below then
+        self.option_gap = self.option_gap + (self.key_back and 1 or 0) + (self.key and 2 or 0)
     end
 
     self:setText{
-        {key=self.key, key_sep=': ', text=self.label, width=self.label_width,
+        self.key_back ~= nil and {key=self.key_back, key_sep='', width=0, on_activate=self:callback('cycle', true)} or {},
+        {key=self.key, key_sep=self.key_sep, text=self.label, width=self.label_width,
          on_activate=self:callback('cycle')},
-        '  ',
-        {text=self:callback('getOptionLabel')},
+        self.label_below and NEWLINE or '',
+        {gap=self.option_gap, text=self:callback('getOptionLabel'),
+         pen=self:callback('getOptionPen')},
     }
 end
 
-function CycleHotkeyLabel:cycle()
+-- CycleHotkeyLabels are always clickable and therefore should always change
+-- color when hovered.
+function CycleHotkeyLabel:shouldHover()
+    return true
+end
+
+function CycleHotkeyLabel:cycle(backwards)
     local old_option_idx = self.option_idx
-    if self.option_idx == #self.options then
+    if self.option_idx == #self.options and not backwards then
         self.option_idx = 1
+    elseif self.option_idx == 1 and backwards then
+        self.option_idx = #self.options
     else
-        self.option_idx = self.option_idx + 1
+        self.option_idx = self.option_idx + (not backwards and 1 or -1)
     end
     if self.on_change then
         self.on_change(self:getOptionValue(),
@@ -1434,28 +1679,57 @@ function CycleHotkeyLabel:cycle()
     end
 end
 
-function CycleHotkeyLabel:getOptionLabel(option_idx)
-    option_idx = option_idx or self.option_idx
-    local option = self.options[option_idx]
-    if type(option) == 'table' then
-        return option.label
+function CycleHotkeyLabel:setOption(value_or_index, call_on_change)
+    local option_idx = nil
+    for i in ipairs(self.options) do
+        if value_or_index == self:getOptionValue(i) then
+            option_idx = i
+            break
+        end
+    end
+    if not option_idx then
+        if self.options[value_or_index] then
+            option_idx = value_or_index
+        end
+    end
+    if not option_idx then
+        option_idx = 1
+    end
+    local old_option_idx = self.option_idx
+    self.option_idx = option_idx
+    if call_on_change and self.on_change then
+        self.on_change(self:getOptionValue(),
+                       self:getOptionValue(old_option_idx))
     end
-    return option
 end
 
-function CycleHotkeyLabel:getOptionValue(option_idx)
+local function cyclehotkeylabel_getOptionElem(self, option_idx, key, require_key)
     option_idx = option_idx or self.option_idx
     local option = self.options[option_idx]
     if type(option) == 'table' then
-        return option.value
+        return option[key]
     end
-    return option
+    return not require_key and option or nil
+end
+
+function CycleHotkeyLabel:getOptionLabel(option_idx)
+    return getval(cyclehotkeylabel_getOptionElem(self, option_idx, 'label'))
+end
+
+function CycleHotkeyLabel:getOptionValue(option_idx)
+    return cyclehotkeylabel_getOptionElem(self, option_idx, 'value')
+end
+
+function CycleHotkeyLabel:getOptionPen(option_idx)
+    local pen = getval(cyclehotkeylabel_getOptionElem(self, option_idx, 'pen', true))
+    if type(pen) == 'string' then return nil end
+    return pen
 end
 
 function CycleHotkeyLabel:onInput(keys)
     if CycleHotkeyLabel.super.onInput(self, keys) then
         return true
-    elseif keys._MOUSE_L_DOWN and self:getMousePos() then
+    elseif keys._MOUSE_L and self:getMousePos() and not is_disabled(self) then
         self:cycle()
         return true
     end
@@ -1467,7 +1741,7 @@ end
 
 ToggleHotkeyLabel = defclass(ToggleHotkeyLabel, CycleHotkeyLabel)
 ToggleHotkeyLabel.ATTRS{
-    options={{label='On', value=true},
+    options={{label='On', value=true, pen=COLOR_GREEN},
              {label='Off', value=false}},
 }
 
@@ -1479,11 +1753,14 @@ List = defclass(List, Widget)
 
 List.ATTRS{
     text_pen = COLOR_CYAN,
+    text_hpen = DEFAULT_NIL, -- hover color, defaults to inverting the FG/BG pens for each text object
     cursor_pen = COLOR_LIGHTCYAN,
     inactive_pen = DEFAULT_NIL,
     on_select = DEFAULT_NIL,
     on_submit = DEFAULT_NIL,
     on_submit2 = DEFAULT_NIL,
+    on_double_click = DEFAULT_NIL,
+    on_double_click2 = DEFAULT_NIL,
     row_height = 1,
     scroll_keys = STANDARDSCROLL,
     icon_width = DEFAULT_NIL,
@@ -1504,6 +1781,8 @@ function List:init(info)
         self.choices = {}
         self.selected = 1
     end
+
+    self.last_select_click_ms = 0 -- used to track double-clicking on an item
 end
 
 function List:setChoices(choices, selected)
@@ -1521,6 +1800,13 @@ function List:setChoices(choices, selected)
     end
 
     self:setSelected(selected)
+
+    -- Check if page_top needs to be adjusted
+    if #self.choices - self.page_size < 0 then
+        self.page_top = 1
+    elseif self.page_top > #self.choices - self.page_size + 1 then
+        self.page_top = #self.choices - self.page_size + 1
+    end
 end
 
 function List:setSelected(selected)
@@ -1556,15 +1842,28 @@ function List:getContentHeight()
     return #self.choices * self.row_height
 end
 
-function List:postComputeFrame(body)
-    self.page_size = math.max(1, math.floor(body.height / self.row_height))
-    self:moveCursor(0)
-end
-
 local function update_list_scrollbar(list)
     list.scrollbar:update(list.page_top, list.page_size, #list.choices)
 end
 
+function List:postComputeFrame(body)
+    local row_count = body.height // self.row_height
+    self.page_size = math.max(1, row_count)
+
+    local num_choices = #self.choices
+    if num_choices == 0 then
+        self.page_top = 1
+        update_list_scrollbar(self)
+        return
+    end
+
+    if self.page_top > num_choices - self.page_size + 1 then
+        self.page_top = math.max(1, num_choices - self.page_size + 1)
+    end
+
+    update_list_scrollbar(self)
+end
+
 function List:postUpdateLayout()
     update_list_scrollbar(self)
 end
@@ -1652,12 +1951,16 @@ function List:onRenderBody(dc)
         end
     end
 
+    local hoveridx = self:getIdxUnderMouse()
     for i = top,iend do
         local obj = choices[i]
         local current = (i == self.selected)
-        local cur_pen = self.cursor_pen
-        local cur_dpen = self.text_pen
-        local active_pen = current and cur_pen or cur_dpen
+        local hovered = (i == hoveridx)
+        -- cur_pen and cur_dpen can't be integers or background colors get
+        -- messed up in render_text for subsequent renders
+        local cur_pen = to_pen(self.cursor_pen)
+        local cur_dpen = to_pen(self.text_pen)
+        local active_pen = (current and cur_pen or cur_dpen)
 
         if not getval(self.active) then
             cur_pen = self.inactive_pen or self.cursor_pen
@@ -1671,7 +1974,7 @@ function List:onRenderBody(dc)
             paint_icon(icon, obj)
         end
 
-        render_text(obj, dc, iw or 0, y, cur_pen, cur_dpen, not current)
+        render_text(obj, dc, iw or 0, y, cur_pen, cur_dpen, not current, self.text_hpen, hovered)
 
         local ip = dc.width
 
@@ -1712,6 +2015,16 @@ function List:submit2()
     end
 end
 
+function List:double_click()
+    if #self.choices == 0 then return end
+    local cb = dfhack.internal.getModifiers().shift and
+            self.on_double_click2 or self.on_double_click
+    if cb then
+        cb(self:getSelected())
+        return true
+    end
+end
+
 function List:onInput(keys)
     if self:inputToSubviews(keys) then
         return true
@@ -1720,9 +2033,21 @@ function List:onInput(keys)
         return self:submit()
     elseif keys.CUSTOM_SHIFT_ENTER then
         return self:submit2()
-    elseif keys._MOUSE_L_DOWN then
+    elseif keys._MOUSE_L then
         local idx = self:getIdxUnderMouse()
         if idx then
+            local now_ms = dfhack.getTickCount()
+            if idx ~= self:getSelected() then
+                self.last_select_click_ms = now_ms
+            else
+                if now_ms - self.last_select_click_ms <= DOUBLE_CLICK_MS then
+                    self.last_select_click_ms = 0
+                    if self:double_click() then return true end
+                else
+                    self.last_select_click_ms = now_ms
+                end
+            end
+
             self:setSelected(idx)
             if dfhack.internal.getModifiers().shift then
                 self:submit2()
@@ -1771,6 +2096,7 @@ FilteredList.ATTRS {
     edit_key = DEFAULT_NIL,
     edit_ignore_keys = DEFAULT_NIL,
     edit_on_char = DEFAULT_NIL,
+    edit_on_change = DEFAULT_NIL,
 }
 
 function FilteredList:init(info)
@@ -1781,10 +2107,18 @@ function FilteredList:init(info)
         end
     end
 
+    local on_change = self:callback('onFilterChange')
+    if self.edit_on_change then
+        on_change = function(text)
+            self.edit_on_change(text)
+            self:onFilterChange(text)
+        end
+    end
+
     self.edit = EditField{
         text_pen = info.edit_pen or info.cursor_pen,
         frame = { l = info.icon_width, t = 0, h = 1 },
-        on_change = self:callback('onFilterChange'),
+        on_change = on_change,
         on_char = on_char,
         key = self.edit_key,
         ignore_keys = self.edit_ignore_keys,
@@ -1818,6 +2152,16 @@ function FilteredList:init(info)
             return info.on_submit2(self:getSelected())
         end
     end
+    if info.on_double_click then
+        self.list.on_double_click = function()
+            return info.on_double_click(self:getSelected())
+        end
+    end
+    if info.on_double_click2 then
+        self.list.on_double_click2 = function()
+            return info.on_double_click2(self:getSelected())
+        end
+    end
     self.not_found = Label{
         visible = true,
         text = info.not_found_label or 'No matches',
@@ -1897,7 +2241,6 @@ function FilteredList:setFilter(filter, pos)
         pos = nil
 
         for i,v in ipairs(self.choices) do
-            local ok = true
             local search_key = v.search_key
             if not search_key then
                 if type(v.text) ~= 'table' then
@@ -1912,19 +2255,7 @@ function FilteredList:setFilter(filter, pos)
                     search_key = table.concat(texts, ' ')
                 end
             end
-            for _,key in ipairs(tokens) do
-                key = key:escape_pattern()
-                -- start matches at non-space or non-punctuation. this allows
-                -- punctuation itself to be matched if that is useful (e.g.
-                -- filenames or parameter names)
-                if key ~= '' and
-                        not search_key:match('%f[^%p\x00]'..key) and
-                        not search_key:match('%f[^%s\x00]'..key) then
-                    ok = false
-                    break
-                end
-            end
-            if ok then
+            if utils.search_text(search_key, tokens) then
                 table.insert(choices, v)
                 cidx[#choices] = i
                 if ipos == i then
@@ -1950,4 +2281,300 @@ function FilteredList:onFilterChar(char, text)
     return true
 end
 
+local TSO = df.global.init.tabs_texpos[0] -- tab spritesheet offset
+local DEFAULT_ACTIVE_TAB_PENS = {
+    text_mode_tab_pen=to_pen{fg=COLOR_YELLOW},
+    text_mode_label_pen=to_pen{fg=COLOR_WHITE},
+    lt=to_pen{tile=TSO+5, write_to_lower=true},
+    lt2=to_pen{tile=TSO+6, write_to_lower=true},
+    t=to_pen{tile=TSO+7, fg=COLOR_BLACK, write_to_lower=true, top_of_text=true},
+    rt2=to_pen{tile=TSO+8, write_to_lower=true},
+    rt=to_pen{tile=TSO+9, write_to_lower=true},
+    lb=to_pen{tile=TSO+15, write_to_lower=true},
+    lb2=to_pen{tile=TSO+16, write_to_lower=true},
+    b=to_pen{tile=TSO+17, fg=COLOR_BLACK, write_to_lower=true, bottom_of_text=true},
+    rb2=to_pen{tile=TSO+18, write_to_lower=true},
+    rb=to_pen{tile=TSO+19, write_to_lower=true},
+}
+
+local DEFAULT_INACTIVE_TAB_PENS = {
+    text_mode_tab_pen=to_pen{fg=COLOR_BROWN},
+    text_mode_label_pen=to_pen{fg=COLOR_DARKGREY},
+    lt=to_pen{tile=TSO+0, write_to_lower=true},
+    lt2=to_pen{tile=TSO+1, write_to_lower=true},
+    t=to_pen{tile=TSO+2, fg=COLOR_WHITE, write_to_lower=true, top_of_text=true},
+    rt2=to_pen{tile=TSO+3, write_to_lower=true},
+    rt=to_pen{tile=TSO+4, write_to_lower=true},
+    lb=to_pen{tile=TSO+10, write_to_lower=true},
+    lb2=to_pen{tile=TSO+11, write_to_lower=true},
+    b=to_pen{tile=TSO+12, fg=COLOR_WHITE, write_to_lower=true, bottom_of_text=true},
+    rb2=to_pen{tile=TSO+13, write_to_lower=true},
+    rb=to_pen{tile=TSO+14, write_to_lower=true},
+}
+
+---------
+-- Tab --
+---------
+
+Tab = defclass(Tabs, Widget)
+Tab.ATTRS{
+    id=DEFAULT_NIL,
+    label=DEFAULT_NIL,
+    on_select=DEFAULT_NIL,
+    get_pens=DEFAULT_NIL,
+}
+
+function Tab:preinit(init_table)
+    init_table.frame = init_table.frame or {}
+    init_table.frame.w = #init_table.label + 4
+    init_table.frame.h = 2
+end
+
+function Tab:onRenderBody(dc)
+    local pens = self.get_pens()
+    dc:seek(0, 0)
+    if dfhack.screen.inGraphicsMode() then
+        dc:char(nil, pens.lt):char(nil, pens.lt2)
+        for i=1,#self.label do
+            dc:char(self.label:sub(i,i), pens.t)
+        end
+        dc:char(nil, pens.rt2):char(nil, pens.rt)
+        dc:seek(0, 1)
+        dc:char(nil, pens.lb):char(nil, pens.lb2)
+        for i=1,#self.label do
+            dc:char(self.label:sub(i,i), pens.b)
+        end
+        dc:char(nil, pens.rb2):char(nil, pens.rb)
+    else
+        local tp = pens.text_mode_tab_pen
+        dc:char(' ', tp):char('/', tp)
+        for i=1,#self.label do
+            dc:char('-', tp)
+        end
+        dc:char('\\', tp):char(' ', tp)
+        dc:seek(0, 1)
+        dc:char('/', tp):char('-', tp)
+        dc:string(self.label, pens.text_mode_label_pen)
+        dc:char('-', tp):char('\\', tp)
+    end
+end
+
+function Tab:onInput(keys)
+    if Tab.super.onInput(self, keys) then return true end
+    if keys._MOUSE_L and self:getMousePos() then
+        self.on_select(self.id)
+        return true
+    end
+end
+
+-------------
+-- Tab Bar --
+-------------
+
+TabBar = defclass(TabBar, ResizingPanel)
+TabBar.ATTRS{
+    labels=DEFAULT_NIL,
+    on_select=DEFAULT_NIL,
+    get_cur_page=DEFAULT_NIL,
+    active_tab_pens=DEFAULT_ACTIVE_TAB_PENS,
+    inactive_tab_pens=DEFAULT_INACTIVE_TAB_PENS,
+    get_pens=DEFAULT_NIL,
+    key='CUSTOM_CTRL_T',
+    key_back='CUSTOM_CTRL_Y',
+}
+
+function TabBar:init()
+    for idx,label in ipairs(self.labels) do
+        self:addviews{
+            Tab{
+                frame={t=0, l=0},
+                id=idx,
+                label=label,
+                on_select=self.on_select,
+                get_pens=self.get_pens and function()
+                    return self.get_pens(idx, self)
+                end or function()
+                    if self.get_cur_page() == idx then
+                        return self.active_tab_pens
+                    end
+
+                    return self.inactive_tab_pens
+                end,
+            }
+        }
+    end
+end
+
+function TabBar:postComputeFrame(body)
+    local t, l, width = 0, 0, body.width
+    for _,tab in ipairs(self.subviews) do
+        if l > 0 and l + tab.frame.w > width then
+            t = t + 2
+            l = 0
+        end
+        tab.frame.t = t
+        tab.frame.l = l
+        l = l + tab.frame.w
+    end
+end
+
+function TabBar:onInput(keys)
+    if TabBar.super.onInput(self, keys) then return true end
+    if self.key and keys[self.key] then
+        local zero_idx = self.get_cur_page() - 1
+        local next_zero_idx = (zero_idx + 1) % #self.labels
+        self.on_select(next_zero_idx + 1)
+        return true
+    end
+    if self.key_back and keys[self.key_back] then
+        local zero_idx = self.get_cur_page() - 1
+        local prev_zero_idx = (zero_idx - 1) % #self.labels
+        self.on_select(prev_zero_idx + 1)
+        return true
+    end
+end
+
+--------------------------------
+-- RangeSlider
+--
+
+RangeSlider = defclass(RangeSlider, Widget)
+RangeSlider.ATTRS{
+    num_stops=DEFAULT_NIL,
+    get_left_idx_fn=DEFAULT_NIL,
+    get_right_idx_fn=DEFAULT_NIL,
+    on_left_change=DEFAULT_NIL,
+    on_right_change=DEFAULT_NIL,
+}
+
+function RangeSlider:preinit(init_table)
+    init_table.frame = init_table.frame or {}
+    init_table.frame.h = init_table.frame.h or 1
+end
+
+function RangeSlider:init()
+    if self.num_stops < 2 then error('too few RangeSlider stops') end
+    self.is_dragging_target = nil -- 'left', 'right', or 'both'
+    self.is_dragging_idx = nil -- offset from leftmost dragged tile
+end
+
+local function rangeslider_get_width_per_idx(self)
+    return math.max(5, (self.frame_body.width-7) // (self.num_stops-1))
+end
+
+function RangeSlider:onInput(keys)
+    if not keys._MOUSE_L then return false end
+    local x = self:getMousePos()
+    if not x then return false end
+    local left_idx, right_idx = self.get_left_idx_fn(), self.get_right_idx_fn()
+    local width_per_idx = rangeslider_get_width_per_idx(self)
+    local left_pos = width_per_idx*(left_idx-1)
+    local right_pos = width_per_idx*(right_idx-1) + 4
+    if x < left_pos then
+        self.on_left_change(self.get_left_idx_fn() - 1)
+    elseif x < left_pos+3 then
+        self.is_dragging_target = 'left'
+        self.is_dragging_idx = x - left_pos
+    elseif x < right_pos then
+        self.is_dragging_target = 'both'
+        self.is_dragging_idx = x - left_pos
+    elseif x < right_pos+3 then
+        self.is_dragging_target = 'right'
+        self.is_dragging_idx = x - right_pos
+    else
+        self.on_right_change(self.get_right_idx_fn() + 1)
+    end
+    return true
+end
+
+local function rangeslider_do_drag(self, width_per_idx)
+    local x = self.frame_body:localXY(dfhack.screen.getMousePos())
+    local cur_pos = x - self.is_dragging_idx
+    cur_pos = math.max(0, cur_pos)
+    cur_pos = math.min(width_per_idx*(self.num_stops-1)+7, cur_pos)
+    local offset = self.is_dragging_target == 'right' and -2 or 1
+    local new_idx = math.max(0, cur_pos+offset)//width_per_idx + 1
+    local new_left_idx, new_right_idx
+    if self.is_dragging_target == 'right' then
+        new_right_idx = new_idx
+    else
+        new_left_idx = new_idx
+        if self.is_dragging_target == 'both' then
+            new_right_idx = new_left_idx + self.get_right_idx_fn() - self.get_left_idx_fn()
+            if new_right_idx > self.num_stops then
+                return
+            end
+        end
+    end
+    if new_left_idx and new_left_idx ~= self.get_left_idx_fn() then
+        if not new_right_idx and new_left_idx > self.get_right_idx_fn() then
+            self.on_right_change(new_left_idx)
+        end
+        self.on_left_change(new_left_idx)
+    end
+    if new_right_idx and new_right_idx ~= self.get_right_idx_fn() then
+        if new_right_idx < self.get_left_idx_fn() then
+            self.on_left_change(new_right_idx)
+        end
+        self.on_right_change(new_right_idx)
+    end
+end
+
+local SLIDER_LEFT_END = to_pen{ch=198, fg=COLOR_GREY, bg=COLOR_BLACK}
+local SLIDER_TRACK = to_pen{ch=205, fg=COLOR_GREY, bg=COLOR_BLACK}
+local SLIDER_TRACK_SELECTED = to_pen{ch=205, fg=COLOR_LIGHTGREEN, bg=COLOR_BLACK}
+local SLIDER_TRACK_STOP = to_pen{ch=216, fg=COLOR_GREY, bg=COLOR_BLACK}
+local SLIDER_TRACK_STOP_SELECTED = to_pen{ch=216, fg=COLOR_LIGHTGREEN, bg=COLOR_BLACK}
+local SLIDER_RIGHT_END = to_pen{ch=181, fg=COLOR_GREY, bg=COLOR_BLACK}
+local SLIDER_TAB_LEFT = to_pen{ch=60, fg=COLOR_BLACK, bg=COLOR_YELLOW}
+local SLIDER_TAB_CENTER = to_pen{ch=9, fg=COLOR_BLACK, bg=COLOR_YELLOW}
+local SLIDER_TAB_RIGHT = to_pen{ch=62, fg=COLOR_BLACK, bg=COLOR_YELLOW}
+
+function RangeSlider:onRenderBody(dc, rect)
+    local left_idx, right_idx = self.get_left_idx_fn(), self.get_right_idx_fn()
+    local width_per_idx = rangeslider_get_width_per_idx(self)
+    -- draw track
+    dc:seek(1,0)
+    dc:char(nil, SLIDER_LEFT_END)
+    dc:char(nil, SLIDER_TRACK)
+    for stop_idx=1,self.num_stops-1 do
+        local track_stop_pen = SLIDER_TRACK_STOP_SELECTED
+        local track_pen = SLIDER_TRACK_SELECTED
+        if left_idx > stop_idx or right_idx < stop_idx then
+            track_stop_pen = SLIDER_TRACK_STOP
+            track_pen = SLIDER_TRACK
+        elseif right_idx == stop_idx then
+            track_pen = SLIDER_TRACK
+        end
+        dc:char(nil, track_stop_pen)
+        for i=2,width_per_idx do
+            dc:char(nil, track_pen)
+        end
+    end
+    if right_idx >= self.num_stops then
+        dc:char(nil, SLIDER_TRACK_STOP_SELECTED)
+    else
+        dc:char(nil, SLIDER_TRACK_STOP)
+    end
+    dc:char(nil, SLIDER_TRACK)
+    dc:char(nil, SLIDER_RIGHT_END)
+    -- draw tabs
+    dc:seek(width_per_idx*(left_idx-1))
+    dc:char(nil, SLIDER_TAB_LEFT)
+    dc:char(nil, SLIDER_TAB_CENTER)
+    dc:char(nil, SLIDER_TAB_RIGHT)
+    dc:seek(width_per_idx*(right_idx-1)+4)
+    dc:char(nil, SLIDER_TAB_LEFT)
+    dc:char(nil, SLIDER_TAB_CENTER)
+    dc:char(nil, SLIDER_TAB_RIGHT)
+    -- manage dragging
+    if self.is_dragging_target then
+        rangeslider_do_drag(self, width_per_idx)
+    end
+    if df.global.enabler.mouse_lbut_down == 0 then
+        self.is_dragging_target = nil
+        self.is_dragging_idx = nil
+    end
+end
+
 return _ENV
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 5af41c929..a4e75ff0c 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -1,23 +1,9 @@
 -- The help text database and query interface.
---
--- Help text is read from the rendered text in hack/docs/docs/. If no rendered
--- text exists, it is read from the script sources (for scripts) or the string
--- passed to the PluginCommand initializer (for plugins).
---
--- There should be one help file for each plugin that contains a summary for the
--- plugin itself and help for all the commands that plugin provides (if any).
--- Each script should also have one documentation file.
---
--- The database is lazy-loaded when an API method is called. It rechecks its
--- help sources for updates if an API method has not been called in the last
--- 60 seconds.
 
 local _ENV = mkmodule('helpdb')
 
 local argparse = require('argparse')
 
-local MAX_STALE_MS = 60000
-
 -- paths
 local RENDERED_PATH = 'hack/docs/docs/tools/'
 local TAG_DEFINITIONS = 'hack/docs/docs/Tags.txt'
@@ -25,8 +11,8 @@ local TAG_DEFINITIONS = 'hack/docs/docs/Tags.txt'
 -- used when reading help text embedded in script sources
 local SCRIPT_DOC_BEGIN = '[====['
 local SCRIPT_DOC_END = ']====]'
-local SCRIPT_DOC_BEGIN_RUBY = '=begin'
-local SCRIPT_DOC_END_RUBY = '=end'
+
+local GLOBAL_KEY = 'HELPDB'
 
 -- enums
 local ENTRY_TYPES = {
@@ -274,11 +260,10 @@ local function make_script_entry(old_entry, entry_name, kwargs)
     if not ok then
         return entry
     end
-    local is_rb = source_path:endswith('.rb')
     update_entry(entry, lines,
-            {begin_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_BEGIN),
-             end_marker=(is_rb and SCRIPT_DOC_END_RUBY or SCRIPT_DOC_END),
-             first_line_is_short_help=(is_rb and '#' or '%-%-')})
+            {begin_marker=SCRIPT_DOC_BEGIN,
+             end_marker=SCRIPT_DOC_END,
+             first_line_is_short_help='%-%-'})
     return entry
 end
 
@@ -364,7 +349,7 @@ local function scan_scripts(old_db)
         if not files then goto skip_path end
         for _,f in ipairs(files) do
             if f.isdir or
-                (not f.path:endswith('.lua') and not f.path:endswith('.rb')) or
+                    not f.path:endswith('.lua') or
                     f.path:startswith('test/') or
                     f.path:startswith('internal/') then
                 goto continue
@@ -418,13 +403,12 @@ local function index_tags()
     end
 end
 
--- ensures the db is up to date by scanning all help sources. does not do
--- anything if it has already been run within the last MAX_STALE_MS milliseconds
-local last_refresh_ms = 0
+local needs_refresh = true
+
+-- ensures the db is loaded
 local function ensure_db()
-    local now_ms = dfhack.getTickCount()
-    if now_ms - last_refresh_ms <= MAX_STALE_MS then return end
-    last_refresh_ms = now_ms
+    if not needs_refresh then return end
+    needs_refresh = false
 
     local old_db = textdb
     textdb, entrydb, tag_index = {}, {}, {}
@@ -436,6 +420,19 @@ local function ensure_db()
     index_tags()
 end
 
+function refresh()
+    needs_refresh = true
+    ensure_db()
+end
+
+dfhack.onStateChange[GLOBAL_KEY] = function(sc)
+    if sc ~= SC_WORLD_LOADED then
+        return
+    end
+    -- pick up widgets from active mods
+    refresh()
+end
+
 local function parse_blocks(text)
     local blocks = {}
     for line in text:gmatch('[^\n]*') do
@@ -791,7 +788,11 @@ function ls(filter_str, skip_tags, show_dev_commands, exclude_strs)
         table.insert(excludes, {str=argparse.stringList(exclude_strs)})
     end
     if not show_dev_commands then
-        table.insert(excludes, {tag='dev'})
+        local dev_tags = {'dev', 'unavailable'}
+        if filter_str ~= 'armok' and dfhack.getHideArmokTools() then
+            table.insert(dev_tags, 'armok')
+        end
+        table.insert(excludes, {tag=dev_tags})
     end
     list_entries(skip_tags, include, excludes)
 end
@@ -816,7 +817,16 @@ function tags(tag)
 
     local skip_tags = true
     local include = {entry_type={ENTRY_TYPES.COMMAND}, tag=tag}
-    list_entries(skip_tags, include)
+
+    local excludes = {tag={}}
+    if tag ~= 'unavailable' then
+        table.insert(excludes.tag, 'unavailable')
+    end
+    if tag ~= 'armok' and dfhack.getHideArmokTools() then
+        table.insert(excludes.tag, 'armok')
+    end
+
+    list_entries(skip_tags, include, excludes)
 end
 
 return _ENV
diff --git a/library/lua/json.lua b/library/lua/json.lua
index 2b4b3a66a..6ba8483dd 100644
--- a/library/lua/json.lua
+++ b/library/lua/json.lua
@@ -59,7 +59,13 @@ function _file:read(strict)
         end
     else
         self.exists = true
-        self.data = decode_file(self.path)
+        local ok, err = pcall(function() self.data = decode_file(self.path) end)
+        if not ok then
+            if strict then
+                error(('cannot decode file: %s: %s'):format(self.path, err))
+            end
+            self.data = {}
+        end
     end
     return self.data
 end
diff --git a/library/lua/makeown.lua b/library/lua/makeown.lua
deleted file mode 100644
index 2b16db1df..000000000
--- a/library/lua/makeown.lua
+++ /dev/null
@@ -1,302 +0,0 @@
-local _ENV = mkmodule('makeown')
---[[
-    'tweak makeown' as a lua include
-    make_own(unit)        -- removes foreign flags, sets civ_id to fort civ_id, and sets clothes ownership
-    make_citizen(unit)    -- called by make_own if unit.race == fort race
-
-    eventually ought to migrate to hack/lua/plugins/tweak.lua
-    and local _ENV = mkmodule('plugin.tweak')
-    in order to link to functions in the compiled plugin (when/if they become available to lua)
---]]
-local utils = require 'utils'
-
-
-local function fix_clothing_ownership(unit)
-    -- extracted/translated from tweak makeown plugin
-    -- to be called by tweak-fixmigrant/makeown
-    -- units forced into the fort by removing the flags do not own their clothes
-    -- which has the result that they drop all their clothes and become unhappy because they are naked
-    -- so we need to make them own their clothes and add them to their uniform
-    local fixcount = 0    --int fixcount = 0;
-    for j=0,#unit.inventory-1 do    --for(size_t j=0; j<unit->inventory.size(); j++)
-        local inv_item = unit.inventory[j]    --unidf::unit_inventory_item* inv_item = unit->inventory[j];
-        local item = inv_item.item    --df::item* item = inv_item->item;
-        -- unforbid items (for the case of kidnapping caravan escorts who have their stuff forbidden by default)
-        -- moved forbid false to inside if so that armor/weapons stay equiped
-        if inv_item.mode == df.unit_inventory_item.T_mode.Worn then --if(inv_item->mode == df::unit_inventory_item::T_mode::Worn)
-            -- ignore armor?
-            -- it could be leather boots, for example, in which case it would not be nice to forbid ownership
-            --if(item->getEffectiveArmorLevel() != 0)
-            --    continue;
-
-            if not dfhack.items.getOwner(item) then    --if(!Items::getOwner(item))
-                if dfhack.items.setOwner(item,unit) then    --if(Items::setOwner(item, unit))
-                    item.flags.forbid = false    --inv_item->item->flags.bits.forbid = 0;
-                    -- add to uniform, so they know they should wear their clothes
-                    unit.military.uniforms[0]:insert('#',item.id)    --insert_into_vector(unit->military.uniforms[0], item->id);
-                    fixcount = fixcount + 1    --fixcount++;
-                else
-                    ----out << "could not change ownership for item!" << endl;
-                    print("Makeown: could not change ownership for an item!")
-                end
-            end
-        end
-    end
-    -- clear uniform_drop (without this they would drop their clothes and pick them up some time later)
-    -- dirty?
-    unit.military.uniform_drop:resize(0)    --unit->military.uniform_drop.clear();
-    ----out << "ownership for " << fixcount << " clothes fixed" << endl;
-    print("Makeown: claimed ownership for "..tostring(fixcount).." worn items")
-    --return true    --return CR_OK;
-end
-
-local function entity_link(hf, eid, do_event, add, replace_idx)
-    do_event = (do_event == nil) and true or do_event
-    add = (add == nil) and true or add
-    replace_idx = replace_idx or -1
-
-    local link = add and df.histfig_entity_link_memberst:new() or df.histfig_entity_link_former_memberst:new()
-    link.entity_id = eid
-    if replace_idx > -1 then
-        local e = hf.entity_links[replace_idx]
-        link.link_strength = (e.link_strength > 3) and (e.link_strength - 2) or e.link_strength
-        hf.entity_links[replace_idx] = link -- replace member link with former member link
-        e:delete()
-    else
-        link.link_strength =  100
-        hf.entity_links:insert('#', link)
-    end
-    if do_event then
-        event = add and df.history_event_add_hf_entity_linkst:new() or df.history_event_remove_hf_entity_linkst:new()
-        event.year = df.global.cur_year
-        event.seconds = df.global.cur_year_tick
-        event.civ = eid
-        event.histfig = hf.id
-        event.link_type = 0
-        event.position_id = -1
-        event.id = df.global.hist_event_next_id
-        df.global.world.history.events:insert('#',event)
-        df.global.hist_event_next_id = df.global.hist_event_next_id + 1
-    end
-end
-
-local function change_state(hf, site_id, pos)
-    hf.info.unk_14.unk_0 = 3    -- state? arrived?
-    hf.info.unk_14.region:assign(pos)
-    hf.info.unk_14.site = site_id
-    event = df.history_event_change_hf_statest:new()
-    event.year = df.global.cur_year
-    event.seconds = df.global.cur_year_tick
-    event.hfid = hf.id
-    event.state = 3
-    event.site = site_id
-    event.region_pos:assign(pos)
-    event.substate = -1; event.region = -1; event.layer = -1;
-    event.id = df.global.hist_event_next_id
-    df.global.world.history.events:insert('#',event)
-    df.global.hist_event_next_id = df.global.hist_event_next_id + 1
-end
-
-
-function make_citizen(unit)
-    local dfg = df.global
-    local civ_id = dfg.ui.civ_id
-    local group_id = dfg.ui.group_id
-    local events = dfg.world.history.events
-    local fortent = dfg.ui.main.fortress_entity
-    local civent = fortent and df.historical_entity.find(fortent.entity_links[0].target)
-        -- utils.binsearch(dfg.world.entities.all, fortent.entity_links[0].target, 'id')
-    local event
-    local region_pos = df.world_site.find(dfg.ui.site_id).pos -- used with state events and hf state
-
-    local hf
-    -- assume that hf id 1 and hf id 2 are equal.  I am unaware of instances of when they are not.
-    -- occationally a unit does not have both flags set (missing flags1.important_historical_figure)
-    -- and I don't know what that means yet.
-    if unit.flags1.important_historical_figure and unit.flags2.important_historical_figure then
-        -- aready hf, find it (unlikely to happen)
-        hf = utils.binsearch(dfg.world.history.figures, unit.hist_figure_id, 'id')
-    --elseif unit.flags1.important_historical_figure or unit.flags2.important_historical_figure then
-        -- something wrong, try to fix it?
-        --[[
-        if unit.hist_figure_id == -1 then
-            unit.hist_figure_id = unit.hist_figure_id2
-        end
-        if unit.hist_figure_id > -1 then
-            unit.hist_figure_id2 = unit.hist_figure_id
-            unit.flags1.important_historical_figure = true
-            unit.flags2.important_historical_figure = true
-            hf = utils.binsearch(dfg.world.history.figures, unit.hist_figure_id, 'id')
-        else
-            unit.flags1.important_historical_figure = false
-            unit.flags2.important_historical_figure = false
-        end
-        --]]
-    --else
-        -- make one
-    end
-    --local new_hf = false
-    if not hf then
-        --new_hf = true
-        hf = df.historical_figure:new()
-        hf.profession = unit.profession
-        hf.race = unit.race
-        hf.caste = unit.caste
-        hf.sex = unit.sex
-        hf.appeared_year = dfg.cur_year
-        hf.born_year = unit.birth_year
-        hf.born_seconds = unit.birth_time
-        hf.curse_year = unit.curse_year
-        hf.curse_seconds = unit.curse_time
-        hf.birth_year_bias=unit.bias_birth_bias
-        hf.birth_time_bias=unit.birth_time_bias
-        hf.old_year = unit.old_year
-        hf.old_seconds = unit.old_time
-        hf.died_year = -1
-        hf.died_seconds = -1
-        hf.name:assign(unit.name)
-        hf.civ_id = unit.civ_id
-        hf.population_id  = unit.population_id
-        hf.breed_id = -1
-        hf.unit_id = unit.id
-        hf.id = dfg.hist_figure_next_id -- id must be set before adding links (for the events)
-
-        --history_event_add_hf_entity_linkst not reported for civ on starting 7
-        entity_link(hf, civ_id, false) -- so lets skip event here
-        entity_link(hf, group_id)
-
-        hf.info = df.historical_figure_info:new()
-        hf.info.unk_14 = df.historical_figure_info.T_unk_14:new() -- hf state?
-        --unk_14.region_id = -1; unk_14.beast_id = -1; unk_14.unk_14 = 0
-        hf.info.unk_14.unk_18 = -1; hf.info.unk_14.unk_1c = -1
-        -- set values that seem related to state and do event
-        change_state(hf, dfg.ui.site_id, region_pos)
-
-
-        --lets skip skills for now
-        --local skills = df.historical_figure_info.T_skills:new() -- skills snap shot
-        -- ...
-        --info.skills = skills
-
-        dfg.world.history.figures:insert('#', hf)
-        dfg.hist_figure_next_id = dfg.hist_figure_next_id + 1
-
-        --new_hf_loc = df.global.world.history.figures[#df.global.world.history.figures - 1]
-        fortent.histfig_ids:insert('#', hf.id)
-        fortent.hist_figures:insert('#', hf)
-        civent.histfig_ids:insert('#', hf.id)
-        civent.hist_figures:insert('#', hf)
-
-        unit.flags1.important_historical_figure = true
-        unit.flags2.important_historical_figure = true
-        unit.hist_figure_id = hf.id
-        unit.hist_figure_id2 = hf.id
-        print("Makeown-citizen: created historical figure")
-    else
-        -- only insert into civ/fort if not already there
-        -- Migrants change previous histfig_entity_link_memberst to histfig_entity_link_former_memberst
-        -- for group entities, add link_member for new group, and reports events for remove from group,
-        -- remove from civ, change state, add civ, and add group
-
-        hf.civ_id = civ_id -- ensure current civ_id
-
-        local found_civlink = false
-        local found_fortlink = false
-        local v = hf.entity_links
-        for k=#v-1,0,-1 do
-            if df.histfig_entity_link_memberst:is_instance(v[k]) then
-                entity_link(hf, v[k].entity_id, true, false, k)
-            end
-        end
-
-        if hf.info and hf.info.unk_14 then
-            change_state(hf, dfg.ui.site_id, region_pos)
-            -- leave info nil if not found for now
-        end
-
-        if not found_civlink then    entity_link(hf,civ_id)        end
-        if not found_fortlink then    entity_link(hf,group_id)    end
-
-        --change entity_links
-        local found = false
-        for _,v in ipairs(civent.histfig_ids) do
-            if v == hf.id then found = true; break end
-        end
-        if not found then
-            civent.histfig_ids:insert('#', hf.id)
-            civent.hist_figures:insert('#', hf)
-        end
-        found = false
-        for _,v in ipairs(fortent.histfig_ids) do
-            if v == hf.id then found = true; break end
-        end
-        if not found then
-            fortent.histfig_ids:insert('#', hf.id)
-            fortent.hist_figures:insert('#', hf)
-        end
-        print("Makeown-citizen: migrated historical figure")
-    end    -- hf
-
-    local nemesis = dfhack.units.getNemesis(unit)
-    if not nemesis then
-        nemesis = df.nemesis_record:new()
-        nemesis.figure = hf
-        nemesis.unit = unit
-        nemesis.unit_id = unit.id
-        nemesis.save_file_id = civent.save_file_id
-        nemesis.unk10, nemesis.unk11, nemesis.unk12 = -1, -1, -1
-        --group_leader_id = -1
-        nemesis.id = dfg.nemesis_next_id
-        nemesis.member_idx = civent.next_member_idx
-        civent.next_member_idx = civent.next_member_idx + 1
-
-        dfg.world.nemesis.all:insert('#', nemesis)
-        dfg.nemesis_next_id = dfg.nemesis_next_id + 1
-
-        nemesis_link = df.general_ref_is_nemesisst:new()
-        nemesis_link.nemesis_id = nemesis.id
-        unit.general_refs:insert('#', nemesis_link)
-
-        --new_nemesis_loc = df.global.world.nemesis.all[#df.global.world.nemesis.all - 1]
-        fortent.nemesis_ids:insert('#', nemesis.id)
-        fortent.nemesis:insert('#', nemesis)
-        civent.nemesis_ids:insert('#', nemesis.id)
-        civent.nemesis:insert('#', nemesis)
-        print("Makeown-citizen: created nemesis entry")
-    else-- only insert into civ/fort if not already there
-        local found = false
-        for _,v in ipairs(civent.nemesis_ids) do
-            if v == nemesis.id then found = true; break end
-        end
-        if not found then
-            civent.nemesis_ids:insert('#', nemesis.id)
-            civent.nemesis:insert('#', nemesis)
-        end
-        found = false
-        for _,v in ipairs(fortent.nemesis_ids) do
-            if v == nemesis.id then found = true; break end
-        end
-        if not found then
-            fortent.nemesis_ids:insert('#', nemesis.id)
-            fortent.nemesis:insert('#', nemesis)
-        end
-        print("Makeown-citizen: migrated nemesis entry")
-    end -- nemesis
-end
-
-
-function make_own(unit)
-    --tweak makeown
-    unit.flags2.resident = false; unit.flags1.merchant = false; unit.flags1.forest = false;
-    unit.civ_id = df.global.ui.civ_id
-    if unit.profession == df.profession.MERCHANT then unit.profession = df.profession.TRADER end
-    if unit.profession2 == df.profession.MERCHANT then unit.profession2 = df.profession.TRADER end
-    fix_clothing_ownership(unit)
-    if unit.race == df.global.ui.race_id then
-        make_citizen(unit)
-    end
-end
-
-
-
-return _ENV
diff --git a/library/lua/memscan.lua b/library/lua/memscan.lua
index 34b030d4e..a4c07d38c 100644
--- a/library/lua/memscan.lua
+++ b/library/lua/memscan.lua
@@ -217,6 +217,7 @@ function get_code_segment()
     for i,mem in ipairs(dfhack.internal.getMemRanges()) do
         if mem.read and mem.execute
            and (string.match(mem.name,'/dwarfort%.exe$')
+             or string.match(mem.name,'/dwarfort$')
              or string.match(mem.name,'/Dwarf_Fortress$')
              or string.match(mem.name,'Dwarf Fortress%.exe'))
         then
@@ -243,6 +244,7 @@ local function find_data_segment()
             end
         elseif mem.read and mem.write
            and (string.match(mem.name,'/dwarfort%.exe$')
+             or string.match(mem.name,'/dwarfort$')
              or string.match(mem.name,'/Dwarf_Fortress$')
              or string.match(mem.name,'Dwarf Fortress%.exe'))
         then
@@ -532,4 +534,32 @@ function get_screen_size()
     return w,h
 end
 
+-- Global table
+
+function read_c_string(char_ptr)
+    local s = ''
+    local i = 0
+    while char_ptr[i] ~= 0 do
+        s = s .. string.char(char_ptr[i])
+        i = i + 1
+    end
+    return s
+end
+
+function read_global_table(global_table)
+    global_table = global_table or df.global.global_table
+    local out = {}
+    local i = 0
+    while true do
+        -- use _displace() so we can read past the bounds of the array set in structures, if necessary
+        local entry = global_table[0]:_displace(i)
+        if not entry.name or not entry.address then
+            break
+        end
+        out[read_c_string(entry.name)] = entry
+        i = i + 1
+    end
+    return out
+end
+
 return _ENV
diff --git a/library/lua/script-manager.lua b/library/lua/script-manager.lua
index 008e9443e..c5d9fb364 100644
--- a/library/lua/script-manager.lua
+++ b/library/lua/script-manager.lua
@@ -2,29 +2,37 @@ local _ENV = mkmodule('script-manager')
 
 local utils = require('utils')
 
+---------------------
+-- enabled API
+
 -- for each script that can be loaded as a module, calls cb(script_name, env)
-function foreach_module_script(cb)
+function foreach_module_script(cb, preprocess_script_file_fn)
     for _,script_path in ipairs(dfhack.internal.getScriptPaths()) do
         local files = dfhack.filesystem.listdir_recursive(
                                             script_path, nil, false)
         if not files then goto skip_path end
         for _,f in ipairs(files) do
-            if not f.isdir and
-                    f.path:endswith('.lua') and
-                    not f.path:startswith('test/') and
-                    not f.path:startswith('internal/') then
-                local script_name = f.path:sub(1, #f.path - 4) -- remove '.lua'
-                local ok, script_env = pcall(reqscript, script_name)
-                if ok then
-                    cb(script_name, script_env)
-                end
+            if f.isdir or not f.path:endswith('.lua') or
+                    f.path:startswith('.git') or
+                    f.path:startswith('test/') or
+                    f.path:startswith('internal/') then
+                goto continue
+            end
+            if preprocess_script_file_fn then
+                preprocess_script_file_fn(script_path, f.path)
+            end
+            local script_name = f.path:sub(1, #f.path - 4) -- remove '.lua'
+            local ok, script_env = pcall(reqscript, script_name)
+            if ok then
+                cb(script_name, script_env)
             end
+            ::continue::
         end
         ::skip_path::
     end
 end
 
-local enabled_map = {}
+local enabled_map = nil
 
 local function process_script(env_name, env)
     local global_name = 'isEnabled'
@@ -39,18 +47,136 @@ local function process_script(env_name, env)
     enabled_map[env_name] = fn
 end
 
-function reload()
+function reload(refresh_active_mod_scripts)
     enabled_map = utils.OrderedTable()
-    foreach_module_script(process_script)
+    local force_refresh_fn = refresh_active_mod_scripts and function(script_path, script_name)
+        if script_path:find('scripts_modactive') then
+            local full_path = script_path..'/'..script_name
+            internal_script = dfhack.internal.scripts[full_path]
+            if internal_script then
+                dfhack.internal.scripts[full_path] = nil
+            end
+        end
+    end or nil
+    foreach_module_script(process_script, force_refresh_fn)
+end
+
+local function ensure_loaded()
+    if not enabled_map then
+        reload()
+    end
 end
 
 function list()
-    -- call reload every time we list to make sure we get scripts that have
-    -- just been added
-    reload()
+    ensure_loaded()
     for name,fn in pairs(enabled_map) do
-        print(('%20s\t%-3s'):format(name..':', fn() and 'on' or 'off'))
+        print(('%21s  %-3s'):format(name..':', fn() and 'on' or 'off'))
+    end
+end
+
+---------------------
+-- mod paths
+
+-- this perhaps could/should be queried from the Steam API
+-- are there any installation configurations where this will be wrong, though?
+local WORKSHOP_MODS_PATH = '../../workshop/content/975370/'
+local MODS_PATH = 'mods/'
+local INSTALLED_MODS_PATH = 'data/installed_mods/'
+
+-- last instance of the same version of the same mod wins, so read them in this
+-- order (in increasing order of liklihood that players may have made custom
+-- changes to the files)
+local MOD_PATH_ROOTS = {WORKSHOP_MODS_PATH, MODS_PATH, INSTALLED_MODS_PATH}
+
+local function get_mod_id_and_version(path)
+    local idfile = path .. '/info.txt'
+    local ok, lines = pcall(io.lines, idfile)
+    if not ok then return end
+    local id, version
+    for line in lines do
+        if not id then
+            _,_,id = line:find('^%[ID:([^%]]+)%]')
+        end
+        if not version then
+            -- note this doesn't include the closing brace since some people put
+            -- non-number characters in here, and DF only reads the leading digits
+            -- as the numeric version
+            _,_,version = line:find('^%[NUMERIC_VERSION:(%d+)')
+        end
+        -- note that we do *not* want to break out of this loop early since
+        -- lines has to hit EOF to close the file
+    end
+    return id, version
+end
+
+local function add_mod_paths(mod_paths, id, base_path, subdir)
+    local sep = base_path:endswith('/') and '' or '/'
+    local path = ('%s%s%s'):format(base_path, sep, subdir)
+    if dfhack.filesystem.isdir(path) then
+        print('indexing mod path: ' .. path)
+        table.insert(mod_paths, {id=id, path=path})
+    end
+end
+
+function get_mod_paths(installed_subdir, active_subdir)
+    -- ordered map of mod id -> {handled=bool, versions=map of version -> path}
+    local mods = utils.OrderedTable()
+    local mod_paths = {}
+
+    -- if a world is loaded, process active mods first, and lock to active version
+    if active_subdir and dfhack.isWorldLoaded() then
+        for _,path in ipairs(df.global.world.object_loader.object_load_order_src_dir) do
+            path = tostring(path.value)
+            -- skip vanilla "mods"
+            if not path:startswith(INSTALLED_MODS_PATH) then goto continue end
+            local id = get_mod_id_and_version(path)
+            if not id then goto continue end
+            mods[id] = {handled=true}
+            add_mod_paths(mod_paths, id, path, active_subdir)
+            add_mod_paths(mod_paths, id, path, installed_subdir)
+            ::continue::
+        end
+    end
+
+    -- assemble version -> path maps for all (non-handled) mod source dirs
+    for _,mod_path_root in ipairs(MOD_PATH_ROOTS) do
+        local files = dfhack.filesystem.listdir_recursive(mod_path_root, 0)
+        if not files then goto skip_path_root end
+        for _,f in ipairs(files) do
+            if not f.isdir then goto continue end
+            local id, version = get_mod_id_and_version(f.path)
+            if not id or not version then goto continue end
+            local mod = ensure_key(mods, id)
+            if mod.handled then goto continue end
+            ensure_key(mod, 'versions')[version] = f.path
+            ::continue::
+        end
+        ::skip_path_root::
+    end
+
+    -- add paths from most recent version of all not-yet-handled mods
+    for id,v in pairs(mods) do
+        if v.handled then goto continue end
+        local max_version, path
+        for version,mod_path in pairs(v.versions) do
+            if not max_version or max_version < version then
+                path = mod_path
+                max_version = version
+            end
+        end
+        add_mod_paths(mod_paths, id, path, installed_subdir)
+        ::continue::
+    end
+
+    return mod_paths
+end
+
+function get_mod_script_paths()
+    local paths = {}
+    for _,v in ipairs(get_mod_paths('scripts_modinstalled', 'scripts_modactive')) do
+        table.insert(paths, v.path)
     end
+    return paths
 end
 
 return _ENV
diff --git a/library/lua/utils.lua b/library/lua/utils.lua
index 2e03a8616..fb41835da 100644
--- a/library/lua/utils.lua
+++ b/library/lua/utils.lua
@@ -2,9 +2,9 @@ local _ENV = mkmodule('utils')
 
 local df = df
 
-function getval(obj)
+function getval(obj, ...)
     if type(obj) == 'function' then
-        return obj()
+        return obj(...)
     else
         return obj
     end
@@ -460,6 +460,32 @@ function erase_sorted(vector,item,field,cmp)
     return erase_sorted_key(vector,key,field,cmp)
 end
 
+FILTER_FULL_TEXT = false
+
+function search_text(text, search_tokens)
+    text = dfhack.toSearchNormalized(text)
+    if type(search_tokens) ~= 'table' then
+        search_tokens = search_tokens:split()
+    end
+
+    for _,search_token in ipairs(search_tokens) do
+        if search_token == '' then goto continue end
+        search_token = dfhack.toSearchNormalized(search_token:escape_pattern())
+
+        -- the separate checks for non-space or non-punctuation allows
+        -- punctuation itself to be matched if that is useful (e.g.
+        -- filenames or parameter names)
+        if not FILTER_FULL_TEXT and not text:match('%f[^%p\x00]'..search_token)
+                and not text:match('%f[^%s\x00]'..search_token) then
+            return false
+        elseif FILTER_FULL_TEXT and not text:find(search_token) then
+            return false
+        end
+        ::continue::
+    end
+    return true
+end
+
 -- Calls a method with a string temporary
 function call_with_string(obj,methodname,...)
     return dfhack.with_temp_object(
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 4ec3f11d7..5bb1a55c1 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -68,6 +68,7 @@ using namespace DFHack;
 #include "df/building_stockpilest.h"
 #include "df/building_trapst.h"
 #include "df/building_water_wheelst.h"
+#include "df/building_weaponst.h"
 #include "df/building_wellst.h"
 #include "df/building_workshopst.h"
 #include "df/buildings_other_id.h"
@@ -81,14 +82,15 @@ using namespace DFHack;
 #include "df/job_item.h"
 #include "df/map_block.h"
 #include "df/tile_occupancy.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
+#include "df/squad.h"
 #include "df/ui_look_list.h"
 #include "df/unit.h"
 #include "df/unit_relationship_type.h"
 #include "df/world.h"
 
 using namespace df::enums;
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::world;
 using df::global::d_init;
 using df::global::building_next_id;
@@ -102,7 +104,6 @@ struct CoordHash {
 };
 
 static unordered_map<df::coord, int32_t, CoordHash> locationToBuilding;
-static unordered_map<df::coord, vector<int32_t>, CoordHash> locationToCivzones;
 
 static df::building_extents_type *getExtentTile(df::building_extents &extent, df::coord2d tile)
 {
@@ -167,6 +168,139 @@ void buildings_onUpdate(color_ostream &out)
     }
 }
 
+static void building_into_zone_unidir(df::building* bld, df::building_civzonest* zone)
+{
+    for (auto contained_building : zone->contained_buildings)
+    {
+        if (contained_building == bld)
+            return;
+    }
+
+    insert_into_vector(zone->contained_buildings, &df::building::id, bld);
+}
+
+static void zone_into_building_unidir(df::building* bld, df::building_civzonest* zone)
+{
+    for (auto relation : bld->relations)
+    {
+        if (relation == zone)
+            return;
+    }
+
+    insert_into_vector(bld->relations, &df::building_civzonest::id, zone);
+}
+
+static bool is_suitable_building_for_zoning(df::building* bld)
+{
+    return bld->canMakeRoom();
+}
+
+static void add_building_to_zone(df::building* bld, df::building_civzonest* zone)
+{
+    if (!is_suitable_building_for_zoning(bld))
+        return;
+
+    building_into_zone_unidir(bld, zone);
+    zone_into_building_unidir(bld, zone);
+}
+
+static void add_building_to_all_zones(df::building* bld)
+{
+    if (!is_suitable_building_for_zoning(bld))
+        return;
+
+    df::coord coord(bld->centerx, bld->centery, bld->z);
+
+    std::vector<df::building_civzonest*> cv;
+    Buildings::findCivzonesAt(&cv, coord);
+
+    for (auto zone : cv)
+        add_building_to_zone(bld, zone);
+}
+
+static void add_zone_to_all_buildings(df::building* zone_as_building)
+{
+    if (zone_as_building->getType() != building_type::Civzone)
+        return;
+
+    auto zone = strict_virtual_cast<df::building_civzonest>(zone_as_building);
+
+    if (zone == nullptr)
+        return;
+
+    for (auto bld : world->buildings.other.IN_PLAY)
+    {
+        if (zone->z != bld->z)
+            continue;
+
+        if (!is_suitable_building_for_zoning(bld))
+            continue;
+
+        int32_t cx = bld->centerx;
+        int32_t cy = bld->centery;
+
+        df::coord2d coord(cx, cy);
+
+        //can a zone without extents exist?
+        if (zone->room.extents && zone->isExtentShaped())
+        {
+            auto etile = getExtentTile(zone->room, coord);
+            if (!etile || !*etile)
+                continue;
+
+            add_building_to_zone(bld, zone);
+        }
+    }
+}
+
+static void remove_building_from_zone(df::building* bld, df::building_civzonest* zone)
+{
+    for (int bid = 0; bid < (int)zone->contained_buildings.size(); bid++)
+    {
+        if (zone->contained_buildings[bid] == bld)
+        {
+            zone->contained_buildings.erase(zone->contained_buildings.begin() + bid);
+            bid--;
+        }
+    }
+
+    for (int bid = 0; bid < (int)bld->relations.size(); bid++)
+    {
+        if (bld->relations[bid] == zone)
+        {
+            bld->relations.erase(bld->relations.begin() + bid);
+            bid--;
+        }
+    }
+}
+
+static void remove_building_from_all_zones(df::building* bld)
+{
+    df::coord coord(bld->centerx, bld->centery, bld->z);
+
+    std::vector<df::building_civzonest*> cv;
+    Buildings::findCivzonesAt(&cv, coord);
+
+    for (auto zone : cv)
+        remove_building_from_zone(bld, zone);
+}
+
+static void remove_zone_from_all_buildings(df::building* zone_as_building)
+{
+    if (zone_as_building->getType() != building_type::Civzone)
+        return;
+
+    auto zone = strict_virtual_cast<df::building_civzonest>(zone_as_building);
+
+    if (zone == nullptr)
+        return;
+
+    //this is a paranoid check and slower than it could be. Zones contain a list of children
+    //good for fixing potentially bad game states when deleting a zone
+    for (auto bld : world->buildings.other.IN_PLAY)
+        remove_building_from_zone(bld, zone);
+}
+
 uint32_t Buildings::getNumBuildings()
 {
     return world->buildings.all.size();
@@ -216,46 +350,45 @@ df::specific_ref *Buildings::getSpecificRef(df::building *building, df::specific
     return findRef(building->specific_refs, type);
 }
 
-bool Buildings::setOwner(df::building *bld, df::unit *unit)
+bool Buildings::setOwner(df::building_civzonest *bld, df::unit *unit)
 {
     CHECK_NULL_POINTER(bld);
-/* TODO: understand how this changes for v50
-    if (!bld->is_room)
-        return false;
-    if (bld->owner == unit)
+
+    if (bld->assigned_unit == unit)
         return true;
 
-    if (bld->owner)
+    df::building * pbld = virtual_cast<df::building>(bld);
+
+    if (bld->assigned_unit)
     {
-        auto &blist = bld->owner->owned_buildings;
-        vector_erase_at(blist, linear_index(blist, bld));
+        auto &blist = bld->assigned_unit->owned_buildings;
+        vector_erase_at(blist, linear_index(blist, pbld));
 
-        if (auto spouse = df::unit::find(bld->owner->relationship_ids[df::unit_relationship_type::Spouse]))
+        if (auto spouse = df::unit::find(bld->assigned_unit->relationship_ids[df::unit_relationship_type::Spouse]))
         {
             auto &blist = spouse->owned_buildings;
-            vector_erase_at(blist, linear_index(blist, bld));
+            vector_erase_at(blist, linear_index(blist, pbld));
         }
     }
 
-    bld->owner = unit;
+    bld->assigned_unit = unit;
 
     if (unit)
     {
-        bld->owner_id = unit->id;
+        bld->assigned_unit_id = unit->id;
         unit->owned_buildings.push_back(bld);
 
         if (auto spouse = df::unit::find(unit->relationship_ids[df::unit_relationship_type::Spouse]))
         {
             auto &blist = spouse->owned_buildings;
-            if (bld->canUseSpouseRoom() && linear_index(blist, bld) < 0)
+            if (bld->canUseSpouseRoom() && linear_index(blist, pbld) < 0)
                 blist.push_back(bld);
         }
     }
     else
     {
-        bld->owner_id = -1;
+        bld->assigned_unit_id = -1;
     }
-*/
 
     return true;
 }
@@ -274,7 +407,7 @@ df::building *Buildings::findAtTile(df::coord pos)
 
         if (building && building->z == pos.z &&
             building->isSettingOccupancy() &&
-            containsTile(building, pos, false))
+            containsTile(building, pos))
         {
             return building;
         }
@@ -309,94 +442,41 @@ df::building *Buildings::findAtTile(df::coord pos)
 
 static unordered_map<int32_t, df::coord> corner1;
 static unordered_map<int32_t, df::coord> corner2;
-static void cacheBuilding(df::building *building, bool is_civzone) {
+static void cacheBuilding(df::building *building) {
     int32_t id = building->id;
     df::coord p1(min(building->x1, building->x2), min(building->y1,building->y2), building->z);
     df::coord p2(max(building->x1, building->x2), max(building->y1,building->y2), building->z);
 
-    if (!is_civzone) {
-        // civzones can be dynamically shrunk so we don't bother to cache
-        // their boundaries. findCivzonesAt() will trim the cache as needed.
-        corner1[id] = p1;
-        corner2[id] = p2;
-    }
+    corner1[id] = p1;
+    corner2[id] = p2;
 
     for (int32_t x = p1.x; x <= p2.x; x++) {
         for (int32_t y = p1.y; y <= p2.y; y++) {
             df::coord pt(x, y, building->z);
-            if (Buildings::containsTile(building, pt, is_civzone)) {
-                if (is_civzone)
-                    locationToCivzones[pt].push_back(id);
-                else
-                    locationToBuilding[pt] = id;
+            if (Buildings::containsTile(building, pt)) {
+                locationToBuilding[pt] = id;
             }
         }
     }
 }
 
-static int32_t nextCivzone = 0;
-static void cacheNewCivzones() {
-    if (!world || !building_next_id)
-        return;
-
-    int32_t nextBuildingId = *building_next_id;
-    for (int32_t id = nextCivzone; id < nextBuildingId; ++id) {
-        auto &vec = world->buildings.other[buildings_other_id::ANY_ZONE];
-        int32_t idx = df::building::binsearch_index(vec, id);
-        if (idx > -1)
-            cacheBuilding(vec[idx], true);
-    }
-    nextCivzone = nextBuildingId;
-}
-
 bool Buildings::findCivzonesAt(std::vector<df::building_civzonest*> *pvec,
                                df::coord pos) {
     pvec->clear();
 
-    // Tiles have an occupancy->bits.building flag to quickly determine if it is
-    // covered by a buildling, but there is no such flag for civzones.
-    // Therefore, we need to make sure that our cache is authoratative.
-    // Otherwise, we would have to fall back to linearly scanning the list of
-    // all civzones on a cache miss.
-    //
-    // Since we guarantee our cache contains *at least* all tiles that are
-    // currently covered by civzones, we can conclude that if a tile is not in
-    // the cache, there is no civzone there. Civzones *can* be dynamically
-    // shrunk, so we still need to verify that civzones that once covered this
-    // tile continue to cover this tile.
-    cacheNewCivzones();
-
-    auto civzones_it = locationToCivzones.find(pos);
-    if (civzones_it == locationToCivzones.end())
-        return false;
-
-    set<int32_t> ids_to_remove;
-    auto &civzones = civzones_it->second;
-    for (int32_t id : civzones) {
-        int32_t idx = df::building::binsearch_index(
-                world->buildings.other[buildings_other_id::ANY_ZONE], id);
-        df::building_civzonest *civzone = NULL;
-        if (idx > -1)
-            civzone = world->buildings.other.ANY_ZONE[idx];
-        if (!civzone || civzone->z != pos.z ||
-                !containsTile(civzone, pos, true)) {
-            ids_to_remove.insert(id);
+    for (df::building_civzonest* zone : world->buildings.other.ANY_ZONE)
+    {
+        if (pos.z != zone->z)
             continue;
-        }
-        pvec->push_back(civzone);
-    }
 
-    // civzone no longer occupies this tile; update the cache
-    if (!ids_to_remove.empty()) {
-        for (auto it = civzones.begin(); it != civzones.end(); ) {
-            if (ids_to_remove.count(*it)) {
-                it = civzones.erase(it);
+        if (zone->room.extents && zone->isExtentShaped())
+        {
+            auto etile = getExtentTile(zone->room, pos);
+            if (!etile || !*etile)
                 continue;
-            }
-            ++it;
+
+            pvec->push_back(zone);
         }
-        if (civzones.empty())
-            locationToCivzones.erase(pos);
     }
 
     return !pvec->empty();
@@ -425,7 +505,7 @@ df::building *Buildings::allocInstance(df::coord pos, df::building_type type, in
     bld->y1 = bld->y2 = bld->centery = pos.y;
     bld->z = pos.z;
 
-    bld->race = ui->race_id;
+    bld->race = plotinfo->race_id;
 
     if (subtype != -1)
         bld->setSubtype(subtype);
@@ -511,6 +591,12 @@ df::building *Buildings::allocInstance(df::coord pos, df::building_type type, in
             obj->gate_flags.bits.closed = false;
         break;
     }
+    case building_type::Weapon:
+    {
+        if (VIRTUAL_CAST_VAR(obj, df::building_weaponst, bld))
+            obj->gate_flags.bits.closed = false;
+        break;
+    }
     default:
         break;
     }
@@ -712,10 +798,13 @@ bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
             if (!allow_occupied &&
                 block->occupancy[btile.x][btile.y].bits.building)
                 allowed = false;
-            else
+            else if (!allow_wall)
             {
-                auto tile = block->tiletype[btile.x][btile.y];
-                if (!allow_wall && !HighPassable(tile))
+                auto &tt = block->tiletype[btile.x][btile.y];
+                auto &des = block->designation[btile.x][btile.y];
+                if (!HighPassable(tt) ||
+                        des.bits.flow_size > 1 ||
+                        (des.bits.flow_size >= 1 && des.bits.liquid_type == df::tile_liquid::Magma))
                     allowed = false;
             }
 
@@ -783,31 +872,16 @@ int Buildings::countExtentTiles(df::building_extents *ext, int defval)
     return cnt;
 }
 
-bool Buildings::containsTile(df::building *bld, df::coord2d tile, bool room)
-{
+bool Buildings::containsTile(df::building *bld, df::coord2d tile) {
     CHECK_NULL_POINTER(bld);
 
-    if (room)
-    {
-/* TODO: understand how this changes for v50
-        if (!bld->is_room || !bld->room.extents)
-            return false;
-*/
-    }
-    else
-    {
+    if (!bld->isExtentShaped() || !bld->room.extents) {
         if (tile.x < bld->x1 || tile.x > bld->x2 || tile.y < bld->y1 || tile.y > bld->y2)
             return false;
     }
 
-    if (bld->room.extents && (room || bld->isExtentShaped()))
-    {
-        df::building_extents_type *etile = getExtentTile(bld->room, tile);
-        if (!etile || !*etile)
-            return false;
-    }
-
-    return true;
+    df::building_extents_type *etile = getExtentTile(bld->room, tile);
+    return etile && *etile;
 }
 
 bool Buildings::hasSupport(df::coord pos, df::coord2d size)
@@ -989,7 +1063,7 @@ static void linkRooms(df::building *bld)
     }
 
     if (changed)
-        df::global::ui->equipment.update.bits.buildings = true;
+        df::global::plotinfo->equipment.update.bits.buildings = true;
 */
 }
 
@@ -1040,35 +1114,19 @@ static void createDesign(df::building *bld, bool rough)
 
 static int getMaxStockpileId()
 {
-    auto &vec = world->buildings.other[buildings_other_id::STOCKPILE];
     int max_id = 0;
-
-    for (size_t i = 0; i < vec.size(); i++)
-    {
-        auto bld = strict_virtual_cast<df::building_stockpilest>(vec[i]);
-        if (bld)
-            max_id = std::max(max_id, bld->stockpile_number);
-    }
-
+    for (auto bld : world->buildings.other.STOCKPILE)
+        max_id = std::max(max_id, bld->stockpile_number);
     return max_id;
 }
 
-/* TODO: understand how this changes for v50
 static int getMaxCivzoneId()
 {
-    auto &vec = world->buildings.other[buildings_other_id::ANY_ZONE];
     int max_id = 0;
-
-    for (size_t i = 0; i < vec.size(); i++)
-    {
-        auto bld = strict_virtual_cast<df::building_civzonest>(vec[i]);
-        if (bld)
-            max_id = std::max(max_id, bld->zone_num);
-    }
-
+    for (auto bld : world->buildings.other.ANY_ZONE)
+        max_id = std::max(max_id, bld->zone_num);
     return max_id;
 }
-*/
 
 bool Buildings::constructAbstract(df::building *bld)
 {
@@ -1087,12 +1145,14 @@ bool Buildings::constructAbstract(df::building *bld)
                 stock->stockpile_number = getMaxStockpileId() + 1;
             break;
 
-/* TODO: understand how this changes for v50
         case building_type::Civzone:
             if (auto zone = strict_virtual_cast<df::building_civzonest>(bld))
+            {
                 zone->zone_num = getMaxCivzoneId() + 1;
+
+                add_zone_to_all_buildings(zone);
+            }
             break;
-*/
 
         default:
             break;
@@ -1186,6 +1246,8 @@ bool Buildings::constructWithItems(df::building *bld, std::vector<df::item*> ite
             bld->mat_index = items[i]->getMaterialIndex();
     }
 
+    add_building_to_all_zones(bld);
+
     createDesign(bld, rough);
     return true;
 }
@@ -1232,13 +1294,71 @@ bool Buildings::constructWithFilters(df::building *bld, std::vector<df::job_item
 
     buildings_do_onupdate = true;
 
+    add_building_to_all_zones(bld);
+
     createDesign(bld, rough);
     return true;
 }
 
+static void delete_civzone_squad_links(df::building_civzonest* zone)
+{
+    for (df::building_civzonest::T_squad_room_info* room_info : zone->squad_room_info)
+    {
+        int32_t squad_id = room_info->squad_id;
+
+        df::squad* squad = df::squad::find(squad_id);
+
+        //if this is null, something has gone just *terribly* wrong
+        if (squad)
+        {
+            for (int i=(int)squad->rooms.size() - 1; i >= 0; i--)
+            {
+                if (squad->rooms[i]->building_id == zone->id)
+                {
+                    auto room = squad->rooms[i];
+                    squad->rooms.erase(squad->rooms.begin() + i);
+                    delete room;
+                }
+            }
+        }
+
+        delete room_info;
+    }
+
+    zone->squad_room_info.clear();
+}
+
+//unit owned_building pointers are known-bad as of 50.05 and dangle on zone delete
+//do not use anything that touches anything other than the pointer value
+//this means also that if dwarf fortress reuses a memory allocation, we will end up with duplicates
+//this vector is also not sorted by id
+//it also turns out that multiple units eg (solely?) spouses can point to one room
+static void delete_assigned_unit_links(df::building_civzonest* zone)
+{
+    //not clear if this is always true
+    /*if (zone->assigned_unit_id == -1)
+        return;*/
+
+    for (df::unit* unit : world->units.active)
+    {
+        for (int i=(int)unit->owned_buildings.size() - 1; i >= 0; i--)
+        {
+            if (unit->owned_buildings[i] == zone)
+                unit->owned_buildings.erase(unit->owned_buildings.begin() + i);
+        }
+    }
+}
+
+static void on_civzone_delete(df::building_civzonest* civzone)
+{
+    remove_zone_from_all_buildings(civzone);
+    delete_civzone_squad_links(civzone);
+    delete_assigned_unit_links(civzone);
+}
+
 bool Buildings::deconstruct(df::building *bld)
 {
-    using df::global::ui;
+    using df::global::plotinfo;
     using df::global::world;
     using df::global::ui_look_list;
 
@@ -1263,7 +1383,8 @@ bool Buildings::deconstruct(df::building *bld)
     // Assume: no parties.
     unlinkRooms(bld);
     // Assume: not unit destroy target
-    vector_erase_at(ui->tax_collection.rooms, linear_index(ui->tax_collection.rooms, bld->id));
+    int id = bld->id;
+    vector_erase_at(plotinfo->tax_collection.rooms, linear_index(plotinfo->tax_collection.rooms, id));
     // Assume: not used in punishment
     // Assume: not used in non-own jobs
     // Assume: does not affect pathfinding
@@ -1271,6 +1392,17 @@ bool Buildings::deconstruct(df::building *bld)
     // Don't clear arrows.
 
     bld->uncategorize();
+
+    remove_building_from_all_zones(bld);
+
+    if (bld->getType() == df::building_type::Civzone)
+    {
+        auto zone = strict_virtual_cast<df::building_civzonest>(bld);
+
+        if (zone)
+            on_civzone_delete(zone);
+    }
+
     delete bld;
 
     if (world->selected_building == bld)
@@ -1283,7 +1415,7 @@ bool Buildings::deconstruct(df::building *bld)
     {
         auto item = ui_look_list->items[i];
         if (item->type == df::ui_look_list::T_items::Building &&
-            item->data.Building == bld)
+            item->data.building.bld_id == id)
         {
             vector_erase_at(ui_look_list->items, i);
             delete item;
@@ -1309,12 +1441,20 @@ bool Buildings::markedForRemoval(df::building *bld)
     return false;
 }
 
+void Buildings::notifyCivzoneModified(df::building* bld)
+{
+    if (bld->getType() != building_type::Civzone)
+        return;
+
+    //remove zone here needs to be the slow method
+    remove_zone_from_all_buildings(bld);
+    add_zone_to_all_buildings(bld);
+}
+
 void Buildings::clearBuildings(color_ostream& out) {
     corner1.clear();
     corner2.clear();
     locationToBuilding.clear();
-    locationToCivzones.clear();
-    nextCivzone = 0;
 }
 
 void Buildings::updateBuildings(color_ostream&, void* ptr)
@@ -1326,7 +1466,7 @@ void Buildings::updateBuildings(color_ostream&, void* ptr)
     {
         bool is_civzone = !building->isSettingOccupancy();
         if (!corner1.count(id) && !is_civzone)
-            cacheBuilding(building, false);
+            cacheBuilding(building);
     }
     else if (corner1.count(id))
     {
@@ -1444,45 +1584,31 @@ bool Buildings::isPenPasture(df::building * building)
     if (!isActivityZone(building))
         return false;
 
-/* TODO: understand how this changes for v50
-    return ((df::building_civzonest*) building)->zone_flags.bits.pen_pasture != 0;
-*/ return false;
+    return ((df::building_civzonest*)building)->type == civzone_type::Pen;
 }
 
 bool Buildings::isPitPond(df::building * building)
 {
     if (!isActivityZone(building))
         return false;
-/* TODO: understand how this changes for v50
-    return ((df::building_civzonest*) building)->zone_flags.bits.pit_pond != 0;
-*/ return false;
+
+    return ((df::building_civzonest*)building)->type == civzone_type::Pond;
 }
 
 bool Buildings::isActive(df::building * building)
 {
     if (!isActivityZone(building))
         return false;
-/* TODO: understand how this changes for v50
-    return ((df::building_civzonest*) building)->zone_flags.bits.active != 0;
-*/ return false;
+    // 8 is the value obtained by reverse engineering
+    return ((df::building_civzonest*)building)->is_active == 8;
 }
 
-bool Buildings::isHospital(df::building * building)
- {
-     if (!isActivityZone(building))
-         return false;
-/* TODO: understand how this changes for v50
-     return ((df::building_civzonest*) building)->zone_flags.bits.hospital != 0;
-*/ return false;
- }
-
  bool Buildings::isAnimalTraining(df::building * building)
  {
      if (!isActivityZone(building))
          return false;
-/* TODO: understand how this changes for v50
-     return ((df::building_civzonest*) building)->zone_flags.bits.animal_training != 0;
-*/ return false;
+
+     return ((df::building_civzonest*)building)->type == civzone_type::AnimalTraining;
  }
 
 // returns building of pen/pit at cursor position (NULL if nothing found)
@@ -1504,19 +1630,25 @@ StockpileIterator& StockpileIterator::operator++() {
         if (block) {
             // Check the next item in the current block.
             ++current;
+        }
+        else if (stockpile->x2 < 0 || stockpile->y2 < 0 || stockpile->z < 0 || stockpile->x1 > world->map.x_count - 1 || stockpile->y1 > world->map.y_count - 1 || stockpile->z > world->map.z_count - 1) {
+            // if the stockpile bounds exist outside of valid map plane then no items can be in the stockpile
+            block = NULL;
+            item = NULL;
+            return *this;
         } else {
             // Start with the top-left block covering the stockpile.
-            block = Maps::getTileBlock(stockpile->x1, stockpile->y1, stockpile->z);
+            block = Maps::getTileBlock(std::min(std::max(stockpile->x1, 0), world->map.x_count-1), std::min(std::max(stockpile->y1, 0), world->map.y_count-1), stockpile->z);
             current = 0;
         }
 
         while (current >= block->items.size()) {
             // Out of items in this block; find the next block to search.
-            if (block->map_pos.x + 16 < stockpile->x2) {
+            if (block->map_pos.x + 16 <= std::min(stockpile->x2, world->map.x_count-1)) {
                 block = Maps::getTileBlock(block->map_pos.x + 16, block->map_pos.y, stockpile->z);
                 current = 0;
-            } else if (block->map_pos.y + 16 < stockpile->y2) {
-                block = Maps::getTileBlock(stockpile->x1, block->map_pos.y + 16, stockpile->z);
+            } else if (block->map_pos.y + 16 <= std::min(stockpile->y2, world->map.y_count-1)) {
+                block = Maps::getTileBlock(std::max(stockpile->x1, 0), block->map_pos.y + 16, stockpile->z);
                 current = 0;
             } else {
                 // All items in all blocks have been checked.
@@ -1532,7 +1664,7 @@ StockpileIterator& StockpileIterator::operator++() {
             continue;
         }
 
-        if (!Buildings::containsTile(stockpile, item->pos, false)) {
+        if (!Buildings::containsTile(stockpile, item->pos)) {
             continue;
         }
 
@@ -1575,3 +1707,15 @@ bool Buildings::getCageOccupants(df::building_cagest *cage, vector<df::unit*> &u
 
     return true;
 }
+
+void Buildings::completebuild(df::building* bld, char in_play)
+{
+    CHECK_NULL_POINTER(bld);
+
+    auto fp = df::global::buildingst_completebuild;
+    CHECK_NULL_POINTER(fp);
+
+    using FT = std::function<void(df::building* bld, char)>;
+    auto f = reinterpret_cast<FT*>(fp);
+    (*f)(bld, in_play);
+}
diff --git a/library/modules/Burrows.cpp b/library/modules/Burrows.cpp
index 52e550960..afd6ac9e3 100644
--- a/library/modules/Burrows.cpp
+++ b/library/modules/Burrows.cpp
@@ -42,22 +42,30 @@ using namespace std;
 #include "df/block_burrow_link.h"
 #include "df/burrow.h"
 #include "df/map_block.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/world.h"
 
 using namespace DFHack;
 using namespace df::enums;
 
 using df::global::world;
-using df::global::ui;
+using df::global::plotinfo;
 
-df::burrow *Burrows::findByName(std::string name)
+df::burrow *Burrows::findByName(std::string name, bool ignore_final_plus)
 {
     auto &vec = df::burrow::get_vector();
 
-    for (size_t i = 0; i < vec.size(); i++)
-        if (vec[i]->name == name)
+    if (ignore_final_plus && name.ends_with('+'))
+        name = name.substr(0, name.length() - 1);
+
+    for (size_t i = 0; i < vec.size(); i++) {
+        std::string bname = vec[i]->name;
+        if (ignore_final_plus && bname.ends_with('+'))
+            bname = bname.substr(0, bname.length() - 1);
+
+        if (bname == name)
             return vec[i];
+    }
 
     return NULL;
 }
@@ -70,23 +78,13 @@ void Burrows::clearUnits(df::burrow *burrow)
     {
         auto unit = df::unit::find(burrow->units[i]);
 
-        if (unit)
+        if (unit) {
             erase_from_vector(unit->burrows, burrow->id);
+            erase_from_vector(unit->inactive_burrows, burrow->id);
+        }
     }
 
     burrow->units.clear();
-
-/* TODO: understand how this changes for v50
-    // Sync ui if active
-    if (ui && ui->main.mode == ui_sidebar_mode::Burrows &&
-        ui->burrows.in_add_units_mode && ui->burrows.sel_id == burrow->id)
-    {
-        auto &sel = ui->burrows.sel_units;
-
-        for (size_t i = 0; i < sel.size(); i++)
-            sel[i] = false;
-    }
-*/
 }
 
 bool Burrows::isAssignedUnit(df::burrow *burrow, df::unit *unit)
@@ -94,37 +92,28 @@ bool Burrows::isAssignedUnit(df::burrow *burrow, df::unit *unit)
     CHECK_NULL_POINTER(unit);
     CHECK_NULL_POINTER(burrow);
 
-    return binsearch_index(unit->burrows, burrow->id) >= 0;
+    return binsearch_index(unit->burrows, burrow->id) >= 0 ||
+        binsearch_index(unit->inactive_burrows, burrow->id) >= 0;
 }
 
 void Burrows::setAssignedUnit(df::burrow *burrow, df::unit *unit, bool enable)
 {
-    using df::global::ui;
+    using df::global::plotinfo;
 
     CHECK_NULL_POINTER(unit);
     CHECK_NULL_POINTER(burrow);
 
-    if (enable)
-    {
-        insert_into_vector(unit->burrows, burrow->id);
+    if (enable) {
+        if (burrow->limit_workshops & 2)  // inactive flag
+            insert_into_vector(unit->inactive_burrows, burrow->id);
+        else
+            insert_into_vector(unit->burrows, burrow->id);
         insert_into_vector(burrow->units, unit->id);
-    }
-    else
-    {
+    } else {
         erase_from_vector(unit->burrows, burrow->id);
+        erase_from_vector(unit->inactive_burrows, burrow->id);
         erase_from_vector(burrow->units, unit->id);
     }
-
-/* TODO: understand how this changes for v50
-    // Sync ui if active
-    if (ui && ui->main.mode == ui_sidebar_mode::Burrows &&
-        ui->burrows.in_add_units_mode && ui->burrows.sel_id == burrow->id)
-    {
-        int idx = linear_index(ui->burrows.list_units, unit);
-        if (idx >= 0)
-            ui->burrows.sel_units[idx] = enable;
-    }
-*/
 }
 
 void Burrows::listBlocks(std::vector<df::map_block*> *pvec, df::burrow *burrow)
diff --git a/library/modules/DFSDL.cpp b/library/modules/DFSDL.cpp
new file mode 100644
index 000000000..dec43a1c5
--- /dev/null
+++ b/library/modules/DFSDL.cpp
@@ -0,0 +1,188 @@
+#include "Internal.h"
+
+#include "modules/DFSDL.h"
+
+#include "Debug.h"
+#include "PluginManager.h"
+
+#include <SDL_stdinc.h>
+
+namespace DFHack {
+    DBG_DECLARE(core, dfsdl, DebugCategory::LINFO);
+}
+
+using namespace DFHack;
+
+static DFLibrary *g_sdl_handle = nullptr;
+static DFLibrary *g_sdl_image_handle = nullptr;
+static const std::vector<std::string> SDL_LIBS {
+    "SDL2.dll",
+    "SDL.framework/Versions/A/SDL",
+    "SDL.framework/SDL",
+    "libSDL2-2.0.so.0"
+};
+static const std::vector<std::string> SDL_IMAGE_LIBS {
+    "SDL2_image.dll",
+    "SDL_image.framework/Versions/A/SDL_image",
+    "SDL_image.framework/SDL_image",
+    "libSDL2_image-2.0.so.0"
+};
+
+SDL_Surface * (*g_IMG_Load)(const char *) = nullptr;
+SDL_Surface * (*g_SDL_CreateRGBSurface)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t) = nullptr;
+SDL_Surface * (*g_SDL_CreateRGBSurfaceFrom)(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = nullptr;
+int (*g_SDL_UpperBlit)(SDL_Surface *, const SDL_Rect *, SDL_Surface *, SDL_Rect *) = nullptr;
+SDL_Surface * (*g_SDL_ConvertSurface)(SDL_Surface *, const SDL_PixelFormat *, uint32_t) = nullptr;
+void (*g_SDL_FreeSurface)(SDL_Surface *) = nullptr;
+// int (*g_SDL_SemWait)(DFSDL_sem *) = nullptr;
+// int (*g_SDL_SemPost)(DFSDL_sem *) = nullptr;
+int (*g_SDL_PushEvent)(SDL_Event *) = nullptr;
+SDL_bool (*g_SDL_HasClipboardText)();
+int (*g_SDL_SetClipboardText)(const char *text);
+char * (*g_SDL_GetClipboardText)();
+void (*g_SDL_free)(void *);
+SDL_PixelFormat* (*g_SDL_AllocFormat)(uint32_t pixel_format) = nullptr;
+SDL_Surface* (*g_SDL_CreateRGBSurfaceWithFormat)(uint32_t flags, int width, int height, int depth, uint32_t format) = nullptr;
+int (*g_SDL_ShowSimpleMessageBox)(uint32_t flags, const char *title, const char *message, SDL_Window *window) = nullptr;
+
+bool DFSDL::init(color_ostream &out) {
+    for (auto &lib_str : SDL_LIBS) {
+        if ((g_sdl_handle = OpenPlugin(lib_str.c_str())))
+            break;
+    }
+    if (!g_sdl_handle) {
+        out.printerr("DFHack could not find SDL\n");
+        return false;
+    }
+
+    for (auto &lib_str : SDL_IMAGE_LIBS) {
+        if ((g_sdl_image_handle = OpenPlugin(lib_str.c_str())))
+            break;
+    }
+    if (!g_sdl_image_handle) {
+        out.printerr("DFHack could not find SDL_image\n");
+        return false;
+    }
+
+    #define bind(handle, name) \
+        g_##name = (decltype(g_##name))LookupPlugin(handle, #name); \
+        if (!g_##name) { \
+            out.printerr("DFHack could not find: " #name "\n"); \
+            return false; \
+        }
+
+    bind(g_sdl_image_handle, IMG_Load);
+    bind(g_sdl_handle, SDL_CreateRGBSurface);
+    bind(g_sdl_handle, SDL_CreateRGBSurfaceFrom);
+    bind(g_sdl_handle, SDL_UpperBlit);
+    bind(g_sdl_handle, SDL_ConvertSurface);
+    bind(g_sdl_handle, SDL_FreeSurface);
+    // bind(g_sdl_handle, SDL_SemWait);
+    // bind(g_sdl_handle, SDL_SemPost);
+    bind(g_sdl_handle, SDL_PushEvent);
+    bind(g_sdl_handle, SDL_HasClipboardText);
+    bind(g_sdl_handle, SDL_SetClipboardText);
+    bind(g_sdl_handle, SDL_GetClipboardText);
+    bind(g_sdl_handle, SDL_free);
+    bind(g_sdl_handle, SDL_AllocFormat);
+    bind(g_sdl_handle, SDL_CreateRGBSurfaceWithFormat);
+    bind(g_sdl_handle, SDL_ShowSimpleMessageBox);
+#undef bind
+
+    DEBUG(dfsdl,out).print("sdl successfully loaded\n");
+    return true;
+}
+
+// It's ok to leave NULLs in the raws list (according to usage in g_src)
+void DFSDL::cleanup() {
+    if (g_sdl_handle) {
+        ClosePlugin(g_sdl_handle);
+        g_sdl_handle = nullptr;
+    }
+    if (g_sdl_image_handle) {
+        ClosePlugin(g_sdl_image_handle);
+        g_sdl_image_handle = nullptr;
+    }
+}
+
+SDL_Surface * DFSDL::DFIMG_Load(const char *file) {
+    return g_IMG_Load(file);
+}
+
+SDL_Surface * DFSDL::DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) {
+    return g_SDL_CreateRGBSurface(flags, width, height, depth, Rmask, Gmask, Bmask, Amask);
+}
+
+SDL_Surface * DFSDL::DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) {
+    return g_SDL_CreateRGBSurfaceFrom(pixels, width, height, depth, pitch, Rmask, Gmask, Bmask, Amask);
+}
+
+int DFSDL::DFSDL_UpperBlit(SDL_Surface *src, const SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) {
+    return g_SDL_UpperBlit(src, srcrect, dst, dstrect);
+}
+
+SDL_Surface * DFSDL::DFSDL_ConvertSurface(SDL_Surface *src, const SDL_PixelFormat *fmt, uint32_t flags) {
+    return g_SDL_ConvertSurface(src, fmt, flags);
+}
+
+void DFSDL::DFSDL_FreeSurface(SDL_Surface *surface) {
+    g_SDL_FreeSurface(surface);
+}
+
+// int DFSDL::DFSDL_SemWait(DFSDL_sem *sem) {
+//     return g_SDL_SemWait(sem);
+// }
+
+// int DFSDL::DFSDL_SemPost(DFSDL_sem *sem) {
+//     return g_SDL_SemPost(sem);
+// }
+
+int DFSDL::DFSDL_PushEvent(SDL_Event *event) {
+    return g_SDL_PushEvent(event);
+}
+
+void DFSDL::DFSDL_free(void *ptr) {
+    g_SDL_free(ptr);
+}
+
+char * DFSDL::DFSDL_GetClipboardText() {
+    return g_SDL_GetClipboardText();
+}
+
+int DFSDL::DFSDL_SetClipboardText(const char *text) {
+    return g_SDL_SetClipboardText(text);
+}
+
+SDL_PixelFormat* DFSDL::DFSDL_AllocFormat(uint32_t pixel_format) {
+    return g_SDL_AllocFormat(pixel_format);
+}
+
+SDL_Surface* DFSDL::DFSDL_CreateRGBSurfaceWithFormat(uint32_t flags, int width, int height, int depth, uint32_t format) {
+    return g_SDL_CreateRGBSurfaceWithFormat(flags, width, height, depth, format);
+}
+
+int DFSDL::DFSDL_ShowSimpleMessageBox(uint32_t flags, const char *title, const char *message, SDL_Window *window) {
+    if (!g_SDL_ShowSimpleMessageBox)
+        return -1;
+    return g_SDL_ShowSimpleMessageBox(flags, title, message, window);
+}
+
+DFHACK_EXPORT std::string DFHack::getClipboardTextCp437() {
+    if (!g_sdl_handle || g_SDL_HasClipboardText() != SDL_TRUE)
+        return "";
+    char *text = g_SDL_GetClipboardText();
+    // convert tabs to spaces so they don't get converted to '?'
+    for (char *c = text; *c; ++c) {
+        if (*c == '\t')
+            *c = ' ';
+    }
+    std::string textcp437 = UTF2DF(text);
+    DFHack::DFSDL::DFSDL_free(text);
+    return textcp437;
+}
+
+DFHACK_EXPORT bool DFHack::setClipboardTextCp437(std::string text) {
+    if (!g_sdl_handle)
+        return false;
+    return 0 == DFHack::DFSDL::DFSDL_SetClipboardText(DF2UTF(text).c_str());
+}
diff --git a/library/modules/DFSteam.cpp b/library/modules/DFSteam.cpp
new file mode 100644
index 000000000..9aab53466
--- /dev/null
+++ b/library/modules/DFSteam.cpp
@@ -0,0 +1,194 @@
+#include "Internal.h"
+
+#include "modules/DFSteam.h"
+
+#include "Debug.h"
+#include "PluginManager.h"
+
+namespace DFHack
+{
+DBG_DECLARE(core, dfsteam, DebugCategory::LINFO);
+}
+
+using namespace DFHack;
+
+static const int DFHACK_STEAM_APPID = 2346660;
+
+static bool g_steam_initialized = false;
+static DFLibrary* g_steam_handle = nullptr;
+static const std::vector<std::string> STEAM_LIBS {
+    "steam_api64.dll",
+        "steam_api", // TODO: validate this on OSX
+        "libsteam_api.so" // TODO: validate this on Linux
+};
+
+bool (*g_SteamAPI_Init)() = nullptr;
+void (*g_SteamAPI_Shutdown)() = nullptr;
+int (*g_SteamAPI_GetHSteamUser)() = nullptr;
+bool (*g_SteamAPI_RestartAppIfNecessary)(uint32_t unOwnAppID) = nullptr;
+void* (*g_SteamInternal_FindOrCreateUserInterface)(int, const char*) = nullptr;
+bool (*g_SteamAPI_ISteamApps_BIsAppInstalled)(void *iSteamApps, uint32_t appID) = nullptr;
+
+
+static void bind_all(color_ostream& out, DFLibrary* handle) {
+#define bind(name) \
+        if (!handle) { \
+            g_##name = nullptr; \
+        } else { \
+            g_##name = (decltype(g_##name))LookupPlugin(handle, #name); \
+            if (!g_##name) { \
+                WARN(dfsteam, out).print("steam library function not found: " #name "\n"); \
+            } \
+        }
+
+    bind(SteamAPI_Init);
+    bind(SteamAPI_Shutdown);
+    bind(SteamAPI_GetHSteamUser);
+    bind(SteamInternal_FindOrCreateUserInterface);
+    bind(SteamAPI_RestartAppIfNecessary);
+    bind(SteamInternal_FindOrCreateUserInterface);
+    bind(SteamAPI_ISteamApps_BIsAppInstalled);
+#undef bind
+}
+
+bool DFSteam::init(color_ostream& out) {
+    char *steam_client_launch = getenv("SteamClientLaunch");
+    if (!steam_client_launch || strncmp(steam_client_launch, "1", 2) != 0) {
+        DEBUG(dfsteam, out).print("not launched from Steam client; not initializing steam\n");
+        return false;
+    }
+
+    for (auto& lib_str : STEAM_LIBS) {
+        if ((g_steam_handle = OpenPlugin(lib_str.c_str())))
+            break;
+    }
+    if (!g_steam_handle) {
+        DEBUG(dfsteam, out).print("steam library not found; stubbing calls\n");
+        return false;
+    }
+
+    bind_all(out, g_steam_handle);
+
+    if (!g_SteamAPI_Init || !g_SteamAPI_Shutdown || !g_SteamAPI_Init()) {
+        DEBUG(dfsteam, out).print("steam detected but cannot be initialized\n");
+        return false;
+    }
+
+    DEBUG(dfsteam, out).print("steam library linked\n");
+    g_steam_initialized = true;
+    return true;
+}
+
+void DFSteam::cleanup(color_ostream& out) {
+    if (!g_steam_handle)
+        return;
+
+    if (g_SteamAPI_Shutdown)
+        g_SteamAPI_Shutdown();
+
+    ClosePlugin(g_steam_handle);
+    g_steam_handle = nullptr;
+
+    bind_all(out, nullptr);
+    g_steam_initialized = false;
+}
+
+#ifdef WIN32
+#include <process.h>
+#include <windows.h>
+#include <TlHelp32.h>
+static bool is_running_on_wine() {
+    typedef const char* (CDECL wine_get_version)(void);
+    static wine_get_version* pwine_get_version;
+    HMODULE hntdll = GetModuleHandle("ntdll.dll");
+    if(!hntdll)
+        return false;
+
+    pwine_get_version = (wine_get_version*) GetProcAddress(hntdll, "wine_get_version");
+    return !!pwine_get_version;
+}
+
+static DWORD findProcess(LPCWSTR name) {
+    PROCESSENTRY32W entry;
+    entry.dwSize = sizeof(PROCESSENTRY32W);
+
+    const auto snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, NULL);
+
+    if (!Process32FirstW(snapshot, &entry)) {
+        CloseHandle(snapshot);
+        return -1;
+    }
+
+    do {
+        std::wstring executableName(entry.szExeFile);
+        if (executableName == name) {
+            CloseHandle(snapshot);
+            return entry.th32ProcessID;
+        }
+    }
+    while (Process32NextW(snapshot, &entry));
+
+    CloseHandle(snapshot);
+    return -1;
+}
+
+static bool launchDFHack(color_ostream& out) {
+    if (is_running_on_wine()) {
+        DEBUG(dfsteam, out).print("not attempting to re-launch DFHack on wine\n");
+        return false;
+    }
+
+    if (findProcess(L"launchdf.exe") != -1) {
+        DEBUG(dfsteam, out).print("launchdf.exe already running\n");
+        return true;
+    }
+
+    STARTUPINFOW si;
+    PROCESS_INFORMATION pi;
+
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+    ZeroMemory(&pi, sizeof(pi));
+
+    static LPCWSTR procname = L"hack/launchdf.exe";
+    static const char * env = "\0";
+
+    // note that the environment must be explicitly zeroed out and not NULL,
+    // otherwise the launched process will inherit this process's environment,
+    // and the Steam API in the launchdf process will think it is in DF's context.
+    BOOL res = CreateProcessW(procname,
+            NULL, NULL, NULL, FALSE, 0, (LPVOID)env, NULL, &si, &pi);
+
+    return !!res;
+}
+#else
+static bool launchDFHack(color_ostream& out) {
+    // TODO once we have a non-Windows build to work with
+    return false;
+}
+#endif
+
+void DFSteam::launchSteamDFHackIfNecessary(color_ostream& out) {
+    if (!g_steam_initialized ||
+            !g_SteamAPI_GetHSteamUser ||
+            !g_SteamInternal_FindOrCreateUserInterface ||
+            !g_SteamAPI_ISteamApps_BIsAppInstalled) {
+        DEBUG(dfsteam, out).print("required Steam API calls are unavailable\n");
+        return;
+    }
+
+    void* iSteamApps = g_SteamInternal_FindOrCreateUserInterface(g_SteamAPI_GetHSteamUser(), "STEAMAPPS_INTERFACE_VERSION008");
+    if (!iSteamApps) {
+        DEBUG(dfsteam, out).print("cannot obtain iSteamApps interface\n");
+        return;
+    }
+
+    bool isDFHackInstalled = g_SteamAPI_ISteamApps_BIsAppInstalled(iSteamApps, DFHACK_STEAM_APPID);
+    if (!isDFHackInstalled) {
+        DEBUG(dfsteam, out).print("player has not installed DFHack through Steam\n");
+        return;
+    }
+
+    bool ret = launchDFHack(out);
+    DEBUG(dfsteam, out).print("launching DFHack via Steam: %s\n", ret ? "successful" : "unsuccessful");
+}
diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp
index e882febf8..e985cfa96 100644
--- a/library/modules/EventManager.cpp
+++ b/library/modules/EventManager.cpp
@@ -27,7 +27,7 @@
 #include "df/job.h"
 #include "df/job_list_link.h"
 #include "df/report.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/unit_flags1.h"
 #include "df/unit_inventory_item.h"
@@ -43,6 +43,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <array>
+#include <utility>
 
 namespace DFHack {
     DBG_DECLARE(eventmanager, log, DebugCategory::LINFO);
@@ -205,6 +206,9 @@ std::array<eventManager_t,EventType::EVENT_MAX> compileManagerArray() {
 //job initiated
 static int32_t lastJobId = -1;
 
+//job started
+static unordered_set<int32_t> startedJobs;
+
 //job completed
 static unordered_map<int32_t, df::job*> prevJobs;
 
@@ -246,6 +250,15 @@ static int32_t reportToRelevantUnitsTime = -1;
 //interaction
 static int32_t lastReportInteraction;
 
+struct hash_pair {
+    template<typename A, typename B>
+    size_t operator()(const std::pair<A,B>& p) const {
+        auto h1 = std::hash<A>{}(p.first);
+        auto h2 = std::hash<B>{}(p.second);
+        return h1 ^ (h2 << 1);
+    }
+};
+
 void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event event) {
     static bool doOnce = false;
 //    const string eventNames[] = {"world loaded", "world unloaded", "map loaded", "map unloaded", "viewscreen changed", "core initialized", "begin unload", "paused", "unpaused"};
@@ -259,6 +272,7 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
     }
     if ( event == DFHack::SC_MAP_UNLOADED ) {
         lastJobId = -1;
+        startedJobs.clear();
         for (auto &prevJob : prevJobs) {
             Job::deleteJobStruct(prevJob.second, true);
         }
@@ -276,9 +290,9 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
         gameLoaded = false;
 
         multimap<Plugin*,EventHandler> copy(handlers[EventType::UNLOAD].begin(), handlers[EventType::UNLOAD].end());
-        for (auto &key_value : copy) {
+        for (auto &[_,handle] : copy) {
             DEBUG(log,out).print("calling handler for map unloaded state change event\n");
-            key_value.second.eventHandler(out, nullptr);
+            handle.eventHandler(out, nullptr);
         }
     } else if ( event == DFHack::SC_MAP_LOADED ) {
         /*
@@ -297,14 +311,14 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
             return;
         if (!df::global::job_next_id)
             return;
-        if (!df::global::ui)
+        if (!df::global::plotinfo)
             return;
         if (!df::global::world)
             return;
 
         nextItem = *df::global::item_next_id;
         nextBuilding = *df::global::building_next_id;
-        nextInvasion = df::global::ui->invasions.next_id;
+        nextInvasion = df::global::plotinfo->invasions.next_id;
         lastJobId = -1 + *df::global::job_next_id;
 
         constructions.clear();
@@ -375,8 +389,7 @@ void DFHack::EventManager::manageEvents(color_ostream& out) {
             continue;
         int32_t eventFrequency = -100;
         if ( a != EventType::TICK )
-            for (auto &key_value : handlers[a]) {
-                EventHandler &handle = key_value.second;
+            for (auto &[_,handle] : handlers[a]) {
                 if (handle.freq < eventFrequency || eventFrequency == -100 )
                     eventFrequency = handle.freq;
             }
@@ -439,8 +452,7 @@ static void manageJobInitiatedEvent(color_ostream& out) {
             continue;
         if ( link->item->id <= lastJobId )
             continue;
-        for (auto &key_value : copy) {
-            EventHandler &handle = key_value.second;
+        for (auto &[_,handle] : copy) {
             DEBUG(log,out).print("calling handler for job initiated event\n");
             handle.eventHandler(out, (void*)link->item);
         }
@@ -453,22 +465,27 @@ static void manageJobStartedEvent(color_ostream& out) {
     if (!df::global::world)
         return;
 
-    static unordered_set<int32_t> startedJobs;
-
     // iterate event handler callbacks
     multimap<Plugin*, EventHandler> copy(handlers[EventType::JOB_STARTED].begin(), handlers[EventType::JOB_STARTED].end());
-    for (df::job_list_link* link = df::global::world->jobs.list.next; link != nullptr; link = link->next) {
-        df::job* job = link->item;
-        if (job && Job::getWorker(job) && !startedJobs.count(job->id)) {
-            startedJobs.emplace(job->id);
-            for (auto &key_value : copy) {
-                auto &handler = key_value.second;
-                // the jobs must have a worker to start
+
+    unordered_set<int32_t> newStartedJobs;
+
+    for (df::job_list_link* link = &df::global::world->jobs.list; link->next != nullptr; link = link->next) {
+        df::job* job = link->next->item;
+        if (!job || !Job::getWorker(job))
+            continue;
+
+        int32_t j_id = job->id;
+        newStartedJobs.emplace(j_id);
+        if (!startedJobs.count(j_id)) {
+            for (auto &[_,handle] : copy) {
                 DEBUG(log,out).print("calling handler for job started event\n");
-                handler.eventHandler(out, job);
+                handle.eventHandler(out, job);
             }
         }
     }
+
+    startedJobs = newStartedJobs;
 }
 
 //helper function for manageJobCompletedEvent
@@ -483,15 +500,16 @@ TODO: consider checking item creation / experience gain just in case
 static void manageJobCompletedEvent(color_ostream& out) {
     if (!df::global::world)
         return;
+
     int32_t tick0 = eventLastTick[EventType::JOB_COMPLETED];
     int32_t tick1 = df::global::world->frame_counter;
 
     multimap<Plugin*,EventHandler> copy(handlers[EventType::JOB_COMPLETED].begin(), handlers[EventType::JOB_COMPLETED].end());
-    map<int32_t, df::job*> nowJobs;
+    unordered_map<int32_t, df::job*> nowJobs;
     for ( df::job_list_link* link = &df::global::world->jobs.list; link != nullptr; link = link->next ) {
         if ( link->item == nullptr )
             continue;
-        nowJobs[link->item->id] = link->item;
+        nowJobs.emplace(link->item->id, link->item);
     }
 
 #if 0
@@ -573,10 +591,9 @@ static void manageJobCompletedEvent(color_ostream& out) {
                 continue;
 
             //still false positive if cancelled at EXACTLY the right time, but experiments show this doesn't happen
-            for (auto &key_value : copy) {
-                EventHandler &handle = key_value.second;
+            for (auto &[_,handle] : copy) {
                 DEBUG(log,out).print("calling handler for repeated job completed event\n");
-                handle.eventHandler(out, (void*)&job0);
+                handle.eventHandler(out, (void*) &job0);
             }
             continue;
         }
@@ -586,28 +603,27 @@ static void manageJobCompletedEvent(color_ostream& out) {
         if ( job0.flags.bits.repeat || job0.completion_timer != 0 )
             continue;
 
-        for (auto &key_value : copy) {
-            EventHandler &handle = key_value.second;
+        for (auto &[_,handle] : copy) {
             DEBUG(log,out).print("calling handler for job completed event\n");
-            handle.eventHandler(out, (void*)&job0);
+            handle.eventHandler(out, (void*) &job0);
         }
     }
 
     //erase old jobs, copy over possibly altered jobs
-    for (auto &prevJob : prevJobs) {
-        Job::deleteJobStruct(prevJob.second, true);
+    for (auto &[_,prev_job] : prevJobs) {
+        Job::deleteJobStruct(prev_job, true);
     }
     prevJobs.clear();
 
     //create new jobs
-    for (auto &nowJob : nowJobs) {
+    for (auto &[_,now_job] : nowJobs) {
         /*map<int32_t, df::job*>::iterator i = prevJobs.find((*j).first);
         if ( i != prevJobs.end() ) {
             continue;
         }*/
 
-        df::job* newJob = Job::cloneJobStruct(nowJob.second, true);
-        prevJobs[newJob->id] = newJob;
+        df::job* newJob = Job::cloneJobStruct(now_job, true);
+        prevJobs.emplace(newJob->id, newJob);
     }
 }
 
@@ -617,15 +633,17 @@ static void manageNewUnitActiveEvent(color_ostream& out) {
 
     multimap<Plugin*,EventHandler> copy(handlers[EventType::UNIT_NEW_ACTIVE].begin(), handlers[EventType::UNIT_NEW_ACTIVE].end());
     // iterate event handler callbacks
-    for (auto &key_value : copy) {
-        auto &handler = key_value.second;
-        for (df::unit* unit : df::global::world->units.active) {
-            int32_t id = unit->id;
-            if (!activeUnits.count(id)) {
-                activeUnits.emplace(id);
-                DEBUG(log,out).print("calling handler for new unit event\n");
-                handler.eventHandler(out, (void*) intptr_t(id)); // intptr_t() avoids cast from smaller type warning
-            }
+    vector<int32_t> new_active_unit_ids;
+    for (df::unit* unit : df::global::world->units.active) {
+        if (!activeUnits.count(unit->id)) {
+            activeUnits.emplace(unit->id);
+            new_active_unit_ids.emplace_back(unit->id);
+        }
+    }
+    for (int32_t unit_id : new_active_unit_ids) {
+        for (auto &[_,handle] : copy) {
+            DEBUG(log,out).print("calling handler for new unit event\n");
+            handle.eventHandler(out, (void*) intptr_t(unit_id)); // intptr_t() avoids cast from smaller type warning
         }
     }
 }
@@ -635,22 +653,26 @@ static void manageUnitDeathEvent(color_ostream& out) {
     if (!df::global::world)
         return;
     multimap<Plugin*,EventHandler> copy(handlers[EventType::UNIT_DEATH].begin(), handlers[EventType::UNIT_DEATH].end());
+    vector<int32_t> dead_unit_ids;
     for (auto unit : df::global::world->units.all) {
         //if ( unit->counters.death_id == -1 ) {
         if ( Units::isActive(unit) ) {
             livingUnits.insert(unit->id);
             continue;
         }
+        if (!Units::isDead(unit)) continue; // for units that have left the map but aren't dead
         //dead: if dead since last check, trigger events
         if ( livingUnits.find(unit->id) == livingUnits.end() )
             continue;
+        livingUnits.erase(unit->id);
+        dead_unit_ids.emplace_back(unit->id);
+    }
 
-        for (auto &key_value : copy) {
-            EventHandler &handle = key_value.second;
+    for (int32_t unit_id : dead_unit_ids) {
+        for (auto &[_,handle] : copy) {
             DEBUG(log,out).print("calling handler for unit death event\n");
-            handle.eventHandler(out, (void*)intptr_t(unit->id));
+            handle.eventHandler(out, (void*)intptr_t(unit_id));
         }
-        livingUnits.erase(unit->id);
     }
 }
 
@@ -666,6 +688,8 @@ static void manageItemCreationEvent(color_ostream& out) {
     multimap<Plugin*,EventHandler> copy(handlers[EventType::ITEM_CREATED].begin(), handlers[EventType::ITEM_CREATED].end());
     size_t index = df::item::binsearch_index(df::global::world->items.all, nextItem, false);
     if ( index != 0 ) index--;
+
+    std::vector<int32_t> created_items;
     for ( size_t a = index; a < df::global::world->items.all.size(); a++ ) {
         df::item* item = df::global::world->items.all[a];
         //already processed
@@ -683,12 +707,17 @@ static void manageItemCreationEvent(color_ostream& out) {
         //spider webs don't count
         if ( item->flags.bits.spider_web )
             continue;
-        for (auto &key_value : copy) {
-            EventHandler &handle = key_value.second;
+        created_items.push_back(item->id);
+    }
+
+    // handle all created items
+    for (int32_t item_id : created_items) {
+        for (auto &[_,handle] : copy) {
             DEBUG(log,out).print("calling handler for item created event\n");
-            handle.eventHandler(out, (void*)intptr_t(item->id));
+            handle.eventHandler(out, (void*)intptr_t(item_id));
         }
     }
+
     nextItem = *df::global::item_next_id;
 }
 
@@ -703,6 +732,7 @@ static void manageBuildingEvent(color_ostream& out) {
      **/
     multimap<Plugin*,EventHandler> copy(handlers[EventType::BUILDING].begin(), handlers[EventType::BUILDING].end());
     //first alert people about new buildings
+    vector<int32_t> new_buildings;
     for ( int32_t a = nextBuilding; a < *df::global::building_next_id; a++ ) {
         int32_t index = df::building::binsearch_index(df::global::world->buildings.all, a);
         if ( index == -1 ) {
@@ -711,30 +741,34 @@ static void manageBuildingEvent(color_ostream& out) {
             continue;
         }
         buildings.insert(a);
-        for (auto &key_value : copy) {
-            EventHandler &handle = key_value.second;
-            DEBUG(log,out).print("calling handler for created building event\n");
-            handle.eventHandler(out, (void*)intptr_t(a));
-        }
+        new_buildings.emplace_back(a);
+
     }
     nextBuilding = *df::global::building_next_id;
 
     //now alert people about destroyed buildings
-    for ( auto a = buildings.begin(); a != buildings.end(); ) {
-        int32_t id = *a;
+    for ( auto it = buildings.begin(); it != buildings.end(); ) {
+        int32_t id = *it;
         int32_t index = df::building::binsearch_index(df::global::world->buildings.all,id);
         if ( index != -1 ) {
-            a++;
+            ++it;
             continue;
         }
 
-        for (auto &key_value : copy) {
-            EventHandler &handle = key_value.second;
+        for (auto &[_,handle] : copy) {
             DEBUG(log,out).print("calling handler for destroyed building event\n");
             handle.eventHandler(out, (void*)intptr_t(id));
         }
-        a = buildings.erase(a);
+        it = buildings.erase(it);
     }
+
+    //alert people about newly created buildings
+    std::for_each(new_buildings.begin(), new_buildings.end(), [&](int32_t building){
+        for (auto &[_,handle] : copy) {
+            DEBUG(log,out).print("calling handler for created building event\n");
+            handle.eventHandler(out, (void*)intptr_t(building));
+        }
+    });
 }
 
 static void manageConstructionEvent(color_ostream& out) {
@@ -743,35 +777,41 @@ static void manageConstructionEvent(color_ostream& out) {
     //unordered_set<df::construction*> constructionsNow(df::global::world->constructions.begin(), df::global::world->constructions.end());
 
     multimap<Plugin*, EventHandler> copy(handlers[EventType::CONSTRUCTION].begin(), handlers[EventType::CONSTRUCTION].end());
-    // find & send construction removals
-    for (auto iter = constructions.begin(); iter != constructions.end();) {
-        auto &construction = *iter;
-        // if we can't find it, it was removed
-        if (df::construction::find(construction.pos) != nullptr) {
-            ++iter;
-            continue;
+
+    unordered_set<df::construction> next_construction_set; // will be swapped with constructions
+    next_construction_set.reserve(constructions.bucket_count());
+    vector<df::construction> new_constructions;
+
+    // find new constructions - swapping found constructions over from constructions to next_construction_set
+    for (auto c : df::global::world->constructions) {
+        auto &construction = *c;
+        auto it = constructions.find(construction);
+        if (it == constructions.end()) {
+            // handle new construction event later
+            new_constructions.emplace_back(construction);
         }
-        // send construction to handlers, because it was removed
-        for (const auto &key_value: copy) {
-            EventHandler handle = key_value.second;
+        else {
+            constructions.erase(it);
+        }
+        next_construction_set.emplace(construction);
+    }
+
+    constructions.swap(next_construction_set);
+
+    // now next_construction_set contains all the constructions that were removed (not found in df::global::world->constructions)
+    for (auto& construction : next_construction_set) {
+        // handle construction removed event
+        for (const auto &[_,handle]: copy) {
             DEBUG(log,out).print("calling handler for destroyed construction event\n");
             handle.eventHandler(out, (void*) &construction);
         }
-        // erase from existent constructions
-        iter = constructions.erase(iter);
     }
 
-    // find & send construction additions
-    for (auto c: df::global::world->constructions) {
-        auto &construction = *c;
-        // add construction to constructions, if it isn't already present
-        if (constructions.emplace(construction).second) {
-            // send construction to handlers, because it is new
-            for (const auto &key_value: copy) {
-                EventHandler handle = key_value.second;
-                DEBUG(log,out).print("calling handler for created construction event\n");
-                handle.eventHandler(out, (void*) &construction);
-            }
+    // now handle all the new constructions
+    for (auto& construction : new_constructions) {
+        for (const auto &[_,handle]: copy) {
+            DEBUG(log,out).print("calling handler for created construction event\n");
+            handle.eventHandler(out, (void*) &construction);
         }
     }
 }
@@ -781,6 +821,8 @@ static void manageSyndromeEvent(color_ostream& out) {
         return;
     multimap<Plugin*,EventHandler> copy(handlers[EventType::SYNDROME].begin(), handlers[EventType::SYNDROME].end());
     int32_t highestTime = -1;
+
+    std::vector<SyndromeData> new_syndrome_data;
     for (auto unit : df::global::world->units.all) {
 
 /*
@@ -795,28 +837,29 @@ static void manageSyndromeEvent(color_ostream& out) {
             if ( startTime <= lastSyndromeTime )
                 continue;
 
-            SyndromeData data(unit->id, b);
-            for (auto &key_value : copy) {
-                EventHandler &handle = key_value.second;
-                DEBUG(log,out).print("calling handler for syndrome event\n");
-                handle.eventHandler(out, (void*)&data);
-            }
+            new_syndrome_data.emplace_back(unit->id, b);
+        }
+    }
+    for (auto& data : new_syndrome_data) {
+        for (auto &[_,handle] : copy) {
+            DEBUG(log,out).print("calling handler for syndrome event\n");
+            handle.eventHandler(out, (void*)&data);
         }
     }
+
     lastSyndromeTime = highestTime;
 }
 
 static void manageInvasionEvent(color_ostream& out) {
-    if (!df::global::ui)
+    if (!df::global::plotinfo)
         return;
     multimap<Plugin*,EventHandler> copy(handlers[EventType::INVASION].begin(), handlers[EventType::INVASION].end());
 
-    if ( df::global::ui->invasions.next_id <= nextInvasion )
+    if ( df::global::plotinfo->invasions.next_id <= nextInvasion )
         return;
-    nextInvasion = df::global::ui->invasions.next_id;
+    nextInvasion = df::global::plotinfo->invasions.next_id;
 
-    for (auto &key_value : copy) {
-        EventHandler &handle = key_value.second;
+    for (auto &[_,handle] : copy) {
         DEBUG(log,out).print("calling handler for invasion event\n");
         handle.eventHandler(out, (void*)intptr_t(nextInvasion-1));
     }
@@ -829,6 +872,18 @@ static void manageEquipmentEvent(color_ostream& out) {
 
     unordered_map<int32_t, InventoryItem> itemIdToInventoryItem;
     unordered_set<int32_t> currentlyEquipped;
+
+    vector<InventoryChangeData> equipment_pickups;
+    vector<InventoryChangeData> equipment_drops;
+    vector<InventoryChangeData> equipment_changes;
+
+
+    // This vector stores the pointers to newly created changed items
+    // needed as the stack allocated temporary (in the loop) is lost when we go to
+    // handle the event calls, so we move that data to the heap if its needed,
+    // and then once we are done we delete everything.
+    vector<InventoryItem*> changed_items;
+
     for (auto unit : df::global::world->units.all) {
         itemIdToInventoryItem.clear();
         currentlyEquipped.clear();
@@ -856,40 +911,30 @@ static void manageEquipmentEvent(color_ostream& out) {
             auto c = itemIdToInventoryItem.find(dfitem_new->item->id);
             if ( c == itemIdToInventoryItem.end() ) {
                 //new item equipped (probably just picked up)
-                InventoryChangeData data(unit->id, nullptr, &item_new);
-                for (auto &key_value : copy) {
-                    EventHandler &handle = key_value.second;
-                    DEBUG(log,out).print("calling handler for new item equipped inventory change event\n");
-                    handle.eventHandler(out, (void*)&data);
-                }
+                changed_items.emplace_back(new InventoryItem(item_new));
+                equipment_pickups.emplace_back(unit->id, nullptr, changed_items.back());
                 continue;
             }
-            InventoryItem item_old = (*c).second;
+            InventoryItem item_old = c->second;
 
             df::unit_inventory_item& item0 = item_old.item;
             df::unit_inventory_item& item1 = item_new.item;
             if ( item0.mode == item1.mode && item0.body_part_id == item1.body_part_id && item0.wound_id == item1.wound_id )
                 continue;
             //some sort of change in how it's equipped
-
-            InventoryChangeData data(unit->id, &item_old, &item_new);
-            for (auto &key_value : copy) {
-                EventHandler &handle = key_value.second;
-                DEBUG(log,out).print("calling handler for inventory change event\n");
-                handle.eventHandler(out, (void*)&data);
-            }
+            changed_items.emplace_back(new InventoryItem(item_new));
+            InventoryItem* item_new_ptr = changed_items.back();
+            changed_items.emplace_back(new InventoryItem(item_old));
+            InventoryItem* item_old_ptr = changed_items.back();
+            equipment_changes.emplace_back(unit->id, item_old_ptr, item_new_ptr);
         }
         //check for dropped items
         for (auto i : v) {
             if ( currentlyEquipped.find(i.itemId) != currentlyEquipped.end() )
                 continue;
             //TODO: delete ptr if invalid
-            InventoryChangeData data(unit->id, &i, nullptr);
-            for (auto &key_value : copy) {
-                EventHandler &handle = key_value.second;
-                DEBUG(log,out).print("calling handler for dropped item inventory change event\n");
-                handle.eventHandler(out, (void*)&data);
-            }
+            changed_items.emplace_back(new InventoryItem(i));
+            equipment_drops.emplace_back(unit->id, changed_items.back(), nullptr);
         }
         if ( !hadEquipment )
             delete temp;
@@ -902,6 +947,31 @@ static void manageEquipmentEvent(color_ostream& out) {
             equipment.push_back(item);
         }
     }
+
+    // now handle events
+    std::for_each(equipment_pickups.begin(), equipment_pickups.end(), [&](InventoryChangeData& data) {
+        for (auto &[_, handle] : copy) {
+            DEBUG(log,out).print("calling handler for new item equipped inventory change event\n");
+            handle.eventHandler(out, (void*) &data);
+        }
+    });
+    std::for_each(equipment_drops.begin(), equipment_drops.end(), [&](InventoryChangeData& data) {
+        for (auto &[_, handle] : copy) {
+            DEBUG(log,out).print("calling handler for dropped item inventory change event\n");
+            handle.eventHandler(out, (void*) &data);
+        }
+    });
+    std::for_each(equipment_changes.begin(), equipment_changes.end(), [&](InventoryChangeData& data) {
+        for (auto &[_, handle] : copy) {
+            DEBUG(log,out).print("calling handler for inventory change event\n");
+            handle.eventHandler(out, (void*) &data);
+        }
+    });
+
+    // clean up changed items list
+    std::for_each(changed_items.begin(), changed_items.end(), [](InventoryItem* p){
+        delete p;
+    });
 }
 
 static void updateReportToRelevantUnits() {
@@ -939,8 +1009,7 @@ static void manageReportEvent(color_ostream& out) {
 
     for ( ; idx < reports.size(); idx++ ) {
         df::report* report = reports[idx];
-        for (auto &key_value : copy) {
-            EventHandler &handle = key_value.second;
+        for (auto &[_,handle] : copy) {
             DEBUG(log,out).print("calling handler for report event\n");
             handle.eventHandler(out, (void*)intptr_t(report->id));
         }
@@ -981,7 +1050,7 @@ static void manageUnitAttackEvent(color_ostream& out) {
     if ( strikeReports.empty() )
         return;
     updateReportToRelevantUnits();
-    map<int32_t, map<int32_t, int32_t> > alreadyDone;
+    unordered_set<std::pair<int32_t, int32_t>, hash_pair> already_done;
     for (int reportId : strikeReports) {
         df::report* report = df::report::find(reportId);
         if ( !report )
@@ -1011,27 +1080,25 @@ static void manageUnitAttackEvent(color_ostream& out) {
 
         UnitAttackData data{};
         data.report_id = report->id;
-        if ( wound1 && !alreadyDone[unit1->id][unit2->id] ) {
+        if ( wound1 && already_done.find(std::make_pair(unit1->id,unit2->id)) == already_done.end() ) {
             data.attacker = unit1->id;
             data.defender = unit2->id;
             data.wound = wound1->id;
 
-            alreadyDone[data.attacker][data.defender] = 1;
-            for (auto &key_value : copy) {
-                EventHandler &handle = key_value.second;
+            already_done.emplace(unit1->id, unit2->id);
+            for (auto &[_,handle] : copy) {
                 DEBUG(log,out).print("calling handler for unit1 attack unit attack event\n");
                 handle.eventHandler(out, (void*)&data);
             }
         }
 
-        if ( wound2 && !alreadyDone[unit1->id][unit2->id] ) {
+        if ( wound2 && already_done.find(std::make_pair(unit1->id,unit2->id)) == already_done.end() ) {
             data.attacker = unit2->id;
             data.defender = unit1->id;
             data.wound = wound2->id;
 
-            alreadyDone[data.attacker][data.defender] = 1;
-            for (auto &key_value : copy) {
-                EventHandler &handle = key_value.second;
+            already_done.emplace(unit1->id, unit2->id);
+            for (auto &[_,handle] : copy) {
                 DEBUG(log,out).print("calling handler for unit2 attack unit attack event\n");
                 handle.eventHandler(out, (void*)&data);
             }
@@ -1041,9 +1108,9 @@ static void manageUnitAttackEvent(color_ostream& out) {
             data.attacker = unit2->id;
             data.defender = unit1->id;
             data.wound = -1;
-            alreadyDone[data.attacker][data.defender] = 1;
-            for (auto &key_value : copy) {
-                EventHandler &handle = key_value.second;
+
+            already_done.emplace(unit1->id, unit2->id);
+            for (auto &[_,handle] : copy) {
                 DEBUG(log,out).print("calling handler for unit1 killed unit attack event\n");
                 handle.eventHandler(out, (void*)&data);
             }
@@ -1053,9 +1120,9 @@ static void manageUnitAttackEvent(color_ostream& out) {
             data.attacker = unit1->id;
             data.defender = unit2->id;
             data.wound = -1;
-            alreadyDone[data.attacker][data.defender] = 1;
-            for (auto &key_value : copy) {
-                EventHandler &handle = key_value.second;
+
+            already_done.emplace(unit1->id, unit2->id);
+            for (auto &[_,handle] : copy) {
                 DEBUG(log,out).print("calling handler for unit2 killed unit attack event\n");
                 handle.eventHandler(out, (void*)&data);
             }
@@ -1313,8 +1380,7 @@ static void manageInteractionEvent(color_ostream& out) {
         lastAttacker = df::unit::find(data.attacker);
         //lastDefender = df::unit::find(data.defender);
         //fire event
-        for (auto &key_value : copy) {
-            EventHandler &handle = key_value.second;
+        for (auto &[_,handle] : copy) {
             DEBUG(log,out).print("calling handler for interaction event\n");
             handle.eventHandler(out, (void*)&data);
         }
diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index a182ac062..2c275ceba 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -255,13 +255,14 @@ static int listdir_recursive_impl (std::string prefix, std::string path,
         std::string path_file = path + *file;
         if (Filesystem::isdir(prefixed_file))
         {
+            files.insert(std::pair<std::string, bool>(include_prefix ? prefixed_file : path_file, true));
+
             if (depth == 0)
             {
                 out_of_depth = true;
                 continue;
             }
 
-            files.insert(std::pair<std::string, bool>(include_prefix ? prefixed_file : path_file, true));
             err = listdir_recursive_impl(prefix, path_file + "/", files, depth - 1, include_prefix);
             if (err)
                 return err;
@@ -277,5 +278,7 @@ static int listdir_recursive_impl (std::string prefix, std::string path,
 int Filesystem::listdir_recursive (std::string dir, std::map<std::string, bool> &files,
     int depth /* = 10 */, bool include_prefix /* = true */)
 {
+    if (dir.size() && dir[dir.size()-1] == '/')
+        dir.resize(dir.size()-1);
     return listdir_recursive_impl(dir, "", files, depth, include_prefix);
 }
diff --git a/library/modules/Graphic.cpp b/library/modules/Graphic.cpp
index 7f6b8f4d3..b55ee83ed 100644
--- a/library/modules/Graphic.cpp
+++ b/library/modules/Graphic.cpp
@@ -44,7 +44,7 @@ using namespace DFHack;
 
 std::unique_ptr<Module> DFHack::createGraphic()
 {
-    return dts::make_unique<Graphic>();
+    return std::make_unique<Graphic>();
 }
 
 bool Graphic::Register(DFTileSurface* (*func)(int,int))
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index f88331347..c718bf46e 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -46,6 +46,7 @@ using namespace DFHack;
 #include "modules/Screen.h"
 #include "modules/Maps.h"
 #include "modules/Units.h"
+#include "modules/World.h"
 
 #include "DataDefs.h"
 
@@ -56,6 +57,7 @@ using namespace DFHack;
 #include "df/building_trapst.h"
 #include "df/building_type.h"
 #include "df/building_workshopst.h"
+#include "df/cri_unitst.h"
 #include "df/d_init.h"
 #include "df/game_mode.h"
 #include "df/general_ref.h"
@@ -67,6 +69,7 @@ using namespace DFHack;
 #include "df/item_corpsepiecest.h"
 #include "df/item_corpsest.h"
 #include "df/job.h"
+#include "df/legend_pagest.h"
 #include "df/occupation.h"
 #include "df/plant.h"
 #include "df/popup_message.h"
@@ -74,20 +77,25 @@ using namespace DFHack;
 #include "df/report_zoom_type.h"
 #include "df/route_stockpile_link.h"
 #include "df/stop_depart_condition.h"
-#include "df/ui_advmode.h"
-#include "df/ui_build_selector.h"
+#include "df/adventurest.h"
+#include "df/buildreq.h"
 #include "df/ui_look_list.h"
-#include "df/ui_sidebar_menus.h"
+#include "df/gamest.h"
 #include "df/ui_unit_view_mode.h"
 #include "df/unit.h"
 #include "df/unit_inventory_item.h"
 #include "df/viewscreen_dwarfmodest.h"
+#include "df/viewscreen_legendsst.h"
+#include "df/viewscreen_new_regionst.h"
+#include "df/viewscreen_setupdwarfgamest.h"
+#include "df/viewscreen_titlest.h"
+#include "df/viewscreen_worldst.h"
 #include "df/world.h"
 
 const size_t MAX_REPORTS_SIZE = 3000; // DF clears old reports to maintain this vector size
 const int32_t RECENT_REPORT_TICKS = 500; // used by UNIT_COMBAT_REPORT_ALL_ACTIVE
-const int32_t ANNOUNCE_LINE_DURATION = 100; // time to display each line in announcement bar; 3.3 sec at 30 GFPS
-const int16_t ANNOUNCE_DISPLAY_TIME = 2000; // DF uses this value for most announcements; 66.6 sec at 30 GFPS
+const int32_t ANNOUNCE_LINE_DURATION = 100; // time to display each line in announcement bar; 2 sec at 50 GFPS
+const int16_t ANNOUNCE_DISPLAY_TIME = 2000; // DF uses this value for most announcements; 40 sec at 50 GFPS
 
 namespace DFHack
 {
@@ -96,14 +104,15 @@ namespace DFHack
 
 using namespace df::enums;
 
+using df::building_civzonest;
+using df::global::game;
 using df::global::gamemode;
 using df::global::gps;
 using df::global::gview;
 using df::global::init;
+using df::global::plotinfo;
 using df::global::selection_rect;
-using df::global::ui;
 using df::global::ui_menu_width;
-using df::global::ui_sidebar_menus;
 using df::global::world;
 
 /* TODO: understand how this changes for v50
@@ -129,528 +138,643 @@ static std::string getNameChunk(virtual_identity *id, int start, int end)
  * Classifying focus context by means of a string path.
  */
 
-typedef void (*getFocusStringHandler)(std::string &str, df::viewscreen *screen);
-static std::map<virtual_identity*, getFocusStringHandler> getFocusStringHandlers;
+typedef void (*getFocusStringsHandler)(std::string &str, std::vector<std::string> &strList, df::viewscreen *screen);
+static std::map<virtual_identity*, getFocusStringsHandler> getFocusStringsHandlers;
 
 #define VIEWSCREEN(name) df::viewscreen_##name##st
 #define DEFINE_GET_FOCUS_STRING_HANDLER(screen_type) \
-    static void getFocusString_##screen_type(std::string &focus, VIEWSCREEN(screen_type) *screen);\
+    static void getFocusStrings_##screen_type(std::string &baseFocus, std::vector<std::string> &focusStrings, VIEWSCREEN(screen_type) *screen);\
     DFHACK_STATIC_ADD_TO_MAP(\
-        &getFocusStringHandlers, &VIEWSCREEN(screen_type)::_identity, \
-        (getFocusStringHandler)getFocusString_##screen_type \
+        &getFocusStringsHandlers, &VIEWSCREEN(screen_type)::_identity, \
+        (getFocusStringsHandler)getFocusStrings_##screen_type \
     ); \
-    static void getFocusString_##screen_type(std::string &focus, VIEWSCREEN(screen_type) *screen)
+    static void getFocusStrings_##screen_type(std::string &baseFocus, std::vector<std::string> &focusStrings, VIEWSCREEN(screen_type) *screen)
 
-DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
+DEFINE_GET_FOCUS_STRING_HANDLER(title)
 {
-/* TODO: understand how this changes for v50
-    using namespace df::enums::ui_sidebar_mode;
-
-    using df::global::ui_workshop_in_add;
-    using df::global::ui_build_selector;
-    using df::global::ui_selected_unit;
-    using df::global::ui_look_list;
-    using df::global::ui_look_cursor;
-    using df::global::ui_building_item_cursor;
-    using df::global::ui_building_assign_type;
-    using df::global::ui_building_assign_is_marked;
-    using df::global::ui_building_assign_units;
-    using df::global::ui_building_assign_items;
-    using df::global::ui_building_in_assign;
-
-    focus += "/" + enum_item_key(ui->main.mode);
-
-    switch (ui->main.mode)
-    {
-    case QueryBuilding:
-        if (df::building *selected = world->selected_building)
-        {
-            if (!selected->jobs.empty() &&
-                selected->jobs[0]->job_type == job_type::DestroyBuilding)
-            {
-                focus += "/Destroying";
-                break;
-            }
-
-            focus += "/Some";
-
-            virtual_identity *id = virtual_identity::get(selected);
-
-            bool jobs = false;
-
-            if (id == &df::building_workshopst::_identity ||
-                id == &df::building_furnacest::_identity)
-            {
-                focus += "/Workshop";
-                jobs = true;
-            }
-            else if (id == &df::building_trapst::_identity)
-            {
-                auto trap = (df::building_trapst*)selected;
-                focus += "/" + enum_item_key(trap->trap_type);
-                if (trap->trap_type == trap_type::Lever)
-                    jobs = true;
-            }
-            else if (ui_building_in_assign && *ui_building_in_assign &&
-                     ui_building_assign_type && ui_building_assign_units &&
-                     ui_building_assign_type->size() == ui_building_assign_units->size())
-            {
-                focus += "/Assign";
-                if (ui_building_item_cursor)
-                {
-                    auto unit = vector_get(*ui_building_assign_units, *ui_building_item_cursor);
-                    focus += unit ? "/Unit" : "/None";
-                }
-            }
-            else
-                focus += "/" + enum_item_key(selected->getType());
-
-            if (jobs)
-            {
-                if (ui_workshop_in_add && *ui_workshop_in_add)
-                    focus += "/AddJob";
-                else if (!selected->jobs.empty())
-                    focus += "/Job";
-                else
-                    focus += "/Empty";
-            }
-        }
-        else
-            focus += "/None";
-        break;
-
-    case Build:
-        if (ui_build_selector)
-        {
-            // Not selecting, or no choices?
-            if (ui_build_selector->building_type < 0)
-                focus += "/Type";
-            else if (ui_build_selector->stage != 2)
-            {
-                if (ui_build_selector->stage != 1)
-                    focus += "/NoMaterials";
-                else
-                    focus += "/Position";
-
-                focus += "/" + enum_item_key(ui_build_selector->building_type);
-            }
-            else
-            {
-                focus += "/Material";
-                if (ui_build_selector->is_grouped)
-                    focus += "/Groups";
-                else
-                    focus += "/Items";
-            }
-        }
-        break;
-
-    case ViewUnits:
-        if (ui_selected_unit)
-        {
-            if (vector_get(world->units.active, *ui_selected_unit))
-            {
-                focus += "/Some";
-
-                using df::global::ui_unit_view_mode;
-
-                if (ui_unit_view_mode)
-                    focus += "/" + enum_item_key(ui_unit_view_mode->value);
-            }
-            else
-                focus += "/None";
-        }
-        break;
-
-    case LookAround:
-        if (ui_look_list && ui_look_cursor)
-        {
-            auto item = vector_get(ui_look_list->items, *ui_look_cursor);
-            if (item)
-                focus += "/" + enum_item_key(item->type);
-            else
-                focus += "/None";
-        }
-        break;
+    if (screen->managing_mods)
+        focusStrings.push_back(baseFocus + "/Mods");
+    else if (game->main_interface.settings.open)
+        focusStrings.push_back(baseFocus + "/Settings");
 
-    case BuildingItems:
-        if (VIRTUAL_CAST_VAR(selected, df::building_actual, world->selected_building))
-        {
-            if (selected->contained_items.empty())
-                focus += "/Some/Empty";
-            else
-                focus += "/Some/Item";
-        }
-        else
-            focus += "/None";
-        break;
+    if (focusStrings.empty())
+        focusStrings.push_back(baseFocus + "/Default");
+}
 
-    case ZonesPenInfo:
-        if (ui_building_assign_type && ui_building_assign_units &&
-            ui_building_assign_is_marked && ui_building_assign_items &&
-            ui_building_assign_type->size() == ui_building_assign_units->size())
-        {
-            focus += "/Assign";
-            if (ui_building_item_cursor)
-            {
-                if (vector_get(*ui_building_assign_units, *ui_building_item_cursor))
-                    focus += "/Unit";
-                else if (vector_get(*ui_building_assign_items, *ui_building_item_cursor))
-                    focus += "/Vermin";
-                else
-                    focus += "/None";
-            }
-        }
-        break;
+DEFINE_GET_FOCUS_STRING_HANDLER(new_region)
+{
+    if (screen->raw_load)
+        focusStrings.push_back(baseFocus + "/Loading");
+    else if (screen->doing_mods)
+        focusStrings.push_back(baseFocus + "/Mods");
+    else if (screen->doing_simple_params)
+        focusStrings.push_back(baseFocus + "/Basic");
+    else if (screen->doing_params)
+        focusStrings.push_back(baseFocus + "/Advanced");
 
-    case Burrows:
-        if (ui->burrows.in_confirm_delete)
-            focus += "/ConfirmDelete";
-        else if (ui->burrows.in_add_units_mode)
-            focus += "/AddUnits";
-        else if (ui->burrows.in_edit_name_mode)
-            focus += "/EditName";
-        else if (ui->burrows.in_define_mode)
-            focus += "/Define";
-        else
-            focus += "/List";
-        break;
+    if (focusStrings.empty())
+        focusStrings.push_back(baseFocus);
+}
 
-    case Hauling:
-        if (ui->hauling.in_assign_vehicle)
-        {
-            auto vehicle = vector_get(ui->hauling.vehicles, ui->hauling.cursor_vehicle);
-            focus += "/AssignVehicle/" + std::string(vehicle ? "Some" : "None");
+DEFINE_GET_FOCUS_STRING_HANDLER(setupdwarfgame)
+{
+    if (screen->doing_custom_settings)
+        focusStrings.push_back(baseFocus + "/CustomSettings");
+    else if (game->main_interface.options.open)
+        focusStrings.push_back(baseFocus + "/Abort");
+    else if (screen->initial_selection == 1)
+        focusStrings.push_back(baseFocus + "/Default");
+    else if (game->main_interface.name_creator.open) {
+        switch (game->main_interface.name_creator.context) {
+        case df::name_creator_context_type::EMBARK_FORT_NAME:
+            focusStrings.push_back(baseFocus + "/FortName");
+            break;
+        case df::name_creator_context_type::EMBARK_GROUP_NAME:
+            focusStrings.push_back(baseFocus + "/GroupName");
+            break;
+        default:
+            break;
         }
-        else
-        {
-            int idx = ui->hauling.cursor_top;
-            auto route = vector_get(ui->hauling.view_routes, idx);
-            auto stop = vector_get(ui->hauling.view_stops, idx);
-            std::string tag = stop ? "Stop" : (route ? "Route" : "None");
-
-            if (ui->hauling.in_name)
-                focus += "/Rename/" + tag;
-            else if (ui->hauling.in_stop)
-            {
-                int sidx = ui->hauling.cursor_stop;
-                auto cond = vector_get(ui->hauling.stop_conditions, sidx);
-                auto link = vector_get(ui->hauling.stop_links, sidx);
-
-                focus += "/DefineStop";
-
-                if (cond)
-                    focus += "/Cond/" + enum_item_key(cond->mode);
-                else if (link)
-                {
-                    focus += "/Link/";
-                    if (link->mode.bits.give) focus += "Give";
-                    if (link->mode.bits.take) focus += "Take";
-                }
-                else
-                    focus += "/None";
-            }
-            else
-                focus += "/Select/" + tag;
+    }
+    else if (game->main_interface.image_creator.open) {
+        focusStrings.push_back(baseFocus + "/GroupSymbol");
+    }
+    else if (screen->viewing_objections != 0)
+        focusStrings.push_back(baseFocus + "/Objections");
+    else {
+        switch (screen->mode) {
+        case 0: focusStrings.push_back(baseFocus + "/Dwarves"); break;
+        case 1: focusStrings.push_back(baseFocus + "/Items"); break;
+        case 2: focusStrings.push_back(baseFocus + "/Animals"); break;
+        default:
+            break;
         }
-        break;
-
-    default:
-        break;
     }
-*/
+
+    if (focusStrings.empty())
+        focusStrings.push_back(baseFocus + "/Default");
 }
 
-/* TODO: understand how this changes for v50
-DEFINE_GET_FOCUS_STRING_HANDLER(dungeonmode)
+DEFINE_GET_FOCUS_STRING_HANDLER(legends)
 {
-    using df::global::ui_advmode;
-
-    if (!ui_advmode)
-        return;
-
-    focus += "/" + enum_item_key(ui_advmode->menu);
+    if (screen->init_stage != -1)
+        focusStrings.push_back(baseFocus + "/Loading");
+    else if (screen->page.size() <= 1)
+        focusStrings.push_back(baseFocus + "/Default");
+    else
+        focusStrings.push_back(baseFocus + '/' + screen->page[screen->active_page_index]->header);
 }
 
-DEFINE_GET_FOCUS_STRING_HANDLER(unitlist)
+DEFINE_GET_FOCUS_STRING_HANDLER(world)
 {
-    focus += "/" + enum_item_key(screen->page);
+    focusStrings.push_back(baseFocus + '/' + enum_item_key(screen->view_mode));
 }
 
-DEFINE_GET_FOCUS_STRING_HANDLER(layer_military)
+DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
 {
-    auto list1 = getLayerList(screen, 0);
-    auto list2 = getLayerList(screen, 1);
-    auto list3 = getLayerList(screen, 2);
-    if (!list1 || !list2 || !list3) return;
-
-    focus += "/" + enum_item_key(screen->page);
-
-    int cur_list;
-    if (list1->active) cur_list = 0;
-    else if (list2->active) cur_list = 1;
-    else if (list3->active) cur_list = 2;
-    else return;
-
-    switch (screen->page)
-    {
-    case df::viewscreen_layer_militaryst::Positions:
-        {
-            static const char *lists[] = { "/Squads", "/Positions", "/Candidates" };
-            focus += lists[cur_list];
+    std::string newFocusString;
+
+    if(game->main_interface.main_designation_selected != -1) {
+        newFocusString = baseFocus;
+        newFocusString += "/Designate/" + enum_item_key(game->main_interface.main_designation_selected);
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.info.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Info";
+        newFocusString += '/' + enum_item_key(game->main_interface.info.current_mode);
+
+        switch(game->main_interface.info.current_mode) {
+        case df::enums::info_interface_mode_type::CREATURES:
+            if (game->main_interface.info.creatures.showing_overall_training)
+                newFocusString += "/OverallTraining";
+            else if (game->main_interface.info.creatures.showing_activity_details)
+                newFocusString += "/ActivityDetails";
+            else if (game->main_interface.info.creatures.adding_trainer)
+                newFocusString += "/AddingTrainer";
+            else if (game->main_interface.info.creatures.assign_work_animal)
+                newFocusString += "/AssignWorkAnimal";
+            else
+                newFocusString += '/' + enum_item_key(game->main_interface.info.creatures.current_mode);
+            break;
+        case df::enums::info_interface_mode_type::BUILDINGS:
+            newFocusString += '/' + enum_item_key(game->main_interface.info.buildings.mode);
+            break;
+        case df::enums::info_interface_mode_type::LABOR:
+            newFocusString += '/' + enum_item_key(game->main_interface.info.labor.mode);
+            break;
+        case df::enums::info_interface_mode_type::ARTIFACTS:
+            newFocusString += '/' + enum_item_key(game->main_interface.info.artifacts.mode);
+            break;
+        case df::enums::info_interface_mode_type::JUSTICE:
+            if (game->main_interface.info.justice.interrogating)
+                newFocusString += "/Interrogating";
+            else if (game->main_interface.info.justice.convicting)
+                newFocusString += "/Convicting";
+            else
+                newFocusString += '/' + enum_item_key(game->main_interface.info.justice.current_mode);
+            break;
+        case df::enums::info_interface_mode_type::WORK_ORDERS:
+            if (game->main_interface.info.work_orders.conditions.open)
+                newFocusString += "/Conditions";
+            else if (game->main_interface.create_work_order.open)
+                newFocusString += "/Create";
+            else
+                newFocusString += "/Default";
+            break;
+        case df::enums::info_interface_mode_type::ADMINISTRATORS:
+            if (game->main_interface.info.administrators.choosing_candidate)
+                newFocusString += "/Candidates";
+            else if (game->main_interface.info.administrators.assigning_symbol)
+                newFocusString += "/Symbols";
+            else
+                newFocusString += "/Default";
+            break;
+        default:
             break;
         }
 
-    case df::viewscreen_layer_militaryst::Equip:
-        {
-            focus += "/" + enum_item_key(screen->equip.mode);
-
-            switch (screen->equip.mode)
-            {
-            case df::viewscreen_layer_militaryst::T_equip::Customize:
-                {
-                    if (screen->equip.edit_mode < 0)
-                        focus += "/View";
-                    else
-                        focus += "/" + enum_item_key(screen->equip.edit_mode);
-                    break;
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.view_sheets.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/ViewSheets";
+        newFocusString += '/' + enum_item_key(game->main_interface.view_sheets.active_sheet);
+        switch (game->main_interface.view_sheets.active_sheet) {
+        case df::view_sheet_type::UNIT:
+            switch (game->main_interface.view_sheets.active_sub_tab) {
+            case 0: newFocusString += "/Overview"; break;
+            case 1: newFocusString += "/Items"; break;
+            case 2:
+                newFocusString += "/Health";
+                switch (game->main_interface.view_sheets.unit_health_active_tab) {
+                    case 0: newFocusString += "/Status"; break;
+                    case 1: newFocusString += "/Wounds"; break;
+                    case 2: newFocusString += "/Treatment"; break;
+                    case 3: newFocusString += "/History"; break;
+                    case 4: newFocusString += "/Description"; break;
+                    default: break;
                 }
-            case df::viewscreen_layer_militaryst::T_equip::Uniform:
                 break;
-            case df::viewscreen_layer_militaryst::T_equip::Priority:
-                {
-                    if (screen->equip.prio_in_move >= 0)
-                        focus += "/Move";
-                    else
-                        focus += "/View";
-                    break;
+            case 3:
+                newFocusString += "/Skills";
+                switch (game->main_interface.view_sheets.unit_skill_active_tab) {
+                    case 0: newFocusString += "/Labor"; break;
+                    case 1: newFocusString += "/Combat"; break;
+                    case 2: newFocusString += "/Social"; break;
+                    case 3: newFocusString += "/Other"; break;
+                    case 4:
+                        newFocusString += "/Knowledge";
+                        if (game->main_interface.view_sheets.skill_description_raw_str.size())
+                            newFocusString += "/Details";
+                        else
+                            newFocusString += "/Default";
+                        break;
+                    default: break;
+                }
+                break;
+            case 4: newFocusString += "/Rooms"; break;
+            case 5:
+                newFocusString += "/Labor";
+                switch (game->main_interface.view_sheets.unit_labor_active_tab) {
+                    case 0: newFocusString += "/WorkDetails"; break;
+                    case 1: newFocusString += "/Workshops"; break;
+                    case 2: newFocusString += "/Locations"; break;
+                    case 3: newFocusString += "/WorkAnimals"; break;
+                    default: break;
+                }
+                break;
+            case 6: newFocusString += "/Relations"; break;
+            case 7: newFocusString += "/Groups"; break;
+            case 8:
+                newFocusString += "/Military";
+                switch (game->main_interface.view_sheets.unit_military_active_tab) {
+                    case 0: newFocusString += "/Squad"; break;
+                    case 1: newFocusString += "/Uniform"; break;
+                    case 2: newFocusString += "/Kills"; break;
+                    default: break;
+                }
+                break;
+            case 9:
+                newFocusString += "/Thoughts";
+                switch (game->main_interface.view_sheets.thoughts_active_tab) {
+                    case 0: newFocusString += "/Recent"; break;
+                    case 1: newFocusString += "/Memories"; break;
+                    default: break;
+                }
+                break;
+            case 10:
+                newFocusString += "/Personality";
+                switch (game->main_interface.view_sheets.personality_active_tab) {
+                    case 0: newFocusString += "/Traits"; break;
+                    case 1: newFocusString += "/Values"; break;
+                    case 2: newFocusString += "/Preferences"; break;
+                    case 3: newFocusString += "/Needs"; break;
+                    default: break;
+                }
+                break;
+            default:
+                break;
+            }
+            break;
+        case df::view_sheet_type::BUILDING:
+            if (game->main_interface.view_sheets.linking_lever)
+                newFocusString = baseFocus + "/LinkingLever";
+            else if (auto bld = df::building::find(game->main_interface.view_sheets.viewing_bldid)) {
+                newFocusString += '/' + enum_item_key(bld->getType());
+                if (bld->getType() == df::enums::building_type::Trap) {
+                    df::building_trapst* trap = strict_virtual_cast<df::building_trapst>(bld);
+                    newFocusString += '/' + enum_item_key(trap->trap_type);
                 }
             }
-
-            static const char *lists[] = { "/Squads", "/Positions", "/Choices" };
-            focus += lists[cur_list];
+            break;
+        default:
             break;
         }
-
-    default:
-        break;
-    }
-}
-
-DEFINE_GET_FOCUS_STRING_HANDLER(workshop_profile)
-{
-    typedef df::viewscreen_workshop_profilest::T_tab T_tab;
-    switch(screen->tab)
-    {
-    case T_tab::Workers:
-        focus += "/Unit";
-        break;
-    case T_tab::Orders:
-        focus += "/Orders";
-        break;
-    case T_tab::Restrictions:
-        focus += "/Restrictions";
-        break;
+        focusStrings.push_back(newFocusString);
     }
-}
 
-DEFINE_GET_FOCUS_STRING_HANDLER(layer_noblelist)
-{
-    auto list1 = getLayerList(screen, 0);
-    auto list2 = getLayerList(screen, 1);
-    if (!list1 || !list2) return;
+    if(game->main_interface.bottom_mode_selected != -1) {
+        newFocusString = baseFocus;
 
-    focus += "/" + enum_item_key(screen->mode);
-}
-
-DEFINE_GET_FOCUS_STRING_HANDLER(pet)
-{
-    focus += "/" + enum_item_key(screen->mode);
-
-    switch (screen->mode)
-    {
-    case df::viewscreen_petst::List:
-        focus += vector_get(screen->is_vermin, screen->cursor) ? "/Vermin" : "/Unit";
-        break;
+        switch(game->main_interface.bottom_mode_selected) {
+        case df::enums::main_bottom_mode_type::STOCKPILE:
+            if (game->main_interface.stockpile.cur_bld) {
+                newFocusString += "/Some";
+            }
+            newFocusString += "/Stockpile";
+            break;
+        case df::enums::main_bottom_mode_type::STOCKPILE_PAINT:
+            newFocusString += "/Stockpile/Paint";
+            break;
+        case df::enums::main_bottom_mode_type::HAULING:
+            newFocusString += "/Hauling";
+            break;
+        case df::enums::main_bottom_mode_type::ZONE:
+            newFocusString += "/Zone";
+            if (game->main_interface.civzone.cur_bld) {
+                newFocusString += "/Some";
+                newFocusString += '/' + enum_item_key(game->main_interface.civzone.cur_bld->type);
+            }
+            break;
+        case df::enums::main_bottom_mode_type::ZONE_PAINT:
+            newFocusString += "/Zone/Paint";
 
-    case df::viewscreen_petst::SelectTrainer:
-        if (vector_get(screen->trainer_unit, screen->trainer_cursor))
-            focus += "/Unit";
-        break;
+            // TODO: figure out why enum_item_key doesn't work on this?
+            switch(game->main_interface.civzone.adding_new_type) {
+            case df::enums::civzone_type::MeetingHall:
+                newFocusString += "/MeetingHall";
+                break;
+            case df::enums::civzone_type::Bedroom:
+                newFocusString += "/Bedroom";
+                break;
+            case df::enums::civzone_type::DiningHall:
+                newFocusString += "/DiningHall";
+                break;
+            case df::enums::civzone_type::Pen:
+                newFocusString += "/Pen";
+                break;
+            case df::enums::civzone_type::Pond:
+                newFocusString += "/Pond";
+                break;
+            case df::enums::civzone_type::WaterSource:
+                newFocusString += "/WaterSource";
+                break;
+            case df::enums::civzone_type::Dungeon:
+                newFocusString += "/Dungeon";
+                break;
+            case df::enums::civzone_type::FishingArea:
+                newFocusString += "/FishingArea";
+                break;
+            case df::enums::civzone_type::SandCollection:
+                newFocusString += "/SandCollection";
+                break;
+            case df::enums::civzone_type::Office:
+                newFocusString += "/Office";
+                break;
+            case df::enums::civzone_type::Dormitory:
+                newFocusString += "/Dormitory";
+                break;
+            case df::enums::civzone_type::Barracks:
+                newFocusString += "/Barracks";
+                break;
+            case df::enums::civzone_type::ArcheryRange:
+                newFocusString += "/ArcheryRange";
+                break;
+            case df::enums::civzone_type::Dump:
+                newFocusString += "/Dump";
+                break;
+            case df::enums::civzone_type::AnimalTraining:
+                newFocusString += "/AnimalTraining";
+                break;
+            case df::enums::civzone_type::Tomb:
+                newFocusString += "/Tomb";
+                break;
+            case df::enums::civzone_type::PlantGathering:
+                newFocusString += "/PlantGathering";
+                break;
+            case df::enums::civzone_type::ClayCollection:
+                newFocusString += "/ClayCollection";
+                break;
+            }
+            break;
+        case df::enums::main_bottom_mode_type::BURROW:
+            newFocusString += "/Burrow";
+            break;
+        case df::enums::main_bottom_mode_type::BURROW_PAINT:
+            newFocusString += "/Burrow/Paint";
+            break;
+        case df::enums::main_bottom_mode_type::BUILDING:
+            newFocusString += "/Building";
+            break;
+        case df::enums::main_bottom_mode_type::BUILDING_PLACEMENT:
+            newFocusString += "/Building/Placement";
+            break;
+        case df::enums::main_bottom_mode_type::BUILDING_PICK_MATERIALS:
+            newFocusString += "/Building/PickMaterials";
+            break;
+        default:
+            break;
+        }
 
-    default:
-        break;
+        focusStrings.push_back(newFocusString);
     }
-}
 
-DEFINE_GET_FOCUS_STRING_HANDLER(layer_overall_health)
-{
-    auto list1 = getLayerList(screen, 0);
-    if (!list1) return;
-
-    focus += "/Units";
-}
-
-DEFINE_GET_FOCUS_STRING_HANDLER(tradegoods)
-{
-    if (!screen->has_traders || screen->is_unloading)
-        focus += "/NoTraders";
-    else if (screen->in_edit_count)
-        focus += "/EditCount";
-    else
-        focus += (screen->in_right_pane ? "/Items/Broker" : "/Items/Trader");
+    if (game->main_interface.trade.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Trade";
+        if (game->main_interface.trade.choosing_merchant)
+            newFocusString += "/ChoosingMerchant";
+        else
+            newFocusString += "/Default";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.job_details.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/JobDetails/" + enum_item_key(game->main_interface.job_details.context);
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.assign_trade.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/AssignTrade";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.diplomacy.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Diplomacy";
+        if (game->main_interface.diplomacy.taking_requests)
+            newFocusString += "/Requests";
+        else
+            newFocusString += "/Default";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.petitions.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Petitions";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.stocks.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Stocks";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.assign_display_item.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/AssignDisplayItem";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.name_creator.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/NameCreator";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.image_creator.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/ImageCreator";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.unit_selector.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/UnitSelector";
+        newFocusString += '/' + enum_item_key(game->main_interface.unit_selector.context);
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.announcement_alert.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/AnnouncementAlert";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.custom_symbol.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/CustomSymbol";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.patrol_routes.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/PatrolRoutes";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.squad_schedule.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/SquadSchedule";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.squad_selector.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/SquadSelector";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.burrow_selector.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/BurrowSelector";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.location_selector.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/LocationSelector/";
+        if (game->main_interface.location_selector.choosing_temple_religious_practice)
+            newFocusString += "Temple";
+        else if (game->main_interface.location_selector.choosing_craft_guild)
+            newFocusString += "Guildhall";
+        else
+            newFocusString += "Default";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.location_details.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/LocationDetails";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.hauling_stop_conditions.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/HaulingStopConditions";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.assign_vehicle.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/AssignVehicle";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.stockpile_link.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/StockpileLink";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.stockpile_tools.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/StockpileTools";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.custom_stockpile.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/CustomStockpile";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.create_squad.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/CreateSquad";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.squad_supplies.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/SquadSupplies";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.assign_uniform.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/AssignUniform";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.hotkey.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Hotkey";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.options.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Options";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.help.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Help";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.settings.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Settings";
+        focusStrings.push_back(newFocusString);
+    }
+    if (game->main_interface.squad_equipment.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/SquadEquipment";
+        focusStrings.push_back(newFocusString);
+    }
+    // squads should be last because it's the only one not exclusive with the others? or something?
+    if (game->main_interface.squads.open) {
+        newFocusString = baseFocus;
+        newFocusString += "/Squads";
+        focusStrings.push_back(newFocusString);
+    }
+
+    if (!newFocusString.size()) {
+        focusStrings.push_back(baseFocus + "/Default");
+    }
 }
 
-DEFINE_GET_FOCUS_STRING_HANDLER(layer_assigntrade)
+/* TODO: understand how this changes for v50
+DEFINE_GET_FOCUS_STRING_HANDLER(dungeonmode)
 {
-    auto list1 = getLayerList(screen, 0);
-    auto list2 = getLayerList(screen, 1);
-    if (!list1 || !list2) return;
+    using df::global::adventure;
 
-    int list_idx = vector_get(screen->visible_lists, list1->cursor, (int16_t)-1);
-    unsigned num_lists = sizeof(screen->lists)/sizeof(screen->lists[0]);
-    if (unsigned(list_idx) >= num_lists)
+    if (!adventure)
         return;
 
-    if (list1->active)
-        focus += "/Groups";
-    else
-        focus += "/Items";
-}
-
-DEFINE_GET_FOCUS_STRING_HANDLER(stores)
-{
-    if (!screen->in_right_list)
-        focus += "/Categories";
-    else if (screen->in_group_mode)
-        focus += "/Groups";
-    else
-        focus += "/Items";
+    focus += '/' + enum_item_key(adventure->menu);
 }
+*/
 
-DEFINE_GET_FOCUS_STRING_HANDLER(layer_stockpile)
-{
-    auto list1 = getLayerList(screen, 0);
-    auto list2 = getLayerList(screen, 1);
-    auto list3 = getLayerList(screen, 2);
-    if (!list1 || !list2 || !list3 || !screen->settings) return;
-
-    auto group = screen->cur_group;
-    if (group != vector_get(screen->group_ids, list1->cursor))
-        return;
-
-    focus += "/" + enum_item_key(group);
-
-    auto bits = vector_get(screen->group_bits, list1->cursor);
-    if (bits.whole && !(bits.whole & screen->settings->flags.whole))
-    {
-        focus += "/Off";
-        return;
-    }
-
-    focus += "/On";
-
-    if (list2->active || list3->active || screen->list_ids.empty()) {
-        focus += "/" + enum_item_key(screen->cur_list);
+bool Gui::matchFocusString(std::string focus_string, df::viewscreen *top) {
+    focus_string = toLower(focus_string);
+    if (!top)
+        top = getCurViewscreen(true);
+    std::vector<std::string> currentFocusStrings = getFocusStrings(top);
 
-        if (list3->active)
-            focus += (screen->item_names.empty() ? "/None" : "/Item");
-    }
+    return std::find_if(currentFocusStrings.begin(), currentFocusStrings.end(), [&focus_string](std::string item) {
+        return prefix_matches(focus_string, toLower(item));
+    }) != currentFocusStrings.end();
 }
 
-DEFINE_GET_FOCUS_STRING_HANDLER(locations)
+static void push_dfhack_focus_string(dfhack_viewscreen *vs, std::vector<std::string> &focusStrings)
 {
-    focus += "/" + enum_item_key(screen->menu);
-}
+    auto name = vs->getFocusString();
+    if (name.empty())
+        name = "dfhack";
+    else if (string::npos == name.find("dfhack/"))
+        name = "dfhack/" + name;
 
-DEFINE_GET_FOCUS_STRING_HANDLER(jobmanagement)
-{
-    focus += (screen->in_max_workshops ? "/MaxWorkshops" : "/Main");
+    focusStrings.push_back(name);
 }
 
-DEFINE_GET_FOCUS_STRING_HANDLER(workquota_condition)
+std::vector<std::string> Gui::getFocusStrings(df::viewscreen* top)
 {
-    focus += "/" + enum_item_key(screen->mode);
-    if (screen->item_count_edit)
-        focus += "/EditCount";
-}
-*/
+    std::vector<std::string> focusStrings;
 
-std::string Gui::getFocusString(df::viewscreen *top)
-{
     if (!top)
-        return "";
+        return focusStrings;
 
     if (dfhack_viewscreen::is_instance(top))
     {
-        auto name = static_cast<dfhack_viewscreen*>(top)->getFocusString();
-        return name.empty() ? "dfhack" : "dfhack/"+name;
+        dfhack_viewscreen *vs = static_cast<dfhack_viewscreen*>(top);
+        if (vs->isFocused())
+        {
+            push_dfhack_focus_string(vs, focusStrings);
+            return focusStrings;
+        }
+        top = Gui::getDFViewscreen(top);
+        if (dfhack_viewscreen::is_instance(top))
+        {
+            push_dfhack_focus_string(static_cast<dfhack_viewscreen*>(top), focusStrings);
+            return focusStrings;
+        }
     }
-    else if (virtual_identity *id = virtual_identity::get(top))
+
+    if (virtual_identity *id = virtual_identity::get(top))
     {
         std::string name = getNameChunk(id, 11, 2);
 
-        auto handler = map_find(getFocusStringHandlers, id);
+        auto handler = map_find(getFocusStringsHandlers, id);
         if (handler)
-            handler(name, top);
-
-        return name;
+            handler(name, focusStrings, top);
     }
-    else
+
+    if (!focusStrings.size())
     {
         Core &core = Core::getInstance();
         std::string name = core.p->readClassName(*(void**)top);
-        return name.substr(11, name.size()-11-2);
+        focusStrings.push_back(name.substr(11, name.size()-11-2));
     }
+    return focusStrings;
 }
 
 // Predefined common guard functions
 
 bool Gui::default_hotkey(df::viewscreen *top)
 {
-    // Default hotkey guard function
-    for (;top ;top = top->parent)
-    {
-        if (strict_virtual_cast<df::viewscreen_dwarfmodest>(top))
-            return true;
-/* TODO: understand how this changes for v50
-        if (strict_virtual_cast<df::viewscreen_dungeonmodest>(top))
-            return true;
-*/
-    }
-    return false;
+    return World::isFortressMode() || World::isAdventureMode();
 }
 
 bool Gui::anywhere_hotkey(df::viewscreen *) {
     return true;
 }
 
-bool Gui::dwarfmode_hotkey(df::viewscreen *top)
-{
-    // Require the main dwarf mode screen
-    return !!strict_virtual_cast<df::viewscreen_dwarfmodest>(top);
-}
-
-bool Gui::unitjobs_hotkey(df::viewscreen *top)
-{
-/* TODO: understand how this changes for v50
-    // Require the unit or jobs list
-    return !!strict_virtual_cast<df::viewscreen_joblistst>(top) ||
-           !!strict_virtual_cast<df::viewscreen_unitlistst>(top);
-*/ return false;
-}
-
-bool Gui::item_details_hotkey(df::viewscreen *top)
-{
-/* TODO: understand how this changes for v50
-    // Require the main dwarf mode screen
-    return !!strict_virtual_cast<df::viewscreen_itemst>(top);
-*/ return false;
+bool Gui::dwarfmode_hotkey(df::viewscreen *top) {
+    return matchFocusString("dwarfmode", top);
 }
 
 static bool has_cursor()
 {
-    return df::global::cursor && df::global::cursor->x != -30000;
+    return Gui::getCursorPos().isValid();
 }
 
 bool Gui::cursor_hotkey(df::viewscreen *top)
@@ -670,170 +794,97 @@ bool Gui::workshop_job_hotkey(df::viewscreen *top)
     if (!dwarfmode_hotkey(top))
         return false;
 
-/* TODO: understand how this changes for v50
-    using namespace ui_sidebar_mode;
-    using df::global::ui_workshop_in_add;
-    using df::global::ui_workshop_job_cursor;
-
-    switch (ui->main.mode) {
-    case QueryBuilding:
-        {
-            if (!ui_workshop_job_cursor) // allow missing
-                return false;
-
-            df::building *selected = world->selected_building;
-            if (!virtual_cast<df::building_workshopst>(selected) &&
-                !virtual_cast<df::building_furnacest>(selected))
-                return false;
-
-            // No jobs?
-            if (selected->jobs.empty() ||
-                selected->jobs[0]->job_type == job_type::DestroyBuilding)
-                return false;
-
-            // Add job gui activated?
-            if (ui_workshop_in_add && *ui_workshop_in_add)
-                return false;
+    df::building *selected = getAnyBuilding(top);
+    if (!virtual_cast<df::building_workshopst>(selected) &&
+            !virtual_cast<df::building_furnacest>(selected))
+        return false;
 
-            return true;
-        };
-    default:
+    if (selected->jobs.empty() ||
+            selected->jobs[0]->job_type == job_type::DestroyBuilding)
         return false;
-    }
-*/ return false;
+
+    return true;
 }
 
 bool Gui::build_selector_hotkey(df::viewscreen *top)
 {
+    using df::global::buildreq;
+
     if (!dwarfmode_hotkey(top))
         return false;
 
-/* TODO: understand how this changes for v50
-    using namespace ui_sidebar_mode;
-    using df::global::ui_build_selector;
-
-    switch (ui->main.mode) {
-    case Build:
-        {
-            if (!ui_build_selector) // allow missing
-                return false;
-
-            // Not selecting, or no choices?
-            if (ui_build_selector->building_type < 0 ||
-                ui_build_selector->stage != 2 ||
-                ui_build_selector->choices.empty())
-                return false;
-
-            return true;
-        };
-    default:
+    if (buildreq->building_type < 0 ||
+            buildreq->stage != 2 ||
+            buildreq->choices.empty())
         return false;
-    }
-*/ return false;
+
+    return true;
 }
 
 bool Gui::view_unit_hotkey(df::viewscreen *top)
 {
     if (!dwarfmode_hotkey(top))
         return false;
-/* TODO: understand how this changes for v50
-    using df::global::ui_selected_unit;
 
-    if (ui->main.mode != ui_sidebar_mode::ViewUnits)
-        return false;
-    if (!ui_selected_unit) // allow missing
-        return false;
-
-    return vector_get(world->units.active, *ui_selected_unit) != NULL;
-*/ return false;
+    return !!getAnyUnit(top);
 }
 
-bool Gui::unit_inventory_hotkey(df::viewscreen *top)
+bool Gui::any_job_hotkey(df::viewscreen *top)
 {
-    using df::global::ui_unit_view_mode;
-
-    if (!view_unit_hotkey(top))
-        return false;
-    if (!ui_unit_view_mode)
-        return false;
-
-    return ui_unit_view_mode->value == df::ui_unit_view_mode::Inventory;
+    return matchFocusString("dwarfmode/Info/JOBS", top)
+            || matchFocusString("dwarfmode/Info/CREATURES/CITIZEN", top)
+            || workshop_job_hotkey(top);
 }
 
 df::job *Gui::getSelectedWorkshopJob(color_ostream &out, bool quiet)
 {
-    using df::global::ui_workshop_job_cursor;
-
-    if (!workshop_job_hotkey(Core::getTopViewscreen())) {
-        if (!quiet)
-            out.printerr("Not in a workshop, or no job is highlighted.\n");
-        return NULL;
-    }
-
-    df::building *selected = world->selected_building;
-    int idx = *ui_workshop_job_cursor;
-
-    if (size_t(idx) >= selected->jobs.size())
-    {
-        out.printerr("Invalid job cursor index: %d\n", idx);
+    auto bld = getSelectedBuilding(out, true);
+    if (!bld)
         return NULL;
-    }
 
-    return selected->jobs[idx];
-}
-
-bool Gui::any_job_hotkey(df::viewscreen *top)
-{
-/* TODO: understand how this changes for v50
-    if (VIRTUAL_CAST_VAR(screen, df::viewscreen_joblistst, top))
-        return vector_get(screen->jobs, screen->cursor_pos) != NULL;
-
-    if (VIRTUAL_CAST_VAR(screen, df::viewscreen_unitlistst, top))
-        return vector_get(screen->jobs[screen->page], screen->cursor_pos[screen->page]) != NULL;
-
-    return workshop_job_hotkey(top);
-*/ return false;
+    // no way to select a specific job; just get the first one
+    return bld->jobs.size() ? bld->jobs[0] : NULL;
 }
 
 df::job *Gui::getSelectedJob(color_ostream &out, bool quiet)
 {
-/* TODO: understand how this changes for v50
-    df::viewscreen *top = Core::getTopViewscreen();
-
-    if (VIRTUAL_CAST_VAR(screen, df::viewscreen_jobst, top))
-    {
-        return screen->job;
-    }
-    if (VIRTUAL_CAST_VAR(joblist, df::viewscreen_joblistst, top))
-    {
-        df::job *job = vector_get(joblist->jobs, joblist->cursor_pos);
+    using df::global::game;
 
-        if (!job && !quiet)
-            out.printerr("Selected unit has no job\n");
+    auto top = Core::getTopViewscreen();
+    if (auto dfscreen = dfhack_viewscreen::try_cast(top))
+        return dfscreen->getSelectedJob();
 
-        return job;
+    if (matchFocusString("dwarfmode/Info/JOBS")) {
+        auto &cri_job = game->main_interface.info.jobs.cri_job;
+        // no way to select specific jobs; just get the first one
+        return cri_job.size() ? cri_job[0]->jb : NULL;
     }
-    else if (VIRTUAL_CAST_VAR(unitlist, df::viewscreen_unitlistst, top))
-    {
-        int page = unitlist->page;
-        df::job *job = vector_get(unitlist->jobs[page], unitlist->cursor_pos[page]);
+
+    if (auto unit = getAnyUnit(top)) {
+        df::job *job = unit->job.current_job;
 
         if (!job && !quiet)
             out.printerr("Selected unit has no job\n");
 
         return job;
     }
-    else if (auto dfscreen = dfhack_viewscreen::try_cast(top))
-        return dfscreen->getSelectedJob();
-    else
-        return getSelectedWorkshopJob(out, quiet);
-*/ return getSelectedWorkshopJob(out, quiet);
+
+    return getSelectedWorkshopJob(out, quiet);
 }
 
 df::unit *Gui::getAnyUnit(df::viewscreen *top)
 {
+    using df::global::game;
+
+    if (auto dfscreen = dfhack_viewscreen::try_cast(top))
+        return dfscreen->getSelectedUnit();
+
+    if (game->main_interface.view_sheets.open
+            && game->main_interface.view_sheets.active_sheet == view_sheet_type::UNIT)
+        return df::unit::find(game->main_interface.view_sheets.active_id);
+
 /* TODO: understand how this changes for v50
-    using namespace ui_sidebar_mode;
+   using namespace ui_sidebar_mode;
     using df::global::ui_look_cursor;
     using df::global::ui_look_list;
     using df::global::ui_selected_unit;
@@ -1017,19 +1068,19 @@ df::unit *Gui::getAnyUnit(df::viewscreen *top)
     if (!Gui::dwarfmode_hotkey(top))
         return NULL;
 
-    if (!ui)
+    if (!plotinfo)
         return NULL;
 
     // general assigning units in building, i.e. (q)uery cage -> (a)ssign
     if (ui_building_in_assign && *ui_building_in_assign
         && ui_building_assign_units && ui_building_item_cursor
-        && ui->main.mode != Zones) // dont show for (i) zone
+        && plotinfo->main.mode != Zones) // dont show for (i) zone
         return vector_get(*ui_building_assign_units, *ui_building_item_cursor);
 
-    if (ui->follow_unit != -1)
-        return df::unit::find(ui->follow_unit);
+    if (plotinfo->follow_unit != -1)
+        return df::unit::find(plotinfo->follow_unit);
 
-    switch (ui->main.mode) {
+    switch (plotinfo->main.mode) {
     case ViewUnits:
     {
         if (!ui_selected_unit || !world)
@@ -1047,8 +1098,8 @@ df::unit *Gui::getAnyUnit(df::viewscreen *top)
     }
     case Burrows:
     {
-        if (ui->burrows.in_add_units_mode)
-            return vector_get(ui->burrows.list_units, ui->burrows.unit_cursor_pos);
+        if (plotinfo->burrows.in_add_units_mode)
+            return vector_get(plotinfo->burrows.list_units, plotinfo->burrows.unit_cursor_pos);
 
         return NULL;
     }
@@ -1114,6 +1165,15 @@ df::unit *Gui::getSelectedUnit(color_ostream &out, bool quiet)
 
 df::item *Gui::getAnyItem(df::viewscreen *top)
 {
+    using df::global::game;
+
+    if (auto dfscreen = dfhack_viewscreen::try_cast(top))
+        return dfscreen->getSelectedItem();
+
+    if (game->main_interface.view_sheets.open
+            && game->main_interface.view_sheets.active_sheet == view_sheet_type::ITEM)
+        return df::item::find(game->main_interface.view_sheets.active_id);
+
 /* TODO: understand how this changes for v50
     using namespace ui_sidebar_mode;
     using df::global::ui_look_cursor;
@@ -1196,16 +1256,16 @@ df::item *Gui::getAnyItem(df::viewscreen *top)
     if (!Gui::dwarfmode_hotkey(top))
         return NULL;
 
-    switch (ui->main.mode) {
+    switch (plotinfo->main.mode) {
     case ViewUnits:
     {
-        if (!ui_unit_view_mode || !ui_look_cursor || !ui_sidebar_menus)
+        if (!ui_unit_view_mode || !ui_look_cursor || !game)
             return NULL;
 
         if (ui_unit_view_mode->value != df::ui_unit_view_mode::Inventory)
             return NULL;
 
-        auto inv_item = vector_get(ui_sidebar_menus->unit.inv_items, *ui_look_cursor);
+        auto inv_item = vector_get(game->unit.inv_items, *ui_look_cursor);
         return inv_item ? inv_item->item : NULL;
     }
     case LookAround:
@@ -1252,8 +1312,62 @@ df::item *Gui::getSelectedItem(color_ostream &out, bool quiet)
     return item;
 }
 
+bool Gui::any_stockpile_hotkey(df::viewscreen* top)
+{
+    return getAnyStockpile(top) != NULL;
+}
+
+df::building_stockpilest* Gui::getAnyStockpile(df::viewscreen* top) {
+    if (auto dfscreen = dfhack_viewscreen::try_cast(top))
+        return dfscreen->getSelectedStockpile();
+
+    if (game->main_interface.bottom_mode_selected == main_bottom_mode_type::STOCKPILE)
+        return game->main_interface.stockpile.cur_bld;
+
+    return NULL;
+}
+
+df::building_stockpilest* Gui::getSelectedStockpile(color_ostream& out, bool quiet) {
+    df::building_stockpilest* stockpile = getAnyStockpile(Core::getTopViewscreen());
+
+    if (!stockpile && !quiet)
+        out.printerr("No stockpile is selected in the UI.\n");
+
+    return stockpile;
+}
+
+bool Gui::any_civzone_hotkey(df::viewscreen* top) {
+    return getAnyCivZone(top) != NULL;
+}
+
+df::building_civzonest *Gui::getAnyCivZone(df::viewscreen* top) {
+    if (auto dfscreen = dfhack_viewscreen::try_cast(top))
+        return dfscreen->getSelectedCivZone();
+
+    if (game->main_interface.bottom_mode_selected == main_bottom_mode_type::ZONE)
+        return game->main_interface.civzone.cur_bld;
+
+    return NULL;
+}
+
+df::building_civzonest *Gui::getSelectedCivZone(color_ostream &out, bool quiet) {
+    df::building_civzonest *civzone = getAnyCivZone(Core::getTopViewscreen());
+
+    if (!civzone && !quiet)
+        out.printerr("No zone is selected in the UI");
+
+    return civzone;
+}
+
 df::building *Gui::getAnyBuilding(df::viewscreen *top)
 {
+    if (auto dfscreen = dfhack_viewscreen::try_cast(top))
+        return dfscreen->getSelectedBuilding();
+
+    if (game->main_interface.view_sheets.open
+            && game->main_interface.view_sheets.active_sheet == view_sheet_type::BUILDING)
+        return df::building::find(game->main_interface.view_sheets.active_id);
+
 /* TODO: understand how this changes for v50
     using namespace ui_sidebar_mode;
     using df::global::ui_look_list;
@@ -1271,7 +1385,7 @@ df::building *Gui::getAnyBuilding(df::viewscreen *top)
     if (!Gui::dwarfmode_hotkey(top))
         return NULL;
 
-    switch (ui->main.mode) {
+    switch (plotinfo->main.mode) {
     case LookAround:
     {
         if (!ui_look_list || !ui_look_cursor)
@@ -1293,8 +1407,8 @@ df::building *Gui::getAnyBuilding(df::viewscreen *top)
     case ZonesPitInfo:
     case ZonesHospitalInfo:
     {
-        if (ui_sidebar_menus)
-            return ui_sidebar_menus->zone.selected;
+        if (game)
+            return game->zone.selected;
         return NULL;
     }
     default:
@@ -1327,11 +1441,11 @@ df::plant *Gui::getAnyPlant(df::viewscreen *top)
 
     if (Gui::dwarfmode_hotkey(top))
     {
-        if (!cursor || !ui || !world)
+        if (!cursor || !plotinfo || !world)
             return nullptr;
 
 /* TODO: understand how this changes for v50
-        if (ui->main.mode == ui_sidebar_mode::LookAround)
+        if (plotinfo->main.mode == ui_sidebar_mode::LookAround)
         {
             return Maps::getPlantAtTile(cursor->x, cursor->y, cursor->z);
         }
@@ -1507,7 +1621,7 @@ DFHACK_EXPORT int Gui::makeAnnouncement(df::announcement_type type, df::announce
         if (flags.bits.D_DISPLAY)
         {
             world->status.display_timer = ANNOUNCE_DISPLAY_TIME;
-            Gui::writeToGamelog("x" + to_string(repeat_count + 1));
+            Gui::writeToGamelog('x' + to_string(repeat_count + 1));
         }
         return -1;
     }
@@ -1694,7 +1808,7 @@ bool Gui::autoDFAnnouncement(df::report_init r, string message)
     // Check if the announcement will actually be announced
     if (*gamemode == game_mode::ADVENTURE)
     {
-        if (r.pos.x != -30000 &&
+        if (r.pos.x >= 0 &&
             r.type != announcement_type::CREATURE_SOUND &&
             r.type != announcement_type::REGULAR_CONVERSATION &&
             r.type != announcement_type::CONFLICT_CONVERSATION &&
@@ -1769,7 +1883,7 @@ bool Gui::autoDFAnnouncement(df::report_init r, string message)
         if (a_flags.bits.D_DISPLAY)
         {
             world->status.display_timer = r.display_timer;
-            Gui::writeToGamelog("x" + to_string(repeat_count + 1));
+            Gui::writeToGamelog('x' + to_string(repeat_count + 1));
         }
         DEBUG(gui).print("Announcement succeeded as repeat:\n%s\n", message.c_str());
         return true;
@@ -1873,6 +1987,12 @@ bool Gui::autoDFAnnouncement(df::announcement_type type, df::coord pos, std::str
     return autoDFAnnouncement(r, message);
 }
 
+static df::viewscreen * do_skip_dismissed(df::viewscreen * ws) {
+    while (ws && Screen::isDismissed(ws) && ws->parent)
+        ws = ws->parent;
+    return ws;
+}
+
 df::viewscreen *Gui::getCurViewscreen(bool skip_dismissed)
 {
     if (!gview)
@@ -1883,10 +2003,7 @@ df::viewscreen *Gui::getCurViewscreen(bool skip_dismissed)
         ws = ws->child;
 
     if (skip_dismissed)
-    {
-        while (ws && Screen::isDismissed(ws) && ws->parent)
-            ws = ws->parent;
-    }
+        ws = do_skip_dismissed(ws);
 
     return ws;
 }
@@ -1906,6 +2023,17 @@ df::viewscreen *Gui::getViewscreenByIdentity (virtual_identity &id, int n)
     return NULL;
 }
 
+df::viewscreen *Gui::getDFViewscreen(bool skip_dismissed, df::viewscreen *screen) {
+    if (!screen)
+        screen = Gui::getCurViewscreen(skip_dismissed);
+    while (screen && dfhack_viewscreen::is_instance(screen)) {
+        screen = screen->parent;
+        if (skip_dismissed)
+            screen = do_skip_dismissed(screen);
+    }
+    return screen;
+}
+
 df::coord Gui::getViewportPos()
 {
     if (!df::global::window_x || !df::global::window_y || !df::global::window_z)
@@ -1949,20 +2077,24 @@ void Gui::resetDwarfmodeView(bool pause)
 {
     using df::global::cursor;
 
-    if (ui)
+    if (plotinfo)
     {
-        ui->follow_unit = -1;
-        ui->follow_item = -1;
-/* TODO: understand how this changes for v50
-        ui->main.mode = ui_sidebar_mode::Default;
-*/
+        plotinfo->follow_unit = -1;
+        plotinfo->follow_item = -1;
+        plotinfo->main.mode = ui_sidebar_mode::Default;
     }
 
     if (selection_rect)
     {
         selection_rect->start_x = -30000;
+        selection_rect->start_y = -30000;
+        selection_rect->start_z = -30000;
         selection_rect->end_x = -30000;
+        selection_rect->end_y = -30000;
+        selection_rect->end_z = -30000;
     }
+    // NOTE: There's an unidentified global coord after selection_rect that is reset to -30000 here.
+    //   This coord goes into game->main_interface.keyboard_last_track_s if the x value is not -30000. Probably okay to ignore?
 
     if (cursor)
         cursor->x = cursor->y = cursor->z = -30000;
@@ -1971,13 +2103,13 @@ void Gui::resetDwarfmodeView(bool pause)
         *df::global::pause_state = true;
 }
 
-bool Gui::revealInDwarfmodeMap(int32_t x, int32_t y, int32_t z, bool center)
+bool Gui::revealInDwarfmodeMap(int32_t x, int32_t y, int32_t z, bool center, bool highlight)
 {   // Reverse-engineered from DF announcement and scrolling code
     using df::global::window_x;
     using df::global::window_y;
     using df::global::window_z;
 
-    if (!window_x || !window_y || !window_z || !world)
+    if (!window_x || !window_y || !window_z || !world || !game)
         return false;
 
     auto dims = getDwarfmodeViewDims();
@@ -2011,8 +2143,14 @@ bool Gui::revealInDwarfmodeMap(int32_t x, int32_t y, int32_t z, bool center)
     *window_x = clip_range(new_win_x, 0, (world->map.x_count - w));
     *window_y = clip_range(new_win_y, 0, (world->map.y_count - h));
     *window_z = clip_range(new_win_z, 0, (world->map.z_count - 1));
-    ui_sidebar_menus->minimap.need_render = true;
-    ui_sidebar_menus->minimap.need_scan = true;
+    game->minimap.update = true;
+    game->minimap.mustmake = true;
+
+    if (highlight) {
+        game->main_interface.recenter_indicator_m.x = x;
+        game->main_interface.recenter_indicator_m.y = y;
+        game->main_interface.recenter_indicator_m.z = z;
+    }
 
     return true;
 }
@@ -2058,10 +2196,10 @@ bool Gui::refreshSidebar()
 
 bool Gui::inRenameBuilding()
 {
-    if (!ui_sidebar_menus)
+    if (!game)
         return false;
     /* TODO: understand how this changes for v50
-    return ui_sidebar_menus->barracks.in_rename;
+    return game->barracks.in_rename;
     */
     return false;
 }
@@ -2112,7 +2250,7 @@ bool Gui::getDesignationCoords (int32_t &x, int32_t &y, int32_t &z)
     x = selection_rect->start_x;
     y = selection_rect->start_y;
     z = selection_rect->start_z;
-    return (x == -30000) ? false : true;
+    return (x >= 0) ? false : true;
 }
 
 bool Gui::setDesignationCoords (const int32_t x, const int32_t y, const int32_t z)
@@ -2124,7 +2262,7 @@ bool Gui::setDesignationCoords (const int32_t x, const int32_t y, const int32_t
 }
 
 // returns the map coordinates that the mouse cursor is over
-df::coord Gui::getMousePos()
+df::coord Gui::getMousePos(bool allow_out_of_bounds)
 {
     df::coord pos;
     if (gps && gps->precise_mouse_x > -1) {
@@ -2138,7 +2276,7 @@ df::coord Gui::getMousePos()
             pos.y += gps->mouse_y;
         }
     }
-    if (!Maps::isValidTilePos(pos.x, pos.y, pos.z))
+    if (!allow_out_of_bounds && !Maps::isValidTilePos(pos.x, pos.y, pos.z))
         return df::coord();
     return pos;
 }
diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index ceb0224e8..a91ea3470 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -39,6 +39,7 @@ distribution.
 using namespace std;
 
 #include "ModuleFactory.h"
+#include "modules/Job.h"
 #include "modules/MapCache.h"
 #include "modules/Materials.h"
 #include "modules/Items.h"
@@ -48,8 +49,17 @@ using namespace std;
 #include "df/body_part_template_flags.h"
 #include "df/building.h"
 #include "df/building_actual.h"
+#include "df/building_tradedepotst.h"
+#include "df/builtin_mats.h"
+#include "df/caravan_state.h"
 #include "df/caste_raw.h"
 #include "df/creature_raw.h"
+#include "df/dfhack_material_category.h"
+#include "df/entity_buy_prices.h"
+#include "df/entity_buy_requests.h"
+#include "df/entity_sell_category.h"
+#include "df/entity_sell_prices.h"
+#include "df/entity_raw.h"
 #include "df/general_ref.h"
 #include "df/general_ref_building_holderst.h"
 #include "df/general_ref_contained_in_itemst.h"
@@ -87,7 +97,7 @@ using namespace std;
 #include "df/reaction_product_itemst.h"
 #include "df/tool_uses.h"
 #include "df/trapcomp_flags.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/unit_inventory_item.h"
 #include "df/vehicle.h"
@@ -100,7 +110,7 @@ using namespace std;
 using namespace DFHack;
 using namespace df::enums;
 using df::global::world;
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::ui_selected_unit;
 using df::global::proj_next_id;
 
@@ -410,6 +420,7 @@ bool ItemTypeInfo::matches(const df::job_item &item, MaterialInfo *mat,
         xmask1.bits.cookable = true;
         break;
 
+    // TODO: split this into BOX and BAG
     case BOX:
         OK(1,bag); OK(1,sand_bearing); OK(1,milk);
         OK(2,dye); OK(2,plaster_containing);
@@ -720,7 +731,14 @@ df::coord Items::getPosition(df::item *item)
     return item->pos;
 }
 
-static char quality_table[] = { 0, '-', '+', '*', '=', '@' };
+static const char quality_table[] = {
+    '\0',   // (base)
+    '-',    // well-crafted
+    '+',    // finely-crafted
+    '*',    // superior quality
+    '\xF0', // (≡) exceptional
+    '\x0F'  // (☼) masterful
+};
 
 static void addQuality(std::string &tmp, int quality)
 {
@@ -819,15 +837,15 @@ std::string Items::getDescription(df::item *item, int type, bool decorate)
     item->getItemDescription(&tmp, type);
 
     if (decorate) {
-        if (item->flags.bits.foreign)
-            tmp = "(" + tmp + ")";
-
         addQuality(tmp, item->getQuality());
 
         if (item->isImproved()) {
-            tmp = "<" + tmp + ">";
+            tmp = '\xAE' + tmp + '\xAF'; // («) + tmp + (»)
             addQuality(tmp, item->getImprovementQuality());
         }
+
+        if (item->flags.bits.foreign)
+            tmp = "(" + tmp + ")";
     }
 
     return tmp;
@@ -924,7 +942,7 @@ static bool detachItem(MapExtras::MapCache &mc, df::item *item)
                 {
 /* TODO: understand how this changes for v50
                     // Unit view sidebar holds inventory item pointers
-                    if (ui->main.mode == ui_sidebar_mode::ViewUnits &&
+                    if (plotinfo->main.mode == ui_sidebar_mode::ViewUnits &&
                         (!ui_selected_unit ||
                          vector_get(world->units.active, *ui_selected_unit) == unit))
                         return false;
@@ -1188,18 +1206,24 @@ int Items::getItemBaseValue(int16_t item_type, int16_t item_subtype, int16_t mat
     switch (item_type)
     {
     case item_type::BAR:
-    case item_type::SMALLGEM:
     case item_type::BLOCKS:
     case item_type::SKIN_TANNED:
         value = 5;
         break;
 
-    case item_type::ROUGH:
+    case item_type::SMALLGEM:
+        value = 20;
+        break;
+
     case item_type::BOULDER:
     case item_type::WOOD:
         value = 3;
         break;
 
+    case item_type::ROUGH:
+        value = 6;
+        break;
+
     case item_type::DOOR:
     case item_type::FLOODGATE:
     case item_type::BED:
@@ -1215,6 +1239,7 @@ int Items::getItemBaseValue(int16_t item_type, int16_t item_subtype, int16_t mat
     case item_type::TABLE:
     case item_type::COFFIN:
     case item_type::BOX:
+    case item_type::BAG:
     case item_type::BIN:
     case item_type::ARMORSTAND:
     case item_type::WEAPONRACK:
@@ -1358,6 +1383,7 @@ int Items::getItemBaseValue(int16_t item_type, int16_t item_subtype, int16_t mat
     case item_type::COIN:
     case item_type::GLOB:
     case item_type::ORTHOPEDIC_CAST:
+    case item_type::BRANCH:
         value = 1;
         break;
 
@@ -1426,7 +1452,506 @@ int Items::getItemBaseValue(int16_t item_type, int16_t item_subtype, int16_t mat
     return value;
 }
 
-int Items::getValue(df::item *item)
+static int32_t get_war_multiplier(df::item *item, df::caravan_state *caravan) {
+    static const int32_t DEFAULT_WAR_MULTIPLIER = 256;
+
+    if (!caravan)
+        return DEFAULT_WAR_MULTIPLIER;
+    auto caravan_he = df::historical_entity::find(caravan->entity);
+    if (!caravan_he)
+        return DEFAULT_WAR_MULTIPLIER;
+    int32_t war_alignment = caravan_he->entity_raw->sphere_alignment[df::sphere_type::WAR];
+    if (war_alignment == DEFAULT_WAR_MULTIPLIER)
+        return DEFAULT_WAR_MULTIPLIER;
+    switch (item->getType()) {
+    case df::item_type::WEAPON:
+    {
+        auto weap_def = df::itemdef_weaponst::find(item->getSubtype());
+        auto caravan_cre_raw = df::creature_raw::find(caravan_he->race);
+        if (!weap_def || !caravan_cre_raw || caravan_cre_raw->adultsize < weap_def->minimum_size)
+            return DEFAULT_WAR_MULTIPLIER;
+        break;
+    }
+    case df::item_type::ARMOR:
+    case df::item_type::SHOES:
+    case df::item_type::HELM:
+    case df::item_type::GLOVES:
+    case df::item_type::PANTS:
+    {
+        if (item->getEffectiveArmorLevel() <= 0)
+            return DEFAULT_WAR_MULTIPLIER;
+        auto caravan_cre_raw = df::creature_raw::find(caravan_he->race);
+        auto maker_cre_raw = df::creature_raw::find(item->getMakerRace());
+        if (!caravan_cre_raw || !maker_cre_raw)
+            return DEFAULT_WAR_MULTIPLIER;
+        if (caravan_cre_raw->adultsize < ((maker_cre_raw->adultsize * 6) / 7))
+            return DEFAULT_WAR_MULTIPLIER;
+        if (caravan_cre_raw->adultsize > ((maker_cre_raw->adultsize * 8) / 7))
+            return DEFAULT_WAR_MULTIPLIER;
+        break;
+    }
+    case df::item_type::SHIELD:
+    case df::item_type::AMMO:
+    case df::item_type::BACKPACK:
+    case df::item_type::QUIVER:
+        break;
+    default:
+        return DEFAULT_WAR_MULTIPLIER;
+    }
+    return war_alignment;
+}
+
+static const int32_t DEFAULT_AGREEMENT_MULTIPLIER = 128;
+
+static int32_t get_buy_request_multiplier(df::item *item, const df::entity_buy_prices *buy_prices) {
+    if (!buy_prices)
+        return DEFAULT_AGREEMENT_MULTIPLIER;
+
+    int16_t item_type = item->getType();
+    int16_t item_subtype = item->getSubtype();
+    int16_t mat_type = item->getMaterial();
+    int32_t mat_subtype = item->getMaterialIndex();
+
+    for (size_t idx = 0; idx < buy_prices->price.size(); ++idx) {
+        if (buy_prices->items->item_type[idx] != item_type)
+            continue;
+        if (buy_prices->items->item_subtype[idx] != -1 && buy_prices->items->item_subtype[idx] != item_subtype)
+            continue;
+        if (buy_prices->items->mat_types[idx] != -1 && buy_prices->items->mat_types[idx] != mat_type)
+            continue;
+        if (buy_prices->items->mat_indices[idx] != -1 && buy_prices->items->mat_indices[idx] != mat_subtype)
+            continue;
+        return buy_prices->price[idx];
+    }
+    return DEFAULT_AGREEMENT_MULTIPLIER;
+}
+
+template<typename T>
+static int get_price(const std::vector<T> &res, int32_t val, const std::vector<int32_t> &pri) {
+    for (size_t idx = 0; idx < res.size(); ++idx) {
+        if (res[idx] == val && pri.size() > idx)
+            return pri[idx];
+    }
+    return -1;
+}
+
+template<typename T1, typename T2>
+static int get_price(const std::vector<T1> &mat_res, int32_t mat, const std::vector<T2> &gloss_res, int32_t gloss, const std::vector<int32_t> &pri) {
+    for (size_t idx = 0; idx < mat_res.size(); ++idx) {
+        if (mat_res[idx] == mat && (gloss_res[idx] == -1 || gloss_res[idx] == gloss) && pri.size() > idx)
+            return pri[idx];
+    }
+    return -1;
+}
+
+static const uint16_t PLANT_BASE = 419;
+static const uint16_t NUM_PLANT_TYPES = 200;
+
+static int32_t get_sell_request_multiplier(df::item *item, const df::historical_entity::T_resources &resources, const std::vector<int32_t> *prices) {
+    static const df::dfhack_material_category silk_cat(df::dfhack_material_category::mask_silk);
+    static const df::dfhack_material_category yarn_cat(df::dfhack_material_category::mask_yarn);
+    static const df::dfhack_material_category leather_cat(df::dfhack_material_category::mask_leather);
+
+    int16_t item_type = item->getType();
+    int16_t item_subtype = item->getSubtype();
+    int16_t mat_type = item->getMaterial();
+    int32_t mat_subtype = item->getMaterialIndex();
+
+    bool inorganic = mat_type == df::builtin_mats::INORGANIC;
+    bool is_plant = (uint16_t)(mat_type - PLANT_BASE) < NUM_PLANT_TYPES;
+
+    switch (item_type) {
+    case df::item_type::BAR:
+        if (inorganic) {
+            if (int32_t price = get_price(resources.metals, mat_subtype, prices[df::entity_sell_category::MetalBars]); price != -1)
+                return price;
+        }
+        break;
+    case df::item_type::SMALLGEM:
+        if (inorganic) {
+            if (int32_t price = get_price(resources.gems, mat_subtype, prices[df::entity_sell_category::SmallCutGems]); price != -1)
+                return price;
+        }
+        break;
+    case df::item_type::BLOCKS:
+        if (inorganic) {
+            if (int32_t price = get_price(resources.stones, mat_subtype, prices[df::entity_sell_category::StoneBlocks]); price != -1)
+                return price;
+        }
+        break;
+    case df::item_type::ROUGH:
+        if (int32_t price = get_price(resources.misc_mat.glass.mat_type, mat_type, resources.misc_mat.glass.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Glass]); price != -1)
+            return price;
+        break;
+    case df::item_type::BOULDER:
+        if (int32_t price = get_price(resources.stones, mat_subtype, prices[df::entity_sell_category::Stone]); price != -1)
+            return price;
+        if (int32_t price = get_price(resources.misc_mat.clay.mat_type, mat_type, resources.misc_mat.clay.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Clay]); price != -1)
+            return price;
+        break;
+    case df::item_type::WOOD:
+        if (int32_t price = get_price(resources.organic.wood.mat_type, mat_type, resources.organic.wood.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Wood]); price != -1)
+            return price;
+        break;
+    case df::item_type::CHAIN:
+        if (is_plant) {
+            if (int32_t price = get_price(resources.organic.fiber.mat_type, mat_type, resources.organic.fiber.mat_index, mat_subtype,
+                    prices[df::entity_sell_category::RopesPlant]); price != -1)
+                return price;
+        }
+        {
+            MaterialInfo mi;
+            mi.decode(mat_type, mat_subtype);
+            if (mi.isValid()) {
+                if (mi.matches(silk_cat)) {
+                    if (int32_t price = get_price(resources.organic.silk.mat_type, mat_type, resources.organic.silk.mat_index, mat_subtype,
+                            prices[df::entity_sell_category::RopesSilk]); price != -1)
+                        return price;
+                }
+                if (mi.matches(yarn_cat)) {
+                    if (int32_t price = get_price(resources.organic.wool.mat_type, mat_type, resources.organic.wool.mat_index, mat_subtype,
+                            prices[df::entity_sell_category::RopesYarn]); price != -1)
+                        return price;
+                }
+            }
+        }
+        break;
+    case df::item_type::FLASK:
+        if (int32_t price = get_price(resources.misc_mat.flasks.mat_type, mat_type, resources.misc_mat.flasks.mat_index, mat_subtype,
+                prices[df::entity_sell_category::FlasksWaterskins]); price != -1)
+            return price;
+        break;
+    case df::item_type::GOBLET:
+        if (int32_t price = get_price(resources.misc_mat.crafts.mat_type, mat_type, resources.misc_mat.crafts.mat_index, mat_subtype,
+                prices[df::entity_sell_category::CupsMugsGoblets]); price != -1)
+            return price;
+        break;
+    case df::item_type::INSTRUMENT:
+        if (int32_t price = get_price(resources.instrument_type, mat_subtype, prices[df::entity_sell_category::Instruments]); price != -1)
+            return price;
+        break;
+    case df::item_type::TOY:
+        if (int32_t price = get_price(resources.toy_type, mat_subtype, prices[df::entity_sell_category::Toys]); price != -1)
+            return price;
+        break;
+    case df::item_type::CAGE:
+        if (int32_t price = get_price(resources.misc_mat.cages.mat_type, mat_type, resources.misc_mat.cages.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Cages]); price != -1)
+            return price;
+        break;
+    case df::item_type::BARREL:
+        if (int32_t price = get_price(resources.misc_mat.barrels.mat_type, mat_type, resources.misc_mat.barrels.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Barrels]); price != -1)
+            return price;
+        break;
+    case df::item_type::BUCKET:
+        if (int32_t price = get_price(resources.misc_mat.barrels.mat_type, mat_type, resources.misc_mat.barrels.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Buckets]); price != -1)
+            return price;
+        break;
+    case df::item_type::WEAPON:
+        if (int32_t price = get_price(resources.weapon_type, mat_subtype, prices[df::entity_sell_category::Weapons]); price != -1)
+            return price;
+        if (int32_t price = get_price(resources.digger_type, mat_subtype, prices[df::entity_sell_category::DiggingImplements]); price != -1)
+            return price;
+        if (int32_t price = get_price(resources.training_weapon_type, mat_subtype, prices[df::entity_sell_category::TrainingWeapons]); price != -1)
+            return price;
+        break;
+    case df::item_type::ARMOR:
+        if (int32_t price = get_price(resources.armor_type, mat_subtype, prices[df::entity_sell_category::Bodywear]); price != -1)
+            return price;
+        break;
+    case df::item_type::SHOES:
+        if (int32_t price = get_price(resources.shoes_type, mat_subtype, prices[df::entity_sell_category::Footwear]); price != -1)
+            return price;
+        break;
+    case df::item_type::SHIELD:
+        if (int32_t price = get_price(resources.shield_type, mat_subtype, prices[df::entity_sell_category::Shields]); price != -1)
+            return price;
+        break;
+    case df::item_type::HELM:
+        if (int32_t price = get_price(resources.helm_type, mat_subtype, prices[df::entity_sell_category::Headwear]); price != -1)
+            return price;
+        break;
+    case df::item_type::GLOVES:
+        if (int32_t price = get_price(resources.gloves_type, mat_subtype, prices[df::entity_sell_category::Handwear]); price != -1)
+            return price;
+        break;
+    case df::item_type::BAG:
+        {
+            MaterialInfo mi;
+            mi.decode(mat_type, mat_subtype);
+            if (mi.isValid() && mi.matches(leather_cat)) {
+                if (int32_t price = get_price(resources.organic.leather.mat_type, mat_type, resources.organic.leather.mat_index, mat_subtype,
+                        prices[df::entity_sell_category::BagsLeather]); price != -1)
+                    return price;
+            }
+            if (is_plant) {
+                if (int32_t price = get_price(resources.organic.fiber.mat_type, mat_type, resources.organic.fiber.mat_index, mat_subtype,
+                        prices[df::entity_sell_category::BagsPlant]); price != -1)
+                    return price;
+            }
+            if (mi.isValid() && mi.matches(silk_cat)) {
+                if (int32_t price = get_price(resources.organic.silk.mat_type, mat_type, resources.organic.silk.mat_index, mat_subtype,
+                        prices[df::entity_sell_category::BagsSilk]); price != -1)
+                    return price;
+            }
+            if (mi.isValid() && mi.matches(yarn_cat)) {
+                if (int32_t price = get_price(resources.organic.wool.mat_type, mat_type, resources.organic.wool.mat_index, mat_subtype,
+                        prices[df::entity_sell_category::BagsYarn]); price != -1)
+                    return price;
+            }
+        }
+        break;
+    case df::item_type::FIGURINE:
+    case df::item_type::AMULET:
+    case df::item_type::SCEPTER:
+    case df::item_type::CROWN:
+    case df::item_type::RING:
+    case df::item_type::EARRING:
+    case df::item_type::BRACELET:
+    case df::item_type::TOTEM:
+    case df::item_type::BOOK:
+        if (int32_t price = get_price(resources.misc_mat.crafts.mat_type, mat_type, resources.misc_mat.crafts.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Crafts]); price != -1)
+            return price;
+        break;
+    case df::item_type::AMMO:
+        if (int32_t price = get_price(resources.ammo_type, mat_subtype, prices[df::entity_sell_category::Ammo]); price != -1)
+            return price;
+        break;
+    case df::item_type::GEM:
+        if (inorganic) {
+            if (int32_t price = get_price(resources.gems, mat_subtype, prices[df::entity_sell_category::LargeCutGems]); price != -1)
+                return price;
+        }
+        break;
+    case df::item_type::ANVIL:
+        if (int32_t price = get_price(resources.metal.anvil.mat_type, mat_type, resources.metal.anvil.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Anvils]); price != -1)
+            return price;
+        break;
+    case df::item_type::MEAT:
+        if (int32_t price = get_price(resources.misc_mat.meat.mat_type, mat_type, resources.misc_mat.meat.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Meat]); price != -1)
+            return price;
+        break;
+    case df::item_type::FISH:
+    case df::item_type::FISH_RAW:
+        if (int32_t price = get_price(resources.fish_races, mat_type, resources.fish_castes, mat_subtype,
+                prices[df::entity_sell_category::Fish]); price != -1)
+            return price;
+        break;
+    case df::item_type::VERMIN:
+    case df::item_type::PET:
+        if (int32_t price = get_price(resources.animals.pet_races, mat_type, resources.animals.pet_castes, mat_subtype,
+                prices[df::entity_sell_category::Pets]); price != -1)
+            return price;
+        break;
+    case df::item_type::SEEDS:
+        if (int32_t price = get_price(resources.seeds.mat_type, mat_type, resources.seeds.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Seeds]); price != -1)
+            return price;
+        break;
+    case df::item_type::PLANT:
+        if (int32_t price = get_price(resources.plants.mat_type, mat_type, resources.plants.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Plants]); price != -1)
+            return price;
+        break;
+    case df::item_type::SKIN_TANNED:
+        if (int32_t price = get_price(resources.organic.leather.mat_type, mat_type, resources.organic.leather.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Leather]); price != -1)
+            return price;
+        break;
+    case df::item_type::PLANT_GROWTH:
+        if (is_plant) {
+            if (int32_t price = get_price(resources.tree_fruit_plants, mat_type, resources.tree_fruit_growths, mat_subtype,
+                    prices[df::entity_sell_category::FruitsNuts]); price != -1)
+                return price;
+            if (int32_t price = get_price(resources.shrub_fruit_plants, mat_type, resources.shrub_fruit_growths, mat_subtype,
+                    prices[df::entity_sell_category::GardenVegetables]); price != -1)
+                return price;
+        }
+        break;
+    case df::item_type::THREAD:
+        if (is_plant) {
+            if (int32_t price = get_price(resources.organic.fiber.mat_type, mat_type, resources.organic.fiber.mat_index, mat_subtype,
+                    prices[df::entity_sell_category::ThreadPlant]); price != -1)
+                return price;
+        }
+        {
+            MaterialInfo mi;
+            mi.decode(mat_type, mat_subtype);
+            if (mi.isValid() && mi.matches(silk_cat)) {
+                if (int32_t price = get_price(resources.organic.silk.mat_type, mat_type, resources.organic.silk.mat_index, mat_subtype,
+                        prices[df::entity_sell_category::ThreadSilk]); price != -1)
+                    return price;
+            }
+            if (mi.isValid() && mi.matches(yarn_cat)) {
+                if (int32_t price = get_price(resources.organic.wool.mat_type, mat_type, resources.organic.wool.mat_index, mat_subtype,
+                        prices[df::entity_sell_category::ThreadYarn]); price != -1)
+                    return price;
+            }
+        }
+        break;
+    case df::item_type::CLOTH:
+        if (is_plant) {
+            if (int32_t price = get_price(resources.organic.fiber.mat_type, mat_type, resources.organic.fiber.mat_index, mat_subtype,
+                    prices[df::entity_sell_category::ClothPlant]); price != -1)
+                return price;
+        }
+        {
+            MaterialInfo mi;
+            mi.decode(mat_type, mat_subtype);
+            if (mi.isValid() && mi.matches(silk_cat)) {
+                if (int32_t price = get_price(resources.organic.silk.mat_type, mat_type, resources.organic.silk.mat_index, mat_subtype,
+                        prices[df::entity_sell_category::ClothSilk]); price != -1)
+                    return price;
+            }
+            if (mi.isValid() && mi.matches(yarn_cat)) {
+                if (int32_t price = get_price(resources.organic.wool.mat_type, mat_type, resources.organic.wool.mat_index, mat_subtype,
+                        prices[df::entity_sell_category::ClothYarn]); price != -1)
+                    return price;
+            }
+        }
+        break;
+    case df::item_type::PANTS:
+        if (int32_t price = get_price(resources.pants_type, mat_subtype, prices[df::entity_sell_category::Legwear]); price != -1)
+            return price;
+        break;
+    case df::item_type::BACKPACK:
+        if (int32_t price = get_price(resources.misc_mat.backpacks.mat_type, mat_type, resources.misc_mat.backpacks.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Backpacks]); price != -1)
+            return price;
+        break;
+    case df::item_type::QUIVER:
+        if (int32_t price = get_price(resources.misc_mat.quivers.mat_type, mat_type, resources.misc_mat.quivers.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Quivers]); price != -1)
+            return price;
+        break;
+    case df::item_type::TRAPCOMP:
+        if (int32_t price = get_price(resources.trapcomp_type, mat_subtype, prices[df::entity_sell_category::TrapComponents]); price != -1)
+            return price;
+        break;
+    case df::item_type::DRINK:
+        if (int32_t price = get_price(resources.misc_mat.booze.mat_type, mat_type, resources.misc_mat.booze.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Drinks]); price != -1)
+            return price;
+        break;
+    case df::item_type::POWDER_MISC:
+        if (int32_t price = get_price(resources.misc_mat.powders.mat_type, mat_type, resources.misc_mat.powders.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Powders]); price != -1)
+            return price;
+        if (int32_t price = get_price(resources.misc_mat.sand.mat_type, mat_type, resources.misc_mat.sand.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Sand]); price != -1)
+            return price;
+        break;
+    case df::item_type::CHEESE:
+        if (int32_t price = get_price(resources.misc_mat.cheese.mat_type, mat_type, resources.misc_mat.cheese.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Cheese]); price != -1)
+            return price;
+        break;
+    case df::item_type::LIQUID_MISC:
+        if (int32_t price = get_price(resources.misc_mat.extracts.mat_type, mat_type, resources.misc_mat.extracts.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Extracts]); price != -1)
+            return price;
+        break;
+    case df::item_type::SPLINT:
+        if (int32_t price = get_price(resources.misc_mat.barrels.mat_type, mat_type, resources.misc_mat.barrels.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Splints]); price != -1)
+            return price;
+        break;
+    case df::item_type::CRUTCH:
+        if (int32_t price = get_price(resources.misc_mat.barrels.mat_type, mat_type, resources.misc_mat.barrels.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Crutches]); price != -1)
+            return price;
+        break;
+    case df::item_type::TOOL:
+        if (int32_t price = get_price(resources.tool_type, mat_subtype, prices[df::entity_sell_category::Tools]); price != -1)
+            return price;
+        break;
+    case df::item_type::EGG:
+        if (int32_t price = get_price(resources.egg_races, mat_type, resources.egg_castes, mat_subtype,
+                prices[df::entity_sell_category::Eggs]); price != -1)
+            return price;
+        break;
+    case df::item_type::SHEET:
+        if (int32_t price = get_price(resources.organic.parchment.mat_type, mat_type, resources.organic.parchment.mat_index, mat_subtype,
+                prices[df::entity_sell_category::Parchment]); price != -1)
+            return price;
+        break;
+    default:
+        break;
+    }
+
+    for (size_t idx = 0; idx < resources.wood_products.item_type.size(); ++idx) {
+        if (resources.wood_products.item_type[idx] == item_type &&
+                (resources.wood_products.item_subtype[idx] == -1 || resources.wood_products.item_subtype[idx] == item_subtype) &&
+                resources.wood_products.material.mat_type[idx] == mat_type &&
+                (resources.wood_products.material.mat_index[idx] == -1 || resources.wood_products.material.mat_index[idx] == mat_subtype) &&
+                prices[df::entity_sell_category::Miscellaneous].size() > idx)
+            return prices[df::entity_sell_category::Miscellaneous][idx];
+    }
+
+    return DEFAULT_AGREEMENT_MULTIPLIER;
+}
+
+static int32_t get_sell_request_multiplier(df::item *item, const df::caravan_state *caravan) {
+    const df::entity_sell_prices *sell_prices = caravan->sell_prices;
+    if (!sell_prices)
+        return DEFAULT_AGREEMENT_MULTIPLIER;
+
+    auto caravan_he = df::historical_entity::find(caravan->entity);
+    if (!caravan_he)
+        return DEFAULT_AGREEMENT_MULTIPLIER;
+
+    return get_sell_request_multiplier(item, caravan_he->resources, &sell_prices->price[0]);
+}
+
+static int32_t get_sell_request_multiplier(df::unit *unit, const df::caravan_state *caravan) {
+    const df::entity_sell_prices *sell_prices = caravan->sell_prices;
+    if (!sell_prices)
+        return DEFAULT_AGREEMENT_MULTIPLIER;
+
+    auto caravan_he = df::historical_entity::find(caravan->entity);
+    if (!caravan_he)
+        return DEFAULT_AGREEMENT_MULTIPLIER;
+
+    auto & resources = caravan_he->resources;
+    int32_t price = get_price(resources.animals.pet_races, unit->race, resources.animals.pet_castes, unit->caste,
+                              sell_prices->price[df::entity_sell_category::Pets]);
+    return (price != -1) ? price : DEFAULT_AGREEMENT_MULTIPLIER;
+}
+
+static bool is_requested_trade_good(df::item *item, df::caravan_state *caravan) {
+    auto trade_state = caravan->trade_state;
+    if (caravan->time_remaining <= 0 ||
+            (trade_state != df::caravan_state::T_trade_state::Approaching &&
+                trade_state != df::caravan_state::T_trade_state::AtDepot))
+        return false;
+    return get_buy_request_multiplier(item, caravan->buy_prices) > DEFAULT_AGREEMENT_MULTIPLIER;
+}
+
+bool Items::isRequestedTradeGood(df::item *item, df::caravan_state *caravan) {
+    if (caravan)
+        return is_requested_trade_good(item, caravan);
+
+    for (auto caravan : df::global::plotinfo->caravans) {
+        auto trade_state = caravan->trade_state;
+        if (caravan->time_remaining <= 0 ||
+                (trade_state != df::caravan_state::T_trade_state::Approaching &&
+                 trade_state != df::caravan_state::T_trade_state::AtDepot))
+            continue;
+        if (get_buy_request_multiplier(item, caravan->buy_prices) > DEFAULT_AGREEMENT_MULTIPLIER)
+            return true;
+    }
+    return false;
+}
+
+int Items::getValue(df::item *item, df::caravan_state *caravan)
 {
     CHECK_NULL_POINTER(item);
 
@@ -1438,16 +1963,38 @@ int Items::getValue(df::item *item)
     // Get base value for item type, subtype, and material
     int value = getItemBaseValue(item_type, item_subtype, mat_type, mat_subtype);
 
-    // Ignore entity value modifications
+    // entity value modifications
+    value *= get_war_multiplier(item, caravan);
+    value >>= 8;
 
     // Improve value based on quality
-    int quality = item->getQuality();
-    value *= (quality + 1);
-    if (quality == 5)
+    switch (item->getQuality()) {
+    case 1:
+        value *= 1.1;
+        value += 3;
+        break;
+    case 2:
+        value *= 1.2;
+        value += 6;
+        break;
+    case 3:
+        value *= 1.333;
+        value += 10;
+        break;
+    case 4:
+        value *= 1.5;
+        value += 15;
+        break;
+    case 5:
         value *= 2;
+        value += 30;
+        break;
+    default:
+        break;
+    }
 
     // Add improvement values
-    int impValue = item->getThreadDyeValue(NULL) + item->getImprovementsValue(NULL);
+    int impValue = item->getThreadDyeValue(caravan) + item->getImprovementsValue(caravan);
     if (item_type == item_type::AMMO) // Ammo improvements are worth less
         impValue /= 30;
     value += impValue;
@@ -1472,12 +2019,20 @@ int Items::getValue(df::item *item)
     if (item->flags.bits.artifact_mood)
         value *= 10;
 
+    // modify buy/sell prices
+    if (caravan) {
+        value *= get_buy_request_multiplier(item, caravan->buy_prices);
+        value >>= 7;
+        value *= get_sell_request_multiplier(item, caravan);
+        value >>= 7;
+    }
+
     // Boost value from stack size
     value *= item->getStackSize();
     // ...but not for coins
     if (item_type == item_type::COIN)
     {
-        value /= 500;
+        value /= 50;
         if (!value)
             value = 1;
     }
@@ -1487,11 +2042,39 @@ int Items::getValue(df::item *item)
     {
         int divisor = 1;
         auto creature = vector_get(world->raws.creatures.all, mat_type);
-        if (creature && size_t(mat_subtype) < creature->caste.size())
-            divisor = creature->caste[mat_subtype]->misc.petvalue_divisor;
-        if (divisor > 1)
+        if (creature) {
+            size_t caste = std::max(0, mat_subtype);
+            if (caste < creature->caste.size())
+                divisor = creature->caste[caste]->misc.petvalue_divisor;
+        }
+        if (divisor > 1) {
             value /= divisor;
+            if (!value)
+                value = 1;
+        }
     }
+
+    // Add in value from units contained in cages
+    if (item_type == item_type::CAGE) {
+        for (auto gref : item->general_refs) {
+            if (gref->getType() != df::general_ref_type::CONTAINS_UNIT)
+                continue;
+            auto unit = gref->getUnit();
+            if (!unit)
+                continue;
+            df::creature_raw *raw = world->raws.creatures.all[unit->race];
+            df::caste_raw *caste = raw->caste.at(unit->caste);
+            int unit_value = caste->misc.petvalue;
+            if (Units::isWar(unit) || Units::isHunter(unit))
+                unit_value *= 2;
+            if (caravan) {
+                unit_value *= get_sell_request_multiplier(unit, caravan);
+                unit_value >>= 7;
+            }
+            value += unit_value;
+        }
+    }
+
     return value;
 }
 
@@ -1534,7 +2117,7 @@ int32_t Items::createItem(df::item_type item_type, int16_t item_subtype, int16_t
     df::enums::game_type::game_type type = *df::global::gametype;
     prod->produce(unit, &out_products, &out_items, &in_reag, &in_items, 1, job_skill::NONE,
             0, df::historical_entity::find(unit->civ_id),
-            ((type == df::enums::game_type::DWARF_MAIN) || (type == df::enums::game_type::DWARF_RECLAIM)) ? df::world_site::find(df::global::ui->site_id) : NULL,
+            ((type == df::enums::game_type::DWARF_MAIN) || (type == df::enums::game_type::DWARF_RECLAIM)) ? df::world_site::find(df::global::plotinfo->site_id) : NULL,
             NULL);
     if ( out_items.size() != 1 )
         return -1;
@@ -1630,6 +2213,63 @@ bool Items::canTradeWithContents(df::item *item)
     return true;
 }
 
+bool Items::canTradeAnyWithContents(df::item *item)
+{
+    CHECK_NULL_POINTER(item);
+
+    if (item->flags.bits.in_inventory)
+        return false;
+
+    vector<df::item*> contained_items;
+    getContainedItems(item, &contained_items);
+
+    if (contained_items.empty())
+        return canTrade(item);
+
+    for (df::item *cit : contained_items) {
+        if (canTrade(cit))
+            return true;
+    }
+
+    return false;
+}
+
+bool Items::markForTrade(df::item *item, df::building_tradedepotst *depot) {
+    CHECK_NULL_POINTER(item);
+    CHECK_NULL_POINTER(depot);
+
+    // validate that the depot is in a good state
+    if (depot->getBuildStage() < depot->getMaxBuildStage())
+        return false;
+    if (depot->jobs.size() && depot->jobs[0]->job_type == df::job_type::DestroyBuilding)
+        return false;
+
+    auto href = df::allocate<df::general_ref_building_holderst>();
+    if (!href)
+        return false;
+
+    auto job = new df::job();
+    job->job_type = df::job_type::BringItemToDepot;
+    job->pos = df::coord(depot->centerx, depot->centery, depot->z);
+
+    // job <-> item link
+    if (!Job::attachJobItem(job, item, df::job_item_ref::Hauled)) {
+        delete job;
+        delete href;
+        return false;
+    }
+
+    // job <-> building link
+    href->building_id = depot->id;
+    depot->jobs.push_back(job);
+    job->general_refs.push_back(href);
+
+    // add to job list
+    Job::linkIntoWorld(job);
+
+    return true;
+}
+
 bool Items::isRouteVehicle(df::item *item)
 {
     CHECK_NULL_POINTER(item);
@@ -1643,9 +2283,51 @@ bool Items::isRouteVehicle(df::item *item)
 bool Items::isSquadEquipment(df::item *item)
 {
     CHECK_NULL_POINTER(item);
-    if (!ui)
+    if (!plotinfo)
         return false;
 
-    auto &vec = ui->equipment.items_assigned[item->getType()];
-    return binsearch_index(vec, &df::item::id, item->id) >= 0;
+    auto &vec = plotinfo->equipment.items_assigned[item->getType()];
+    return binsearch_index(vec, item->id) >= 0;
+}
+
+// reverse engineered, code reference: 0x140953150 in 50.11-win64-steam
+// our name for this function: itemst::getCapacity
+// bay12 name for this function: not known
+
+int32_t Items::getCapacity(df::item* item)
+{
+    CHECK_NULL_POINTER(item);
+
+    switch (item->getType()) {
+    case df::enums::item_type::FLASK:
+    case df::enums::item_type::GOBLET:
+        return 180;
+    case df::enums::item_type::CAGE:
+    case df::enums::item_type::BARREL:
+    case df::enums::item_type::COFFIN:
+    case df::enums::item_type::BOX:
+    case df::enums::item_type::BAG:
+    case df::enums::item_type::BIN:
+    case df::enums::item_type::ARMORSTAND:
+    case df::enums::item_type::WEAPONRACK:
+    case df::enums::item_type::CABINET:
+        return 6000;
+    case df::enums::item_type::BUCKET:
+        return 600;
+    case df::enums::item_type::ANIMALTRAP:
+    case df::enums::item_type::BACKPACK:
+        return 3000;
+    case df::enums::item_type::QUIVER:
+        return 1200;
+    case df::enums::item_type::TOOL:
+        {
+            auto tool = virtual_cast<df::item_toolst>(item);
+            if (tool)
+                return tool->subtype->container_capacity;
+        }
+        // fall through
+    default:
+        ; // fall through to default exit
+    }
+    return 0;
 }
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
index ff158caa0..87301fef2 100644
--- a/library/modules/Job.cpp
+++ b/library/modules/Job.cpp
@@ -43,7 +43,7 @@ using namespace std;
 
 #include "DataDefs.h"
 #include "df/world.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/building.h"
 #include "df/job.h"
@@ -387,7 +387,14 @@ bool DFHack::Job::removeJob(df::job* job) {
     // call the job cancel vmethod graciously provided by The Toady One.
     // job_handler::cancel_job calls job::~job, and then deletes job (this has
     // been confirmed by disassembly).
-    world->jobs.cancel_job(job);
+
+    // HACK: GCC (starting around GCC 10 targeting C++20 as of v50.09) optimizes
+    // out the vmethod call here regardless of optimization level, so we need to
+    // invoke the vmethod manually through a pointer, as the Lua wrapper does.
+    // `volatile` does not seem to be necessary but is included for good
+    // measure.
+    volatile auto cancel_job_method = &df::job_handler::cancel_job;
+    (world->jobs.*cancel_job_method)(job);
 
     return true;
 }
@@ -560,7 +567,7 @@ bool DFHack::Job::attachJobItem(df::job *job, df::item *item,
     return true;
 }
 
-bool Job::isSuitableItem(df::job_item *item, df::item_type itype, int isubtype)
+bool Job::isSuitableItem(const df::job_item *item, df::item_type itype, int isubtype)
 {
     CHECK_NULL_POINTER(item);
 
@@ -574,7 +581,7 @@ bool Job::isSuitableItem(df::job_item *item, df::item_type itype, int isubtype)
 }
 
 bool Job::isSuitableMaterial(
-    df::job_item *item, int mat_type, int mat_index, df::item_type itype)
+    const df::job_item *item, int mat_type, int mat_index, df::item_type itype)
 {
     CHECK_NULL_POINTER(item);
 
@@ -593,17 +600,17 @@ std::string Job::getName(df::job *job)
 
     std::string desc;
     auto button = df::allocate<df::interface_button_building_new_jobst>();
-    button->reaction_name = job->reaction_name;
-    button->hist_figure_id = job->hist_figure_id;
-    button->job_type = job->job_type;
-    button->item_type = job->item_type;
-    button->item_subtype = job->item_subtype;
-    button->mat_type = job->mat_type;
-    button->mat_index = job->mat_index;
-    button->item_category = job->item_category;
-    button->material_category = job->material_category;
-
-    button->getLabel(&desc);
+    button->mstring = job->reaction_name;
+    button->spec_id = job->hist_figure_id;
+    button->jobtype = job->job_type;
+    button->itemtype = job->item_type;
+    button->subtype = job->item_subtype;
+    button->material = job->mat_type;
+    button->matgloss = job->mat_index;
+    button->specflag = job->item_category;
+    button->job_item_flag = job->material_category;
+
+    button->text(&desc);
     delete button;
 
     return desc;
diff --git a/library/modules/Kitchen.cpp b/library/modules/Kitchen.cpp
index ac560c687..7fed01b50 100644
--- a/library/modules/Kitchen.cpp
+++ b/library/modules/Kitchen.cpp
@@ -20,19 +20,13 @@ using namespace DFHack;
 
 #include "DataDefs.h"
 #include "df/world.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/item_type.h"
 #include "df/plant_raw.h"
 
 using namespace df::enums;
 using df::global::world;
-using df::global::ui;
-
-// Special values used by "seedwatch" plugin to store seed limits
-const df::enums::item_type::item_type SEEDLIMIT_ITEMTYPE = df::enums::item_type::BAR;
-const int16_t SEEDLIMIT_ITEMSUBTYPE = 0;
-const int16_t SEEDLIMIT_MAX = 400; // Maximum permitted seed limit
-const df::kitchen_exc_type SEEDLIMIT_EXCTYPE = df::kitchen_exc_type(4);
+using df::global::plotinfo;
 
 void Kitchen::debug_print(color_ostream &out)
 {
@@ -41,12 +35,12 @@ void Kitchen::debug_print(color_ostream &out)
     {
         out.print("%2zu: IT:%2i IS:%i MT:%3i MI:%2i ET:%i %s\n",
                        i,
-                       ui->kitchen.item_types[i],
-                       ui->kitchen.item_subtypes[i],
-                       ui->kitchen.mat_types[i],
-                       ui->kitchen.mat_indices[i],
-                       ui->kitchen.exc_types[i],
-                       (ui->kitchen.mat_types[i] >= 419 && ui->kitchen.mat_types[i] <= 618) ? world->raws.plants.all[ui->kitchen.mat_indices[i]]->id.c_str() : "n/a"
+                       plotinfo->kitchen.item_types[i],
+                       plotinfo->kitchen.item_subtypes[i],
+                       plotinfo->kitchen.mat_types[i],
+                       plotinfo->kitchen.mat_indices[i],
+                       plotinfo->kitchen.exc_types[i],
+                       (plotinfo->kitchen.mat_types[i] >= 419 && plotinfo->kitchen.mat_types[i] <= 618) ? world->raws.plants.all[plotinfo->kitchen.mat_indices[i]]->id.c_str() : "n/a"
         );
     }
     out.print("\n");
@@ -54,6 +48,9 @@ void Kitchen::debug_print(color_ostream &out)
 
 void Kitchen::allowPlantSeedCookery(int32_t plant_id)
 {
+    if (plant_id < 0 || (size_t)plant_id >= world->raws.plants.all.size())
+        return;
+
     df::plant_raw *type = world->raws.plants.all[plant_id];
 
     removeExclusion(df::kitchen_exc_type::Cook, item_type::SEEDS, -1,
@@ -67,6 +64,9 @@ void Kitchen::allowPlantSeedCookery(int32_t plant_id)
 
 void Kitchen::denyPlantSeedCookery(int32_t plant_id)
 {
+    if (plant_id < 0 || (size_t)plant_id >= world->raws.plants.all.size())
+        return;
+
     df::plant_raw *type = world->raws.plants.all[plant_id];
 
     addExclusion(df::kitchen_exc_type::Cook, item_type::SEEDS, -1,
@@ -78,87 +78,29 @@ void Kitchen::denyPlantSeedCookery(int32_t plant_id)
         type->material_defs.idx[plant_material_def::basic_mat]);
 }
 
-void Kitchen::fillWatchMap(std::map<int32_t, int16_t>& watchMap)
-{
-    watchMap.clear();
-    for (std::size_t i = 0; i < size(); ++i)
-    {
-        if (ui->kitchen.item_subtypes[i] == SEEDLIMIT_ITEMTYPE &&
-            ui->kitchen.item_subtypes[i] == SEEDLIMIT_ITEMSUBTYPE &&
-            ui->kitchen.exc_types[i] == SEEDLIMIT_EXCTYPE)
-        {
-            watchMap[ui->kitchen.mat_indices[i]] = ui->kitchen.mat_types[i];
-        }
-    }
-}
-
-int Kitchen::findLimit(int32_t plant_id)
-{
-    for (size_t i = 0; i < size(); ++i)
-    {
-        if (ui->kitchen.item_types[i] == SEEDLIMIT_ITEMTYPE &&
-            ui->kitchen.item_subtypes[i] == SEEDLIMIT_ITEMSUBTYPE &&
-            ui->kitchen.mat_indices[i] == plant_id &&
-            ui->kitchen.exc_types[i] == SEEDLIMIT_EXCTYPE)
-        {
-            return int(i);
-        }
-    }
-    return -1;
-}
-
-bool Kitchen::removeLimit(int32_t plant_id)
-{
-    int i = findLimit(plant_id);
-    if (i < 0)
+bool Kitchen::isPlantCookeryAllowed(int32_t plant_id) {
+    if (plant_id < 0 || (size_t)plant_id >= world->raws.plants.all.size())
         return false;
 
-    ui->kitchen.item_types.erase(ui->kitchen.item_types.begin() + i);
-    ui->kitchen.item_subtypes.erase(ui->kitchen.item_subtypes.begin() + i);
-    ui->kitchen.mat_types.erase(ui->kitchen.mat_types.begin() + i);
-    ui->kitchen.mat_indices.erase(ui->kitchen.mat_indices.begin() + i);
-    ui->kitchen.exc_types.erase(ui->kitchen.exc_types.begin() + i);
-    return true;
+    df::plant_raw *type = world->raws.plants.all[plant_id];
+    return findExclusion(df::kitchen_exc_type::Cook, item_type::PLANT, -1,
+            type->material_defs.type[plant_material_def::basic_mat],
+            type->material_defs.idx[plant_material_def::basic_mat]) < 0;
 }
 
-bool Kitchen::setLimit(int32_t plant_id, int16_t limit)
-{
-    if (limit > SEEDLIMIT_MAX)
-        limit = SEEDLIMIT_MAX;
-
-    int i = findLimit(plant_id);
-    if (i < 0)
-    {
-        ui->kitchen.item_types.push_back(SEEDLIMIT_ITEMTYPE);
-        ui->kitchen.item_subtypes.push_back(SEEDLIMIT_ITEMSUBTYPE);
-        ui->kitchen.mat_types.push_back(limit);
-        ui->kitchen.mat_indices.push_back(plant_id);
-        ui->kitchen.exc_types.push_back(SEEDLIMIT_EXCTYPE);
-    }
-    else
-    {
-        ui->kitchen.mat_types[i] = limit;
-    }
-    return true;
-}
+bool Kitchen::isSeedCookeryAllowed(int32_t plant_id) {
+    if (plant_id < 0 || (size_t)plant_id >= world->raws.plants.all.size())
+        return false;
 
-void Kitchen::clearLimits()
-{
-    for (size_t i = 0; i < size(); ++i)
-    {
-        if (ui->kitchen.item_types[i] == SEEDLIMIT_ITEMTYPE &&
-            ui->kitchen.item_subtypes[i] == SEEDLIMIT_ITEMSUBTYPE &&
-            ui->kitchen.exc_types[i] == SEEDLIMIT_EXCTYPE)
-        {
-            removeLimit(ui->kitchen.mat_indices[i]);
-            --i;
-        }
-    }
+    df::plant_raw *type = world->raws.plants.all[plant_id];
+    return findExclusion(df::kitchen_exc_type::Cook, item_type::SEEDS, -1,
+                type->material_defs.type[plant_material_def::seed],
+                type->material_defs.idx[plant_material_def::seed]) < 0;
 }
 
 size_t Kitchen::size()
 {
-    return ui->kitchen.item_types.size();
+    return plotinfo->kitchen.item_types.size();
 }
 
 int Kitchen::findExclusion(df::kitchen_exc_type type,
@@ -167,11 +109,11 @@ int Kitchen::findExclusion(df::kitchen_exc_type type,
 {
     for (size_t i = 0; i < size(); i++)
     {
-        if (ui->kitchen.item_types[i] == item_type &&
-            ui->kitchen.item_subtypes[i] == item_subtype &&
-            ui->kitchen.mat_types[i] == mat_type &&
-            ui->kitchen.mat_indices[i] == mat_index &&
-            ui->kitchen.exc_types[i] == type)
+        if (plotinfo->kitchen.item_types[i] == item_type &&
+            plotinfo->kitchen.item_subtypes[i] == item_subtype &&
+            plotinfo->kitchen.mat_types[i] == mat_type &&
+            plotinfo->kitchen.mat_indices[i] == mat_index &&
+            plotinfo->kitchen.exc_types[i] == type)
         {
             return int(i);
         }
@@ -186,11 +128,11 @@ bool Kitchen::addExclusion(df::kitchen_exc_type type,
     if (findExclusion(type, item_type, item_subtype, mat_type, mat_index) >= 0)
         return false;
 
-    ui->kitchen.item_types.push_back(item_type);
-    ui->kitchen.item_subtypes.push_back(item_subtype);
-    ui->kitchen.mat_types.push_back(mat_type);
-    ui->kitchen.mat_indices.push_back(mat_index);
-    ui->kitchen.exc_types.push_back(type);
+    plotinfo->kitchen.item_types.push_back(item_type);
+    plotinfo->kitchen.item_subtypes.push_back(item_subtype);
+    plotinfo->kitchen.mat_types.push_back(mat_type);
+    plotinfo->kitchen.mat_indices.push_back(mat_index);
+    plotinfo->kitchen.exc_types.push_back(type);
     return true;
 }
 
@@ -202,10 +144,10 @@ bool Kitchen::removeExclusion(df::kitchen_exc_type type,
     if (i < 0)
         return false;
 
-    ui->kitchen.item_types.erase(ui->kitchen.item_types.begin() + i);
-    ui->kitchen.item_subtypes.erase(ui->kitchen.item_subtypes.begin() + i);
-    ui->kitchen.mat_types.erase(ui->kitchen.mat_types.begin() + i);
-    ui->kitchen.mat_indices.erase(ui->kitchen.mat_indices.begin() + i);
-    ui->kitchen.exc_types.erase(ui->kitchen.exc_types.begin() + i);
+    plotinfo->kitchen.item_types.erase(plotinfo->kitchen.item_types.begin() + i);
+    plotinfo->kitchen.item_subtypes.erase(plotinfo->kitchen.item_subtypes.begin() + i);
+    plotinfo->kitchen.mat_types.erase(plotinfo->kitchen.mat_types.begin() + i);
+    plotinfo->kitchen.mat_indices.erase(plotinfo->kitchen.mat_indices.begin() + i);
+    plotinfo->kitchen.exc_types.erase(plotinfo->kitchen.exc_types.begin() + i);
     return true;
 }
diff --git a/library/modules/MapCache.cpp b/library/modules/MapCache.cpp
index b88a078b1..c329220c9 100644
--- a/library/modules/MapCache.cpp
+++ b/library/modules/MapCache.cpp
@@ -60,6 +60,7 @@ using namespace std;
 #include "df/flow_info.h"
 #include "df/job.h"
 #include "df/plant.h"
+#include "df/plant_root_tile.h"
 #include "df/plant_tree_info.h"
 #include "df/plant_tree_tile.h"
 #include "df/region_map_entry.h"
@@ -805,14 +806,16 @@ void MapExtras::BlockInfo::prepare(Block *mblock)
             // If the block is at or above the plant's base level, we use the body array
             // otherwise we use the roots.
             // TODO: verify that the tree bounds intersect the block.
-            df::plant_tree_tile tile;
+            bool has_tree_tile = false;
             int z_diff = block->map_pos.z - pp->pos.z;
-            if (z_diff >= 0)
-                tile = info->body[z_diff][xx + (yy*info->dim_x)];
-            else
-                tile = info->roots[-1 - z_diff][xx + (yy*info->dim_x)];
-            if (tile.whole && !(tile.bits.blocked))
-            {
+            if (z_diff >= 0) {
+                df::plant_tree_tile tile = info->body[z_diff][xx + (yy * info->dim_x)];
+                has_tree_tile = tile.whole && !(tile.bits.blocked);
+            } else {
+                df::plant_root_tile tile = info->roots[-1 - z_diff][xx + (yy * info->dim_x)];
+                has_tree_tile = tile.whole && !(tile.bits.blocked);
+            }
+            if (has_tree_tile) {
                 df::coord pos = pp->pos;
                 pos.x = pos.x - (info->dim_x / 2) + xx;
                 pos.y = pos.y - (info->dim_y / 2) + yy;
diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp
index e046faa0e..a05474fa5 100644
--- a/library/modules/Maps.cpp
+++ b/library/modules/Maps.cpp
@@ -57,6 +57,7 @@ using namespace std;
 #include "df/flow_info.h"
 #include "df/map_block_column.h"
 #include "df/plant.h"
+#include "df/plant_root_tile.h"
 #include "df/plant_tree_info.h"
 #include "df/plant_tree_tile.h"
 #include "df/region_map_entry.h"
@@ -621,16 +622,15 @@ bool Maps::ReadGeology(vector<vector<int16_t> > *layer_mats, vector<df::coord2d>
     return true;
 }
 
+uint16_t Maps::getWalkableGroup(df::coord pos) {
+    auto block = getTileBlock(pos);
+    return block ? index_tile(block->walkable, pos) : 0;
+}
+
 bool Maps::canWalkBetween(df::coord pos1, df::coord pos2)
 {
-    auto block1 = getTileBlock(pos1);
-    auto block2 = getTileBlock(pos2);
-
-    if (!block1 || !block2)
-        return false;
-
-    auto tile1 = index_tile(block1->walkable, pos1);
-    auto tile2 = index_tile(block2->walkable, pos2);
+    auto tile1 = getWalkableGroup(pos1);
+    auto tile2 = getWalkableGroup(pos2);
 
     return tile1 && tile1 == tile2;
 }
@@ -987,7 +987,7 @@ Return the biome type, given a position coordinate expressed in world_tiles
 The world ref coordinates are used for tropicality determination and may refer
 to a tile neighboring the "official" one.
 *****************************************************************************/
-df::enums::biome_type::biome_type Maps::GetBiomeTypeWithRef(int world_coord_x,
+df::enums::biome_type::biome_type Maps::getBiomeTypeWithRef(int world_coord_x,
     int world_coord_y,
     int world_ref_coord_y
 )
@@ -1186,7 +1186,7 @@ df::enums::biome_type::biome_type Maps::GetBiomeTypeWithRef(int world_coord_x,
 Module main function.
 Return the biome type, given a position coordinate expressed in world_tiles
 *****************************************************************************/
-df::enums::biome_type::biome_type Maps::GetBiomeType(int world_coord_x, int world_coord_y)
+df::enums::biome_type::biome_type Maps::getBiomeType(int world_coord_x, int world_coord_y)
 {
-    return Maps::GetBiomeTypeWithRef(world_coord_x, world_coord_y, world_coord_y);
+    return Maps::getBiomeTypeWithRef(world_coord_x, world_coord_y, world_coord_y);
 }
diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp
index a52579059..1c2d736da 100644
--- a/library/modules/Materials.cpp
+++ b/library/modules/Materials.cpp
@@ -42,7 +42,7 @@ using namespace std;
 #include "MiscUtils.h"
 
 #include "df/world.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/item.h"
 #include "df/creature_raw.h"
 #include "df/caste_raw.h"
@@ -68,7 +68,7 @@ using namespace DFHack;
 using namespace df::enums;
 
 using df::global::world;
-using df::global::ui;
+using df::global::plotinfo;
 
 bool MaterialInfo::decode(df::item *item)
 {
@@ -376,7 +376,7 @@ df::craft_material_class MaterialInfo::getCraftClass()
     return craft_material_class::None;
 }
 
-bool MaterialInfo::isAnyCloth()
+bool MaterialInfo::isAnyCloth() const
 {
     using namespace df::enums::material_flags;
 
@@ -387,7 +387,7 @@ bool MaterialInfo::isAnyCloth()
     );
 }
 
-bool MaterialInfo::matches(const df::job_material_category &cat)
+bool MaterialInfo::matches(const df::job_material_category &cat) const
 {
     if (!material)
         return false;
@@ -416,7 +416,7 @@ bool MaterialInfo::matches(const df::job_material_category &cat)
     return false;
 }
 
-bool MaterialInfo::matches(const df::dfhack_material_category &cat)
+bool MaterialInfo::matches(const df::dfhack_material_category &cat) const
 {
     if (!material)
         return false;
@@ -439,12 +439,13 @@ bool MaterialInfo::matches(const df::dfhack_material_category &cat)
         return true;
     if (cat.bits.milk && linear_index(material->reaction_product.id, std::string("CHEESE_MAT")) >= 0)
         return true;
+    TEST(gem, IS_GEM);
     return false;
 }
 
 #undef TEST
 
-bool MaterialInfo::matches(const df::job_item &item, df::item_type itype)
+bool MaterialInfo::matches(const df::job_item &item, df::item_type itype) const
 {
     if (!isValid()) return false;
 
@@ -465,7 +466,7 @@ bool MaterialInfo::matches(const df::job_item &item, df::item_type itype)
            bits_match(item.flags3.whole, ok3.whole, mask3.whole);
 }
 
-void MaterialInfo::getMatchBits(df::job_item_flags1 &ok, df::job_item_flags1 &mask)
+void MaterialInfo::getMatchBits(df::job_item_flags1 &ok, df::job_item_flags1 &mask) const
 {
     ok.whole = mask.whole = 0;
     if (!isValid()) return;
@@ -500,7 +501,7 @@ void MaterialInfo::getMatchBits(df::job_item_flags1 &ok, df::job_item_flags1 &ma
     //04000000 - "milkable" - vtable[107],1,1
 }
 
-void MaterialInfo::getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &mask)
+void MaterialInfo::getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &mask) const
 {
     ok.whole = mask.whole = 0;
     if (!isValid()) return;
@@ -513,10 +514,18 @@ void MaterialInfo::getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &ma
     TEST(sewn_imageless, is_cloth);
     TEST(glass_making, MAT_FLAG(CRYSTAL_GLASSABLE));
 
-    TEST(fire_safe, material->heat.melting_point > 11000);
-    TEST(magma_safe, material->heat.melting_point > 12000);
+    TEST(fire_safe, material->heat.melting_point > 11000
+                    && material->heat.boiling_point > 11000
+                    && material->heat.ignite_point > 11000
+                    && material->heat.heatdam_point > 11000
+                    && (material->heat.colddam_point == 60001 || material->heat.colddam_point < 11000));
+    TEST(magma_safe, material->heat.melting_point > 12000
+                    && material->heat.boiling_point > 12000
+                    && material->heat.ignite_point > 12000
+                    && material->heat.heatdam_point > 12000
+                    && (material->heat.colddam_point == 60001 || material->heat.colddam_point < 12000));
     TEST(deep_material, FLAG(inorganic, inorganic_flags::SPECIAL));
-    TEST(non_economic, !inorganic || !(ui && vector_get(ui->economic_stone, index)));
+    TEST(non_economic, !inorganic || !(plotinfo && vector_get(plotinfo->economic_stone, index)));
 
     TEST(plant, plant);
     TEST(silk, MAT_FLAG(SILK));
@@ -532,7 +541,7 @@ void MaterialInfo::getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &ma
     TEST(yarn, MAT_FLAG(YARN));
 }
 
-void MaterialInfo::getMatchBits(df::job_item_flags3 &ok, df::job_item_flags3 &mask)
+void MaterialInfo::getMatchBits(df::job_item_flags3 &ok, df::job_item_flags3 &mask) const
 {
     ok.whole = mask.whole = 0;
     if (!isValid()) return;
@@ -597,7 +606,7 @@ bool DFHack::isStoneInorganic(int material)
 
 std::unique_ptr<Module> DFHack::createMaterials()
 {
-    return dts::make_unique<Materials>();
+    return std::make_unique<Materials>();
 }
 
 Materials::Materials()
diff --git a/library/modules/Military.cpp b/library/modules/Military.cpp
new file mode 100644
index 000000000..b402cc0fa
--- /dev/null
+++ b/library/modules/Military.cpp
@@ -0,0 +1,291 @@
+#include <string>
+#include <vector>
+#include <array>
+#include "MiscUtils.h"
+#include "modules/Military.h"
+#include "modules/Translation.h"
+#include "df/building.h"
+#include "df/building_civzonest.h"
+#include "df/historical_figure.h"
+#include "df/historical_entity.h"
+#include "df/entity_position.h"
+#include "df/entity_position_assignment.h"
+#include "df/plotinfost.h"
+#include "df/squad.h"
+#include "df/squad_position.h"
+#include "df/squad_schedule_order.h"
+#include "df/squad_order.h"
+#include "df/squad_order_trainst.h"
+#include "df/world.h"
+
+using namespace DFHack;
+using namespace df::enums;
+using df::global::world;
+using df::global::plotinfo;
+
+std::string Military::getSquadName(int32_t squad_id)
+{
+    df::squad *squad = df::squad::find(squad_id);
+    if (!squad)
+        return "";
+    if (squad->alias.size() > 0)
+        return squad->alias;
+    return Translation::TranslateName(&squad->name, true);
+}
+
+//only works for making squads for fort mode player controlled dwarf squads
+//could be extended straightforwardly by passing in entity
+df::squad* Military::makeSquad(int32_t assignment_id)
+{
+    if (df::global::squad_next_id == nullptr || df::global::plotinfo == nullptr)
+        return nullptr;
+
+    df::language_name name;
+    name.type = df::language_name_type::Squad;
+
+    for (int i=0; i < 7; i++)
+    {
+        name.words[i] = -1;
+        name.parts_of_speech[i] = df::part_of_speech::Noun;
+    }
+
+    df::historical_entity* fort = df::historical_entity::find(df::global::plotinfo->group_id);
+
+    if (fort == nullptr)
+        return nullptr;
+
+    df::entity_position_assignment* found_assignment = nullptr;
+
+    for (auto* assignment : fort->positions.assignments)
+    {
+        if (assignment->id == assignment_id)
+        {
+            found_assignment = assignment;
+            break;
+        }
+    }
+
+    if (found_assignment == nullptr)
+        return nullptr;
+
+    //this function does not attempt to delete or replace squads for assignments
+    if (found_assignment->squad_id != -1)
+        return nullptr;
+
+    df::entity_position* corresponding_position = nullptr;
+
+    for (auto* position : fort->positions.own)
+    {
+        if (position->id == found_assignment->position_id)
+        {
+            corresponding_position = position;
+            break;
+        }
+    }
+
+    if (corresponding_position == nullptr)
+        return nullptr;
+
+    df::squad* result = new df::squad();
+    result->id = *df::global::squad_next_id;
+    result->uniform_priority = result->id + 1; //no idea why, but seems to hold
+    result->carry_food = 2;
+    result->carry_water = 1;
+    result->entity_id = df::global::plotinfo->group_id;
+    result->leader_position = corresponding_position->id;
+    result->leader_assignment = found_assignment->id;
+    result->name = name;
+
+    int16_t squad_size = corresponding_position->squad_size;
+
+    for (int i=0; i < squad_size; i++)
+    {
+        //construct for squad_position seems to set all the attributes correctly
+        df::squad_position* pos = new df::squad_position();
+
+        result->positions.push_back(pos);
+    }
+
+    const auto& routines = df::global::plotinfo->alerts.routines;
+
+    for (const auto& routine : routines)
+    {
+        df::squad_schedule_entry* asched = (df::squad_schedule_entry*)malloc(sizeof(df::squad_schedule_entry) * 12);
+
+        for(int kk=0; kk < 12; kk++)
+        {
+            new (&asched[kk]) df::squad_schedule_entry;
+
+            for(int jj=0; jj < squad_size; jj++)
+            {
+                int32_t* order_assignments = new int32_t();
+                *order_assignments = -1;
+
+                asched[kk].order_assignments.push_back(order_assignments);
+            }
+        }
+
+        auto insert_training_order = [asched, squad_size](int month)
+        {
+            df::squad_schedule_order* order = new df::squad_schedule_order();
+            order->min_count = squad_size;
+            //assumed
+            order->positions.resize(squad_size);
+
+            df::squad_order* s_order = df::allocate<df::squad_order_trainst>();
+
+            s_order->year = *df::global::cur_year;
+            s_order->year_tick = *df::global::cur_year_tick;
+
+            order->order = s_order;
+
+            asched[month].orders.push_back(order);
+            //wear uniform while training
+            asched[month].uniform_mode = 0;
+        };
+
+        //Dwarf fortress does do this via a series of string comparisons
+        //Off duty: No orders, Sleep/room at will. Equip/orders only
+        if (routine->name == "Off duty")
+        {
+            for (int i=0; i < 12; i++)
+            {
+                asched[i].sleep_mode = 0;
+                asched[i].uniform_mode = 1;
+            }
+        }
+        //Staggered Training: Training orders at months 3 4 5 9 10 11, *or* 0 1 2 6 7 8, sleep/room at will. Equip/orders only, except train months which are equip/always
+        else if (routine->name == "Staggered training")
+        {
+            //this is semi randomised for different squads
+            //appears to be something like squad.id & 1, it isn't smart
+            //if you alternate squad creation, its 'correctly' staggered
+            //but it'll also happily not stagger them if you eg delete a squad and make another
+            std::array<int, 6> indices;
+
+            if ((*df::global::squad_next_id) & 1)
+            {
+                indices = {3, 4, 5, 9, 10, 11};
+            }
+            else
+            {
+                indices = {0, 1, 2, 6, 7, 8};
+            }
+
+            for (int index : indices)
+            {
+                insert_training_order(index);
+                //still sleep in room at will even when training
+                asched[index].sleep_mode = 0;
+            }
+        }
+        //see above, but with all indices
+        else if (routine->name == "Constant training")
+        {
+            for (int i=0; i < 12; i++)
+            {
+                insert_training_order(i);
+                //still sleep in room at will even when training
+                asched[i].sleep_mode = 0;
+            }
+        }
+        else if (routine->name == "Ready")
+        {
+            for (int i=0; i < 12; i++)
+            {
+                asched[i].sleep_mode = 2;
+                asched[i].uniform_mode = 0;
+            }
+        }
+        else
+        {
+            for (int i=0; i < 12; i++)
+            {
+                asched[i].sleep_mode = 0;
+                asched[i].uniform_mode = 0;
+            }
+        }
+
+        result->schedule.push_back(reinterpret_cast<df::squad::T_schedule*>(asched));
+    }
+
+    //Modify necessary world state
+    (*df::global::squad_next_id)++;
+    fort->squads.push_back(result->id);
+    df::global::world->squads.all.push_back(result);
+    found_assignment->squad_id = result->id;
+
+    return result;
+}
+
+void Military::updateRoomAssignments(int32_t squad_id, int32_t civzone_id, df::squad_use_flags flags)
+{
+    df::squad* squad = df::squad::find(squad_id);
+    df::building* bzone = df::building::find(civzone_id);
+
+    df::building_civzonest* zone = strict_virtual_cast<df::building_civzonest>(bzone);
+
+    if (squad == nullptr || zone == nullptr)
+        return;
+
+    df::squad::T_rooms* room_from_squad = nullptr;
+    df::building_civzonest::T_squad_room_info* room_from_building = nullptr;
+
+    for (auto room : squad->rooms)
+    {
+        if (room->building_id == civzone_id)
+        {
+            room_from_squad = room;
+            break;
+        }
+    }
+
+    for (auto room : zone->squad_room_info)
+    {
+        if (room->squad_id == squad_id)
+        {
+            room_from_building = room;
+            break;
+        }
+    }
+
+    if (flags.whole == 0 && room_from_squad == nullptr && room_from_building == nullptr)
+        return;
+
+    //if we're setting 0 flags, and there's no room already, don't set a room
+    bool avoiding_squad_roundtrip = flags.whole == 0 && room_from_squad == nullptr;
+
+    if (!avoiding_squad_roundtrip && room_from_squad == nullptr)
+    {
+        room_from_squad = new df::squad::T_rooms();
+        room_from_squad->building_id = civzone_id;
+
+        insert_into_vector(squad->rooms, &df::squad::T_rooms::building_id, room_from_squad);
+    }
+
+    if (room_from_building == nullptr)
+    {
+        room_from_building = new df::building_civzonest::T_squad_room_info();
+        room_from_building->squad_id = squad_id;
+
+        insert_into_vector(zone->squad_room_info, &df::building_civzonest::T_squad_room_info::squad_id, room_from_building);
+    }
+
+    if (room_from_squad)
+        room_from_squad->mode = flags;
+
+    room_from_building->mode = flags;
+
+    if (flags.whole == 0 && !avoiding_squad_roundtrip)
+    {
+        for (int i=0; i < (int)squad->rooms.size(); i++)
+        {
+            if (squad->rooms[i]->building_id == civzone_id)
+            {
+                delete squad->rooms[i];
+                squad->rooms.erase(squad->rooms.begin() + i);
+                i--;
+            }
+        }
+    }
+}
diff --git a/library/modules/Persistence.cpp b/library/modules/Persistence.cpp
index 05afa77ed..975ba0bea 100644
--- a/library/modules/Persistence.cpp
+++ b/library/modules/Persistence.cpp
@@ -387,7 +387,7 @@ static std::string filterSaveFileName(std::string s)
 
 static std::string getSaveFilePath(const std::string &world, const std::string &name)
 {
-    return "data/save/" + world + "/dfhack-" + filterSaveFileName(name) + ".dat";
+    return "save/" + world + "/dfhack-" + filterSaveFileName(name) + ".dat";
 }
 
 #if defined(__GNUC__) && __GNUC__ < 5
diff --git a/library/modules/Screen.cpp b/library/modules/Screen.cpp
index e7f6cea93..dee7e2b75 100644
--- a/library/modules/Screen.cpp
+++ b/library/modules/Screen.cpp
@@ -78,7 +78,6 @@ namespace DFHack {
     DBG_DECLARE(core, screen, DebugCategory::LINFO);
 }
 
-
 /*
  * Screen painting API.
  */
@@ -106,9 +105,11 @@ df::coord2d Screen::getWindowSize()
     return df::coord2d(gps->dimx, gps->dimy);
 }
 
+/*
 void Screen::zoom(df::zoom_commands cmd) {
     enabler->zoom_display(cmd);
 }
+*/
 
 bool Screen::inGraphicsMode()
 {
@@ -116,17 +117,21 @@ bool Screen::inGraphicsMode()
 }
 
 static bool doSetTile_map(const Pen &pen, int x, int y) {
-    size_t max_index = gps->main_viewport->dim_x * gps->main_viewport->dim_y - 1;
-    size_t index = (x * gps->main_viewport->dim_y) + y;
+    auto &vp = gps->main_viewport;
 
-    if (index < 0 || index > max_index)
+    if (x < 0 || x >= vp->dim_x || y < 0 || y >= vp->dim_y)
+        return false;
+
+    size_t max_index = vp->dim_x * vp->dim_y - 1;
+    size_t index = (x * vp->dim_y) + y;
+
+    if (index > max_index)
         return false;
 
     long texpos = pen.tile;
-    if (texpos == 0) {
+    if (!texpos && pen.ch)
         texpos = init->font.large_font_texpos[(uint8_t)pen.ch];
-    }
-    gps->main_viewport->screentexpos_interface[index] = texpos;
+    vp->screentexpos_interface[index] = texpos;
     return true;
 }
 
@@ -137,6 +142,9 @@ static bool doSetTile_default(const Pen &pen, int x, int y, bool map)
     if (map && use_graphics)
         return doSetTile_map(pen, x, y);
 
+    if (x < 0 || x >= gps->dimx || y < 0 || y >= gps->dimy)
+        return false;
+
     size_t index = (x * gps->dimy) + y;
     uint8_t *screen = &gps->screen[index * 8];
 
@@ -147,13 +155,18 @@ static bool doSetTile_default(const Pen &pen, int x, int y, bool map)
     long *texpos_lower = &gps->screentexpos_lower[index];
     uint32_t *flag = &gps->screentexpos_flag[index];
 
+    // keep SCREENTEXPOS_FLAG_ANCHOR_SUBORDINATE so occluded anchored textures
+    // don't appear corrupted
+    uint32_t flag_mask = 0x4;
+    if (pen.write_to_lower)
+        flag_mask |= 0x18;
+
     *screen = 0;
     *texpos = 0;
-    *texpos_lower = 0;
+    if (!pen.keep_lower)
+        *texpos_lower = 0;
     gps->screentexpos_anchored[index] = 0;
-    // keep SCREENTEXPOS_FLAG_ANCHOR_SUBORDINATE so occluded anchored textures
-    // don't appear corrupted
-    *flag &= 4;
+    *flag &= flag_mask;
 
     if (gps->top_in_use) {
         screen = &gps->screen_top[index * 8];
@@ -163,9 +176,10 @@ static bool doSetTile_default(const Pen &pen, int x, int y, bool map)
 
         *screen = 0;
         *texpos = 0;
-        *texpos_lower = 0;
+        if (!pen.keep_lower)
+            *texpos_lower = 0;
         gps->screentexpos_top_anchored[index] = 0;
-        *flag &= 4; // keep SCREENTEXPOS_FLAG_ANCHOR_SUBORDINATE
+        *flag &= flag_mask;
     }
 
     uint8_t fg = pen.fg | (pen.bold << 3);
@@ -182,10 +196,21 @@ static bool doSetTile_default(const Pen &pen, int x, int y, bool map)
     }
 
     if (pen.tile && use_graphics) {
-        *texpos = pen.tile;
-    } else {
+        if (pen.write_to_lower)
+            *texpos_lower = pen.tile;
+        else
+            *texpos = pen.tile;
+
+        if (pen.top_of_text || pen.bottom_of_text) {
+            screen[0] = uint8_t(pen.ch);
+            if (pen.top_of_text)
+                *flag |= 0x8;
+            if (pen.bottom_of_text)
+                *flag |= 0x10;
+        }
+    } else if (pen.ch) {
         screen[0] = uint8_t(pen.ch);
-        *texpos_lower = 909;
+        *texpos_lower = df::global::init->texpos_border_interior; // basic black background
     }
 
     auto rgb_fg = &gps->uccolor[fg][0];
@@ -215,21 +240,26 @@ bool Screen::paintTile(const Pen &pen, int x, int y, bool map)
 }
 
 static Pen doGetTile_map(int x, int y) {
-    size_t max_index = gps->main_viewport->dim_x * gps->main_viewport->dim_y - 1;
-    size_t index = (x * gps->main_viewport->dim_y) + y;
+    auto &vp = gps->main_viewport;
+
+    if (x < 0 || x >= vp->dim_x || y < 0 || y >= vp->dim_y)
+        return Pen(0, 0, 0, -1);
+
+    size_t max_index = vp->dim_x * vp->dim_y - 1;
+    size_t index = (x * vp->dim_y) + y;
 
     if (index < 0 || index > max_index)
         return Pen(0, 0, 0, -1);
 
-    int tile = gps->main_viewport->screentexpos[index];
+    int tile = vp->screentexpos[index];
     if (tile == 0)
-        tile = gps->main_viewport->screentexpos_item[index];
+        tile = vp->screentexpos_item[index];
     if (tile == 0)
-        tile = gps->main_viewport->screentexpos_building_one[index];
+        tile = vp->screentexpos_building_one[index];
     if (tile == 0)
-        tile = gps->main_viewport->screentexpos_background_two[index];
+        tile = vp->screentexpos_background_two[index];
     if (tile == 0)
-        tile = gps->main_viewport->screentexpos_background[index];
+        tile = vp->screentexpos_background[index];
 
     char ch = 0;
     uint8_t fg = 0;
@@ -249,14 +279,14 @@ static uint8_t to_16_bit_color(uint8_t  *rgb) {
 }
 
 static Pen doGetTile_default(int x, int y, bool map) {
-    if (x < 0 || y < 0)
-        return Pen(0, 0, 0, -1);
-
     bool use_graphics = Screen::inGraphicsMode();
 
     if (map && use_graphics)
         return doGetTile_map(x, y);
 
+    if (x < 0 || x >= gps->dimx || y < 0 || y >= gps->dimy)
+        return Pen(0, 0, 0, -1);
+
     size_t index = (x * gps->dimy) + y;
     uint8_t *screen = &gps->screen[index * 8];
 
@@ -264,6 +294,7 @@ static Pen doGetTile_default(int x, int y, bool map) {
         return Pen(0, 0, 0, -1);
 
     long *texpos = &gps->screentexpos[index];
+    long *texpos_lower = &gps->screentexpos_lower[index];
     uint32_t *flag = &gps->screentexpos_flag[index];
 
     if (gps->top_in_use &&
@@ -271,6 +302,7 @@ static Pen doGetTile_default(int x, int y, bool map) {
              (use_graphics && gps->screentexpos_top[index]))) {
         screen = &gps->screen_top[index * 8];
         texpos = &gps->screentexpos_top[index];
+        texpos_lower = &gps->screentexpos_top_lower[index];
         flag = &gps->screentexpos_top_flag[index];
     }
 
@@ -278,19 +310,37 @@ static Pen doGetTile_default(int x, int y, bool map) {
     uint8_t fg = to_16_bit_color(&screen[1]);
     uint8_t bg = to_16_bit_color(&screen[4]);
     int tile = 0;
-    if (use_graphics)
+    bool write_to_lower = false;
+    bool top_of_text = false;
+    bool bottom_of_text = false;
+    if (use_graphics) {
         tile = *texpos;
+        if (!tile && *texpos_lower) {
+            tile = *texpos_lower;
+            write_to_lower = true;
+        }
+        if (*flag & 0x8)
+            top_of_text = true;
+        else if (*flag &0x10)
+            bottom_of_text = true;
+    }
 
+    Pen ret;
     if (*flag & 1) {
         // TileColor
-        return Pen(ch, fg&7, bg, !!(fg&8), tile, fg, bg);
+        ret = Pen(ch, fg&7, bg, !!(fg&8), tile, fg, bg);
     } else if (*flag & 2) {
         // CharColor
-        return Pen(ch, fg, bg, tile, true);
+        ret = Pen(ch, fg, bg, tile, true);
+    } else {
+        // AsIs
+        ret = Pen(ch, fg, bg, tile, false);
     }
 
-    // AsIs
-    return Pen(ch, fg, bg, tile, false);
+    ret.write_to_lower = write_to_lower;
+    ret.top_of_text = top_of_text;
+    ret.bottom_of_text = bottom_of_text;
+    return ret;
 }
 
 GUI_HOOK_DEFINE(Screen::Hooks::get_tile, doGetTile_default);
@@ -502,55 +552,80 @@ bool Screen::hasActiveScreens(Plugin *plugin)
     return false;
 }
 
+void Screen::raise(df::viewscreen *screen) {
+    Hide swapper(screen, Screen::Hide::RESTORE_AT_TOP);
+}
+
 namespace DFHack { namespace Screen {
 
 Hide::Hide(df::viewscreen* screen, int flags) :
-    screen{screen}, flags{flags}
-{
-    extract(screen);
+    screen{screen}, prev_parent{nullptr}, flags{flags} {
+    if (!screen)
+        return;
+
+    // don't extract a screen that's not even in the stack
+    if (screen->parent)
+        extract();
 }
 
-Hide::~Hide()
-{
+Hide::~Hide() {
     if (screen)
-        merge(screen);
+        merge();
 }
 
-void Hide::extract(df::viewscreen* a)
-{
-    df::viewscreen* ap = a->parent;
-    df::viewscreen* ac = a->child;
+void Hide::extract() {
+    prev_parent = screen->parent;
+    df::viewscreen *prev_child = screen->child;
+
+    screen->parent = nullptr;
+    screen->child = nullptr;
 
-    ap->child = ac;
-    if (ac) ac->parent = ap;
-    else Core::getInstance().top_viewscreen = ap;
+    prev_parent->child = prev_child;
+    if (prev_child) prev_child->parent = prev_parent;
+    else Core::getInstance().top_viewscreen = prev_parent;
 }
 
-void Hide::merge(df::viewscreen* a)
-{
+void Hide::merge() {
+    if (screen->parent) {
+        // we're somehow back on the stack; do nothing
+        return;
+    }
+
     if (flags & RESTORE_AT_TOP) {
-        a->parent = NULL;
-        a->child = NULL;
-        Screen::show(std::unique_ptr<df::viewscreen>(a));
+        Screen::show(std::unique_ptr<df::viewscreen>(screen));
         return;
     }
 
-    df::viewscreen* ap = a->parent;
-    df::viewscreen* ac = a->parent->child;
+    df::viewscreen* new_child = prev_parent->child;
 
-    ap->child = a;
-    a->child = ac;
-    if (ac) ac->parent = a;
-    else Core::getInstance().top_viewscreen = a;
+    prev_parent->child = screen;
+    screen->child = new_child;
+    if (new_child) new_child->parent = screen;
+    else Core::getInstance().top_viewscreen = screen;
 }
 } }
 
+std::set<df::interface_key> Screen::normalize_text_keys(const std::set<df::interface_key>& keys) {
+    std::set<df::interface_key> combined_keys;
+    std::copy_if(keys.begin(), keys.end(), std::inserter(combined_keys, combined_keys.begin()),
+        [](df::interface_key k){ return k <= df::interface_key::STRING_A000 || k > df::interface_key::STRING_A255; } );
+    if (!(Core::getInstance().getModstate() & (DFH_MOD_CTRL | DFH_MOD_ALT)) && df::global::enabler->last_text_input[0]) {
+        char c = df::global::enabler->last_text_input[0];
+        df::interface_key key = charToKey(c);
+        DEBUG(screen).print("adding character %c as interface key %ld\n", c, key);
+        combined_keys.emplace(key);
+    }
+    return combined_keys;
+}
+
 string Screen::getKeyDisplay(df::interface_key key)
 {
-    if (enabler)
-        return enabler->GetKeyDisplay(key);
-
-    return "?";
+    int c = keyToChar(key);
+    if (c != -1)
+        return string(1, c);
+    if (key >= df::interface_key::CUSTOM_SHIFT_A && key <= df::interface_key::CUSTOM_SHIFT_Z)
+        return string(1, 'A' + (key - df::interface_key::CUSTOM_SHIFT_A));
+    return enabler->GetKeyDisplay(key);
 }
 
 int Screen::keyToChar(df::interface_key key)
@@ -688,6 +763,21 @@ void dfhack_viewscreen::logic()
 
     // Various stuff works poorly unless always repainting
     Screen::invalidate();
+
+    // if the DF screen immediately beneath the DFHack viewscreens is waiting to
+    // be dismissed, raise it to the top so DF never gets stuck
+    auto *p = parent;
+    while (p) {
+        bool is_df_screen = !is_instance(p);
+        auto *next_p = p->parent;
+        if (is_df_screen && Screen::isDismissed(p)) {
+            DEBUG(screen).print("raising dismissed DF viewscreen %p\n", p);
+            Screen::raise(p);
+        }
+        if (is_df_screen)
+            break;
+        p = next_p;
+    }
 }
 
 void dfhack_viewscreen::render()
@@ -778,6 +868,13 @@ int dfhack_lua_viewscreen::do_destroy(lua_State *L)
     auto self = get_self(L);
     if (!self) return 0;
 
+    if (!Screen::isDismissed(self)) {
+        WARN(screen).print("DFHack screen was destroyed before it was dismissed\n");
+        WARN(screen).print("Please tell the DFHack team which DF screen you were just viewing\n");
+        // run skipped onDismiss cleanup logic
+        Screen::dismiss(self);
+    }
+
     lua_pushnil(L);
     lua_rawsetp(L, LUA_REGISTRYINDEX, self);
 
@@ -803,6 +900,9 @@ void dfhack_lua_viewscreen::update_focus(lua_State *L, int idx)
     lua_getfield(L, idx, "allow_options");
     allow_options = lua_toboolean(L, -1);
     lua_pop(L, 1);
+    lua_getfield(L, idx, "defocused");
+    defocused = lua_toboolean(L, -1);
+    lua_pop(L, 1);
 
     lua_getfield(L, idx, "focus_path");
     auto str = lua_tostring(L, -1);
@@ -812,7 +912,7 @@ void dfhack_lua_viewscreen::update_focus(lua_State *L, int idx)
 
     if (focus.empty())
         focus = "lua";
-    else
+    else if (string::npos == focus.find("lua/"))
         focus = "lua/"+focus;
 }
 
@@ -856,12 +956,25 @@ int dfhack_lua_viewscreen::do_notify(lua_State *L)
     return 1;
 }
 
+void dfhack_lua_viewscreen::markInputAsHandled() {
+    if (!enabler)
+        return;
+
+    // clear text buffer
+    enabler->last_text_input[0] = '\0';
+
+    // mark clicked mouse buttons as handled
+    enabler->mouse_lbut = 0;
+    enabler->mouse_rbut = 0;
+}
+
 int dfhack_lua_viewscreen::do_input(lua_State *L)
 {
     auto self = get_self(L);
     if (!self) return 0;
 
     auto keys = (std::set<df::interface_key>*)lua_touserdata(L, 2);
+    if (!keys) return 0;
 
     lua_getfield(L, -1, "onInput");
 
@@ -874,9 +987,13 @@ int dfhack_lua_viewscreen::do_input(lua_State *L)
     }
 
     lua_pushvalue(L, -2);
-    Lua::PushInterfaceKeys(L, *keys);
+    Lua::PushInterfaceKeys(L, Screen::normalize_text_keys(*keys));
+
+    lua_call(L, 2, 1);
+    if (lua_toboolean(L, -1))
+        markInputAsHandled();
+    lua_pop(L, 1);
 
-    lua_call(L, 2, 0);
     self->update_focus(L, -1);
     return 0;
 }
@@ -903,6 +1020,8 @@ dfhack_lua_viewscreen::~dfhack_lua_viewscreen()
 
 void dfhack_lua_viewscreen::render()
 {
+    using df::global::enabler;
+
     if (Screen::isDismissed(this))
     {
         if (parent)
@@ -910,6 +1029,14 @@ void dfhack_lua_viewscreen::render()
         return;
     }
 
+    if (enabler &&
+        (enabler->mouse_lbut_down || enabler->mouse_rbut_down || enabler->mouse_mbut_down))
+    {
+        // synthesize feed events for held mouse buttons
+        std::set<df::interface_key> keys;
+        feed(&keys);
+    }
+
     dfhack_viewscreen::render();
 
     safe_call_lua(do_render, 0, 0);
@@ -957,6 +1084,7 @@ void dfhack_lua_viewscreen::feed(std::set<df::interface_key> *keys)
 
     lua_pushlightuserdata(Lua::Core::State, keys);
     safe_call_lua(do_input, 1, 0);
+    df::global::enabler->last_text_input[0] = '\0';
 }
 
 void dfhack_lua_viewscreen::onShow()
@@ -1003,6 +1131,22 @@ df::building *dfhack_lua_viewscreen::getSelectedBuilding()
     return Lua::GetDFObject<df::building>(Lua::Core::State, -1);
 }
 
+df::building_stockpilest *dfhack_lua_viewscreen::getSelectedStockpile()
+{
+    Lua::StackUnwinder frame(Lua::Core::State);
+    lua_pushstring(Lua::Core::State, "onGetSelectedStockpile");
+    safe_call_lua(do_notify, 1, 1);
+    return Lua::GetDFObject<df::building_stockpilest>(Lua::Core::State, -1);
+}
+
+df::building_civzonest *dfhack_lua_viewscreen::getSelectedCivZone()
+{
+    Lua::StackUnwinder frame(Lua::Core::State);
+    lua_pushstring(Lua::Core::State, "onGetSelectedCivZone");
+    safe_call_lua(do_notify, 1, 1);
+    return Lua::GetDFObject<df::building_civzonest>(Lua::Core::State, -1);
+}
+
 df::plant *dfhack_lua_viewscreen::getSelectedPlant()
 {
     Lua::StackUnwinder frame(Lua::Core::State);
@@ -1011,14 +1155,14 @@ df::plant *dfhack_lua_viewscreen::getSelectedPlant()
     return Lua::GetDFObject<df::plant>(Lua::Core::State, -1);
 }
 
-#define STATIC_FIELDS_GROUP
-#include "../DataStaticsFields.cpp"
+#include "DataStaticsFields.inc"
 
 using df::identity_traits;
 
 #define CUR_STRUCT dfhack_viewscreen
 static const struct_field_info dfhack_viewscreen_fields[] = {
     { METHOD(OBJ_METHOD, is_lua_screen), 0, 0 },
+    { METHOD(OBJ_METHOD, isFocused), 0, 0 },
     { METHOD(OBJ_METHOD, getFocusString), 0, 0 },
     { METHOD(OBJ_METHOD, onShow), 0, 0 },
     { METHOD(OBJ_METHOD, onDismiss), 0, 0 },
diff --git a/library/modules/Textures.cpp b/library/modules/Textures.cpp
new file mode 100644
index 000000000..8b485a3a6
--- /dev/null
+++ b/library/modules/Textures.cpp
@@ -0,0 +1,462 @@
+#include <algorithm>
+#include <atomic>
+#include <mutex>
+#include <numeric>
+#include <unordered_map>
+
+#include "Internal.h"
+
+#include "modules/DFSDL.h"
+#include "modules/Textures.h"
+
+#include "Debug.h"
+#include "PluginManager.h"
+#include "VTableInterpose.h"
+
+#include "df/enabler.h"
+#include "df/viewscreen_adopt_regionst.h"
+#include "df/viewscreen_loadgamest.h"
+#include "df/viewscreen_new_arenast.h"
+#include "df/viewscreen_new_regionst.h"
+
+#include <SDL_pixels.h>
+#include <SDL_surface.h>
+
+using df::global::enabler;
+using namespace DFHack;
+using namespace DFHack::DFSDL;
+
+namespace DFHack {
+DBG_DECLARE(core, textures, DebugCategory::LINFO);
+}
+
+struct ReservedRange {
+    void init(int32_t start) {
+        this->start = start;
+        this->end = start + ReservedRange::size;
+        this->current = start;
+        this->is_installed = true;
+    }
+    long get_new_texpos() {
+        if (this->current == this->end)
+            return -1;
+        return this->current++;
+    }
+
+    static const int32_t size = 10000; // size of reserved texpos buffer
+    int32_t start = -1;
+    int32_t end = -1;
+    long current = -1;
+    bool is_installed = false;
+};
+
+static ReservedRange reserved_range{};
+static std::unordered_map<TexposHandle, long> g_handle_to_texpos;
+static std::unordered_map<TexposHandle, long> g_handle_to_reserved_texpos;
+static std::unordered_map<TexposHandle, SDL_Surface*> g_handle_to_surface;
+static std::unordered_map<std::string, std::vector<TexposHandle>> g_tileset_to_handles;
+static std::vector<TexposHandle> g_delayed_regs;
+static std::mutex g_adding_mutex;
+static std::atomic<bool> loading_state = false;
+static SDL_Surface* dummy_surface = NULL;
+
+// Converts an arbitrary Surface to something like the display format
+// (32-bit RGBA), and converts magenta to transparency if convert_magenta is set
+// and the source surface didn't already have an alpha channel.
+// It also deletes the source surface.
+//
+// It uses the same pixel format (RGBA, R at lowest address) regardless of
+// hardware.
+SDL_Surface* canonicalize_format(SDL_Surface* src) {
+    // even though we have null check after DFIMG_Load
+    // in loadTileset() (the only consumer of this method)
+    // it's better put nullcheck here as well
+    if (!src)
+        return src;
+
+    auto fmt = DFSDL_AllocFormat(SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA32);
+    SDL_Surface* tgt = DFSDL_ConvertSurface(src, fmt, SDL_SWSURFACE);
+    DFSDL_FreeSurface(src);
+    for (int x = 0; x < tgt->w; ++x) {
+        for (int y = 0; y < tgt->h; ++y) {
+            Uint8* p = (Uint8*)tgt->pixels + y * tgt->pitch + x * 4;
+            if (p[3] == 0) {
+                for (int c = 0; c < 3; c++) {
+                    p[c] = 0;
+                }
+            }
+        }
+    }
+
+    return tgt;
+}
+
+// register surface in texture raws, get a texpos
+static long add_texture(SDL_Surface* surface) {
+    std::lock_guard<std::mutex> lg_add_texture(g_adding_mutex);
+    auto texpos = enabler->textures.raws.size();
+    enabler->textures.raws.push_back(surface);
+    return texpos;
+}
+
+// register surface in texture raws to specific texpos
+static void insert_texture(SDL_Surface* surface, long texpos) {
+    std::lock_guard<std::mutex> lg_add_texture(g_adding_mutex);
+    enabler->textures.raws[texpos] = surface;
+}
+
+// delete surface from texture raws
+static void delete_texture(long texpos) {
+    std::lock_guard<std::mutex> lg_add_texture(g_adding_mutex);
+    auto pos = static_cast<size_t>(texpos);
+    if (pos >= enabler->textures.raws.size())
+        return;
+    enabler->textures.raws[texpos] = NULL;
+}
+
+// create new surface with RGBA32 format and pixels as data
+SDL_Surface* create_texture(std::vector<uint32_t>& pixels, int texture_px_w, int texture_px_h) {
+    auto surface = DFSDL_CreateRGBSurfaceWithFormat(0, texture_px_w, texture_px_h, 32,
+                                                    SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA32);
+    auto canvas_length = static_cast<size_t>(texture_px_w * texture_px_h);
+    for (size_t i = 0; i < pixels.size() && i < canvas_length; i++) {
+        uint32_t* p = (uint32_t*)surface->pixels + i;
+        *p = pixels[i];
+    }
+    return surface;
+}
+
+// convert single surface into tiles according w/h
+// register tiles in texture raws and return handles
+std::vector<TexposHandle> slice_tileset(SDL_Surface* surface, int tile_px_w, int tile_px_h,
+                                        bool reserved) {
+    std::vector<TexposHandle> handles{};
+    if (!surface)
+        return handles;
+
+    int dimx = surface->w / tile_px_w;
+    int dimy = surface->h / tile_px_h;
+
+    if (reserved && (dimx * dimy > reserved_range.end - reserved_range.current)) {
+        WARN(textures).print(
+            "there is not enough space in reserved range for whole tileset, using dynamic range\n");
+        reserved = false;
+    }
+
+    for (int y = 0; y < dimy; y++) {
+        for (int x = 0; x < dimx; x++) {
+            SDL_Surface* tile = DFSDL_CreateRGBSurface(
+                0, tile_px_w, tile_px_h, 32, surface->format->Rmask, surface->format->Gmask,
+                surface->format->Bmask, surface->format->Amask);
+            SDL_Rect vp{tile_px_w * x, tile_px_h * y, tile_px_w, tile_px_h};
+            DFSDL_UpperBlit(surface, &vp, tile, NULL);
+            auto handle = Textures::loadTexture(tile, reserved);
+            handles.push_back(handle);
+        }
+    }
+
+    DFSDL_FreeSurface(surface);
+    return handles;
+}
+
+TexposHandle Textures::loadTexture(SDL_Surface* surface, bool reserved) {
+    if (!surface || !enabler)
+        return 0; // should be some error, i guess
+    if (loading_state)
+        reserved = true; // use reserved range during loading for all textures
+
+    auto handle = reinterpret_cast<uintptr_t>(surface);
+    g_handle_to_surface.emplace(handle, surface);
+    surface->refcount++; // prevent destruct on next FreeSurface by game
+
+    if (reserved && reserved_range.is_installed) {
+        auto texpos = reserved_range.get_new_texpos();
+        if (texpos != -1) {
+            insert_texture(surface, texpos);
+            g_handle_to_reserved_texpos.emplace(handle, texpos);
+            dummy_surface->refcount--;
+            return handle;
+        }
+
+        if (loading_state) { // if we in loading state and reserved range is full -> error
+            ERR(textures).printerr("reserved range limit has been reached, use dynamic range\n");
+            return 0;
+        }
+    }
+
+    // if we here in loading state = true, then it should be dynamic range -> delay reg
+    if (loading_state) {
+        g_delayed_regs.push_back(handle);
+    } else {
+        auto texpos = add_texture(surface);
+        g_handle_to_texpos.emplace(handle, texpos);
+    }
+
+    return handle;
+}
+
+std::vector<TexposHandle> Textures::loadTileset(const std::string& file, int tile_px_w,
+                                                int tile_px_h, bool reserved) {
+    if (g_tileset_to_handles.contains(file))
+        return g_tileset_to_handles[file];
+    if (!enabler)
+        return std::vector<TexposHandle>{};
+
+    SDL_Surface* surface = DFIMG_Load(file.c_str());
+    if (!surface) {
+        ERR(textures).printerr("unable to load textures from '%s'\n", file.c_str());
+        return std::vector<TexposHandle>{};
+    }
+
+    surface = canonicalize_format(surface);
+    auto handles = slice_tileset(surface, tile_px_w, tile_px_h, reserved);
+
+    DEBUG(textures).print("loaded %zd textures from '%s'\n", handles.size(), file.c_str());
+    g_tileset_to_handles[file] = handles;
+
+    return handles;
+}
+
+long Textures::getTexposByHandle(TexposHandle handle) {
+    if (!handle || !enabler)
+        return -1;
+
+    if (g_handle_to_reserved_texpos.contains(handle))
+        return g_handle_to_reserved_texpos[handle];
+    if (g_handle_to_texpos.contains(handle))
+        return g_handle_to_texpos[handle];
+    if (std::find(g_delayed_regs.begin(), g_delayed_regs.end(), handle) != g_delayed_regs.end())
+        return 0;
+    if (g_handle_to_surface.contains(handle)) {
+        g_handle_to_surface[handle]->refcount++; // prevent destruct on next FreeSurface by game
+        if (loading_state) { // reinit dor dynamic range during loading -> delayed
+            g_delayed_regs.push_back(handle);
+            return 0;
+        }
+        auto texpos = add_texture(g_handle_to_surface[handle]);
+        g_handle_to_texpos.emplace(handle, texpos);
+        return texpos;
+    }
+
+    return -1;
+}
+
+TexposHandle Textures::createTile(std::vector<uint32_t>& pixels, int tile_px_w, int tile_px_h,
+                                  bool reserved) {
+    if (!enabler)
+        return 0;
+
+    auto texture = create_texture(pixels, tile_px_w, tile_px_h);
+    auto handle = Textures::loadTexture(texture, reserved);
+    return handle;
+}
+
+std::vector<TexposHandle> Textures::createTileset(std::vector<uint32_t>& pixels, int texture_px_w,
+                                                  int texture_px_h, int tile_px_w, int tile_px_h,
+                                                  bool reserved) {
+    if (!enabler)
+        return std::vector<TexposHandle>{};
+
+    auto texture = create_texture(pixels, texture_px_w, texture_px_h);
+    auto handles = slice_tileset(texture, tile_px_w, tile_px_h, reserved);
+    return handles;
+}
+
+void Textures::deleteHandle(TexposHandle handle) {
+    if (!enabler)
+        return;
+
+    auto texpos = Textures::getTexposByHandle(handle);
+    if (texpos > 0)
+        delete_texture(texpos);
+    if (g_handle_to_reserved_texpos.contains(handle))
+        g_handle_to_reserved_texpos.erase(handle);
+    if (g_handle_to_texpos.contains(handle))
+        g_handle_to_texpos.erase(handle);
+    if (auto it = std::find(g_delayed_regs.begin(), g_delayed_regs.end(), handle);
+        it != g_delayed_regs.end())
+        g_delayed_regs.erase(it);
+    if (g_handle_to_surface.contains(handle)) {
+        auto surface = g_handle_to_surface[handle];
+        while (surface->refcount)
+            DFSDL_FreeSurface(surface);
+        g_handle_to_surface.erase(handle);
+    }
+}
+
+static void reset_texpos() {
+    DEBUG(textures).print("resetting texture mappings\n");
+    g_handle_to_texpos.clear();
+}
+
+static void reset_reserved_texpos() {
+    DEBUG(textures).print("resetting reserved texture mappings\n");
+    g_handle_to_reserved_texpos.clear();
+}
+
+static void reset_tilesets() {
+    DEBUG(textures).print("resetting tileset to handle mappings\n");
+    g_tileset_to_handles.clear();
+}
+
+static void reset_surface() {
+    DEBUG(textures).print("deleting cached surfaces\n");
+    for (auto& entry : g_handle_to_surface) {
+        DFSDL_FreeSurface(entry.second);
+    }
+    g_handle_to_surface.clear();
+}
+
+static void register_delayed_handles() {
+    DEBUG(textures).print("register delayed handles, size %zd\n", g_delayed_regs.size());
+    for (auto& handle : g_delayed_regs) {
+        auto texpos = add_texture(g_handle_to_surface[handle]);
+        g_handle_to_texpos.emplace(handle, texpos);
+    }
+    g_delayed_regs.clear();
+}
+
+// reset point on New Game
+struct tracking_stage_new_region : df::viewscreen_new_regionst {
+    typedef df::viewscreen_new_regionst interpose_base;
+
+    DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
+        if (this->m_raw_load_stage != this->raw_load_stage) {
+            TRACE(textures).print("raw_load_stage %d -> %d\n", this->m_raw_load_stage,
+                                  this->raw_load_stage);
+            bool tmp_state = loading_state;
+            loading_state = this->raw_load_stage >= 0 && this->raw_load_stage < 3 ? true : false;
+            if (tmp_state != loading_state && !loading_state)
+                register_delayed_handles();
+            this->m_raw_load_stage = this->raw_load_stage;
+            if (this->m_raw_load_stage == 1)
+                reset_texpos();
+        }
+        INTERPOSE_NEXT(logic)();
+    }
+
+  private:
+    inline static int m_raw_load_stage = -2; // not valid state at the start
+};
+IMPLEMENT_VMETHOD_INTERPOSE(tracking_stage_new_region, logic);
+
+// reset point on New Game in Existing World
+struct tracking_stage_adopt_region : df::viewscreen_adopt_regionst {
+    typedef df::viewscreen_adopt_regionst interpose_base;
+
+    DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
+        if (this->m_cur_step != this->cur_step) {
+            TRACE(textures).print("step %d -> %d\n", this->m_cur_step, this->cur_step);
+            bool tmp_state = loading_state;
+            loading_state = this->cur_step >= 0 && this->cur_step < 3 ? true : false;
+            if (tmp_state != loading_state && !loading_state)
+                register_delayed_handles();
+            this->m_cur_step = this->cur_step;
+            if (this->m_cur_step == 1)
+                reset_texpos();
+        }
+        INTERPOSE_NEXT(logic)();
+    }
+
+  private:
+    inline static int m_cur_step = -2; // not valid state at the start
+};
+IMPLEMENT_VMETHOD_INTERPOSE(tracking_stage_adopt_region, logic);
+
+// reset point on Load Game
+struct tracking_stage_load_region : df::viewscreen_loadgamest {
+    typedef df::viewscreen_loadgamest interpose_base;
+
+    DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
+        if (this->m_cur_step != this->cur_step) {
+            TRACE(textures).print("step %d -> %d\n", this->m_cur_step, this->cur_step);
+            bool tmp_state = loading_state;
+            loading_state = this->cur_step >= 0 && this->cur_step < 3 ? true : false;
+            if (tmp_state != loading_state && !loading_state)
+                register_delayed_handles();
+            this->m_cur_step = this->cur_step;
+            if (this->m_cur_step == 1)
+                reset_texpos();
+        }
+        INTERPOSE_NEXT(logic)();
+    }
+
+  private:
+    inline static int m_cur_step = -2; // not valid state at the start
+};
+IMPLEMENT_VMETHOD_INTERPOSE(tracking_stage_load_region, logic);
+
+// reset point on New Arena
+struct tracking_stage_new_arena : df::viewscreen_new_arenast {
+    typedef df::viewscreen_new_arenast interpose_base;
+
+    DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
+        if (this->m_cur_step != this->cur_step) {
+            TRACE(textures).print("step %d -> %d\n", this->m_cur_step, this->cur_step);
+            bool tmp_state = loading_state;
+            loading_state = this->cur_step >= 0 && this->cur_step < 3 ? true : false;
+            if (tmp_state != loading_state && !loading_state)
+                register_delayed_handles();
+            this->m_cur_step = this->cur_step;
+            if (this->m_cur_step == 0)
+                reset_texpos();
+        }
+        INTERPOSE_NEXT(logic)();
+    }
+
+  private:
+    inline static int m_cur_step = -2; // not valid state at the start
+};
+IMPLEMENT_VMETHOD_INTERPOSE(tracking_stage_new_arena, logic);
+
+static void install_reset_point() {
+    INTERPOSE_HOOK(tracking_stage_new_region, logic).apply();
+    INTERPOSE_HOOK(tracking_stage_adopt_region, logic).apply();
+    INTERPOSE_HOOK(tracking_stage_load_region, logic).apply();
+    INTERPOSE_HOOK(tracking_stage_new_arena, logic).apply();
+}
+
+static void uninstall_reset_point() {
+    INTERPOSE_HOOK(tracking_stage_new_region, logic).remove();
+    INTERPOSE_HOOK(tracking_stage_adopt_region, logic).remove();
+    INTERPOSE_HOOK(tracking_stage_load_region, logic).remove();
+    INTERPOSE_HOOK(tracking_stage_new_arena, logic).remove();
+}
+
+static void reserve_static_range() {
+    if (static_cast<size_t>(enabler->textures.init_texture_size) != enabler->textures.raws.size()) {
+        WARN(textures).print(
+            "reserved range can't be installed! all textures will be loaded to dynamic range!");
+        return;
+    }
+    reserved_range.init(enabler->textures.init_texture_size);
+    dummy_surface =
+        DFSDL_CreateRGBSurfaceWithFormat(0, 0, 0, 32, SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA32);
+    dummy_surface->refcount += ReservedRange::size;
+    for (int32_t i = 0; i < ReservedRange::size; i++) {
+        add_texture(dummy_surface);
+    }
+    enabler->textures.init_texture_size += ReservedRange::size;
+}
+
+void Textures::init(color_ostream& out) {
+    if (!enabler)
+        return;
+
+    reserve_static_range();
+    install_reset_point();
+    DEBUG(textures, out)
+        .print("dynamic texture loading ready, reserved range %d-%d\n", reserved_range.start,
+               reserved_range.end);
+}
+
+void Textures::cleanup() {
+    if (!enabler)
+        return;
+
+    reset_texpos();
+    reset_reserved_texpos();
+    reset_tilesets();
+    reset_surface();
+    uninstall_reset_point();
+}
diff --git a/library/modules/Translation.cpp b/library/modules/Translation.cpp
index 282039c02..8ebae035f 100644
--- a/library/modules/Translation.cpp
+++ b/library/modules/Translation.cpp
@@ -27,7 +27,6 @@ distribution.
 #include <string>
 #include <vector>
 #include <map>
-using namespace std;
 
 #include "modules/Translation.h"
 #include "VersionInfo.h"
@@ -44,6 +43,8 @@ using namespace df::enums;
 #include "df/world.h"
 #include "df/d_init.h"
 
+using std::vector, std::string;
+
 using df::global::world;
 using df::global::d_init;
 using df::global::gametype;
@@ -131,6 +132,37 @@ void Translation::setNickname(df::language_name *name, std::string nick)
     }
 }
 
+static string translate_word(const df::language_name * name, size_t word_idx) {
+    CHECK_NULL_POINTER(name);
+
+    auto translation = vector_get(world->raws.language.translations, name->language);
+    if (!translation)
+        return "";
+
+    auto word = vector_get(translation->words, word_idx);
+    if (!word)
+        return "";
+
+    return *word;
+}
+
+static string translate_english_word(const df::language_name * name, size_t part_idx) {
+    CHECK_NULL_POINTER(name);
+
+    if (part_idx >= 7)
+        return "";
+
+    auto words = vector_get(world->raws.language.words, name->words[part_idx]);
+    if (!words)
+        return "";
+
+    df::part_of_speech part = name->parts_of_speech[part_idx];
+    if (part < df::part_of_speech::Noun || part > df::part_of_speech::VerbGerund)
+        return "";
+
+    return words->forms[part];
+}
+
 string Translation::TranslateName(const df::language_name * name, bool inEnglish, bool onlyLastPart)
 {
     CHECK_NULL_POINTER(name);
@@ -166,20 +198,20 @@ string Translation::TranslateName(const df::language_name * name, bool inEnglish
         {
             word.clear();
             if (name->words[0] >= 0)
-                word.append(*world->raws.language.translations[name->language]->words[name->words[0]]);
+                word.append(translate_word(name, name->words[0]));
             if (name->words[1] >= 0)
-                word.append(*world->raws.language.translations[name->language]->words[name->words[1]]);
+                word.append(translate_word(name, name->words[1]));
             addNameWord(out, word);
         }
         word.clear();
         for (int i = 2; i <= 5; i++)
             if (name->words[i] >= 0)
-                word.append(*world->raws.language.translations[name->language]->words[name->words[i]]);
+                word.append(translate_word(name, name->words[i]));
         addNameWord(out, word);
         if (name->words[6] >= 0)
         {
             word.clear();
-            word.append(*world->raws.language.translations[name->language]->words[name->words[6]]);
+            word.append(translate_word(name, name->words[6]));
             addNameWord(out, word);
         }
     }
@@ -189,9 +221,9 @@ string Translation::TranslateName(const df::language_name * name, bool inEnglish
         {
             word.clear();
             if (name->words[0] >= 0)
-                word.append(world->raws.language.words[name->words[0]]->forms[name->parts_of_speech[0]]);
+                word.append(translate_english_word(name, 0));
             if (name->words[1] >= 0)
-                word.append(world->raws.language.words[name->words[1]]->forms[name->parts_of_speech[1]]);
+                word.append(translate_english_word(name, 1));
             addNameWord(out, word);
         }
         if (name->words[2] >= 0 || name->words[3] >= 0 || name->words[4] >= 0 || name->words[5] >= 0)
@@ -201,10 +233,10 @@ string Translation::TranslateName(const df::language_name * name, bool inEnglish
             else
                 out.append("The");
         }
-        for (int i = 2; i <= 5; i++)
+        for (size_t i = 2; i <= 5; i++)
         {
             if (name->words[i] >= 0)
-                addNameWord(out, world->raws.language.words[name->words[i]]->forms[name->parts_of_speech[i]]);
+                addNameWord(out, translate_english_word(name, i));
         }
         if (name->words[6] >= 0)
         {
@@ -213,7 +245,7 @@ string Translation::TranslateName(const df::language_name * name, bool inEnglish
             else
                 out.append("Of");
 
-            addNameWord(out, world->raws.language.words[name->words[6]]->forms[name->parts_of_speech[6]]);
+            addNameWord(out, translate_english_word(name, 6));
         }
     }
 
diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index 20badb1b5..ff36481b7 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -53,12 +53,14 @@ using namespace std;
 #include "df/activity_entry.h"
 #include "df/burrow.h"
 #include "df/caste_raw.h"
+#include "df/creature_interaction_effect_display_namest.h"
 #include "df/creature_raw.h"
 #include "df/curse_attr_change.h"
 #include "df/entity_position.h"
 #include "df/entity_position_assignment.h"
 #include "df/entity_raw.h"
 #include "df/entity_raw_flags.h"
+#include "df/entity_site_link.h"
 #include "df/identity_type.h"
 #include "df/game_mode.h"
 #include "df/histfig_entity_link_positionst.h"
@@ -71,23 +73,27 @@ using namespace std;
 #include "df/identity.h"
 #include "df/job.h"
 #include "df/nemesis_record.h"
-#include "df/squad.h"
 #include "df/tile_occupancy.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
+#include "df/syndrome.h"
+#include "df/training_assignment.h"
 #include "df/unit_inventory_item.h"
 #include "df/unit_misc_trait.h"
 #include "df/unit_relationship_type.h"
 #include "df/unit_skill.h"
 #include "df/unit_soul.h"
+#include "df/unit_syndrome.h"
 #include "df/unit_wound.h"
 #include "df/world.h"
+#include "df/world_data.h"
+#include "df/world_site.h"
 #include "df/unit_action.h"
 #include "df/unit_action_type_group.h"
 
 using namespace DFHack;
 using namespace df::enums;
 using df::global::world;
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::gamemode;
 using df::global::gametype;
 
@@ -175,10 +181,11 @@ bool Units::isFortControlled(df::unit *unit)
     if (unit->flags2.bits.visitor ||
         unit->flags2.bits.visitor_uninvited ||
         unit->flags2.bits.underworld ||
-        unit->flags2.bits.resident)
+        unit->flags2.bits.resident ||
+        unit->flags4.bits.agitated_wilderness_creature)
         return false;
 
-    return unit->civ_id != -1 && unit->civ_id == ui->civ_id;
+    return unit->civ_id != -1 && unit->civ_id == plotinfo->civ_id;
 }
 
 // check if creature belongs to the player's civilization
@@ -186,7 +193,7 @@ bool Units::isFortControlled(df::unit *unit)
 bool Units::isOwnCiv(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
-    return unit->civ_id == ui->civ_id;
+    return unit->civ_id == plotinfo->civ_id;
 }
 
 // check if creature belongs to the player's group
@@ -199,7 +206,7 @@ bool Units::isOwnGroup(df::unit* unit)
     for (size_t i = 0; i < histfig->entity_links.size(); i++)
     {
         auto link = histfig->entity_links[i];
-        if (link->entity_id == ui->group_id && link->getType() == df::histfig_entity_link_type::MEMBER)
+        if (link->entity_id == plotinfo->group_id && link->getType() == df::histfig_entity_link_type::MEMBER)
             return true;
     }
     return false;
@@ -210,7 +217,7 @@ bool Units::isOwnGroup(df::unit* unit)
 bool Units::isOwnRace(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
-    return unit->race == ui->race_id;
+    return unit->race == plotinfo->race_id;
 }
 
 
@@ -504,12 +511,61 @@ bool Units::isDomesticated(df::unit* unit)
     return tame;
 }
 
+static df::training_assignment * get_training_assignment(df::unit* unit) {
+    return binsearch_in_vector(df::global::plotinfo->equipment.training_assignments,
+        &df::training_assignment::animal_id, unit->id);
+}
+
+bool Units::isMarkedForTraining(df::unit* unit)
+{
+    CHECK_NULL_POINTER(unit);
+    return !!get_training_assignment(unit);
+}
+
+bool Units::isMarkedForTaming(df::unit* unit)
+{
+    CHECK_NULL_POINTER(unit);
+    auto assignment = get_training_assignment(unit);
+    return assignment && !assignment->flags.bits.train_war && !assignment->flags.bits.train_hunt;
+}
+
+bool Units::isMarkedForWarTraining(df::unit* unit)
+{
+    CHECK_NULL_POINTER(unit);
+    auto assignment = get_training_assignment(unit);
+    return assignment && assignment->flags.bits.train_war;
+}
+
+bool Units::isMarkedForHuntTraining(df::unit* unit)
+{
+    CHECK_NULL_POINTER(unit);
+    auto assignment = get_training_assignment(unit);
+    return assignment && assignment->flags.bits.train_hunt;
+}
+
 bool Units::isMarkedForSlaughter(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
     return unit->flags2.bits.slaughter == 1;
 }
 
+bool Units::isMarkedForGelding(df::unit* unit)
+{
+    CHECK_NULL_POINTER(unit);
+    return unit->flags3.bits.marked_for_gelding == 1;
+}
+
+bool Units::isGeldable(df::unit* unit)
+{
+    CHECK_NULL_POINTER(unit);
+
+    if(world->raws.creatures.all[unit->race]->caste[unit->caste]->flags.is_set(caste_raw_flags::GELDABLE)) {
+        return true;
+    }
+
+    return false;
+}
+
 bool Units::isGelded(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
@@ -535,6 +591,18 @@ bool Units::isEggLayer(df::unit* unit)
            || caste->flags.is_set(caste_raw_flags::LAYS_UNUSUAL_EGGS);
 }
 
+bool Units::isEggLayerRace(df::unit* unit)
+{
+    CHECK_NULL_POINTER(unit);
+    df::creature_raw *raw = world->raws.creatures.all[unit->race];
+    for (auto &caste : raw->caste) {
+        if (caste->flags.is_set(caste_raw_flags::LAYS_EGGS)
+                || caste->flags.is_set(caste_raw_flags::LAYS_UNUSUAL_EGGS))
+            return true;
+    }
+    return false;
+}
+
 bool Units::isGrazer(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
@@ -571,22 +639,19 @@ bool Units::isMischievous(df::unit *unit)
 bool Units::isAvailableForAdoption(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
-    auto refs = unit->specific_refs;
-    for(size_t i=0; i<refs.size(); i++)
-    {
-        auto ref = refs[i];
-        auto reftype = ref->type;
-        if( reftype == df::specific_ref_type::PETINFO_PET )
-        {
-            //df::pet_info* pet = ref->pet;
-            return true;
-        }
-    }
+    return unit->flags3.bits.available_for_adoption;
+}
+
+bool Units::isPet(df::unit* unit)
+{
+    CHECK_NULL_POINTER(unit);
+
+    if(unit->relationship_ids[df::unit_relationship_type::Pet] != -1)
+        return true;
 
     return false;
 }
 
-
 bool Units::hasExtravision(df::unit *unit)
 {
     CHECK_NULL_POINTER(unit);
@@ -622,8 +687,8 @@ bool Units::isDwarf(df::unit *unit)
 {
     CHECK_NULL_POINTER(unit);
 
-    return unit->race == ui->race_id ||
-           unit->enemy.normal_race == ui->race_id;
+    return unit->race == plotinfo->race_id ||
+           unit->enemy.normal_race == plotinfo->race_id;
 }
 
 bool Units::isAnimal(df::unit* unit) {
@@ -756,6 +821,68 @@ bool Units::getUnitsInBox (std::vector<df::unit*> &units,
     return true;
 }
 
+static int32_t get_noble_position_id(const df::historical_entity::T_positions &positions, const string &noble) {
+    string target_id = toUpper(noble);
+    for (auto &position : positions.own) {
+        if (position->code == target_id)
+            return position->id;
+    }
+    return -1;
+}
+
+static void add_assigned_noble_units(vector<df::unit *> &units, const df::historical_entity::T_positions &positions, int32_t noble_position_id, size_t limit) {
+    for (auto &assignment : positions.assignments) {
+        if (assignment->position_id != noble_position_id)
+            continue;
+        auto histfig = df::historical_figure::find(assignment->histfig);
+        if (!histfig)
+            continue;
+        auto unit = df::unit::find(histfig->unit_id);
+        if (!unit)
+            continue;
+        units.emplace_back(unit);
+        if (limit > 0 && units.size() >= limit)
+            break;
+    }
+}
+
+static void get_units_by_noble_role(vector<df::unit *> &units, string noble, size_t limit = 0) {
+    auto &site = df::global::world->world_data->active_site[0];
+    for (auto &link : site->entity_links) {
+        auto he = df::historical_entity::find(link->entity_id);
+        if (!he ||
+                (he->type != df::historical_entity_type::SiteGovernment &&
+                 he->type != df::historical_entity_type::Civilization))
+            continue;
+        int32_t noble_position_id = get_noble_position_id(he->positions, noble);
+        if (noble_position_id < 0)
+            continue;
+        add_assigned_noble_units(units, he->positions, noble_position_id, limit);
+    }
+}
+
+bool Units::getUnitsByNobleRole(vector<df::unit *> &units, std::string noble) {
+    units.clear();
+    get_units_by_noble_role(units, noble);
+    return !units.empty();
+}
+
+df::unit *Units::getUnitByNobleRole(string noble) {
+    vector<df::unit *> units;
+    get_units_by_noble_role(units, noble, 1);
+    if (units.empty())
+        return NULL;
+    return units[0];
+}
+
+bool Units::getCitizens(std::vector<df::unit *> &citizens, bool ignore_sanity) {
+    for (auto &unit : world->units.active) {
+        if (isCitizen(unit, ignore_sanity) && isAlive(unit))
+            citizens.emplace_back(unit);
+    }
+    return true;
+}
+
 int32_t Units::findIndexById(int32_t creature_id)
 {
     return df::unit::binsearch_index(world->units.all, creature_id);
@@ -1025,9 +1152,12 @@ df::unit_misc_trait *Units::getMiscTrait(df::unit *unit, df::misc_trait_type typ
 // get race name by id or unit pointer
 string Units::getRaceNameById(int32_t id)
 {
-    df::creature_raw *raw = world->raws.creatures.all[id];
-    if (raw)
-        return raw->creature_id;
+    if (id >= 0 && (size_t)id < world->raws.creatures.all.size())
+    {
+        df::creature_raw* raw = world->raws.creatures.all[id];
+        if (raw)
+            return raw->creature_id;
+    }
     return "";
 }
 string Units::getRaceName(df::unit* unit)
@@ -1036,6 +1166,23 @@ string Units::getRaceName(df::unit* unit)
     return getRaceNameById(unit->race);
 }
 
+// get human-readable race name by id or unit pointer
+string Units::getRaceReadableNameById(int32_t id)
+{
+    if (id >= 0 && (size_t)id < world->raws.creatures.all.size())
+    {
+        df::creature_raw* raw = world->raws.creatures.all[id];
+        if (raw)
+            return raw->name[0];
+    }
+    return "";
+}
+string Units::getRaceReadableName(df::unit* unit)
+{
+    CHECK_NULL_POINTER(unit);
+    return getRaceReadableNameById(unit->race);
+}
+
 void df_unit_get_physical_description(df::unit* unit, string* out_str)
 {
     static auto* const fn =
@@ -1058,9 +1205,12 @@ string Units::getPhysicalDescription(df::unit* unit)
 // get plural of race name (used for display in autobutcher UI and for sorting the watchlist)
 string Units::getRaceNamePluralById(int32_t id)
 {
-    df::creature_raw *raw = world->raws.creatures.all[id];
-    if (raw)
-        return raw->name[1]; // second field is plural of race name
+    if (id >= 0 && (size_t)id < world->raws.creatures.all.size())
+    {
+        df::creature_raw* raw = world->raws.creatures.all[id];
+        if (raw)
+            return raw->name[1]; // second field is plural of race name
+    }
     return "";
 }
 
@@ -1072,9 +1222,16 @@ string Units::getRaceNamePlural(df::unit* unit)
 
 string Units::getRaceBabyNameById(int32_t id)
 {
-    df::creature_raw *raw = world->raws.creatures.all[id];
-    if (raw)
-        return raw->general_baby_name[0];
+    if (id >= 0 && (size_t)id < world->raws.creatures.all.size())
+    {
+        df::creature_raw* raw = world->raws.creatures.all[id];
+        if (raw) {
+            string & baby_name = raw->general_baby_name[0];
+            if (!baby_name.empty())
+                return baby_name;
+            return getRaceReadableNameById(id) + " baby";
+        }
+    }
     return "";
 }
 
@@ -1086,9 +1243,16 @@ string Units::getRaceBabyName(df::unit* unit)
 
 string Units::getRaceChildNameById(int32_t id)
 {
-    df::creature_raw *raw = world->raws.creatures.all[id];
-    if (raw)
-        return raw->general_child_name[0];
+    if (id >= 0 && (size_t)id < world->raws.creatures.all.size())
+    {
+        df::creature_raw* raw = world->raws.creatures.all[id];
+        if (raw) {
+            string & child_name = raw->general_child_name[0];
+            if (!child_name.empty())
+                return child_name;
+            return getRaceReadableNameById(id) + " child";
+        }
+    }
     return "";
 }
 
@@ -1098,6 +1262,48 @@ string Units::getRaceChildName(df::unit* unit)
     return getRaceChildNameById(unit->race);
 }
 
+static string get_caste_name(df::unit* unit) {
+    int32_t id = unit->race;
+    if (id < 0 || (size_t)id >= world->raws.creatures.all.size())
+        return "";
+    df::creature_raw* raw = world->raws.creatures.all[id];
+    int16_t caste = unit->caste;
+    if (!raw || caste < 0 || (size_t)caste >= raw->caste.size())
+        return "";
+    return raw->caste[caste]->caste_name[0];
+}
+
+string Units::getReadableName(df::unit* unit) {
+    string race_name = isBaby(unit) ? getRaceBabyName(unit) :
+        (isChild(unit) ? getRaceChildName(unit) : get_caste_name(unit));
+    if (race_name.empty())
+        race_name = getRaceReadableName(unit);
+    if (isHunter(unit))
+        race_name = "hunter " + race_name;
+    if (isWar(unit))
+        race_name = "war " + race_name;
+    string name = Translation::TranslateName(getVisibleName(unit), false);
+    if (name.empty()) {
+        name = race_name;
+    } else {
+        name += ", ";
+        name += race_name;
+    }
+    for (auto unit_syndrome : unit->syndromes.active) {
+        auto syndrome = df::syndrome::find(unit_syndrome->type);
+        if (!syndrome)
+            continue;
+        for (auto effect : syndrome->ce) {
+            auto cie = strict_virtual_cast<df::creature_interaction_effect_display_namest>(effect);
+            if (!cie)
+                continue;
+            name += " ";
+            name += cie->name;
+            break;
+        }
+    }
+    return name;
+}
 
 double Units::getAge(df::unit *unit, bool true_age)
 {
@@ -1301,7 +1507,7 @@ bool Units::setLaborValidity(df::unit_labor labor, bool isValid)
         return false;
     if (labor == df::unit_labor::NONE)
         return false;
-    df::historical_entity *entity = df::historical_entity::find(ui->civ_id);
+    df::historical_entity *entity = df::historical_entity::find(plotinfo->civ_id);
     if (!entity || !entity->entity_raw)
         return false;
     entity->entity_raw->jobs.permitted_labor[labor] = isValid;
@@ -1426,7 +1632,7 @@ int Units::computeMovementSpeed(df::unit *unit)
     if (isBaby(unit))
         speed += 3000;
 
-    if (unit->flags3.bits.unk15)
+    if (unit->flags3.bits.diving)
         speed /= 20;
 
     if (unit->counters2.exhaustion >= 2000)
@@ -1704,7 +1910,7 @@ std::string Units::getCasteProfessionName(int race, int casteid, df::profession
 
     if (pid < (df::profession)0 || !is_valid_enum_item(pid))
         return "";
-    int16_t current_race = df::global::ui->race_id;
+    int16_t current_race = df::global::plotinfo->race_id;
     if (df::global::gamemode && *df::global::gamemode == df::game_mode::ADVENTURE)
         current_race = world->units.active[0]->race;
     bool use_race_prefix = (race >= 0 && race != current_race);
@@ -1895,19 +2101,6 @@ bool Units::isGoalAchieved(df::unit *unit, size_t goalIndex)
         && unit->status.current_soul->personality.dreams[goalIndex]->flags.whole != 0;
 }
 
-std::string Units::getSquadName(df::unit *unit)
-{
-    CHECK_NULL_POINTER(unit);
-    if (unit->military.squad_id == -1)
-        return "";
-    df::squad *squad = df::squad::find(unit->military.squad_id);
-    if (!squad)
-        return "";
-    if (squad->alias.size() > 0)
-        return squad->alias;
-    return Translation::TranslateName(&squad->name, true);
-}
-
 df::activity_entry *Units::getMainSocialActivity(df::unit *unit)
 {
     CHECK_NULL_POINTER(unit);
@@ -1936,7 +2129,7 @@ int Units::getStressCategory(df::unit *unit)
     if (!unit->status.current_soul)
         return int(stress_cutoffs.size()) / 2;
 
-    return getStressCategoryRaw(unit->status.current_soul->personality.stress_level);
+    return getStressCategoryRaw(unit->status.current_soul->personality.stress);
 }
 
 int Units::getStressCategoryRaw(int32_t stress_level)
diff --git a/library/xml b/library/xml
index 1b1ffd406..6375044bc 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 1b1ffd4069652bf189ac0bc229ddf027009c110a
+Subproject commit 6375044bc504cf5bf4579659755966bb30704b7f
diff --git a/package/linux/dfhack b/package/linux/dfhack
index 6b542f405..fab3d0602 100755
--- a/package/linux/dfhack
+++ b/package/linux/dfhack
@@ -1,26 +1,20 @@
 #!/bin/sh
 
-# NOTE: This is dfhack's modification of the normal invocation script,
-# changed to properly set LD_PRELOAD so as to run DFHACK.
-#
 # You can run DF under gdb by passing -g or --gdb as the first argument.
 #
 # If the file ".dfhackrc" exists in the DF directory or your home directory
 # it will be sourced by this script, to let you set environmental variables.
 # If it exists in both places it will first source the one in your home
-# directory, then the on in the game directory.
+# directory, then the one in the game directory.
 #
 # Shell variables .dfhackrc can set to affect this script:
 #     DF_GDB_OPTS: Options to pass to gdb, if it's being run
 #     DF_VALGRIND_OPTS: Options to pass to valgrind, if it's being run
 #     DF_HELGRIND_OPTS: Options to pass to helgrind, if it's being run
 #     DF_POST_CMD: Shell command to be run at very end of script
-#     DFHACK_NO_RENAME_LIBSTDCXX: Non-empty to prevent automatically renaming libstdc++
 
 DF_DIR=$(dirname "$0")
 cd "${DF_DIR}"
-export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
-#export SDL_VIDEO_CENTERED=1 # Centre the screen.  Messes up resizing.
 
 # User config files
 RC=".dfhackrc"
@@ -32,22 +26,6 @@ if [ -r "./$RC" ]; then
     . "./$RC"
 fi
 
-# Disable bundled libstdc++
-libcxx_orig="libs/libstdc++.so.6"
-libcxx_backup="libs/libstdc++.so.6.backup"
-if [ -z "${DFHACK_NO_RENAME_LIBSTDCXX:-}" ] && [ -e "$libcxx_orig" ] && [ ! -e "$libcxx_backup" ]; then
-    mv "$libcxx_orig" "$libcxx_backup"
-    cat <<EOF
-NOTICE: $libcxx_orig has been moved to $libcxx_backup
-for better compatibility. If you are using an older distro and this breaks,
-run "cp $libcxx_backup $libcxx_orig", or add this to
-$HOME/$RC to affect future DFHack installations:
-
-    export DFHACK_NO_RENAME_LIBSTDCXX=1
-
-EOF
-fi
-
 if [ ! -t 0 ]; then
     stty() {
         return
@@ -57,15 +35,8 @@ fi
 # Save current terminal settings
 old_tty_settings=$(stty -g)
 
-# Use distro_fixes.sh from LNP if it exists
-DISTROFIXES="distro_fixes.sh"
-if [ -r "$DISTROFIXES" ]; then
-    . "./$DISTROFIXES"
-fi
-
 # Now run
-
-export LD_LIBRARY_PATH="./hack/libs:./hack:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH=".:$LD_LIBRARY_PATH"
 
 LIB="./hack/libdfhack.so"
 LIBSAN=""
@@ -74,7 +45,7 @@ if which objdump > /dev/null; then
 fi
 PRELOAD_LIB="${PRELOAD_LIB:+$PRELOAD_LIB:}${LIBSAN}${LIB}"
 
-setarch_arch=$(cat hack/dfhack_setarch.txt || printf i386)
+setarch_arch=$(cat hack/dfhack_setarch.txt || printf x86_64)
 if ! setarch "$setarch_arch" -R true 2>/dev/null; then
     echo "warn: architecture '$setarch_arch' not supported by setarch" >&2
     if [ "$setarch_arch" = "i386" ]; then
@@ -89,8 +60,8 @@ fi
 case "$1" in
   -g | --gdb)
     shift
-    echo "set exec-wrapper env LD_LIBRARY_PATH='$LD_LIBRARY_PATH' LD_PRELOAD='$PRELOAD_LIB' MALLOC_PERTURB_=45" > gdbcmd.tmp
-    gdb $DF_GDB_OPTS -x gdbcmd.tmp --args ./libs/Dwarf_Fortress "$@"
+    echo "set exec-wrapper env LD_LIBRARY_PATH='$LD_LIBRARY_PATH' LD_PRELOAD='${LD_PRELOAD:+$LD_PRELOAD:}$PRELOAD_LIB' MALLOC_PERTURB_=45" > gdbcmd.tmp
+    gdb $DF_GDB_OPTS -x gdbcmd.tmp --args ./dwarfort "$@"
     rm gdbcmd.tmp
     ret=$?
     ;;
@@ -107,11 +78,11 @@ case "$1" in
     echo "set environment MALLOC_PERTURB_ 45" >> gdbcmd.tmp
     echo "set startup-with-shell off" >> gdbcmd.tmp
     echo "target extended-remote localhost:12345" >> gdbcmd.tmp
-    echo "set remote exec-file ./libs/Dwarf_Fortress" >> gdbcmd.tmp
+    echo "set remote exec-file ./dwarfort" >> gdbcmd.tmp
     # For some reason gdb ignores sysroot setting if it is from same file as
     # target extended-remote command
     echo "set sysroot /" > gdbcmd_sysroot.tmp
-    gdb $DF_GDB_OPTS -x gdbcmd.tmp -x gdbcmd_sysroot.tmp --args ./libs/Dwarf_Fortress "$@"
+    gdb $DF_GDB_OPTS -x gdbcmd.tmp -x gdbcmd_sysroot.tmp --args ./dwarfort "$@"
     rm gdbcmd.tmp gdbcmd_sysroot.tmp
     ret=$?
     ;;
@@ -124,35 +95,35 @@ case "$1" in
     ;;
   -h | --helgrind)
     shift
-    LD_PRELOAD="$PRELOAD_LIB" setarch "$setarch_arch" -R valgrind $DF_HELGRIND_OPTS --tool=helgrind --log-file=helgrind.log ./libs/Dwarf_Fortress "$@"
+    LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}$PRELOAD_LIB" setarch "$setarch_arch" -R valgrind $DF_HELGRIND_OPTS --tool=helgrind --log-file=helgrind.log ./dwarfort "$@"
     ret=$?
     ;;
   -v | --valgrind)
     shift
-    LD_PRELOAD="$PRELOAD_LIB" setarch "$setarch_arch" -R valgrind $DF_VALGRIND_OPTS --log-file=valgrind.log ./libs/Dwarf_Fortress "$@"
+    LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}$PRELOAD_LIB" setarch "$setarch_arch" -R valgrind $DF_VALGRIND_OPTS --log-file=valgrind.log ./dwarfort "$@"
     ret=$?
     ;;
   -c | --callgrind)
     shift
-    LD_PRELOAD="$PRELOAD_LIB" setarch "$setarch_arch" -R valgrind $DF_CALLGRIND_OPTS --tool=callgrind --separate-threads=yes --dump-instr=yes --instr-atstart=no --log-file=callgrind.log ./libs/Dwarf_Fortress "$@"
+    LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}$PRELOAD_LIB" setarch "$setarch_arch" -R valgrind $DF_CALLGRIND_OPTS --tool=callgrind --separate-threads=yes --dump-instr=yes --instr-atstart=no --log-file=callgrind.log ./dwarfort "$@"
     ret=$?
     ;;
   --strace)
     shift
-    strace -f setarch "$setarch_arch" -R env LD_PRELOAD="$PRELOAD_LIB" ./libs/Dwarf_Fortress "$@" 2> strace.log
+    strace -f setarch "$setarch_arch" -R env LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}$PRELOAD_LIB" ./dwarfort "$@" 2> strace.log
     ret=$?
     ;;
   -x | --exec)
-    exec setarch "$setarch_arch" -R env LD_PRELOAD="$PRELOAD_LIB" ./libs/Dwarf_Fortress "$@"
+    exec setarch "$setarch_arch" -R env LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}$PRELOAD_LIB" ./dwarfort "$@"
     # script does not resume
     ;;
   --sc | --sizecheck)
     PRELOAD_LIB="${PRELOAD_LIB:+$PRELOAD_LIB:}./hack/libsizecheck.so"
-    MALLOC_PERTURB_=45 setarch "$setarch_arch" -R env LD_PRELOAD="$PRELOAD_LIB" ./libs/Dwarf_Fortress "$@"
+    MALLOC_PERTURB_=45 setarch "$setarch_arch" -R env LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}$PRELOAD_LIB" ./dwarfort "$@"
     ret=$?
     ;;
   *)
-    setarch "$setarch_arch" -R env LD_PRELOAD="$PRELOAD_LIB" ./libs/Dwarf_Fortress "$@"
+    setarch "$setarch_arch" -R env LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}$PRELOAD_LIB" ./dwarfort "$@"
     ret=$?
     ;;
 esac
diff --git a/package/linux/dfhack-run b/package/linux/dfhack-run
index 55001cfcb..b5e6ccfe2 100755
--- a/package/linux/dfhack-run
+++ b/package/linux/dfhack-run
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DF_DIR=$(dirname "$0")
+DF_DIR=$(dirname "$(readlink -f "$0")")
 cd "${DF_DIR}"
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./hack/libs":"./hack"
diff --git a/package/windows/CMakeLists.txt b/package/windows/CMakeLists.txt
new file mode 100644
index 000000000..ad5469c6b
--- /dev/null
+++ b/package/windows/CMakeLists.txt
@@ -0,0 +1,32 @@
+project(package_windows)
+
+option(BUILD_DFLAUNCH "Whether to build the Steam launcher exectuable (requires Steam SDK)." OFF)
+
+if(WIN32 AND BUILD_DFLAUNCH)
+    # builder must manually download Steam SDK
+    set (STEAMAPI_DIR ${dfhack_SOURCE_DIR}/depends/steam)
+    set (STEAMAPI_VER 156)
+    set (STEAMAPI_ZIP_EXPECTED_HASH af5a579990dbe5ae4c1b0689260d001b)
+    set (STEAMSDK_ZIP ${STEAMAPI_DIR}/steamworks_sdk_${STEAMAPI_VER}.zip)
+
+    set (STEAM_SDK_HASH "NOT FOUND")
+    file(MD5 ${STEAMSDK_ZIP} STEAM_SDK_HASH)
+    if (NOT (${STEAM_SDK_HASH} STREQUAL ${STEAMAPI_ZIP_EXPECTED_HASH}))
+        message(FATAL_ERROR "You need the Steamworks SDK at ${STEAMSDK_ZIP} to build launchdf.exe. Please disable the BUILD_DFLAUNCH CMake option or download the Steam SDK from: https://partner.steamgames.com/downloads/steamworks_sdk_${STEAMAPI_VER}.zip")
+    endif()
+    if (${STEAMSDK_ZIP} IS_NEWER_THAN ${STEAMAPI_DIR}/sdk)
+        file(ARCHIVE_EXTRACT
+            INPUT ${STEAMSDK_ZIP}
+            DESTINATION ${STEAMAPI_DIR})
+    endif()
+
+    set(STEAMAPI_LIBRARY "${STEAMAPI_DIR}/sdk/redistributable_bin/win64/steam_api64.lib")
+    set(STEAMAPI_SOURCE_DIR "${STEAMAPI_DIR}/sdk/public/steam")
+    set(STEAMAPI_SHARED_LIBRARY "${STEAMAPI_DIR}/sdk/redistributable_bin/win64/steam_api64.dll")
+
+    include_directories(${STEAMAPI_SOURCE_DIR})
+    link_libraries(${STEAMAPI_LIBRARY})
+    add_executable(launchdf WIN32 launchdf.cpp)
+    install(TARGETS launchdf DESTINATION ${DFHACK_DATA_DESTINATION})
+    install(FILES ${STEAMAPI_SHARED_LIBRARY} DESTINATION ${DFHACK_DATA_DESTINATION})
+endif()
diff --git a/package/windows/launchdf.cpp b/package/windows/launchdf.cpp
new file mode 100644
index 000000000..f9ed11f66
--- /dev/null
+++ b/package/windows/launchdf.cpp
@@ -0,0 +1,232 @@
+#include <process.h>
+#include <windows.h>
+#include <TlHelp32.h>
+#include "steam_api.h"
+
+#include <string>
+
+const uint32 DFHACK_STEAM_APPID = 2346660;
+const uint32 DF_STEAM_APPID = 975370;
+
+static BOOL is_running_on_wine() {
+    typedef const char* (CDECL wine_get_version)(void);
+    static wine_get_version* pwine_get_version;
+    HMODULE hntdll = GetModuleHandle("ntdll.dll");
+    if(!hntdll)
+        return FALSE;
+
+    pwine_get_version = (wine_get_version*) GetProcAddress(hntdll, "wine_get_version");
+    return !!pwine_get_version;
+}
+
+static LPCWSTR launch_via_steam_posix() {
+    const char* argv[] = { "/bin/sh", "-c", "\"steam -applaunch 975370\"", NULL };
+
+    // does not return on success
+    _execv(argv[0], argv);
+
+    return L"Could not launch Dwarf Fortress";
+}
+
+static LPCWSTR launch_via_steam_windows() {
+    STARTUPINFOW si;
+    PROCESS_INFORMATION pi;
+
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+    ZeroMemory(&pi, sizeof(pi));
+
+    WCHAR steamPath[1024] = L"";
+    DWORD datasize = 1024;
+
+    LONG retCode = RegGetValueW(HKEY_CURRENT_USER, L"SOFTWARE\\Valve\\Steam",
+            L"SteamExe", RRF_RT_REG_SZ, NULL, &steamPath, &datasize);
+
+    if (retCode != ERROR_SUCCESS)
+        return L"Could not find Steam client executable";
+
+    WCHAR commandLine[1024] = L"steam.exe -applaunch 975370";
+
+    BOOL res = CreateProcessW(steamPath, commandLine,
+        NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+
+    if (res)
+    {
+        WaitForSingleObject(pi.hProcess, INFINITE);
+
+        CloseHandle(pi.hProcess);
+        CloseHandle(pi.hThread);
+        return NULL;
+    }
+    else
+    {
+        return L"Could not launch Dwarf Fortress";
+    }
+}
+
+static LPCWSTR launch_direct() {
+    STARTUPINFOW si;
+    PROCESS_INFORMATION pi;
+
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+    ZeroMemory(&pi, sizeof(pi));
+
+    BOOL res = CreateProcessW(L"Dwarf Fortress.exe",
+            NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+
+    if (res)
+    {
+        WaitForSingleObject(pi.hProcess, INFINITE);
+
+        CloseHandle(pi.hProcess);
+        CloseHandle(pi.hThread);
+        return NULL;
+    }
+
+    return L"Could not launch via non-steam fallback method";
+}
+
+DWORD findDwarfFortressProcess()
+{
+    PROCESSENTRY32W entry;
+    entry.dwSize = sizeof(PROCESSENTRY32W);
+
+    const auto snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, NULL);
+
+    if (!Process32FirstW(snapshot, &entry))
+    {
+        CloseHandle(snapshot);
+        return -1;
+    }
+
+    do {
+        std::wstring executableName(entry.szExeFile);
+        if (executableName == L"Dwarf Fortress.exe")
+        {
+            CloseHandle(snapshot);
+            return entry.th32ProcessID;
+        }
+    } while (Process32NextW(snapshot, &entry));
+
+    CloseHandle(snapshot);
+    return -1;
+}
+
+bool waitForDF() {
+    DWORD df_pid = findDwarfFortressProcess();
+
+    if (df_pid == -1)
+        return false;
+
+    HANDLE hDF = OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE, df_pid);
+
+    // in the future open an IPC connection so that we can proxy SteamAPI calls for the DFSteam module
+
+    // this will eventuallyh need to become a loop with a WaitForMultipleObjects call
+    WaitForSingleObject(hDF, INFINITE);
+
+    CloseHandle(hDF);
+
+    return true;
+}
+
+int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpCmdLine, _In_ int nShowCmd) {
+
+    // initialize steam context
+    if (SteamAPI_RestartAppIfNecessary(DFHACK_STEAM_APPID))
+    {
+        exit(0);
+    }
+
+    if (waitForDF())
+        exit(0);
+
+    if (!SteamAPI_Init())
+    {
+        // could not initialize steam context, attempt fallback launch
+        LPCWSTR err = launch_direct();
+        if (err != NULL)
+        {
+            MessageBoxW(NULL, err, NULL, 0);
+            exit(1);
+        }
+        exit(0);
+    }
+
+    bool wine = is_running_on_wine();
+
+    if (wine)
+    {
+        // attempt launch via steam client
+        LPCWSTR err = launch_via_steam_posix();
+
+        if (err != NULL)
+            // steam client launch failed, attempt fallback launch
+            err = launch_direct();
+
+        if (err != NULL)
+        {
+            MessageBoxW(NULL, err, NULL, 0);
+            exit(1);
+        }
+        exit(0);
+    }
+
+    // steam detected and not running in wine
+
+    bool df_installed = SteamApps()->BIsAppInstalled(DF_STEAM_APPID);
+
+    if (!df_installed)
+    {
+        // Steam DF is not installed. Assume DF is installed in same directory as DFHack and do a fallback launch
+        LPCWSTR err = launch_direct();
+
+        if (err != NULL)
+        {
+            MessageBoxW(NULL, err, NULL, 0);
+            exit(1);
+        }
+        exit(0);
+    }
+
+    // obtain DF app path
+
+    char buf[2048] = "";
+
+    int b1 = SteamApps()->GetAppInstallDir(DFHACK_STEAM_APPID, (char*)&buf, 2048);
+    std::string dfhack_install_folder = (b1 != -1) ? std::string(buf) : "";
+
+    int b2 = SteamApps()->GetAppInstallDir(DF_STEAM_APPID, (char*)&buf, 2048);
+    std::string df_install_folder = (b2 != -1) ? std::string(buf) : "";
+
+
+    if (df_install_folder != dfhack_install_folder)
+    {
+        // DF and DFHack are not installed in the same library
+        MessageBoxW(NULL, L"DFHack and Dwarf Fortress must be installed in the same Steam library.\nAborting.", NULL, 0);
+        exit(1);
+    }
+
+    if (waitForDF())
+        exit(0);
+
+    LPCWSTR err = launch_via_steam_windows();
+    if (err != NULL)
+    {
+        MessageBoxW(NULL, err, NULL, 0);
+        exit(1);
+    }
+
+    int counter = 0;
+    while (!waitForDF()) {
+        if (counter++ > 60)
+        {
+            MessageBoxW(NULL, L"Dwarf Fortress took too long to launch, aborting", NULL, 0);
+            exit(1);
+        }
+        Sleep(1000);
+    }
+
+    exit(0);
+}
diff --git a/plugins/.gitignore b/plugins/.gitignore
new file mode 100644
index 000000000..5b0a52473
--- /dev/null
+++ b/plugins/.gitignore
@@ -0,0 +1 @@
+!buildingplan/
diff --git a/plugins/3dveins.cpp b/plugins/3dveins.cpp
index eaf741caf..6b95c2e87 100644
--- a/plugins/3dveins.cpp
+++ b/plugins/3dveins.cpp
@@ -7,15 +7,16 @@
 
 #include "Core.h"
 #include "Console.h"
+#include "DataDefs.h"
+#include "Debug.h"
 #include "Export.h"
+#include "MiscUtils.h"
 #include "PluginManager.h"
+
 #include "modules/MapCache.h"
 #include "modules/Random.h"
 #include "modules/World.h"
 
-#include "MiscUtils.h"
-
-#include "DataDefs.h"
 #include "df/world.h"
 #include "df/world_data.h"
 #include "df/world_region_details.h"
@@ -47,6 +48,10 @@ DFHACK_PLUGIN("3dveins");
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(gametype);
 
+namespace DFHack {
+    DBG_DECLARE(_3dveins, process, DebugCategory::LINFO);
+}
+
 command_result cmd_3dveins(color_ostream &out, std::vector <std::string> & parameters);
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
@@ -431,11 +436,13 @@ struct GeoLayer
     void print_mineral_stats(color_ostream &out)
     {
         for (auto it = mineral_count.begin(); it != mineral_count.end(); ++it)
-            out << "    " << MaterialInfo(0,it->first.first).getToken()
-                << " " << ENUM_KEY_STR(inclusion_type,it->first.second)
-                << ": \t\t" << it->second << " (" << (float(it->second)/unmined_tiles) << ")" << std::endl;
+            INFO(process, out).print("3dveins:    %s %s: %d  (%f)\n",
+                MaterialInfo(0, it->first.first).getToken().c_str(),
+                ENUM_KEY_STR(inclusion_type, it->first.second).c_str(),
+                it->second,
+                (float(it->second) / unmined_tiles));
 
-        out.print("    Total tiles: %d (%d unmined)\n", tiles, unmined_tiles);
+        INFO(process, out).print ("3dveins:    Total tiles: %d (%d unmined)\n", tiles, unmined_tiles);
     }
 
     bool form_veins(color_ostream &out);
@@ -467,12 +474,12 @@ struct GeoBiome
 
     void print_mineral_stats(color_ostream &out)
     {
-        out.print("Geological biome %d:\n", info.geo_index);
+        INFO(process,out).print("3dveins: Geological biome %d:\n", info.geo_index);
 
         for (size_t i = 0; i < layers.size(); i++)
             if (layers[i])
             {
-                out << "  Layer " << i << std::endl;
+                INFO(process, out).print("3dveins:  Layer %ld\n", i);
                 layers[i]->print_mineral_stats(out);
             }
     }
@@ -586,7 +593,7 @@ bool VeinGenerator::init_biomes()
 
         if (info.geo_index < 0 || !info.geobiome)
         {
-            out.printerr("Biome %zd is not defined.\n", i);
+            WARN(process, out).print("Biome %zd is not defined.\n", i);
             return false;
         }
 
@@ -797,8 +804,7 @@ bool VeinGenerator::scan_layer_depth(Block *b, df::coord2d column, int z)
             {
                 if (z != min_level[idx]-1 && min_level[idx] <= top_solid)
                 {
-                    out.printerr(
-                        "Discontinuous layer %d at (%d,%d,%d).\n",
+                    WARN(process, out).print("Discontinuous layer %d at (%d,%d,%d).\n",
                         layer->index, x+column.x*16, y+column.y*16, z
                     );
                     return false;
@@ -848,7 +854,7 @@ bool VeinGenerator::adjust_layer_depth(df::coord2d column)
 
                     if (max_level[i+1] != min_level[i]-1)
                     {
-                        out.printerr(
+                        WARN(process, out).print(
                             "Gap or overlap with next layer %d at (%d,%d,%d-%d).\n",
                             i+1, x+column.x*16, y+column.y*16, max_level[i+1], min_level[i]
                         );
@@ -891,7 +897,7 @@ bool VeinGenerator::adjust_layer_depth(df::coord2d column)
                         }
                     }
 
-                    out.printerr(
+                    WARN(process, out).print(
                         "Layer height change in layer %d at (%d,%d,%d): %d instead of %d.\n",
                         i, x+column.x*16, y+column.y*16, max_level[i],
                         size, biome->layers[i]->thickness
@@ -914,6 +920,7 @@ bool VeinGenerator::scan_block_tiles(Block *b, df::coord2d column, int z)
         for (int y = 0; y < 16; y++)
         {
             df::coord2d tile(x,y);
+
             GeoLayer *layer = mapLayer(b, tile);
             if (!layer)
                 continue;
@@ -932,7 +939,7 @@ bool VeinGenerator::scan_block_tiles(Block *b, df::coord2d column, int z)
                     if (unsigned(key.first) >= materials.size() ||
                         unsigned(key.second) >= NUM_INCLUSIONS)
                     {
-                        out.printerr("Invalid vein code: %d %d - aborting.\n",key.first,key.second);
+                        WARN(process, out).print("Invalid vein code: %d %d - aborting.\n",key.first,key.second);
                         return false;
                     }
 
@@ -941,7 +948,7 @@ bool VeinGenerator::scan_block_tiles(Block *b, df::coord2d column, int z)
                     if (status == -1)
                     {
                         // Report first occurence of unreasonable vein spec
-                        out.printerr(
+                        WARN(process, out).print(
                             "Unexpected vein %s %s - ",
                             MaterialInfo(0,key.first).getToken().c_str(),
                             ENUM_KEY_STR(inclusion_type, key.second).c_str()
@@ -949,9 +956,9 @@ bool VeinGenerator::scan_block_tiles(Block *b, df::coord2d column, int z)
 
                         status = materials[key.first].default_type;
                         if (status < 0)
-                            out.printerr("will be left in place.\n");
+                            WARN(process, out).print("will be left in place.\n");
                         else
-                            out.printerr(
+                            WARN(process, out).print(
                                 "correcting to %s.\n",
                                 ENUM_KEY_STR(inclusion_type, df::inclusion_type(status)).c_str()
                             );
@@ -1090,7 +1097,7 @@ void VeinGenerator::write_block_tiles(Block *b, df::coord2d column, int z)
 
                 if (!ok)
                 {
-                    out.printerr(
+                    WARN(process, out).print(
                         "Couldn't write %d vein at (%d,%d,%d)\n",
                         mat, x+column.x*16, y+column.y*16, z
                     );
@@ -1281,7 +1288,7 @@ bool GeoLayer::form_veins(color_ostream &out)
 
         if (parent_id >= (int)refs.size())
         {
-            out.printerr("Forward vein reference in biome %d.\n", biome->info.geo_index);
+            WARN(process, out).print("Forward vein reference in biome %d.\n", biome->info.geo_index);
             return false;
         }
 
@@ -1301,7 +1308,7 @@ bool GeoLayer::form_veins(color_ostream &out)
                 if (vptr->parent)
                     ctx = "only be in "+MaterialInfo(0,vptr->parent_mat()).getToken();
 
-                out.printerr(
+                WARN(process, out).print(
                     "Duplicate vein %s %s in biome %d layer %d - will %s.\n",
                     MaterialInfo(0,key.first).getToken().c_str(),
                     ENUM_KEY_STR(inclusion_type, key.second).c_str(),
@@ -1357,13 +1364,13 @@ bool VeinGenerator::place_orphan(t_veinkey key, int size, GeoLayer *from)
 
     if (best.empty())
     {
-        out.printerr(
+        WARN(process,out).print(
             "Could not place orphaned vein %s %s anywhere.\n",
             MaterialInfo(0,key.first).getToken().c_str(),
             ENUM_KEY_STR(inclusion_type, key.second).c_str()
         );
 
-        return false;
+        return true;
     }
 
     for (auto it = best.begin(); size > 0 && it != best.end(); ++it)
@@ -1391,7 +1398,7 @@ bool VeinGenerator::place_orphan(t_veinkey key, int size, GeoLayer *from)
 
     if (size > 0)
     {
-         out.printerr(
+        WARN(process, out).print(
             "Could not place all of orphaned vein %s %s: %d left.\n",
             MaterialInfo(0,key.first).getToken().c_str(),
             ENUM_KEY_STR(inclusion_type, key.second).c_str(),
@@ -1541,7 +1548,7 @@ bool VeinGenerator::place_veins(bool verbose)
 
             if (!isStoneInorganic(key.first))
             {
-                out.printerr(
+                WARN(process, out).print(
                     "Invalid vein material: %s\n",
                     MaterialInfo(0, key.first).getToken().c_str()
                 );
@@ -1551,7 +1558,7 @@ bool VeinGenerator::place_veins(bool verbose)
 
             if (!is_valid_enum_item(key.second))
             {
-                out.printerr("Invalid vein type: %d\n", key.second);
+                WARN(process, out).print("Invalid vein type: %d\n", key.second);
                 return false;
             }
 
@@ -1564,13 +1571,13 @@ bool VeinGenerator::place_veins(bool verbose)
     sort(queue.begin(), queue.end(), vein_cmp);
 
     // Place tiles
-    out.print("Processing... (%zu)", queue.size());
+    TRACE(process,out).print("Processing... (%zu)", queue.size());
 
     for (size_t j = 0; j < queue.size(); j++)
     {
         if (queue[j]->parent && !queue[j]->parent->placed)
         {
-            out.printerr(
+            WARN(process, out).print(
                 "\nParent vein not placed for %s %s.\n",
                 MaterialInfo(0,queue[j]->vein.first).getToken().c_str(),
                 ENUM_KEY_STR(inclusion_type, queue[j]->vein.second).c_str()
@@ -1582,9 +1589,11 @@ bool VeinGenerator::place_veins(bool verbose)
         if (verbose)
         {
             if (j > 0)
-                out.print("done.");
+            {
+                TRACE(process, out).print("done.");
+            }
 
-            out.print(
+            TRACE(process, out).print(
                 "\nVein layer %zu of %zu: %s %s (%.2f%%)... ",
                 j+1, queue.size(),
                 MaterialInfo(0,queue[j]->vein.first).getToken().c_str(),
@@ -1594,14 +1603,13 @@ bool VeinGenerator::place_veins(bool verbose)
         }
         else
         {
-            out.print("\rVein layer %zu of %zu... ", j+1, queue.size());
-            out.flush();
+            TRACE(process, out).print("\rVein layer %zu of %zu... ", j+1, queue.size());
         }
 
         queue[j]->place_tiles();
     }
 
-    out.print("done.\n");
+    TRACE(process, out).print("done.\n");
     return true;
 }
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index ac3f0f95a..5918f9205 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -2,7 +2,7 @@ include(Plugins.cmake)
 
 option(BUILD_STONESENSE "Build stonesense (needs a checkout first)." OFF)
 if(BUILD_STONESENSE)
-    #add_subdirectory(stonesense)
+    add_subdirectory(stonesense)
 endif()
 
 option(BUILD_ISOWORLD "Build isoworld (needs a checkout first)." OFF)
@@ -21,24 +21,21 @@ endif()
 
 option(BUILD_DEV_PLUGINS "Build developer plugins." OFF)
 if(BUILD_DEV_PLUGINS)
-    #add_subdirectory(devel)
+    add_subdirectory(devel)
 endif()
 
-option(BUILD_RUBY "Build ruby binding." ON)
-if(BUILD_RUBY)
-    #add_subdirectory(ruby)
+if(INSTALL_DATA_FILES)
+    install(DIRECTORY lua/
+        DESTINATION ${DFHACK_LUA_DESTINATION}/plugins
+        FILES_MATCHING PATTERN "*.lua")
+    install(DIRECTORY raw/
+        DESTINATION ${DFHACK_DATA_DESTINATION}/raw
+        FILES_MATCHING PATTERN "*.txt")
+    install(DIRECTORY raw/
+        DESTINATION ${DFHACK_DATA_DESTINATION}/raw
+        FILES_MATCHING PATTERN "*.diff")
 endif()
 
-install(DIRECTORY lua/
-    DESTINATION ${DFHACK_LUA_DESTINATION}/plugins
-    FILES_MATCHING PATTERN "*.lua")
-install(DIRECTORY raw/
-    DESTINATION ${DFHACK_DATA_DESTINATION}/raw
-    FILES_MATCHING PATTERN "*.txt")
-install(DIRECTORY raw/
-    DESTINATION ${DFHACK_DATA_DESTINATION}/raw
-    FILES_MATCHING PATTERN "*.diff")
-
 # Protobuf
 file(GLOB PROJECT_PROTOS ${CMAKE_CURRENT_SOURCE_DIR}/proto/*.proto)
 
@@ -78,102 +75,104 @@ set_source_files_properties( Brushes.h PROPERTIES HEADER_FILE_ONLY TRUE )
 # If you are adding a plugin that you do not intend to commit to the DFHack repo,
 # see instructions for adding "external" plugins at the end of this file.
 
-#dfhack_plugin(3dveins 3dveins.cpp)
-#dfhack_plugin(add-spatter add-spatter.cpp)
-dfhack_plugin(autobutcher autobutcher.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(autochop autochop.cpp)
-#dfhack_plugin(autoclothing autoclothing.cpp)
-#dfhack_plugin(autodump autodump.cpp)
-#dfhack_plugin(autofarm autofarm.cpp)
-#dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_static)
-#add_subdirectory(autolabor)
-#dfhack_plugin(automaterial automaterial.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(automelt automelt.cpp)
-#dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(autotrade autotrade.cpp)
-#dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
-#add_subdirectory(buildingplan)
-#dfhack_plugin(changeitem changeitem.cpp)
-#dfhack_plugin(changelayer changelayer.cpp)
-#dfhack_plugin(changevein changevein.cpp)
-#add_subdirectory(channel-safely)
-#dfhack_plugin(cleanconst cleanconst.cpp)
-#dfhack_plugin(cleaners cleaners.cpp)
-#dfhack_plugin(cleanowned cleanowned.cpp)
-#dfhack_plugin(confirm confirm.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(createitem createitem.cpp)
-#dfhack_plugin(cursecheck cursecheck.cpp)
-#dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(deramp deramp.cpp)
-dfhack_plugin(debug debug.cpp LINK_LIBRARIES jsoncpp_static)
-#dfhack_plugin(dig dig.cpp)
-#dfhack_plugin(dig-now dig-now.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(digFlood digFlood.cpp)
-#add_subdirectory(diggingInvaders)
-#dfhack_plugin(dwarfvet dwarfvet.cpp)
-#dfhack_plugin(dwarfmonitor dwarfmonitor.cpp LINK_LIBRARIES lua)
-#add_subdirectory(embark-assistant)
-#dfhack_plugin(embark-tools embark-tools.cpp)
-dfhack_plugin(eventful eventful.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(fastdwarf fastdwarf.cpp)
-#dfhack_plugin(filltraffic filltraffic.cpp)
-#dfhack_plugin(fix-unit-occupancy fix-unit-occupancy.cpp)
-#dfhack_plugin(fixveins fixveins.cpp)
-#dfhack_plugin(flows flows.cpp)
-#dfhack_plugin(follow follow.cpp)
-#dfhack_plugin(forceequip forceequip.cpp)
-#dfhack_plugin(generated-creature-renamer generated-creature-renamer.cpp)
-#dfhack_plugin(getplants getplants.cpp)
-dfhack_plugin(hotkeys hotkeys.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(infiniteSky infiniteSky.cpp)
-#dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote)
-#dfhack_plugin(jobutils jobutils.cpp)
-#dfhack_plugin(lair lair.cpp)
-#dfhack_plugin(liquids liquids.cpp Brushes.h LINK_LIBRARIES lua)
-#dfhack_plugin(luasocket luasocket.cpp LINK_LIBRARIES clsocket lua dfhack-tinythread)
-#dfhack_plugin(manipulator manipulator.cpp)
-#dfhack_plugin(map-render map-render.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(misery misery.cpp)
-#dfhack_plugin(mode mode.cpp)
-#dfhack_plugin(mousequery mousequery.cpp)
-#dfhack_plugin(nestboxes nestboxes.cpp)
-#dfhack_plugin(orders orders.cpp LINK_LIBRARIES jsoncpp_static)
-dfhack_plugin(overlay overlay.cpp LINK_LIBRARIES lua)
-dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(petcapRemover petcapRemover.cpp)
-#dfhack_plugin(plants plants.cpp)
-#dfhack_plugin(probe probe.cpp)
-#dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(regrass regrass.cpp)
-#add_subdirectory(remotefortressreader)
-#dfhack_plugin(rename rename.cpp LINK_LIBRARIES lua PROTOBUFS rename)
-#add_subdirectory(rendermax)
-#dfhack_plugin(reveal reveal.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(search search.cpp)
-#dfhack_plugin(seedwatch seedwatch.cpp)
-#dfhack_plugin(showmood showmood.cpp)
-#dfhack_plugin(siege-engine siege-engine.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(sort sort.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(steam-engine steam-engine.cpp)
-#add_subdirectory(spectate)
-#dfhack_plugin(stockflow stockflow.cpp LINK_LIBRARIES lua)
-#add_subdirectory(stockpiles)
-#dfhack_plugin(stocks stocks.cpp)
-#dfhack_plugin(strangemood strangemood.cpp)
-#dfhack_plugin(tailor tailor.cpp)
-#dfhack_plugin(tiletypes tiletypes.cpp Brushes.h LINK_LIBRARIES lua)
-#dfhack_plugin(title-folder title-folder.cpp)
-#dfhack_plugin(title-version title-version.cpp)
-#dfhack_plugin(trackstop trackstop.cpp)
-#dfhack_plugin(tubefill tubefill.cpp)
-#add_subdirectory(tweak)
-#dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua)
-#dfhack_plugin(workNow workNow.cpp)
-#dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat)
-#dfhack_plugin(zone zone.cpp)
+option(BUILD_SUPPORTED "Build the supported plugins (reveal, probe, etc.)." ON)
+if(BUILD_SUPPORTED)
+    dfhack_plugin(3dveins 3dveins.cpp)
+    dfhack_plugin(add-spatter add-spatter.cpp)
+    dfhack_plugin(autobutcher autobutcher.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(autochop autochop.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(autoclothing autoclothing.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(design design.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(autodump autodump.cpp)
+    dfhack_plugin(autofarm autofarm.cpp)
+    #dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_static)
+    add_subdirectory(autolabor)
+    dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(autoslab autoslab.cpp)
+    dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(burrow burrow.cpp LINK_LIBRARIES lua)
+    #dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
+    add_subdirectory(buildingplan)
+    dfhack_plugin(changeitem changeitem.cpp)
+    dfhack_plugin(changelayer changelayer.cpp)
+    dfhack_plugin(changevein changevein.cpp)
+    add_subdirectory(channel-safely)
+    dfhack_plugin(cleanconst cleanconst.cpp)
+    dfhack_plugin(cleaners cleaners.cpp)
+    dfhack_plugin(cleanowned cleanowned.cpp)
+    dfhack_plugin(confirm confirm.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(createitem createitem.cpp)
+    dfhack_plugin(cursecheck cursecheck.cpp)
+    dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(deramp deramp.cpp)
+    dfhack_plugin(debug debug.cpp LINK_LIBRARIES jsoncpp_static)
+    dfhack_plugin(dig dig.cpp)
+    dfhack_plugin(dig-now dig-now.cpp LINK_LIBRARIES lua)
+    #dfhack_plugin(digFlood digFlood.cpp)
+    #add_subdirectory(diggingInvaders)
+    dfhack_plugin(dwarfvet dwarfvet.cpp LINK_LIBRARIES lua)
+    #dfhack_plugin(dwarfmonitor dwarfmonitor.cpp LINK_LIBRARIES lua)
+    #add_subdirectory(embark-assistant)
+    #dfhack_plugin(embark-tools embark-tools.cpp)
+    dfhack_plugin(eventful eventful.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(fastdwarf fastdwarf.cpp)
+    dfhack_plugin(faststart faststart.cpp)
+    dfhack_plugin(filltraffic filltraffic.cpp)
+    #dfhack_plugin(fix-unit-occupancy fix-unit-occupancy.cpp)
+    #dfhack_plugin(fixveins fixveins.cpp)
+    dfhack_plugin(flows flows.cpp)
+    #dfhack_plugin(follow follow.cpp)
+    #dfhack_plugin(forceequip forceequip.cpp)
+    #dfhack_plugin(generated-creature-renamer generated-creature-renamer.cpp)
+    dfhack_plugin(getplants getplants.cpp)
+    dfhack_plugin(hotkeys hotkeys.cpp LINK_LIBRARIES lua)
+    #dfhack_plugin(infiniteSky infiniteSky.cpp)
+    #dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote)
+    #dfhack_plugin(jobutils jobutils.cpp)
+    dfhack_plugin(lair lair.cpp)
+    dfhack_plugin(liquids liquids.cpp Brushes.h LINK_LIBRARIES lua)
+    dfhack_plugin(luasocket luasocket.cpp LINK_LIBRARIES clsocket lua dfhack-tinythread)
+    dfhack_plugin(logistics logistics.cpp LINK_LIBRARIES lua)
+    #dfhack_plugin(manipulator manipulator.cpp)
+    #dfhack_plugin(map-render map-render.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(misery misery.cpp LINK_LIBRARIES lua)
+    #dfhack_plugin(mode mode.cpp)
+    #dfhack_plugin(mousequery mousequery.cpp)
+    dfhack_plugin(nestboxes nestboxes.cpp)
+    dfhack_plugin(orders orders.cpp LINK_LIBRARIES jsoncpp_static lua)
+    dfhack_plugin(overlay overlay.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua)
+    #dfhack_plugin(petcapRemover petcapRemover.cpp)
+    #dfhack_plugin(plants plants.cpp)
+    dfhack_plugin(preserve-tombs preserve-tombs.cpp)
+    dfhack_plugin(probe probe.cpp)
+    dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua)
+    #dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(regrass regrass.cpp)
+    add_subdirectory(remotefortressreader)
+    #dfhack_plugin(rename rename.cpp LINK_LIBRARIES lua PROTOBUFS rename)
+    #add_subdirectory(rendermax)
+    dfhack_plugin(reveal reveal.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(seedwatch seedwatch.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(showmood showmood.cpp)
+    #dfhack_plugin(siege-engine siege-engine.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(sort sort.cpp LINK_LIBRARIES lua)
+    #dfhack_plugin(steam-engine steam-engine.cpp)
+    add_subdirectory(spectate)
+    #dfhack_plugin(stockflow stockflow.cpp LINK_LIBRARIES lua)
+    add_subdirectory(stockpiles)
+    dfhack_plugin(stocks stocks.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(strangemood strangemood.cpp)
+    dfhack_plugin(tailor tailor.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(tiletypes tiletypes.cpp Brushes.h LINK_LIBRARIES lua)
+    #dfhack_plugin(title-folder title-folder.cpp)
+    dfhack_plugin(tubefill tubefill.cpp)
+    #add_subdirectory(tweak)
+    dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(work-now work-now.cpp)
+    dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat)
+    dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua)
+endif(BUILD_SUPPORTED)
 
 # If you are adding a plugin that you do not intend to commit to the DFHack repo,
 # see instructions for adding "external" plugins at the end of this file.
diff --git a/plugins/Plugins.cmake b/plugins/Plugins.cmake
index db7582c09..e058d2281 100644
--- a/plugins/Plugins.cmake
+++ b/plugins/Plugins.cmake
@@ -6,11 +6,6 @@ if(UNIX)
     endif()
 endif()
 
-include_directories("${dfhack_SOURCE_DIR}/library/include")
-include_directories("${dfhack_SOURCE_DIR}/library/proto")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/proto")
-include_directories("${dfhack_SOURCE_DIR}/library/depends/xgetopt")
-
 macro(car var)
     set(${var} ${ARGV1})
 endmacro()
@@ -120,37 +115,44 @@ macro(dfhack_plugin)
         endif()
     endif()
 
-    add_library(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES})
-    ide_folder(${PLUGIN_NAME} "Plugins")
+    if(BUILD_LIBRARY AND BUILD_PLUGINS)
+        add_library(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES})
+        ide_folder(${PLUGIN_NAME} "Plugins")
 
-    if(NUM_PROTO)
-        add_dependencies(${PLUGIN_NAME} generate_proto_${PLUGIN_NAME})
-        target_link_libraries(${PLUGIN_NAME} dfhack protobuf-lite dfhack-version ${PLUGIN_LINK_LIBRARIES})
-    else()
-        target_link_libraries(${PLUGIN_NAME} dfhack dfhack-version ${PLUGIN_LINK_LIBRARIES})
-    endif()
+        target_include_directories(${PLUGIN_NAME} PRIVATE "${dfhack_SOURCE_DIR}/library/include")
+        target_include_directories(${PLUGIN_NAME} PRIVATE "${dfhack_SOURCE_DIR}/library/proto")
+        target_include_directories(${PLUGIN_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/proto")
+        target_include_directories(${PLUGIN_NAME} PRIVATE "${dfhack_SOURCE_DIR}/library/depends/xgetopt")
 
-    add_dependencies(${PLUGIN_NAME} dfhack-version)
+        if(NUM_PROTO)
+            add_dependencies(${PLUGIN_NAME} generate_proto_${PLUGIN_NAME})
+            target_link_libraries(${PLUGIN_NAME} dfhack protobuf-lite dfhack-version ${PLUGIN_LINK_LIBRARIES})
+        else()
+            target_link_libraries(${PLUGIN_NAME} dfhack dfhack-version ${PLUGIN_LINK_LIBRARIES})
+        endif()
 
-    # Make sure the source is generated before the executable builds.
-    add_dependencies(${PLUGIN_NAME} generate_proto)
+        add_dependencies(${PLUGIN_NAME} dfhack-version)
 
-    if(UNIX)
-        set(PLUGIN_COMPILE_FLAGS "${PLUGIN_COMPILE_FLAGS} ${PLUGIN_COMPILE_FLAGS_GCC}")
-    else()
-        set(PLUGIN_COMPILE_FLAGS "${PLUGIN_COMPILE_FLAGS} ${PLUGIN_COMPILE_FLAGS_MSVC}")
-    endif()
-    set_target_properties(${PLUGIN_NAME} PROPERTIES COMPILE_FLAGS "${PLUGIN_COMPILE_FLAGS}")
-
-    if(APPLE)
-        set_target_properties(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.dylib PREFIX "")
-    elseif(UNIX)
-        set_target_properties(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.so PREFIX "")
-    else()
-        set_target_properties(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.dll)
-    endif()
+        # Make sure the source is generated before the executable builds.
+        add_dependencies(${PLUGIN_NAME} generate_proto)
 
-    install(TARGETS ${PLUGIN_NAME}
-        LIBRARY DESTINATION ${DFHACK_PLUGIN_DESTINATION}
-        RUNTIME DESTINATION ${DFHACK_PLUGIN_DESTINATION})
+        if(UNIX)
+            set(PLUGIN_COMPILE_FLAGS "${PLUGIN_COMPILE_FLAGS} ${PLUGIN_COMPILE_FLAGS_GCC}")
+        else()
+            set(PLUGIN_COMPILE_FLAGS "${PLUGIN_COMPILE_FLAGS} ${PLUGIN_COMPILE_FLAGS_MSVC}")
+        endif()
+        set_target_properties(${PLUGIN_NAME} PROPERTIES COMPILE_FLAGS "${PLUGIN_COMPILE_FLAGS}")
+
+        if(APPLE)
+            set_target_properties(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.dylib PREFIX "")
+        elseif(UNIX)
+            set_target_properties(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.so PREFIX "")
+        else()
+            set_target_properties(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.dll)
+        endif()
+
+        install(TARGETS ${PLUGIN_NAME}
+            LIBRARY DESTINATION ${DFHACK_PLUGIN_DESTINATION}
+            RUNTIME DESTINATION ${DFHACK_PLUGIN_DESTINATION})
+    endif()
 endmacro()
diff --git a/plugins/add-spatter.cpp b/plugins/add-spatter.cpp
index 459e28f25..3cfefce39 100644
--- a/plugins/add-spatter.cpp
+++ b/plugins/add-spatter.cpp
@@ -1,51 +1,26 @@
-#include "Core.h"
-#include <Console.h>
-#include <Export.h>
-#include <PluginManager.h>
-#include <modules/Gui.h>
-#include <modules/Screen.h>
-#include <modules/Maps.h>
-#include <modules/Job.h>
-#include <modules/Items.h>
-#include <modules/Units.h>
-#include <TileTypes.h>
-#include <vector>
-#include <cstdio>
-#include <stack>
-#include <string>
-#include <cmath>
-#include <string.h>
-
-#include <VTableInterpose.h>
-#include "df/item_liquid_miscst.h"
+#include "PluginManager.h"
+#include "VTableInterpose.h"
+
+#include "modules/Items.h"
+#include "modules/Units.h"
+
 #include "df/item_constructed.h"
-#include "df/builtin_mats.h"
-#include "df/world.h"
 #include "df/job.h"
 #include "df/job_item.h"
 #include "df/job_item_ref.h"
-#include "df/ui.h"
-#include "df/report.h"
 #include "df/reaction.h"
 #include "df/reaction_reagent_itemst.h"
 #include "df/reaction_product_item_improvementst.h"
-#include "df/reaction_product_improvement_flags.h"
-#include "df/matter_state.h"
 #include "df/spatter.h"
 
-#include "MiscUtils.h"
-
 using std::vector;
 using std::string;
-using std::stack;
+
 using namespace DFHack;
 using namespace df::enums;
 
 DFHACK_PLUGIN("add-spatter");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
 
 typedef df::reaction_product_item_improvementst improvement_product;
 
@@ -397,18 +372,20 @@ static void enable_hooks(bool enable)
     INTERPOSE_HOOK(product_hook, produce).apply(enable);
 }
 
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    if (find_reactions(out)) {
+        out.print("Detected spatter add reactions - enabling plugin.\n");
+        enable_hooks(true);
+    }
+    else
+        enable_hooks(false);
+
+    return CR_OK;
+}
+
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
 {
     switch (event) {
-    case SC_WORLD_LOADED:
-        if (find_reactions(out))
-        {
-            out.print("Detected spatter add reactions - enabling plugin.\n");
-            enable_hooks(true);
-        }
-        else
-            enable_hooks(false);
-        break;
     case SC_WORLD_UNLOADED:
         enable_hooks(false);
         reactions.clear();
@@ -423,9 +400,6 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    if (Core::getInstance().isWorldLoaded())
-        plugin_onstatechange(out, SC_WORLD_LOADED);
-
     return CR_OK;
 }
 
diff --git a/plugins/autobutcher.cpp b/plugins/autobutcher.cpp
index d75108f3f..d3d8487de 100644
--- a/plugins/autobutcher.cpp
+++ b/plugins/autobutcher.cpp
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "df/building_cagest.h"
+#include "df/building_civzonest.h"
 #include "df/creature_raw.h"
 #include "df/world.h"
 
@@ -18,8 +19,6 @@
 #include "LuaTools.h"
 #include "PluginManager.h"
 
-#include "modules/Gui.h"
-#include "modules/Maps.h"
 #include "modules/Persistence.h"
 #include "modules/Units.h"
 #include "modules/World.h"
@@ -106,6 +105,8 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
         DEBUG(status,out).print("%s from the API; persisting\n",
                                 is_enabled ? "enabled" : "disabled");
         set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+        if (enable)
+            autobutcher_cycle(out);
     } else {
         DEBUG(status,out).print("%s from the API, but already %s; no action\n",
                                 is_enabled ? "enabled" : "disabled",
@@ -121,6 +122,7 @@ DFhackCExport command_result plugin_shutdown (color_ostream &out) {
 }
 
 DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
     config = World::GetPersistentData(CONFIG_KEY);
 
     if (!config.isValid()) {
@@ -128,11 +130,11 @@ DFhackCExport command_result plugin_load_data (color_ostream &out) {
         config = World::AddPersistentData(CONFIG_KEY);
         set_config_bool(CONFIG_IS_ENABLED, is_enabled);
         set_config_val(CONFIG_CYCLE_TICKS, 6000);
-        set_config_bool(CONFIG_AUTOWATCH, false);
-        set_config_val(CONFIG_DEFAULT_FK, 5);
-        set_config_val(CONFIG_DEFAULT_MK, 1);
-        set_config_val(CONFIG_DEFAULT_FA, 5);
-        set_config_val(CONFIG_DEFAULT_MA, 1);
+        set_config_bool(CONFIG_AUTOWATCH, true);
+        set_config_val(CONFIG_DEFAULT_FK, 4);
+        set_config_val(CONFIG_DEFAULT_MK, 2);
+        set_config_val(CONFIG_DEFAULT_FA, 4);
+        set_config_val(CONFIG_DEFAULT_MA, 2);
     }
 
     // we have to copy our enabled flag into the global plugin variable, but
@@ -718,14 +720,7 @@ static bool isInBuiltCageRoom(df::unit *unit) {
         if (building->getType() != df::building_type::Cage)
             continue;
 
-        bool in_zone = false;
-        for (auto relation : building->relations) {
-            if (relation->getType() == df::building_type::Civzone) {
-                in_zone = true;
-                break;
-            }
-        }
-        if (!in_zone)
+        if (!building->relations.size())
             continue;
 
         df::building_cagest* cage = (df::building_cagest*)building;
@@ -735,6 +730,32 @@ static bool isInBuiltCageRoom(df::unit *unit) {
     return false;
 }
 
+// This can be used to identify completely inappropriate units (dead, undead, not belonging to the fort, ...)
+// that autobutcher should be ignoring.
+static bool isInappropriateUnit(df::unit *unit) {
+    return !Units::isActive(unit)
+        || Units::isUndead(unit)
+        || Units::isMerchant(unit) // ignore merchants' draft animals
+        || Units::isForest(unit) // ignore merchants' caged animals
+        || !Units::isOwnCiv(unit);
+}
+
+// This can be used to identify protected units that should be counted towards fort totals, but not scheduled
+// for butchering. This way they count towards target quota, so if you order that you want 1 female adult cat
+// and have 2 cats, one of them being a pet, the other gets butchered
+static bool isProtectedUnit(df::unit *unit) {
+    return Units::isWar(unit)    // ignore war dogs etc
+        || Units::isHunter(unit) // ignore hunting dogs etc
+        || Units::isMarkedForWarTraining(unit) // ignore units marked for any kind of training
+        || Units::isMarkedForHuntTraining(unit)
+        // ignore creatures in built cages which are defined as rooms to leave zoos alone
+        // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
+        || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
+        || Units::isAvailableForAdoption(unit)
+        || unit->name.has_name
+        || !unit->name.nickname.empty();
+}
+
 static void autobutcher_cycle(color_ostream &out) {
     // mark that we have recently run
     cycle_timestamp = world->frame_counter;
@@ -760,14 +781,9 @@ static void autobutcher_cycle(color_ostream &out) {
         // then let autowatch add units to the watchlist which will probably start breeding (owned pets, war animals, ...)
         // then process units counting those which can't be butchered (war animals, named pets, ...)
         // so that they are treated as "own stock" as well and count towards the target quota
-        if (   !Units::isActive(unit)
-            || Units::isUndead(unit)
+        if (isInappropriateUnit(unit)
             || Units::isMarkedForSlaughter(unit)
-            || Units::isMerchant(unit) // ignore merchants' draft animals
-            || Units::isForest(unit) // ignore merchants' caged animals
-            || !Units::isOwnCiv(unit)
-            || !Units::isTame(unit)
-            )
+            || !Units::isTame(unit))
             continue;
 
         // found a bugged unit which had invalid coordinates but was not in a cage.
@@ -789,21 +805,15 @@ static void autobutcher_cycle(color_ostream &out) {
             w->UpdateConfig(out);
             watched_races.emplace(unit->race, w);
 
-            string announce = "New race added to autobutcher watchlist: " + Units::getRaceNamePluralById(unit->race);
-            Gui::showAnnouncement(announce, 2, false);
+            INFO(cycle,out).print("New race added to autobutcher watchlist: %s\n",
+                Units::getRaceNamePluralById(unit->race).c_str());
         }
 
         if (w->isWatched) {
             // don't butcher protected units, but count them as stock as well
             // this way they count towards target quota, so if you order that you want 1 female adult cat
             // and have 2 cats, one of them being a pet, the other gets butchered
-            if(    Units::isWar(unit)    // ignore war dogs etc
-                || Units::isHunter(unit) // ignore hunting dogs etc
-                // ignore creatures in built cages which are defined as rooms to leave zoos alone
-                // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
-                || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
-                || Units::isAvailableForAdoption(unit)
-                || unit->name.has_name)
+            if(isProtectedUnit(unit))
                 w->PushProtectedUnit(unit);
             else if (   Units::isGay(unit)
                      || Units::isGelded(unit))
@@ -818,9 +828,8 @@ static void autobutcher_cycle(color_ostream &out) {
         if (slaughter_count) {
             std::stringstream ss;
             ss << slaughter_count;
-            string announce = Units::getRaceNamePluralById(w.first) + " marked for slaughter: " + ss.str();
-            DEBUG(cycle,out).print("%s\n", announce.c_str());
-            Gui::showAnnouncement(announce, 2, false);
+            INFO(cycle,out).print("%s marked for slaughter: %s\n",
+                Units::getRaceNamePluralById(w.first).c_str(), ss.str().c_str());
         }
     }
 }
@@ -836,12 +845,7 @@ static WatchedRace * checkRaceStocksTotal(color_ostream &out, int race) {
         if (unit->race != race)
             continue;
 
-        if (   !Units::isActive(unit)
-            || Units::isUndead(unit)
-            || Units::isMerchant(unit) // ignore merchants' draft animals
-            || Units::isForest(unit) // ignore merchants' caged animals
-            || !Units::isOwnCiv(unit)
-            )
+        if (isInappropriateUnit(unit))
             continue;
 
         if(!isContainedInItem(unit) && !hasValidMapPos(unit))
@@ -858,12 +862,7 @@ WatchedRace * checkRaceStocksProtected(color_ostream &out, int race) {
         if (unit->race != race)
             continue;
 
-        if (   !Units::isActive(unit)
-            || Units::isUndead(unit)
-            || Units::isMerchant(unit) // ignore merchants' draft animals
-            || Units::isForest(unit) // ignore merchants' caged animals
-            || !Units::isOwnCiv(unit)
-            )
+        if (isInappropriateUnit(unit))
             continue;
 
         // found a bugged unit which had invalid coordinates but was not in a cage.
@@ -871,14 +870,8 @@ WatchedRace * checkRaceStocksProtected(color_ostream &out, int race) {
         if (!isContainedInItem(unit) && !hasValidMapPos(unit))
             continue;
 
-        if (  !Units::isTame(unit)
-           || Units::isWar(unit) // ignore war dogs etc
-           || Units::isHunter(unit) // ignore hunting dogs etc
-            // ignore creatures in built cages which are defined as rooms to leave zoos alone
-            // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
-            || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
-            || Units::isAvailableForAdoption(unit)
-            || unit->name.has_name )
+        if (   !Units::isTame(unit)
+            || isProtectedUnit(unit))
             w->PushUnit(unit);
     }
     return w;
@@ -890,19 +883,9 @@ WatchedRace * checkRaceStocksButcherable(color_ostream &out, int race) {
         if (unit->race != race)
             continue;
 
-        if (   !Units::isActive(unit)
-            || Units::isUndead(unit)
-            || Units::isMerchant(unit) // ignore merchants' draft animals
-            || Units::isForest(unit) // ignore merchants' caged animals
-            || !Units::isOwnCiv(unit)
+        if (   isInappropriateUnit(unit)
             || !Units::isTame(unit)
-            || Units::isWar(unit) // ignore war dogs etc
-            || Units::isHunter(unit) // ignore hunting dogs etc
-            // ignore creatures in built cages which are defined as rooms to leave zoos alone
-            // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
-            || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
-            || Units::isAvailableForAdoption(unit)
-            || unit->name.has_name
+            || isProtectedUnit(unit)
             )
             continue;
 
@@ -920,12 +903,7 @@ WatchedRace * checkRaceStocksButcherFlag(color_ostream &out, int race) {
         if(unit->race != race)
             continue;
 
-        if (   !Units::isActive(unit)
-            || Units::isUndead(unit)
-            || Units::isMerchant(unit) // ignore merchants' draft animals
-            || Units::isForest(unit) // ignore merchants' caged animals
-            || !Units::isOwnCiv(unit)
-            )
+        if (isInappropriateUnit(unit))
             continue;
 
         if (!isContainedInItem(unit) && !hasValidMapPos(unit))
@@ -975,10 +953,8 @@ static void autobutcher_setWatchListRace(color_ostream &out, unsigned id, unsign
     WatchedRace * w = new WatchedRace(out, id, watched, fk, mk, fa, ma);
     w->UpdateConfig(out);
     watched_races.emplace(id, w);
-
-    string announce;
-    announce = "New race added to autobutcher watchlist: " + Units::getRaceNamePluralById(id);
-    Gui::showAnnouncement(announce, 2, false);
+    INFO(status,out).print("New race added to autobutcher watchlist: %s\n",
+        Units::getRaceNamePluralById(id).c_str());
 }
 
 // remove entry from watchlist
@@ -1016,19 +992,9 @@ static void autobutcher_butcherRace(color_ostream &out, int id) {
         if(unit->race != id)
             continue;
 
-        if(    !Units::isActive(unit)
-            || Units::isUndead(unit)
-            || Units::isMerchant(unit) // ignore merchants' draught animals
-            || Units::isForest(unit) // ignore merchants' caged animals
-            || !Units::isOwnCiv(unit)
+        if(    isInappropriateUnit(unit)
             || !Units::isTame(unit)
-            || Units::isWar(unit) // ignore war dogs etc
-            || Units::isHunter(unit) // ignore hunting dogs etc
-            // ignore creatures in built cages which are defined as rooms to leave zoos alone
-            // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
-            || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
-            || Units::isAvailableForAdoption(unit)
-            || unit->name.has_name
+            || isProtectedUnit(unit)
             )
             continue;
 
diff --git a/plugins/autochop.cpp b/plugins/autochop.cpp
index acb8959b9..cb703cf47 100644
--- a/plugins/autochop.cpp
+++ b/plugins/autochop.cpp
@@ -1,384 +1,500 @@
 // automatically chop trees
 
-#include "uicommon.h"
-#include "listcolumn.h"
-
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
+#include "Debug.h"
+#include "LuaTools.h"
 #include "PluginManager.h"
-#include "DataDefs.h"
 #include "TileTypes.h"
 
+#include "modules/Burrows.h"
+#include "modules/Designations.h"
+#include "modules/Items.h"
+#include "modules/Maps.h"
+#include "modules/Persistence.h"
+#include "modules/Units.h"
+#include "modules/World.h"
+
 #include "df/burrow.h"
 #include "df/item.h"
-#include "df/item_flags.h"
-#include "df/items_other_id.h"
-#include "df/job.h"
 #include "df/map_block.h"
-#include "df/material.h"
 #include "df/plant.h"
 #include "df/plant_tree_info.h"
 #include "df/plant_tree_tile.h"
-#include "df/plant_raw.h"
-#include "df/tile_dig_designation.h"
-#include "df/ui.h"
-#include "df/viewscreen_dwarfmodest.h"
+#include "df/plotinfost.h"
 #include "df/world.h"
 
-#include "modules/Burrows.h"
-#include "modules/Designations.h"
-#include "modules/Gui.h"
-#include "modules/MapCache.h"
-#include "modules/Maps.h"
-#include "modules/Screen.h"
-#include "modules/World.h"
-
-#include <set>
+#include <map>
+#include <unordered_map>
 
+using std::map;
+using std::multimap;
+using std::pair;
 using std::string;
+using std::unordered_map;
 using std::vector;
-using std::set;
+
 using namespace DFHack;
 using namespace df::enums;
 
-#define PLUGIN_VERSION 0.3
 DFHACK_PLUGIN("autochop");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
-
-static int get_log_count();
-
-static bool autochop_enabled = false;
-static int min_logs, max_logs;
-static const int LOG_CAP_MAX = 99999;
-static bool wait_for_threshold;
-struct Skip {
-    bool fruit_trees;
-    bool food_trees;
-    bool cook_trees;
-    operator int() {
-        return (fruit_trees ? 1 : 0) |
-                (food_trees ? 2 : 0) |
-                (cook_trees ? 4 : 0);
-    }
-    Skip &operator= (int in) {
-        // set all fields to false if they haven't been set in this save yet
-        if (in < 0)
-            in = 0;
-        fruit_trees = (in & 1);
-        food_trees = (in & 2);
-        cook_trees = (in & 4);
-        return *this;
-    }
-};
-static Skip skip;
+REQUIRE_GLOBAL(plotinfo);
 
-static PersistentDataItem config_autochop;
+namespace DFHack {
+    // for configuration-related logging
+    DBG_DECLARE(autochop, status, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(autochop, cycle, DebugCategory::LINFO);
+}
 
-struct WatchedBurrow
-{
-    int32_t id;
-    df::burrow *burrow;
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+static const string BURROW_CONFIG_KEY_PREFIX = string(plugin_name) + "/burrow/";
+static PersistentDataItem config;
+static vector<PersistentDataItem> watched_burrows;
+static unordered_map<int, size_t> watched_burrows_indices;
+
+enum ConfigValues {
+    CONFIG_IS_ENABLED = 0,
+    CONFIG_MAX_LOGS = 1,
+    CONFIG_MIN_LOGS = 2,
+    CONFIG_WAITING_FOR_MIN = 3,
+};
 
-    WatchedBurrow(df::burrow *burrow) : burrow(burrow)
-    {
-        id = burrow->id;
-    }
+enum BurrowConfigValues {
+    BURROW_CONFIG_ID = 0,
+    BURROW_CONFIG_CHOP = 1,
+    BURROW_CONFIG_CLEARCUT = 2,
+    BURROW_CONFIG_PROTECT_BREWABLE = 3,
+    BURROW_CONFIG_PROTECT_EDIBLE = 4,
+    BURROW_CONFIG_PROTECT_COOKABLE = 5,
 };
 
-class WatchedBurrows
-{
-public:
-    string getSerialisedIds()
-    {
-        validate();
-        stringstream burrow_ids;
-        bool append_started = false;
-        for (auto it = burrows.begin(); it != burrows.end(); it++)
-        {
-            if (append_started)
-                burrow_ids << " ";
-            burrow_ids << it->id;
-            append_started = true;
-        }
+static int get_config_val(PersistentDataItem &c, int index) {
+    if (!c.isValid())
+        return -1;
+    return c.ival(index);
+}
+static bool get_config_bool(PersistentDataItem &c, int index) {
+    return get_config_val(c, index) == 1;
+}
+static void set_config_val(PersistentDataItem &c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
+}
+static void set_config_bool(PersistentDataItem &c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
+}
 
-        return burrow_ids.str();
+static PersistentDataItem & ensure_burrow_config(color_ostream &out, int id) {
+    if (watched_burrows_indices.count(id))
+        return watched_burrows[watched_burrows_indices[id]];
+    string keyname = BURROW_CONFIG_KEY_PREFIX + int_to_string(id);
+    DEBUG(status,out).print("creating new persistent key for burrow %d\n", id);
+    watched_burrows.emplace_back(World::GetPersistentData(keyname, NULL));
+    size_t idx = watched_burrows.size()-1;
+    watched_burrows_indices.emplace(id, idx);
+    return watched_burrows[idx];
+}
+static void remove_burrow_config(color_ostream &out, int id) {
+    if (!watched_burrows_indices.count(id))
+        return;
+    DEBUG(status,out).print("removing persistent key for burrow %d\n", id);
+    size_t idx = watched_burrows_indices[id];
+    World::DeletePersistentData(watched_burrows[idx]);
+    watched_burrows.erase(watched_burrows.begin()+idx);
+    watched_burrows_indices.erase(id);
+}
+static void validate_burrow_configs(color_ostream &out) {
+    for (int32_t idx = watched_burrows.size()-1; idx >=0; --idx) {
+        int id = get_config_val(watched_burrows[idx], BURROW_CONFIG_ID);
+        if (!df::burrow::find(id)) {
+            remove_burrow_config(out, id);
+        }
     }
+}
 
-    void clear()
-    {
-        burrows.clear();
-    }
+static const int32_t CYCLE_TICKS = 1200;
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
 
-    void add(const int32_t id)
-    {
-        if (!isValidBurrow(id))
-            return;
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+static int32_t do_cycle(color_ostream &out, bool force_designate = false);
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    DEBUG(status,out).print("initializing %s\n", plugin_name);
 
-        WatchedBurrow wb(getBurrow(id));
-        burrows.push_back(wb);
+    // provide a configuration interface for the plugin
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Auto-harvest trees when low on stockpiled logs.",
+        do_command));
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
     }
 
-    void add(const string burrow_ids)
-    {
-        istringstream iss(burrow_ids);
-        int id;
-        while (iss >> id)
-        {
-            add(id);
-        }
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(status,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        if (enable)
+            do_cycle(out, true);
+    } else {
+        DEBUG(status,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
     }
+    return CR_OK;
+}
 
-    bool isValidPos(const df::coord &plant_pos)
-    {
-        validate();
-        if (!burrows.size())
-            return true;
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(status,out).print("shutting down %s\n", plugin_name);
 
-        for (auto it = burrows.begin(); it != burrows.end(); it++)
-        {
-            df::burrow *burrow = it->burrow;
-            if (Burrows::isAssignedTile(burrow, plant_pos))
-                return true;
-        }
+    return CR_OK;
+}
 
-        return false;
-    }
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
+    config = World::GetPersistentData(CONFIG_KEY);
+
+    if (!config.isValid()) {
+        DEBUG(status,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        set_config_val(config, CONFIG_MAX_LOGS, 200);
+        set_config_val(config, CONFIG_MIN_LOGS, 160);
+        set_config_bool(config, CONFIG_WAITING_FOR_MIN, false);
+    }
+
+    // we have to copy our enabled flag into the global plugin variable, but
+    // all the other state we can directly read/modify from the persistent
+    // data structure.
+    is_enabled = get_config_bool(config, CONFIG_IS_ENABLED);
+    DEBUG(status,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
+    World::GetPersistentData(&watched_burrows, BURROW_CONFIG_KEY_PREFIX, true);
+    watched_burrows_indices.clear();
+    const size_t num_watched_burrows = watched_burrows.size();
+    for (size_t idx = 0; idx < num_watched_burrows; ++idx) {
+        auto &c = watched_burrows[idx];
+        watched_burrows_indices.emplace(get_config_val(c, BURROW_CONFIG_ID), idx);
+    }
+    validate_burrow_configs(out);
 
-    bool isBurrowWatched(const df::burrow *burrow)
-    {
-        validate();
-        for (auto it = burrows.begin(); it != burrows.end(); it++)
-        {
-            if (it->burrow == burrow)
-                return true;
-        }
+    return CR_OK;
+}
 
-        return false;
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        if (is_enabled) {
+            DEBUG(status,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
+        }
     }
+    return CR_OK;
+}
 
-private:
-    static bool isValidBurrow(const int32_t id)
-    {
-        return getBurrow(id);
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && world->frame_counter - cycle_timestamp >= CYCLE_TICKS) {
+        int32_t designated = do_cycle(out);
+        if (0 < designated)
+            out.print("autochop: designated %d tree(s) for chopping\n", designated);
     }
+    return CR_OK;
+}
 
-    static df::burrow *getBurrow(const int32_t id)
-    {
-        return df::burrow::find(id);
-    }
+static bool call_autochop_lua(color_ostream *out, const char *fn_name,
+        int nargs = 0, int nres = 0,
+        Lua::LuaLambda && args_lambda = Lua::DEFAULT_LUA_LAMBDA,
+        Lua::LuaLambda && res_lambda = Lua::DEFAULT_LUA_LAMBDA) {
+    DEBUG(status).print("calling autochop lua function: '%s'\n", fn_name);
 
-    void validate()
-    {
-        for (auto it = burrows.begin(); it != burrows.end();)
-        {
-            if (!isValidBurrow(it->id))
-                it = burrows.erase(it);
-            else
-                ++it;
-        }
-    }
+    CoreSuspender guard;
 
-    vector<WatchedBurrow> burrows;
-};
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
 
-static WatchedBurrows watchedBurrows;
+    if (!out)
+        out = &Core::getInstance().getConsole();
 
-static void save_config()
-{
-    config_autochop.val() = watchedBurrows.getSerialisedIds();
-    config_autochop.ival(0) = autochop_enabled;
-    config_autochop.ival(1) = min_logs;
-    config_autochop.ival(2) = max_logs;
-    config_autochop.ival(3) = wait_for_threshold;
-    config_autochop.ival(4) = skip;
+    return Lua::CallLuaModuleFunction(*out, L, "plugins.autochop", fn_name,
+            nargs, nres,
+            std::forward<Lua::LuaLambda&&>(args_lambda),
+            std::forward<Lua::LuaLambda&&>(res_lambda));
 }
 
-static void initialize()
-{
-    watchedBurrows.clear();
-    autochop_enabled = false;
-    min_logs = 80;
-    max_logs = 100;
-    wait_for_threshold = false;
-    skip = 0;
-
-    config_autochop = World::GetPersistentData("autochop/config");
-    if (config_autochop.isValid())
-    {
-        watchedBurrows.add(config_autochop.val());
-        autochop_enabled = config_autochop.ival(0);
-        min_logs = config_autochop.ival(1);
-        max_logs = config_autochop.ival(2);
-        wait_for_threshold = config_autochop.ival(3);
-        skip = config_autochop.ival(4);
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
+
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
     }
-    else
-    {
-        config_autochop = World::AddPersistentData("autochop/config");
-        if (config_autochop.isValid())
-            save_config();
+
+    bool show_help = false;
+    if (!call_autochop_lua(&out, "parse_commandline", parameters.size(), 1,
+            [&](lua_State *L) {
+                for (const string &param : parameters)
+                    Lua::Push(L, param);
+            },
+            [&](lua_State *L) {
+                show_help = !lua_toboolean(L, -1);
+            })) {
+        return CR_FAILURE;
     }
+
+    return show_help ? CR_WRONG_USAGE : CR_OK;
 }
 
-static bool skip_plant(const df::plant * plant, bool *restricted)
-{
-    if (restricted)
-        *restricted = false;
+/////////////////////////////////////////////////////
+// cycle logic
+//
 
+static bool is_accessible_item(df::item *item, const vector<df::unit *> &citizens) {
+    const df::coord pos = Items::getPosition(item);
+    for (auto &unit : citizens) {
+        if (Maps::canWalkBetween(Units::getPosition(unit), pos))
+            return true;
+    }
+    return false;
+}
+
+// at least one member of the fort can reach a position adjacent to the given pos
+static bool is_accessible_tree(const df::coord &pos, const vector<df::unit *> &citizens) {
+    for (auto &unit : citizens) {
+        if (Maps::canWalkBetween(unit->pos, df::coord(pos.x-1, pos.y-1, pos.z))
+                || Maps::canWalkBetween(unit->pos, df::coord(pos.x,   pos.y-1, pos.z))
+                || Maps::canWalkBetween(unit->pos, df::coord(pos.x+1, pos.y-1, pos.z))
+                || Maps::canWalkBetween(unit->pos, df::coord(pos.x-1, pos.y,   pos.z))
+                || Maps::canWalkBetween(unit->pos, df::coord(pos.x+1, pos.y,   pos.z))
+                || Maps::canWalkBetween(unit->pos, df::coord(pos.x-1, pos.y+1, pos.z))
+                || Maps::canWalkBetween(unit->pos, df::coord(pos.x,   pos.y+1, pos.z))
+                || Maps::canWalkBetween(unit->pos, df::coord(pos.x+1, pos.y+1, pos.z)))
+            return true;
+    }
+    return false;
+}
+
+static bool is_valid_tree(const df::plant *plant) {
     // Skip all non-trees immediately.
     if (plant->flags.bits.is_shrub)
-        return true;
+        return false;
 
     // Skip plants with invalid tile.
-    df::map_block *cur = Maps::getTileBlock(plant->pos);
-    if (!cur)
-        return true;
+    df::map_block *block = Maps::getTileBlock(plant->pos);
+    if (!block)
+        return false;
 
     int x = plant->pos.x % 16;
     int y = plant->pos.y % 16;
 
     // Skip all unrevealed plants.
-    if (cur->designation[x][y].bits.hidden)
-        return true;
+    if (block->designation[x][y].bits.hidden)
+        return false;
 
-    df::tiletype_material material = tileMaterial(cur->tiletype[x][y]);
-    if (material != tiletype_material::TREE)
-        return true;
+    if (tileMaterial(block->tiletype[x][y]) != tiletype_material::TREE)
+        return false;
 
+    return true;
+}
+
+static bool is_protected(const df::plant * plant, PersistentDataItem &c) {
     const df::plant_raw *plant_raw = df::plant_raw::find(plant->material);
 
-    // Skip fruit trees if set.
-    if (skip.fruit_trees && plant_raw->material_defs.type[plant_material_def::drink] != -1)
-    {
-        if (restricted)
-            *restricted = true;
+    bool protect_brewable = get_config_bool(c, BURROW_CONFIG_PROTECT_BREWABLE);
+    bool protect_edible = get_config_bool(c, BURROW_CONFIG_PROTECT_EDIBLE);
+    bool protect_cookable = get_config_bool(c, BURROW_CONFIG_PROTECT_COOKABLE);
+
+    if (protect_brewable && plant_raw->material_defs.type[plant_material_def::drink] != -1)
         return true;
-    }
 
-    if (skip.food_trees || skip.cook_trees)
-    {
-        for (df::material * mat : plant_raw->material)
-        {
-            if (skip.food_trees && mat->flags.is_set(material_flags::EDIBLE_RAW))
-            {
-                if (restricted)
-                    *restricted = true;
+    if (protect_edible || protect_cookable) {
+        for (df::material * mat : plant_raw->material) {
+            if (protect_edible && mat->flags.is_set(material_flags::EDIBLE_RAW))
                 return true;
-            }
 
-            if (skip.cook_trees && mat->flags.is_set(material_flags::EDIBLE_COOKED))
-            {
-                if (restricted)
-                    *restricted = true;
+            if (protect_cookable && mat->flags.is_set(material_flags::EDIBLE_COOKED))
                 return true;
-            }
         }
     }
 
     return false;
 }
 
-static int estimate_logs(const df::plant *plant)
-{
+static int32_t estimate_logs(const df::plant *plant) {
+    if (!plant->tree_info)
+        return 0;
+
     //adapted from code by aljohnston112 @ github
     df::plant_tree_tile** tiles = plant->tree_info->body;
-    df::plant_tree_tile* tilesRow;
 
-    int trunks = 0;
+    if (!tiles)
+        return 0;
+
+    int32_t trunks = 0;
+    const int32_t area = plant->tree_info->dim_y * plant->tree_info->dim_x;
     for (int i = 0; i < plant->tree_info->body_height; i++) {
-        tilesRow = tiles[i];
-        for (int j = 0; j < plant->tree_info->dim_y*plant->tree_info->dim_x; j++) {
+        df::plant_tree_tile* tilesRow = tiles[i];
+        if (!tilesRow)
+            return 0; // tree data is corrupt; let's not touch it
+        for (int j = 0; j < area; j++)
             trunks += tilesRow[j].bits.trunk;
-        }
     }
 
     return trunks;
 }
 
-static int do_chop_designation(bool chop, bool count_only, int *skipped = nullptr)
-{
-    int count = 0;
-    int estimated_yield = get_log_count();
-    multimap<int, df::plant *, std::greater<int>> trees_by_size;
-
-    if (skipped)
-    {
-        *skipped = 0;
-    }
-
-    //get trees
-    for (auto plant : world->plants.all)
-    {
-        bool restricted = false;
+static void bucket_tree(df::plant *plant, bool designate_clearcut, bool *designated, bool *can_chop,
+        map<int32_t, int32_t> *tree_counts, map<int32_t, int32_t> *designated_tree_counts,
+        map<int, PersistentDataItem *> &clearcut_burrows,
+        map<int, PersistentDataItem *> &chop_burrows) {
+    for (auto &burrow : plotinfo->burrows.list) {
+        if (!Burrows::isAssignedTile(burrow, plant->pos))
+            continue;
 
-        if (skip_plant(plant, &restricted))
-        {
-            if (restricted && skipped)
-            {
-                ++*skipped;
+        int id = burrow->id;
+        if (tree_counts)
+            ++(*tree_counts)[id];
+
+        if (*designated) {
+            if (designated_tree_counts)
+                ++(*designated_tree_counts)[id];
+        } else if (clearcut_burrows.count(id) && !is_protected(plant, *clearcut_burrows[id])) {
+            if (designate_clearcut && Designations::markPlant(plant)) {
+                *designated = true;
+                if (designated_tree_counts)
+                    ++(*designated_tree_counts)[id];
             }
-            continue;
+        } else if (chop_burrows.count(id) && !is_protected(plant, *chop_burrows[id])) {
+            *can_chop = true;
         }
-
-        trees_by_size.insert(pair<int, df::plant *>(estimate_logs(plant), plant));
     }
 
-    //designate
-    for (auto & entry : trees_by_size)
-    {
-        const df::plant * plant = entry.second;
-
-        if ((estimated_yield >= max_logs) && chop)
-            break;
-
-        if (!count_only && !watchedBurrows.isValidPos(plant->pos))
-            continue;
-
-        if (chop && !Designations::isPlantMarked(plant))
-        {
-            if (count_only)
-            {
-                if (Designations::canMarkPlant(plant))
-                    count++;
-            }
-            else
-            {
-                if (Designations::markPlant(plant))
-                {
-                    estimated_yield += entry.first;
-                    count++;
-                }
-            }
-        }
+    if (!*designated && chop_burrows.empty())
+        *can_chop = true;
+}
 
-        if (!chop && Designations::isPlantMarked(plant))
-        {
-            if (count_only)
-            {
-                if (Designations::canUnmarkPlant(plant))
-                    count++;
-            }
-            else
-            {
-                if (Designations::unmarkPlant(plant))
-                    count++;
-            }
-        }
+static void bucket_watched_burrows(color_ostream & out,
+        map<int, PersistentDataItem *> &clearcut_burrows,
+        map<int, PersistentDataItem *> &chop_burrows) {
+    for (auto &c : watched_burrows) {
+        int id = get_config_val(c, BURROW_CONFIG_ID);
+        if (get_config_bool(c, BURROW_CONFIG_CLEARCUT))
+            clearcut_burrows.emplace(id, &c);
+        else if (get_config_bool(c, BURROW_CONFIG_CHOP))
+            chop_burrows.emplace(id, &c);
     }
+}
 
-    return count;
+typedef multimap<int, df::plant *, std::greater<int>> TreesBySize;
+
+static int32_t scan_tree(color_ostream & out, df::plant *plant, int32_t *expected_yield,
+        TreesBySize *designatable_trees_by_size, bool designate_clearcut,
+        const vector<df::unit *> &citizens, int32_t *accessible_trees,
+        int32_t *inaccessible_trees, int32_t *designated_trees, int32_t *accessible_yield,
+        map<int32_t, int32_t> *tree_counts,
+        map<int32_t, int32_t> *designated_tree_counts,
+        map<int, PersistentDataItem *> &clearcut_burrows,
+        map<int, PersistentDataItem *> &chop_burrows) {
+    TRACE(cycle,out).print("  scanning tree at %d,%d,%d\n",
+                            plant->pos.x, plant->pos.y, plant->pos.z);
+
+    if (!is_valid_tree(plant))
+        return 0;
+
+    bool accessible = is_accessible_tree(plant->pos, citizens);
+    int32_t yield = estimate_logs(plant);
+
+    if (accessible) {
+        if (accessible_trees)
+            ++*accessible_trees;
+        if (accessible_yield)
+            *accessible_yield += yield;
+    } else {
+        if (inaccessible_trees)
+            ++*inaccessible_trees;
+    }
+
+    bool can_chop = false;
+    bool designated = Designations::isPlantMarked(plant);
+    bool was_designated = designated;
+    bucket_tree(plant, designate_clearcut, &designated, &can_chop, tree_counts,
+            designated_tree_counts, clearcut_burrows, chop_burrows);
+
+    int32_t ret = 0;
+    if (designated) {
+        if (!was_designated)
+            ret = 1;
+        if (designated_trees)
+            ++*designated_trees;
+        if (expected_yield)
+            *expected_yield += yield;
+    } else if (can_chop && accessible) {
+        if (designatable_trees_by_size)
+            designatable_trees_by_size->emplace(yield, plant);
+    }
+
+    return ret;
 }
 
-static bool is_valid_item(df::item *item)
-{
-    for (size_t i = 0; i < item->general_refs.size(); i++)
-    {
+// returns the number of trees that were newly marked
+static int32_t scan_trees(color_ostream & out, int32_t *expected_yield,
+        TreesBySize *designatable_trees_by_size, bool designate_clearcut,
+        const vector<df::unit *> &citizens, int32_t *accessible_trees = NULL,
+        int32_t *inaccessible_trees = NULL, int32_t *designated_trees = NULL,
+        int32_t *accessible_yield = NULL,
+        map<int32_t, int32_t> *tree_counts = NULL,
+        map<int32_t, int32_t> *designated_tree_counts = NULL) {
+    TRACE(cycle,out).print("scanning trees\n");
+    int32_t newly_marked = 0;
+
+    if (accessible_trees)
+        *accessible_trees = 0;
+    if (inaccessible_trees)
+        *inaccessible_trees = 0;
+    if (designated_trees)
+        *designated_trees = 0;
+    if (expected_yield)
+        *expected_yield = 0;
+    if (accessible_yield)
+        *accessible_yield = 0;
+    if (tree_counts)
+        tree_counts->clear();
+    if (designated_tree_counts)
+        designated_tree_counts->clear();
+
+    map<int, PersistentDataItem *> clearcut_burrows, chop_burrows;
+    bucket_watched_burrows(out, clearcut_burrows, chop_burrows);
+
+    for (auto plant : world->plants.tree_dry)
+        newly_marked += scan_tree(out, plant, expected_yield, designatable_trees_by_size,
+                                  designate_clearcut, citizens, accessible_trees,
+                                  inaccessible_trees, designated_trees, accessible_yield,
+                                  tree_counts, designated_tree_counts,
+                                  clearcut_burrows, chop_burrows);
+    for (auto plant : world->plants.tree_wet)
+        newly_marked += scan_tree(out, plant, expected_yield, designatable_trees_by_size,
+                                  designate_clearcut, citizens, accessible_trees,
+                                  inaccessible_trees, designated_trees, accessible_yield,
+                                  tree_counts, designated_tree_counts,
+                                  clearcut_burrows, chop_burrows);
+
+    return newly_marked;
+}
+
+// TODO: does this actually catch anything above the bad_flag check?
+static bool is_valid_item(df::item *item) {
+    for (size_t i = 0; i < item->general_refs.size(); i++) {
         df::general_ref *ref = item->general_refs[i];
 
-        switch (ref->getType())
-        {
+        switch (ref->getType()) {
         case general_ref_type::CONTAINED_IN_ITEM:
             return false;
 
@@ -393,12 +509,10 @@ static bool is_valid_item(df::item *item)
         }
     }
 
-    for (size_t i = 0; i < item->specific_refs.size(); i++)
-    {
+    for (size_t i = 0; i < item->specific_refs.size(); i++) {
         df::specific_ref *ref = item->specific_refs[i];
 
-        if (ref->type == specific_ref_type::JOB)
-        {
+        if (ref->type == specific_ref_type::JOB) {
             // Ignore any items assigned to a job
             return false;
         }
@@ -407,544 +521,429 @@ static bool is_valid_item(df::item *item)
     return true;
 }
 
-static int get_log_count()
+struct BadFlags
 {
-    std::vector<df::item*> &items = world->items.other[items_other_id::IN_PLAY];
+    uint32_t whole;
 
-    // Pre-compute a bitmask with the bad flags
-    df::item_flags bad_flags;
-    bad_flags.whole = 0;
+    BadFlags()
+    {
+        df::item_flags flags;
+        #define F(x) flags.bits.x = true;
+        F(dump); F(forbid); F(garbage_collect);
+        F(hostile); F(on_fire); F(rotten); F(trader);
+        F(in_building); F(construction); F(artifact);
+        F(in_job); F(owned); F(in_chest); F(removed);
+        F(encased); F(spider_web);
+        #undef F
+        whole = flags.whole;
+    }
+};
 
-#define F(x) bad_flags.bits.x = true;
-    F(dump); F(forbid); F(garbage_collect);
-    F(hostile); F(on_fire); F(rotten); F(trader);
-    F(in_building); F(construction); F(artifact);
-    F(spider_web); F(owned); F(in_job);
-#undef F
+static void scan_logs(color_ostream &out, int32_t *usable_logs,
+                      const vector<df::unit *> &citizens, int32_t *inaccessible_logs = NULL) {
+    static const BadFlags bad_flags;
 
-    size_t valid_count = 0;
-    for (size_t i = 0; i < items.size(); i++)
-    {
-        df::item *item = items[i];
+    TRACE(cycle,out).print("scanning logs\n");
+    if (usable_logs)
+        *usable_logs = 0;
+    if (inaccessible_logs)
+        *inaccessible_logs = 0;
 
-        if (item->getType() != item_type::WOOD)
+    for (auto &item : world->items.other[items_other_id::IN_PLAY]) {
+        TRACE(cycle,out).print("  scanning log %d\n", item->id);
+        if (item->flags.whole & bad_flags.whole)
             continue;
 
-        if (item->flags.whole & bad_flags.whole)
+        if (item->getType() != item_type::WOOD)
             continue;
 
         if (!is_valid_item(item))
             continue;
 
-        ++valid_count;
-    }
-
-    return valid_count;
-}
-
-static void set_threshold_check(bool state)
-{
-    wait_for_threshold = state;
-    save_config();
-}
-
-static void do_autochop()
-{
-    int log_count = get_log_count();
-    if (wait_for_threshold)
-    {
-        if (log_count < min_logs)
-        {
-            set_threshold_check(false);
-            do_chop_designation(true, false);
-        }
-    }
-    else
-    {
-        if (log_count >= max_logs)
-        {
-            set_threshold_check(true);
-            do_chop_designation(false, false);
-        }
-        else
-        {
-            do_chop_designation(true, false);
+        if (!is_accessible_item(item, citizens)) {
+            if (inaccessible_logs)
+                ++*inaccessible_logs;
+        } else if (usable_logs) {
+            ++*usable_logs;
         }
     }
 }
 
-class ViewscreenAutochop : public dfhack_viewscreen
-{
-public:
-    ViewscreenAutochop():
-        selected_column(0),
-        current_log_count(0),
-        marked_tree_count(0),
-        skipped_tree_count(0)
-    {
-        edit_mode = EDIT_NONE;
-        burrows_column.multiselect = true;
-        burrows_column.setTitle("Burrows");
-        burrows_column.bottom_margin = 3;
-        burrows_column.allow_search = false;
-        burrows_column.text_clip_at = 30;
-
-        populateBurrowsColumn();
-        message.clear();
-    }
+static int32_t do_cycle(color_ostream &out, bool force_designate) {
+    DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
 
-    void populateBurrowsColumn()
-    {
-        selected_column = 0;
-
-        burrows_column.clear();
-
-        for (df::burrow *burrow : ui->burrows.list)
-        {
-            string name = burrow->name;
-            if (name.empty())
-                name = "Burrow " + int_to_string(burrow->id + 1);
-            auto elem = ListEntry<df::burrow *>(name, burrow);
-            elem.selected = watchedBurrows.isBurrowWatched(burrow);
-            burrows_column.add(elem);
-        }
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
 
-        burrows_column.fixWidth();
-        burrows_column.filterDisplay();
+    validate_burrow_configs(out);
 
-        current_log_count = get_log_count();
-        marked_tree_count = do_chop_designation(false, true, &skipped_tree_count);
-    }
+    // scan trees and clearcut marked burrows
+    int32_t expected_yield;
+    TreesBySize designatable_trees_by_size;
+    vector<df::unit *> citizens;
+    Units::getCitizens(citizens);
+    int32_t newly_marked = scan_trees(out, &expected_yield,
+            &designatable_trees_by_size, true, citizens);
 
-    void change_min_logs(int delta)
-    {
-        if (!autochop_enabled)
-            return;
+    // check how many logs we have already
+    int32_t usable_logs;
+    scan_logs(out, &usable_logs, citizens);
 
-        min_logs += delta;
-        if (min_logs < 0)
-            min_logs = 0;
-        if (min_logs > max_logs)
-            max_logs = min_logs;
+    if (get_config_bool(config, CONFIG_WAITING_FOR_MIN)
+            && usable_logs <= get_config_val(config, CONFIG_MIN_LOGS)) {
+        DEBUG(cycle,out).print("minimum threshold crossed\n");
+        set_config_bool(config, CONFIG_WAITING_FOR_MIN, false);
     }
-
-    void change_max_logs(int delta)
-    {
-        if (!autochop_enabled)
-            return;
-
-        max_logs += delta;
-        if (max_logs < min_logs)
-            min_logs = max_logs;
+    else if (!get_config_bool(config, CONFIG_WAITING_FOR_MIN)
+            && usable_logs > get_config_val(config, CONFIG_MAX_LOGS)) {
+        DEBUG(cycle,out).print("maximum threshold crossed\n");
+        set_config_bool(config, CONFIG_WAITING_FOR_MIN, true);
     }
 
-    void feed(set<df::interface_key> *input)
-    {
-        if (edit_mode != EDIT_NONE)
-        {
-            string entry = int_to_string(edit_mode == EDIT_MIN ? min_logs : max_logs);
-            if (input->count(interface_key::LEAVESCREEN) || input->count(interface_key::SELECT))
-            {
-                if (edit_mode == EDIT_MIN)
-                    max_logs = std::max(min_logs, max_logs);
-                else if (edit_mode == EDIT_MAX)
-                    min_logs = std::min(min_logs, max_logs);
-                edit_mode = EDIT_NONE;
-            }
-            else if (input->count(interface_key::STRING_A000))
-            {
-                if (!entry.empty())
-                    entry.erase(entry.size() - 1);
-            }
-            else if (entry.size() < 5)
-            {
-                for (auto k = input->begin(); k != input->end(); ++k)
-                {
-                    char ch = char(Screen::keyToChar(*k));
-                    if (ch >= '0' && ch <= '9')
-                        entry += ch;
-                }
-            }
-
-            switch (edit_mode)
-            {
-            case EDIT_MIN:
-                min_logs = string_to_int(entry);
-                break;
-            case EDIT_MAX:
-                max_logs = string_to_int(entry);
-                break;
-            default: break;
-            }
-
-            return;
-        }
-
-        bool key_processed = false;
-        message.clear();
-        switch (selected_column)
-        {
-        case 0:
-            key_processed = burrows_column.feed(input);
-            break;
-        }
-
-        if (key_processed)
-        {
-            if (input->count(interface_key::SELECT))
-                updateAutochopBurrows();
-            return;
-        }
-
-        if (input->count(interface_key::LEAVESCREEN))
-        {
-            save_config();
-            input->clear();
-            Screen::dismiss(this);
-            if (autochop_enabled)
-                do_autochop();
-            return;
-        }
-        else if  (input->count(interface_key::CUSTOM_A))
-        {
-            autochop_enabled = !autochop_enabled;
-        }
-        else if  (input->count(interface_key::CUSTOM_D))
-        {
-            int count = do_chop_designation(true, false);
-            message = "Trees marked for chop: " + int_to_string(count);
-            marked_tree_count = do_chop_designation(false, true, &skipped_tree_count);
-            if (skipped_tree_count)
-            {
-                message += ", skipped: " + int_to_string(skipped_tree_count);
-            }
-        }
-        else if  (input->count(interface_key::CUSTOM_U))
-        {
-            int count = do_chop_designation(false, false);
-            message = "Trees unmarked: " + int_to_string(count);
-            marked_tree_count = do_chop_designation(false, true, &skipped_tree_count);
-            if (skipped_tree_count)
-            {
-                message += ", skipped: " + int_to_string(skipped_tree_count);
-            }
-        }
-        else if  (input->count(interface_key::CUSTOM_N))
-        {
-            edit_mode = EDIT_MIN;
-        }
-        else if  (input->count(interface_key::CUSTOM_M))
-        {
-            edit_mode = EDIT_MAX;
-        }
-        else if  (input->count(interface_key::CUSTOM_SHIFT_N))
-        {
-            min_logs = LOG_CAP_MAX + 1;
-            max_logs = LOG_CAP_MAX + 1;
-        }
-        else if  (input->count(interface_key::CUSTOM_H))
-        {
-            change_min_logs(-1);
-        }
-        else if  (input->count(interface_key::CUSTOM_SHIFT_H))
-        {
-            change_min_logs(-10);
-        }
-        else if  (input->count(interface_key::CUSTOM_J))
-        {
-            change_min_logs(1);
-        }
-        else if  (input->count(interface_key::CUSTOM_SHIFT_J))
-        {
-            change_min_logs(10);
-        }
-        else if  (input->count(interface_key::CUSTOM_K))
-        {
-            change_max_logs(-1);
-        }
-        else if  (input->count(interface_key::CUSTOM_SHIFT_K))
-        {
-            change_max_logs(-10);
-        }
-        else if  (input->count(interface_key::CUSTOM_L))
-        {
-            change_max_logs(1);
-        }
-        else if  (input->count(interface_key::CUSTOM_SHIFT_L))
-        {
-            change_max_logs(10);
-        }
-        else if  (input->count(interface_key::CUSTOM_F))
-        {
-            skip.fruit_trees = !skip.fruit_trees;
-        }
-        else if  (input->count(interface_key::CUSTOM_E))
-        {
-            skip.food_trees = !skip.food_trees;
-        }
-        else if  (input->count(interface_key::CUSTOM_C))
-        {
-            skip.cook_trees = !skip.cook_trees;
-        }
-        else if (enabler->tracking_on && enabler->mouse_lbut)
-        {
-            if (burrows_column.setHighlightByMouse())
-            {
-                selected_column = 0;
-            }
-
-            enabler->mouse_lbut = enabler->mouse_rbut = 0;
-        }
+    // if we already have designated enough, we're done
+    int32_t limit = force_designate || !get_config_bool(config, CONFIG_WAITING_FOR_MIN) ?
+        get_config_val(config, CONFIG_MAX_LOGS) :
+        get_config_val(config, CONFIG_MIN_LOGS);
+    if (usable_logs + expected_yield > limit) {
+        return newly_marked;
     }
 
-    void render()
-    {
-        if (Screen::isDismissed(this))
-            return;
-
-        dfhack_viewscreen::render();
-
-        Screen::clear();
-        Screen::drawBorder("  Autochop  ");
-
-        burrows_column.display(selected_column == 0);
-
-        int32_t y = gps->dimy - 3;
-        int32_t x = 2;
-        OutputHotkeyString(x, y, "Leave", "Esc");
-        x += 3;
-        OutputString(COLOR_YELLOW, x, y, message);
-
-        y = 3;
-        int32_t left_margin = burrows_column.getMaxItemWidth() + 3;
-        x = left_margin;
-        if (burrows_column.getSelectedElems().size() > 0)
-        {
-            OutputString(COLOR_GREEN, x, y, "Will chop in selected burrows", true, left_margin);
-            ++y;
-        }
-        else
-        {
-            OutputString(COLOR_YELLOW, x, y, "Will chop from whole map", true, left_margin);
-            OutputString(COLOR_YELLOW, x, y, "Select from left to chop in specific burrows", true, left_margin);
-        }
-
-        ++y;
-
-        using namespace df::enums::interface_key;
-        OutputToggleString(x, y, "Autochop", CUSTOM_A, autochop_enabled, true, left_margin);
-        OutputHotkeyString(x, y, "Designate Now", CUSTOM_D, true, left_margin);
-        OutputHotkeyString(x, y, "Undesignate Now", CUSTOM_U, true, left_margin);
-        OutputHotkeyString(x, y, "Toggle Burrow", "Enter", true, left_margin);
-        if (autochop_enabled)
-        {
-            const struct {
-                const char *caption;
-                int count;
-                bool in_edit;
-                df::interface_key key;
-                df::interface_key skeys[4];
-            } rows[] = {
-                {"Min Logs: ", min_logs, edit_mode == EDIT_MIN, CUSTOM_N, {CUSTOM_H, CUSTOM_J, CUSTOM_SHIFT_H, CUSTOM_SHIFT_J}},
-                {"Max Logs: ", max_logs, edit_mode == EDIT_MAX, CUSTOM_M, {CUSTOM_K, CUSTOM_L, CUSTOM_SHIFT_K, CUSTOM_SHIFT_L}}
-            };
-            for (size_t i = 0; i < sizeof(rows) / sizeof(rows[0]); ++i)
-            {
-                auto row = rows[i];
-                OutputHotkeyString(x, y, row.caption, row.key);
-                auto prev_x = x;
-                if (row.in_edit)
-                    OutputString(COLOR_LIGHTCYAN, x, y, int_to_string(row.count) + "_");
-                else if (row.count <= LOG_CAP_MAX)
-                    OutputString(COLOR_LIGHTGREEN, x, y, int_to_string(row.count));
-                else
-                    OutputString(COLOR_LIGHTBLUE, x, y, "Unlimited");
-                if (edit_mode == EDIT_NONE)
-                {
-                    x = std::max(x, prev_x + 10);
-                    for (size_t j = 0; j < sizeof(row.skeys) / sizeof(row.skeys[0]); ++j)
-                        OutputString(COLOR_LIGHTGREEN, x, y, DFHack::Screen::getKeyDisplay(row.skeys[j]));
-                    OutputString(COLOR_WHITE, x, y, ": Step");
-                }
-                OutputString(COLOR_WHITE, x, y, "", true, left_margin);
-            }
-            OutputHotkeyString(x, y, "No limit", CUSTOM_SHIFT_N, true, left_margin);
-            OutputToggleString(x, y, "Skip Fruit Trees", CUSTOM_F, skip.fruit_trees, true, left_margin);
-            OutputToggleString(x, y, "Skip Edible Product Trees", CUSTOM_E, skip.food_trees, true, left_margin);
-            OutputToggleString(x, y, "Skip Cookable Product Trees", CUSTOM_C, skip.cook_trees, true, left_margin);
+    // designate until the expected yield gets us to our target or we run out
+    // of accessible trees
+    int32_t needed = get_config_val(config, CONFIG_MAX_LOGS) -
+            (usable_logs + expected_yield);
+    DEBUG(cycle,out).print("needed logs for this cycle: %d\n", needed);
+    for (auto & entry : designatable_trees_by_size) {
+        if (!Designations::markPlant(entry.second))
+            continue;
+        ++newly_marked;
+        needed -= entry.first;
+        if (needed <= 0) {
+            return newly_marked;
         }
-
-        ++y;
-        OutputString(COLOR_BROWN, x, y, "Current Counts", true, left_margin);
-        OutputString(COLOR_WHITE, x, y, "Current Logs: ");
-        OutputString(COLOR_GREEN, x, y, int_to_string(current_log_count), true, left_margin);
-        OutputString(COLOR_WHITE, x, y, "Marked Trees: ");
-        OutputString(COLOR_GREEN, x, y, int_to_string(marked_tree_count), true, left_margin);
     }
+    out.print("autochop: insufficient accessible trees to reach log target! Still need %d logs!\n",
+            needed);
+    return newly_marked;
+}
 
-    std::string getFocusString() { return "autochop"; }
-
-    void updateAutochopBurrows()
-    {
-        watchedBurrows.clear();
-        vector<df::burrow *> v = burrows_column.getSelectedElems();
-        for_each_<df::burrow *>(v, [] (df::burrow *b) { watchedBurrows.add(b->id); });
-    }
-
-private:
-    ListColumn<df::burrow *> burrows_column;
-    int selected_column;
-    int current_log_count;
-    int marked_tree_count;
-    int skipped_tree_count;
-    MapExtras::MapCache mcache;
-    string message;
-    enum { EDIT_NONE, EDIT_MIN, EDIT_MAX } edit_mode;
-
-    void validateColumn()
-    {
-        set_to_limit(selected_column, 0);
-    }
-
-    void resize(int32_t x, int32_t y)
-    {
-        dfhack_viewscreen::resize(x, y);
-        burrows_column.resize();
-    }
-};
-
-struct autochop_hook : public df::viewscreen_dwarfmodest
-{
-    typedef df::viewscreen_dwarfmodest interpose_base;
+/////////////////////////////////////////////////////
+// Lua API
+// core will already be suspended when coming in through here
+//
+
+static const char * get_protect_str(bool protect_brewable, bool protect_edible, bool protect_cookable) {
+    if (!protect_brewable && !protect_edible && !protect_cookable)
+        return "   ";
+    if (!protect_brewable && !protect_edible && protect_cookable)
+        return "  z";
+    if (!protect_brewable && protect_edible && !protect_cookable)
+        return " e ";
+    if (!protect_brewable && protect_edible && protect_cookable)
+        return " ez";
+    if (protect_brewable && !protect_edible && !protect_cookable)
+        return "b  ";
+    if (protect_brewable && !protect_edible && protect_cookable)
+        return "b z";
+    if (protect_brewable && protect_edible && !protect_cookable)
+        return "be ";
+    if (protect_brewable && protect_edible && protect_cookable)
+        return "bez";
+    return "";
+}
 
-    bool isInDesignationMenu()
-    {
-        using namespace df::enums::ui_sidebar_mode;
-        return (ui->main.mode == DesignateChopTrees);
+static void autochop_printStatus(color_ostream &out) {
+    DEBUG(status,out).print("entering autochop_printStatus\n");
+    validate_burrow_configs(out);
+    out.print("autochop is %s\n\n", is_enabled ? "enabled" : "disabled");
+    out.print("  keeping log counts between %d and %d\n",
+            get_config_val(config, CONFIG_MIN_LOGS), get_config_val(config, CONFIG_MAX_LOGS));
+    if (get_config_bool(config, CONFIG_WAITING_FOR_MIN))
+        out.print("  currently waiting for min threshold to be crossed before designating more trees\n");
+    else
+        out.print("  currently designating trees until max threshold is crossed\n");
+    out.print("\n");
+
+    int32_t usable_logs, inaccessible_logs;
+    int32_t accessible_trees, inaccessible_trees;
+    int32_t designated_trees, expected_yield, accessible_yield;
+    map<int32_t, int32_t> tree_counts, designated_tree_counts;
+    vector<df::unit *> citizens;
+    Units::getCitizens(citizens);
+    scan_logs(out, &usable_logs, citizens, &inaccessible_logs);
+    scan_trees(out, &expected_yield, NULL, false, citizens, &accessible_trees, &inaccessible_trees,
+            &designated_trees, &accessible_yield, &tree_counts, &designated_tree_counts);
+
+    out.print("summary:\n");
+    out.print("           accessible logs (usable stock): %d\n", usable_logs);
+    out.print("                        inaccessible logs: %d\n", inaccessible_logs);
+    out.print("                       total visible logs: %d\n", usable_logs + inaccessible_logs);
+    out.print("\n");
+    out.print("                         accessible trees: %d\n", accessible_trees);
+    out.print("                       inaccessible trees: %d\n", inaccessible_trees);
+    out.print("                      total visible trees: %d\n", accessible_trees + inaccessible_trees);
+    out.print("\n");
+    out.print("                         designated trees: %d\n", designated_trees);
+    out.print("      expected logs from designated trees: %d\n", expected_yield);
+    out.print("  expected logs from all accessible trees: %d\n", accessible_yield);
+    out.print("\n");
+    out.print("                    total trees harvested: %d\n", plotinfo->trees_removed);
+    out.print("\n");
+
+    if (!plotinfo->burrows.list.size()) {
+        out.print("no burrows defined\n");
+        return;
+    }
+
+    out.print("\n");
+
+    int name_width = 11;
+    for (auto &burrow : plotinfo->burrows.list) {
+        name_width = std::max(name_width, (int)burrow->name.size());
+    }
+    name_width = -name_width; // left justify
+
+    const char *fmt = "%*s  %4s  %4s  %8s  %5s  %6s  %7s\n";
+    out.print(fmt, name_width, "burrow name", " id ", "chop", "clearcut", "trees", "marked", "protect");
+    out.print(fmt, name_width, "-----------", "----", "----", "--------", "-----", "------", "-------");
+
+    for (auto &burrow : plotinfo->burrows.list) {
+        bool chop = false;
+        bool clearcut = false;
+        bool protect_brewable = false;
+        bool protect_edible = false;
+        bool protect_cookable = false;
+        if (watched_burrows_indices.count(burrow->id)) {
+            auto &c = watched_burrows[watched_burrows_indices[burrow->id]];
+            chop = get_config_bool(c, BURROW_CONFIG_CHOP);
+            clearcut = get_config_bool(c, BURROW_CONFIG_CLEARCUT);
+            protect_brewable = get_config_bool(c, BURROW_CONFIG_PROTECT_BREWABLE);
+            protect_edible = get_config_bool(c, BURROW_CONFIG_PROTECT_EDIBLE);
+            protect_cookable = get_config_bool(c, BURROW_CONFIG_PROTECT_COOKABLE);
+        }
+        out.print(fmt, name_width, burrow->name.c_str(), int_to_string(burrow->id).c_str(),
+                chop ? "[x]" : "[ ]", clearcut ? "[x]" : "[ ]",
+                int_to_string(tree_counts[burrow->id]).c_str(),
+                int_to_string(designated_tree_counts[burrow->id]).c_str(),
+                get_protect_str(protect_brewable, protect_edible, protect_cookable));
     }
+}
 
-    void sendKey(const df::interface_key &key)
-    {
-        set<df::interface_key> tmp;
-        tmp.insert(key);
-        INTERPOSE_NEXT(feed)(&tmp);
-    }
+static void autochop_designate(color_ostream &out) {
+    DEBUG(status,out).print("entering autochop_designate\n");
+    out.print("designated %d tree(s) for chopping\n", do_cycle(out, true));
+}
 
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
-    {
-        if (isInDesignationMenu() && input->count(interface_key::CUSTOM_C))
-        {
-            sendKey(interface_key::LEAVESCREEN);
-            Screen::show(dts::make_unique<ViewscreenAutochop>(), plugin_self);
-        }
-        else
-        {
-            INTERPOSE_NEXT(feed)(input);
-        }
+static void autochop_undesignate(color_ostream &out) {
+    DEBUG(status,out).print("entering autochop_undesignate\n");
+    int32_t count = 0;
+    for (auto plant : world->plants.all) {
+        if (is_valid_tree(plant) && Designations::unmarkPlant(plant))
+            ++count;
     }
+    out.print("undesignated %d tree(s)\n", count);
+}
 
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        INTERPOSE_NEXT(render)();
-
-        auto dims = Gui::getDwarfmodeViewDims();
-        if (dims.menu_x1 <= 0)
-            return;
-
-        if (!isInDesignationMenu())
-            return;
-
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = 26;
-        OutputHotkeyString(x, y, "Autochop Dashboard", "c");
+static void autochop_setTargets(color_ostream &out, int32_t max_logs, int32_t min_logs) {
+    DEBUG(status,out).print("entering autochop_setTargets\n");
+    if (max_logs < min_logs || min_logs < 0) {
+        out.printerr("max and min must be at least 0 and max must be greater than min\n");
+        return;
     }
-};
+    set_config_val(config, CONFIG_MAX_LOGS, max_logs);
+    set_config_val(config, CONFIG_MIN_LOGS, min_logs);
 
-IMPLEMENT_VMETHOD_INTERPOSE_PRIO(autochop_hook, feed, 100);
-IMPLEMENT_VMETHOD_INTERPOSE_PRIO(autochop_hook, render, 100);
+    // check limits and designate up to the new maximum
+    autochop_designate(out);
+}
 
+static int autochop_getTargets(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering autochop_getTargets\n");
+    Lua::Push(L, get_config_val(config, CONFIG_MAX_LOGS));
+    Lua::Push(L, get_config_val(config, CONFIG_MIN_LOGS));
+    return 2;
+}
 
-command_result df_autochop (color_ostream &out, vector <string> & parameters)
-{
-    for (size_t i = 0; i < parameters.size(); i++)
-    {
-        if (parameters[i] == "help" || parameters[i] == "?")
-            return CR_WRONG_USAGE;
-        if (parameters[i] == "debug")
-            save_config();
-        else
-            return CR_WRONG_USAGE;
-    }
-    if (Maps::IsValid())
-        Screen::show(dts::make_unique<ViewscreenAutochop>(), plugin_self);
-    return CR_OK;
+static int autochop_getLogCounts(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering autochop_getNumLogs\n");
+    int32_t usable_logs, inaccessible_logs;
+    vector<df::unit *> citizens;
+    Units::getCitizens(citizens);
+    scan_logs(*out, &usable_logs, citizens, &inaccessible_logs);
+    Lua::Push(L, usable_logs);
+    Lua::Push(L, inaccessible_logs);
+    return 2;
 }
 
-DFhackCExport command_result plugin_onupdate (color_ostream &out)
-{
-    if (!autochop_enabled)
-        return CR_OK;
+static void push_burrow_config(lua_State *L, int id, bool chop = false,
+        bool clearcut = false, bool protect_brewable = false,
+        bool protect_edible = false, bool protect_cookable = false) {
+    map<string, int32_t> burrow_config;
+    burrow_config.emplace("id", id);
+    burrow_config.emplace("chop", chop);
+    burrow_config.emplace("clearcut", clearcut);
+    burrow_config.emplace("protect_brewable", protect_brewable);
+    burrow_config.emplace("protect_edible", protect_edible);
+    burrow_config.emplace("protect_cookable", protect_cookable);
+    Lua::Push(L, burrow_config);
+}
 
-    if(!Maps::IsValid())
-        return CR_OK;
+static void push_burrow_config(lua_State *L, PersistentDataItem &c) {
+    push_burrow_config(L, get_config_val(c, BURROW_CONFIG_ID),
+            get_config_bool(c, BURROW_CONFIG_CHOP),
+            get_config_bool(c, BURROW_CONFIG_CLEARCUT),
+            get_config_bool(c, BURROW_CONFIG_PROTECT_BREWABLE),
+            get_config_bool(c, BURROW_CONFIG_PROTECT_EDIBLE),
+            get_config_bool(c, BURROW_CONFIG_PROTECT_COOKABLE));
+}
 
-    if (DFHack::World::ReadPauseState())
-        return CR_OK;
+static void emplace_bulk_burrow_config(lua_State *L,  map<int32_t, map<string, int32_t>> &burrows, int id, bool chop = false,
+        bool clearcut = false, bool protect_brewable = false,
+        bool protect_edible = false, bool protect_cookable = false) {
 
-    if (world->frame_counter % 1200 != 0) // Check every day
-        return CR_OK;
+    map<string, int32_t> burrow_config;
+    burrow_config.emplace("id", id);
+    burrow_config.emplace("chop", chop);
+    burrow_config.emplace("clearcut", clearcut);
+    burrow_config.emplace("protect_brewable", protect_brewable);
+    burrow_config.emplace("protect_edible", protect_edible);
+    burrow_config.emplace("protect_cookable", protect_cookable);
 
-    do_autochop();
+    burrows.emplace(id, burrow_config);
+}
 
-    return CR_OK;
+static void emplace_bulk_burrow_config(lua_State *L, map<int32_t, map<string, int32_t>> &burrows, PersistentDataItem &c) {
+    emplace_bulk_burrow_config(L, burrows, get_config_val(c, BURROW_CONFIG_ID),
+            get_config_bool(c, BURROW_CONFIG_CHOP),
+            get_config_bool(c, BURROW_CONFIG_CLEARCUT),
+            get_config_bool(c, BURROW_CONFIG_PROTECT_BREWABLE),
+            get_config_bool(c, BURROW_CONFIG_PROTECT_EDIBLE),
+            get_config_bool(c, BURROW_CONFIG_PROTECT_COOKABLE));
 }
 
-DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+static int autochop_getTreeCountsAndBurrowConfigs(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering autochop_getTreeCountsAndBurrowConfigs\n");
+    validate_burrow_configs(*out);
+    int32_t accessible_trees, inaccessible_trees;
+    int32_t designated_trees, expected_yield, accessible_yield;
+    map<int32_t, int32_t> tree_counts, designated_tree_counts;
+    vector<df::unit *> citizens;
+    Units::getCitizens(citizens);
+    scan_trees(*out, &expected_yield, NULL, false, citizens, &accessible_trees, &inaccessible_trees,
+            &designated_trees, &accessible_yield, &tree_counts, &designated_tree_counts);
+
+    map<string, int32_t> summary;
+
+    map<int32_t, map<string, int32_t>> burrow_config_map;
+
+    summary.emplace("accessible_trees", accessible_trees);
+    summary.emplace("inaccessible_trees", inaccessible_trees);
+    summary.emplace("designated_trees", designated_trees);
+    summary.emplace("expected_yield", expected_yield);
+    summary.emplace("accessible_yield", accessible_yield);
+    Lua::Push(L, summary);
+
+    Lua::Push(L, tree_counts);
+    Lua::Push(L, designated_tree_counts);
+
+    for (auto &burrow : plotinfo->burrows.list) {
+        int id = burrow->id;
+        if (watched_burrows_indices.count(id))
+            emplace_bulk_burrow_config(L, burrow_config_map,
+                    watched_burrows[watched_burrows_indices[id]]);
+        else
+            emplace_bulk_burrow_config(L, burrow_config_map, id);
+    }
 
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    if (!gps)
-        return CR_FAILURE;
+    Lua::Push(L, burrow_config_map);
 
-    if (enable != is_enabled)
-    {
-        if (!INTERPOSE_HOOK(autochop_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(autochop_hook, render).apply(enable))
-            return CR_FAILURE;
+    return 4;
+}
 
-        is_enabled = enable;
-        initialize();
+static int autochop_getBurrowConfig(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering autochop_getBurrowConfig\n");
+    validate_burrow_configs(*out);
+    // param can be a name or an id
+    int id;
+    if (lua_isnumber(L, -1)) {
+        id = lua_tointeger(L, -1);
+        if (!df::burrow::find(id))
+            return 0;
+    } else {
+        const char * name = lua_tostring(L, -1);
+        if (!name)
+            return 0;
+
+        string nameStr = name;
+        bool found = false;
+        for (auto &burrow : plotinfo->burrows.list) {
+            if (nameStr == burrow->name) {
+                id = burrow->id;
+                found = true;
+                break;
+            }
+        }
+        if (!found)
+            return 0;
     }
 
-    return CR_OK;
+    if (watched_burrows_indices.count(id)) {
+        push_burrow_config(L, watched_burrows[watched_burrows_indices[id]]);
+    } else {
+        push_burrow_config(L, id);
+    }
+    return 1;
 }
 
-DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
-{
-    commands.push_back(PluginCommand(
-        "autochop",
-        "Auto-harvest trees when low on stockpiled logs.",
-        df_autochop));
-
-    initialize();
-    return CR_OK;
-}
+static void autochop_setBurrowConfig(color_ostream &out, int id, bool chop,
+        bool clearcut, bool protect_brewable, bool protect_edible,
+        bool protect_cookable) {
+    DEBUG(status,out).print("entering autochop_setBurrowConfig\n");
+    validate_burrow_configs(out);
 
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    return CR_OK;
-}
+    bool isInvalidBurrow = !df::burrow::find(id);
+    bool hasNoData = !chop && !clearcut && !protect_brewable && !protect_edible
+            && !protect_cookable;
 
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event) {
-    case SC_MAP_LOADED:
-        initialize();
-        break;
-    default:
-        break;
+    if (isInvalidBurrow || hasNoData) {
+        remove_burrow_config(out, id);
+        return;
     }
 
-    return CR_OK;
+    PersistentDataItem &c = ensure_burrow_config(out, id);
+    set_config_val(c, BURROW_CONFIG_ID, id);
+    set_config_bool(c, BURROW_CONFIG_CHOP, chop);
+    set_config_bool(c, BURROW_CONFIG_CLEARCUT, clearcut);
+    set_config_bool(c, BURROW_CONFIG_PROTECT_BREWABLE, protect_brewable);
+    set_config_bool(c, BURROW_CONFIG_PROTECT_EDIBLE, protect_edible);
+    set_config_bool(c, BURROW_CONFIG_PROTECT_COOKABLE, protect_cookable);
 }
+
+DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(autochop_printStatus),
+    DFHACK_LUA_FUNCTION(autochop_designate),
+    DFHACK_LUA_FUNCTION(autochop_undesignate),
+    DFHACK_LUA_FUNCTION(autochop_setTargets),
+    DFHACK_LUA_FUNCTION(autochop_setBurrowConfig),
+    DFHACK_LUA_END
+};
+
+DFHACK_PLUGIN_LUA_COMMANDS {
+    DFHACK_LUA_COMMAND(autochop_getTargets),
+    DFHACK_LUA_COMMAND(autochop_getLogCounts),
+    DFHACK_LUA_COMMAND(autochop_getBurrowConfig),
+    DFHACK_LUA_COMMAND(autochop_getTreeCountsAndBurrowConfigs),
+    DFHACK_LUA_END
+};
diff --git a/plugins/autoclothing.cpp b/plugins/autoclothing.cpp
index 1535b5eb8..d404960b4 100644
--- a/plugins/autoclothing.cpp
+++ b/plugins/autoclothing.cpp
@@ -1,7 +1,8 @@
 #include "Core.h"
-#include <Console.h>
-#include <Export.h>
-#include <PluginManager.h>
+#include "Console.h"
+#include "Debug.h"
+#include "Export.h"
+#include "PluginManager.h"
 
 #include <map>
 
@@ -11,9 +12,20 @@
 #include "modules/Items.h"
 #include "modules/Maps.h"
 #include "modules/Materials.h"
+#include "modules/Persistence.h"
 #include "modules/Units.h"
 #include "modules/World.h"
-
+#include "modules/Translation.h"
+
+#include "df/item.h"
+#include "df/item_actual.h"
+#include "df/item_crafted.h"
+#include "df/item_constructed.h"
+#include "df/item_armorst.h"
+#include "df/item_glovesst.h"
+#include "df/item_shoesst.h"
+#include "df/item_helmst.h"
+#include "df/item_pantsst.h"
 #include "df/itemdef_armorst.h"
 #include "df/itemdef_glovesst.h"
 #include "df/itemdef_shoesst.h"
@@ -24,6 +36,9 @@
 #include "df/world.h"
 
 using std::endl;
+using std::string;
+using std::vector;
+using std::map;
 
 using namespace DFHack;
 using namespace DFHack::Items;
@@ -31,32 +46,64 @@ using namespace DFHack::Units;
 using namespace df::enums;
 
 
-// A plugin must be able to return its name and version.
-// The name string provided must correspond to the filename -
-// skeleton.plug.so, skeleton.plug.dylib, or skeleton.plug.dll in this case
 DFHACK_PLUGIN("autoclothing");
-
-// Any globals a plugin requires (e.g. world) should be listed here.
-// For example, this line expands to "using df::global::world" and prevents the
-// plugin from being loaded if df::global::world is null (i.e. missing from symbols.xml):
-//
 REQUIRE_GLOBAL(world);
 
 // Only run if this is enabled
 DFHACK_PLUGIN_IS_ENABLED(autoclothing_enabled);
 
+// logging levels can be dynamically controlled with the `debugfilter` command.
+namespace DFHack {
+    // for configuration-related logging
+    DBG_DECLARE(autoclothing, report, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(autoclothing, cycle, DebugCategory::LINFO);
+}
+
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+enum ConfigValues {
+    CONFIG_IS_ENABLED = 0,
+};
+
+//static int get_config_val(PersistentDataItem& c, int index) {
+//    if (!c.isValid())
+//        return -1;
+//    return c.ival(index);
+//}
+//static bool get_config_bool(PersistentDataItem& c, int index) {
+//    return get_config_val(c, index) == 1;
+//}
+static void set_config_val(PersistentDataItem& c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
+}
+static void set_config_bool(PersistentDataItem& c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
+}
+
 // Here go all the command declarations...
 // mostly to allow having the mandatory stuff on top of the file and commands on the bottom
 struct ClothingRequirement;
-command_result autoclothing(color_ostream &out, std::vector <std::string> & parameters);
+command_result autoclothing(color_ostream &out, vector <string> & parameters);
 static void init_state(color_ostream &out);
 static void save_state(color_ostream &out);
 static void cleanup_state(color_ostream &out);
 static void do_autoclothing();
 static bool validateMaterialCategory(ClothingRequirement * requirement);
-static bool setItem(std::string name, ClothingRequirement* requirement);
+static bool setItem(string name, ClothingRequirement* requirement);
+static void generate_report(color_ostream& out);
+static bool isAvailableItem(df::item* item);
 
-std::vector<ClothingRequirement>clothingOrders;
+enum match_strictness
+{
+    STRICT_PERMISSIVE,
+    STRICT_TYPE,
+    STRICT_MATERIAL
+};
+
+match_strictness strictnessSetting = STRICT_PERMISSIVE;
+
+vector<ClothingRequirement>clothingOrders;
 
 struct ClothingRequirement
 {
@@ -65,7 +112,7 @@ struct ClothingRequirement
     int16_t item_subtype;
     df::job_material_category material_category;
     int16_t needed_per_citizen;
-    std::map<int16_t, int32_t> total_needed_per_race;
+    map<int16_t, int32_t> total_needed_per_race;
 
     bool matches(ClothingRequirement * b)
     {
@@ -80,7 +127,7 @@ struct ClothingRequirement
         return true;
     }
 
-    std::string Serialize()
+    string Serialize()
     {
         std::stringstream stream;
         stream << ENUM_KEY_STR(job_type, jobType) << " ";
@@ -91,10 +138,10 @@ struct ClothingRequirement
         return stream.str();
     }
 
-    void Deserialize(std::string s)
+    void Deserialize(string s)
     {
         std::stringstream stream(s);
-        std::string loadedJob;
+        string loadedJob;
         stream >> loadedJob;
         FOR_ENUM_ITEMS(job_type, job)
         {
@@ -104,7 +151,7 @@ struct ClothingRequirement
                 break;
             }
         }
-        std::string loadedItem;
+        string loadedItem;
         stream >> loadedItem;
         FOR_ENUM_ITEMS(item_type, item)
         {
@@ -119,7 +166,7 @@ struct ClothingRequirement
         stream >> needed_per_citizen;
     }
 
-    bool SetFromParameters(color_ostream &out, std::vector <std::string> & parameters)
+    bool SetFromParameters(color_ostream &out, vector <string> & parameters)
     {
         if (!set_bitfield_field(&material_category, parameters[0], 1))
         {
@@ -138,12 +185,12 @@ struct ClothingRequirement
         return true;
     }
 
-    std::string ToReadableLabel()
+    string ToReadableLabel()
     {
         std::stringstream stream;
         stream << bitfield_to_string(material_category) << " ";
-        std::string adjective = "";
-        std::string name = "";
+        string adjective = "";
+        string name = "";
         switch (itemType)
         {
         case df::enums::item_type::ARMOR:
@@ -180,7 +227,7 @@ struct ClothingRequirement
 
 
 // Mandatory init function. If you have some global state, create it here.
-DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands)
+DFhackCExport command_result plugin_init(color_ostream &out, vector <PluginCommand> &commands)
 {
     // Fill the command list with your commands.
     commands.push_back(PluginCommand(
@@ -221,6 +268,29 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 }
 
 
+DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+
+    if (enable != autoclothing_enabled) {
+        auto enabled = World::GetPersistentData("autoclothing/enabled");
+        autoclothing_enabled = enable;
+        DEBUG(report, out).print("%s from the API; persisting\n",
+            autoclothing_enabled ? "enabled" : "disabled");
+        set_config_bool(enabled, CONFIG_IS_ENABLED, autoclothing_enabled);
+        if (enable)
+            do_autoclothing();
+    }
+    else {
+        DEBUG(report, out).print("%s from the API, but already %s; no action\n",
+            autoclothing_enabled ? "enabled" : "disabled",
+            autoclothing_enabled ? "enabled" : "disabled");
+    }
+    return CR_OK;
+}
+
 // Whatever you put here will be done in each game step. Don't abuse it.
 // It's optional, so you can just comment it out like this if you don't need it.
 
@@ -243,12 +313,12 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out)
     return CR_OK;
 }
 
-static bool setItemFromName(std::string name, ClothingRequirement* requirement)
+static bool setItemFromName(string name, ClothingRequirement* requirement)
 {
 #define SEARCH_ITEM_RAWS(rawType, job, item) \
 for (auto& itemdef : world->raws.itemdefs.rawType) \
 { \
-    std::string fullName = itemdef->adjective.empty() ? itemdef->name : itemdef->adjective + " " + itemdef->name; \
+    string fullName = itemdef->adjective.empty() ? itemdef->name : itemdef->adjective + " " + itemdef->name; \
     if (fullName == name) \
     { \
         requirement->jobType = job_type::job; \
@@ -265,7 +335,7 @@ for (auto& itemdef : world->raws.itemdefs.rawType) \
     return false;
 }
 
-static bool setItemFromToken(std::string token, ClothingRequirement* requirement)
+static bool setItemFromToken(string token, ClothingRequirement* requirement)
 {
     ItemTypeInfo itemInfo;
     if (!itemInfo.find(token))
@@ -295,7 +365,7 @@ static bool setItemFromToken(std::string token, ClothingRequirement* requirement
     return true;
 }
 
-static bool setItem(std::string name, ClothingRequirement* requirement)
+static bool setItem(string name, ClothingRequirement* requirement)
 {
     if (setItemFromName(name, requirement))
         return true;
@@ -349,7 +419,7 @@ static bool validateMaterialCategory(ClothingRequirement * requirement)
 
 
 // A command! It sits around and looks pretty. And it's nice and friendly.
-command_result autoclothing(color_ostream &out, std::vector <std::string> & parameters)
+command_result autoclothing(color_ostream &out, vector <string> & parameters)
 {
     // It's nice to print a help message you get invalid options
     // from the user instead of just acting strange.
@@ -359,13 +429,31 @@ command_result autoclothing(color_ostream &out, std::vector <std::string> & para
     // be used by 'help your-command'.
     if (parameters.size() == 0)
     {
+        CoreSuspender suspend;
+        out << "Automatic clothing management is currently " << (autoclothing_enabled ? "enabled" : "disabled") << "." << endl;
         out << "Currently set " << clothingOrders.size() << " automatic clothing orders" << endl;
         for (size_t i = 0; i < clothingOrders.size(); i++)
         {
             out << clothingOrders[i].ToReadableLabel() << endl;
         }
+        generate_report(out);
         return CR_OK;
     }
+    ////Disabled until I have time to fully implement it.
+    //else if (parameters[0] == "strictness")
+    //{
+    //    if (parameters.size() != 2)
+    //    {
+    //        out << "Wrong number of arguments." << endl;
+    //        return CR_WRONG_USAGE;
+    //    }
+    //    if (parameters[1] == "permissive")
+    //        strictnessSetting = STRICT_PERMISSIVE;
+    //    else if (parameters[1] == "type")
+    //        strictnessSetting = STRICT_TYPE;
+    //    else if (parameters[1] == "material")
+    //        strictnessSetting = STRICT_MATERIAL;
+    //}
     else if (parameters.size() < 2 || parameters.size() > 3)
     {
         out << "Wrong number of arguments." << endl;
@@ -471,10 +559,16 @@ static void find_needed_clothing_items()
             int alreadyOwnedAmount = 0;
 
             //looping through the items first, then clothing order might be a little faster, but this way is cleaner.
-            for (auto& ownedItem : unit->owned_items)
+            for (auto ownedItem : unit->owned_items)
             {
                 auto item = findItemByID(ownedItem);
 
+                if (!item)
+                {
+                    DEBUG(cycle).print("autoclothing: Invalid inventory item ID: %d\n", ownedItem);
+                    continue;
+                }
+
                 if (item->getType() != clothingOrder.itemType)
                     continue;
                 if (item->getSubtype() != clothingOrder.item_subtype)
@@ -612,9 +706,8 @@ static void init_state(color_ostream &out)
         autoclothing_enabled = false;
     }
 
-
     // Parse constraints
-    std::vector<PersistentDataItem> items;
+    vector<PersistentDataItem> items;
     World::GetPersistentData(&items, "autoclothing/clothingItems");
 
     for (auto& item : items)
@@ -643,7 +736,7 @@ static void save_state(color_ostream &out)
 
 
     // Parse constraints
-    std::vector<PersistentDataItem> items;
+    vector<PersistentDataItem> items;
     World::GetPersistentData(&items, "autoclothing/clothingItems");
 
     for (size_t i = 0; i < items.size(); i++)
@@ -663,3 +756,218 @@ static void save_state(color_ostream &out)
         item.val() = clothingOrders[i].Serialize();
     }
 }
+
+static void list_unit_counts(color_ostream& out, map<int, int>& unitList)
+{
+    for (const auto& race : unitList)
+    {
+        if (race.second == 1)
+            out << "    1 " << Units::getRaceReadableNameById(race.first) << endl;
+        else
+            out << "    " << race.second << " " << Units::getRaceNamePluralById(race.first) << endl;
+    }
+}
+
+static bool isAvailableItem(df::item* item)
+{
+    static struct BadFlags {
+        uint32_t whole;
+
+        BadFlags() {
+            df::item_flags flags;
+#define F(x) flags.bits.x = true;
+            F(in_job); F(hostile); F(in_building); F(encased);
+            F(foreign); F(trader); F(owned); F(forbid);
+            F(dump); F(on_fire); F(melt); F(hidden);
+
+            F(garbage_collect); F(rotten); F(construction);
+            F(in_chest); F(removed); F(spider_web);
+
+            // F(artifact); -- TODO: should this be included?
+#undef F
+            whole = flags.whole;
+        }
+    } badFlags;
+
+    if ((item->flags.whole & badFlags.whole) != 0)
+        return false;
+
+    if (item->getWear() > 1)
+        return false;
+    if (!item->isClothing())
+        return false;
+    return true;
+}
+
+static void generate_report(color_ostream& out)
+{
+    map<int, int> fullUnitList;
+    map<int, int> missingArmor;
+    map<int, int> missingShoes;
+    map<int, int> missingHelms;
+    map<int, int> missingGloves;
+    map<int, int> missingPants;
+    for (df::unit* unit : world->units.active)
+    {
+        if (!Units::isCitizen(unit))
+            continue;
+        fullUnitList[unit->race]++;
+        int numArmor = 0, numShoes = 0, numHelms = 0, numGloves = 0, numPants = 0;
+        for (auto itemId : unit->owned_items)
+        {
+            auto item = Items::findItemByID(itemId);
+            if (!item)
+            {
+                DEBUG(cycle, out).print("autoclothing: Invalid inventory item ID: %d\n", itemId);
+                continue;
+            }
+            if (item->getWear() >= 1)
+                continue;
+            switch (item->getType())
+            {
+            case df::item_type::ARMOR:
+                numArmor++;
+                break;
+            case df::item_type::SHOES:
+                numShoes++;
+                break;
+            case df::item_type::HELM:
+                numHelms++;
+                break;
+            case df::item_type::GLOVES:
+                numGloves++;
+                break;
+            case df::item_type::PANTS:
+                numPants++;
+                break;
+            default:
+                break;
+            }
+        }
+        if (numArmor == 0)
+            missingArmor[unit->race]++;
+        if (numShoes < 2)
+            missingShoes[unit->race]++;
+        if (numHelms == 0)
+            missingHelms[unit->race]++;
+        if (numGloves < 2)
+            missingGloves[unit->race]++;
+        if (numPants == 0)
+            missingPants[unit->race]++;
+        DEBUG(report,out) << Translation::TranslateName(Units::getVisibleName(unit)) << " has " << numArmor << " armor, " << numShoes << " shoes, " << numHelms << " helms, " << numGloves << " gloves, " << numPants << " pants" << endl;
+    }
+    if (missingArmor.size() + missingShoes.size() + missingHelms.size() + missingGloves.size() + missingPants.size() == 0)
+    {
+        out << "Everybody has a full set of clothes to wear, congrats!" << endl;
+        return;
+    }
+    else
+    {
+        if (missingArmor.size())
+        {
+            out << "Following units need new bodywear:" << endl;
+            list_unit_counts(out, missingArmor);
+        }
+        if (missingShoes.size())
+        {
+            out << "Following units need new shoes:" << endl;
+            list_unit_counts(out, missingShoes);
+        }
+        if (missingHelms.size())
+        {
+            out << "Following units need new headwear:" << endl;
+            list_unit_counts(out, missingHelms);
+        }
+        if (missingGloves.size())
+        {
+            out << "Following units need new handwear:" << endl;
+            list_unit_counts(out, missingGloves);
+        }
+        if (missingPants.size())
+        {
+            out << "Following units need new legwear:" << endl;
+            list_unit_counts(out, missingPants);
+        }
+    }
+    map<int, int> availableArmor;
+    for (auto armor : world->items.other.ARMOR)
+    {
+        if (!isAvailableItem(armor))
+            continue;
+        availableArmor[armor->maker_race]++;
+    }
+    if (availableArmor.size())
+    {
+        out << "We have available bodywear for:" << endl;
+        list_unit_counts(out, availableArmor);
+    }
+    map<int, int> availableShoes;
+    for (auto shoe : world->items.other.SHOES)
+    {
+        if (!isAvailableItem(shoe))
+            continue;
+        availableShoes[shoe->maker_race]++;
+    }
+    if (availableShoes.size())
+    {
+        out << "We have available footwear for:" << endl;
+        list_unit_counts(out, availableShoes);
+    }
+    map<int, int> availableHelms;
+    for (auto helm : world->items.other.HELM)
+    {
+        if (!isAvailableItem(helm))
+            continue;
+        availableHelms[helm->maker_race]++;
+    }
+    if (availableHelms.size())
+    {
+        out << "We have available headwear for:" << endl;
+        list_unit_counts(out, availableHelms);
+    }
+    map<int, int> availableGloves;
+    for (auto glove : world->items.other.HELM)
+    {
+        if (!isAvailableItem(glove))
+            continue;
+        availableGloves[glove->maker_race]++;
+    }
+    if (availableGloves.size())
+    {
+        out << "We have available handwear for:" << endl;
+        list_unit_counts(out, availableGloves);
+    }
+    map<int, int> availablePants;
+    for (auto pants : world->items.other.HELM)
+    {
+        if (!isAvailableItem(pants))
+            continue;
+        availablePants[pants->maker_race]++;
+    }
+    if (availablePants.size())
+    {
+        out << "We have available legwear for:" << endl;
+        list_unit_counts(out, availablePants);
+    }
+
+}
+
+/////////////////////////////////////////////////////
+// Lua API
+// TODO: implement Lua hooks to manipulate the persistent order configuration
+//
+
+static void autoclothing_doCycle(color_ostream& out) {
+    DEBUG(report, out).print("entering autoclothing_doCycle\n");
+    do_autoclothing();
+}
+
+
+DFHACK_PLUGIN_LUA_FUNCTIONS{
+    DFHACK_LUA_FUNCTION(autoclothing_doCycle),
+    DFHACK_LUA_END
+};
+
+DFHACK_PLUGIN_LUA_COMMANDS{
+    DFHACK_LUA_END
+};
diff --git a/plugins/autodump.cpp b/plugins/autodump.cpp
index fb215c26b..3c8638cea 100644
--- a/plugins/autodump.cpp
+++ b/plugins/autodump.cpp
@@ -1,33 +1,34 @@
 // Quick Dumper : Moves items marked as "dump" to cursor
 // FIXME: local item cache in map blocks needs to be fixed after teleporting items
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <climits>
-#include <vector>
-#include <string>
-#include <algorithm>
-#include <set>
-using namespace std;
 
 #include "Core.h"
 #include "Console.h"
+#include "DataDefs.h"
 #include "Export.h"
 #include "PluginManager.h"
+
 #include "modules/Maps.h"
 #include "modules/Gui.h"
 #include "modules/Items.h"
 #include "modules/Materials.h"
 #include "modules/MapCache.h"
 
-#include "DataDefs.h"
 #include "df/item.h"
 #include "df/world.h"
 #include "df/general_ref.h"
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/building_stockpilest.h"
-#include "uicommon.h"
 
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+#include <climits>
+#include <vector>
+#include <string>
+#include <algorithm>
+#include <set>
+
+using namespace std;
 using namespace DFHack;
 using namespace df::enums;
 
@@ -40,234 +41,6 @@ DFHACK_PLUGIN("autodump");
 REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(world);
 
-// Stockpile interface START
-static const string PERSISTENCE_KEY = "autodump/stockpiles";
-
-static void mark_all_in_stockpiles(vector<PersistentStockpileInfo> &stockpiles)
-{
-    std::vector<df::item*> &items = world->items.other[items_other_id::IN_PLAY];
-
-    // Precompute a bitmask with the bad flags
-    df::item_flags bad_flags;
-    bad_flags.whole = 0;
-
-#define F(x) bad_flags.bits.x = true;
-    F(dump); F(forbid); F(garbage_collect);
-    F(hostile); F(on_fire); F(rotten); F(trader);
-    F(in_building); F(construction); F(artifact);
-    F(spider_web); F(owned); F(in_job);
-#undef F
-
-    size_t marked_count = 0;
-    for (size_t i = 0; i < items.size(); i++)
-    {
-        df::item *item = items[i];
-        if (item->flags.whole & bad_flags.whole)
-            continue;
-
-        for (auto it = stockpiles.begin(); it != stockpiles.end(); it++)
-        {
-            if (!it->inStockpile(item))
-                continue;
-
-            ++marked_count;
-            item->flags.bits.dump = true;
-        }
-    }
-
-    if (marked_count)
-        Gui::showAnnouncement("Marked " + int_to_string(marked_count) + " items to dump", COLOR_GREEN, false);
-}
-
-class StockpileMonitor
-{
-public:
-    bool isMonitored(df::building_stockpilest *sp)
-    {
-        for (auto it = monitored_stockpiles.begin(); it != monitored_stockpiles.end(); it++)
-        {
-            if (it->matches(sp))
-                return true;
-        }
-
-        return false;
-    }
-
-    void add(df::building_stockpilest *sp)
-    {
-        auto pile = PersistentStockpileInfo(sp, PERSISTENCE_KEY);
-        if (pile.isValid())
-        {
-            monitored_stockpiles.push_back(PersistentStockpileInfo(pile));
-            monitored_stockpiles.back().save();
-        }
-    }
-
-    void remove(df::building_stockpilest *sp)
-    {
-        for (auto it = monitored_stockpiles.begin(); it != monitored_stockpiles.end(); it++)
-        {
-            if (it->matches(sp))
-            {
-                it->remove();
-                monitored_stockpiles.erase(it);
-                break;
-            }
-        }
-    }
-
-    void doCycle()
-    {
-        for (auto it = monitored_stockpiles.begin(); it != monitored_stockpiles.end();)
-        {
-            if (!it->isValid())
-                it = monitored_stockpiles.erase(it);
-            else
-                ++it;
-        }
-
-        mark_all_in_stockpiles(monitored_stockpiles);
-    }
-
-    void reset()
-    {
-        monitored_stockpiles.clear();
-        std::vector<PersistentDataItem> items;
-        DFHack::World::GetPersistentData(&items, PERSISTENCE_KEY);
-
-        for (auto i = items.begin(); i != items.end(); i++)
-        {
-            auto pile = PersistentStockpileInfo(*i, PERSISTENCE_KEY);
-            if (pile.load())
-                monitored_stockpiles.push_back(PersistentStockpileInfo(pile));
-            else
-                pile.remove();
-        }
-    }
-
-
-private:
-    vector<PersistentStockpileInfo> monitored_stockpiles;
-};
-
-static StockpileMonitor monitor;
-
-#define DELTA_TICKS 620
-
-
-DFhackCExport command_result plugin_onupdate ( color_ostream &out )
-{
-    if(!Maps::IsValid())
-        return CR_OK;
-
-    if (DFHack::World::ReadPauseState())
-        return CR_OK;
-
-    if (world->frame_counter % DELTA_TICKS != 0)
-        return CR_OK;
-
-    monitor.doCycle();
-
-    return CR_OK;
-}
-
-struct dump_hook : public df::viewscreen_dwarfmodest
-{
-    typedef df::viewscreen_dwarfmodest interpose_base;
-
-    bool handleInput(set<df::interface_key> *input)
-    {
-        if (Gui::inRenameBuilding())
-            return false;
-
-        building_stockpilest *sp = get_selected_stockpile();
-        if (!sp)
-            return false;
-
-        if (input->count(interface_key::CUSTOM_SHIFT_D))
-        {
-            if (monitor.isMonitored(sp))
-                monitor.remove(sp);
-            else
-                monitor.add(sp);
-        }
-
-        return false;
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
-    {
-        if (!handleInput(input))
-            INTERPOSE_NEXT(feed)(input);
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        INTERPOSE_NEXT(render)();
-
-        building_stockpilest *sp = get_selected_stockpile();
-        if (!sp)
-            return;
-
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = dims.y2 - 7;
-
-        int links = 0;
-        links += sp->links.give_to_pile.size();
-        links += sp->links.take_from_pile.size();
-        links += sp->links.give_to_workshop.size();
-        links += sp->links.take_from_workshop.size();
-        bool state = monitor.isMonitored(sp);
-
-        if (links + 12 >= y) {
-            y = dims.y2;
-            OutputString(COLOR_WHITE, x, y, "Auto: ");
-            OutputString(COLOR_LIGHTRED, x, y, "D");
-            OutputString(state? COLOR_LIGHTGREEN: COLOR_GREY, x, y, "ump ");
-        } else {
-            OutputToggleString(x, y, "Auto dump", "D", state, true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
-        }
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(dump_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(dump_hook, render);
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event)
-    {
-    case DFHack::SC_MAP_LOADED:
-        monitor.reset();
-        break;
-    case DFHack::SC_MAP_UNLOADED:
-        break;
-    default:
-        break;
-    }
-    return CR_OK;
-}
-
-DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    if (enable != is_enabled)
-    {
-        if (!INTERPOSE_HOOK(dump_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(dump_hook, render).apply(enable))
-            return CR_FAILURE;
-
-        is_enabled = enable;
-    }
-
-    return CR_OK;
-}
-
-// Stockpile interface END
-
 command_result df_autodump(color_ostream &out, vector <string> & parameters);
 command_result df_autodump_destroy_here(color_ostream &out, vector <string> & parameters);
 command_result df_autodump_destroy_item(color_ostream &out, vector <string> & parameters);
@@ -276,11 +49,11 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCom
 {
     commands.push_back(PluginCommand(
         "autodump",
-        "Teleport items marked for dumping to the cursor.",
+        "Teleport items marked for dumping to the keyboard cursor.",
         df_autodump));
     commands.push_back(PluginCommand(
         "autodump-destroy-here",
-        "Destroy items marked for dumping under cursor.",
+        "Destroy items marked for dumping under the keyboard cursor.",
         df_autodump_destroy_here,
         Gui::cursor_hotkey));
     commands.push_back(PluginCommand(
@@ -329,7 +102,6 @@ static command_result autodump_main(color_ostream &out, vector <string> & parame
         return CR_WRONG_USAGE;
     }
 
-    //DFHack::VersionInfo *mem = Core::getInstance().vinfo;
     if (!Maps::IsValid())
     {
         out.printerr("Map is not available!\n");
@@ -340,16 +112,14 @@ static command_result autodump_main(color_ostream &out, vector <string> & parame
     MapCache MC;
     int dumped_total = 0;
 
-    int cx, cy, cz;
-    DFCoord pos_cursor;
+    df::coord pos_cursor;
     if(!destroy || here)
     {
-        if (!Gui::getCursorCoords(cx,cy,cz))
-        {
-            out.printerr("Cursor position not found. Please enable the cursor.\n");
+        pos_cursor = Gui::getCursorPos();
+        if (!pos_cursor.isValid()) {
+            out.printerr("Keyboard cursor must be over a suitable map tile.\n");
             return CR_FAILURE;
         }
-        pos_cursor = DFCoord(cx,cy,cz);
     }
     if (!destroy)
     {
@@ -361,7 +131,7 @@ static command_result autodump_main(color_ostream &out, vector <string> & parame
                 return CR_FAILURE;
             }
             df::tiletype ttype = MC.tiletypeAt(pos_cursor);
-            if(!DFHack::isWalkable(ttype) || DFHack::isOpenTerrain(ttype))
+            if(!DFHack::isWalkable(ttype))
             {
                 out.printerr("Cursor should be placed over a floor.\n");
                 return CR_FAILURE;
@@ -395,18 +165,22 @@ static command_result autodump_main(color_ostream &out, vector <string> & parame
         if (!need_forbidden && itm->flags.bits.forbid)
             continue;
 
-        if(!destroy) // move to cursor
+        if (!destroy) // move to cursor
         {
-            // Change flags to indicate the dump was completed, as if by super-dwarfs
-            itm->flags.bits.dump = false;
-            itm->flags.bits.forbid = true;
-
             // Don't move items if they're already at the cursor
             if (pos_cursor != pos_item)
             {
-                if (!Items::moveToGround(MC, itm, pos_cursor))
+                if (Items::moveToGround(MC, itm, pos_cursor))
+                {
+                    // Change flags to indicate the dump was completed, as if by super-dwarfs
+                    itm->flags.bits.dump = false;
+                    itm->flags.bits.forbid = true;
+                }
+                else
+                {
                     out.print("Could not move item: %s\n",
-                              Items::getDescription(itm, 0, true).c_str());
+                        Items::getDescription(itm, 0, true).c_str());
+                }
             }
         }
         else // destroy
@@ -441,13 +215,14 @@ command_result df_autodump(color_ostream &out, vector <string> & parameters)
 
 command_result df_autodump_destroy_here(color_ostream &out, vector <string> & parameters)
 {
-    // HOTKEY COMMAND; CORE ALREADY SUSPENDED
     if (!parameters.empty())
         return CR_WRONG_USAGE;
 
     vector<string> args;
     args.push_back("destroy-here");
 
+    CoreSuspender suspend;
+
     return autodump_main(out, args);
 }
 
@@ -456,10 +231,11 @@ static int last_frame = 0;
 
 command_result df_autodump_destroy_item(color_ostream &out, vector <string> & parameters)
 {
-    // HOTKEY COMMAND; CORE ALREADY SUSPENDED
     if (!parameters.empty())
         return CR_WRONG_USAGE;
 
+    CoreSuspender suspend;
+
     df::item *item = Gui::getSelectedItem(out);
     if (!item)
         return CR_FAILURE;
diff --git a/plugins/autofarm.cpp b/plugins/autofarm.cpp
index 2f8762425..e1511153c 100644
--- a/plugins/autofarm.cpp
+++ b/plugins/autofarm.cpp
@@ -1,11 +1,12 @@
 #include "Core.h"
 #include "Console.h"
+#include "Debug.h"
 #include "Export.h"
 #include "PluginManager.h"
 
 #include "DataDefs.h"
 #include "df/world.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/building_type.h"
 #include "df/building_farmplotst.h"
 #include "df/buildings_other_id.h"
@@ -30,7 +31,7 @@ using namespace DFHack;
 using namespace df::enums;
 
 using df::global::world;
-using df::global::ui;
+using df::global::plotinfo;
 
 static command_result autofarm(color_ostream& out, std::vector<std::string>& parameters);
 
@@ -38,6 +39,13 @@ DFHACK_PLUGIN("autofarm");
 
 DFHACK_PLUGIN_IS_ENABLED(enabled);
 
+#define CONFIG_KEY "autofarm/config"
+
+namespace DFHack {
+    DBG_DECLARE(autofarm, cycle, DebugCategory::LINFO);
+    DBG_DECLARE(autofarm, config, DebugCategory::LINFO);
+}
+
 class AutoFarm {
 private:
     std::map<int, int> thresholds;
@@ -192,9 +200,9 @@ public:
         if (old_plant_id != new_plant_id)
         {
             farm->plant_id[season] = new_plant_id;
-            out << "autofarm: changing farm #" << farm->id <<
-                " from " << get_plant_name(old_plant_id) <<
-                " to " << get_plant_name(new_plant_id) << '\n';
+            INFO(cycle, out).print("autofarm: changing farm #%d from %s to %s\n", farm->id,
+                get_plant_name(old_plant_id).c_str(),
+                get_plant_name(new_plant_id).c_str());
         }
     }
 
@@ -307,7 +315,7 @@ public:
                     biome = biome_type::SUBTERRANEAN_WATER;
                 else {
                     df::coord2d region(Maps::getTileBiomeRgn(df::coord(bb->centerx, bb->centery, bb->z)));
-                    biome = Maps::GetBiomeType(region.x, region.y);
+                    biome = Maps::getBiomeType(region.x, region.y);
                 }
                 farms[biome].push_back(farm);
             }
@@ -324,6 +332,7 @@ public:
     void status(color_ostream& out)
     {
         out << "Autofarm is " << (enabled ? "Active." : "Stopped.") << '\n';
+
         for (auto& lc : lastCounts)
         {
             auto plant = world->raws.plants.all[lc.first];
@@ -332,7 +341,7 @@ public:
 
         for (auto& th : thresholds)
         {
-            if (lastCounts[th.first] > 0)
+            if (lastCounts.count(th.first) > 0)
                 continue;
             auto plant = world->raws.plants.all[th.first];
             out << plant->id << " limit " << getThreshold(th.first) << " current 0" << '\n';
@@ -341,6 +350,79 @@ public:
 
         out << std::flush;
     }
+
+private:
+
+    PersistentDataItem cfg_default_threshold;
+    PersistentDataItem cfg_enabled;
+
+public:
+    void load_state(color_ostream& out)
+    {
+        initialize();
+        if (!(Core::getInstance().isWorldLoaded()))
+            return;
+
+        cfg_enabled = World::GetPersistentData("autofarm/enabled");
+        if (cfg_enabled.isValid())
+            enabled = cfg_enabled.ival(0) != 0;
+        else {
+            cfg_enabled = World::AddPersistentData("autofarm/enabled");
+            cfg_enabled.ival(0) = enabled;
+        }
+
+        cfg_default_threshold = World::GetPersistentData("autofarm/default_threshold");
+
+        if (cfg_default_threshold.isValid())
+            defaultThreshold = cfg_default_threshold.ival(0);
+        else {
+            cfg_default_threshold = World::AddPersistentData("autofarm/default_threshold");
+            cfg_default_threshold.ival(0) = defaultThreshold;
+        }
+
+        std::vector<PersistentDataItem> items;
+        World::GetPersistentData(&items, "autofarm/threshold/", true);
+        for (auto& i: items) {
+            if (i.isValid())
+            {
+                const auto allPlants = world->raws.plants.all;
+                const std::string id = i.val();
+                const int val = i.ival(0);
+                const auto plant = std::find_if(std::begin(allPlants), std::end(allPlants), [id](df::plant_raw* p) { return p->id == id; });
+                if (plant != std::end(allPlants))
+                {
+                    setThreshold((*plant)->index, val);
+                    INFO(config, out).print("threshold of %d for plant %s in saved configuration loaded\n", val, id.c_str());
+                }
+                else
+                {
+                    WARN(config, out).print("threshold for unknown plant %s in saved configuration ignored\n", id.c_str());
+                }
+            }
+        }
+
+    }
+
+    void save_state(color_ostream& out)
+    {
+        cfg_default_threshold.ival(0) = defaultThreshold;
+        cfg_enabled.ival(0) = enabled;
+
+        std::vector<PersistentDataItem> items;
+        World::GetPersistentData(&items, "autofarm/threshold/", true);
+        for (auto& i : items)
+            World::DeletePersistentData(i);
+
+        for (const auto& t : thresholds)
+        {
+            const std::string& plantID = world->raws.plants.all[t.first]->id;
+            const std::string keyName = "autofarm/threshold/" + plantID;
+            PersistentDataItem cfgThreshold = World::AddPersistentData(keyName);
+            cfgThreshold.val() = plantID;
+            cfgThreshold.ival(0) = t.second;
+        }
+    }
+
 };
 
 static std::unique_ptr<AutoFarm> autofarmInstance;
@@ -348,13 +430,14 @@ static std::unique_ptr<AutoFarm> autofarmInstance;
 
 DFhackCExport command_result plugin_init(color_ostream& out, std::vector <PluginCommand>& commands)
 {
-    if (world && ui) {
+    if (world && plotinfo) {
         commands.push_back(
             PluginCommand("autofarm",
                           "Automatically manage farm crop selection.",
                           autofarm));
     }
-    autofarmInstance = std::move(dts::make_unique<AutoFarm>());
+    autofarmInstance = std::move(std::make_unique<AutoFarm>());
+    autofarmInstance->load_state(out);
     return CR_OK;
 }
 
@@ -390,6 +473,26 @@ DFhackCExport command_result plugin_onupdate(color_ostream& out)
 DFhackCExport command_result plugin_enable(color_ostream& out, bool enable)
 {
     enabled = enable;
+    if (Core::getInstance().isWorldLoaded())
+        autofarmInstance->save_state(out);
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream& out, state_change_event event)
+{
+    if (!autofarmInstance)
+        return CR_OK;
+
+    switch (event) {
+    case SC_WORLD_LOADED:
+        autofarmInstance->load_state(out);
+        break;
+    case SC_MAP_UNLOADED:
+        break;
+    default:
+        break;
+    }
+
     return CR_OK;
 }
 
@@ -417,6 +520,7 @@ static command_result setThresholds(color_ostream& out, std::vector<std::string>
             return CR_WRONG_USAGE;
         }
     }
+    autofarmInstance->save_state(out);
     return CR_OK;
 }
 
@@ -434,11 +538,16 @@ static command_result autofarm(color_ostream& out, std::vector<std::string>& par
         plugin_enable(out, false);
     else if (parameters.size() == 2 && parameters[0] == "default")
     {
-        if (autofarmInstance) autofarmInstance->setDefault(atoi(parameters[1].c_str()));
+        if (autofarmInstance)
+        {
+            autofarmInstance->setDefault(atoi(parameters[1].c_str()));
+            autofarmInstance->save_state(out);
+        }
     }
     else if (parameters.size() >= 3 && parameters[0] == "threshold")
     {
-        if (autofarmInstance) return setThresholds(out, parameters);
+        if (autofarmInstance)
+            return setThresholds(out, parameters);
     }
     else if (parameters.size() == 0 || (parameters.size() == 1 && parameters[0] == "status"))
         autofarmInstance->status(out);
diff --git a/plugins/autogems.cpp b/plugins/autogems.cpp
index d296caf7f..87eaafd16 100644
--- a/plugins/autogems.cpp
+++ b/plugins/autogems.cpp
@@ -33,7 +33,7 @@ using namespace DFHack;
 DFHACK_PLUGIN("autogems");
 DFHACK_PLUGIN_IS_ENABLED(enabled);
 
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(world);
 
 typedef int32_t item_id;
@@ -242,7 +242,7 @@ struct autogem_hook : public df::viewscreen_dwarfmodest {
 
     bool in_menu() {
         // Determines whether we're looking at the Workshop Orders screen.
-        return ui->main.mode == ui_sidebar_mode::OrdersWorkshop;
+        return plotinfo->main.mode == ui_sidebar_mode::OrdersWorkshop;
     }
 
     bool handleInput(std::set<df::interface_key> *input) {
@@ -299,7 +299,7 @@ IMPLEMENT_VMETHOD_INTERPOSE(autogem_hook, feed);
 IMPLEMENT_VMETHOD_INTERPOSE(autogem_hook, render);
 
 bool read_config(color_ostream &out) {
-    std::string path = "data/save/" + World::ReadWorldFolder() + "/autogems.json";
+    std::string path = "save/" + World::ReadWorldFolder() + "/autogems.json";
     if (!Filesystem::isfile(path)) {
         // no need to require the config file to exist
         return true;
diff --git a/plugins/autolabor/CMakeLists.txt b/plugins/autolabor/CMakeLists.txt
index c73e2ad6d..721654d20 100644
--- a/plugins/autolabor/CMakeLists.txt
+++ b/plugins/autolabor/CMakeLists.txt
@@ -10,7 +10,6 @@ set_source_files_properties(${COMMON_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
 # mash them together (headers are marked as headers and nothing will try to compile them)
 list(APPEND COMMON_SRCS ${COMMON_HDRS})
 
-dfhack_plugin(labormanager labormanager.cpp joblabormapper.cpp ${COMMON_SRCS})
+#dfhack_plugin(labormanager labormanager.cpp joblabormapper.cpp ${COMMON_SRCS})
 
-dfhack_plugin(autohauler autohauler.cpp ${COMMON_SRCS})
-dfhack_plugin(autolabor autolabor.cpp ${COMMON_SRCS})
+dfhack_plugin(autolabor autolabor.cpp ${COMMON_SRCS} LINK_LIBRARIES lua)
diff --git a/plugins/autolabor/autohauler.cpp b/plugins/autolabor/autohauler.cpp
deleted file mode 100644
index e7c2530e1..000000000
--- a/plugins/autolabor/autohauler.cpp
+++ /dev/null
@@ -1,727 +0,0 @@
-#include "Core.h"
-#include <Console.h>
-#include <Debug.h>
-#include <Export.h>
-#include <PluginManager.h>
-
-#include <vector>
-#include <algorithm>
-
-#include "modules/Units.h"
-#include "modules/World.h"
-
-// DF data structure definition headers
-#include "DataDefs.h"
-#include <df/ui.h>
-#include <df/world.h>
-#include <df/unit.h>
-#include <df/unit_soul.h>
-#include <df/unit_labor.h>
-#include <df/unit_skill.h>
-#include <df/job.h>
-#include <df/building.h>
-#include <df/workshop_type.h>
-#include <df/unit_misc_trait.h>
-#include <df/entity_position_responsibility.h>
-#include <df/historical_figure.h>
-#include <df/historical_entity.h>
-#include <df/histfig_entity_link.h>
-#include <df/histfig_entity_link_positionst.h>
-#include <df/entity_position_assignment.h>
-#include <df/entity_position.h>
-#include <df/building_tradedepotst.h>
-#include <df/building_stockpilest.h>
-#include <df/items_other_id.h>
-#include <df/ui.h>
-#include <df/activity_info.h>
-
-#include <MiscUtils.h>
-
-#include "modules/MapCache.h"
-#include "modules/Items.h"
-#include "modules/Units.h"
-
-#include "laborstatemap.h"
-
-using namespace DFHack;
-using namespace df::enums;
-
-DFHACK_PLUGIN("autohauler");
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(world);
-
-#define ARRAY_COUNT(array) (sizeof(array)/sizeof((array)[0]))
-
-/*
- * Autohauler module for dfhack
- * Fork of autolabor, DFHack version 0.40.24-r2
- *
- * Rather than the all-of-the-above means of autolabor, autohauler will instead
- * only manage hauling labors and leave skilled labors entirely to the user, who
- * will probably use Dwarf Therapist to do so.
- * Idle dwarves will be assigned the hauling labors; everyone else (including
- * those currently hauling) will have the hauling labors removed. This is to
- * encourage every dwarf to do their assigned skilled labors whenever possible,
- * but resort to hauling when those jobs are not available. This also implies
- * that the user will have a very tight skill assignment, with most skilled
- * labors only being assigned to just one dwarf, no dwarf having more than two
- * active skilled labors, and almost every non-military dwarf having at least
- * one skilled labor assigned.
- * Autohauler allows skills to be flagged as to prevent hauling labors from
- * being assigned when the skill is present. By default this is the unused
- * ALCHEMIST labor but can be changed by the user.
- * It is noteworthy that, as stated in autolabor.cpp, "for almost all labors,
- * once a dwarf begins a job it will finish that job even if the associated
- * labor is removed." This is why we can remove hauling labors by default to try
- * to force dwarves to do "real" jobs whenever they can.
- * This is a standalone plugin. However, it would be wise to delete
- * autolabor.plug.dll as this plugin is mutually exclusive with it.
- */
-
-DFHACK_PLUGIN_IS_ENABLED(enable_autohauler);
-
-namespace DFHack {
-    DBG_DECLARE(autohauler, cycle, DebugCategory::LINFO);
-}
-
-static std::vector<int> state_count(NUM_STATE);
-
-const static int DEFAULT_FRAME_SKIP = 30;
-
-static PersistentDataItem config;
-
-command_result autohauler (color_ostream &out, std::vector <std::string> & parameters);
-
-static int frame_skip;
-
-static bool isOptionEnabled(unsigned flag)
-{
-    return config.isValid() && (config.ival(0) & flag) != 0;
-}
-
-enum ConfigFlags {
-    CF_ENABLED = 1,
-};
-
-static void setOptionEnabled(ConfigFlags flag, bool on)
-{
-    if (!config.isValid())
-        return;
-
-    if (on)
-        config.ival(0) |= flag;
-    else
-        config.ival(0) &= ~flag;
-}
-
-enum labor_mode {
-    ALLOW,
-    HAULERS,
-    FORBID
-};
-
-struct labor_info
-{
-    PersistentDataItem config;
-
-    int active_dwarfs;
-
-    labor_mode mode() { return (labor_mode) config.ival(0); }
-
-    void set_mode(labor_mode mode) { config.ival(0) = mode; }
-
-    void set_config(PersistentDataItem a) { config = a; }
-
-    };
-
-struct labor_default
-{
-    labor_mode mode;
-    int active_dwarfs;
-};
-
-static std::vector<struct labor_info> labor_infos;
-
-static const struct labor_default default_labor_infos[] = {
-    /* MINE */                  {ALLOW,   0},
-    /* HAUL_STONE */            {HAULERS, 0},
-    /* HAUL_WOOD */             {HAULERS, 0},
-    /* HAUL_BODY */             {HAULERS, 0},
-    /* HAUL_FOOD */             {HAULERS, 0},
-    /* HAUL_REFUSE */           {HAULERS, 0},
-    /* HAUL_ITEM */             {HAULERS, 0},
-    /* HAUL_FURNITURE */        {HAULERS, 0},
-    /* HAUL_ANIMAL */           {HAULERS, 0},
-    /* CLEAN */                 {HAULERS, 0},
-    /* CUTWOOD */               {ALLOW,   0},
-    /* CARPENTER */             {ALLOW,   0},
-    /* DETAIL */                {ALLOW,   0},
-    /* MASON */                 {ALLOW,   0},
-    /* ARCHITECT */             {ALLOW,   0},
-    /* ANIMALTRAIN */           {ALLOW,   0},
-    /* ANIMALCARE */            {ALLOW,   0},
-    /* DIAGNOSE */              {ALLOW,   0},
-    /* SURGERY */               {ALLOW,   0},
-    /* BONE_SETTING */          {ALLOW,   0},
-    /* SUTURING */              {ALLOW,   0},
-    /* DRESSING_WOUNDS */       {ALLOW,   0},
-    /* FEED_WATER_CIVILIANS */  {HAULERS, 0}, // This could also be ALLOW
-    /* RECOVER_WOUNDED */       {HAULERS, 0},
-    /* BUTCHER */               {ALLOW,   0},
-    /* TRAPPER */               {ALLOW,   0},
-    /* DISSECT_VERMIN */        {ALLOW,   0},
-    /* LEATHER */               {ALLOW,   0},
-    /* TANNER */                {ALLOW,   0},
-    /* BREWER */                {ALLOW,   0},
-    /* ALCHEMIST */             {FORBID,  0},
-    /* SOAP_MAKER */            {ALLOW,   0},
-    /* WEAVER */                {ALLOW,   0},
-    /* CLOTHESMAKER */          {ALLOW,   0},
-    /* MILLER */                {ALLOW,   0},
-    /* PROCESS_PLANT */         {ALLOW,   0},
-    /* MAKE_CHEESE */           {ALLOW,   0},
-    /* MILK */                  {ALLOW,   0},
-    /* COOK */                  {ALLOW,   0},
-    /* PLANT */                 {ALLOW,   0},
-    /* HERBALIST */             {ALLOW,   0},
-    /* FISH */                  {ALLOW,   0},
-    /* CLEAN_FISH */            {ALLOW,   0},
-    /* DISSECT_FISH */          {ALLOW,   0},
-    /* HUNT */                  {ALLOW,   0},
-    /* SMELT */                 {ALLOW,   0},
-    /* FORGE_WEAPON */          {ALLOW,   0},
-    /* FORGE_ARMOR */           {ALLOW,   0},
-    /* FORGE_FURNITURE */       {ALLOW,   0},
-    /* METAL_CRAFT */           {ALLOW,   0},
-    /* CUT_GEM */               {ALLOW,   0},
-    /* ENCRUST_GEM */           {ALLOW,   0},
-    /* WOOD_CRAFT */            {ALLOW,   0},
-    /* STONE_CRAFT */           {ALLOW,   0},
-    /* BONE_CARVE */            {ALLOW,   0},
-    /* GLASSMAKER */            {ALLOW,   0},
-    /* EXTRACT_STRAND */        {ALLOW,   0},
-    /* SIEGECRAFT */            {ALLOW,   0},
-    /* SIEGEOPERATE */          {ALLOW,   0},
-    /* BOWYER */                {ALLOW,   0},
-    /* MECHANIC */              {ALLOW,   0},
-    /* POTASH_MAKING */         {ALLOW,   0},
-    /* LYE_MAKING */            {ALLOW,   0},
-    /* DYER */                  {ALLOW,   0},
-    /* BURN_WOOD */             {ALLOW,   0},
-    /* OPERATE_PUMP */          {ALLOW,   0},
-    /* SHEARER */               {ALLOW,   0},
-    /* SPINNER */               {ALLOW,   0},
-    /* POTTERY */               {ALLOW,   0},
-    /* GLAZING */               {ALLOW,   0},
-    /* PRESSING */              {ALLOW,   0},
-    /* BEEKEEPING */            {ALLOW,   0},
-    /* WAX_WORKING */           {ALLOW,   0},
-    /* HANDLE_VEHICLES */       {HAULERS, 0},
-    /* HAUL_TRADE */            {HAULERS, 0},
-    /* PULL_LEVER */            {HAULERS, 0},
-    /* REMOVE_CONSTRUCTION */   {HAULERS, 0},
-    /* HAUL_WATER */            {HAULERS, 0},
-    /* GELD */                  {ALLOW,   0},
-    /* BUILD_ROAD */            {HAULERS, 0},
-    /* BUILD_CONSTRUCTION */    {HAULERS, 0},
-    /* PAPERMAKING */           {ALLOW,   0},
-    /* BOOKBINDING */           {ALLOW,   0}
-};
-
-struct dwarf_info_t
-{
-    dwarf_state state;
-
-    bool haul_exempt;
-};
-
-static void cleanup_state()
-{
-    enable_autohauler = false;
-    labor_infos.clear();
-}
-
-static void reset_labor(df::unit_labor labor)
-{
-    labor_infos[labor].set_mode(default_labor_infos[labor].mode);
-}
-
-static void enable_alchemist(color_ostream &out)
-{
-    if (!Units::setLaborValidity(unit_labor::ALCHEMIST, true))
-    {
-        // informational only; this is a non-fatal error
-        out.printerr("%s: Could not flag Alchemist as a valid skill; Alchemist will not"
-                     " be settable from DF or DFHack labor management screens.\n", plugin_name);
-    }
-}
-
-static void init_state(color_ostream &out)
-{
-    config = World::GetPersistentData("autohauler/config");
-
-    if (config.isValid() && config.ival(0) == -1)
-        config.ival(0) = 0;
-
-    enable_autohauler = isOptionEnabled(CF_ENABLED);
-
-    if (!enable_autohauler)
-        return;
-
-    auto cfg_frameskip = World::GetPersistentData("autohauler/frameskip");
-    if (cfg_frameskip.isValid())
-    {
-        frame_skip = cfg_frameskip.ival(0);
-    }
-    else
-    {
-        cfg_frameskip = World::AddPersistentData("autohauler/frameskip");
-        cfg_frameskip.ival(0) = DEFAULT_FRAME_SKIP;
-        frame_skip = cfg_frameskip.ival(0);
-    }
-    labor_infos.resize(ARRAY_COUNT(default_labor_infos));
-
-    std::vector<PersistentDataItem> items;
-    World::GetPersistentData(&items, "autohauler/labors/", true);
-
-
-    for (auto& p : items)
-    {
-        std::string key = p.key();
-        df::unit_labor labor = (df::unit_labor) atoi(key.substr(strlen("autohauler/labors/")).c_str());
-        if (labor >= 0 && size_t(labor) < labor_infos.size())
-        {
-            labor_infos[labor].set_config(p);
-            labor_infos[labor].active_dwarfs = 0;
-        }
-    }
-
-    // Add default labors for those not in save
-    for (size_t i = 0; i < ARRAY_COUNT(default_labor_infos); i++) {
-        if (labor_infos[i].config.isValid())
-            continue;
-
-        std::stringstream name;
-        name << "autohauler/labors/" << i;
-
-        labor_infos[i].set_config(World::AddPersistentData(name.str()));
-
-        labor_infos[i].active_dwarfs = 0;
-        reset_labor((df::unit_labor) i);
-    }
-
-    enable_alchemist(out);
-}
-
-static void enable_plugin(color_ostream &out)
-{
-    if (!config.isValid())
-    {
-        config = World::AddPersistentData("autohauler/config");
-        config.ival(0) = 0;
-    }
-
-    setOptionEnabled(CF_ENABLED, true);
-    enable_autohauler = true;
-    out << "Enabling the plugin." << std::endl;
-
-    cleanup_state();
-    init_state(out);
-}
-
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    if(ARRAY_COUNT(default_labor_infos) != ENUM_LAST_ITEM(unit_labor) + 1)
-    {
-        out.printerr("autohauler: labor size mismatch\n");
-        return CR_FAILURE;
-    }
-
-    commands.push_back(PluginCommand(
-        "autohauler",
-        "Automatically manage hauling labors.",
-        autohauler));
-
-    init_state(out);
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    cleanup_state();
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event) {
-    case SC_MAP_LOADED:
-        cleanup_state();
-        init_state(out);
-        break;
-    case SC_MAP_UNLOADED:
-        cleanup_state();
-        break;
-    default:
-        break;
-    }
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_onupdate ( color_ostream &out )
-{
-    static int step_count = 0;
-    if(!world || !world->map.block_index || !enable_autohauler)
-    {
-        return CR_OK;
-    }
-
-    if (++step_count < frame_skip)
-        return CR_OK;
-    step_count = 0;
-
-    std::vector<df::unit *> dwarfs;
-
-    for (auto& cre : world->units.active)
-    {
-        if (Units::isCitizen(cre))
-        {
-            dwarfs.push_back(cre);
-        }
-    }
-
-    int n_dwarfs = dwarfs.size();
-
-    if (n_dwarfs == 0)
-        return CR_OK;
-
-    std::vector<dwarf_info_t> dwarf_info(n_dwarfs);
-
-    state_count.clear();
-    state_count.resize(NUM_STATE);
-
-    for (int dwarf = 0; dwarf < n_dwarfs; dwarf++)
-    {
-        /* Before determining how to handle employment status, handle
-         * hauling exemptions first */
-
-        // Default deny condition of on break for later else-if series
-        bool is_migrant = false;
-
-        // Scan every labor. If a labor that disallows hauling is present
-        // for the dwarf, the dwarf is hauling exempt
-        FOR_ENUM_ITEMS(unit_labor, labor)
-        {
-            if (!(labor == unit_labor::NONE))
-            {
-                bool test1 = labor_infos[labor].mode() == FORBID;
-                bool test2 = dwarfs[dwarf]->status.labors[labor];
-
-                if(test1 && test2) dwarf_info[dwarf].haul_exempt = true;
-            }
-        }
-
-        // Scan a dwarf's miscellaneous traits for on break or migrant status.
-        // If either of these are present, disable hauling because we want them
-        // to try to find real jobs first
-        auto v = dwarfs[dwarf]->status.misc_traits;
-        auto test_migrant = [](df::unit_misc_trait* t) { return t->id == misc_trait_type::Migrant; };
-        is_migrant = std::find_if(v.begin(), v.end(), test_migrant ) != v.end();
-
-        /* Now determine a dwarf's employment status and decide whether
-         * to assign hauling */
-
-        // I don't think you can set the labors for babies and children, but let's
-        // ignore them anyway
-        if (Units::isBaby(dwarfs[dwarf]) || Units::isChild(dwarfs[dwarf]))
-        {
-            dwarf_info[dwarf].state = CHILD;
-        }
-        // Account for any hauling exemptions here
-        else if (dwarf_info[dwarf].haul_exempt)
-        {
-            dwarf_info[dwarf].state = BUSY;
-        }
-        // Account for the military
-        else if (ENUM_ATTR(profession, military, dwarfs[dwarf]->profession))
-            dwarf_info[dwarf].state = MILITARY;
-        // Account for incoming migrants
-        else if (is_migrant)
-        {
-            dwarf_info[dwarf].state = OTHER;
-        }
-        else if (dwarfs[dwarf]->job.current_job == NULL)
-        {
-            dwarf_info[dwarf].state = IDLE;
-        }
-        else
-        {
-            int job = dwarfs[dwarf]->job.current_job->job_type;
-            if (job >= 0 && size_t(job) < ARRAY_COUNT(dwarf_states))
-                dwarf_info[dwarf].state = dwarf_states[job];
-            else
-            {
-                WARN(cycle, out).print("Dwarf %i \"%s\" has unknown job %i\n", dwarf, dwarfs[dwarf]->name.first_name.c_str(), job);
-                dwarf_info[dwarf].state = OTHER;
-            }
-        }
-
-        state_count[dwarf_info[dwarf].state]++;
-
-        TRACE(cycle, out).print("Dwarf %i \"%s\": state %s\n",
-            dwarf, dwarfs[dwarf]->name.first_name.c_str(), state_names[dwarf_info[dwarf].state]);
-    }
-
-    // This is a vector of all the labors
-    std::vector<df::unit_labor> labors;
-
-    // For every labor...
-    FOR_ENUM_ITEMS(unit_labor, labor)
-    {
-        // Ignore all nonexistent labors
-        if (labor == unit_labor::NONE)
-            continue;
-
-        // Set number of active dwarves for this job to zero
-        labor_infos[labor].active_dwarfs = 0;
-
-        // And add the labor to the aforementioned vector of labors
-        labors.push_back(labor);
-    }
-
-    // This is a different algorithm than Autolabor. Instead, the intent is to
-    // have "real" jobs filled first, then if nothing is available the dwarf
-    // instead resorts to hauling.
-
-    // IDLE     - Enable hauling
-    // BUSY     - Disable hauling
-    // OTHER    - Enable hauling
-    // MILITARY - Enable hauling
-
-    // There was no reason to put potential haulers in an array. All of them are
-    // covered in the following for loop.
-
-    FOR_ENUM_ITEMS(unit_labor, labor)
-    {
-        if (labor == unit_labor::NONE)
-            continue;
-        if (labor_infos[labor].mode() != HAULERS)
-            continue;
-
-        for(size_t dwarf = 0; dwarf < dwarfs.size(); dwarf++)
-        {
-            if (!Units::isValidLabor(dwarfs[dwarf], labor))
-                continue;
-
-            // Set hauling labors based on employment states
-            if(dwarf_info[dwarf].state == IDLE) {
-                dwarfs[dwarf]->status.labors[labor] = true;
-            }
-            else if(dwarf_info[dwarf].state == MILITARY) {
-                dwarfs[dwarf]->status.labors[labor] = true;
-            }
-            else if(dwarf_info[dwarf].state == OTHER) {
-                dwarfs[dwarf]->status.labors[labor] = true;
-            }
-            else if(dwarf_info[dwarf].state == BUSY) {
-                dwarfs[dwarf]->status.labors[labor] = false;
-            }
-            // If at the end of this the dwarf has the hauling labor, increment the
-            // counter
-            if(dwarfs[dwarf]->status.labors[labor])
-            {
-                labor_infos[labor].active_dwarfs++;
-            }
-            // CHILD ignored
-        }
-    }
-    return CR_OK;
-}
-
-void print_labor (df::unit_labor labor, color_ostream &out)
-{
-    std::string labor_name = ENUM_KEY_STR(unit_labor, labor);
-    out << labor_name << ": ";
-    for (int i = 0; i < 20 - (int)labor_name.length(); i++)
-        out << ' ';
-    if (labor_infos[labor].mode() == ALLOW) out << "allow" << std::endl;
-    else if(labor_infos[labor].mode() == FORBID) out << "forbid" << std::endl;
-    else if(labor_infos[labor].mode() == HAULERS)
-    {
-        out << "haulers, currently " << labor_infos[labor].active_dwarfs << " dwarfs" << std::endl;
-    }
-    else
-    {
-        out << "Warning: Invalid labor mode!" << std::endl;
-    }
-}
-
-DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable )
-{
-    if (!Core::getInstance().isWorldLoaded()) {
-        out.printerr("World is not loaded: please load a game first.\n");
-        return CR_FAILURE;
-    }
-
-    if (enable && !enable_autohauler)
-    {
-        enable_plugin(out);
-    }
-    else if(!enable && enable_autohauler)
-    {
-        enable_autohauler = false;
-        setOptionEnabled(CF_ENABLED, false);
-
-        out << "Autohauler is disabled." << std::endl;
-    }
-
-    return CR_OK;
-}
-
-command_result autohauler (color_ostream &out, std::vector <std::string> & parameters)
-{
-    CoreSuspender suspend;
-
-    if (!Core::getInstance().isWorldLoaded()) {
-        out.printerr("World is not loaded: please load a game first.\n");
-        return CR_FAILURE;
-    }
-
-    if (parameters.size() == 1 &&
-        (parameters[0] == "0" || parameters[0] == "enable" ||
-         parameters[0] == "1" || parameters[0] == "disable"))
-    {
-        bool enable = (parameters[0] == "1" || parameters[0] == "enable");
-
-        return plugin_enable(out, enable);
-    }
-    else if (parameters.size() == 2 && parameters[0] == "frameskip")
-    {
-        auto cfg_frameskip = World::GetPersistentData("autohauler/frameskip");
-        if(cfg_frameskip.isValid())
-        {
-            int newValue = atoi(parameters[1].c_str());
-            cfg_frameskip.ival(0) = newValue;
-            out << "Setting frame skip to " << newValue << std::endl;
-            frame_skip = cfg_frameskip.ival(0);
-            return CR_OK;
-        }
-        else
-        {
-            out << "Warning! No persistent data for frame skip!" << std::endl;
-            return CR_OK;
-        }
-    }
-    else if (parameters.size() >= 2 && parameters.size() <= 4)
-    {
-        if (!enable_autohauler)
-        {
-            out << "Error: The plugin is not enabled." << std::endl;
-            return CR_FAILURE;
-        }
-
-        df::unit_labor labor = unit_labor::NONE;
-
-        FOR_ENUM_ITEMS(unit_labor, test_labor)
-        {
-            if (parameters[0] == ENUM_KEY_STR(unit_labor, test_labor))
-                labor = test_labor;
-        }
-
-        if (labor == unit_labor::NONE)
-        {
-            out.printerr("Could not find labor %s.\n", parameters[0].c_str());
-            return CR_WRONG_USAGE;
-        }
-
-        if (parameters[1] == "haulers")
-        {
-            labor_infos[labor].set_mode(HAULERS);
-            print_labor(labor, out);
-            return CR_OK;
-        }
-        if (parameters[1] == "allow")
-        {
-            labor_infos[labor].set_mode(ALLOW);
-            print_labor(labor, out);
-            return CR_OK;
-        }
-        if (parameters[1] == "forbid")
-        {
-            labor_infos[labor].set_mode(FORBID);
-            print_labor(labor, out);
-            return CR_OK;
-        }
-        if (parameters[1] == "reset")
-        {
-            reset_labor(labor);
-            print_labor(labor, out);
-            return CR_OK;
-        }
-
-        print_labor(labor, out);
-
-        return CR_OK;
-    }
-    else if (parameters.size() == 1 && parameters[0] == "reset-all")
-    {
-        if (!enable_autohauler)
-        {
-            out << "Error: The plugin is not enabled." << std::endl;
-            return CR_FAILURE;
-        }
-
-        for (size_t i = 0; i < labor_infos.size(); i++)
-        {
-            reset_labor((df::unit_labor) i);
-        }
-        out << "All labors reset." << std::endl;
-        return CR_OK;
-    }
-    else if (parameters.size() == 1 && (parameters[0] == "list" || parameters[0] == "status"))
-    {
-        if (!enable_autohauler)
-        {
-            out << "Error: The plugin is not enabled." << std::endl;
-            return CR_FAILURE;
-        }
-
-        bool need_comma = false;
-        for (int i = 0; i < NUM_STATE; i++)
-        {
-            if (state_count[i] == 0)
-                continue;
-            if (need_comma)
-                out << ", ";
-            out << state_count[i] << ' ' << state_names[i];
-            need_comma = true;
-        }
-        out << std::endl;
-
-        out << "Autohauler is running every " << frame_skip << " frames." << std::endl;
-
-        if (parameters[0] == "list")
-        {
-            FOR_ENUM_ITEMS(unit_labor, labor)
-            {
-                if (labor == unit_labor::NONE)
-                    continue;
-
-                print_labor(labor, out);
-            }
-        }
-
-        return CR_OK;
-    }
-    else
-    {
-        out.print("Automatically assigns hauling labors to dwarves.\n"
-            "Activate with 'enable autohauler', deactivate with 'disable autohauler'.\n"
-            "Current state: %d.\n", enable_autohauler);
-
-        return CR_OK;
-    }
-}
diff --git a/plugins/autolabor/autolabor.cpp b/plugins/autolabor/autolabor.cpp
index 76108ddd0..8be035214 100644
--- a/plugins/autolabor/autolabor.cpp
+++ b/plugins/autolabor/autolabor.cpp
@@ -12,7 +12,7 @@
 
 // DF data structure definition headers
 #include "DataDefs.h"
-#include <df/ui.h>
+#include <df/plotinfost.h>
 #include <df/world.h>
 #include <df/unit.h>
 #include <df/unit_soul.h>
@@ -32,8 +32,10 @@
 #include <df/building_tradedepotst.h>
 #include <df/building_stockpilest.h>
 #include <df/items_other_id.h>
-#include <df/ui.h>
+#include <df/plotinfost.h>
 #include <df/activity_info.h>
+#include <df/gamest.h>
+#include <df/global_objects.h>
 
 #include <MiscUtils.h>
 
@@ -47,8 +49,9 @@ using namespace DFHack;
 using namespace df::enums;
 
 DFHACK_PLUGIN("autolabor");
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(world);
+REQUIRE_GLOBAL(game);
 
 #define ARRAY_COUNT(array) (sizeof(array)/sizeof((array)[0]))
 
@@ -172,9 +175,9 @@ static const struct labor_default default_labor_infos[] = {
     /* CLEAN */                 {HAULERS, false, 1, 200, 0},
     /* CUTWOOD */               {AUTOMATIC, true, 1, 200, 0},
     /* CARPENTER */             {AUTOMATIC, false, 1, 200, 0},
-    /* DETAIL */                {AUTOMATIC, false, 1, 200, 0},
+    /* STONECUTTER */           {AUTOMATIC, false, 1, 200, 0},
+    /* STONE_CARVER */          {AUTOMATIC, false, 1, 200, 0},
     /* MASON */                 {AUTOMATIC, false, 1, 200, 0},
-    /* ARCHITECT */             {AUTOMATIC, false, 1, 200, 0},
     /* ANIMALTRAIN */           {AUTOMATIC, false, 1, 200, 0},
     /* ANIMALCARE */            {AUTOMATIC, false, 1, 200, 0},
     /* DIAGNOSE */              {AUTOMATIC, false, 1, 200, 0},
@@ -242,7 +245,18 @@ static const struct labor_default default_labor_infos[] = {
     /* BUILD_ROAD */            {AUTOMATIC, false, 1, 200, 0},
     /* BUILD_CONSTRUCTION */    {AUTOMATIC, false, 1, 200, 0},
     /* PAPERMAKING */           {AUTOMATIC, false, 1, 200, 0},
-    /* BOOKBINDING */           {AUTOMATIC, false, 1, 200, 0}
+    /* BOOKBINDING */           {AUTOMATIC, false, 1, 200, 0},
+    /* ANON_LABOR_83 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_84 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_85 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_86 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_87 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_88 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_89 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_90 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_91 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_92 */         {DISABLE, false, 0, 0, 0},
+    /* ANON_LABOR_93 */         {DISABLE, false, 0, 0, 0},
 };
 
 static const int responsibility_penalties[] = {
@@ -291,6 +305,7 @@ static void cleanup_state()
 {
     enable_autolabor = false;
     labor_infos.clear();
+    game->external_flag &= ~1; // reinstate DF's work detail system
 }
 
 static void reset_labor(df::unit_labor labor)
@@ -312,6 +327,8 @@ static void init_state()
     if (!enable_autolabor)
         return;
 
+    game->external_flag |= 1; // bypass DF's work detail system
+
     auto cfg_haulpct = World::GetPersistentData("autolabor/haulpct");
     if (cfg_haulpct.isValid())
     {
@@ -401,6 +418,17 @@ static void enable_plugin(color_ostream &out)
     init_state();
 }
 
+static void disable_plugin(color_ostream& out)
+{
+    if (config.isValid())
+        setOptionEnabled(CF_ENABLED, false);
+
+    enable_autolabor = false;
+    out << "Disabling autolabor." << std::endl;
+
+    cleanup_state();
+}
+
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     // initialize labor infos table from default table
@@ -711,15 +739,18 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 
 DFhackCExport command_result plugin_onupdate ( color_ostream &out )
 {
-    static int step_count = 0;
+    static int last_run = 0;
+    static const int run_frequency = 60;
+
     if(!world || !world->map.block_index || !enable_autolabor)
     {
         return CR_OK;
     }
 
-    if (++step_count < 60)
+    if (world->frame_counter - last_run <= run_frequency)
         return CR_OK;
-    step_count = 0;
+
+    last_run = world->frame_counter;
 
     std::vector<df::unit *> dwarfs;
 
@@ -742,7 +773,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
         {
             df::building_tradedepotst* depot = (df::building_tradedepotst*) build;
             trader_requested = trader_requested || depot->trade_flags.bits.trader_requested;
-            INFO(cycle,out).print(trader_requested
+            TRACE(cycle,out).print(trader_requested
                 ? "Trade depot found and trader requested, trader will be excluded from all labors.\n"
                 : "Trade depot found but trader is not requested.\n"
                 );
@@ -813,16 +844,16 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
 
         // identify dwarfs who are needed for meetings and mark them for exclusion
 
-        for (auto& act : ui->activities)
+        for (auto& act : plotinfo->activities)
         {
             if (!act) continue;
-            bool p1 = act->unit_actor == dwarfs[dwarf];
-            bool p2 = act->unit_noble == dwarfs[dwarf];
+            bool p1 = act->unit_actor == dwarfs[dwarf]->id;
+            bool p2 = act->unit_noble == dwarfs[dwarf]->id;
 
             if (p1 || p2)
             {
                 dwarf_info[dwarf].diplomacy = true;
-                INFO(cycle, out).print("Dwarf %i \"%s\" has a meeting, will be cleared of all labors\n",
+                DEBUG(cycle, out).print("Dwarf %i \"%s\" has a meeting, will be cleared of all labors\n",
                     dwarf, dwarfs[dwarf]->name.first_name.c_str());
                 break;
             }
@@ -1062,10 +1093,7 @@ DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable )
     }
     else if(!enable && enable_autolabor)
     {
-        enable_autolabor = false;
-        setOptionEnabled(CF_ENABLED, false);
-
-        out << "Autolabor is disabled." << std::endl;
+        disable_plugin(out);
     }
 
     return CR_OK;
diff --git a/plugins/autolabor/joblabormapper.cpp b/plugins/autolabor/joblabormapper.cpp
index 2917b8d3a..690e80881 100644
--- a/plugins/autolabor/joblabormapper.cpp
+++ b/plugins/autolabor/joblabormapper.cpp
@@ -56,7 +56,7 @@ using std::string;
 using std::endl;
 using namespace DFHack;
 using namespace df::enums;
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::world;
 
 #include "labormanager.h"
diff --git a/plugins/autolabor/labormanager.cpp b/plugins/autolabor/labormanager.cpp
index 44817e405..4b43b09c1 100644
--- a/plugins/autolabor/labormanager.cpp
+++ b/plugins/autolabor/labormanager.cpp
@@ -25,7 +25,7 @@
 #include "DataDefs.h"
 #include <MiscUtils.h>
 
-#include <df/ui.h>
+#include <df/plotinfost.h>
 #include <df/world.h>
 #include <df/unit.h>
 #include <df/unit_relationship_type.h>
@@ -46,7 +46,7 @@
 #include <df/building_tradedepotst.h>
 #include <df/building_stockpilest.h>
 #include <df/items_other_id.h>
-#include <df/ui.h>
+#include <df/plotinfost.h>
 #include <df/activity_info.h>
 #include <df/tile_dig_designation.h>
 #include <df/item_weaponst.h>
@@ -64,7 +64,7 @@
 #include <df/building_design.h>
 #include <df/vehicle.h>
 #include <df/units_other_id.h>
-#include <df/ui.h>
+#include <df/plotinfost.h>
 #include <df/training_assignment.h>
 #include <df/general_ref_contains_itemst.h>
 #include <df/personality_facet_type.h>
@@ -82,7 +82,7 @@ using std::string;
 using std::endl;
 using namespace DFHack;
 using namespace df::enums;
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::world;
 
 #define ARRAY_COUNT(array) (sizeof(array)/sizeof((array)[0]))
@@ -948,9 +948,9 @@ private:
 
                 // identify dwarfs who are needed for meetings and mark them for exclusion
 
-                for (size_t i = 0; i < ui->activities.size(); ++i)
+                for (size_t i = 0; i < plotinfo->activities.size(); ++i)
                 {
-                    df::activity_info *act = ui->activities[i];
+                    df::activity_info *act = plotinfo->activities[i];
                     if (!act) continue;
 
                     bool p1 = act->unit_actor == dwarf->dwarf;
@@ -996,11 +996,11 @@ private:
 
                 for (size_t j = 0; j < dwarf->dwarf->inventory.size(); j++)
                 {
-                    df::unit_inventory_item* ui = dwarf->dwarf->inventory[j];
-                    if (ui->mode == df::unit_inventory_item::Weapon && ui->item->isWeapon())
+                    df::unit_inventory_item* plotinfo = dwarf->dwarf->inventory[j];
+                    if (plotinfo->mode == df::unit_inventory_item::Weapon && plotinfo->item->isWeapon())
                     {
                         dwarf->armed = true;
-                        df::itemdef_weaponst* weapondef = ((df::item_weaponst*)(ui->item))->subtype;
+                        df::itemdef_weaponst* weapondef = ((df::item_weaponst*)(plotinfo->item))->subtype;
                         df::job_skill weaponsk = (df::job_skill) weapondef->skill_melee;
                         df::job_skill rangesk = (df::job_skill) weapondef->skill_ranged;
                         if (weaponsk == df::job_skill::AXE)
@@ -1408,8 +1408,8 @@ public:
             (isOptionEnabled(CF_ALLOW_HUNTING) && has_butchers) ? 1 : 0;
 
         /* add animal trainers */
-        for (auto a = df::global::ui->equipment.training_assignments.begin();
-            a != df::global::ui->equipment.training_assignments.end();
+        for (auto a = df::global::plotinfo->equipment.training_assignments.begin();
+            a != df::global::plotinfo->equipment.training_assignments.end();
             a++)
         {
             labor_needed[df::unit_labor::ANIMALTRAIN]++;
diff --git a/plugins/autolabor/laborstatemap.h b/plugins/autolabor/laborstatemap.h
index 789685930..61cebdd9c 100644
--- a/plugins/autolabor/laborstatemap.h
+++ b/plugins/autolabor/laborstatemap.h
@@ -42,6 +42,8 @@ char const* state_names[] {
 
 const dwarf_state dwarf_states[] = {
     dwarf_state::BUSY /* CarveFortification */,
+    dwarf_state::BUSY /* SmoothWall */,
+    dwarf_state::BUSY /* SmoothFloor */,
     dwarf_state::BUSY /* DetailWall */,
     dwarf_state::BUSY /* DetailFloor */,
     dwarf_state::EXCLUSIVE /* Dig */,
@@ -75,21 +77,17 @@ const dwarf_state dwarf_states[] = {
     dwarf_state::BUSY /* CatchLiveLandAnimal */,
     dwarf_state::BUSY /* CatchLiveFish */,
     dwarf_state::BUSY /* ReturnKill */,
-    dwarf_state::BUSY /* CheckChest */,
     dwarf_state::BUSY /* StoreOwnedItem */,
     dwarf_state::BUSY /* PlaceItemInTomb */,
     dwarf_state::BUSY /* StoreItemInStockpile */,
     dwarf_state::BUSY /* StoreItemInBag */,
-    dwarf_state::BUSY /* StoreItemInHospital */,
-    dwarf_state::BUSY /* StoreItemInChest */,
-    dwarf_state::BUSY /* StoreItemInCabinet */,
+    dwarf_state::BUSY /* StoreItemInLocation */,
     dwarf_state::BUSY /* StoreWeapon */,
     dwarf_state::BUSY /* StoreArmor */,
     dwarf_state::BUSY /* StoreItemInBarrel */,
     dwarf_state::BUSY /* StoreItemInBin */,
     dwarf_state::BUSY /* SeekArtifact */,
     dwarf_state::BUSY /* SeekInfant */,
-    dwarf_state::OTHER /* AttendParty */,
     dwarf_state::OTHER /* GoShopping */,
     dwarf_state::OTHER /* GoShopping2 */,
     dwarf_state::BUSY /* Clean */,
@@ -117,6 +115,7 @@ const dwarf_state dwarf_states[] = {
     dwarf_state::BUSY /* ConstructCoffin */,
     dwarf_state::BUSY /* ConstructTable */,
     dwarf_state::BUSY /* ConstructChest */,
+    dwarf_state::BUSY /* ConstructBag */,
     dwarf_state::BUSY /* ConstructBin */,
     dwarf_state::BUSY /* ConstructArmorStand */,
     dwarf_state::BUSY /* ConstructWeaponRack */,
@@ -153,7 +152,7 @@ const dwarf_state dwarf_states[] = {
     dwarf_state::BUSY /* MilkCreature */,
     dwarf_state::BUSY /* MakeCheese */,
     dwarf_state::BUSY /* ProcessPlants */,
-    dwarf_state::BUSY /* ProcessPlantsBag */,
+    dwarf_state::BUSY /* PolishStones */,
     dwarf_state::BUSY /* ProcessPlantsVial */,
     dwarf_state::BUSY /* ProcessPlantsBarrel */,
     dwarf_state::BUSY /* PrepareMeal */,
@@ -165,7 +164,6 @@ const dwarf_state dwarf_states[] = {
     dwarf_state::BUSY /* MakeChain */,
     dwarf_state::BUSY /* MakeFlask */,
     dwarf_state::BUSY /* MakeGoblet */,
-    dwarf_state::BUSY /* MakeInstrument */,
     dwarf_state::BUSY /* MakeToy */,
     dwarf_state::BUSY /* MakeAnimalTrap */,
     dwarf_state::BUSY /* MakeBarrel */,
@@ -188,10 +186,10 @@ const dwarf_state dwarf_states[] = {
     dwarf_state::BUSY /* LoadStoneTrap */,
     dwarf_state::BUSY /* LoadWeaponTrap */,
     dwarf_state::BUSY /* CleanTrap */,
-    dwarf_state::BUSY /* CastSpell */,
+    dwarf_state::BUSY /* EncrustWithStones */,
     dwarf_state::BUSY /* LinkBuildingToTrigger */,
     dwarf_state::BUSY /* PullLever */,
-    dwarf_state::BUSY /* BrewDrink */,
+    dwarf_state::OTHER /* _unk_0x94*/,
     dwarf_state::BUSY /* ExtractFromPlants */,
     dwarf_state::BUSY /* ExtractFromRawFish */,
     dwarf_state::BUSY /* ExtractFromLandAnimal */,
diff --git a/plugins/automaterial.cpp b/plugins/automaterial.cpp
deleted file mode 100644
index 24f2d8e2a..000000000
--- a/plugins/automaterial.cpp
+++ /dev/null
@@ -1,1340 +0,0 @@
-// Auto Material Select
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "Core.h"
-#include "LuaTools.h"
-#include <Console.h>
-#include <Export.h>
-#include <PluginManager.h>
-#include <VTableInterpose.h>
-
-
-// DF data structure definition headers
-#include "DataDefs.h"
-#include "Debug.h"
-#include "MiscUtils.h"
-#include "TileTypes.h"
-#include "df/build_req_choice_genst.h"
-#include "df/build_req_choice_specst.h"
-#include "df/construction_type.h"
-#include "df/item.h"
-#include "df/ui.h"
-#include "df/ui_build_selector.h"
-#include "df/viewscreen_dwarfmodest.h"
-#include "df/items_other_id.h"
-#include "df/job.h"
-#include "df/world.h"
-#include "df/building_constructionst.h"
-#include "df/job_item.h"
-
-#include "modules/Gui.h"
-#include "modules/Screen.h"
-#include "modules/Items.h"
-#include "modules/Constructions.h"
-#include "modules/Buildings.h"
-#include "modules/Maps.h"
-#include "modules/MapCache.h"
-
-#include "uicommon.h"
-
-using namespace std;
-using std::map;
-using std::string;
-using std::vector;
-
-using namespace DFHack;
-using namespace df::enums;
-
-DFHACK_PLUGIN("automaterial");
-REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(ui_build_selector);
-
-namespace DFHack {
-    DBG_DECLARE(automaterial,log,DebugCategory::LINFO);
-}
-
-struct MaterialDescriptor
-{
-    df::item_type item_type;
-    int16_t item_subtype;
-    int16_t type;
-    int32_t index;
-    bool valid;
-
-    bool matches(const MaterialDescriptor &a) const
-    {
-        return a.valid && valid &&
-            a.type == type &&
-            a.index == index &&
-            a.item_type == item_type &&
-            a.item_subtype == item_subtype;
-    }
-};
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    return CR_OK;
-}
-
-void AMOutputToggleString(int &x, int &y, const char *text, const char *hotkey, bool state, bool newline = true, int left_margin = 0, int8_t color = COLOR_WHITE)
-{
-    OutputHotkeyString(x, y, text, hotkey);
-    OutputString(COLOR_WHITE, x, y, ": ");
-    if (state)
-        OutputString(COLOR_GREEN, x, y, "Enabled", newline, left_margin);
-    else
-        OutputString(COLOR_GREY, x, y, "Disabled", newline, left_margin);
-}
-
-//START UI Functions
-
-static enum t_box_select_mode {SELECT_FIRST, SELECT_SECOND, SELECT_MATERIALS, AUTOSELECT_MATERIALS} box_select_mode = SELECT_FIRST;
-static coord32_t box_first, box_second;
-static bool box_select_enabled = false;
-static bool show_box_selection = true;
-static bool hollow_selection = false;
-static deque<df::item*> box_select_materials;
-
-#define SELECTION_IGNORE_TICKS 1
-static int ignore_selection = SELECTION_IGNORE_TICKS;
-
-static map<int16_t, MaterialDescriptor> last_used_material;
-static map<int16_t, MaterialDescriptor> last_moved_material;
-static map< int16_t, vector<MaterialDescriptor> > preferred_materials;
-static map< int16_t, df::interface_key > hotkeys;
-static bool last_used_moved = false;
-static bool auto_choose_materials = true;
-static bool revert_to_last_used_type = false;
-static bool allow_future_placement = false;
-
-static inline bool in_material_choice_stage()
-{
-    return Gui::build_selector_hotkey(Core::getTopViewscreen()) &&
-        ui_build_selector->building_type == df::building_type::Construction &&
-        ui->main.mode == ui_sidebar_mode::Build &&
-        ui_build_selector->stage == 2;
-}
-
-static inline bool in_placement_stage()
-{
-    return Gui::dwarfmode_hotkey(Core::getTopViewscreen()) &&
-        ui->main.mode == ui_sidebar_mode::Build &&
-        ui_build_selector &&
-        ui_build_selector->building_type == df::building_type::Construction &&
-        ui_build_selector->stage == 1;
-}
-
-static inline bool in_type_choice_stage()
-{
-    return Gui::dwarfmode_hotkey(Core::getTopViewscreen()) &&
-        ui->main.mode == ui_sidebar_mode::Build &&
-        ui_build_selector &&
-        ui_build_selector->building_type < 0;
-}
-
-static inline vector<MaterialDescriptor> &get_curr_constr_prefs()
-{
-    if (preferred_materials.find(ui_build_selector->building_subtype) == preferred_materials.end())
-        preferred_materials[ui_build_selector->building_subtype] = vector<MaterialDescriptor>();
-
-    return preferred_materials[ui_build_selector->building_subtype];
-}
-
-static inline MaterialDescriptor &get_last_used_material()
-{
-    if (last_used_material.find(ui_build_selector->building_subtype) == last_used_material.end())
-        last_used_material[ui_build_selector->building_subtype] = MaterialDescriptor();
-
-    return last_used_material[ui_build_selector->building_subtype];
-}
-
-static void set_last_used_material(const MaterialDescriptor &matetial)
-{
-    last_used_material[ui_build_selector->building_subtype] = matetial;
-}
-
-static MaterialDescriptor &get_last_moved_material()
-{
-    if (last_moved_material.find(ui_build_selector->building_subtype) == last_moved_material.end())
-        last_moved_material[ui_build_selector->building_subtype] = MaterialDescriptor();
-
-    return last_moved_material[ui_build_selector->building_subtype];
-}
-
-static void set_last_moved_material(const MaterialDescriptor &matetial)
-{
-    last_moved_material[ui_build_selector->building_subtype] = matetial;
-}
-
-static MaterialDescriptor get_material_in_list(size_t i)
-{
-    MaterialDescriptor result;
-    result.valid = false;
-
-    if (VIRTUAL_CAST_VAR(gen, df::build_req_choice_genst, ui_build_selector->choices[i]))
-    {
-        result.item_type = gen->item_type;
-        result.item_subtype = gen->item_subtype;
-        result.type = gen->mat_type;
-        result.index = gen->mat_index;
-        result.valid = true;
-    }
-    else if (VIRTUAL_CAST_VAR(spec, df::build_req_choice_specst, ui_build_selector->choices[i]))
-    {
-        result.item_type = spec->candidate->getType();
-        result.item_subtype = spec->candidate->getSubtype();
-        result.type = spec->candidate->getActualMaterial();
-        result.index = spec->candidate->getActualMaterialIndex();
-        result.valid = true;
-    }
-
-    return result;
-}
-
-static bool is_material_in_autoselect(size_t &i, MaterialDescriptor &material)
-{
-    for (i = 0; i < get_curr_constr_prefs().size(); i++)
-    {
-        if (get_curr_constr_prefs()[i].matches(material))
-            return true;
-    }
-
-    return false;
-}
-
-static bool is_material_in_list(size_t &i, MaterialDescriptor &material)
-{
-    const size_t size = ui_build_selector->choices.size(); //Just because material list could be very big
-    for (i = 0; i < size; i++)
-    {
-        if (get_material_in_list(i).matches(material))
-            return true;
-    }
-
-    return false;
-}
-
-static bool move_material_to_top(MaterialDescriptor &material)
-{
-    size_t i;
-    if (is_material_in_list(i, material))
-    {
-        auto sel_item = ui_build_selector->choices[i];
-        ui_build_selector->choices.erase(ui_build_selector->choices.begin() + i);
-        ui_build_selector->choices.insert(ui_build_selector->choices.begin(), sel_item);
-
-        ui_build_selector->sel_index = 0;
-        set_last_moved_material(material);
-        return true;
-    }
-
-    set_last_moved_material(MaterialDescriptor());
-    return false;
-}
-
-static bool check_autoselect(MaterialDescriptor &material, bool toggle)
-{
-    size_t idx;
-    if (is_material_in_autoselect(idx, material))
-    {
-        if (toggle)
-            vector_erase_at(get_curr_constr_prefs(), idx);
-
-        return true;
-    }
-    else
-    {
-        if (toggle)
-            get_curr_constr_prefs().push_back(material);
-
-        return false;
-    }
-}
-
-static void cancel_box_selection()
-{
-    if (box_select_mode == SELECT_FIRST)
-        return;
-
-    box_select_mode = SELECT_FIRST;
-    box_select_materials.clear();
-    if (!show_box_selection)
-        Gui::setDesignationCoords(-1, -1, -1);
-}
-//END UI Functions
-
-
-//START Building and Verification
-struct building_site
-{
-    df::coord pos;
-    bool in_open_air;
-
-    building_site(df::coord pos, bool in_open_air)
-    {
-        this->pos = pos;
-        this->in_open_air = in_open_air;
-    }
-
-    building_site() {}
-};
-
-static deque<building_site> valid_building_sites;
-static deque<building_site> open_air_sites;
-static building_site anchor;
-
-static bool is_orthogonal_to_pending_construction(building_site &site)
-{
-    for (deque<building_site>::iterator it = valid_building_sites.begin(); it != valid_building_sites.end(); it++)
-    {
-        if ((it->pos.x == site.pos.x && abs(it->pos.y - site.pos.y) == 1) || (it->pos.y == site.pos.y && abs(it->pos.x - site.pos.x) == 1))
-        {
-            site.in_open_air = true;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-static df::building_constructionst *get_construction_on_tile(const df::coord &pos)
-{
-    auto current = Buildings::findAtTile(pos);
-    if (current)
-        return strict_virtual_cast<df::building_constructionst>(current);
-
-    return NULL;
-}
-
-static df::tiletype *read_tile_shapes(const df::coord &pos, df::tiletype_shape &shape, df::tiletype_shape_basic &shape_basic)
-{
-    if (!Maps::isValidTilePos(pos))
-        return NULL;
-
-    auto ttype = Maps::getTileType(pos);
-
-    if (!ttype)
-        return NULL;
-
-    shape = tileShape(*ttype);
-    shape_basic = tileShapeBasic(shape);
-
-    return ttype;
-}
-
-static bool is_valid_building_site(building_site &site, bool orthogonal_check, bool check_placed_constructions, bool in_future_placement_mode)
-{
-    df::tiletype_shape shape;
-    df::tiletype_shape_basic shape_basic;
-
-    auto ttype = read_tile_shapes(site.pos, shape, shape_basic);
-    if (!ttype)
-        return false;
-
-    if (shape_basic == tiletype_shape_basic::Open)
-    {
-        if (orthogonal_check)
-        {
-            // Check if this is a valid tile to have a construction placed orthogonally to it
-            if (!in_future_placement_mode)
-                return false;
-
-            df::building_constructionst *cons = get_construction_on_tile(site.pos);
-            if (cons && cons->type == construction_type::Floor)
-            {
-                site.in_open_air = true;
-                return true;
-            }
-
-            return false;
-        }
-
-        // Stairs can be placed in open space, if they can connect to other stairs
-        df::tiletype_shape shape_s;
-        df::tiletype_shape_basic shape_basic_s;
-
-        if (ui_build_selector->building_subtype == construction_type::DownStair ||
-            ui_build_selector->building_subtype == construction_type::UpDownStair)
-        {
-            df::coord below(site.pos.x, site.pos.y, site.pos.z - 1);
-            auto ttype_s = read_tile_shapes(below, shape_s, shape_basic_s);
-            if (ttype_s)
-            {
-                if (shape_s == tiletype_shape::STAIR_UP || shape_s == tiletype_shape::STAIR_UPDOWN)
-                    return true;
-            }
-        }
-
-        if (ui_build_selector->building_subtype == construction_type::UpStair ||
-            ui_build_selector->building_subtype == construction_type::UpDownStair)
-        {
-            df::coord above(site.pos.x, site.pos.y, site.pos.z + 1);
-            auto ttype_s = read_tile_shapes(above, shape_s, shape_basic_s);
-            if (ttype_s)
-            {
-                if (shape_s == tiletype_shape::STAIR_DOWN || shape_s == tiletype_shape::STAIR_UPDOWN)
-                    return true;
-            }
-        }
-
-        // Check if there is a valid tile orthogonally adjacent
-        bool valid_orthogonal_tile_found = false;
-        df::coord orthagonal_pos;
-        orthagonal_pos.z = site.pos.z;
-        for (orthagonal_pos.x = site.pos.x-1; orthagonal_pos.x <= site.pos.x+1 && !valid_orthogonal_tile_found; orthagonal_pos.x++)
-        {
-            for (orthagonal_pos.y = site.pos.y-1; orthagonal_pos.y <= site.pos.y+1; orthagonal_pos.y++)
-            {
-                if ((site.pos.x == orthagonal_pos.x) == (site.pos.y == orthagonal_pos.y))
-                    continue;
-
-                building_site orthogonal_site(orthagonal_pos, false);
-                if (is_valid_building_site(orthogonal_site, true, check_placed_constructions, in_future_placement_mode))
-                {
-                    valid_orthogonal_tile_found = true;
-                    if (orthogonal_site.in_open_air)
-                        site.in_open_air = true;
-                    break;
-                }
-
-            }
-        }
-
-        if (!(valid_orthogonal_tile_found || (check_placed_constructions && is_orthogonal_to_pending_construction(site))))
-        {
-            site.in_open_air = true;
-            return false;
-        }
-    }
-    else if (orthogonal_check)
-    {
-        if (shape != tiletype_shape::RAMP &&
-            shape_basic != tiletype_shape_basic::Floor &&
-            shape_basic != tiletype_shape_basic::Stair)
-            return false;
-    }
-    else
-    {
-        auto material = tileMaterial(*ttype);
-        if (shape == tiletype_shape::RAMP)
-        {
-            if (material == tiletype_material::CONSTRUCTION)
-                return false;
-        }
-        else
-        {
-            if (shape != tiletype_shape::STAIR_DOWN && shape_basic != tiletype_shape_basic::Floor)
-                return false;
-
-            // Can build on top of a wall, but not on other construction
-            auto construction = Constructions::findAtTile(site.pos);
-            if (construction)
-            {
-                if (construction->flags.bits.top_of_wall==0)
-                    return false;
-            }
-
-            if (material == tiletype_material::FIRE ||
-                material == tiletype_material::POOL ||
-                material == tiletype_material::BROOK ||
-                material == tiletype_material::RIVER ||
-                material == tiletype_material::MAGMA ||
-                material == tiletype_material::DRIFTWOOD ||
-                material == tiletype_material::CAMPFIRE
-                )
-
-                return false;
-        }
-    }
-
-    if (orthogonal_check)
-        return true;
-
-    auto designation = Maps::getTileDesignation(site.pos);
-    if (designation->bits.flow_size > 2)
-        return false;
-
-    auto current = Buildings::findAtTile(site.pos);
-    if (current)
-        return false;
-
-    df::coord2d size(1,1);
-    return Buildings::checkFreeTiles(site.pos, size, NULL, false, false);
-}
-
-
-static bool find_anchor_in_spiral(const df::coord &start)
-{
-    bool found = false;
-
-    for (anchor.pos.z = start.z; anchor.pos.z > start.z - 4; anchor.pos.z--)
-    {
-        int x, y, dx, dy;
-        x = y = dx = 0;
-        dy = -1;
-        const int side = 11;
-        const int maxI = side*side;
-        for (int i = 0; i < maxI; i++)
-        {
-            if (-side/2 < x && x <= side/2 && -side/2 < y && y <= side/2)
-            {
-                anchor.pos.x = start.x + x;
-                anchor.pos.y = start.y + y;
-                if (is_valid_building_site(anchor, false, false, false))
-                {
-                    found = true;
-                    break;
-                }
-            }
-
-            if ((x == y) || ((x < 0) && (x == -y)) || ((x > 0) && (x == 1-y)))
-            {
-                int tmp = dx;
-                dx = -dy;
-                dy = tmp;
-            }
-
-            x += dx;
-            y += dy;
-        }
-
-        if (found)
-            break;
-    }
-
-    return found;
-}
-
-static bool find_valid_building_sites(bool in_future_placement_mode, bool use_buildingplan)
-{
-    valid_building_sites.clear();
-    open_air_sites.clear();
-
-    int xD = (box_second.x > box_first.x) ? 1 : -1;
-    int yD = (box_second.y > box_first.y) ? 1 : -1;
-    for (int32_t xB = box_first.x; (xD > 0) ? (xB <= box_second.x) : (xB >= box_second.x); xB += xD)
-    {
-        for (int32_t yB = box_first.y; (yD > 0) ? (yB <= box_second.y) : (yB >= box_second.y); yB += yD)
-        {
-            if (hollow_selection && !(xB == box_first.x || xB == box_second.x || yB == box_first.y || yB == box_second.y))
-                continue;
-
-            building_site site(df::coord(xB, yB, box_second.z), false);
-            // if we're using buildingplan, it will take care of filtering out bad tiles
-            if (use_buildingplan || is_valid_building_site(site, false, true, in_future_placement_mode))
-                valid_building_sites.push_back(site);
-            else if (site.in_open_air)
-            {
-                if (in_future_placement_mode)
-                    valid_building_sites.push_back(site);
-                else
-                    open_air_sites.push_back(site);
-            }
-        }
-    }
-
-    if (!use_buildingplan)
-    {
-        size_t last_open_air_count = 0;
-        while (valid_building_sites.size() > 0 && open_air_sites.size() != last_open_air_count)
-        {
-            last_open_air_count = open_air_sites.size();
-            deque<building_site> current_open_air_list = open_air_sites;
-            open_air_sites.clear();
-            for (deque<building_site>::iterator it = current_open_air_list.begin(); it != current_open_air_list.end(); it++)
-            {
-                if (is_orthogonal_to_pending_construction(*it))
-                    valid_building_sites.push_back(*it);
-                else
-                    open_air_sites.push_back(*it);
-            }
-
-        }
-    }
-
-    return valid_building_sites.size() > 0;
-}
-
-static bool is_buildingplan_enabled()
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    Lua::StackUnwinder top(L);
-
-    if (!(lua_checkstack(L, 1) &&
-          Lua::PushModulePublic(out, L, "plugins.buildingplan", "isEnabled") &&
-          Lua::SafeCall(out, L, 0, 1)))
-    {
-        return false;
-    }
-
-    return lua_toboolean(L, -1);
-}
-
-static bool is_buildingplan_planmode_enabled(
-        df::building_type type, int16_t subtype, int32_t custom)
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    Lua::StackUnwinder top(L);
-
-    if (!lua_checkstack(L, 4) ||
-        !Lua::PushModulePublic(
-            out, L, "plugins.buildingplan", "isPlanModeEnabled"))
-        return false;
-
-    Lua::Push(L, type);
-    Lua::Push(L, subtype);
-    Lua::Push(L, custom);
-
-    if (!Lua::SafeCall(out, L, 3, 1))
-        return false;
-
-    return lua_toboolean(L, -1);
-}
-
-static bool is_buildingplan_managed()
-{
-    return is_buildingplan_enabled() &&
-        is_buildingplan_planmode_enabled(ui_build_selector->building_type,
-                                         ui_build_selector->building_subtype,
-                                         ui_build_selector->custom_type);
-}
-
-static bool build_with_buildingplan_box_select(const df::coord &pos)
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-
-    CoreSuspendClaimer suspend;
-    Lua::StackUnwinder top(L);
-
-    if (!lua_checkstack(L, 5) ||
-        !Lua::PushModulePublic(
-                out, L, "plugins.automaterial",
-                "build_with_buildingplan_box_select"))
-    {
-        return false;
-    }
-
-    Lua::Push(L, ui_build_selector->building_subtype);
-    Lua::Push(L, pos.x);
-    Lua::Push(L, pos.y);
-    Lua::Push(L, pos.z);
-
-    if (!Lua::SafeCall(out, L, 4, 1))
-        return false;
-
-    return lua_toboolean(L, -1);
-}
-
-static bool build_with_buildingplan_ui()
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-
-    CoreSuspendClaimer suspend;
-    Lua::StackUnwinder top(L);
-
-    return lua_checkstack(L, 1) &&
-            Lua::PushModulePublic(out, L, "plugins.automaterial",
-                                  "build_with_buildingplan_ui") &&
-            Lua::SafeCall(out, L, 0, 1);
-}
-
-static bool designate_new_construction(df::coord &pos, df::construction_type &type, df::item *item)
-{
-    auto newinst = Buildings::allocInstance(pos, building_type::Construction, type);
-    if (!newinst)
-        return false;
-
-    vector<df::item*> items;
-    items.push_back(item);
-    Maps::ensureTileBlock(pos);
-
-    if (!Buildings::constructWithItems(newinst, items))
-    {
-        delete newinst;
-        return false;
-    }
-
-    return true;
-}
-//END Building and Verification
-
-
-//START Viewscreen Hook
-struct jobutils_hook : public df::viewscreen_dwarfmodest
-{
-    //START UI Methods
-    typedef df::viewscreen_dwarfmodest interpose_base;
-
-    void send_key(const df::interface_key &key)
-    {
-        set< df::interface_key > keys;
-        keys.insert(key);
-        this->feed(&keys);
-    }
-
-    bool select_material_at_index(size_t i)
-    {
-        ui_build_selector->sel_index = i;
-        std::set< df::interface_key > keys;
-        keys.insert(df::interface_key::SELECT_ALL);
-        this->feed(&keys);
-        return !in_material_choice_stage();
-    }
-
-    bool choose_materials()
-    {
-        if (!auto_choose_materials || get_curr_constr_prefs().size() == 0)
-            return false;
-
-        size_t size = ui_build_selector->choices.size();
-        for (size_t i = 0; i < size; i++)
-        {
-            MaterialDescriptor material = get_material_in_list(i);
-            size_t j;
-            if (is_material_in_autoselect(j, material))
-            {
-                return select_material_at_index(i);
-            }
-        }
-
-        return false;
-    }
-
-    void draw_box_selection()
-    {
-        if (!box_select_enabled)
-            return;
-
-        if (ui->main.mode != df::ui_sidebar_mode::Build ||
-            ui_build_selector->building_type != df::building_type::Construction)
-            return;
-
-        df::coord vport = Gui::getViewportPos();
-
-        //Even if selection drawing is disabled, paint a green cursor as we can place box selection anywhere
-
-        if (box_select_mode == SELECT_FIRST || (!show_box_selection && box_select_mode == SELECT_SECOND))
-        {
-            int32_t x, y, z;
-            if (!Gui::getCursorCoords(x, y, z))
-                return;
-
-            x = x - vport.x + 1;
-            y = y - vport.y + 1;
-            OutputString(COLOR_GREEN, x, y, "X", false, 0, 0, true /* map */);
-        }
-        else if (show_box_selection && box_select_mode == SELECT_SECOND)
-        {
-            if (!Gui::getCursorCoords(box_second.x, box_second.y, box_second.z))
-                return;
-
-            Gui::DwarfmodeDims dims = Gui::getDwarfmodeViewDims();
-            int32_t startx = std::max((int32_t)vport.x, std::min(box_first.x, box_second.x));
-            int32_t endx = std::min(vport.x + dims.map_x2 - dims.map_x1, std::max(box_first.x, box_second.x));
-            int32_t starty = std::max((int32_t)vport.y, std::min(box_first.y, box_second.y));
-            int32_t endy = std::min(vport.y + dims.map_y2 - dims.map_y1, std::max(box_first.y, box_second.y));
-            for (int32_t yB = starty; yB <= endy; ++yB) {
-                for (int32_t xB = startx; xB <= endx; ++xB) {
-                    if (hollow_selection && !(xB == box_first.x || xB == box_second.x || yB == box_first.y || yB == box_second.y))
-                        continue;
-
-                    int8_t color = (xB == box_second.x && yB == box_second.y) ? COLOR_GREEN : COLOR_BROWN;
-
-                    int32_t x = xB - vport.x + 1;
-                    int32_t y = yB - vport.y + 1;
-                    OutputString(color, x, y, "X", false, 0, 0, true /* map */);
-                }
-            }
-        }
-        else if (show_box_selection && box_select_mode == SELECT_MATERIALS)
-        {
-            for (deque<building_site>::iterator it = valid_building_sites.begin(); it != valid_building_sites.end(); it++)
-            {
-                int32_t x = it->pos.x - vport.x + 1;
-                int32_t y = it->pos.y - vport.y + 1;
-                OutputString(COLOR_GREEN, x, y, "X", false, 0, 0, true /* map */);
-            }
-        }
-    }
-
-    void reset_existing_selection()
-    {
-        for (int i = 0; i < 10; i++)
-        {
-            send_key(df::interface_key::BUILDING_DIM_Y_DOWN);
-            send_key(df::interface_key::BUILDING_DIM_X_DOWN);
-        }
-    }
-
-    void handle_input(set<df::interface_key> *input)
-    {
-        if (ui_build_selector->building_subtype >= 7)
-            return;
-
-        if (in_material_choice_stage())
-        {
-            if (input->count(interface_key::LEAVESCREEN))
-            {
-                box_select_mode = SELECT_FIRST;
-            }
-
-            MaterialDescriptor material = get_material_in_list(ui_build_selector->sel_index);
-            if (material.valid)
-            {
-                if (input->count(interface_key::SELECT) || input->count(interface_key::SELECT_ALL))
-                {
-                    if (get_last_moved_material().matches(material))
-                        last_used_moved = false; //Keep selected material on top
-
-                    set_last_used_material(material);
-
-                    if (box_select_enabled)
-                    {
-                        auto curr_index = ui_build_selector->sel_index;
-                        vector<MaterialDescriptor> gen_material;
-                        gen_material.push_back(get_material_in_list(curr_index));
-                        box_select_materials.clear();
-                        // Populate material list with selected material
-                        populate_box_materials(gen_material, ((input->count(interface_key::SELECT_ALL) && ui_build_selector->is_grouped) ? -1 : 1));
-
-                        input->clear(); // Let the apply_box_selection routine allocate the construction
-                        input->insert(interface_key::LEAVESCREEN);
-                    }
-                }
-                else if (input->count(interface_key::CUSTOM_A))
-                {
-                    check_autoselect(material, true);
-                    input->clear();
-                }
-            }
-        }
-        else if (in_placement_stage())
-        {
-            bool use_buildingplan = is_buildingplan_managed();
-
-            if (!use_buildingplan && input->count(interface_key::CUSTOM_A))
-            {
-                auto_choose_materials = !auto_choose_materials;
-            }
-            else if (!use_buildingplan && input->count(interface_key::CUSTOM_T))
-            {
-                revert_to_last_used_type = !revert_to_last_used_type;
-            }
-            else if (input->count(interface_key::CUSTOM_B))
-            {
-                reset_existing_selection();
-                box_select_enabled = !box_select_enabled;
-                if (!box_select_enabled)
-                    cancel_box_selection();
-
-                return;
-            }
-            else if (!use_buildingplan && input->count(interface_key::CUSTOM_O))
-            {
-                allow_future_placement = !allow_future_placement;
-            }
-            else if (input->count(interface_key::LEAVESCREEN))
-            {
-                switch (box_select_mode)
-                {
-                case SELECT_FIRST:
-                case SELECT_SECOND:
-                    cancel_box_selection();
-
-                default:
-                    break;
-                }
-            }
-            else if (box_select_enabled)
-            {
-                if (input->count(interface_key::SELECT))
-                {
-                    switch (box_select_mode)
-                    {
-                    case SELECT_FIRST:
-                        if (!Gui::getCursorCoords(box_first.x, box_first.y, box_first.z))
-                        {
-                            cancel_box_selection();
-                            return;
-                        }
-                        box_select_mode = SELECT_SECOND;
-                        if (!show_box_selection)
-                            Gui::setDesignationCoords(box_first.x, box_first.y, box_first.z);
-                        input->clear();
-                        return;
-
-                    case SELECT_SECOND:
-                        if (!Gui::getCursorCoords(box_second.x, box_second.y, box_second.z))
-                        {
-                            cancel_box_selection();
-                            return;
-                        }
-                        cancel_box_selection();
-                        input->clear();
-                        apply_box_selection(true);
-                        return;
-
-                    default:
-                        break;
-                    }
-                }
-                else if (input->count(interface_key::CUSTOM_X))
-                {
-                    show_box_selection = !show_box_selection;
-                    if (box_select_mode == SELECT_SECOND)
-                    {
-                        if (show_box_selection)
-                        {
-                            Gui::setDesignationCoords(-1, -1, -1);
-                        }
-                        else
-                        {
-                            Gui::setDesignationCoords(box_first.x, box_first.y, box_first.z);
-                        }
-                    }
-                }
-                else if (input->count(interface_key::CUSTOM_H))
-                {
-                    hollow_selection = !hollow_selection;
-                }
-                else if (input->count(interface_key::BUILDING_DIM_Y_UP) ||
-                         input->count(interface_key::BUILDING_DIM_Y_DOWN) ||
-                         input->count(interface_key::BUILDING_DIM_X_UP) ||
-                         input->count(interface_key::BUILDING_DIM_X_DOWN))
-                {
-                    input->clear();
-                    return;
-                }
-            }
-            else if (use_buildingplan
-                     && ui_build_selector->errors.size() == 0
-                     && input->count(interface_key::SELECT))
-            {
-                build_with_buildingplan_ui();
-                Gui::refreshSidebar();
-                input->clear();
-                return;
-            }
-        }
-    }
-    //END UI Methods
-
-    //START Building Application
-    bool populate_box_materials(vector<MaterialDescriptor> &gen_materials, int32_t count = -1)
-    {
-        bool result = false;
-
-        if (gen_materials.size() == 0)
-            return result;
-
-        if (ui_build_selector->is_grouped)
-            send_key(interface_key::BUILDING_EXPAND_CONTRACT);
-
-        size_t size = ui_build_selector->choices.size();
-        vector<MaterialDescriptor>::iterator gen_material;
-        for (size_t i = 0; i < size; i++)
-        {
-            if (VIRTUAL_CAST_VAR(spec, df::build_req_choice_specst, ui_build_selector->choices[i]))
-            {
-                for (gen_material = gen_materials.begin(); gen_material != gen_materials.end(); gen_material++)
-                {
-                    if (gen_material->item_type == spec->candidate->getType() &&
-                        gen_material->item_subtype == spec->candidate->getSubtype() &&
-                        gen_material->type == spec->candidate->getActualMaterial() &&
-                        gen_material->index == spec->candidate->getActualMaterialIndex())
-                    {
-                        box_select_materials.push_back(spec->candidate);
-                        if (count > -1)
-                            return true; // Right now we only support 1 or all materials
-
-                        result = true;
-                        break;
-                    }
-                }
-            }
-        }
-        send_key(interface_key::BUILDING_EXPAND_CONTRACT);
-
-        return result;
-    }
-
-    void move_cursor(df::coord &pos)
-    {
-        int32_t x, y, z;
-        Gui::getCursorCoords(x, y, z);
-        DEBUG(log).print("moving cursor from %d, %d, %d to %d, %d, %d\n",
-                         x, y, z, pos.x, pos.y, pos.z);
-
-        Gui::setCursorCoords(pos.x, pos.y, pos.z);
-        Gui::refreshSidebar();
-    }
-
-    void move_cursor(coord32_t &pos)
-    {
-        df::coord c((int16_t) pos.x, (int16_t) pos.y, (int16_t) pos.z);
-        move_cursor(c);
-    }
-
-    void apply_box_selection(bool new_start)
-    {
-        static bool saved_revert_setting = false;
-        static bool auto_select_applied = false;
-
-        bool use_buildingplan = is_buildingplan_managed();
-        box_select_mode = SELECT_MATERIALS;
-        if (new_start)
-        {
-            bool ok_to_continue = false;
-            bool in_future_placement_mode = false;
-            if (!find_valid_building_sites(false, use_buildingplan))
-            {
-                if (allow_future_placement)
-                {
-                    in_future_placement_mode = find_valid_building_sites(true, use_buildingplan);
-                }
-            }
-            else
-            {
-                ok_to_continue = true;
-            }
-
-            // if using buildingplan, we don't need an anchor
-            if (!use_buildingplan)
-            {
-                if (in_future_placement_mode)
-                {
-                    ok_to_continue =
-                            find_anchor_in_spiral(valid_building_sites[0].pos);
-                }
-                else if (ok_to_continue)
-                {
-                    // First valid site is guaranteed to be anchored, either on
-                    // a tile or against a valid orthogonal tile
-                    // Use it as an anchor point to generate materials list
-                    anchor = valid_building_sites.front();
-                    valid_building_sites.pop_front();
-                    valid_building_sites.push_back(anchor);
-                }
-            }
-
-            if (!ok_to_continue)
-            {
-                cancel_box_selection();
-                hollow_selection = false;
-                return;
-            }
-
-            saved_revert_setting = revert_to_last_used_type;
-            revert_to_last_used_type = true;
-            auto_select_applied = false;
-            box_select_materials.clear();
-
-        }
-
-        while (valid_building_sites.size() > 0)
-        {
-            building_site site = valid_building_sites.front();
-            valid_building_sites.pop_front();
-
-            if (use_buildingplan)
-            {
-                // we don't actually care if this fails. buildingplan will return
-                // false when it filters out bad tiles, and that's ok.
-                build_with_buildingplan_box_select(site.pos);
-                continue;
-            }
-
-            if (box_select_materials.size() > 0)
-            {
-                df::construction_type type = (df::construction_type) ui_build_selector->building_subtype;
-                df::item *item = NULL;
-                while (box_select_materials.size() > 0)
-                {
-                    item = box_select_materials.front();
-                    if (!item->flags.bits.in_job)
-                        break;
-                    box_select_materials.pop_front();
-                    item = NULL;
-                }
-
-                if (item != NULL)
-                {
-                    if (designate_new_construction(site.pos, type, item))
-                    {
-                        box_select_materials.pop_front();
-                        box_select_mode = AUTOSELECT_MATERIALS;
-                        send_key(interface_key::LEAVESCREEN); //Must do this to register items in use
-                        send_key(hotkeys[type]);
-                        box_select_mode = SELECT_MATERIALS;
-                    }
-                    continue;
-                }
-            }
-
-            // Generate material list using regular construction placement routine
-
-            if (site.in_open_air)
-            {
-                // Cannot invoke material selection on an unconnected tile, use anchor instead
-                move_cursor(anchor.pos);
-                send_key(df::interface_key::SELECT);
-            }
-
-            move_cursor(site.pos);
-
-            if (!site.in_open_air)
-                send_key(df::interface_key::SELECT);
-
-            if (in_material_choice_stage())
-            {
-                valid_building_sites.push_front(site); //Redo current tile with whatever gets selected
-                if (!auto_select_applied)
-                {
-                    // See if any auto select materials are available
-                    auto_select_applied = true;
-                    if (auto_choose_materials && populate_box_materials(preferred_materials[ui_build_selector->building_subtype]))
-                    {
-                        continue;
-                    }
-                }
-
-                last_used_moved = false;
-                return; // No auto select materials left, ask user
-            }
-        }
-
-        // Allocation done, reset
-        move_cursor(box_second);
-
-        // if we're using buildingplan, we never actually leave the placement
-        // screen, so there's no need to re-enter the screen
-        revert_to_last_used_type = saved_revert_setting;
-        if (!use_buildingplan && !revert_to_last_used_type)
-        {
-            send_key(df::interface_key::LEAVESCREEN);
-        }
-
-        cancel_box_selection();
-        hollow_selection = false;
-        ignore_selection = 0;
-    }
-    //END Building Application
-
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
-    {
-        if (ignore_selection < SELECTION_IGNORE_TICKS)
-        {
-            //FIXME: Sometimes there's an extra ENTER key left over after box selection
-            ignore_selection = SELECTION_IGNORE_TICKS;
-            return;
-        }
-
-        if (box_select_mode != AUTOSELECT_MATERIALS)
-            handle_input(input);
-
-        int16_t last_used_constr_subtype = (in_material_choice_stage()) ?  ui_build_selector->building_subtype : -1;
-        INTERPOSE_NEXT(feed)(input);
-
-        if (revert_to_last_used_type &&
-            last_used_constr_subtype >= 0 &&
-            in_type_choice_stage() &&
-            hotkeys.find(last_used_constr_subtype) != hotkeys.end())
-        {
-            input->clear();
-            input->insert(hotkeys[last_used_constr_subtype]);
-            INTERPOSE_NEXT(feed)(input);
-
-            if (box_select_mode == SELECT_MATERIALS)
-            {
-                apply_box_selection(false);
-            }
-        }
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        if (ignore_selection < SELECTION_IGNORE_TICKS)
-        {
-            ++ignore_selection;
-        }
-
-        if (in_material_choice_stage())
-        {
-            if (!last_used_moved && ui_build_selector->is_grouped)
-            {
-                last_used_moved = true;
-                if (!box_select_enabled && choose_materials())
-                {
-                    return;
-                }
-                else
-                {
-                    move_material_to_top(get_last_used_material());
-                }
-            }
-            else if (!ui_build_selector->is_grouped)
-            {
-                last_used_moved = false;
-            }
-        }
-        else
-        {
-            last_used_moved = false;
-        }
-
-        INTERPOSE_NEXT(render)();
-
-        draw_box_selection();
-
-        if (in_type_choice_stage())
-        {
-            cancel_box_selection();
-            return;
-        }
-
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = 25;
-        if (in_material_choice_stage())
-        {
-            MaterialDescriptor material = get_material_in_list(ui_build_selector->sel_index);
-            if (material.valid)
-            {
-                AMOutputToggleString(x, y, "Autoselect", "a", check_autoselect(material, false), true, left_margin);
-
-                if (box_select_mode == SELECT_MATERIALS)
-                {
-                    ++y;
-                    OutputString(COLOR_BROWN, x, y, "Construction:", true, left_margin);
-                    OutputString(COLOR_WHITE, x, y, int_to_string(valid_building_sites.size()) + " tiles to fill", true, left_margin);
-                }
-            }
-        }
-        else if (in_placement_stage() && ui_build_selector->building_subtype < 7)
-        {
-            bool use_buildingplan = is_buildingplan_managed();
-
-            OutputString(COLOR_BROWN, x, y, "DFHack Automaterial Options", true, left_margin);
-            if (use_buildingplan)
-            {
-                y += 2;
-            }
-            else
-            {
-                AMOutputToggleString(x, y, "Auto Mat-select", "a", auto_choose_materials, true, left_margin);
-                AMOutputToggleString(x, y, "Reselect Type", "t", revert_to_last_used_type, true, left_margin);
-            }
-
-            ++y;
-            AMOutputToggleString(x, y, "Box Select", "b", box_select_enabled, true, left_margin);
-            if (box_select_enabled)
-            {
-                AMOutputToggleString(x, y, "Show Box Mask", "x", show_box_selection, true, left_margin);
-                OutputHotkeyString(x, y, (hollow_selection) ? "Make Solid" : "Make Hollow", "h", true, left_margin);
-
-                if (use_buildingplan)
-                    ++y;
-                else
-                    AMOutputToggleString(x, y, "Open Placement", "o", allow_future_placement, true, left_margin);
-            }
-            else
-            {
-                y += 3;
-            }
-            y += 2;
-            if (is_buildingplan_enabled())
-                OutputString(COLOR_BROWN, x, y, "DFHack Buildingplan Options", true, left_margin);
-
-            if (box_select_enabled)
-            {
-                Screen::Pen pen(' ',COLOR_BLACK);
-                y = dims.y1 + 2;
-                Screen::fillRect(pen, x, y, dims.menu_x2, y + 17);
-
-                y += 2;
-                switch (box_select_mode)
-                {
-                case SELECT_FIRST:
-                    OutputString(COLOR_BROWN, x, y, "Choose first corner", true, left_margin);
-                    break;
-
-                case SELECT_SECOND:
-                {
-                    OutputString(COLOR_GREEN, x, y, "Choose second corner", true, left_margin);
-
-                    int32_t curr_x, curr_y, curr_z;
-                    Gui::getCursorCoords(curr_x, curr_y, curr_z);
-                    int dX = abs(box_first.x - curr_x) + 1;
-                    int dY = abs(box_first.y - curr_y) + 1;
-                    stringstream label;
-                    label << "Selection: " << dX << "x" << dY;
-                    OutputString(COLOR_WHITE, x, ++y, label.str(), true, left_margin);
-
-                    df::coord vport = Gui::getViewportPos();
-                    int cx = box_first.x - vport.x + 1;
-                    int cy = box_first.y - vport.y + 1;
-
-                    Gui::DwarfmodeDims dims = Gui::getDwarfmodeViewDims();
-                    if (cx >= 1 && cx <= dims.map_x2 && cy >= 1 && cy <= dims.map_y2)
-                        OutputString(COLOR_BROWN, cx, cy, "X", false, 0, 0, true /* map */);
-                    break;
-                }
-
-                default:
-                    break;
-                }
-
-                OutputString(COLOR_BROWN, x, ++y, "Ignore Building Restrictions", true, left_margin);
-            }
-        }
-    }
-};
-//END Viewscreen Hook
-
-color_ostream_proxy console_out(Core::getInstance().getConsole());
-
-
-IMPLEMENT_VMETHOD_INTERPOSE(jobutils_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(jobutils_hook, render);
-
-DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-
-DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable)
-{
-    if (!gps)
-        return CR_FAILURE;
-
-    if (enable != is_enabled)
-    {
-        if (!INTERPOSE_HOOK(jobutils_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(jobutils_hook, render).apply(enable))
-            return CR_FAILURE;
-
-        is_enabled = enable;
-    }
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    hotkeys[construction_type::Wall] = df::interface_key::HOTKEY_BUILDING_CONSTRUCTION_WALL;
-    hotkeys[construction_type::Floor] = df::interface_key::HOTKEY_BUILDING_CONSTRUCTION_FLOOR;
-    hotkeys[construction_type::Ramp] = df::interface_key::HOTKEY_BUILDING_CONSTRUCTION_RAMP;
-    hotkeys[construction_type::UpStair] = df::interface_key::HOTKEY_BUILDING_CONSTRUCTION_STAIR_UP;
-    hotkeys[construction_type::DownStair] = df::interface_key::HOTKEY_BUILDING_CONSTRUCTION_STAIR_DOWN;
-    hotkeys[construction_type::UpDownStair] = df::interface_key::HOTKEY_BUILDING_CONSTRUCTION_STAIR_UPDOWN;
-    hotkeys[construction_type::Fortification] = df::interface_key::HOTKEY_BUILDING_CONSTRUCTION_FORTIFICATION;
-    //Ignore tracks, DF already returns to track menu
-
-    return CR_OK;
-}
diff --git a/plugins/automelt.cpp b/plugins/automelt.cpp
deleted file mode 100644
index 4bbb727d7..000000000
--- a/plugins/automelt.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-#include "uicommon.h"
-
-#include "modules/Gui.h"
-
-#include "df/world.h"
-#include "df/world_raws.h"
-#include "df/building_def.h"
-#include "df/viewscreen_dwarfmodest.h"
-#include "df/building_stockpilest.h"
-#include "modules/Buildings.h"
-#include "modules/Items.h"
-#include "df/ui.h"
-#include "modules/Maps.h"
-#include "modules/World.h"
-#include "df/item_quality.h"
-
-using df::building_stockpilest;
-
-DFHACK_PLUGIN("automelt");
-#define PLUGIN_VERSION 0.3
-REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(cursor);
-REQUIRE_GLOBAL(ui);
-
-static const string PERSISTENCE_KEY = "automelt/stockpiles";
-
-static int mark_item(df::item *item, df::item_flags bad_flags, int32_t stockpile_id)
-{
-    if (item->flags.whole & bad_flags.whole)
-        return 0;
-
-    if (item->isAssignedToThisStockpile(stockpile_id)) {
-        size_t marked_count = 0;
-        std::vector<df::item*> contents;
-        Items::getContainedItems(item, &contents);
-        for (auto child = contents.begin(); child != contents.end(); child++)
-        {
-            marked_count += mark_item(*child, bad_flags, stockpile_id);
-        }
-
-        return marked_count;
-    }
-
-    if (!can_melt(item))
-        return 0;
-
-    if (is_set_to_melt(item))
-        return 0;
-
-    insert_into_vector(world->items.other[items_other_id::ANY_MELT_DESIGNATED], &df::item::id, item);
-    item->flags.bits.melt = true;
-    return 1;
-}
-
-static void mark_all_in_stockpiles(vector<PersistentStockpileInfo> &stockpiles)
-{
-    // Precompute a bitmask with the bad flags
-    df::item_flags bad_flags;
-    bad_flags.whole = 0;
-
-#define F(x) bad_flags.bits.x = true;
-    F(dump); F(forbid); F(garbage_collect);
-    F(hostile); F(on_fire); F(rotten); F(trader);
-    F(in_building); F(construction); F(artifact);
-    F(spider_web); F(owned); F(in_job);
-#undef F
-
-    size_t marked_count = 0;
-    for (auto it = stockpiles.begin(); it != stockpiles.end(); it++)
-    {
-        if (!it->isValid())
-            continue;
-
-        auto spid = it->getId();
-        Buildings::StockpileIterator stored;
-        for (stored.begin(it->getStockpile()); !stored.done(); ++stored)
-        {
-            marked_count += mark_item(*stored, bad_flags, spid);
-        }
-    }
-
-    if (marked_count)
-        Gui::showAnnouncement("Marked " + int_to_string(marked_count) + " items to melt", COLOR_GREEN, false);
-}
-
-/*
- * Stockpile Monitoring
- */
-
-class StockpileMonitor
-{
-public:
-    bool isMonitored(df::building_stockpilest *sp)
-    {
-        for (auto it = monitored_stockpiles.begin(); it != monitored_stockpiles.end(); it++)
-        {
-            if (it->matches(sp))
-                return true;
-        }
-
-        return false;
-    }
-
-    void add(df::building_stockpilest *sp)
-    {
-        auto pile = PersistentStockpileInfo(sp, PERSISTENCE_KEY);
-        if (pile.isValid())
-        {
-            monitored_stockpiles.push_back(PersistentStockpileInfo(pile));
-            monitored_stockpiles.back().save();
-        }
-    }
-
-    void remove(df::building_stockpilest *sp)
-    {
-        for (auto it = monitored_stockpiles.begin(); it != monitored_stockpiles.end(); it++)
-        {
-            if (it->matches(sp))
-            {
-                it->remove();
-                monitored_stockpiles.erase(it);
-                break;
-            }
-        }
-    }
-
-    void doCycle()
-    {
-        for (auto it = monitored_stockpiles.begin(); it != monitored_stockpiles.end();)
-        {
-            if (!it->isValid())
-                it = monitored_stockpiles.erase(it);
-            else
-                ++it;
-        }
-
-        mark_all_in_stockpiles(monitored_stockpiles);
-    }
-
-    void reset()
-    {
-        monitored_stockpiles.clear();
-        std::vector<PersistentDataItem> items;
-        DFHack::World::GetPersistentData(&items, PERSISTENCE_KEY);
-
-        for (auto i = items.begin(); i != items.end(); i++)
-        {
-            auto pile = PersistentStockpileInfo(*i, PERSISTENCE_KEY);
-            if (pile.load())
-                monitored_stockpiles.push_back(PersistentStockpileInfo(pile));
-            else
-                pile.remove();
-        }
-    }
-
-
-private:
-    vector<PersistentStockpileInfo> monitored_stockpiles;
-};
-
-static StockpileMonitor monitor;
-
-#define DELTA_TICKS 610
-
-DFhackCExport command_result plugin_onupdate ( color_ostream &out )
-{
-    if(!Maps::IsValid())
-        return CR_OK;
-
-    if (DFHack::World::ReadPauseState())
-        return CR_OK;
-
-    if (world->frame_counter % DELTA_TICKS != 0)
-        return CR_OK;
-
-    monitor.doCycle();
-
-    return CR_OK;
-}
-
-
-/*
- * Interface
- */
-
-struct melt_hook : public df::viewscreen_dwarfmodest
-{
-    typedef df::viewscreen_dwarfmodest interpose_base;
-
-    bool handleInput(set<df::interface_key> *input)
-    {
-        if (Gui::inRenameBuilding())
-            return false;
-
-        building_stockpilest *sp = get_selected_stockpile();
-        if (!sp)
-            return false;
-
-        if (input->count(interface_key::CUSTOM_SHIFT_M))
-        {
-            if (monitor.isMonitored(sp))
-                monitor.remove(sp);
-            else
-                monitor.add(sp);
-        }
-
-        return false;
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
-    {
-        if (!handleInput(input))
-            INTERPOSE_NEXT(feed)(input);
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        INTERPOSE_NEXT(render)();
-
-        building_stockpilest *sp = get_selected_stockpile();
-        if (!sp)
-            return;
-
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = dims.y2 - 6;
-
-        int links = 0;
-        links += sp->links.give_to_pile.size();
-        links += sp->links.take_from_pile.size();
-        links += sp->links.give_to_workshop.size();
-        links += sp->links.take_from_workshop.size();
-        bool state = monitor.isMonitored(sp);
-
-        if (links + 12 >= y) {
-            y = dims.y2;
-            OutputString(COLOR_WHITE, x, y, "Auto: ");
-            x += 5;
-            OutputString(COLOR_LIGHTRED, x, y, "M");
-            OutputString(state? COLOR_LIGHTGREEN: COLOR_GREY, x, y, "elt ");
-        } else {
-            OutputToggleString(x, y, "Auto melt", "M", state, true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
-        }
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(melt_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(melt_hook, render);
-
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event)
-    {
-    case DFHack::SC_MAP_LOADED:
-        monitor.reset();
-        break;
-    case DFHack::SC_MAP_UNLOADED:
-        break;
-    default:
-        break;
-    }
-    return CR_OK;
-}
-
-DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    if (enable != is_enabled)
-    {
-        if (!INTERPOSE_HOOK(melt_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(melt_hook, render).apply(enable))
-            return CR_FAILURE;
-
-        is_enabled = enable;
-    }
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    // ensure we disengage our hooks
-    plugin_enable(out, false);
-    return CR_OK;
-}
diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
index 8b1ee5244..be7bdb2aa 100644
--- a/plugins/autonestbox.cpp
+++ b/plugins/autonestbox.cpp
@@ -96,6 +96,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 }
 
 DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
     config = World::GetPersistentData(CONFIG_KEY);
 
     if (!config.isValid()) {
diff --git a/plugins/autoslab.cpp b/plugins/autoslab.cpp
new file mode 100644
index 000000000..82333c822
--- /dev/null
+++ b/plugins/autoslab.cpp
@@ -0,0 +1,209 @@
+/* Simple plugin to check for ghosts and automatically queue jobs to engrave slabs for them.
+ *
+ * Enhancement idea: Queue up a ConstructSlab job, then link the engrave slab job to it. Avoids need to have slabs in stockpiles
+ *                   Would require argument parsing, specifying materials
+ * Enhancement idea: Automatically place the slab. This seems like a tricky problem but maybe solveable with named zones?
+ *                   Might be made obsolete by people just using buildingplan to pre-place plans for slab?
+ * Enhancement idea: Optionally enable autoengraving for pets.
+ * Enhancement idea: Try to get ahead of ghosts by autoengraving for dead dwarves with no remains, or dwarves
+ *                   whose remains are unreachable.
+ */
+
+#include "Core.h"
+#include "Debug.h"
+#include "PluginManager.h"
+
+#include "modules/Persistence.h"
+#include "modules/Translation.h"
+#include "modules/World.h"
+
+#include "df/historical_figure.h"
+#include "df/item.h"
+#include "df/item_slabst.h"
+#include "df/manager_order.h"
+#include "df/plotinfost.h"
+#include "df/unit.h"
+#include "df/world.h"
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("autoslab");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
+REQUIRE_GLOBAL(world);
+
+// logging levels can be dynamically controlled with the `debugfilter` command.
+namespace DFHack
+{
+    // for configuration-related logging
+    DBG_DECLARE(autoslab, status, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(autoslab, cycle, DebugCategory::LINFO);
+}
+
+static const auto CONFIG_KEY = std::string(plugin_name) + "/config";
+static PersistentDataItem config;
+enum ConfigValues
+{
+    CONFIG_IS_ENABLED = 0,
+};
+static int get_config_val(int index)
+{
+    if (!config.isValid())
+        return -1;
+    return config.ival(index);
+}
+static bool get_config_bool(int index)
+{
+    return get_config_val(index) == 1;
+}
+static void set_config_val(int index, int value)
+{
+    if (config.isValid())
+        config.ival(index) = value;
+}
+static void set_config_bool(int index, bool value)
+{
+    set_config_val(index, value ? 1 : 0);
+}
+
+static int32_t cycle_timestamp = 0; // world->frame_counter at last cycle
+
+static void do_cycle(color_ostream &out);
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector<PluginCommand> &commands)
+{
+    DEBUG(status, out).print("initializing %s\n", plugin_name);
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
+{
+    if (!Core::getInstance().isWorldLoaded())
+    {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+
+    if (enable != is_enabled)
+    {
+        is_enabled = enable;
+        DEBUG(status, out).print("%s from the API; persisting\n", is_enabled ? "enabled" : "disabled");
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+        if (enable)
+            do_cycle(out);
+    }
+    else
+    {
+        DEBUG(status, out).print("%s from the API, but already %s; no action\n", is_enabled ? "enabled" : "disabled", is_enabled ? "enabled" : "disabled");
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown(color_ostream &out)
+{
+    DEBUG(status, out).print("shutting down %s\n", plugin_name);
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_load_data(color_ostream &out)
+{
+    cycle_timestamp = 0;
+    config = World::GetPersistentData(CONFIG_KEY);
+
+    if (!config.isValid())
+    {
+        DEBUG(status, out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+    }
+
+    // we have to copy our enabled flag into the global plugin variable, but
+    // all the other state we can directly read/modify from the persistent
+    // data structure.
+    is_enabled = get_config_bool(CONFIG_IS_ENABLED);
+    DEBUG(status, out).print("loading persisted enabled state: %s\n", is_enabled ? "true" : "false");
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
+{
+    if (event == DFHack::SC_WORLD_UNLOADED)
+    {
+        if (is_enabled)
+        {
+            DEBUG(status, out).print("world unloaded; disabling %s\n", plugin_name);
+            is_enabled = false;
+        }
+    }
+    return CR_OK;
+}
+
+static const int32_t CYCLE_TICKS = 1200;
+
+DFhackCExport command_result plugin_onupdate(color_ostream &out)
+{
+    CoreSuspender suspend;
+    if (is_enabled && world->frame_counter - cycle_timestamp >= CYCLE_TICKS)
+        do_cycle(out);
+    return CR_OK;
+}
+
+// Queue up a single order to engrave the slab for the given unit
+static void createSlabJob(df::unit *unit)
+{
+    auto next_id = world->manager_order_next_id++;
+    auto order = new df::manager_order();
+
+    order->id = next_id;
+    order->job_type = df::job_type::EngraveSlab;
+    order->hist_figure_id = unit->hist_figure_id;
+    order->amount_left = 1;
+    order->amount_total = 1;
+    world->manager_orders.push_back(order);
+}
+
+static void checkslabs(color_ostream &out)
+{
+    // Get existing orders for slab engraving as map hist_figure_id -> order ID
+    std::map<int32_t, int32_t> histToJob;
+    for (auto order : world->manager_orders)
+    {
+        if (order->job_type == df::job_type::EngraveSlab)
+            histToJob[order->hist_figure_id] = order->id;
+    }
+
+    // Build list of ghosts
+    std::vector<df::unit *> ghosts;
+    std::copy_if(world->units.all.begin(), world->units.all.end(),
+                 std::back_inserter(ghosts),
+                 [](const df::unit *unit)
+                 { return unit->flags3.bits.ghostly; });
+
+    for (auto ghost : ghosts)
+    {
+        // Only create a job is the map has no existing jobs for that historical figure or no existing engraved slabs
+        if (histToJob.count(ghost->hist_figure_id) == 0 &&
+            !std::any_of(world->items.other.SLAB.begin(),
+                        world->items.other.SLAB.end(),
+                        [&ghost](df::item_slabst *slab){
+                            return slab->engraving_type == df::slab_engraving_type::Memorial && slab->topic == ghost->hist_figure_id;
+                        })
+            )
+        {
+            createSlabJob(ghost);
+            auto fullName = Translation::TranslateName(&ghost->name, false);
+            out.print("Added slab order for ghost %s\n", fullName.c_str());
+        }
+    }
+}
+
+static void do_cycle(color_ostream &out)
+{
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
+
+    checkslabs(out);
+}
diff --git a/plugins/autotrade.cpp b/plugins/autotrade.cpp
deleted file mode 100644
index 623fd5c1e..000000000
--- a/plugins/autotrade.cpp
+++ /dev/null
@@ -1,467 +0,0 @@
-#include "uicommon.h"
-
-#include "modules/Gui.h"
-
-#include "df/world.h"
-#include "df/world_raws.h"
-#include "df/building_def.h"
-#include "df/viewscreen_dwarfmodest.h"
-#include "df/viewscreen_tradegoodsst.h"
-#include "df/building_stockpilest.h"
-#include "modules/Buildings.h"
-#include "modules/Items.h"
-#include "df/building_tradedepotst.h"
-#include "df/general_ref_building_holderst.h"
-#include "df/job.h"
-#include "df/job_item_ref.h"
-#include "modules/Job.h"
-#include "df/ui.h"
-#include "df/mandate.h"
-#include "modules/Maps.h"
-
-using df::building_stockpilest;
-
-DFHACK_PLUGIN("autotrade");
-REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(cursor);
-REQUIRE_GLOBAL(ui);
-
-static const string PERSISTENCE_KEY = "autotrade/stockpiles";
-
-/*
- * Depot Access
- */
-
-class TradeDepotInfo
-{
-public:
-    TradeDepotInfo() : depot(0)
-    {
-
-    }
-
-    bool findDepot()
-    {
-        if (isValid())
-            return true;
-
-        reset();
-        for(auto bld_it = world->buildings.all.begin(); bld_it != world->buildings.all.end(); bld_it++)
-        {
-            auto bld = *bld_it;
-            if (!isUsableDepot(bld))
-                continue;
-
-            depot = bld;
-            id = depot->id;
-            break;
-        }
-
-        return depot;
-    }
-
-    bool assignItem(df::item *item)
-    {
-        auto href = df::allocate<df::general_ref_building_holderst>();
-        if (!href)
-            return false;
-
-        auto job = new df::job();
-
-        df::coord tpos(depot->centerx, depot->centery, depot->z);
-        job->pos = tpos;
-
-        job->job_type = job_type::BringItemToDepot;
-
-        // job <-> item link
-        if (!Job::attachJobItem(job, item, df::job_item_ref::Hauled))
-        {
-            delete job;
-            delete href;
-            return false;
-        }
-
-        // job <-> building link
-        href->building_id = id;
-        depot->jobs.push_back(job);
-        job->general_refs.push_back(href);
-
-        // add to job list
-        Job::linkIntoWorld(job);
-
-        return true;
-    }
-
-    void reset()
-    {
-        depot = 0;
-    }
-
-private:
-    int32_t id;
-    df::building *depot;
-
-    bool isUsableDepot(df::building* bld)
-    {
-        if (bld->getType() != building_type::TradeDepot)
-            return false;
-
-        if (bld->getBuildStage() < bld->getMaxBuildStage())
-            return false;
-
-        if (bld->jobs.size() == 1 && bld->jobs[0]->job_type == job_type::DestroyBuilding)
-            return false;
-
-        return true;
-    }
-
-    bool isValid()
-    {
-        if (!depot)
-            return false;
-
-        auto found = df::building::find(id);
-        return found && found == depot && isUsableDepot(found);
-    }
-
-};
-
-static TradeDepotInfo depot_info;
-
-
-/*
- * Item Manipulation
- */
-
-static bool is_valid_item(df::item *item)
-{
-    // Similar to Items::canTrade() with a few checks changed
-    for (size_t i = 0; i < item->general_refs.size(); i++)
-    {
-        df::general_ref *ref = item->general_refs[i];
-
-        switch (ref->getType())
-        {
-        case general_ref_type::CONTAINED_IN_ITEM:
-            return false;
-
-        case general_ref_type::UNIT_HOLDER:
-            return false;
-
-        case general_ref_type::BUILDING_HOLDER:
-            return false;
-
-        default:
-            break;
-        }
-    }
-
-    for (size_t i = 0; i < item->specific_refs.size(); i++)
-    {
-        df::specific_ref *ref = item->specific_refs[i];
-
-        if (ref->type == specific_ref_type::JOB)
-        {
-            // Ignore any items assigned to a job
-            return false;
-        }
-    }
-
-    if (!Items::checkMandates(item))
-        return false;
-
-    return true;
-}
-
-static void mark_all_in_stockpiles(vector<PersistentStockpileInfo> &stockpiles)
-{
-    if (!depot_info.findDepot())
-        return;
-
-
-    // Precompute a bitmask with the bad flags
-    df::item_flags bad_flags;
-    bad_flags.whole = 0;
-
-#define F(x) bad_flags.bits.x = true;
-    F(dump); F(forbid); F(garbage_collect);
-    F(hostile); F(on_fire); F(rotten); F(trader);
-    F(in_building); F(construction); F(artifact);
-    F(spider_web); F(owned); F(in_job);
-#undef F
-
-    size_t marked_count = 0;
-    size_t error_count = 0;
-    for (auto it = stockpiles.begin(); it != stockpiles.end(); it++)
-    {
-        if (!it->isValid())
-            continue;
-
-        Buildings::StockpileIterator stored;
-        for (stored.begin(it->getStockpile()); !stored.done(); ++stored)
-        {
-            df::item *item = *stored;
-            if (item->flags.whole & bad_flags.whole)
-                continue;
-
-            if (!is_valid_item(item))
-                continue;
-
-            // In case of container, check contained items for mandates
-            bool mandates_ok = true;
-            vector<df::item*> contained_items;
-            Items::getContainedItems(item, &contained_items);
-            for (df::item *cit : contained_items)
-            {
-                if (!Items::checkMandates(cit))
-                {
-                    mandates_ok = false;
-                    break;
-                }
-            }
-
-            if (!mandates_ok)
-                continue;
-
-            if (depot_info.assignItem(item))
-            {
-                ++marked_count;
-            }
-            else
-            {
-                if (++error_count < 5)
-                {
-                    Gui::showZoomAnnouncement(df::announcement_type::CANCEL_JOB, item->pos,
-                        "Cannot trade item from stockpile " + int_to_string(it->getId()), COLOR_RED, true);
-                }
-            }
-        }
-    }
-
-    if (marked_count)
-        Gui::showAnnouncement("Marked " + int_to_string(marked_count) + " items for trade", COLOR_GREEN, false);
-
-    if (error_count >= 5)
-    {
-        Gui::showAnnouncement(int_to_string(error_count) + " items were not marked", COLOR_RED, true);
-    }
-}
-
-
-/*
- * Stockpile Monitoring
- */
-
-class StockpileMonitor
-{
-public:
-    bool isMonitored(df::building_stockpilest *sp)
-    {
-        for (auto it = monitored_stockpiles.begin(); it != monitored_stockpiles.end(); it++)
-        {
-            if (it->matches(sp))
-                return true;
-        }
-
-        return false;
-    }
-
-    void add(df::building_stockpilest *sp)
-    {
-        auto pile = PersistentStockpileInfo(sp, PERSISTENCE_KEY);
-        if (pile.isValid())
-        {
-            monitored_stockpiles.push_back(pile);
-            monitored_stockpiles.back().save();
-        }
-    }
-
-    void remove(df::building_stockpilest *sp)
-    {
-        for (auto it = monitored_stockpiles.begin(); it != monitored_stockpiles.end(); it++)
-        {
-            if (it->matches(sp))
-            {
-                it->remove();
-                monitored_stockpiles.erase(it);
-                break;
-            }
-        }
-    }
-
-    void doCycle()
-    {
-        if (!can_trade())
-            return;
-
-        for (auto it = monitored_stockpiles.begin(); it != monitored_stockpiles.end();)
-        {
-            if (!it->isValid())
-            {
-                it = monitored_stockpiles.erase(it);
-                continue;
-            }
-
-            ++it;
-        }
-
-        mark_all_in_stockpiles(monitored_stockpiles);
-    }
-
-    void reset()
-    {
-        monitored_stockpiles.clear();
-        std::vector<PersistentDataItem> items;
-        DFHack::World::GetPersistentData(&items, PERSISTENCE_KEY);
-
-        for (auto i = items.begin(); i != items.end(); i++)
-        {
-            auto pile = PersistentStockpileInfo(*i, PERSISTENCE_KEY);
-            if (pile.load())
-                monitored_stockpiles.push_back(pile);
-            else
-                pile.remove();
-        }
-    }
-
-
-private:
-    vector<PersistentStockpileInfo> monitored_stockpiles;
-};
-
-static StockpileMonitor monitor;
-
-#define DELTA_TICKS 600
-
-DFhackCExport command_result plugin_onupdate ( color_ostream &out )
-{
-    if(!Maps::IsValid())
-        return CR_OK;
-
-    if (DFHack::World::ReadPauseState())
-        return CR_OK;
-
-    if (world->frame_counter % DELTA_TICKS != 0)
-        return CR_OK;
-
-    monitor.doCycle();
-
-    return CR_OK;
-}
-
-
-/*
- * Interface
- */
-
-struct trade_hook : public df::viewscreen_dwarfmodest
-{
-    typedef df::viewscreen_dwarfmodest interpose_base;
-
-    bool handleInput(set<df::interface_key> *input)
-    {
-        if (Gui::inRenameBuilding())
-            return false;
-
-        building_stockpilest *sp = get_selected_stockpile();
-        if (!sp)
-            return false;
-
-        if (input->count(interface_key::CUSTOM_SHIFT_T))
-        {
-            if (monitor.isMonitored(sp))
-                monitor.remove(sp);
-            else
-                monitor.add(sp);
-        }
-
-        return false;
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
-    {
-        if (!handleInput(input))
-            INTERPOSE_NEXT(feed)(input);
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        INTERPOSE_NEXT(render)();
-
-        building_stockpilest *sp = get_selected_stockpile();
-        if (!sp)
-            return;
-
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = dims.y2 - 5;
-
-        int links = 0;
-        links += sp->links.give_to_pile.size();
-        links += sp->links.take_from_pile.size();
-        links += sp->links.give_to_workshop.size();
-        links += sp->links.take_from_workshop.size();
-        bool state = monitor.isMonitored(sp);
-
-        if (links + 12 >= y) {
-            y = dims.y2;
-            OutputString(COLOR_WHITE, x, y, "Auto: ");
-            x += 11;
-            OutputString(COLOR_LIGHTRED, x, y, "T");
-            OutputString(state? COLOR_LIGHTGREEN: COLOR_GREY, x, y, "rade ");
-        } else {
-            OutputToggleString(x, y, "Auto trade", "T", state, true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
-        }
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(trade_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(trade_hook, render);
-
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event)
-    {
-    case DFHack::SC_MAP_LOADED:
-        depot_info.reset();
-        monitor.reset();
-        break;
-    case DFHack::SC_MAP_UNLOADED:
-        break;
-    default:
-        break;
-    }
-    return CR_OK;
-}
-
-DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    if (enable != is_enabled)
-    {
-        depot_info.reset();
-        monitor.reset();
-
-        if (!INTERPOSE_HOOK(trade_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(trade_hook, render).apply(enable))
-            return CR_FAILURE;
-
-        is_enabled = enable;
-    }
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    return CR_OK;
-}
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 509b1e6bc..d5a06cc5c 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -46,6 +46,8 @@ using namespace DFHack;
 DFHACK_PLUGIN("blueprint");
 REQUIRE_GLOBAL(world);
 
+static const string BLUEPRINT_USER_DIR = "dfhack-config/blueprints/";
+
 namespace DFHack {
     DBG_DECLARE(blueprint,log);
 }
@@ -97,9 +99,9 @@ struct blueprint_options {
     bool construct = false;
     bool build = false;
     bool place = false;
-    bool zone = false;
-    bool query = false;
-    bool rooms = false;
+    // bool zone = false;
+    // bool query = false;
+    // bool rooms = false;
 
     static struct_identity _identity;
 };
@@ -123,9 +125,9 @@ static const struct_field_info blueprint_options_fields[] = {
     { struct_field_info::PRIMITIVE, "construct",              offsetof(blueprint_options, construct),             &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "build",                  offsetof(blueprint_options, build),                 &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "place",                  offsetof(blueprint_options, place),                 &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE, "zone",                   offsetof(blueprint_options, zone),                  &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE, "query",                  offsetof(blueprint_options, query),                 &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE, "rooms",                  offsetof(blueprint_options, rooms),                 &df::identity_traits<bool>::identity,    0, 0 },
+    // { struct_field_info::PRIMITIVE, "zone",                   offsetof(blueprint_options, zone),                  &df::identity_traits<bool>::identity,    0, 0 },
+    // { struct_field_info::PRIMITIVE, "query",                  offsetof(blueprint_options, query),                 &df::identity_traits<bool>::identity,    0, 0 },
+    // { struct_field_info::PRIMITIVE, "rooms",                  offsetof(blueprint_options, rooms),                 &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::END }
 };
 struct_identity blueprint_options::_identity(sizeof(blueprint_options), &df::allocator_fn<blueprint_options>, NULL, "blueprint_options", NULL, blueprint_options_fields);
@@ -227,6 +229,9 @@ static const char * get_tile_dig(const df::coord &pos, const tile_context &) {
     case tiletype_shape::BOULDER:
     case tiletype_shape::PEBBLES:
     case tiletype_shape::BROOK_TOP:
+    case tiletype_shape::SAPLING:
+    case tiletype_shape::SHRUB:
+    case tiletype_shape::TWIG:
         return "d";
     case tiletype_shape::STAIR_UP:
         return "u";
@@ -902,6 +907,7 @@ static const char * get_tile_place(const df::coord &pos,
     return add_expansion_syntax(ctx, get_place_keys(ctx));
 }
 
+/* TODO: understand how this changes for v50
 static bool hospital_maximums_eq(const df::hospital_supplies &a,
                                  const df::hospital_supplies &b) {
     return a.max_thread == b.max_thread &&
@@ -1086,10 +1092,11 @@ static const char * get_tile_rooms(const df::coord &, const tile_context &ctx) {
     str << "r{+ " << (max_dim - 3) << "}&";
     return cache(str);
 }
+*/
 
 static bool create_output_dir(color_ostream &out,
                               const blueprint_options &opts) {
-    string basename = "blueprints/" + opts.name;
+    string basename = BLUEPRINT_USER_DIR + opts.name;
     size_t last_slash = basename.find_last_of("/");
     string parent_path = basename.substr(0, last_slash);
 
@@ -1328,12 +1335,13 @@ static bool do_transform(color_ostream &out,
                   get_tile_build, ensure_building);
     add_processor(processors, opts, "place", "place", opts.place,
                   get_tile_place, ensure_building);
+/* TODO: understand how this changes for v50
     add_processor(processors, opts, "zone", "zone", opts.zone, get_tile_zone);
     add_processor(processors, opts, "query", "query", opts.query,
                   get_tile_query, ensure_building);
     add_processor(processors, opts, "query", "rooms", opts.rooms,
                   get_tile_rooms, ensure_building);
-
+*/
     if (processors.empty()) {
         out.printerr("no phases requested! nothing to do!\n");
         return false;
diff --git a/plugins/buildingplan/CMakeLists.txt b/plugins/buildingplan/CMakeLists.txt
index 1d34b169a..118b2a1d1 100644
--- a/plugins/buildingplan/CMakeLists.txt
+++ b/plugins/buildingplan/CMakeLists.txt
@@ -2,10 +2,15 @@ project(buildingplan)
 
 set(COMMON_HDRS
     buildingplan.h
-    buildingplan-planner.h
-    buildingplan-rooms.h
+    buildingtypekey.h
+    defaultitemfilters.h
+    itemfilter.h
+    plannedbuilding.h
 )
 set_source_files_properties(${COMMON_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
 
-dfhack_plugin(buildingplan buildingplan.cpp buildingplan-planner.cpp
-    buildingplan-rooms.cpp ${COMMON_HDRS} LINK_LIBRARIES lua)
+dfhack_plugin(buildingplan
+    buildingplan.cpp buildingplan_cycle.cpp buildingtypekey.cpp
+    defaultitemfilters.cpp itemfilter.cpp plannedbuilding.cpp
+    ${COMMON_HDRS}
+    LINK_LIBRARIES lua)
diff --git a/plugins/buildingplan/buildingplan-planner.cpp b/plugins/buildingplan/buildingplan-planner.cpp
deleted file mode 100644
index 4ac11c4e1..000000000
--- a/plugins/buildingplan/buildingplan-planner.cpp
+++ /dev/null
@@ -1,1074 +0,0 @@
-#include <functional>
-#include <climits> // for CHAR_BIT
-
-#include "df/building_design.h"
-#include "df/building_doorst.h"
-#include "df/building_type.h"
-#include "df/general_ref_building_holderst.h"
-#include "df/job_item.h"
-#include "df/ui_build_selector.h"
-
-#include "modules/Buildings.h"
-#include "modules/Gui.h"
-#include "modules/Job.h"
-
-#include "LuaTools.h"
-#include "../uicommon.h"
-
-#include "buildingplan.h"
-
-static const std::string planned_building_persistence_key_v1 = "buildingplan/constraints";
-static const std::string planned_building_persistence_key_v2 = "buildingplan/constraints2";
-static const std::string global_settings_persistence_key = "buildingplan/global";
-
-/*
- * ItemFilter
- */
-
-ItemFilter::ItemFilter()
-{
-    clear();
-}
-
-void ItemFilter::clear()
-{
-    min_quality = df::item_quality::Ordinary;
-    max_quality = df::item_quality::Masterful;
-    decorated_only = false;
-    clearMaterialMask();
-    materials.clear();
-}
-
-bool ItemFilter::deserialize(std::string ser)
-{
-    clear();
-
-    std::vector<std::string> tokens;
-    split_string(&tokens, ser, "/");
-    if (tokens.size() != 5)
-    {
-        debug("invalid ItemFilter serialization: '%s'", ser.c_str());
-        return false;
-    }
-
-    if (!deserializeMaterialMask(tokens[0]) || !deserializeMaterials(tokens[1]))
-        return false;
-
-    setMinQuality(atoi(tokens[2].c_str()));
-    setMaxQuality(atoi(tokens[3].c_str()));
-    decorated_only = static_cast<bool>(atoi(tokens[4].c_str()));
-    return true;
-}
-
-bool ItemFilter::deserializeMaterialMask(std::string ser)
-{
-    if (ser.empty())
-        return true;
-
-    if (!parseJobMaterialCategory(&mat_mask, ser))
-    {
-        debug("invalid job material category serialization: '%s'", ser.c_str());
-        return false;
-    }
-    return true;
-}
-
-bool ItemFilter::deserializeMaterials(std::string ser)
-{
-    if (ser.empty())
-        return true;
-
-    std::vector<std::string> mat_names;
-    split_string(&mat_names, ser, ",");
-    for (auto m = mat_names.begin(); m != mat_names.end(); m++)
-    {
-        DFHack::MaterialInfo material;
-        if (!material.find(*m) || !material.isValid())
-        {
-            debug("invalid material name serialization: '%s'", ser.c_str());
-            return false;
-        }
-        materials.push_back(material);
-    }
-    return true;
-}
-
-// format: mat,mask,elements/materials,list/minq/maxq/decorated
-std::string ItemFilter::serialize() const
-{
-    std::ostringstream ser;
-    ser << bitfield_to_string(mat_mask, ",") << "/";
-    if (!materials.empty())
-    {
-        ser << materials[0].getToken();
-        for (size_t i = 1; i < materials.size(); ++i)
-            ser << "," << materials[i].getToken();
-    }
-    ser << "/" << static_cast<int>(min_quality);
-    ser << "/" << static_cast<int>(max_quality);
-    ser << "/" << static_cast<int>(decorated_only);
-    return ser.str();
-}
-
-void ItemFilter::clearMaterialMask()
-{
-    mat_mask.whole = 0;
-}
-
-void ItemFilter::addMaterialMask(uint32_t mask)
-{
-    mat_mask.whole |= mask;
-}
-
-void ItemFilter::setMaterials(std::vector<DFHack::MaterialInfo> materials)
-{
-    this->materials = materials;
-}
-
-static void clampItemQuality(df::item_quality *quality)
-{
-    if (*quality > item_quality::Artifact)
-    {
-        debug("clamping quality to Artifact");
-        *quality = item_quality::Artifact;
-    }
-    if (*quality < item_quality::Ordinary)
-    {
-        debug("clamping quality to Ordinary");
-        *quality = item_quality::Ordinary;
-    }
-}
-
-void ItemFilter::setMinQuality(int quality)
-{
-    min_quality = static_cast<df::item_quality>(quality);
-    clampItemQuality(&min_quality);
-    if (max_quality < min_quality)
-        max_quality = min_quality;
-}
-
-void ItemFilter::setMaxQuality(int quality)
-{
-    max_quality = static_cast<df::item_quality>(quality);
-    clampItemQuality(&max_quality);
-    if (max_quality < min_quality)
-        min_quality = max_quality;
-}
-
-void ItemFilter::incMinQuality() { setMinQuality(min_quality + 1); }
-void ItemFilter::decMinQuality() { setMinQuality(min_quality - 1); }
-void ItemFilter::incMaxQuality() { setMaxQuality(max_quality + 1); }
-void ItemFilter::decMaxQuality() { setMaxQuality(max_quality - 1); }
-
-void ItemFilter::toggleDecoratedOnly() { decorated_only = !decorated_only; }
-
-static std::string material_to_string_fn(const MaterialInfo &m) { return m.toString(); }
-
-uint32_t ItemFilter::getMaterialMask() const { return mat_mask.whole; }
-
-std::vector<std::string> ItemFilter::getMaterials() const
-{
-    std::vector<std::string> descriptions;
-    transform_(materials, descriptions, material_to_string_fn);
-
-    if (descriptions.size() == 0)
-        bitfield_to_string(&descriptions, mat_mask);
-
-    if (descriptions.size() == 0)
-        descriptions.push_back("any");
-
-    return descriptions;
-}
-
-std::string ItemFilter::getMinQuality() const
-{
-    return ENUM_KEY_STR(item_quality, min_quality);
-}
-
-std::string ItemFilter::getMaxQuality() const
-{
-    return ENUM_KEY_STR(item_quality, max_quality);
-}
-
-bool ItemFilter::getDecoratedOnly() const
-{
-    return decorated_only;
-}
-
-bool ItemFilter::matchesMask(DFHack::MaterialInfo &mat) const
-{
-    return mat_mask.whole ? mat.matches(mat_mask) : true;
-}
-
-bool ItemFilter::matches(df::dfhack_material_category mask) const
-{
-    return mask.whole & mat_mask.whole;
-}
-
-bool ItemFilter::matches(DFHack::MaterialInfo &material) const
-{
-    for (auto it = materials.begin(); it != materials.end(); ++it)
-        if (material.matches(*it))
-            return true;
-    return false;
-}
-
-bool ItemFilter::matches(df::item *item) const
-{
-    if (item->getQuality() < min_quality || item->getQuality() > max_quality)
-        return false;
-
-    if (decorated_only && !item->hasImprovements())
-        return false;
-
-    auto imattype = item->getActualMaterial();
-    auto imatindex = item->getActualMaterialIndex();
-    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
-
-    return (materials.size() == 0) ? matchesMask(item_mat) : matches(item_mat);
-}
-
-
-/*
- * PlannedBuilding
- */
-
-// format: itemfilterser|itemfilterser|...
-static std::string serializeFilters(const std::vector<ItemFilter> &filters)
-{
-    std::ostringstream ser;
-    if (!filters.empty())
-    {
-        ser << filters[0].serialize();
-        for (size_t i = 1; i < filters.size(); ++i)
-            ser << "|" << filters[i].serialize();
-    }
-    return ser.str();
-}
-
-static std::vector<ItemFilter> deserializeFilters(std::string ser)
-{
-    std::vector<std::string> isers;
-    split_string(&isers, ser, "|");
-    std::vector<ItemFilter> ret;
-    for (auto & iser : isers)
-    {
-        ItemFilter filter;
-        if (filter.deserialize(iser))
-            ret.push_back(filter);
-    }
-    return ret;
-}
-
-static size_t getNumFilters(BuildingTypeKey key)
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    Lua::StackUnwinder top(L);
-
-    if (!lua_checkstack(L, 4) || !Lua::PushModulePublic(
-            out, L, "plugins.buildingplan", "get_num_filters"))
-    {
-        debug("failed to push the lua method on the stack");
-        return 0;
-    }
-
-    Lua::Push(L, std::get<0>(key));
-    Lua::Push(L, std::get<1>(key));
-    Lua::Push(L, std::get<2>(key));
-
-    if (!Lua::SafeCall(out, L, 3, 1))
-    {
-        debug("lua call failed");
-        return 0;
-    }
-
-    int num_filters = lua_tonumber(L, -1);
-    lua_pop(L, 1);
-    return num_filters;
-}
-
-PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters)
-    : building(building),
-      building_id(building->id),
-      filters(filters)
-{
-    config = DFHack::World::AddPersistentData(planned_building_persistence_key_v2);
-    config.ival(0) = building_id;
-    config.val() = serializeFilters(filters);
-}
-
-PlannedBuilding::PlannedBuilding(PersistentDataItem &config)
-    : config(config),
-      building(df::building::find(config.ival(0))),
-      building_id(config.ival(0)),
-      filters(deserializeFilters(config.val()))
-{
-    if (building)
-    {
-        if (filters.size() !=
-            getNumFilters(toBuildingTypeKey(building)))
-        {
-            debug("invalid ItemFilter vector serialization: '%s'",
-                config.val().c_str());
-            building = NULL;
-        }
-    }
-}
-
-// Ensure the building still exists and is in a valid state. It can disappear
-// for lots of reasons, such as running the game with the buildingplan plugin
-// disabled, manually removing the building, modifying it via the API, etc.
-bool PlannedBuilding::isValid() const
-{
-    return building && df::building::find(building_id)
-        && building->getBuildStage() == 0;
-}
-
-void PlannedBuilding::remove()
-{
-    DFHack::World::DeletePersistentData(config);
-    building = NULL;
-}
-
-df::building * PlannedBuilding::getBuilding()
-{
-    return building;
-}
-
-const std::vector<ItemFilter> & PlannedBuilding::getFilters() const
-{
-    // if we want to be able to dynamically change the filters, we'll need to
-    // re-bucket the tasks in Planner.
-    return filters;
-}
-
-
-/*
- * BuildingTypeKey
- */
-
-BuildingTypeKey toBuildingTypeKey(
-    df::building_type btype, int16_t subtype, int32_t custom)
-{
-    return std::make_tuple(btype, subtype, custom);
-}
-
-BuildingTypeKey toBuildingTypeKey(df::building *bld)
-{
-    return std::make_tuple(
-        bld->getType(), bld->getSubtype(), bld->getCustomType());
-}
-
-BuildingTypeKey toBuildingTypeKey(df::ui_build_selector *uibs)
-{
-    return std::make_tuple(
-        uibs->building_type, uibs->building_subtype, uibs->custom_type);
-}
-
-// rotates a size_t value left by count bits
-// assumes count is not 0 or >= size_t_bits
-// replace this with std::rotl when we move to C++20
-static std::size_t rotl_size_t(size_t val, uint32_t count)
-{
-    static const int size_t_bits = CHAR_BIT * sizeof(std::size_t);
-    return val << count | val >> (size_t_bits - count);
-}
-
-std::size_t BuildingTypeKeyHash::operator() (const BuildingTypeKey & key) const
-{
-    // cast first param to appease gcc-4.8, which is missing the enum
-    // specializations for std::hash
-    std::size_t h1 = std::hash<int32_t>()(static_cast<int32_t>(std::get<0>(key)));
-    std::size_t h2 = std::hash<int16_t>()(std::get<1>(key));
-    std::size_t h3 = std::hash<int32_t>()(std::get<2>(key));
-
-    return h1 ^ rotl_size_t(h2, 8) ^ rotl_size_t(h3, 16);
-}
-
-
-/*
- * Planner
- */
-
-// convert v1 persistent data into v2 format
-// we can remove this conversion code once v2 has been live for a while
-void migrateV1ToV2()
-{
-    std::vector<PersistentDataItem> configs;
-    DFHack::World::GetPersistentData(&configs, planned_building_persistence_key_v1);
-    if (configs.empty())
-        return;
-
-    debug("migrating %zu persisted configs to new format", configs.size());
-    for (auto config : configs)
-    {
-        df::building *bld = df::building::find(config.ival(1));
-        if (!bld)
-        {
-            debug("buliding no longer exists; removing config");
-            DFHack::World::DeletePersistentData(config);
-            continue;
-        }
-
-        if (bld->getBuildStage() != 0 || bld->jobs.size() != 1
-            || bld->jobs[0]->job_items.size() != 1)
-        {
-            debug("building in invalid state; removing config");
-            DFHack::World::DeletePersistentData(config);
-            continue;
-        }
-
-        // fix up the building so we can set the material properties later
-        bld->mat_type = -1;
-        bld->mat_index = -1;
-
-        // the v1 filters are not initialized correctly and will match any item.
-        // we need to fix them up a bit.
-        auto filter = bld->jobs[0]->job_items[0];
-        df::item_type type;
-        switch (bld->getType())
-        {
-        case df::building_type::Armorstand: type = df::item_type::ARMORSTAND; break;
-        case df::building_type::Bed: type = df::item_type::BED; break;
-        case df::building_type::Chair: type = df::item_type::CHAIR; break;
-        case df::building_type::Coffin: type = df::item_type::COFFIN; break;
-        case df::building_type::Door: type = df::item_type::DOOR; break;
-        case df::building_type::Floodgate: type = df::item_type::FLOODGATE; break;
-        case df::building_type::Hatch: type = df::item_type::HATCH_COVER; break;
-        case df::building_type::GrateWall: type = df::item_type::GRATE; break;
-        case df::building_type::GrateFloor: type = df::item_type::GRATE; break;
-        case df::building_type::BarsVertical: type = df::item_type::BAR; break;
-        case df::building_type::BarsFloor: type = df::item_type::BAR; break;
-        case df::building_type::Cabinet: type = df::item_type::CABINET; break;
-        case df::building_type::Box: type = df::item_type::BOX; break;
-        case df::building_type::Weaponrack: type = df::item_type::WEAPONRACK; break;
-        case df::building_type::Statue: type = df::item_type::STATUE; break;
-        case df::building_type::Slab: type = df::item_type::SLAB; break;
-        case df::building_type::Table: type = df::item_type::TABLE; break;
-        case df::building_type::WindowGlass: type = df::item_type::WINDOW; break;
-        case df::building_type::AnimalTrap: type = df::item_type::ANIMALTRAP; break;
-        case df::building_type::Chain: type = df::item_type::CHAIN; break;
-        case df::building_type::Cage: type = df::item_type::CAGE; break;
-        case df::building_type::TractionBench: type = df::item_type::TRACTION_BENCH; break;
-        default:
-            debug("building has unhandled type; removing config");
-            DFHack::World::DeletePersistentData(config);
-            continue;
-        }
-        filter->item_type = type;
-        filter->item_subtype = -1;
-        filter->mat_type = -1;
-        filter->mat_index = -1;
-        filter->flags1.whole = 0;
-        filter->flags2.whole = 0;
-        filter->flags2.bits.allow_artifact = true;
-        filter->flags3.whole = 0;
-        filter->flags4 = 0;
-        filter->flags5 = 0;
-        filter->metal_ore = -1;
-        filter->min_dimension = -1;
-        filter->has_tool_use = df::tool_uses::NONE;
-        filter->quantity = 1;
-
-        std::vector<std::string> tokens;
-        split_string(&tokens, config.val(), "/");
-        if (tokens.size() != 2)
-        {
-            debug("invalid v1 format; removing config");
-            DFHack::World::DeletePersistentData(config);
-            continue;
-        }
-
-        ItemFilter item_filter;
-        item_filter.deserializeMaterialMask(tokens[0]);
-        item_filter.deserializeMaterials(tokens[1]);
-        item_filter.setMinQuality(config.ival(2) - 1);
-        item_filter.setMaxQuality(config.ival(4) - 1);
-        if (config.ival(3) - 1)
-            item_filter.toggleDecoratedOnly();
-
-        // create the v2 record
-        std::vector<ItemFilter> item_filters;
-        item_filters.push_back(item_filter);
-        PlannedBuilding pb(bld, item_filters);
-
-        // remove the v1 record
-        DFHack::World::DeletePersistentData(config);
-        debug("v1 %s(%d) record successfully migrated",
-              ENUM_KEY_STR(building_type, bld->getType()).c_str(),
-              bld->id);
-    }
-}
-
-// assumes no setting has '=' or '|' characters
-static std::string serialize_settings(std::map<std::string, bool> & settings)
-{
-    std::ostringstream ser;
-    for (auto & entry : settings)
-    {
-        ser << entry.first << "=" << (entry.second ? "1" : "0") << "|";
-    }
-    return ser.str();
-}
-
-static void deserialize_settings(std::map<std::string, bool> & settings,
-                                 std::string ser)
-{
-    std::vector<std::string> tokens;
-    split_string(&tokens, ser, "|");
-    for (auto token : tokens)
-    {
-        if (token.empty())
-            continue;
-
-        std::vector<std::string> parts;
-        split_string(&parts, token, "=");
-        if (parts.size() != 2)
-        {
-            debug("invalid serialized setting format: '%s'", token.c_str());
-            continue;
-        }
-        std::string key = parts[0];
-        if (settings.count(key) == 0)
-        {
-            debug("unknown serialized setting: '%s", key.c_str());
-            continue;
-        }
-        settings[key] = static_cast<bool>(atoi(parts[1].c_str()));
-        debug("deserialized setting: %s = %d", key.c_str(), settings[key]);
-    }
-}
-
-static DFHack::PersistentDataItem init_global_settings(
-        std::map<std::string, bool> & settings)
-{
-    settings.clear();
-    settings["blocks"] = true;
-    settings["boulders"] = true;
-    settings["logs"] = true;
-    settings["bars"] = false;
-
-    // load persistent global settings if they exist; otherwise create them
-    std::vector<PersistentDataItem> items;
-    DFHack::World::GetPersistentData(&items, global_settings_persistence_key);
-    if (items.size() == 1)
-    {
-        DFHack::PersistentDataItem & config = items[0];
-        deserialize_settings(settings, config.val());
-        return config;
-    }
-
-    debug("initializing persistent global settings");
-    DFHack::PersistentDataItem config =
-        DFHack::World::AddPersistentData(global_settings_persistence_key);
-    config.val() = serialize_settings(settings);
-    return config;
-}
-
-const std::map<std::string, bool> & Planner::getGlobalSettings() const
-{
-    return global_settings;
-}
-
-bool Planner::setGlobalSetting(std::string name, bool value)
-{
-    if (global_settings.count(name) == 0)
-    {
-        debug("attempted to set invalid setting: '%s'", name.c_str());
-        return false;
-    }
-    debug("global setting '%s' %d -> %d",
-          name.c_str(), global_settings[name], value);
-    global_settings[name] = value;
-    if (config.isValid())
-        config.val() = serialize_settings(global_settings);
-    return true;
-}
-
-void Planner::reset()
-{
-    debug("resetting Planner state");
-    default_item_filters.clear();
-    planned_buildings.clear();
-    tasks.clear();
-
-    config = init_global_settings(global_settings);
-
-    migrateV1ToV2();
-
-    std::vector<PersistentDataItem> items;
-    DFHack::World::GetPersistentData(&items, planned_building_persistence_key_v2);
-    debug("found data for %zu planned building(s)", items.size());
-
-    for (auto i = items.begin(); i != items.end(); i++)
-    {
-        PlannedBuilding pb(*i);
-        if (!pb.isValid())
-        {
-            debug("discarding invalid planned building");
-            pb.remove();
-            continue;
-        }
-
-        if (registerTasks(pb))
-            planned_buildings.insert(std::make_pair(pb.getBuilding()->id, pb));
-    }
-}
-
-void Planner::addPlannedBuilding(df::building *bld)
-{
-    auto item_filters = getItemFilters(toBuildingTypeKey(bld)).get();
-    // not a supported type
-    if (item_filters.empty())
-    {
-        debug("failed to add building: unsupported type");
-        return;
-    }
-
-    // protect against multiple registrations
-    if (planned_buildings.count(bld->id) != 0)
-    {
-        debug("failed to add building: already registered");
-        return;
-    }
-
-    PlannedBuilding pb(bld, item_filters);
-    if (pb.isValid() && registerTasks(pb))
-    {
-        for (auto job : bld->jobs)
-            job->flags.bits.suspend = true;
-
-        planned_buildings.insert(std::make_pair(bld->id, pb));
-    }
-    else
-    {
-        pb.remove();
-    }
-}
-
-static std::string getBucket(const df::job_item & ji,
-                             const std::vector<ItemFilter> & item_filters)
-{
-    std::ostringstream ser;
-
-    // pull out and serialize only known relevant fields. if we miss a few, then
-    // the filter bucket will be slighly less specific than it could be, but
-    // that's probably ok. we'll just end up bucketing slightly different items
-    // together. this is only a problem if the different filter at the front of
-    // the queue doesn't match any available items and blocks filters behind it
-    // that could be matched.
-    ser << ji.item_type << ':' << ji.item_subtype << ':' << ji.mat_type << ':'
-        << ji.mat_index << ':' << ji.flags1.whole << ':' << ji.flags2.whole
-        << ':' << ji.flags3.whole << ':' << ji.flags4 << ':' << ji.flags5 << ':'
-        << ji.metal_ore << ':' << ji.has_tool_use;
-
-    for (auto & item_filter : item_filters)
-    {
-        ser << ':' << item_filter.serialize();
-    }
-
-    return ser.str();
-}
-
-// get a list of item vectors that we should search for matches
-static std::vector<df::job_item_vector_id> getVectorIds(df::job_item *job_item,
-        const std::map<std::string, bool> & global_settings)
-{
-    std::vector<df::job_item_vector_id> ret;
-
-    // if the filter already has the vector_id set to something specific, use it
-    if (job_item->vector_id > df::job_item_vector_id::IN_PLAY)
-    {
-        debug("using vector_id from job_item: %s",
-              ENUM_KEY_STR(job_item_vector_id, job_item->vector_id).c_str());
-        ret.push_back(job_item->vector_id);
-        return ret;
-    }
-
-    // if the filer is for building material, refer to our global settings for
-    // which vectors to search
-    if (job_item->flags2.bits.building_material)
-    {
-        if (global_settings.at("blocks"))
-            ret.push_back(df::job_item_vector_id::BLOCKS);
-        if (global_settings.at("boulders"))
-            ret.push_back(df::job_item_vector_id::BOULDER);
-        if (global_settings.at("logs"))
-            ret.push_back(df::job_item_vector_id::WOOD);
-        if (global_settings.at("bars"))
-            ret.push_back(df::job_item_vector_id::BAR);
-    }
-
-    // fall back to IN_PLAY if no other vector was appropriate
-    if (ret.empty())
-        ret.push_back(df::job_item_vector_id::IN_PLAY);
-    return ret;
-}
-
-bool Planner::registerTasks(PlannedBuilding & pb)
-{
-    df::building * bld = pb.getBuilding();
-    if (bld->jobs.size() != 1)
-    {
-        debug("unexpected number of jobs: want 1, got %zu", bld->jobs.size());
-        return false;
-    }
-    auto job_items = bld->jobs[0]->job_items;
-    int num_job_items = job_items.size();
-    if (num_job_items < 1)
-    {
-        debug("unexpected number of job items: want >0, got %d", num_job_items);
-        return false;
-    }
-    int32_t id = bld->id;
-    for (int job_item_idx = 0; job_item_idx < num_job_items; ++job_item_idx)
-    {
-        auto job_item = job_items[job_item_idx];
-        auto bucket = getBucket(*job_item, pb.getFilters());
-        auto vector_ids = getVectorIds(job_item, global_settings);
-
-        // if there are multiple vector_ids, schedule duplicate tasks. after
-        // the correct number of items are matched, the extras will get popped
-        // as invalid
-        for (auto vector_id : vector_ids)
-        {
-            for (int item_num = 0; item_num < job_item->quantity; ++item_num)
-            {
-                tasks[vector_id][bucket].push(std::make_pair(id, job_item_idx));
-                debug("added task: %s/%s/%d,%d; "
-                      "%zu vector(s), %zu filter bucket(s), %zu task(s) in bucket",
-                      ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
-                      bucket.c_str(), id, job_item_idx, tasks.size(),
-                      tasks[vector_id].size(), tasks[vector_id][bucket].size());
-            }
-        }
-    }
-    return true;
-}
-
-PlannedBuilding * Planner::getPlannedBuilding(df::building *bld)
-{
-    if (!bld || planned_buildings.count(bld->id) == 0)
-        return NULL;
-    return &planned_buildings.at(bld->id);
-}
-
-bool Planner::isPlannableBuilding(BuildingTypeKey key)
-{
-    return getNumFilters(key) >= 1;
-}
-
-Planner::ItemFiltersWrapper Planner::getItemFilters(BuildingTypeKey key)
-{
-    static std::vector<ItemFilter> empty_vector;
-    static const ItemFiltersWrapper empty_ret(empty_vector);
-
-    size_t nfilters = getNumFilters(key);
-    if (nfilters < 1)
-        return empty_ret;
-    while (default_item_filters[key].size() < nfilters)
-        default_item_filters[key].push_back(ItemFilter());
-    return ItemFiltersWrapper(default_item_filters[key]);
-}
-
-// precompute a bitmask with bad item flags
-struct BadFlags
-{
-    uint32_t whole;
-
-    BadFlags()
-    {
-        df::item_flags flags;
-        #define F(x) flags.bits.x = true;
-        F(dump); F(forbid); F(garbage_collect);
-        F(hostile); F(on_fire); F(rotten); F(trader);
-        F(in_building); F(construction); F(in_job);
-        F(owned); F(in_chest); F(removed); F(encased);
-        #undef F
-        whole = flags.whole;
-    }
-};
-
-static bool itemPassesScreen(df::item * item)
-{
-    static BadFlags bad_flags;
-    return !(item->flags.whole & bad_flags.whole)
-        && !item->isAssignedToStockpile()
-        // TODO: make this configurable
-        && !(item->getType() == df::item_type::BOX && item->isBag());
-}
-
-static bool matchesFilters(df::item * item,
-                           df::job_item * job_item,
-                           const ItemFilter & item_filter)
-{
-    // check the properties that are not checked by Job::isSuitableItem()
-    if (job_item->item_type > -1 && job_item->item_type != item->getType())
-        return false;
-
-    if (job_item->item_subtype > -1 &&
-        job_item->item_subtype != item->getSubtype())
-        return false;
-
-    if (job_item->flags2.bits.building_material && !item->isBuildMat())
-        return false;
-
-    if (job_item->metal_ore > -1 && !item->isMetalOre(job_item->metal_ore))
-        return false;
-
-    if (job_item->has_tool_use > df::tool_uses::NONE
-        && !item->hasToolUse(job_item->has_tool_use))
-        return false;
-
-    return DFHack::Job::isSuitableItem(
-            job_item, item->getType(), item->getSubtype())
-        && DFHack::Job::isSuitableMaterial(
-            job_item, item->getMaterial(), item->getMaterialIndex(),
-            item->getType())
-        && item_filter.matches(item);
-}
-
-// note that this just removes the PlannedBuilding. the tasks will get dropped
-// as we discover them in the tasks queues and they fail their isValid() check.
-// this "lazy" task cleaning algorithm works because there is no way to
-// re-register a building once it has been removed -- if it fails isValid()
-// then it has either been built or desroyed. therefore there is no chance of
-// duplicate tasks getting added to the tasks queues.
-void Planner::unregisterBuilding(int32_t id)
-{
-    if (planned_buildings.count(id) > 0)
-    {
-        planned_buildings.at(id).remove();
-        planned_buildings.erase(id);
-    }
-}
-
-static bool isJobReady(df::job * job)
-{
-    int needed_items = 0;
-    for (auto job_item : job->job_items) { needed_items += job_item->quantity; }
-    if (needed_items)
-    {
-        debug("building needs %d more item(s)", needed_items);
-        return false;
-    }
-    return true;
-}
-
-static bool job_item_idx_lt(df::job_item_ref *a, df::job_item_ref *b)
-{
-    // we want the items in the opposite order of the filters
-    return a->job_item_idx > b->job_item_idx;
-}
-
-// this function does not remove the job_items since their quantity fields are
-// now all at 0, so there is no risk of having extra items attached. we don't
-// remove them to keep the "finalize with buildingplan active" path as similar
-// as possible to the "finalize with buildingplan disabled" path.
-static void finalizeBuilding(df::building * bld)
-{
-    debug("finalizing building %d", bld->id);
-    auto job = bld->jobs[0];
-
-    // sort the items so they get added to the structure in the correct order
-    std::sort(job->items.begin(), job->items.end(), job_item_idx_lt);
-
-    // derive the material properties of the building and job from the first
-    // applicable item, though if any boulders are involved, it makes the whole
-    // structure "rough".
-    bool rough = false;
-    for (auto attached_item : job->items)
-    {
-        df::item *item = attached_item->item;
-        rough = rough || item->getType() == item_type::BOULDER;
-        if (bld->mat_type == -1)
-        {
-            bld->mat_type = item->getMaterial();
-            job->mat_type = bld->mat_type;
-        }
-        if (bld->mat_index == -1)
-        {
-            bld->mat_index = item->getMaterialIndex();
-            job->mat_index = bld->mat_index;
-        }
-    }
-
-    if (bld->needsDesign())
-    {
-        auto act = (df::building_actual *)bld;
-        if (!act->design)
-            act->design = new df::building_design();
-        act->design->flags.bits.rough = rough;
-    }
-
-    // we're good to go!
-    job->flags.bits.suspend = false;
-    Job::checkBuildingsNow();
-}
-
-void Planner::popInvalidTasks(std::queue<std::pair<int32_t, int>> & task_queue)
-{
-    while (!task_queue.empty())
-    {
-        auto & task = task_queue.front();
-        auto id = task.first;
-        if (planned_buildings.count(id) > 0)
-        {
-            PlannedBuilding & pb = planned_buildings.at(id);
-            if (pb.isValid() &&
-                pb.getBuilding()->jobs[0]->job_items[task.second]->quantity)
-            {
-                break;
-            }
-        }
-        debug("discarding invalid task: bld=%d, job_item_idx=%d",
-              id, task.second);
-        task_queue.pop();
-        unregisterBuilding(id);
-    }
-}
-
-void Planner::doVector(df::job_item_vector_id vector_id,
-       std::map<std::string, std::queue<std::pair<int32_t, int>>> & buckets)
-{
-    auto other_id = ENUM_ATTR(job_item_vector_id, other, vector_id);
-    auto item_vector = df::global::world->items.other[other_id];
-    debug("matching %zu item(s) in vector %s against %zu filter bucket(s)",
-          item_vector.size(),
-          ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
-          buckets.size());
-    for (auto item_it = item_vector.rbegin();
-         item_it != item_vector.rend();
-         ++item_it)
-    {
-        auto item = *item_it;
-        if (!itemPassesScreen(item))
-            continue;
-        for (auto bucket_it = buckets.begin(); bucket_it != buckets.end();)
-        {
-            auto & task_queue = bucket_it->second;
-            popInvalidTasks(task_queue);
-            if (task_queue.empty())
-            {
-                debug("removing empty bucket: %s/%s; %zu bucket(s) left",
-                      ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
-                      bucket_it->first.c_str(),
-                      buckets.size() - 1);
-                bucket_it = buckets.erase(bucket_it);
-                continue;
-            }
-            auto & task = task_queue.front();
-            auto id = task.first;
-            auto & pb = planned_buildings.at(id);
-            auto building = pb.getBuilding();
-            auto job = building->jobs[0];
-            auto filter_idx = task.second;
-            if (matchesFilters(item, job->job_items[filter_idx],
-                    pb.getFilters()[filter_idx])
-               && DFHack::Job::attachJobItem(job, item,
-                        df::job_item_ref::Hauled, filter_idx))
-            {
-                MaterialInfo material;
-                material.decode(item);
-                ItemTypeInfo item_type;
-                item_type.decode(item);
-                debug("attached %s %s to filter %d for %s(%d): %s/%s",
-                      material.toString().c_str(),
-                      item_type.toString().c_str(),
-                      filter_idx,
-                      ENUM_KEY_STR(building_type, building->getType()).c_str(),
-                      id,
-                      ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
-                      bucket_it->first.c_str());
-                // keep quantity aligned with the actual number of remaining
-                // items so if buildingplan is turned off, the building will
-                // be completed with the correct number of items.
-                --job->job_items[filter_idx]->quantity;
-                task_queue.pop();
-                if (isJobReady(job))
-                {
-                    finalizeBuilding(building);
-                    unregisterBuilding(id);
-                }
-                if (task_queue.empty())
-                {
-                    debug(
-                        "removing empty item bucket: %s/%s; %zu left",
-                        ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
-                        bucket_it->first.c_str(),
-                        buckets.size() - 1);
-                    buckets.erase(bucket_it);
-                }
-                // we found a home for this item; no need to look further
-                break;
-            }
-            ++bucket_it;
-        }
-        if (buckets.empty())
-            break;
-    }
-}
-
-struct VectorsToScanLast
-{
-    std::vector<df::job_item_vector_id> vectors;
-    VectorsToScanLast()
-    {
-        // order is important here. we want to match boulders before wood and
-        // everything before bars. blocks are not listed here since we'll have
-        // already scanned them when we did the first pass through the buckets.
-        vectors.push_back(df::job_item_vector_id::BOULDER);
-        vectors.push_back(df::job_item_vector_id::WOOD);
-        vectors.push_back(df::job_item_vector_id::BAR);
-    }
-};
-
-void Planner::doCycle()
-{
-    debug("running cycle for %zu registered building(s)",
-          planned_buildings.size());
-    static const VectorsToScanLast vectors_to_scan_last;
-    for (auto it = tasks.begin(); it != tasks.end();)
-    {
-        auto vector_id = it->first;
-        // we could make this a set, but it's only three elements
-        if (std::find(vectors_to_scan_last.vectors.begin(),
-                      vectors_to_scan_last.vectors.end(),
-                      vector_id) != vectors_to_scan_last.vectors.end())
-        {
-            ++it;
-            continue;
-        }
-
-        auto & buckets = it->second;
-        doVector(vector_id, buckets);
-        if (buckets.empty())
-        {
-            debug("removing empty vector: %s; %zu vector(s) left",
-                  ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
-                  tasks.size() - 1);
-            it = tasks.erase(it);
-        }
-        else
-            ++it;
-    }
-    for (auto vector_id : vectors_to_scan_last.vectors)
-    {
-        if (tasks.count(vector_id) == 0)
-            continue;
-        auto & buckets = tasks[vector_id];
-        doVector(vector_id, buckets);
-        if (buckets.empty())
-        {
-            debug("removing empty vector: %s; %zu vector(s) left",
-                  ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
-                  tasks.size() - 1);
-            tasks.erase(vector_id);
-        }
-    }
-    debug("cycle done; %zu registered building(s) left",
-          planned_buildings.size());
-}
-
-Planner planner;
diff --git a/plugins/buildingplan/buildingplan-planner.h b/plugins/buildingplan/buildingplan-planner.h
deleted file mode 100644
index 7b1615704..000000000
--- a/plugins/buildingplan/buildingplan-planner.h
+++ /dev/null
@@ -1,140 +0,0 @@
-#pragma once
-
-#include <queue>
-#include <unordered_map>
-
-#include "df/building.h"
-#include "df/dfhack_material_category.h"
-#include "df/item_quality.h"
-#include "df/job_item.h"
-
-#include "modules/Materials.h"
-#include "modules/Persistence.h"
-
-class ItemFilter
-{
-public:
-    ItemFilter();
-
-    void clear();
-    bool deserialize(std::string ser);
-    std::string serialize() const;
-
-    void addMaterialMask(uint32_t mask);
-    void clearMaterialMask();
-    void setMaterials(std::vector<DFHack::MaterialInfo> materials);
-
-    void incMinQuality();
-    void decMinQuality();
-    void incMaxQuality();
-    void decMaxQuality();
-    void toggleDecoratedOnly();
-
-    uint32_t getMaterialMask() const;
-    std::vector<std::string> getMaterials() const;
-    std::string getMinQuality() const;
-    std::string getMaxQuality() const;
-    bool getDecoratedOnly() const;
-
-    bool matches(df::dfhack_material_category mask) const;
-    bool matches(DFHack::MaterialInfo &material) const;
-    bool matches(df::item *item) const;
-
-private:
-    // remove friend declaration when we no longer need v1 deserialization
-    friend void migrateV1ToV2();
-
-    df::dfhack_material_category mat_mask;
-    std::vector<DFHack::MaterialInfo> materials;
-    df::item_quality min_quality;
-    df::item_quality max_quality;
-    bool decorated_only;
-
-    bool deserializeMaterialMask(std::string ser);
-    bool deserializeMaterials(std::string ser);
-    void setMinQuality(int quality);
-    void setMaxQuality(int quality);
-    bool matchesMask(DFHack::MaterialInfo &mat) const;
-};
-
-class PlannedBuilding
-{
-public:
-    PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters);
-    PlannedBuilding(DFHack::PersistentDataItem &config);
-
-    bool isValid() const;
-    void remove();
-
-    df::building * getBuilding();
-    const std::vector<ItemFilter> & getFilters() const;
-
-private:
-    DFHack::PersistentDataItem config;
-    df::building *building;
-    const df::building::key_field_type building_id;
-    const std::vector<ItemFilter> filters;
-};
-
-// building type, subtype, custom
-typedef std::tuple<df::building_type, int16_t, int32_t> BuildingTypeKey;
-
-BuildingTypeKey toBuildingTypeKey(
-    df::building_type btype, int16_t subtype, int32_t custom);
-BuildingTypeKey toBuildingTypeKey(df::building *bld);
-BuildingTypeKey toBuildingTypeKey(df::ui_build_selector *uibs);
-
-struct BuildingTypeKeyHash
-{
-    std::size_t operator() (const BuildingTypeKey & key) const;
-};
-
-class Planner
-{
-public:
-    class ItemFiltersWrapper
-    {
-    public:
-        ItemFiltersWrapper(std::vector<ItemFilter> & item_filters)
-            : item_filters(item_filters) { }
-        std::vector<ItemFilter>::reverse_iterator rbegin() const { return item_filters.rbegin(); }
-        std::vector<ItemFilter>::reverse_iterator  rend() const { return item_filters.rend(); }
-        const std::vector<ItemFilter> & get() const { return item_filters; }
-    private:
-        std::vector<ItemFilter> &item_filters;
-    };
-
-    const std::map<std::string, bool> & getGlobalSettings() const;
-    bool setGlobalSetting(std::string name, bool value);
-
-    void reset();
-
-    void addPlannedBuilding(df::building *bld);
-    PlannedBuilding *getPlannedBuilding(df::building *bld);
-
-    bool isPlannableBuilding(BuildingTypeKey key);
-
-    // returns an empty vector if the type is not supported
-    ItemFiltersWrapper getItemFilters(BuildingTypeKey key);
-
-    void doCycle();
-
-private:
-    DFHack::PersistentDataItem config;
-    std::map<std::string, bool> global_settings;
-    std::unordered_map<BuildingTypeKey,
-                       std::vector<ItemFilter>,
-                       BuildingTypeKeyHash> default_item_filters;
-    // building id -> PlannedBuilding
-    std::unordered_map<int32_t, PlannedBuilding> planned_buildings;
-    // vector id -> filter bucket -> queue of (building id, job_item index)
-    std::map<df::job_item_vector_id, std::map<std::string, std::queue<std::pair<int32_t, int>>>> tasks;
-
-    bool registerTasks(PlannedBuilding &plannedBuilding);
-    void unregisterBuilding(int32_t id);
-    void popInvalidTasks(std::queue<std::pair<int32_t, int>> &task_queue);
-    void doVector(df::job_item_vector_id vector_id,
-        std::map<std::string, std::queue<std::pair<int32_t, int>>> & buckets);
-};
-
-extern Planner planner;
diff --git a/plugins/buildingplan/buildingplan-rooms.cpp b/plugins/buildingplan/buildingplan-rooms.cpp
deleted file mode 100644
index a08c85804..000000000
--- a/plugins/buildingplan/buildingplan-rooms.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "buildingplan.h"
-
-#include <df/entity_position.h>
-#include <df/job_type.h>
-#include <df/world.h>
-
-#include <modules/World.h>
-#include <modules/Units.h>
-#include <modules/Buildings.h>
-
-using namespace DFHack;
-
-bool canReserveRoom(df::building *building)
-{
-    if (!building)
-        return false;
-
-    if (building->jobs.size() > 0 && building->jobs[0]->job_type == df::job_type::DestroyBuilding)
-        return false;
-
-    return building->is_room;
-}
-
-std::vector<Units::NoblePosition> getUniqueNoblePositions(df::unit *unit)
-{
-    std::vector<Units::NoblePosition> np;
-    Units::getNoblePositions(&np, unit);
-    for (auto iter = np.begin(); iter != np.end(); iter++)
-    {
-        if (iter->position->code == "MILITIA_CAPTAIN")
-        {
-            np.erase(iter);
-            break;
-        }
-    }
-
-    return np;
-}
-
-/*
- * ReservedRoom
- */
-
-ReservedRoom::ReservedRoom(df::building *building, std::string noble_code)
-{
-    this->building = building;
-    config = DFHack::World::AddPersistentData("buildingplan/reservedroom");
-    config.val() = noble_code;
-    config.ival(1) = building->id;
-    pos = df::coord(building->centerx, building->centery, building->z);
-}
-
-ReservedRoom::ReservedRoom(PersistentDataItem &config, color_ostream &)
-{
-    this->config = config;
-
-    building = df::building::find(config.ival(1));
-    if (!building)
-        return;
-    pos = df::coord(building->centerx, building->centery, building->z);
-}
-
-bool ReservedRoom::checkRoomAssignment()
-{
-    if (!isValid())
-        return false;
-
-    auto np = getOwnersNobleCode();
-    bool correctOwner = false;
-    for (auto iter = np.begin(); iter != np.end(); iter++)
-    {
-        if (iter->position->code == getCode())
-        {
-            correctOwner = true;
-            break;
-        }
-    }
-
-    if (correctOwner)
-        return true;
-
-    for (auto iter = df::global::world->units.active.begin(); iter != df::global::world->units.active.end(); iter++)
-    {
-        df::unit* unit = *iter;
-        if (!Units::isCitizen(unit))
-            continue;
-
-        if (!Units::isActive(unit))
-            continue;
-
-        np = getUniqueNoblePositions(unit);
-        for (auto iter = np.begin(); iter != np.end(); iter++)
-        {
-            if (iter->position->code == getCode())
-            {
-                Buildings::setOwner(building, unit);
-                break;
-            }
-        }
-    }
-
-    return true;
-}
-
-void ReservedRoom::remove() { DFHack::World::DeletePersistentData(config); }
-
-bool ReservedRoom::isValid()
-{
-    if (!building)
-        return false;
-
-    if (Buildings::findAtTile(pos) != building)
-        return false;
-
-    return canReserveRoom(building);
-}
-
-int32_t ReservedRoom::getId()
-{
-    if (!isValid())
-        return 0;
-
-    return building->id;
-}
-
-std::string ReservedRoom::getCode() { return config.val(); }
-
-void ReservedRoom::setCode(const std::string &noble_code) { config.val() = noble_code; }
-
-std::vector<Units::NoblePosition> ReservedRoom::getOwnersNobleCode()
-{
-    if (!building->owner)
-        return std::vector<Units::NoblePosition> ();
-
-    return getUniqueNoblePositions(building->owner);
-}
-
-/*
- * RoomMonitor
- */
-
-std::string RoomMonitor::getReservedNobleCode(int32_t buildingId)
-{
-    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end(); iter++)
-    {
-        if (buildingId == iter->getId())
-            return iter->getCode();
-    }
-
-    return "";
-}
-
-void RoomMonitor::toggleRoomForPosition(int32_t buildingId, std::string noble_code)
-{
-    bool found = false;
-    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end(); iter++)
-    {
-        if (buildingId != iter->getId())
-        {
-            continue;
-        }
-        else
-        {
-            if (noble_code == iter->getCode())
-            {
-                iter->remove();
-                reservedRooms.erase(iter);
-            }
-            else
-            {
-                iter->setCode(noble_code);
-            }
-            found = true;
-            break;
-        }
-    }
-
-    if (!found)
-    {
-        ReservedRoom room(df::building::find(buildingId), noble_code);
-        reservedRooms.push_back(room);
-    }
-}
-
-void RoomMonitor::doCycle()
-{
-    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end();)
-    {
-        if (iter->checkRoomAssignment())
-        {
-            ++iter;
-        }
-        else
-        {
-            iter->remove();
-            iter = reservedRooms.erase(iter);
-        }
-    }
-}
-
-void RoomMonitor::reset(color_ostream &out)
-{
-    reservedRooms.clear();
-    std::vector<PersistentDataItem> items;
-    DFHack::World::GetPersistentData(&items, "buildingplan/reservedroom");
-
-    for (auto i = items.begin(); i != items.end(); i++)
-    {
-        ReservedRoom rr(*i, out);
-        if (rr.isValid())
-            addRoom(rr);
-    }
-}
-
-void RoomMonitor::addRoom(ReservedRoom &rr)
-{
-    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end(); iter++)
-    {
-        if (iter->getId() == rr.getId())
-            return;
-    }
-
-    reservedRooms.push_back(rr);
-}
-
-RoomMonitor roomMonitor;
diff --git a/plugins/buildingplan/buildingplan-rooms.h b/plugins/buildingplan/buildingplan-rooms.h
deleted file mode 100644
index 3880dbe06..000000000
--- a/plugins/buildingplan/buildingplan-rooms.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include "modules/Persistence.h"
-#include "modules/Units.h"
-
-class ReservedRoom
-{
-public:
-    ReservedRoom(df::building *building, std::string noble_code);
-
-    ReservedRoom(DFHack::PersistentDataItem &config, DFHack::color_ostream &out);
-
-    bool checkRoomAssignment();
-    void remove();
-    bool isValid();
-
-    int32_t getId();
-    std::string getCode();
-    void setCode(const std::string &noble_code);
-
-private:
-    df::building *building;
-    DFHack::PersistentDataItem config;
-    df::coord pos;
-
-    std::vector<DFHack::Units::NoblePosition> getOwnersNobleCode();
-};
-
-class RoomMonitor
-{
-public:
-    RoomMonitor() { }
-
-    std::string getReservedNobleCode(int32_t buildingId);
-
-    void toggleRoomForPosition(int32_t buildingId, std::string noble_code);
-
-    void doCycle();
-
-    void reset(DFHack::color_ostream &out);
-
-private:
-    std::vector<ReservedRoom> reservedRooms;
-
-    void addRoom(ReservedRoom &rr);
-};
-
-bool canReserveRoom(df::building *building);
-std::vector<DFHack::Units::NoblePosition> getUniqueNoblePositions(df::unit *unit);
-
-extern RoomMonitor roomMonitor;
diff --git a/plugins/buildingplan/buildingplan.cpp b/plugins/buildingplan/buildingplan.cpp
index e0bc6dd69..7a1416855 100644
--- a/plugins/buildingplan/buildingplan.cpp
+++ b/plugins/buildingplan/buildingplan.cpp
@@ -1,1168 +1,1268 @@
-#include "df/construction_type.h"
-#include "df/entity_position.h"
-#include "df/interface_key.h"
-#include "df/ui_build_selector.h"
-#include "df/viewscreen_dwarfmodest.h"
-
-#include "modules/Gui.h"
-#include "modules/Maps.h"
-#include "modules/World.h"
+#include "buildingplan.h"
+#include "buildingtypekey.h"
+#include "defaultitemfilters.h"
+#include "plannedbuilding.h"
 
-#include "Core.h"
+#include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
 
-#include "../uicommon.h"
-#include "../listcolumn.h"
-#include "buildingplan.h"
+#include "modules/World.h"
 
-DFHACK_PLUGIN("buildingplan");
-#define PLUGIN_VERSION "2.0"
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(ui_build_selector);
-REQUIRE_GLOBAL(world); // used in buildingplan library
+#include "df/construction_type.h"
+#include "df/item.h"
+#include "df/job_item.h"
+#include "df/organic_mat_category.h"
+#include "df/world.h"
 
-#define MAX_MASK 10
-#define MAX_MATERIAL 21
+using std::map;
+using std::set;
+using std::string;
+using std::unordered_map;
+using std::vector;
 
-bool show_help = false;
-bool quickfort_mode = false;
-bool all_enabled = false;
-bool in_dummy_screen = false;
-std::unordered_map<BuildingTypeKey, bool, BuildingTypeKeyHash> planmode_enabled;
+using namespace DFHack;
 
-bool show_debugging = false;
+DFHACK_PLUGIN("buildingplan");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
-void debug(const char *fmt, ...)
-{
-    if (!show_debugging)
-        return;
+REQUIRE_GLOBAL(world);
 
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    out.print("DEBUG(buildingplan): ");
-    va_list args;
-    va_start(args, fmt);
-    out.vprint(fmt, args);
-    va_end(args);
-    out.print("\n");
+namespace DFHack {
+    DBG_DECLARE(buildingplan, status, DebugCategory::LINFO);
+    DBG_DECLARE(buildingplan, cycle, DebugCategory::LINFO);
 }
 
-class ViewscreenChooseMaterial : public dfhack_viewscreen
-{
-public:
-    ViewscreenChooseMaterial(ItemFilter &filter);
-
-    void feed(set<df::interface_key> *input);
-
-    void render();
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+const string FILTER_CONFIG_KEY = string(plugin_name) + "/filter";
+const string BLD_CONFIG_KEY = string(plugin_name) + "/building";
 
-    std::string getFocusString() { return "buildingplan_choosemat"; }
-
-private:
-    ListColumn<df::dfhack_material_category> masks_column;
-    ListColumn<MaterialInfo> materials_column;
-    int selected_column;
-    ItemFilter &filter;
-
-    void addMaskEntry(df::dfhack_material_category &mask, const std::string &text)
-    {
-        auto entry = ListEntry<df::dfhack_material_category>(pad_string(text, MAX_MASK, false), mask);
-        if (filter.matches(mask))
-            entry.selected = true;
-
-        masks_column.add(entry);
-    }
-
-    void populateMasks()
-    {
-        masks_column.clear();
-        df::dfhack_material_category mask;
+int get_config_val(PersistentDataItem &c, int index) {
+    if (!c.isValid())
+        return -1;
+    return c.ival(index);
+}
+bool get_config_bool(PersistentDataItem &c, int index) {
+    return get_config_val(c, index) == 1;
+}
+void set_config_val(PersistentDataItem &c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
+}
+void set_config_bool(PersistentDataItem &c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
+}
 
-        mask.whole = 0;
-        mask.bits.stone = true;
-        addMaskEntry(mask, "Stone");
+static PersistentDataItem config;
+// for use in counting available materials for the UI
+static map<string, std::pair<MaterialInfo, string>> mat_cache;
+static unordered_map<BuildingTypeKey, vector<const df::job_item *>, BuildingTypeKeyHash> job_item_cache;
+static unordered_map<BuildingTypeKey, HeatSafety, BuildingTypeKeyHash> cur_heat_safety;
+static unordered_map<BuildingTypeKey, DefaultItemFilters, BuildingTypeKeyHash> cur_item_filters;
+// building id -> PlannedBuilding
+static unordered_map<int32_t, PlannedBuilding> planned_buildings;
+// vector id -> filter bucket -> queue of (building id, job_item index)
+static Tasks tasks;
+
+// note that this just removes the PlannedBuilding. the tasks will get dropped
+// as we discover them in the tasks queues and they fail to be found in planned_buildings.
+// this "lazy" task cleaning algorithm works because there is no way to
+// re-register a building once it has been removed -- if it has been booted out of
+// planned_buildings, then it has either been built or desroyed. therefore there is
+// no chance of duplicate tasks getting added to the tasks queues.
+void PlannedBuilding::remove(color_ostream &out) {
+    DEBUG(status,out).print("removing persistent data for building %d\n", id);
+    World::DeletePersistentData(bld_config);
+    if (planned_buildings.count(id))
+        planned_buildings.erase(id);
+}
 
-        mask.whole = 0;
-        mask.bits.wood = true;
-        addMaskEntry(mask, "Wood");
+static const int32_t CYCLE_TICKS = 600; // twice per game day
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
 
-        mask.whole = 0;
-        mask.bits.metal = true;
-        addMaskEntry(mask, "Metal");
+static bool call_buildingplan_lua(color_ostream *out, const char *fn_name,
+        int nargs = 0, int nres = 0,
+        Lua::LuaLambda && args_lambda = Lua::DEFAULT_LUA_LAMBDA,
+        Lua::LuaLambda && res_lambda = Lua::DEFAULT_LUA_LAMBDA) {
+    DEBUG(status).print("calling buildingplan lua function: '%s'\n", fn_name);
 
-        mask.whole = 0;
-        mask.bits.soap = true;
-        addMaskEntry(mask, "Soap");
+    CoreSuspender guard;
 
-        masks_column.filterDisplay();
-    }
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
 
-    void populateMaterials()
-    {
-        materials_column.clear();
-        df::dfhack_material_category selected_category;
-        std::vector<df::dfhack_material_category> selected_masks = masks_column.getSelectedElems();
-        if (selected_masks.size() == 1)
-            selected_category = selected_masks[0];
-        else if (selected_masks.size() > 1)
-            return;
-
-        df::world_raws &raws = world->raws;
-        for (int i = 1; i < DFHack::MaterialInfo::NUM_BUILTIN; i++)
-        {
-            auto obj = raws.mat_table.builtin[i];
-            if (obj)
-            {
-                MaterialInfo material;
-                material.decode(i, -1);
-                addMaterialEntry(selected_category, material, material.toString());
-            }
-        }
+    if (!out)
+        out = &Core::getInstance().getConsole();
 
-        for (size_t i = 0; i < raws.inorganics.size(); i++)
-        {
-            MaterialInfo material;
-            material.decode(0, i);
-            addMaterialEntry(selected_category, material, material.toString());
-        }
+    return Lua::CallLuaModuleFunction(*out, L, "plugins.buildingplan", fn_name,
+            nargs, nres,
+            std::forward<Lua::LuaLambda&&>(args_lambda),
+            std::forward<Lua::LuaLambda&&>(res_lambda));
+}
 
-        decltype(selected_category) wood_flag;
-        wood_flag.bits.wood = true;
-        if (!selected_category.whole || selected_category.bits.wood)
-        {
-            for (size_t i = 0; i < raws.plants.all.size(); i++)
-            {
-                df::plant_raw *p = raws.plants.all[i];
-                for (size_t j = 0; p->material.size() > 1 && j < p->material.size(); j++)
-                {
-                    if (p->material[j]->id != "WOOD")
-                        continue;
-
-                    MaterialInfo material;
-                    material.decode(DFHack::MaterialInfo::PLANT_BASE+j, i);
-                    auto name = material.toString();
-                    ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
-                    if (filter.matches(material))
-                        entry.selected = true;
-
-                    materials_column.add(entry);
-                }
-            }
-        }
-        materials_column.sort();
+static int get_num_filters(color_ostream &out, BuildingTypeKey key) {
+    int num_filters = 0;
+    if (!call_buildingplan_lua(&out, "get_num_filters", 3, 1,
+            [&](lua_State *L) {
+                Lua::Push(L, std::get<0>(key));
+                Lua::Push(L, std::get<1>(key));
+                Lua::Push(L, std::get<2>(key));
+            },
+            [&](lua_State *L) {
+                num_filters = lua_tonumber(L, -1);
+            })) {
+        return 0;
     }
+    return num_filters;
+}
 
-    void addMaterialEntry(df::dfhack_material_category &selected_category,
-                          MaterialInfo &material, std::string name)
-    {
-        if (!selected_category.whole || material.matches(selected_category))
-        {
-            ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
-            if (filter.matches(material))
-                entry.selected = true;
-
-            materials_column.add(entry);
+static const vector<const df::job_item *> & get_job_items(color_ostream &out, BuildingTypeKey key) {
+    if (job_item_cache.count(key))
+        return job_item_cache[key];
+    const int num_filters = get_num_filters(out, key);
+    auto &jitems = job_item_cache[key];
+    for (int index = 0; index < num_filters; ++index) {
+        bool failed = false;
+        if (!call_buildingplan_lua(&out, "get_job_item", 4, 1,
+                [&](lua_State *L) {
+                    Lua::Push(L, std::get<0>(key));
+                    Lua::Push(L, std::get<1>(key));
+                    Lua::Push(L, std::get<2>(key));
+                    Lua::Push(L, index+1);
+                },
+                [&](lua_State *L) {
+                    df::job_item *jitem = Lua::GetDFObject<df::job_item>(L, -1);
+                    DEBUG(status,out).print("retrieving job_item for (%d, %d, %d) index=%d: 0x%p\n",
+                            std::get<0>(key), std::get<1>(key), std::get<2>(key), index, jitem);
+                    if (!jitem)
+                        failed = true;
+                    else
+                        jitems.emplace_back(jitem);
+                }) || failed) {
+            jitems.clear();
+            break;
         }
     }
-
-    void validateColumn()
-    {
-        set_to_limit(selected_column, 1);
-    }
-
-    void resize(int32_t x, int32_t y)
-    {
-        dfhack_viewscreen::resize(x, y);
-        masks_column.resize();
-        materials_column.resize();
-    }
-};
-
-const DFHack::MaterialInfo &material_info_identity_fn(const DFHack::MaterialInfo &m) { return m; }
-
-ViewscreenChooseMaterial::ViewscreenChooseMaterial(ItemFilter &filter)
-    : filter(filter)
-{
-    selected_column = 0;
-    masks_column.setTitle("Type");
-    masks_column.multiselect = true;
-    masks_column.allow_search = false;
-    masks_column.left_margin = 2;
-    materials_column.left_margin = MAX_MASK + 3;
-    materials_column.setTitle("Material");
-    materials_column.multiselect = true;
-
-    masks_column.changeHighlight(0);
-
-    populateMasks();
-    populateMaterials();
-
-    masks_column.selectDefaultEntry();
-    materials_column.selectDefaultEntry();
-    materials_column.changeHighlight(0);
+    return jitems;
 }
 
-void ViewscreenChooseMaterial::feed(set<df::interface_key> *input)
-{
-    bool key_processed = false;
-    switch (selected_column)
-    {
-    case 0:
-        key_processed = masks_column.feed(input);
-        if (input->count(interface_key::SELECT))
-            populateMaterials(); // Redo materials lists based on category selection
-        break;
-    case 1:
-        key_processed = materials_column.feed(input);
-        break;
-    }
-
-    if (key_processed)
-        return;
-
-    if (input->count(interface_key::LEAVESCREEN))
-    {
-        input->clear();
-        Screen::dismiss(this);
-        return;
-    }
-    if (input->count(interface_key::CUSTOM_SHIFT_C))
-    {
-        filter.clear();
-        masks_column.clearSelection();
-        materials_column.clearSelection();
-        populateMaterials();
-    }
-    else if (input->count(interface_key::SEC_SELECT))
-    {
-        // Convert list selections to material filters
-        filter.clearMaterialMask();
-
-        // Category masks
-        auto masks = masks_column.getSelectedElems();
-        for (auto it = masks.begin(); it != masks.end(); ++it)
-            filter.addMaterialMask(it->whole);
-
-        // Specific materials
-        auto materials = materials_column.getSelectedElems();
-        std::vector<DFHack::MaterialInfo> materialInfos;
-        transform_(materials, materialInfos, material_info_identity_fn);
-        filter.setMaterials(materialInfos);
-
-        Screen::dismiss(this);
-    }
-    else if (input->count(interface_key::STANDARDSCROLL_LEFT))
-    {
-        --selected_column;
-        validateColumn();
-    }
-    else if (input->count(interface_key::STANDARDSCROLL_RIGHT))
-    {
-        selected_column++;
-        validateColumn();
+static const df::dfhack_material_category stone_cat(df::dfhack_material_category::mask_stone);
+static const df::dfhack_material_category wood_cat(df::dfhack_material_category::mask_wood);
+static const df::dfhack_material_category metal_cat(df::dfhack_material_category::mask_metal);
+static const df::dfhack_material_category glass_cat(df::dfhack_material_category::mask_glass);
+static const df::dfhack_material_category gem_cat(df::dfhack_material_category::mask_gem);
+static const df::dfhack_material_category clay_cat(df::dfhack_material_category::mask_clay);
+static const df::dfhack_material_category cloth_cat(df::dfhack_material_category::mask_cloth);
+static const df::dfhack_material_category silk_cat(df::dfhack_material_category::mask_silk);
+static const df::dfhack_material_category yarn_cat(df::dfhack_material_category::mask_yarn);
+
+static void cache_matched(int16_t type, int32_t index) {
+    MaterialInfo mi;
+    mi.decode(type, index);
+    if (mi.matches(stone_cat)) {
+        DEBUG(status).print("cached stone material: %s (%d, %d)\n", mi.toString().c_str(), type, index);
+        mat_cache.emplace(mi.toString(), std::make_pair(mi, "stone"));
+    } else if (mi.matches(wood_cat)) {
+        DEBUG(status).print("cached wood material: %s (%d, %d)\n", mi.toString().c_str(), type, index);
+        mat_cache.emplace(mi.toString(), std::make_pair(mi, "wood"));
+    } else if (mi.matches(metal_cat)) {
+        DEBUG(status).print("cached metal material: %s (%d, %d)\n", mi.toString().c_str(), type, index);
+        mat_cache.emplace(mi.toString(), std::make_pair(mi, "metal"));
+    } else if (mi.matches(glass_cat)) {
+        DEBUG(status).print("cached glass material: %s (%d, %d)\n", mi.toString().c_str(), type, index);
+        mat_cache.emplace(mi.toString(), std::make_pair(mi, "glass"));
+    } else if (mi.matches(gem_cat)) {
+        DEBUG(status).print("cached gem material: %s (%d, %d)\n", mi.toString().c_str(), type, index);
+        mat_cache.emplace(mi.toString(), std::make_pair(mi, "gem"));
+    } else if (mi.matches(clay_cat)) {
+        DEBUG(status).print("cached clay material: %s (%d, %d)\n", mi.toString().c_str(), type, index);
+        mat_cache.emplace(mi.toString(), std::make_pair(mi, "clay"));
+    } else if (mi.matches(cloth_cat)) {
+        DEBUG(status).print("cached cloth material: %s (%d, %d)\n", mi.toString().c_str(), type, index);
+        mat_cache.emplace(mi.toString(), std::make_pair(mi, "cloth"));
+    } else if (mi.matches(silk_cat)) {
+        DEBUG(status).print("cached silk material: %s (%d, %d)\n", mi.toString().c_str(), type, index);
+        mat_cache.emplace(mi.toString(), std::make_pair(mi, "silk"));
+    } else if (mi.matches(yarn_cat)) {
+        DEBUG(status).print("cached yarn material: %s (%d, %d)\n", mi.toString().c_str(), type, index);
+        mat_cache.emplace(mi.toString(), std::make_pair(mi, "yarn"));
     }
-    else if (enabler->tracking_on && enabler->mouse_lbut)
-    {
-        if (masks_column.setHighlightByMouse())
-            selected_column = 0;
-        else if (materials_column.setHighlightByMouse())
-            selected_column = 1;
+    else
+        TRACE(status).print("not matched: %s\n", mi.toString().c_str());
+}
 
-        enabler->mouse_lbut = enabler->mouse_rbut = 0;
+static void load_organic_material_cache(df::organic_mat_category cat) {
+    auto& mat_tab = world->raws.mat_table;
+    auto& cat_vec = mat_tab.organic_types[cat];
+    auto& cat_indices = mat_tab.organic_indexes[cat];
+    for (size_t i = 0; i < cat_vec.size(); i++) {
+        cache_matched(cat_vec[i], cat_indices[i]);
     }
 }
 
-void ViewscreenChooseMaterial::render()
-{
-    if (Screen::isDismissed(this))
-        return;
-
-    dfhack_viewscreen::render();
+static void load_material_cache() {
+    df::world_raws &raws = world->raws;
+    for (int i = 1; i < DFHack::MaterialInfo::NUM_BUILTIN; ++i)
+        if (raws.mat_table.builtin[i])
+            cache_matched(i, -1);
 
-    Screen::clear();
-    Screen::drawBorder("  Building Material  ");
+    for (size_t i = 0; i < raws.inorganics.size(); i++)
+        cache_matched(0, i);
 
-    masks_column.display(selected_column == 0);
-    materials_column.display(selected_column == 1);
+    load_organic_material_cache(df::organic_mat_category::Wood);
+    load_organic_material_cache(df::organic_mat_category::PlantFiber);
+    load_organic_material_cache(df::organic_mat_category::Silk);
+    load_organic_material_cache(df::organic_mat_category::Yarn);
+}
 
-    int32_t y = gps->dimy - 3;
-    int32_t x = 2;
-    OutputHotkeyString(x, y, "Toggle", interface_key::SELECT);
-    x += 3;
-    OutputHotkeyString(x, y, "Save", interface_key::SEC_SELECT);
-    x += 3;
-    OutputHotkeyString(x, y, "Clear", interface_key::CUSTOM_SHIFT_C);
-    x += 3;
-    OutputHotkeyString(x, y, "Cancel", interface_key::LEAVESCREEN);
+static HeatSafety get_heat_safety_filter(const BuildingTypeKey &key) {
+    if (cur_heat_safety.count(key))
+        return cur_heat_safety.at(key);
+    return HEAT_SAFETY_ANY;
 }
 
-//START Viewscreen Hook
-static bool is_planmode_enabled(BuildingTypeKey key)
-{
-    return planmode_enabled[key] || quickfort_mode || all_enabled;
+static DefaultItemFilters & get_item_filters(color_ostream &out, const BuildingTypeKey &key) {
+    if (cur_item_filters.count(key))
+        return cur_item_filters.at(key);
+    cur_item_filters.emplace(key, DefaultItemFilters(out, key, get_job_items(out, key)));
+    return cur_item_filters.at(key);
 }
 
-static std::string get_item_label(const BuildingTypeKey &key, int item_idx)
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    Lua::StackUnwinder top(L);
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+void buildingplan_cycle(color_ostream &out, Tasks &tasks,
+        unordered_map<int32_t, PlannedBuilding> &planned_buildings, bool unsuspend_on_finalize);
 
-    if (!lua_checkstack(L, 5) ||
-        !Lua::PushModulePublic(
-            out, L, "plugins.buildingplan", "get_item_label"))
-        return "Failed push";
+static bool registerPlannedBuilding(color_ostream &out, PlannedBuilding & pb, bool unsuspend_on_finalize);
 
-    Lua::Push(L, std::get<0>(key));
-    Lua::Push(L, std::get<1>(key));
-    Lua::Push(L, std::get<2>(key));
-    Lua::Push(L, item_idx);
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    DEBUG(status,out).print("initializing %s\n", plugin_name);
 
-    if (!Lua::SafeCall(out, L, 4, 1))
-        return "Failed call";
+    // provide a configuration interface for the plugin
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Plan building placement before you have materials.",
+        do_command));
 
-    const char *s = lua_tostring(L, -1);
-    if (!s)
-        return "No string";
+    return CR_OK;
+}
 
-    return s;
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(status,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+    } else {
+        DEBUG(status,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
+    }
+    return CR_OK;
 }
 
-static bool item_can_be_improved(const BuildingTypeKey &key, int item_idx)
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    Lua::StackUnwinder top(L);
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(status,out).print("shutting down %s\n", plugin_name);
 
-    if (!lua_checkstack(L, 5) ||
-        !Lua::PushModulePublic(
-            out, L, "plugins.buildingplan", "item_can_be_improved"))
-        return false;
+    return CR_OK;
+}
 
-    Lua::Push(L, std::get<0>(key));
-    Lua::Push(L, std::get<1>(key));
-    Lua::Push(L, std::get<2>(key));
-    Lua::Push(L, item_idx);
+static void validate_config(color_ostream &out, bool verbose = false) {
+    if (get_config_bool(config, CONFIG_BLOCKS)
+            || get_config_bool(config, CONFIG_BOULDERS)
+            || get_config_bool(config, CONFIG_LOGS)
+            || get_config_bool(config, CONFIG_BARS))
+        return;
 
-    if (!Lua::SafeCall(out, L, 4, 1))
-        return false;
+    if (verbose)
+        out.printerr("all contruction materials disabled; resetting config\n");
 
-    return lua_toboolean(L, -1);
+    set_config_bool(config, CONFIG_BLOCKS, true);
+    set_config_bool(config, CONFIG_BOULDERS, true);
+    set_config_bool(config, CONFIG_LOGS, true);
+    set_config_bool(config, CONFIG_BARS, false);
 }
 
-static bool construct_planned_building()
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-
-    CoreSuspendClaimer suspend;
-    Lua::StackUnwinder top(L);
+static void reset_filters(color_ostream &out) {
+    cur_heat_safety.clear();
+    cur_item_filters.clear();
+    call_buildingplan_lua(&out, "signal_reset");
+}
 
-    if (!(lua_checkstack(L, 1) &&
-          Lua::PushModulePublic(out, L, "plugins.buildingplan",
-                                "construct_buildings_from_ui_state") &&
-          Lua::SafeCall(out, L, 0, 1)))
-    {
-        return false;
+static void clear_state(color_ostream &out) {
+    planned_buildings.clear();
+    tasks.clear();
+    for (auto &entry : job_item_cache ) {
+        for (auto &jitem : entry.second) {
+            delete jitem;
+        }
     }
+    job_item_cache.clear();
+    mat_cache.clear();
+    reset_filters(out);
+    call_buildingplan_lua(&out, "reload_pens");
+}
 
-    // register all returned buildings with planner
-    lua_pushnil(L);
-    while (lua_next(L, -2) != 0)
-    {
-        auto bld = Lua::GetDFObject<df::building>(L, -1);
-        if (!bld)
-        {
-            out.printerr(
-                "buildingplan: construct_buildings_from_ui_state() failed\n");
-            return false;
-        }
+static int16_t get_subtype(df::building *bld) {
+    if (!bld)
+        return -1;
 
-        planner.addPlannedBuilding(bld);
-        lua_pop(L, 1);
-    }
+    int16_t subtype = bld->getSubtype();
+    if (bld->getType() == df::building_type::Construction &&
+            subtype >= df::construction_type::UpStair &&
+            subtype <= df::construction_type::UpDownStair)
+        subtype = df::construction_type::UpDownStair;
+    return subtype;
+}
 
-    return true;
+static bool is_suspendmanager_enabled(color_ostream &out) {
+    bool suspendmanager_enabled = false;
+    call_buildingplan_lua(&out, "is_suspendmanager_enabled", 0, 1,
+            Lua::DEFAULT_LUA_LAMBDA,
+            [&](lua_State *L){
+                suspendmanager_enabled = lua_toboolean(L, -1);
+            });
+    return suspendmanager_enabled;
 }
 
-static void show_global_settings_dialog()
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    Lua::StackUnwinder top(L);
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
+    config = World::GetPersistentData(CONFIG_KEY);
 
-    if (!lua_checkstack(L, 2) ||
-        !Lua::PushModulePublic(
-            out, L, "plugins.buildingplan", "show_global_settings_dialog"))
-    {
-        debug("Failed to push the module");
-        return;
+    if (!config.isValid()) {
+        DEBUG(status,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
     }
+    validate_config(out);
 
-    lua_newtable(L);
-    int ctable = lua_gettop(L);
-    Lua::SetField(L, quickfort_mode, ctable, "quickfort_mode");
-    Lua::SetField(L, all_enabled, ctable, "all_enabled");
+    DEBUG(status,out).print("loading persisted state\n");
+    clear_state(out);
 
-    for (auto & setting : planner.getGlobalSettings())
-    {
-        Lua::SetField(L, setting.second, ctable, setting.first.c_str());
-    }
+    load_material_cache();
 
-    if (!Lua::SafeCall(out, L, 1, 0))
-    {
-        debug("Failed call to show_global_settings_dialog");
-        return;
+    vector<PersistentDataItem> filter_configs;
+    World::GetPersistentData(&filter_configs, FILTER_CONFIG_KEY);
+    for (auto &cfg : filter_configs) {
+        BuildingTypeKey key = DefaultItemFilters::getKey(cfg);
+        cur_item_filters.emplace(key, DefaultItemFilters(out, cfg, get_job_items(out, key)));
     }
-}
-
-static bool is_automaterial_enabled()
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    Lua::StackUnwinder top(L);
 
-    if (!(lua_checkstack(L, 1) &&
-          Lua::PushModulePublic(out, L, "plugins.automaterial", "isEnabled") &&
-          Lua::SafeCall(out, L, 0, 1)))
-    {
-        return false;
+    vector<PersistentDataItem> building_configs;
+    World::GetPersistentData(&building_configs, BLD_CONFIG_KEY);
+    const size_t num_building_configs = building_configs.size();
+    bool unsuspend_on_finalize = !is_suspendmanager_enabled(out);
+    for (size_t idx = 0; idx < num_building_configs; ++idx) {
+        PlannedBuilding pb(out, building_configs[idx]);
+        df::building *bld = df::building::find(pb.id);
+        if (!bld) {
+            DEBUG(status,out).print("building %d no longer exists; skipping\n", pb.id);
+            pb.remove(out);
+            continue;
+        }
+        BuildingTypeKey key(bld->getType(), get_subtype(bld), bld->getCustomType());
+        if (pb.item_filters.size() != get_item_filters(out, key).getItemFilters().size()) {
+            WARN(status).print("loaded state for building %d doesn't match world\n", pb.id);
+            pb.remove(out);
+            continue;
+        }
+        registerPlannedBuilding(out, pb, unsuspend_on_finalize);
     }
 
-    return lua_toboolean(L, -1);
+    return CR_OK;
 }
 
-static bool is_automaterial_managed(df::building_type type, int16_t subtype)
-{
-    return is_automaterial_enabled()
-        && type == df::building_type::Construction
-        && subtype < df::construction_type::TrackN;
+static bool cycle_requested = false;
+
+static void do_cycle(color_ostream &out) {
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
+    cycle_requested = false;
+
+    bool unsuspend_on_finalize = !is_suspendmanager_enabled(out);
+    buildingplan_cycle(out, tasks, planned_buildings, unsuspend_on_finalize);
+    call_buildingplan_lua(&out, "signal_reset");
 }
 
-struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
-{
-    typedef df::viewscreen_dwarfmodest interpose_base;
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (!Core::getInstance().isWorldLoaded())
+        return CR_OK;
 
-    // no non-static fields allowed (according to VTableInterpose.h)
-    static df::building *bld;
-    static PlannedBuilding *pb;
-    static int filter_count;
-    static int filter_idx;
+    if (is_enabled &&
+            (cycle_requested || world->frame_counter - cycle_timestamp >= CYCLE_TICKS))
+        do_cycle(out);
+    return CR_OK;
+}
 
-    // logic is reversed since we're starting at the last filter
-    bool hasNextFilter() const { return filter_idx > 0; }
-    bool hasPrevFilter() const { return filter_idx + 1 < filter_count; }
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
 
-    bool isInPlannedBuildingQueryMode()
-    {
-        return (ui->main.mode == df::ui_sidebar_mode::QueryBuilding ||
-            ui->main.mode == df::ui_sidebar_mode::BuildingItems) &&
-            planner.getPlannedBuilding(world->selected_building);
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot configure %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
     }
 
-    // reinit static fields when selected building changes
-    void initStatics()
-    {
-        df::building *cur_bld = world->selected_building;
-        if (bld != cur_bld)
-        {
-            bld = cur_bld;
-            pb = planner.getPlannedBuilding(bld);
-            filter_count = pb->getFilters().size();
-            filter_idx = filter_count - 1;
-        }
+    bool show_help = false;
+    if (!call_buildingplan_lua(&out, "parse_commandline", parameters.size(), 1,
+            [&](lua_State *L) {
+                for (const string &param : parameters)
+                    Lua::Push(L, param);
+            },
+            [&](lua_State *L) {
+                show_help = !lua_toboolean(L, -1);
+            })) {
+        return CR_FAILURE;
     }
 
-    static void invalidateStatics()
-    {
-        bld = NULL;
-    }
+    return show_help ? CR_WRONG_USAGE : CR_OK;
+}
 
-    bool handleInput(set<df::interface_key> *input)
-    {
-        if (!isInPlannedBuildingQueryMode() || Gui::inRenameBuilding())
-            return false;
-
-        initStatics();
-
-        if (input->count(interface_key::SUSPENDBUILDING))
-            return true; // Don't unsuspend planned buildings
-        if (input->count(interface_key::DESTROYBUILDING))
-        {
-            // remove persistent data
-            pb->remove();
-            // still allow the building to be removed
-            return false;
-        }
+/////////////////////////////////////////////////////
+// Lua API
+// core will already be suspended when coming in through here
+//
+
+static string getBucket(const df::job_item & ji, const PlannedBuilding & pb, int idx) {
+    if (idx < 0 || (size_t)idx >= pb.item_filters.size())
+        return "INVALID";
+
+    std::ostringstream ser;
+
+    // put elements in front that significantly affect the difficulty of matching
+    // the filter. ensure the lexicographically "less" value is the pickier value.
+    const ItemFilter & item_filter = pb.item_filters[idx];
+
+    if (item_filter.getDecoratedOnly())
+        ser << "Da";
+    else
+        ser << "Db";
+
+    if (ji.flags2.bits.magma_safe || pb.heat_safety == HEAT_SAFETY_MAGMA)
+        ser << "Ha";
+    else if (ji.flags2.bits.fire_safe || pb.heat_safety == HEAT_SAFETY_FIRE)
+        ser << "Hb";
+    else
+        ser << "Hc";
+
+    size_t num_materials = item_filter.getMaterials().size();
+    if (num_materials == 0 || num_materials >= 9 || !item_filter.getMaterialMask().whole)
+        ser << "M9";
+    else
+        ser << "M" << num_materials;
+
+    // pull out and serialize only known relevant fields. if we miss a few, then
+    // the filter bucket will be slighly less specific than it could be, but
+    // that's probably ok. we'll just end up bucketing slightly different items
+    // together. this is only a problem if the different filter at the front of
+    // the queue doesn't match any available items and blocks filters behind it
+    // that could be matched.
+    ser << ji.item_type << ':' << ji.item_subtype << ':' << ji.mat_type << ':'
+        << ji.mat_index << ':' << ji.flags1.whole << ':' << ji.flags2.whole
+        << ':' << ji.flags3.whole << ':' << ji.flags4 << ':' << ji.flags5 << ':'
+        << ji.metal_ore << ':' << ji.has_tool_use;
+
+    ser << ':' << item_filter.serialize();
+
+    for (auto &special : pb.specials)
+        ser << ':' << special;
+
+    return ser.str();
+}
 
-        // ctrl+Right
-        if (input->count(interface_key::A_MOVE_E_DOWN) && hasNextFilter())
-            --filter_idx;
-        // ctrl+Left
-        else if (input->count(interface_key::A_MOVE_W_DOWN) && hasPrevFilter())
-            ++filter_idx;
-        else
-            return false;
-        return true;
-    }
+// get a list of item vectors that we should search for matches
+vector<df::job_item_vector_id> getVectorIds(color_ostream &out, const df::job_item *job_item, bool ignore_filters) {
+    std::vector<df::job_item_vector_id> ret;
 
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
+    // if the filter already has the vector_id set to something specific, use it
+    if (job_item->vector_id > df::job_item_vector_id::IN_PLAY)
     {
-        if (!handleInput(input))
-            INTERPOSE_NEXT(feed)(input);
+        DEBUG(status,out).print("using vector_id from job_item: %s\n",
+              ENUM_KEY_STR(job_item_vector_id, job_item->vector_id).c_str());
+        ret.push_back(job_item->vector_id);
+        return ret;
     }
 
-    static bool is_filter_satisfied(df::building *bld, int filter_idx)
+    // if the filter is for building material, refer to our global settings for
+    // which vectors to search
+    if (job_item->flags2.bits.building_material)
     {
-        if (!bld
-                || bld->jobs.size() < 1
-                || int(bld->jobs[0]->job_items.size()) <= filter_idx)
-            return false;
-
-        // if all items for this filter are attached, the quantity will be 0
-        return bld->jobs[0]->job_items[filter_idx]->quantity == 0;
+        if (ignore_filters || get_config_bool(config, CONFIG_BLOCKS))
+            ret.push_back(df::job_item_vector_id::BLOCKS);
+        if (ignore_filters || get_config_bool(config, CONFIG_BOULDERS))
+            ret.push_back(df::job_item_vector_id::BOULDER);
+        if (ignore_filters || get_config_bool(config, CONFIG_LOGS))
+            ret.push_back(df::job_item_vector_id::WOOD);
+        if (ignore_filters || get_config_bool(config, CONFIG_BARS))
+            ret.push_back(df::job_item_vector_id::BAR);
     }
 
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        INTERPOSE_NEXT(render)();
-
-        if (!isInPlannedBuildingQueryMode())
-            return;
-
-        initStatics();
-
-        // Hide suspend toggle option
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = 20;
-        Screen::Pen pen(' ', COLOR_BLACK);
-        Screen::fillRect(pen, x, y, dims.menu_x2, y);
-
-        bool attached = is_filter_satisfied(pb->getBuilding(), filter_idx);
-
-        auto & filter = pb->getFilters()[filter_idx];
-        y = 24;
-        std::string item_label =
-            stl_sprintf("Item %d of %d (%s)", filter_count - filter_idx, filter_count, attached ? "attached" : "pending");
-        OutputString(COLOR_WHITE, x, y, "Planned Building Filter", true, left_margin + 1);
-        OutputString(COLOR_WHITE, x, y, item_label.c_str(), true, left_margin + 1);
-        OutputString(COLOR_WHITE, x, y, get_item_label(toBuildingTypeKey(bld), filter_idx).c_str(), true, left_margin);
-        ++y;
-        if (item_can_be_improved(toBuildingTypeKey(bld), filter_idx))
-        {
-            OutputString(COLOR_BROWN, x, y, "Min Quality: ", false, left_margin);
-            OutputString(COLOR_BLUE, x, y, filter.getMinQuality(), true, left_margin);
-            OutputString(COLOR_BROWN, x, y, "Max Quality: ", false, left_margin);
-            OutputString(COLOR_BLUE, x, y, filter.getMaxQuality(), true, left_margin);
-            if (filter.getDecoratedOnly())
-                OutputString(COLOR_BLUE, x, y, "Decorated Only", true, left_margin);
-        }
+    // fall back to IN_PLAY if no other vector was appropriate
+    if (ret.empty())
+        ret.push_back(df::job_item_vector_id::IN_PLAY);
+    return ret;
+}
 
-        OutputString(COLOR_BROWN, x, y, "Materials:", true, left_margin);
-        auto filters = filter.getMaterials();
-        for (auto it = filters.begin(); it != filters.end(); ++it)
-            OutputString(COLOR_BLUE, x, y, "*" + *it, true, left_margin);
+static bool registerPlannedBuilding(color_ostream &out, PlannedBuilding & pb, bool unsuspend_on_finalize) {
+    df::building * bld = pb.getBuildingIfValidOrRemoveIfNot(out);
+    if (!bld)
+        return false;
 
-        ++y;
-        if (hasPrevFilter())
-            OutputHotkeyString(x, y, "Prev Item", "Ctrl+Left", true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
-        if (hasNextFilter())
-            OutputHotkeyString(x, y, "Next Item", "Ctrl+Right", true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
+    if (bld->jobs.size() != 1) {
+        DEBUG(status,out).print("unexpected number of jobs: want 1, got %zu\n", bld->jobs.size());
+        return false;
     }
-};
 
-df::building * buildingplan_query_hook::bld;
-PlannedBuilding * buildingplan_query_hook::pb;
-int buildingplan_query_hook::filter_count;
-int buildingplan_query_hook::filter_idx;
+    // suspend jobs
+    for (auto job : bld->jobs)
+        job->flags.bits.suspend = true;
 
-struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
-{
-    typedef df::viewscreen_dwarfmodest interpose_base;
-
-    // no non-static fields allowed (according to VTableInterpose.h)
-    static BuildingTypeKey key;
-    static std::vector<ItemFilter>::reverse_iterator filter_rbegin;
-    static std::vector<ItemFilter>::reverse_iterator filter_rend;
-    static std::vector<ItemFilter>::reverse_iterator filter;
-    static int filter_count;
-    static int filter_idx;
-
-    bool hasNextFilter() const { return filter + 1 != filter_rend; }
-    bool hasPrevFilter() const { return filter != filter_rbegin; }
-
-    bool isInPlannedBuildingPlacementMode()
-    {
-        return ui->main.mode == ui_sidebar_mode::Build &&
-            df::global::ui_build_selector &&
-            df::global::ui_build_selector->stage < 2 &&
-            planner.isPlannableBuilding(toBuildingTypeKey(ui_build_selector));
+    auto job_items = bld->jobs[0]->job_items;
+    if (isJobReady(out, job_items)) {
+        // all items are already attached
+        finalizeBuilding(out, bld, unsuspend_on_finalize);
+        pb.remove(out);
+        return true;
     }
 
-    // reinit static fields when selected building type changes
-    void initStatics()
-    {
-        BuildingTypeKey cur_key = toBuildingTypeKey(ui_build_selector);
-        if (key != cur_key)
-        {
-            key = cur_key;
-            auto wrapper = planner.getItemFilters(key);
-            filter_rbegin = wrapper.rbegin();
-            filter_rend = wrapper.rend();
-            filter = filter_rbegin;
-            filter_count = wrapper.get().size();
-            filter_idx = filter_count - 1;
+    int num_job_items = (int)job_items.size();
+    int32_t id = bld->id;
+    for (int job_item_idx = 0; job_item_idx < num_job_items; ++job_item_idx) {
+        int rev_jitem_index = num_job_items - (job_item_idx+1);
+        auto job_item = job_items[rev_jitem_index];
+        auto bucket = getBucket(*job_item, pb, job_item_idx);
+
+        // if there are multiple vector_ids, schedule duplicate tasks. after
+        // the correct number of items are matched, the extras will get popped
+        // as invalid
+        for (auto vector_id : pb.vector_ids[job_item_idx]) {
+            for (int item_num = 0; item_num < job_item->quantity; ++item_num) {
+                tasks[vector_id][bucket].emplace_back(id, rev_jitem_index);
+                DEBUG(status,out).print("added task: %s/%s/%d,%d; "
+                      "%zu vector(s), %zu filter bucket(s), %zu task(s) in bucket\n",
+                      ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                      bucket.c_str(), id, rev_jitem_index, tasks.size(),
+                      tasks[vector_id].size(), tasks[vector_id][bucket].size());
+            }
         }
     }
 
-    static void invalidateStatics()
-    {
-        key = BuildingTypeKey();
-    }
-
-    bool handleInput(set<df::interface_key> *input)
-    {
-        if (!isInPlannedBuildingPlacementMode())
-        {
-            show_help = false;
-            return false;
-        }
+    // add the planned buildings to our register
+    planned_buildings.emplace(bld->id, pb);
 
-        initStatics();
-
-        if (in_dummy_screen)
-        {
-            if (input->count(interface_key::SELECT) || input->count(interface_key::SEC_SELECT)
-                 || input->count(interface_key::LEAVESCREEN))
-            {
-                in_dummy_screen = false;
-                // pass LEAVESCREEN up to parent view
-                input->clear();
-                input->insert(interface_key::LEAVESCREEN);
-                return false;
-            }
-            return true;
-        }
+    return true;
+}
 
-        if (input->count(interface_key::CUSTOM_P) ||
-            input->count(interface_key::CUSTOM_G) ||
-            input->count(interface_key::CUSTOM_D) ||
-            input->count(interface_key::CUSTOM_Q) ||
-            input->count(interface_key::CUSTOM_W) ||
-            input->count(interface_key::CUSTOM_A) ||
-            input->count(interface_key::CUSTOM_S) ||
-            input->count(interface_key::CUSTOM_M))
-        {
-            show_help = true;
-        }
+static string get_desc_string(color_ostream &out, df::job_item *jitem,
+        const vector<df::job_item_vector_id> &vec_ids) {
+    vector<string> descs;
+    for (auto &vec_id : vec_ids) {
+        df::job_item jitem_copy = *jitem;
+        jitem_copy.vector_id = vec_id;
+        call_buildingplan_lua(&out, "get_desc", 1, 1,
+                [&](lua_State *L) { Lua::Push(L, &jitem_copy); },
+                [&](lua_State *L) {
+                    descs.emplace_back(lua_tostring(L, -1)); });
+    }
+    return join_strings(" or ", descs);
+}
 
-        if (!quickfort_mode && !all_enabled
-            && input->count(interface_key::CUSTOM_SHIFT_P))
-        {
-            planmode_enabled[key] = !planmode_enabled[key];
-            if (!is_planmode_enabled(key))
-                Gui::refreshSidebar();
-            return true;
-        }
-        if (input->count(interface_key::CUSTOM_SHIFT_G))
-        {
-            show_global_settings_dialog();
-            return true;
-        }
+static void printStatus(color_ostream &out) {
+    DEBUG(status,out).print("entering buildingplan_printStatus\n");
+    out.print("buildingplan is %s\n\n", is_enabled ? "enabled" : "disabled");
+    out.print("Current settings:\n");
+    out.print("  use blocks:   %s\n", get_config_bool(config, CONFIG_BLOCKS) ? "yes" : "no");
+    out.print("  use boulders: %s\n", get_config_bool(config, CONFIG_BOULDERS) ? "yes" : "no");
+    out.print("  use logs:     %s\n", get_config_bool(config, CONFIG_LOGS) ? "yes" : "no");
+    out.print("  use bars:     %s\n", get_config_bool(config, CONFIG_BARS) ? "yes" : "no");
+    out.print("\n");
 
-        if (!is_planmode_enabled(key))
-            return false;
-
-        // if automaterial is enabled, let it handle building allocation and
-        // registration with planner
-        if (input->count(interface_key::SELECT) &&
-            !is_automaterial_managed(ui_build_selector->building_type,
-                                     ui_build_selector->building_subtype))
-        {
-            if (ui_build_selector->errors.size() == 0 && construct_planned_building())
-            {
-                Gui::refreshSidebar();
-                if (quickfort_mode)
-                    in_dummy_screen = true;
+    size_t bld_count = 0;
+    map<string, int32_t> counts;
+    int32_t total = 0;
+    for (auto &entry : planned_buildings) {
+        auto &pb = entry.second;
+        // don't actually remove bad buildings from the list while we're
+        // actively iterating through that list
+        auto bld = pb.getBuildingIfValidOrRemoveIfNot(out, true);
+        if (!bld || bld->jobs.size() != 1)
+            continue;
+        auto &job_items = bld->jobs[0]->job_items;
+        const size_t num_job_items = job_items.size();
+        if (num_job_items != pb.vector_ids.size())
+            continue;
+        ++bld_count;
+        int job_item_idx = 0;
+        for (auto &vec_ids : pb.vector_ids) {
+            auto &jitem = job_items[num_job_items - (job_item_idx+1)];
+            int32_t quantity = jitem->quantity;
+            if (quantity) {
+                counts[get_desc_string(out, jitem, vec_ids)] += quantity;
+                total += quantity;
             }
-            return true;
-        }
-
-
-
-        if (input->count(interface_key::CUSTOM_SHIFT_M))
-            Screen::show(dts::make_unique<ViewscreenChooseMaterial>(*filter), plugin_self);
-
-        if (item_can_be_improved(key, filter_idx))
-        {
-            if (input->count(interface_key::CUSTOM_SHIFT_Q))
-                filter->decMinQuality();
-            else if (input->count(interface_key::CUSTOM_SHIFT_W))
-                filter->incMinQuality();
-            else if (input->count(interface_key::CUSTOM_SHIFT_A))
-                filter->decMaxQuality();
-            else if (input->count(interface_key::CUSTOM_SHIFT_S))
-                filter->incMaxQuality();
-            else if (input->count(interface_key::CUSTOM_SHIFT_D))
-                filter->toggleDecoratedOnly();
-        }
-
-        // ctrl+Right
-        if (input->count(interface_key::A_MOVE_E_DOWN) && hasNextFilter())
-        {
-            ++filter;
-            --filter_idx;
+            ++job_item_idx;
         }
-        // ctrl+Left
-        else if (input->count(interface_key::A_MOVE_W_DOWN) && hasPrevFilter())
-        {
-            --filter;
-            ++filter_idx;
-        }
-        else
-            return false;
-        return true;
     }
 
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
-    {
-        if (!handleInput(input))
-            INTERPOSE_NEXT(feed)(input);
+    if (bld_count) {
+        out.print("Waiting for %d item(s) to be produced for %zd building(s):\n",
+                total, bld_count);
+        for (auto &count : counts)
+            out.print("  %3d %s%s\n", count.second, count.first.c_str(), count.second == 1 ? "" : "s");
+    } else {
+        out.print("Currently no planned buildings\n");
     }
+    out.print("\n");
+}
 
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        initStatics();
-
-        bool plannable = isInPlannedBuildingPlacementMode();
-        if (plannable && is_planmode_enabled(key))
-        {
-            if (ui_build_selector->stage < 1)
-                // No materials but turn on cursor
-                ui_build_selector->stage = 1;
-
-            for (auto iter = ui_build_selector->errors.begin();
-                 iter != ui_build_selector->errors.end();)
-            {
-                // FIXME Hide bags
-                if (((*iter)->find("Needs") != string::npos
-                     && **iter != "Needs adjacent wall")
-                    || (*iter)->find("No access") != string::npos)
-                    iter = ui_build_selector->errors.erase(iter);
-                else
-                    ++iter;
-            }
-        }
-
-        INTERPOSE_NEXT(render)();
+static bool setSetting(color_ostream &out, string name, bool value) {
+    DEBUG(status,out).print("entering setSetting (%s -> %s)\n", name.c_str(), value ? "true" : "false");
+    if (name == "blocks")
+        set_config_bool(config, CONFIG_BLOCKS, value);
+    else if (name == "boulders")
+        set_config_bool(config, CONFIG_BOULDERS, value);
+    else if (name == "logs")
+        set_config_bool(config, CONFIG_LOGS, value);
+    else if (name == "bars")
+        set_config_bool(config, CONFIG_BARS, value);
+    else {
+        out.printerr("unrecognized setting: '%s'\n", name.c_str());
+        return false;
+    }
 
-        if (!plannable)
-            return;
+    validate_config(out, true);
+    call_buildingplan_lua(&out, "signal_reset");
+    return true;
+}
 
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
+static void resetFilters(color_ostream &out) {
+    DEBUG(status,out).print("entering resetFilters\n");
+    reset_filters(out);
+}
 
-        if (in_dummy_screen)
-        {
-            Screen::Pen pen(' ',COLOR_BLACK);
-            int y = dims.y1 + 1;
-            Screen::fillRect(pen, x, y, dims.menu_x2, y + 20);
+static bool isPlannableBuilding(color_ostream &out, df::building_type type, int16_t subtype, int32_t custom) {
+    DEBUG(status,out).print("entering isPlannableBuilding\n");
+    return get_num_filters(out, BuildingTypeKey(type, subtype, custom)) >= 1;
+}
 
-            ++y;
+static bool isPlannedBuilding(color_ostream &out, df::building *bld) {
+    TRACE(status,out).print("entering isPlannedBuilding\n");
+    return bld && planned_buildings.count(bld->id);
+}
 
-            OutputString(COLOR_BROWN, x, y,
-                "Placeholder for legacy Quickfort. This screen is not required for DFHack native quickfort.",
-                true, left_margin);
-            OutputString(COLOR_WHITE, x, y, "Enter, Shift-Enter or Esc", true, left_margin);
-            return;
-        }
+static bool addPlannedBuilding(color_ostream &out, df::building *bld) {
+    DEBUG(status,out).print("entering addPlannedBuilding\n");
+    if (!bld || planned_buildings.count(bld->id))
+        return false;
 
-        int y = 23;
+    int16_t subtype = get_subtype(bld);
 
-        if (is_automaterial_managed(ui_build_selector->building_type,
-                                    ui_build_selector->building_subtype))
-        {
-            // avoid conflict with the automaterial plugin UI
-            y = 36;
-        }
+    if (!isPlannableBuilding(out, bld->getType(), subtype, bld->getCustomType()))
+        return false;
 
-        if (show_help)
-        {
-            OutputString(COLOR_BROWN, x, y, "Note: ");
-            OutputString(COLOR_WHITE, x, y, "Use Shift-Keys here", true, left_margin);
-        }
+    BuildingTypeKey key(bld->getType(), subtype, bld->getCustomType());
+    PlannedBuilding pb(out, bld, get_heat_safety_filter(key), get_item_filters(out, key));
 
-        OutputHotkeyString(x, y, "Planning Mode", interface_key::CUSTOM_SHIFT_P);
-        OutputString(COLOR_WHITE, x, y, ": ");
-        if (quickfort_mode)
-            OutputString(COLOR_YELLOW, x, y, "Quickfort", true, left_margin);
-        else if (all_enabled)
-            OutputString(COLOR_YELLOW, x, y, "All", true, left_margin);
-        else if (planmode_enabled[key])
-            OutputString(COLOR_GREEN, x, y, "On", true, left_margin);
-        else
-            OutputString(COLOR_GREY, x, y, "Off", true, left_margin);
-        OutputHotkeyString(x, y, "Global Settings", interface_key::CUSTOM_SHIFT_G,
-            true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
-
-        if (!is_planmode_enabled(key))
-            return;
-
-        y += 2;
-        std::string title =
-            stl_sprintf("Filter for Item %d of %d:",
-                        filter_count - filter_idx, filter_count);
-        OutputString(COLOR_WHITE, x, y, title.c_str(), true, left_margin + 1);
-        OutputString(COLOR_WHITE, x, y, get_item_label(key, filter_idx).c_str(), true, left_margin);
-
-        if (item_can_be_improved(key, filter_idx))
-        {
-            OutputHotkeyString(x, y, "Min Quality: ", "QW", false, 0, COLOR_WHITE, COLOR_LIGHTRED);
-            OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
-
-            OutputHotkeyString(x, y, "Max Quality: ", "AS", false, 0, COLOR_WHITE, COLOR_LIGHTRED);
-            OutputString(COLOR_BROWN, x, y, filter->getMaxQuality(), true, left_margin);
-
-            OutputToggleString(x, y, "Decorated Only", interface_key::CUSTOM_SHIFT_D,
-                filter->getDecoratedOnly(), true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
-        }
+    bool unsuspend_on_finalize = !is_suspendmanager_enabled(out);
+    return registerPlannedBuilding(out, pb, unsuspend_on_finalize);
+}
 
-        OutputHotkeyString(x, y, "Material Filter:", interface_key::CUSTOM_SHIFT_M, true,
-            left_margin, COLOR_WHITE, COLOR_LIGHTRED);
-        auto filter_descriptions = filter->getMaterials();
-        for (auto it = filter_descriptions.begin();
-             it != filter_descriptions.end(); ++it)
-             OutputString(COLOR_BROWN, x, y, "   *" + *it, true, left_margin);
-
-        y += 2;
-        if (hasPrevFilter())
-            OutputHotkeyString(x, y, "Prev Item", "Ctrl+Left", true,
-                left_margin, COLOR_WHITE, COLOR_LIGHTRED);
-        if (hasNextFilter())
-            OutputHotkeyString(x, y, "Next Item", "Ctrl+Right", true,
-                left_margin, COLOR_WHITE, COLOR_LIGHTRED);
-    }
-};
+static void doCycle(color_ostream &out) {
+    DEBUG(status,out).print("entering doCycle\n");
+    do_cycle(out);
+}
 
-BuildingTypeKey buildingplan_place_hook::key;
-std::vector<ItemFilter>::reverse_iterator buildingplan_place_hook::filter_rbegin;
-std::vector<ItemFilter>::reverse_iterator buildingplan_place_hook::filter_rend;
-std::vector<ItemFilter>::reverse_iterator buildingplan_place_hook::filter;
-int buildingplan_place_hook::filter_count;
-int buildingplan_place_hook::filter_idx;
+static void scheduleCycle(color_ostream &out) {
+    DEBUG(status,out).print("entering scheduleCycle\n");
+    cycle_requested = true;
+}
 
-struct buildingplan_room_hook : public df::viewscreen_dwarfmodest
+static int scanAvailableItems(color_ostream &out, df::building_type type, int16_t subtype,
+        int32_t custom, int index, bool ignore_filters, bool ignore_quality, HeatSafety *heat_override = NULL,
+        vector<int> *item_ids = NULL, map<MaterialInfo, int32_t> *counts = NULL)
 {
-    typedef df::viewscreen_dwarfmodest interpose_base;
-
-    std::vector<Units::NoblePosition> getNoblePositionOfSelectedBuildingOwner()
-    {
-        std::vector<Units::NoblePosition> np;
-        if (ui->main.mode != df::ui_sidebar_mode::QueryBuilding ||
-            !world->selected_building ||
-            !world->selected_building->owner)
-        {
-            return np;
-        }
-
-        switch (world->selected_building->getType())
-        {
-        case building_type::Bed:
-        case building_type::Chair:
-        case building_type::Table:
-            break;
-        default:
-            return np;
+    DEBUG(status,out).print(
+            "entering scanAvailableItems building_type=%d subtype=%d custom=%d index=%d\n",
+            type, subtype, custom, index);
+    BuildingTypeKey key(type, subtype, custom);
+    HeatSafety heat = heat_override ? *heat_override : get_heat_safety_filter(key);
+    auto &job_items = get_job_items(out, key);
+    if (index < 0 || job_items.size() <= (size_t)index)
+        return 0;
+    auto &item_filters = get_item_filters(out, key);
+    auto &filters = item_filters.getItemFilters();
+    auto &specials = item_filters.getSpecials();
+
+    auto &jitem = job_items[index];
+    auto vector_ids = getVectorIds(out, jitem, ignore_filters);
+
+    int count = 0;
+    for (auto vector_id : vector_ids) {
+        auto other_id = ENUM_ATTR(job_item_vector_id, other, vector_id);
+        for (auto &item : df::global::world->items.other[other_id]) {
+            ItemFilter filter = filters[index];
+            set<string> special = specials;
+            if (ignore_filters || counts) {
+                // don't filter by material; we want counts for all materials
+                filter.setMaterialMask(0);
+                filter.setMaterials(set<MaterialInfo>());
+                special.clear();
+            }
+            if (ignore_quality) {
+                filter.setMinQuality(df::item_quality::Ordinary);
+                filter.setMaxQuality(df::item_quality::Artifact);
+            }
+            if (itemPassesScreen(out, item) && matchesFilters(item, jitem, heat, filter, special)) {
+                if (item_ids)
+                    item_ids->emplace_back(item->id);
+                if (counts) {
+                    MaterialInfo mi;
+                    mi.decode(item);
+                    (*counts)[mi]++;
+                }
+                ++count;
+            }
         }
-
-        return getUniqueNoblePositions(world->selected_building->owner);
     }
 
-    bool isInNobleRoomQueryMode()
-    {
-        if (getNoblePositionOfSelectedBuildingOwner().size() > 0)
-            return canReserveRoom(world->selected_building);
-        else
-            return false;
-    }
+    DEBUG(status,out).print("found matches %d\n", count);
+    return count;
+}
 
-    bool handleInput(set<df::interface_key> *input)
-    {
-        if (!isInNobleRoomQueryMode())
-            return false;
-
-        if (Gui::inRenameBuilding())
-            return false;
-        auto np = getNoblePositionOfSelectedBuildingOwner();
-        df::interface_key last_token = get_string_key(input);
-        if (last_token >= Screen::charToKey('1')
-            && last_token <= Screen::charToKey('9'))
-        {
-            size_t index = last_token - Screen::charToKey('1');
-            if (index >= np.size())
-                return false;
-            roomMonitor.toggleRoomForPosition(world->selected_building->id, np.at(index).position->code);
-            return true;
-        }
+static int getAvailableItems(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    int index = luaL_checkint(L, 4);
+    DEBUG(status,*out).print(
+            "entering getAvailableItems building_type=%d subtype=%d custom=%d index=%d\n",
+            type, subtype, custom, index);
+    vector<int> item_ids;
+    scanAvailableItems(*out, type, subtype, custom, index, true, false, NULL, &item_ids);
+    Lua::PushVector(L, item_ids);
+    return 1;
+}
 
-        return false;
-    }
+static int getAvailableItemsByHeat(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    int index = luaL_checkint(L, 4);
+    HeatSafety heat = (HeatSafety)luaL_checkint(L, 5);
+    DEBUG(status,*out).print(
+            "entering getAvailableItemsByHeat building_type=%d subtype=%d custom=%d index=%d\n",
+            type, subtype, custom, index);
+    vector<int> item_ids;
+    scanAvailableItems(*out, type, subtype, custom, index, true, true, &heat, &item_ids);
+    Lua::PushVector(L, item_ids);
+    return 1;
+}
 
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
-    {
-        if (!handleInput(input))
-            INTERPOSE_NEXT(feed)(input);
-    }
+static int getGlobalSettings(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering getGlobalSettings\n");
+    map<string, bool> settings;
+    settings.emplace("blocks", get_config_bool(config, CONFIG_BLOCKS));
+    settings.emplace("logs", get_config_bool(config, CONFIG_LOGS));
+    settings.emplace("boulders", get_config_bool(config, CONFIG_BOULDERS));
+    settings.emplace("bars", get_config_bool(config, CONFIG_BARS));
+    Lua::Push(L, settings);
+    return 1;
+}
 
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        INTERPOSE_NEXT(render)();
-
-        if (!isInNobleRoomQueryMode())
-            return;
-
-        auto np = getNoblePositionOfSelectedBuildingOwner();
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = 24;
-        OutputString(COLOR_BROWN, x, y, "DFHack", true, left_margin);
-        OutputString(COLOR_WHITE, x, y, "Auto-allocate to:", true, left_margin);
-        for (size_t i = 0; i < np.size() && i < 9; i++)
-        {
-            bool enabled =
-                roomMonitor.getReservedNobleCode(world->selected_building->id)
-                == np[i].position->code;
-            OutputToggleString(x, y, np[i].position->name[0].c_str(),
-                int_to_string(i+1).c_str(), enabled, true, left_margin);
+static int countAvailableItems(color_ostream &out, df::building_type type, int16_t subtype, int32_t custom, int index) {
+    DEBUG(status,out).print(
+            "entering countAvailableItems building_type=%d subtype=%d custom=%d index=%d\n",
+            type, subtype, custom, index);
+    int count = scanAvailableItems(out, type, subtype, custom, index, false, false);
+    if (count)
+        return count;
+
+    // nothing in stock; return how many are waiting in line as a negative
+    BuildingTypeKey key(type, subtype, custom);
+    auto &job_items = get_job_items(out, key);
+    if (index < 0 || job_items.size() <= (size_t)index)
+        return 0;
+    auto &jitem = job_items[index];
+
+    for (auto &entry : planned_buildings) {
+        auto &pb = entry.second;
+        // don't actually remove bad buildings from the list while we're
+        // actively iterating through that list
+        auto bld = pb.getBuildingIfValidOrRemoveIfNot(out, true);
+        if (!bld || bld->jobs.size() != 1)
+            continue;
+        for (auto pb_jitem : bld->jobs[0]->job_items) {
+            if (pb_jitem->item_type == jitem->item_type && pb_jitem->item_subtype == jitem->item_subtype)
+                count -= pb_jitem->quantity;
         }
     }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_query_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_place_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_room_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_query_hook, render);
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_place_hook, render);
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_room_hook, render);
-
-DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-
-static bool setSetting(std::string name, bool value);
-
-static bool isTrue(std::string val)
-{
-    val = toLower(val);
-    return val == "on" || val == "true" || val == "y" || val == "yes"
-        || val == "1";
+    return count;
 }
 
-static command_result buildingplan_cmd(color_ostream &out, vector <string> & parameters)
-{
-    if (parameters.empty())
-        return CR_OK;
+static bool hasFilter(color_ostream &out, df::building_type type, int16_t subtype, int32_t custom, int index) {
+    TRACE(status,out).print("entering hasFilter\n");
+    if (!Core::getInstance().isWorldLoaded())
+        return false;
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(out, key);
+    if (index < 0 || filters.getItemFilters().size() <= (size_t)index)
+        return false;
+    return !filters.getItemFilters()[index].isEmpty();
+}
 
-    std::string cmd = toLower(parameters[0]);
+static void clearFilter(color_ostream &out, df::building_type type, int16_t subtype, int32_t custom, int index) {
+    TRACE(status,out).print("entering clearFilter\n");
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(out, key);
+    if (index < 0 || filters.getItemFilters().size() <= (size_t)index)
+        return;
+    ItemFilter filter = filters.getItemFilters()[index];
+    filter.clear();
+    filters.setItemFilter(out, filter, index);
+    call_buildingplan_lua(&out, "signal_reset");
+}
 
-    if (cmd.size() >= 1 && cmd[0] == 'v')
-    {
-        out.print("buildingplan version: %s\n", PLUGIN_VERSION);
-    }
-    else if (parameters.size() >= 2 && cmd == "debug")
-    {
-        show_debugging = isTrue(parameters[1]);
-        out.print("buildingplan debugging: %s\n",
-                  show_debugging ? "enabled" : "disabled");
+static int setMaterialMaskFilter(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    int index = luaL_checkint(L, 4);
+    DEBUG(status,*out).print(
+            "entering setMaterialMaskFilter building_type=%d subtype=%d custom=%d index=%d\n",
+            type, subtype, custom, index);
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(*out, key).getItemFilters();
+    if (index < 0 || filters.size() <= (size_t)index)
+        return 0;
+    uint32_t mask = 0;
+    vector<string> cats;
+    Lua::GetVector(L, cats, 5);
+    for (auto &cat : cats) {
+        if (cat == "stone")
+            mask |= stone_cat.whole;
+        else if (cat == "wood")
+            mask |= wood_cat.whole;
+        else if (cat == "metal")
+            mask |= metal_cat.whole;
+        else if (cat == "glass")
+            mask |= glass_cat.whole;
+        else if (cat == "gem")
+            mask |= gem_cat.whole;
+        else if (cat == "clay")
+            mask |= clay_cat.whole;
+        else if (cat == "cloth")
+            mask |= cloth_cat.whole;
+        else if (cat == "silk")
+            mask |= silk_cat.whole;
+        else if (cat == "yarn")
+            mask |= yarn_cat.whole;
     }
-    else if (cmd == "set")
-    {
-        if (!is_enabled)
-        {
-            out.printerr(
-                "ERROR: buildingplan must be enabled before you can"
-                " read or set buildingplan global settings.");
-            return CR_FAILURE;
-        }
-
-        if (!DFHack::Core::getInstance().isMapLoaded())
-        {
-            out.printerr(
-                "ERROR: A map must be loaded before you can read or set"
-                "buildingplan global settings. Try adding your"
-                "'buildingplan set' commands to the onMapLoad.init file.\n");
-            return CR_FAILURE;
-        }
-
-        if (parameters.size() == 1)
-        {
-            // display current settings
-            out.print("active settings:\n");
-
-            out.print("  all_enabled = %s\n", all_enabled ? "true" : "false");
-            for (auto & setting : planner.getGlobalSettings())
-            {
-                out.print("  %s = %s\n", setting.first.c_str(),
-                          setting.second ? "true" : "false");
-            }
-
-            out.print("  quickfort_mode = %s\n",
-                      quickfort_mode ? "true" : "false");
-        }
-        else if (parameters.size() == 3)
-        {
-            // set a setting
-            std::string setting = toLower(parameters[1]);
-            bool val = isTrue(parameters[2]);
-            if (!setSetting(setting, val))
-            {
-                out.printerr("ERROR: invalid parameter: '%s'\n",
-                    parameters[1].c_str());
-            }
-        }
-        else
-        {
-            out.printerr("ERROR: invalid syntax\n");
+    DEBUG(status,*out).print(
+            "setting material mask filter for building_type=%d subtype=%d custom=%d index=%d to %x\n",
+            type, subtype, custom, index, mask);
+    ItemFilter filter = filters[index];
+    filter.setMaterialMask(mask);
+    set<MaterialInfo> new_mats;
+    if (mask) {
+        // remove materials from the list that don't match the mask
+        const auto &mats = filter.getMaterials();
+        const df::dfhack_material_category mat_mask(mask);
+        for (auto & mat : mats) {
+            if (mat.matches(mat_mask))
+                new_mats.emplace(mat);
         }
     }
-
-    return CR_OK;
+    filter.setMaterials(new_mats);
+    get_item_filters(*out, key).setItemFilter(*out, filter, index);
+    call_buildingplan_lua(out, "signal_reset");
+    return 0;
 }
 
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    if (!gps)
-        return CR_FAILURE;
-
-    if (enable != is_enabled)
-    {
-        if (DFHack::Core::getInstance().isMapLoaded())
-            planner.reset();
-
-        if (!INTERPOSE_HOOK(buildingplan_query_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(buildingplan_place_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(buildingplan_room_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(buildingplan_query_hook, render).apply(enable) ||
-            !INTERPOSE_HOOK(buildingplan_place_hook, render).apply(enable) ||
-            !INTERPOSE_HOOK(buildingplan_room_hook, render).apply(enable))
-            return CR_FAILURE;
+static int getMaterialMaskFilter(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    int index = luaL_checkint(L, 4);
+    DEBUG(status,*out).print(
+            "entering getMaterialFilter building_type=%d subtype=%d custom=%d index=%d\n",
+            type, subtype, custom, index);
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(*out, key);
+    if (index < 0 || filters.getItemFilters().size() <= (size_t)index)
+        return 0;
+    map<string, bool> ret;
+    uint32_t bits = filters.getItemFilters()[index].getMaterialMask().whole;
+    ret.emplace("unset", !bits);
+    ret.emplace("stone", !bits || bits & stone_cat.whole);
+    ret.emplace("wood", !bits || bits & wood_cat.whole);
+    ret.emplace("metal", !bits || bits & metal_cat.whole);
+    ret.emplace("glass", !bits || bits & glass_cat.whole);
+    ret.emplace("gem", !bits || bits & gem_cat.whole);
+    ret.emplace("clay", !bits || bits & clay_cat.whole);
+    ret.emplace("cloth", !bits || bits & cloth_cat.whole);
+    ret.emplace("silk", !bits || bits & silk_cat.whole);
+    ret.emplace("yarn", !bits || bits & yarn_cat.whole);
+    Lua::Push(L, ret);
+    return 1;
+}
 
-        is_enabled = enable;
+static int setMaterialFilter(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    int index = luaL_checkint(L, 4);
+    DEBUG(status,*out).print(
+            "entering setMaterialFilter building_type=%d subtype=%d custom=%d index=%d\n",
+            type, subtype, custom, index);
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(*out, key).getItemFilters();
+    if (index < 0 || filters.size() <= (size_t)index)
+        return 0;
+    set<MaterialInfo> mats;
+    vector<string> matstrs;
+    Lua::GetVector(L, matstrs, 5);
+    for (auto &mat : matstrs) {
+        if (mat_cache.count(mat))
+            mats.emplace(mat_cache.at(mat).first);
     }
-
-    return CR_OK;
+    DEBUG(status,*out).print(
+            "setting material filter for building_type=%d subtype=%d custom=%d index=%d to %zd materials\n",
+            type, subtype, custom, index, mats.size());
+    ItemFilter filter = filters[index];
+    filter.setMaterials(mats);
+    // ensure relevant masks are explicitly enabled
+    df::dfhack_material_category mask = filter.getMaterialMask();
+    if (!mats.size())
+        mask.whole = 0; // if all materials are disabled, reset the mask
+    for (auto & mat : mats) {
+        if (mat.matches(stone_cat))
+            mask.whole |= stone_cat.whole;
+        else if (mat.matches(wood_cat))
+            mask.whole |= wood_cat.whole;
+        else if (mat.matches(metal_cat))
+            mask.whole |= metal_cat.whole;
+        else if (mat.matches(glass_cat))
+            mask.whole |= glass_cat.whole;
+        else if (mat.matches(gem_cat))
+            mask.whole |= gem_cat.whole;
+        else if (mat.matches(clay_cat))
+            mask.whole |= clay_cat.whole;
+        else if (mat.matches(cloth_cat))
+            mask.whole |= cloth_cat.whole;
+        else if (mat.matches(silk_cat))
+            mask.whole |= silk_cat.whole;
+        else if (mat.matches(yarn_cat))
+            mask.whole |= yarn_cat.whole;
+    }
+    filter.setMaterialMask(mask.whole);
+    get_item_filters(*out, key).setItemFilter(*out, filter, index);
+    call_buildingplan_lua(out, "signal_reset");
+    return 0;
 }
 
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    commands.push_back(
-        PluginCommand("buildingplan",
-                      "Plan building construction before you have materials.",
-                      buildingplan_cmd));
+static int getMaterialFilter(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    int index = luaL_checkint(L, 4);
+    DEBUG(status,*out).print(
+            "entering getMaterialFilter building_type=%d subtype=%d custom=%d index=%d\n",
+            type, subtype, custom, index);
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(*out, key).getItemFilters();
+    if (index < 0 || filters.size() <= (size_t)index)
+        return 0;
+    const auto &mat_filter = filters[index].getMaterials();
+    map<MaterialInfo, int32_t> counts;
+    scanAvailableItems(*out, type, subtype, custom, index, false, false, NULL, NULL, &counts);
+    HeatSafety heat = get_heat_safety_filter(key);
+    const df::job_item *jitem = get_job_items(*out, key)[index];
+    // name -> {count=int, enabled=bool, category=string, heat=string}
+    map<string, map<string, string>> ret;
+    for (auto & entry : mat_cache) {
+        auto &mat = entry.second.first;
+        if (!mat.matches(jitem))
+            continue;
+        if (!matchesHeatSafety(mat.type, mat.index, heat))
+            continue;
+        string heat_safety = "";
+        if (matchesHeatSafety(mat.type, mat.index, HEAT_SAFETY_MAGMA))
+            heat_safety = "magma-safe";
+        else if (matchesHeatSafety(mat.type, mat.index, HEAT_SAFETY_FIRE))
+            heat_safety = "fire-safe";
+        auto &name = entry.first;
+        auto &cat = entry.second.second;
+        map<string, string> props;
+        string count = "0";
+        if (counts.count(mat))
+            count = int_to_string(counts.at(mat));
+        props.emplace("count", count);
+        props.emplace("enabled", (!mat_filter.size() || mat_filter.count(mat)) ? "true" : "false");
+        props.emplace("category", cat);
+        ret.emplace(name, props);
+    }
+    Lua::Push(L, ret);
+    return 1;
+}
 
-    return CR_OK;
+static void setChooseItems(color_ostream &out, df::building_type type, int16_t subtype, int32_t custom, int choose) {
+    DEBUG(status,out).print(
+            "entering setChooseItems building_type=%d subtype=%d custom=%d choose=%d\n",
+            type, subtype, custom, choose);
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(out, key);
+    filters.setChooseItems(choose);
+    // no need to reset signal; no change to the state of any other UI element
 }
 
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event) {
-    case SC_MAP_LOADED:
-        buildingplan_place_hook::invalidateStatics();
-        buildingplan_query_hook::invalidateStatics();
-        planner.reset();
-        roomMonitor.reset(out);
-        break;
-    default:
-        break;
-    }
+static int getChooseItems(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    DEBUG(status,*out).print(
+            "entering getChooseItems building_type=%d subtype=%d custom=%d\n",
+            type, subtype, custom);
+    BuildingTypeKey key(type, subtype, custom);
+    Lua::Push(L, get_item_filters(*out, key).getChooseItems());
+    return 1;
+}
 
-    return CR_OK;
+static void setHeatSafetyFilter(color_ostream &out, df::building_type type, int16_t subtype, int32_t custom, int heat) {
+    DEBUG(status,out).print("entering setHeatSafetyFilter\n");
+    BuildingTypeKey key(type, subtype, custom);
+    if (heat == HEAT_SAFETY_FIRE || heat == HEAT_SAFETY_MAGMA)
+        cur_heat_safety[key] = (HeatSafety)heat;
+    else
+        cur_heat_safety.erase(key);
+    call_buildingplan_lua(&out, "signal_reset");
 }
 
-static bool is_paused()
-{
-    return World::ReadPauseState() ||
-        ui->main.mode > df::ui_sidebar_mode::Squads ||
-        !strict_virtual_cast<df::viewscreen_dwarfmodest>(Gui::getCurViewscreen(true));
+static int getHeatSafetyFilter(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    DEBUG(status,*out).print(
+            "entering getHeatSafetyFilter building_type=%d subtype=%d custom=%d\n",
+            type, subtype, custom);
+    BuildingTypeKey key(type, subtype, custom);
+    HeatSafety heat = get_heat_safety_filter(key);
+    Lua::Push(L, heat);
+    return 1;
 }
 
-static bool cycle_requested = false;
+static void setSpecial(color_ostream &out, df::building_type type, int16_t subtype, int32_t custom, string special, bool val) {
+    DEBUG(status,out).print("entering setSpecial\n");
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(out, key);
+    filters.setSpecial(special, val);
+    call_buildingplan_lua(&out, "signal_reset");
+}
 
-#define DAY_TICKS 1200
-DFhackCExport command_result plugin_onupdate(color_ostream &)
-{
-    if (Maps::IsValid() && !is_paused()
-        && (cycle_requested || world->frame_counter % (DAY_TICKS/2) == 0))
-    {
-        planner.doCycle();
-        roomMonitor.doCycle();
-        cycle_requested = false;
-    }
+static int getSpecials(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    DEBUG(status,*out).print(
+            "entering getSpecials building_type=%d subtype=%d custom=%d\n",
+            type, subtype, custom);
+    BuildingTypeKey key(type, subtype, custom);
+    Lua::Push(L, get_item_filters(*out, key).getSpecials());
+    return 1;
+}
 
-    return CR_OK;
+static void setQualityFilter(color_ostream &out, df::building_type type, int16_t subtype, int32_t custom, int index,
+        int decorated, int min_quality, int max_quality) {
+    DEBUG(status,out).print("entering setQualityFilter\n");
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(out, key).getItemFilters();
+    if (index < 0 || filters.size() <= (size_t)index)
+        return;
+    ItemFilter filter = filters[index];
+    filter.setDecoratedOnly(decorated != 0);
+    filter.setMinQuality(min_quality);
+    filter.setMaxQuality(max_quality);
+    get_item_filters(out, key).setItemFilter(out, filter, index);
+    call_buildingplan_lua(&out, "signal_reset");
 }
 
-DFhackCExport command_result plugin_shutdown(color_ostream &)
-{
-    return CR_OK;
+static int getQualityFilter(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    df::building_type type = (df::building_type)luaL_checkint(L, 1);
+    int16_t subtype = luaL_checkint(L, 2);
+    int32_t custom = luaL_checkint(L, 3);
+    int index = luaL_checkint(L, 4);
+    DEBUG(status,*out).print(
+            "entering getQualityFilter building_type=%d subtype=%d custom=%d index=%d\n",
+            type, subtype, custom, index);
+    BuildingTypeKey key(type, subtype, custom);
+    auto &filters = get_item_filters(*out, key).getItemFilters();
+    if (index < 0 || filters.size() <= (size_t)index)
+        return 0;
+    auto &filter = filters[index];
+    map<string, int> ret;
+    ret.emplace("decorated", filter.getDecoratedOnly());
+    ret.emplace("min_quality", filter.getMinQuality());
+    ret.emplace("max_quality", filter.getMaxQuality());
+    Lua::Push(L, ret);
+    return 1;
 }
 
-// Lua API section
+static bool validate_pb(color_ostream &out, df::building *bld, int index) {
+    if (!isPlannedBuilding(out, bld) || bld->jobs.size() != 1)
+        return false;
 
-static bool isPlanModeEnabled(df::building_type type,
-                              int16_t subtype,
-                              int32_t custom) {
-    return is_planmode_enabled(toBuildingTypeKey(type, subtype, custom));
-}
+    auto &job_items = bld->jobs[0]->job_items;
+    if ((int)job_items.size() <= index)
+        return false;
 
-static bool isPlannableBuilding(df::building_type type,
-                                int16_t subtype,
-                                int32_t custom) {
-    return planner.isPlannableBuilding(
-        toBuildingTypeKey(type, subtype, custom));
-}
+    PlannedBuilding &pb = planned_buildings.at(bld->id);
+    if ((int)pb.vector_ids.size() <= index)
+        return false;
 
-static bool isPlannedBuilding(df::building *bld) {
-    return !!planner.getPlannedBuilding(bld);
+    return true;
 }
 
-static void addPlannedBuilding(df::building *bld) {
-    planner.addPlannedBuilding(bld);
+static string getDescString(color_ostream &out, df::building *bld, int index) {
+    DEBUG(status,out).print("entering getDescString\n");
+    if (!validate_pb(out, bld, index))
+        return "INVALID";
+
+    PlannedBuilding &pb = planned_buildings.at(bld->id);
+    auto & jitems = bld->jobs[0]->job_items;
+    const size_t num_job_items = jitems.size();
+    int rev_index = num_job_items - (index + 1);
+    auto &jitem = jitems[rev_index];
+    return int_to_string(jitem->quantity) + " " + get_desc_string(out, jitem, pb.vector_ids[index]);
 }
 
-static void doCycle() {
-    planner.doCycle();
-}
+static int getQueuePosition(color_ostream &out, df::building *bld, int index) {
+    TRACE(status,out).print("entering getQueuePosition\n");
+    if (!validate_pb(out, bld, index))
+        return 0;
+
+    PlannedBuilding &pb = planned_buildings.at(bld->id);
+    auto & jitems = bld->jobs[0]->job_items;
+    const size_t num_job_items = jitems.size();
+    int rev_index = num_job_items - (index + 1);
+    auto &job_item = jitems[rev_index];
+
+    if (job_item->quantity <= 0)
+        return 0;
+
+    int min_pos = -1;
+    for (auto &vec_id : pb.vector_ids[index]) {
+        if (!tasks.count(vec_id))
+            continue;
+        auto &buckets = tasks.at(vec_id);
+        string bucket_id = getBucket(*job_item, pb, index);
+        if (!buckets.count(bucket_id))
+            continue;
+        int bucket_pos = -1;
+        for (auto &task : buckets.at(bucket_id)) {
+            ++bucket_pos;
+            if (bld->id == task.first && rev_index == task.second)
+                break;
+        }
+        if (bucket_pos++ >= 0)
+            min_pos = min_pos < 0 ? bucket_pos : std::min(min_pos, bucket_pos);
+    }
 
-static void scheduleCycle() {
-    cycle_requested = true;
+    return min_pos < 0 ? 0 : min_pos;
 }
 
-static bool setSetting(std::string name, bool value) {
-    if (name == "quickfort_mode")
-    {
-        debug("setting quickfort_mode %d -> %d", quickfort_mode, value);
-        quickfort_mode = value;
-        return true;
-    }
-    if (name == "all_enabled")
-    {
-        debug("setting all_enabled %d -> %d", all_enabled, value);
-        all_enabled = value;
-        return true;
+static void makeTopPriority(color_ostream &out, df::building *bld) {
+    DEBUG(status,out).print("entering makeTopPriority\n");
+    if (!validate_pb(out, bld, 0))
+        return;
+
+    PlannedBuilding &pb = planned_buildings.at(bld->id);
+    auto &job_items = bld->jobs[0]->job_items;
+    const int num_job_items = (int)job_items.size();
+
+    for (int index = 0; index < num_job_items; ++index) {
+        int rev_index = num_job_items - (index + 1);
+        for (auto &vec_id : pb.vector_ids[index]) {
+            if (!tasks.count(vec_id))
+                continue;
+            auto &buckets = tasks.at(vec_id);
+            string bucket_id = getBucket(*job_items[rev_index], pb, index);
+            if (!buckets.count(bucket_id))
+                continue;
+            auto &bucket = buckets.at(bucket_id);
+            for (auto taskit = bucket.begin(); taskit != bucket.end(); ++taskit) {
+                if (bld->id == taskit->first && rev_index == taskit->second) {
+                    auto task_bld_id = taskit->first;
+                    auto task_job_item_idx = taskit->second;
+                    bucket.erase(taskit);
+                    bucket.emplace_front(task_bld_id, task_job_item_idx);
+                    break;
+                }
+            }
+        }
     }
-    return planner.setGlobalSetting(name, value);
 }
 
 DFHACK_PLUGIN_LUA_FUNCTIONS {
-    DFHACK_LUA_FUNCTION(isPlanModeEnabled),
+    DFHACK_LUA_FUNCTION(printStatus),
+    DFHACK_LUA_FUNCTION(setSetting),
+    DFHACK_LUA_FUNCTION(resetFilters),
     DFHACK_LUA_FUNCTION(isPlannableBuilding),
     DFHACK_LUA_FUNCTION(isPlannedBuilding),
     DFHACK_LUA_FUNCTION(addPlannedBuilding),
     DFHACK_LUA_FUNCTION(doCycle),
     DFHACK_LUA_FUNCTION(scheduleCycle),
-    DFHACK_LUA_FUNCTION(setSetting),
+    DFHACK_LUA_FUNCTION(countAvailableItems),
+    DFHACK_LUA_FUNCTION(hasFilter),
+    DFHACK_LUA_FUNCTION(clearFilter),
+    DFHACK_LUA_FUNCTION(setChooseItems),
+    DFHACK_LUA_FUNCTION(setHeatSafetyFilter),
+    DFHACK_LUA_FUNCTION(setSpecial),
+    DFHACK_LUA_FUNCTION(setQualityFilter),
+    DFHACK_LUA_FUNCTION(getDescString),
+    DFHACK_LUA_FUNCTION(getQueuePosition),
+    DFHACK_LUA_FUNCTION(makeTopPriority),
+    DFHACK_LUA_END
+};
+
+DFHACK_PLUGIN_LUA_COMMANDS {
+    DFHACK_LUA_COMMAND(getGlobalSettings),
+    DFHACK_LUA_COMMAND(getAvailableItems),
+    DFHACK_LUA_COMMAND(getAvailableItemsByHeat),
+    DFHACK_LUA_COMMAND(setMaterialMaskFilter),
+    DFHACK_LUA_COMMAND(getMaterialMaskFilter),
+    DFHACK_LUA_COMMAND(setMaterialFilter),
+    DFHACK_LUA_COMMAND(getMaterialFilter),
+    DFHACK_LUA_COMMAND(getChooseItems),
+    DFHACK_LUA_COMMAND(getHeatSafetyFilter),
+    DFHACK_LUA_COMMAND(getSpecials),
+    DFHACK_LUA_COMMAND(getQualityFilter),
     DFHACK_LUA_END
 };
diff --git a/plugins/buildingplan/buildingplan.h b/plugins/buildingplan/buildingplan.h
index e906ef1a7..a17f408a8 100644
--- a/plugins/buildingplan/buildingplan.h
+++ b/plugins/buildingplan/buildingplan.h
@@ -1,8 +1,61 @@
 #pragma once
 
-#include "buildingplan-planner.h"
-#include "buildingplan-rooms.h"
+#include "itemfilter.h"
 
-void debug(const char *fmt, ...) Wformat(printf,1,2);
+#include "modules/Persistence.h"
 
-extern bool show_debugging;
+#include "df/building.h"
+#include "df/job_item.h"
+#include "df/job_item_vector_id.h"
+
+#include <deque>
+#include <set>
+
+typedef std::deque<std::pair<int32_t, int>> Bucket;
+typedef std::map<df::job_item_vector_id, std::map<std::string, Bucket>> Tasks;
+
+extern const std::string FILTER_CONFIG_KEY;
+extern const std::string BLD_CONFIG_KEY;
+
+enum ConfigValues {
+    CONFIG_BLOCKS = 1,
+    CONFIG_BOULDERS = 2,
+    CONFIG_LOGS = 3,
+    CONFIG_BARS = 4,
+};
+
+enum FilterConfigValues {
+    FILTER_CONFIG_TYPE = 0,
+    FILTER_CONFIG_SUBTYPE = 1,
+    FILTER_CONFIG_CUSTOM = 2,
+    FILTER_CONFIG_CHOOSE_ITEMS = 3,
+};
+
+enum BuildingConfigValues {
+    BLD_CONFIG_ID = 0,
+    BLD_CONFIG_HEAT = 1,
+};
+
+enum HeatSafety {
+    HEAT_SAFETY_ANY = 0,
+    HEAT_SAFETY_FIRE = 1,
+    HEAT_SAFETY_MAGMA = 2,
+};
+
+enum ItemSelectionChoice {
+    ITEM_SELECTION_CHOICE_FILTER = 0,
+    ITEM_SELECTION_CHOICE_MANUAL = 1,
+    ITEM_SELECTION_CHOICE_AUTOMATERIAL = 2,
+};
+
+int get_config_val(DFHack::PersistentDataItem &c, int index);
+bool get_config_bool(DFHack::PersistentDataItem &c, int index);
+void set_config_val(DFHack::PersistentDataItem &c, int index, int value);
+void set_config_bool(DFHack::PersistentDataItem &c, int index, bool value);
+
+std::vector<df::job_item_vector_id> getVectorIds(DFHack::color_ostream &out, const df::job_item *job_item, bool ignore_filters);
+bool itemPassesScreen(DFHack::color_ostream& out, df::item* item);
+bool matchesHeatSafety(int16_t mat_type, int32_t mat_index, HeatSafety heat);
+bool matchesFilters(df::item * item, const df::job_item * job_item, HeatSafety heat, const ItemFilter &item_filter, const std::set<std::string> &special);
+bool isJobReady(DFHack::color_ostream &out, const std::vector<df::job_item *> &jitems);
+void finalizeBuilding(DFHack::color_ostream &out, df::building *bld, bool unsuspend_on_finalize);
diff --git a/plugins/buildingplan/buildingplan_cycle.cpp b/plugins/buildingplan/buildingplan_cycle.cpp
new file mode 100644
index 000000000..0a3f0d867
--- /dev/null
+++ b/plugins/buildingplan/buildingplan_cycle.cpp
@@ -0,0 +1,360 @@
+#include "plannedbuilding.h"
+#include "buildingplan.h"
+
+#include "Debug.h"
+
+#include "modules/Items.h"
+#include "modules/Job.h"
+#include "modules/Maps.h"
+#include "modules/Materials.h"
+
+#include "df/building_design.h"
+#include "df/item.h"
+#include "df/item_slabst.h"
+#include "df/job.h"
+#include "df/world.h"
+
+#include <unordered_map>
+
+using std::map;
+using std::string;
+using std::unordered_map;
+
+namespace DFHack {
+    DBG_EXTERN(buildingplan, cycle);
+}
+
+using namespace DFHack;
+
+struct BadFlags {
+    uint32_t whole;
+
+    BadFlags() {
+        df::item_flags flags;
+        #define F(x) flags.bits.x = true;
+        F(dump); F(forbid); F(garbage_collect);
+        F(hostile); F(on_fire); F(rotten); F(trader);
+        F(in_building); F(construction); F(in_job);
+        F(owned); F(in_chest); F(removed); F(encased);
+        F(spider_web);
+        #undef F
+        whole = flags.whole;
+    }
+};
+
+// This is tricky. we want to choose an item that can be brought to the job site, but that's not
+// necessarily the same as job->pos. it could be many tiles off in any direction (e.g. for bridges), or
+// up or down (e.g. for stairs). For now, just return if the item is on a walkable tile.
+static bool isAccessible(color_ostream& out, df::item* item) {
+    df::coord item_pos = Items::getPosition(item);
+    uint16_t walkability_group = Maps::getWalkableGroup(item_pos);
+    bool is_walkable = walkability_group != 0;
+    TRACE(cycle, out).print("item %d in walkability_group %u at (%d,%d,%d) is %saccessible from job site\n",
+        item->id, walkability_group, item_pos.x, item_pos.y, item_pos.z, is_walkable ? "(probably) " : "not ");
+    return is_walkable;
+}
+
+// as of v50, soap, coal, and ash are no longer valid building materials
+static bool isUnusableBar(color_ostream& out, df::item* item) {
+    if (item->getType() != df::item_type::BAR)
+        return false;
+
+    MaterialInfo minfo(item);
+    string token = minfo.getToken();
+    if (token.starts_with("COAL:") || token == "ASH")
+        return true;
+
+    df::job_item_flags2 ok;
+    df::job_item_flags2 mask;
+    minfo.getMatchBits(ok, mask);
+    return ok.bits.soap;
+}
+
+bool itemPassesScreen(color_ostream& out, df::item* item) {
+    static const BadFlags bad_flags;
+    return !(item->flags.whole & bad_flags.whole)
+        && !item->isAssignedToStockpile()
+        && isAccessible(out, item)
+        && !isUnusableBar(out, item);
+}
+
+bool matchesHeatSafety(int16_t mat_type, int32_t mat_index, HeatSafety heat) {
+     if (heat == HEAT_SAFETY_ANY)
+        return true;
+
+    MaterialInfo minfo(mat_type, mat_index);
+    df::job_item_flags2 ok;
+    df::job_item_flags2 mask;
+    minfo.getMatchBits(ok, mask);
+
+    if (heat >= HEAT_SAFETY_MAGMA)
+        return ok.bits.magma_safe;
+    if (heat == HEAT_SAFETY_FIRE)
+        return ok.bits.fire_safe || ok.bits.magma_safe;
+    return false;
+}
+
+bool matchesFilters(df::item * item, const df::job_item * jitem, HeatSafety heat, const ItemFilter &item_filter, const std::set<string> &specials) {
+    // check the properties that are not checked by Job::isSuitableItem()
+    if (jitem->item_type > -1 && jitem->item_type != item->getType())
+        return false;
+
+    if (jitem->item_subtype > -1 &&
+        jitem->item_subtype != item->getSubtype())
+        return false;
+
+    if (jitem->flags2.bits.building_material && !item->isBuildMat())
+        return false;
+
+    if ((jitem->flags1.bits.empty || jitem->flags2.bits.lye_milk_free)) {
+        auto gref = Items::getGeneralRef(item, df::general_ref_type::CONTAINS_ITEM);
+        if (gref) {
+            if (jitem->flags1.bits.empty)
+                return false;
+            if (auto contained_item = gref->getItem(); contained_item) {
+                MaterialInfo mi;
+                mi.decode(contained_item);
+                if (mi.getToken() != "WATER")
+                    return false;
+            }
+        }
+    }
+
+    if (jitem->metal_ore > -1 && !item->isMetalOre(jitem->metal_ore))
+        return false;
+
+    if (jitem->has_tool_use > df::tool_uses::NONE
+        && !item->hasToolUse(jitem->has_tool_use))
+        return false;
+
+    if (item->getType() == df::item_type::SLAB && specials.count("engraved")
+        && static_cast<df::item_slabst *>(item)->engraving_type != df::slab_engraving_type::Memorial)
+        return false;
+
+    if (item->getType() == df::item_type::CAGE && specials.count("empty")
+        && (Items::getGeneralRef(item, df::general_ref_type::CONTAINS_UNIT)
+            || Items::getGeneralRef(item, df::general_ref_type::CONTAINS_ITEM)))
+        return false;
+
+    if (!matchesHeatSafety(item->getMaterial(), item->getMaterialIndex(), heat))
+        return false;
+
+    return Job::isSuitableItem(
+            jitem, item->getType(), item->getSubtype())
+        && Job::isSuitableMaterial(
+            jitem, item->getMaterial(), item->getMaterialIndex(),
+            item->getType())
+        && item_filter.matches(item);
+}
+
+bool isJobReady(color_ostream &out, const std::vector<df::job_item *> &jitems) {
+    int needed_items = 0;
+    for (auto job_item : jitems) { needed_items += job_item->quantity; }
+    if (needed_items) {
+        DEBUG(cycle,out).print("building needs %d more item(s)\n", needed_items);
+        return false;
+    }
+    return true;
+}
+
+static bool job_item_idx_lt(df::job_item_ref *a, df::job_item_ref *b) {
+    // we want the items in the opposite order of the filters
+    return a->job_item_idx > b->job_item_idx;
+}
+
+// this function does not remove the job_items since their quantity fields are
+// now all at 0, so there is no risk of having extra items attached. we don't
+// remove them to keep the "finalize with buildingplan active" path as similar
+// as possible to the "finalize with buildingplan disabled" path.
+void finalizeBuilding(color_ostream &out, df::building *bld, bool unsuspend_on_finalize) {
+    DEBUG(cycle,out).print("finalizing building %d\n", bld->id);
+    auto job = bld->jobs[0];
+
+    // sort the items so they get added to the structure in the correct order
+    std::sort(job->items.begin(), job->items.end(), job_item_idx_lt);
+
+    // derive the material properties of the building and job from the first
+    // applicable item. if any boulders are involved, it makes the whole
+    // structure "rough".
+    bool rough = false;
+    for (auto attached_item : job->items) {
+        df::item *item = attached_item->item;
+        rough = rough || item->getType() == df::item_type::BOULDER;
+        if (bld->mat_type == -1) {
+            bld->mat_type = item->getMaterial();
+            job->mat_type = bld->mat_type;
+        }
+        if (bld->mat_index == -1) {
+            bld->mat_index = item->getMaterialIndex();
+            job->mat_index = bld->mat_index;
+        }
+    }
+
+    if (bld->needsDesign()) {
+        auto act = (df::building_actual *)bld;
+        if (!act->design)
+            act->design = new df::building_design();
+        act->design->flags.bits.rough = rough;
+    }
+
+    // we're good to go!
+    if (unsuspend_on_finalize) {
+        job->flags.bits.suspend = false;
+        Job::checkBuildingsNow();
+    }
+}
+
+static df::building * popInvalidTasks(color_ostream &out, Bucket &task_queue,
+        unordered_map<int32_t, PlannedBuilding> &planned_buildings) {
+    while (!task_queue.empty()) {
+        auto & task = task_queue.front();
+        auto id = task.first;
+        if (planned_buildings.count(id) > 0) {
+            auto bld = planned_buildings.at(id).getBuildingIfValidOrRemoveIfNot(out);
+            if (bld && bld->jobs[0]->job_items[task.second]->quantity)
+                return bld;
+        }
+        DEBUG(cycle,out).print("discarding invalid task: bld=%d, job_item_idx=%d\n", id, task.second);
+        task_queue.pop_front();
+    }
+    return NULL;
+}
+
+static void doVector(color_ostream &out, df::job_item_vector_id vector_id,
+        map<string, Bucket> &buckets,
+        unordered_map<int32_t, PlannedBuilding> &planned_buildings,
+        bool unsuspend_on_finalize) {
+    auto other_id = ENUM_ATTR(job_item_vector_id, other, vector_id);
+    auto item_vector = df::global::world->items.other[other_id];
+    DEBUG(cycle,out).print("matching %zu item(s) in vector %s against %zu filter bucket(s)\n",
+          item_vector.size(),
+          ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+          buckets.size());
+    for (auto item_it = item_vector.rbegin();
+            item_it != item_vector.rend();
+            ++item_it) {
+        auto item = *item_it;
+        if (!itemPassesScreen(out, item))
+            continue;
+        for (auto bucket_it = buckets.begin(); bucket_it != buckets.end(); ) {
+            TRACE(cycle,out).print("scanning bucket: %s/%s\n",
+                    ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(), bucket_it->first.c_str());
+            auto & task_queue = bucket_it->second;
+            auto bld = popInvalidTasks(out, task_queue, planned_buildings);
+            if (!bld) {
+                DEBUG(cycle,out).print("removing empty bucket: %s/%s; %zu bucket(s) left\n",
+                      ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                      bucket_it->first.c_str(),
+                      buckets.size() - 1);
+                bucket_it = buckets.erase(bucket_it);
+                continue;
+            }
+            auto & task = task_queue.front();
+            auto id = task.first;
+            auto job = bld->jobs[0];
+            auto & jitems = job->job_items;
+            const size_t num_filters = jitems.size();
+            auto filter_idx = task.second;
+            const int rev_filter_idx = num_filters - (filter_idx+1);
+            auto &pb = planned_buildings.at(id);
+            if (matchesFilters(item, jitems[filter_idx], pb.heat_safety,
+                        pb.item_filters[rev_filter_idx], pb.specials)
+                    && Job::attachJobItem(job, item,
+                        df::job_item_ref::Hauled, filter_idx))
+            {
+                MaterialInfo material;
+                material.decode(item);
+                ItemTypeInfo item_type;
+                item_type.decode(item);
+                DEBUG(cycle,out).print("attached %s %s to filter %d for %s(%d): %s/%s\n",
+                      material.toString().c_str(),
+                      item_type.toString().c_str(),
+                      filter_idx,
+                      ENUM_KEY_STR(building_type, bld->getType()).c_str(),
+                      id,
+                      ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                      bucket_it->first.c_str());
+                // keep quantity aligned with the actual number of remaining
+                // items so if buildingplan is turned off, the building will
+                // be completed with the correct number of items.
+                --jitems[filter_idx]->quantity;
+                task_queue.pop_front();
+                if (isJobReady(out, jitems)) {
+                    finalizeBuilding(out, bld, unsuspend_on_finalize);
+                    planned_buildings.at(id).remove(out);
+                }
+                if (task_queue.empty()) {
+                    DEBUG(cycle,out).print(
+                        "removing empty item bucket: %s/%s; %zu left\n",
+                        ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                        bucket_it->first.c_str(),
+                        buckets.size() - 1);
+                    buckets.erase(bucket_it);
+                }
+                // we found a home for this item; no need to look further
+                break;
+            }
+            ++bucket_it;
+        }
+        if (buckets.empty())
+            break;
+    }
+}
+
+struct VectorsToScanLast {
+    std::vector<df::job_item_vector_id> vectors;
+    VectorsToScanLast() {
+        // order is important here. we want to match boulders before wood and
+        // everything before bars. blocks are not listed here since we'll have
+        // already scanned them when we did the first pass through the buckets.
+        vectors.push_back(df::job_item_vector_id::BOULDER);
+        vectors.push_back(df::job_item_vector_id::WOOD);
+        vectors.push_back(df::job_item_vector_id::BAR);
+        vectors.push_back(df::job_item_vector_id::IN_PLAY);
+    }
+};
+
+void buildingplan_cycle(color_ostream &out, Tasks &tasks,
+        unordered_map<int32_t, PlannedBuilding> &planned_buildings, bool unsuspend_on_finalize) {
+    static const VectorsToScanLast vectors_to_scan_last;
+
+    DEBUG(cycle,out).print(
+            "running buildingplan cycle for %zu registered buildings\n",
+            planned_buildings.size());
+
+    for (auto it = tasks.begin(); it != tasks.end(); ) {
+        auto vector_id = it->first;
+        // we could make this a set, but it's only a few elements
+        if (std::find(vectors_to_scan_last.vectors.begin(),
+                      vectors_to_scan_last.vectors.end(),
+                      vector_id) != vectors_to_scan_last.vectors.end()) {
+            ++it;
+            continue;
+        }
+
+        auto & buckets = it->second;
+        doVector(out, vector_id, buckets, planned_buildings, unsuspend_on_finalize);
+        if (buckets.empty()) {
+            DEBUG(cycle,out).print("removing empty vector: %s; %zu vector(s) left\n",
+                  ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                  tasks.size() - 1);
+            it = tasks.erase(it);
+        }
+        else
+            ++it;
+    }
+    for (auto vector_id : vectors_to_scan_last.vectors) {
+        if (tasks.count(vector_id) == 0)
+            continue;
+        auto & buckets = tasks[vector_id];
+        doVector(out, vector_id, buckets, planned_buildings, unsuspend_on_finalize);
+        if (buckets.empty()) {
+            DEBUG(cycle,out).print("removing empty vector: %s; %zu vector(s) left\n",
+                  ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                  tasks.size() - 1);
+            tasks.erase(vector_id);
+        }
+    }
+    DEBUG(cycle,out).print("cycle done; %zu registered building(s) left\n",
+          planned_buildings.size());
+}
diff --git a/plugins/buildingplan/buildingtypekey.cpp b/plugins/buildingplan/buildingtypekey.cpp
new file mode 100644
index 000000000..664fdf27d
--- /dev/null
+++ b/plugins/buildingplan/buildingtypekey.cpp
@@ -0,0 +1,59 @@
+#include "buildingplan.h"
+#include "buildingtypekey.h"
+
+#include "Debug.h"
+#include "MiscUtils.h"
+
+using std::string;
+using std::vector;
+
+namespace DFHack {
+    DBG_EXTERN(buildingplan, status);
+}
+
+using namespace DFHack;
+
+// building type, subtype, custom
+BuildingTypeKey::BuildingTypeKey(df::building_type type, int16_t subtype, int32_t custom)
+        : tuple(type, subtype, custom) { }
+
+static BuildingTypeKey deserialize(color_ostream &out, const std::string &serialized) {
+    vector<string> key_parts;
+    split_string(&key_parts, serialized, ",");
+    if (key_parts.size() != 3) {
+        WARN(status,out).print("invalid key_str: '%s'\n", serialized.c_str());
+        return BuildingTypeKey(df::building_type::NONE, -1, -1);
+    }
+    return BuildingTypeKey((df::building_type)string_to_int(key_parts[0]),
+                        string_to_int(key_parts[1]), string_to_int(key_parts[2]));
+}
+
+BuildingTypeKey::BuildingTypeKey(color_ostream &out, const std::string &serialized)
+        :tuple(deserialize(out, serialized)) { }
+
+string BuildingTypeKey::serialize() const {
+    std::ostringstream ser;
+    ser << std::get<0>(*this) << ",";
+    ser << std::get<1>(*this) << ",";
+    ser << std::get<2>(*this);
+    return ser.str();
+}
+
+// rotates a size_t value left by count bits
+// assumes count is not 0 or >= size_t_bits
+// replace this with std::rotl when we move to C++20
+static std::size_t rotl_size_t(size_t val, uint32_t count)
+{
+    static const int size_t_bits = CHAR_BIT * sizeof(std::size_t);
+    return val << count | val >> (size_t_bits - count);
+}
+
+std::size_t BuildingTypeKeyHash::operator() (const BuildingTypeKey & key) const {
+    // cast first param to appease gcc-4.8, which is missing the enum
+    // specializations for std::hash
+    std::size_t h1 = std::hash<int32_t>()(static_cast<int32_t>(std::get<0>(key)));
+    std::size_t h2 = std::hash<int16_t>()(std::get<1>(key));
+    std::size_t h3 = std::hash<int32_t>()(std::get<2>(key));
+
+    return h1 ^ rotl_size_t(h2, 8) ^ rotl_size_t(h3, 16);
+}
diff --git a/plugins/buildingplan/buildingtypekey.h b/plugins/buildingplan/buildingtypekey.h
new file mode 100644
index 000000000..81bb043c5
--- /dev/null
+++ b/plugins/buildingplan/buildingtypekey.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "df/building_type.h"
+
+#include <tuple>
+#include <string>
+
+namespace DFHack {
+    class color_ostream;
+}
+
+// building type, subtype, custom
+struct BuildingTypeKey : public std::tuple<df::building_type, int16_t, int32_t> {
+    BuildingTypeKey(df::building_type type, int16_t subtype, int32_t custom);
+    BuildingTypeKey(DFHack::color_ostream &out, const std::string & serialized);
+
+    std::string serialize() const;
+};
+
+struct BuildingTypeKeyHash {
+    std::size_t operator() (const BuildingTypeKey & key) const;
+};
diff --git a/plugins/buildingplan/defaultitemfilters.cpp b/plugins/buildingplan/defaultitemfilters.cpp
new file mode 100644
index 000000000..069459841
--- /dev/null
+++ b/plugins/buildingplan/defaultitemfilters.cpp
@@ -0,0 +1,111 @@
+#include "defaultitemfilters.h"
+
+#include "Debug.h"
+#include "MiscUtils.h"
+
+#include "modules/World.h"
+
+namespace DFHack {
+    DBG_EXTERN(buildingplan, status);
+}
+
+using std::string;
+using std::vector;
+using namespace DFHack;
+
+BuildingTypeKey DefaultItemFilters::getKey(PersistentDataItem &filter_config) {
+    return BuildingTypeKey(
+        (df::building_type)get_config_val(filter_config, FILTER_CONFIG_TYPE),
+                           get_config_val(filter_config, FILTER_CONFIG_SUBTYPE),
+                           get_config_val(filter_config, FILTER_CONFIG_CUSTOM));
+}
+
+static int get_max_quality(const df::job_item *jitem) {
+    if (jitem->flags2.bits.building_material ||
+            jitem->item_type == df::item_type::WOOD ||
+            jitem->item_type == df::item_type::BLOCKS ||
+            jitem->item_type == df::item_type::BAR ||
+            jitem->item_type == df::item_type::BOULDER)
+        return df::item_quality::Ordinary;
+
+    return df::item_quality::Masterful;
+}
+
+static string serialize(const std::vector<ItemFilter> &item_filters, const std::set<std::string> &specials) {
+    std::ostringstream out;
+    out << serialize_item_filters(item_filters);
+    out << "|" << join_strings(",", specials);
+    return out.str();
+}
+
+DefaultItemFilters::DefaultItemFilters(color_ostream &out, BuildingTypeKey key, const std::vector<const df::job_item *> &jitems)
+        : key(key), choose_items(ItemSelectionChoice::ITEM_SELECTION_CHOICE_FILTER) {
+    DEBUG(status,out).print("creating persistent data for filter key %d,%d,%d\n",
+                            std::get<0>(key), std::get<1>(key), std::get<2>(key));
+    filter_config = World::AddPersistentData(FILTER_CONFIG_KEY);
+    set_config_val(filter_config, FILTER_CONFIG_TYPE, std::get<0>(key));
+    set_config_val(filter_config, FILTER_CONFIG_SUBTYPE, std::get<1>(key));
+    set_config_val(filter_config, FILTER_CONFIG_CUSTOM, std::get<2>(key));
+    set_config_val(filter_config, FILTER_CONFIG_CHOOSE_ITEMS, choose_items);
+    item_filters.resize(jitems.size());
+    for (size_t idx = 0; idx < jitems.size(); ++idx) {
+        item_filters[idx].setMaxQuality(get_max_quality(jitems[idx]), true);
+    }
+    filter_config.val() = serialize(item_filters, specials);
+}
+
+DefaultItemFilters::DefaultItemFilters(color_ostream &out, PersistentDataItem &filter_config, const std::vector<const df::job_item *> &jitems)
+        : key(getKey(filter_config)), filter_config(filter_config) {
+    choose_items = get_config_val(filter_config, FILTER_CONFIG_CHOOSE_ITEMS);
+    if (choose_items < ItemSelectionChoice::ITEM_SELECTION_CHOICE_FILTER ||
+            choose_items > ItemSelectionChoice::ITEM_SELECTION_CHOICE_AUTOMATERIAL)
+        choose_items = ItemSelectionChoice::ITEM_SELECTION_CHOICE_FILTER;
+    auto &serialized = filter_config.val();
+    DEBUG(status,out).print("deserializing default item filters for key %d,%d,%d: %s\n",
+        std::get<0>(key), std::get<1>(key), std::get<2>(key), serialized.c_str());
+    if (!jitems.size())
+        return;
+    std::vector<std::string> elems;
+    split_string(&elems, serialized, "|");
+    std::vector<ItemFilter> filters = deserialize_item_filters(out, elems[0]);
+    if (filters.size() != jitems.size()) {
+        WARN(status,out).print("ignoring invalid filters_str for key %d,%d,%d: '%s'\n",
+            std::get<0>(key), std::get<1>(key), std::get<2>(key), serialized.c_str());
+        item_filters.resize(jitems.size());
+    } else
+        item_filters = filters;
+    if (elems.size() > 1) {
+        vector<string> specs;
+        split_string(&specs, elems[1], ",");
+        for (auto & special : specs) {
+            if (special.size())
+                specials.emplace(special);
+        }
+    }
+}
+
+void DefaultItemFilters::setChooseItems(int choose) {
+    choose_items = choose;
+    set_config_val(filter_config, FILTER_CONFIG_CHOOSE_ITEMS, choose);
+}
+
+void DefaultItemFilters::setSpecial(const std::string &special, bool val) {
+    if (val)
+        specials.emplace(special);
+    else
+        specials.erase(special);
+    filter_config.val() = serialize(item_filters, specials);
+}
+
+void DefaultItemFilters::setItemFilter(DFHack::color_ostream &out, const ItemFilter &filter, int index) {
+    if (index < 0 || item_filters.size() <= (size_t)index) {
+        WARN(status,out).print("invalid index for filter key %d,%d,%d: %d\n",
+                std::get<0>(key), std::get<1>(key), std::get<2>(key), index);
+        return;
+    }
+
+    item_filters[index] = filter;
+    filter_config.val() = serialize(item_filters, specials);
+    DEBUG(status,out).print("updated item filter and persisted for key %d,%d,%d: %s\n",
+        std::get<0>(key), std::get<1>(key), std::get<2>(key), filter_config.val().c_str());
+}
diff --git a/plugins/buildingplan/defaultitemfilters.h b/plugins/buildingplan/defaultitemfilters.h
new file mode 100644
index 000000000..7d285ce4c
--- /dev/null
+++ b/plugins/buildingplan/defaultitemfilters.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "buildingplan.h"
+#include "buildingtypekey.h"
+
+#include "modules/Persistence.h"
+
+class DefaultItemFilters {
+public:
+    static BuildingTypeKey getKey(DFHack::PersistentDataItem &filter_config);
+
+    const BuildingTypeKey key;
+
+    DefaultItemFilters(DFHack::color_ostream &out, BuildingTypeKey key, const std::vector<const df::job_item *> &jitems);
+    DefaultItemFilters(DFHack::color_ostream &out, DFHack::PersistentDataItem &filter_config, const std::vector<const df::job_item *> &jitems);
+
+    void setChooseItems(int choose);
+    void setItemFilter(DFHack::color_ostream &out, const ItemFilter &filter, int index);
+    void setSpecial(const std::string &special, bool val);
+
+    int getChooseItems() const { return choose_items; }
+    const std::vector<ItemFilter> & getItemFilters() const { return item_filters; }
+    const std::set<std::string> & getSpecials() const { return specials; }
+
+private:
+    DFHack::PersistentDataItem filter_config;
+    int choose_items;
+    std::vector<ItemFilter> item_filters;
+    std::set<std::string> specials;
+};
diff --git a/plugins/buildingplan/itemfilter.cpp b/plugins/buildingplan/itemfilter.cpp
new file mode 100644
index 000000000..3ef4206eb
--- /dev/null
+++ b/plugins/buildingplan/itemfilter.cpp
@@ -0,0 +1,195 @@
+#include "itemfilter.h"
+
+#include "Debug.h"
+
+#include "df/item.h"
+
+namespace DFHack {
+    DBG_EXTERN(buildingplan, status);
+    DBG_EXTERN(buildingplan, cycle);
+}
+
+using std::set;
+using std::string;
+using std::vector;
+
+using namespace DFHack;
+
+ItemFilter::ItemFilter() : default_max_quality(df::item_quality::Masterful) {
+    clear();
+}
+
+void ItemFilter::clear() {
+    min_quality = df::item_quality::Ordinary;
+    max_quality = default_max_quality;
+    decorated_only = false;
+    mat_mask.whole = 0;
+    materials.clear();
+}
+
+bool ItemFilter::isEmpty() const {
+    return min_quality == df::item_quality::Ordinary
+            && max_quality == default_max_quality
+            && !decorated_only
+            && !mat_mask.whole
+            && materials.empty();
+}
+
+static bool deserializeMaterialMask(const string& ser, df::dfhack_material_category& mat_mask) {
+    if (ser.empty())
+        return true;
+
+    if (!parseJobMaterialCategory(&mat_mask, ser)) {
+        DEBUG(status).print("invalid job material category serialization: '%s'", ser.c_str());
+        return false;
+    }
+    return true;
+}
+
+static bool deserializeMaterials(const string& ser, set<DFHack::MaterialInfo> &materials) {
+    if (ser.empty())
+        return true;
+
+    vector<string> mat_names;
+    split_string(&mat_names, ser, ",");
+    for (auto m = mat_names.begin(); m != mat_names.end(); m++) {
+        DFHack::MaterialInfo material;
+        if (!material.find(*m) || !material.isValid()) {
+            DEBUG(status).print("invalid material name serialization: '%s'", ser.c_str());
+            return false;
+        }
+        materials.emplace(material);
+    }
+    return true;
+}
+
+ItemFilter::ItemFilter(color_ostream &out, const string& serialized) : ItemFilter() {
+    vector<string> tokens;
+    split_string(&tokens, serialized, "/");
+    if (tokens.size() < 5) {
+        DEBUG(status,out).print("invalid ItemFilter serialization: '%s'", serialized.c_str());
+        return;
+    }
+
+    if (!deserializeMaterialMask(tokens[0], mat_mask) || !deserializeMaterials(tokens[1], materials))
+        return;
+
+    setMinQuality(atoi(tokens[2].c_str()));
+    setMaxQuality(atoi(tokens[3].c_str()));
+    decorated_only = static_cast<bool>(atoi(tokens[4].c_str()));
+
+    if (tokens.size() >= 6)
+        default_max_quality = static_cast<df::item_quality>(atoi(tokens[5].c_str()));
+}
+
+// format: mat,mask,elements/materials,list/minq/maxq/decorated
+string ItemFilter::serialize() const {
+    std::ostringstream ser;
+    ser << bitfield_to_string(mat_mask, ",") << "/";
+    vector<string> matstrs;
+    for (auto &mat : materials)
+        matstrs.emplace_back(mat.getToken());
+    ser << join_strings(",", matstrs);
+    ser << "/" << static_cast<int>(min_quality);
+    ser << "/" << static_cast<int>(max_quality);
+    ser << "/" << static_cast<int>(decorated_only);
+    ser << "/" << static_cast<int>(default_max_quality);
+    return ser.str();
+}
+
+static void clampItemQuality(df::item_quality *quality) {
+    if (*quality > df::item_quality::Artifact) {
+        DEBUG(status).print("clamping quality to Artifact");
+        *quality = df::item_quality::Artifact;
+    }
+    if (*quality < df::item_quality::Ordinary) {
+        DEBUG(status).print("clamping quality to Ordinary");
+        *quality = df::item_quality::Ordinary;
+    }
+}
+
+void ItemFilter::setMinQuality(int quality) {
+    min_quality = static_cast<df::item_quality>(quality);
+    clampItemQuality(&min_quality);
+    if (max_quality < min_quality)
+        max_quality = min_quality;
+}
+
+void ItemFilter::setMaxQuality(int quality, bool is_default) {
+    max_quality = static_cast<df::item_quality>(quality);
+    clampItemQuality(&max_quality);
+    if (max_quality < min_quality)
+        min_quality = max_quality;
+    if (is_default)
+        default_max_quality = max_quality;
+}
+
+void ItemFilter::setDecoratedOnly(bool decorated) {
+    decorated_only = decorated;
+}
+
+void ItemFilter::setMaterialMask(uint32_t mask) {
+    mat_mask.whole = mask;
+}
+
+void ItemFilter::setMaterials(const set<DFHack::MaterialInfo> &materials) {
+    this->materials = materials;
+}
+
+static bool matchesMask(DFHack::MaterialInfo &mat, df::dfhack_material_category mat_mask) {
+    return mat_mask.whole ? mat.matches(mat_mask) : true;
+}
+
+bool ItemFilter::matches(df::dfhack_material_category mask) const {
+    return mask.whole & mat_mask.whole;
+}
+
+bool ItemFilter::matches(DFHack::MaterialInfo &material) const {
+    for (auto &mat : materials)
+        if (material.matches(mat))
+            return true;
+    return false;
+}
+
+bool ItemFilter::matches(df::item *item) const {
+    int16_t quality = (item->flags.bits.artifact ? df::item_quality::Artifact : item->getQuality());
+    if (quality < min_quality || quality > max_quality) {
+        TRACE(cycle).print("item outside of quality range (%d not between %d and %d)\n",
+                quality, min_quality, max_quality);
+        return false;
+    }
+
+    if (decorated_only && !item->hasImprovements()) {
+        TRACE(cycle).print("item needs improvements and doesn't have any\n");
+        return false;
+    }
+
+    if (!mat_mask.whole)
+        return true;
+
+    auto imattype = item->getActualMaterial();
+    auto imatindex = item->getActualMaterialIndex();
+    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
+
+    return (materials.size() == 0) ? matchesMask(item_mat, mat_mask) : matches(item_mat);
+}
+
+vector<ItemFilter> deserialize_item_filters(color_ostream &out, const string &serialized) {
+    vector<ItemFilter> filters;
+
+    vector<string> filter_strs;
+    split_string(&filter_strs, serialized, ";");
+    for (auto &str : filter_strs) {
+        filters.emplace_back(out, str);
+    }
+
+    return filters;
+}
+
+string serialize_item_filters(const vector<ItemFilter> &filters) {
+    vector<string> strs;
+    for (auto &filter : filters) {
+        strs.emplace_back(filter.serialize());
+    }
+    return join_strings(";", strs);
+}
diff --git a/plugins/buildingplan/itemfilter.h b/plugins/buildingplan/itemfilter.h
new file mode 100644
index 000000000..c74150434
--- /dev/null
+++ b/plugins/buildingplan/itemfilter.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "modules/Materials.h"
+
+#include "df/dfhack_material_category.h"
+#include "df/item_quality.h"
+
+class ItemFilter {
+public:
+    ItemFilter();
+    ItemFilter(DFHack::color_ostream &out, const std::string& serialized);
+
+    void clear();
+    bool isEmpty() const;
+    std::string serialize() const;
+
+    void setMinQuality(int quality);
+    void setMaxQuality(int quality, bool is_default = false);
+    void setDecoratedOnly(bool decorated);
+    void setMaterialMask(uint32_t mask);
+    void setMaterials(const std::set<DFHack::MaterialInfo> &materials);
+
+    df::item_quality getMinQuality() const { return min_quality; }
+    df::item_quality getMaxQuality() const {return max_quality; }
+    bool getDecoratedOnly() const { return decorated_only; }
+    df::dfhack_material_category getMaterialMask() const { return mat_mask; }
+    std::set<DFHack::MaterialInfo> getMaterials() const { return materials; }
+
+    bool matches(df::dfhack_material_category mask) const;
+    bool matches(DFHack::MaterialInfo &material) const;
+    bool matches(df::item *item) const;
+
+private:
+    df::item_quality min_quality;
+    df::item_quality max_quality;
+    df::item_quality default_max_quality;
+    bool decorated_only;
+    df::dfhack_material_category mat_mask;
+    std::set<DFHack::MaterialInfo> materials;
+};
+
+std::vector<ItemFilter> deserialize_item_filters(DFHack::color_ostream &out, const std::string &serialized);
+std::string serialize_item_filters(const std::vector<ItemFilter> &filters);
diff --git a/plugins/buildingplan/plannedbuilding.cpp b/plugins/buildingplan/plannedbuilding.cpp
new file mode 100644
index 000000000..b16da01cb
--- /dev/null
+++ b/plugins/buildingplan/plannedbuilding.cpp
@@ -0,0 +1,129 @@
+#include "plannedbuilding.h"
+#include "buildingplan.h"
+
+#include "Debug.h"
+#include "MiscUtils.h"
+
+#include "modules/World.h"
+
+#include "df/job.h"
+
+namespace DFHack {
+    DBG_EXTERN(buildingplan, status);
+}
+
+using std::set;
+using std::string;
+using std::vector;
+
+using namespace DFHack;
+
+static vector<vector<df::job_item_vector_id>> get_vector_ids(color_ostream &out, int bld_id) {
+    vector<vector<df::job_item_vector_id>> ret;
+
+    df::building *bld = df::building::find(bld_id);
+
+    if (!bld || bld->jobs.size() != 1)
+        return ret;
+
+    auto &jitems = bld->jobs[0]->job_items;
+    int num_job_items = (int)jitems.size();
+    for (int jitem_idx = num_job_items - 1; jitem_idx >= 0; --jitem_idx) {
+        ret.emplace_back(getVectorIds(out, jitems[jitem_idx], false));
+    }
+    return ret;
+}
+
+static vector<vector<df::job_item_vector_id>> deserialize_vector_ids(color_ostream &out, PersistentDataItem &bld_config) {
+    vector<vector<df::job_item_vector_id>> ret;
+
+    vector<string> rawstrs;
+    split_string(&rawstrs, bld_config.val(), "|");
+    const string &serialized = rawstrs[0];
+
+    DEBUG(status,out).print("deserializing vector ids for building %d: %s\n",
+            get_config_val(bld_config, BLD_CONFIG_ID), serialized.c_str());
+
+    vector<string> joined;
+    split_string(&joined, serialized, ";");
+    for (auto &str : joined) {
+        vector<string> lst;
+        split_string(&lst, str, ",");
+        vector<df::job_item_vector_id> ids;
+        for (auto &s : lst)
+            ids.emplace_back(df::job_item_vector_id(string_to_int(s)));
+        ret.emplace_back(ids);
+    }
+
+    if (!ret.size())
+        ret = get_vector_ids(out, get_config_val(bld_config, BLD_CONFIG_ID));
+
+    return ret;
+}
+
+static vector<ItemFilter> get_item_filters(color_ostream &out, PersistentDataItem &bld_config) {
+    vector<string> rawstrs;
+    split_string(&rawstrs, bld_config.val(), "|");
+    if (rawstrs.size() < 2)
+        return vector<ItemFilter>();
+    return deserialize_item_filters(out, rawstrs[1]);
+}
+
+static set<string> get_specials(color_ostream &out, PersistentDataItem &bld_config) {
+    vector<string> rawstrs;
+    split_string(&rawstrs, bld_config.val(), "|");
+    set<string> ret;
+    if (rawstrs.size() < 3)
+        return ret;
+    vector<string> specials;
+    split_string(&specials, rawstrs[2], ",");
+    for (auto & special : specials)
+        ret.emplace(special);
+    return ret;
+}
+
+static string serialize(const vector<vector<df::job_item_vector_id>> &vector_ids, const DefaultItemFilters &item_filters) {
+    vector<string> joined;
+    for (auto &vec_list : vector_ids) {
+        joined.emplace_back(join_strings(",", vec_list));
+    }
+    std::ostringstream out;
+    out << join_strings(";", joined);
+    out << "|" << serialize_item_filters(item_filters.getItemFilters());
+    out << "|" << join_strings(",", item_filters.getSpecials());
+    return out.str();
+}
+
+PlannedBuilding::PlannedBuilding(color_ostream &out, df::building *bld, HeatSafety heat, const DefaultItemFilters &item_filters)
+        : id(bld->id), vector_ids(get_vector_ids(out, id)), heat_safety(heat),
+          item_filters(item_filters.getItemFilters()),
+          specials(item_filters.getSpecials()) {
+    DEBUG(status,out).print("creating persistent data for building %d\n", id);
+    bld_config = World::AddPersistentData(BLD_CONFIG_KEY);
+    set_config_val(bld_config, BLD_CONFIG_ID, id);
+    set_config_val(bld_config, BLD_CONFIG_HEAT, heat_safety);
+    bld_config.val() = serialize(vector_ids, item_filters);
+    DEBUG(status,out).print("serialized state for building %d: %s\n", id, bld_config.val().c_str());
+}
+
+PlannedBuilding::PlannedBuilding(color_ostream &out, PersistentDataItem &bld_config)
+    : id(get_config_val(bld_config, BLD_CONFIG_ID)),
+        vector_ids(deserialize_vector_ids(out, bld_config)),
+        heat_safety((HeatSafety)get_config_val(bld_config, BLD_CONFIG_HEAT)),
+        item_filters(get_item_filters(out, bld_config)),
+        specials(get_specials(out, bld_config)),
+        bld_config(bld_config) { }
+
+// Ensure the building still exists and is in a valid state. It can disappear
+// for lots of reasons, such as running the game with the buildingplan plugin
+// disabled, manually removing the building, modifying it via the API, etc.
+df::building * PlannedBuilding::getBuildingIfValidOrRemoveIfNot(color_ostream &out, bool skip_remove) {
+    auto bld = df::building::find(id);
+    bool valid = bld && bld->getBuildStage() == 0;
+    if (!valid) {
+        if (!skip_remove)
+            remove(out);
+        return NULL;
+    }
+    return bld;
+}
diff --git a/plugins/buildingplan/plannedbuilding.h b/plugins/buildingplan/plannedbuilding.h
new file mode 100644
index 000000000..703d4246d
--- /dev/null
+++ b/plugins/buildingplan/plannedbuilding.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "buildingplan.h"
+#include "defaultitemfilters.h"
+#include "itemfilter.h"
+
+#include "Core.h"
+
+#include "modules/Persistence.h"
+
+#include "df/building.h"
+#include "df/job_item_vector_id.h"
+
+class PlannedBuilding {
+public:
+    const df::building::key_field_type id;
+
+    // job_item idx -> list of vectors the task is linked to
+    const std::vector<std::vector<df::job_item_vector_id>> vector_ids;
+
+    const HeatSafety heat_safety;
+
+    const std::vector<ItemFilter> item_filters;
+
+    const std::set<std::string> specials;
+
+    PlannedBuilding(DFHack::color_ostream &out, df::building *bld, HeatSafety heat, const DefaultItemFilters &item_filters);
+    PlannedBuilding(DFHack::color_ostream &out, DFHack::PersistentDataItem &bld_config);
+
+    void remove(DFHack::color_ostream &out);
+
+    // Ensure the building still exists and is in a valid state. It can disappear
+    // for lots of reasons, such as running the game with the buildingplan plugin
+    // disabled, manually removing the building, modifying it via the API, etc.
+    df::building * getBuildingIfValidOrRemoveIfNot(DFHack::color_ostream &out, bool skip_remove = false);
+
+private:
+    DFHack::PersistentDataItem bld_config;
+};
diff --git a/plugins/burrow.cpp b/plugins/burrow.cpp
new file mode 100644
index 000000000..8e4bfef2e
--- /dev/null
+++ b/plugins/burrow.cpp
@@ -0,0 +1,687 @@
+#include "Core.h"
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+#include "TileTypes.h"
+
+#include "modules/Burrows.h"
+#include "modules/EventManager.h"
+#include "modules/Job.h"
+#include "modules/Persistence.h"
+#include "modules/World.h"
+
+#include "df/block_burrow.h"
+#include "df/burrow.h"
+#include "df/map_block.h"
+#include "df/plotinfost.h"
+#include "df/tile_designation.h"
+#include "df/unit.h"
+#include "df/world.h"
+
+using std::vector;
+using std::string;
+using namespace DFHack;
+
+DFHACK_PLUGIN("burrow");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
+REQUIRE_GLOBAL(plotinfo);
+REQUIRE_GLOBAL(window_z);
+REQUIRE_GLOBAL(world);
+
+// logging levels can be dynamically controlled with the `debugfilter` command.
+namespace DFHack {
+    // for configuration-related logging
+    DBG_DECLARE(burrow, status, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(burrow, event, DebugCategory::LINFO);
+}
+
+static std::unordered_map<df::coord, df::tiletype> active_dig_jobs;
+
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+static void init_diggers(color_ostream& out);
+static void jobStartedHandler(color_ostream& out, void* ptr);
+static void jobCompletedHandler(color_ostream& out, void* ptr);
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector<PluginCommand> &commands) {
+    DEBUG(status, out).print("initializing %s\n", plugin_name);
+    commands.push_back(
+        PluginCommand("burrow",
+                      "Quickly adjust burrow tiles and units.",
+                      do_command));
+    return CR_OK;
+}
+
+static void reset() {
+    active_dig_jobs.clear();
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(status, out).print("%s from the API\n", is_enabled ? "enabled" : "disabled");
+        reset();
+        if (enable) {
+            init_diggers(out);
+            EventManager::registerListener(EventManager::EventType::JOB_STARTED, EventManager::EventHandler(jobStartedHandler, 0), plugin_self);
+            EventManager::registerListener(EventManager::EventType::JOB_COMPLETED, EventManager::EventHandler(jobCompletedHandler, 0), plugin_self);
+        } else {
+            EventManager::unregisterAll(plugin_self);
+        }
+    }
+    else {
+        DEBUG(status, out).print("%s from the API, but already %s; no action\n", is_enabled ? "enabled" : "disabled", is_enabled ? "enabled" : "disabled");
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown(color_ostream &out) {
+    DEBUG(status, out).print("shutting down %s\n", plugin_name);
+    reset();
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED)
+        reset();
+    return CR_OK;
+}
+
+static bool call_burrow_lua(color_ostream *out, const char *fn_name,
+        int nargs = 0, int nres = 0,
+        Lua::LuaLambda && args_lambda = Lua::DEFAULT_LUA_LAMBDA,
+        Lua::LuaLambda && res_lambda = Lua::DEFAULT_LUA_LAMBDA) {
+    DEBUG(status).print("calling %s lua function: '%s'\n", plugin_name, fn_name);
+
+    CoreSuspender guard;
+
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!out)
+        out = &Core::getInstance().getConsole();
+
+    return Lua::CallLuaModuleFunction(*out, L, "plugins.burrow", fn_name,
+            nargs, nres,
+            std::forward<Lua::LuaLambda&&>(args_lambda),
+            std::forward<Lua::LuaLambda&&>(res_lambda));
+}
+
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
+
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+
+    bool show_help = false;
+    if (!call_burrow_lua(&out, "parse_commandline", parameters.size(), 1,
+            [&](lua_State *L) {
+                for (const string &param : parameters)
+                    Lua::Push(L, param);
+            },
+            [&](lua_State *L) {
+                show_help = !lua_toboolean(L, -1);
+            })) {
+        return CR_FAILURE;
+    }
+
+    return show_help ? CR_WRONG_USAGE : CR_OK;
+}
+
+/////////////////////////////////////////////////////
+// listener logic
+//
+
+static void init_diggers(color_ostream& out) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        DEBUG(status, out).print("world not yet loaded; not scanning jobs\n");
+        return;
+    }
+
+    std::vector<df::job*> pvec;
+    int start_id = 0;
+    if (Job::listNewlyCreated(&pvec, &start_id)) {
+        for (auto job : pvec) {
+            if (Job::getWorker(job))
+                jobStartedHandler(out, job);
+        }
+    }
+}
+
+static void jobStartedHandler(color_ostream& out, void* ptr) {
+    DEBUG(event, out).print("entering jobStartedHandler\n");
+
+    df::job *job = (df::job *)ptr;
+    auto type = ENUM_ATTR(job_type, type, job->job_type);
+    if (type != job_type_class::Digging)
+        return;
+
+    const df::coord &pos = job->pos;
+    DEBUG(event, out).print("dig job started: id=%d, pos=(%d,%d,%d), type=%s\n",
+            job->id, pos.x, pos.y, pos.z, ENUM_KEY_STR(job_type, job->job_type).c_str());
+    df::tiletype *tt = Maps::getTileType(pos);
+    if (tt)
+        active_dig_jobs[pos] = *tt;
+}
+
+static void add_walls_to_burrow(color_ostream &out, df::burrow* b,
+    const df::coord & pos1, const df::coord & pos2)
+{
+    for (int z = pos1.z; z <= pos2.z; z++) {
+        for (int y = pos1.y; y <= pos2.y; y++) {
+            for (int x = pos1.x; x <= pos2.x; x++) {
+                df::coord pos(x,y,z);
+                df::tiletype *tt = Maps::getTileType(pos);
+                if (tt && isWallTerrain(*tt))
+                    Burrows::setAssignedTile(b, pos, true);
+            }
+        }
+    }
+}
+
+static void expand_burrows(color_ostream &out, const df::coord & pos, df::tiletype prev_tt, df::tiletype tt) {
+    if (!isWalkable(tt) && tileShape(tt) != tiletype_shape::RAMP_TOP)
+        return;
+
+    bool changed = false;
+    for (auto b : plotinfo->burrows.list) {
+        if (!b->name.ends_with('+') || !Burrows::isAssignedTile(b, pos))
+            continue;
+
+        if (!isWalkable(prev_tt)) {
+            changed = true;
+            add_walls_to_burrow(out, b, pos+df::coord(-1,-1,0), pos+df::coord(1,1,0));
+
+            if (isWalkableUp(tt))
+                Burrows::setAssignedTile(b, pos+df::coord(0,0,1), true);
+
+            if (tileShape(tt) == tiletype_shape::RAMP)
+                add_walls_to_burrow(out, b, pos+df::coord(-1,-1,1), pos+df::coord(1,1,1));
+        }
+
+        if (LowPassable(tt) && !LowPassable(prev_tt)) {
+            changed = true;
+            Burrows::setAssignedTile(b, pos-df::coord(0,0,1), true);
+            if (tileShape(tt) == tiletype_shape::RAMP_TOP)
+                add_walls_to_burrow(out, b, pos+df::coord(-1,-1,-1), pos+df::coord(1,1,-1));
+        }
+    }
+
+    if (changed)
+        Job::checkDesignationsNow();
+}
+
+static void jobCompletedHandler(color_ostream& out, void* ptr) {
+    DEBUG(event, out).print("entering jobCompletedHandler\n");
+
+    df::job *job = (df::job *)ptr;
+    auto type = ENUM_ATTR(job_type, type, job->job_type);
+    if (type != job_type_class::Digging)
+        return;
+
+    const df::coord &pos = job->pos;
+    DEBUG(event, out).print("dig job completed: id=%d, pos=(%d,%d,%d), type=%s\n",
+            job->id, pos.x, pos.y, pos.z, ENUM_KEY_STR(job_type, job->job_type).c_str());
+
+    df::tiletype prev_tt = active_dig_jobs[pos];
+    df::tiletype *tt = Maps::getTileType(pos);
+
+    if (tt && *tt && *tt != prev_tt)
+        expand_burrows(out, pos, prev_tt, *tt);
+
+    active_dig_jobs.erase(pos);
+}
+
+/////////////////////////////////////////////////////
+// Lua API
+//
+
+static void get_bool_field(lua_State *L, int idx, const char *name, bool *dest) {
+    lua_getfield(L, idx, name);
+    if (lua_isnil(L, -1)) {
+        lua_pop(L, 1);
+        return;
+    }
+    *dest = lua_toboolean(L, -1);
+    lua_pop(L, 1);
+}
+
+static void get_opts(lua_State *L, int idx, bool &zlevel) {
+    if (lua_gettop(L) < idx)
+        return;
+    get_bool_field(L, idx, "zlevel", &zlevel);
+}
+
+static bool get_int_field(lua_State *L, int idx, const char *name, int16_t *dest) {
+    lua_getfield(L, idx, name);
+    if (lua_isnil(L, -1)) {
+        lua_pop(L, 1);
+        return false;
+    }
+    *dest = lua_tointeger(L, -1);
+    lua_pop(L, 1);
+    return true;
+}
+
+static bool get_bounds(lua_State *L, int idx, df::coord &pos1, df::coord &pos2) {
+    return get_int_field(L, idx, "x1", &pos1.x) &&
+        get_int_field(L, idx, "y1", &pos1.y) &&
+        get_int_field(L, idx, "z1", &pos1.z) &&
+        get_int_field(L, idx, "x2", &pos2.x) &&
+        get_int_field(L, idx, "y2", &pos2.y) &&
+        get_int_field(L, idx, "z2", &pos2.z);
+}
+
+static df::burrow* get_burrow(lua_State *L, int idx) {
+    df::burrow *burrow = NULL;
+    if (lua_isuserdata(L, idx))
+        burrow = Lua::GetDFObject<df::burrow>(L, idx);
+    else if (lua_isstring(L, idx))
+        burrow = Burrows::findByName(luaL_checkstring(L, idx), true);
+    else if (lua_isinteger(L, idx))
+        burrow = df::burrow::find(luaL_checkinteger(L, idx));
+    return burrow;
+}
+
+static void copyTiles(df::burrow *target, df::burrow *source, bool enable) {
+    CHECK_NULL_POINTER(target);
+    CHECK_NULL_POINTER(source);
+
+    if (source == target) {
+        if (!enable)
+            Burrows::clearTiles(target);
+        return;
+    }
+
+    vector<df::map_block*> pvec;
+    Burrows::listBlocks(&pvec, source);
+
+    for (auto block : pvec) {
+        auto smask = Burrows::getBlockMask(source, block);
+        if (!smask)
+            continue;
+
+        auto tmask = Burrows::getBlockMask(target, block, enable);
+        if (!tmask)
+            continue;
+
+        if (enable) {
+            for (int j = 0; j < 16; j++)
+                tmask->tile_bitmask[j] |= smask->tile_bitmask[j];
+        } else {
+            for (int j = 0; j < 16; j++)
+                tmask->tile_bitmask[j] &= ~smask->tile_bitmask[j];
+
+            if (!tmask->has_assignments())
+                Burrows::deleteBlockMask(target, block, tmask);
+        }
+    }
+}
+
+static void setTilesByDesignation(df::burrow *target, df::tile_designation d_mask,
+                                  df::tile_designation d_value, bool enable) {
+    CHECK_NULL_POINTER(target);
+
+    auto &blocks = world->map.map_blocks;
+
+    for (auto block : blocks) {
+        df::block_burrow *mask = NULL;
+
+        for (int x = 0; x < 16; x++) {
+            for (int y = 0; y < 16; y++) {
+                if ((block->designation[x][y].whole & d_mask.whole) != d_value.whole)
+                    continue;
+
+                if (!mask)
+                    mask = Burrows::getBlockMask(target, block, enable);
+                if (!mask)
+                    goto next_block;
+
+                mask->setassignment(x, y, enable);
+            }
+        }
+
+        if (mask && !enable && !mask->has_assignments())
+            Burrows::deleteBlockMask(target, block, mask);
+
+    next_block:;
+    }
+}
+
+static bool setTilesByKeyword(df::burrow *target, std::string name, bool enable) {
+    CHECK_NULL_POINTER(target);
+
+    df::tile_designation mask;
+    df::tile_designation value;
+
+    if (name == "ABOVE_GROUND")
+        mask.bits.subterranean = true;
+    else if (name == "SUBTERRANEAN")
+        mask.bits.subterranean = value.bits.subterranean = true;
+    else if (name == "LIGHT")
+        mask.bits.light = value.bits.light = true;
+    else if (name == "DARK")
+        mask.bits.light = true;
+    else if (name == "OUTSIDE")
+        mask.bits.outside = value.bits.outside = true;
+    else if (name == "INSIDE")
+        mask.bits.outside = true;
+    else if (name == "HIDDEN")
+        mask.bits.hidden = value.bits.hidden = true;
+    else if (name == "REVEALED")
+        mask.bits.hidden = true;
+    else
+        return false;
+
+    setTilesByDesignation(target, mask, value, enable);
+    return true;
+}
+
+static void copyUnits(df::burrow *target, df::burrow *source, bool enable) {
+    CHECK_NULL_POINTER(target);
+    CHECK_NULL_POINTER(source);
+
+    if (source == target) {
+        if (!enable)
+            Burrows::clearUnits(target);
+        return;
+    }
+
+    for (size_t i = 0; i < source->units.size(); i++) {
+        if (auto unit = df::unit::find(source->units[i]))
+            Burrows::setAssignedUnit(target, unit, enable);
+    }
+}
+
+static int burrow_tiles_clear(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_tiles_clear\n");
+
+    lua_pushnil(L);   // first key
+    while (lua_next(L, 1)) {
+        df::burrow * burrow = get_burrow(L, -1);
+        if (burrow)
+            Burrows::clearTiles(burrow);
+        lua_pop(L, 1);  // remove value, leave key
+    }
+
+    return 0;
+}
+
+static void tiles_set_add_remove(lua_State *L, bool do_set, bool enable) {
+    df::burrow *target = get_burrow(L, 1);
+    if (!target) {
+        luaL_argerror(L, 1, "invalid burrow specifier or burrow not found");
+        return;
+    }
+
+    if (do_set)
+        Burrows::clearTiles(target);
+
+    lua_pushnil(L);   // first key
+    while (lua_next(L, 2)) {
+        if (!lua_isstring(L, -1) || !setTilesByKeyword(target, luaL_checkstring(L, -1), enable)) {
+            if (auto burrow = get_burrow(L, -1))
+                copyTiles(target, burrow, enable);
+        }
+        lua_pop(L, 1);  // remove value, leave key
+    }
+}
+
+static int burrow_tiles_set(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_tiles_set\n");
+    tiles_set_add_remove(L, true, true);
+    return 0;
+}
+
+static int burrow_tiles_add(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_tiles_add\n");
+    tiles_set_add_remove(L, false, true);
+    return 0;
+}
+
+static int burrow_tiles_remove(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_tiles_remove\n");
+    tiles_set_add_remove(L, false, false);
+    return 0;
+}
+
+static void box_fill(lua_State *L, bool enable) {
+    df::burrow *burrow = get_burrow(L, 1);
+    if (!burrow) {
+        luaL_argerror(L, 1, "invalid burrow specifier or burrow not found");
+        return;
+    }
+
+    df::coord pos_start, pos_end;
+    if (!get_bounds(L, 2, pos_start, pos_end)) {
+        luaL_argerror(L, 2, "invalid box bounds");
+        return;
+    }
+
+    for (int32_t z = pos_start.z; z <= pos_end.z; ++z) {
+        for (int32_t y = pos_start.y; y <= pos_end.y; ++y) {
+            for (int32_t x = pos_start.x; x <= pos_end.x; ++x) {
+                df::coord pos(x, y, z);
+                Burrows::setAssignedTile(burrow, pos, enable);
+            }
+        }
+    }
+}
+
+static int burrow_tiles_box_add(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_tiles_box_add\n");
+    box_fill(L, true);
+    return 0;
+}
+
+static int burrow_tiles_box_remove(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_tiles_box_remove\n");
+    box_fill(L, false);
+    return 0;
+}
+
+// ramp tops inherit walkability group of the tile below
+static uint16_t get_walk_group(const df::coord & pos) {
+    uint16_t walk = Maps::getWalkableGroup(pos);
+    if (walk)
+        return walk;
+    if (auto tt = Maps::getTileType(pos)) {
+        if (tileShape(*tt) == df::tiletype_shape::RAMP_TOP) {
+            df::coord pos_below(pos);
+            --pos_below.z;
+            walk = Maps::getWalkableGroup(pos_below);
+        }
+    }
+    return walk;
+}
+
+static void flood_fill(lua_State *L, bool enable) {
+    df::coord start_pos;
+    bool zlevel = false;
+
+    df::burrow *burrow = get_burrow(L, 1);
+    if (!burrow) {
+        luaL_argerror(L, 1, "invalid burrow specifier or burrow not found");
+        return;
+    }
+
+    Lua::CheckDFAssign(L, &start_pos, 2);
+    get_opts(L, 3, zlevel);
+
+    df::tile_designation *start_des = Maps::getTileDesignation(start_pos);
+    if (!start_des) {
+        luaL_argerror(L, 2, "invalid starting coordinates");
+        return;
+    }
+    uint16_t start_walk = Maps::getWalkableGroup(start_pos);
+
+    std::stack<df::coord> flood;
+    flood.emplace(start_pos);
+
+    while(!flood.empty()) {
+        const df::coord pos = flood.top();
+        flood.pop();
+
+        df::tile_designation *des = Maps::getTileDesignation(pos);
+        if(!des ||
+            des->bits.outside != start_des->bits.outside ||
+            des->bits.hidden != start_des->bits.hidden)
+        {
+            continue;
+        }
+
+        uint16_t walk = get_walk_group(pos);
+        if (!start_walk && walk)
+            continue;
+
+        if (pos != start_pos && enable == Burrows::isAssignedTile(burrow, pos))
+            continue;
+
+        Burrows::setAssignedTile(burrow, pos, enable);
+
+        // only go one tile outside of a walkability group
+        if (start_walk && start_walk != walk)
+            continue;
+
+        flood.emplace(pos.x-1, pos.y-1, pos.z);
+        flood.emplace(pos.x,   pos.y-1, pos.z);
+        flood.emplace(pos.x+1, pos.y-1, pos.z);
+        flood.emplace(pos.x-1, pos.y,   pos.z);
+        flood.emplace(pos.x+1, pos.y,   pos.z);
+        flood.emplace(pos.x-1, pos.y+1, pos.z);
+        flood.emplace(pos.x,   pos.y+1, pos.z);
+        flood.emplace(pos.x+1, pos.y+1, pos.z);
+
+        if (!zlevel) {
+            df::coord pos_above(pos);
+            ++pos_above.z;
+            df::tiletype *tt = Maps::getTileType(pos);
+            df::tiletype *tt_above = Maps::getTileType(pos_above);
+            if (tt_above && LowPassable(*tt_above))
+                flood.emplace(pos_above);
+            if (tt && LowPassable(*tt))
+                flood.emplace(pos.x, pos.y, pos.z-1);
+        }
+    }
+}
+
+static int burrow_tiles_flood_add(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_tiles_flood_add\n");
+    flood_fill(L, true);
+    return 0;
+}
+
+static int burrow_tiles_flood_remove(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_tiles_flood_remove\n");
+    flood_fill(L, false);
+    return 0;
+}
+
+static int burrow_units_clear(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_units_clear\n");
+
+    int32_t count = 0;
+    lua_pushnil(L);   // first key
+    while (lua_next(L, 1)) {
+        df::burrow * burrow = get_burrow(L, -1);
+        if (burrow) {
+            count += burrow->units.size();
+            Burrows::clearUnits(burrow);
+        }
+        lua_pop(L, 1);  // remove value, leave key
+    }
+
+    Lua::Push(L, count);
+    return 1;
+}
+
+static void units_set_add_remove(lua_State *L, bool do_set, bool enable) {
+    df::burrow *target = get_burrow(L, 1);
+    if (!target) {
+        luaL_argerror(L, 1, "invalid burrow specifier or burrow not found");
+        return;
+    }
+
+    if (do_set)
+        Burrows::clearUnits(target);
+
+    lua_pushnil(L);   // first key
+    while (lua_next(L, 2)) {
+        if (auto burrow = get_burrow(L, -1))
+            copyUnits(target, burrow, enable);
+        lua_pop(L, 1);  // remove value, leave key
+    }
+}
+
+static int burrow_units_set(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_units_set\n");
+    units_set_add_remove(L, true, true);
+    return 0;
+}
+
+static int burrow_units_add(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_units_add\n");
+    units_set_add_remove(L, false, true);
+    return 0;
+}
+
+static int burrow_units_remove(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering burrow_units_remove\n");
+    units_set_add_remove(L, false, false);
+    return 0;
+}
+
+DFHACK_PLUGIN_LUA_COMMANDS {
+    DFHACK_LUA_COMMAND(burrow_tiles_clear),
+    DFHACK_LUA_COMMAND(burrow_tiles_set),
+    DFHACK_LUA_COMMAND(burrow_tiles_add),
+    DFHACK_LUA_COMMAND(burrow_tiles_remove),
+    DFHACK_LUA_COMMAND(burrow_tiles_box_add),
+    DFHACK_LUA_COMMAND(burrow_tiles_box_remove),
+    DFHACK_LUA_COMMAND(burrow_tiles_flood_add),
+    DFHACK_LUA_COMMAND(burrow_tiles_flood_remove),
+    DFHACK_LUA_COMMAND(burrow_units_clear),
+    DFHACK_LUA_COMMAND(burrow_units_set),
+    DFHACK_LUA_COMMAND(burrow_units_add),
+    DFHACK_LUA_COMMAND(burrow_units_remove),
+    DFHACK_LUA_END
+};
diff --git a/plugins/burrows.cpp b/plugins/burrows.cpp
deleted file mode 100644
index 029b3c715..000000000
--- a/plugins/burrows.cpp
+++ /dev/null
@@ -1,682 +0,0 @@
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
-#include "PluginManager.h"
-#include "Error.h"
-
-#include "DataFuncs.h"
-#include "LuaTools.h"
-
-#include "modules/Gui.h"
-#include "modules/Job.h"
-#include "modules/Maps.h"
-#include "modules/MapCache.h"
-#include "modules/World.h"
-#include "modules/Units.h"
-#include "modules/Burrows.h"
-#include "TileTypes.h"
-
-#include "DataDefs.h"
-#include "df/ui.h"
-#include "df/world.h"
-#include "df/unit.h"
-#include "df/burrow.h"
-#include "df/map_block.h"
-#include "df/block_burrow.h"
-#include "df/job.h"
-#include "df/job_list_link.h"
-
-#include "MiscUtils.h"
-
-#include <stdlib.h>
-
-using std::vector;
-using std::string;
-using std::endl;
-using namespace DFHack;
-using namespace df::enums;
-using namespace dfproto;
-
-DFHACK_PLUGIN("burrows");
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(gamemode);
-
-/*
- * Initialization.
- */
-
-static command_result burrow(color_ostream &out, vector <string> & parameters);
-
-static void init_map(color_ostream &out);
-static void deinit_map(color_ostream &out);
-
-DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    commands.push_back(
-        PluginCommand("burrow",
-                      "Quick commands for burrow control.",
-                      burrow));
-
-    if (Core::getInstance().isMapLoaded())
-        init_map(out);
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    deinit_map(out);
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event) {
-    case SC_MAP_LOADED:
-        deinit_map(out);
-        if (gamemode &&
-            *gamemode == game_mode::DWARF)
-            init_map(out);
-        break;
-    case SC_MAP_UNLOADED:
-        deinit_map(out);
-        break;
-    default:
-        break;
-    }
-
-    return CR_OK;
-}
-
-/*
- * State change tracking.
- */
-
-static int name_burrow_id = -1;
-
-static void handle_burrow_rename(color_ostream &out, df::burrow *burrow);
-
-DEFINE_LUA_EVENT_1(onBurrowRename, handle_burrow_rename, df::burrow*);
-
-static void detect_burrow_renames(color_ostream &out)
-{
-    if (ui->main.mode == ui_sidebar_mode::Burrows &&
-        ui->burrows.in_edit_name_mode &&
-        ui->burrows.sel_id >= 0)
-    {
-        name_burrow_id = ui->burrows.sel_id;
-    }
-    else if (name_burrow_id >= 0)
-    {
-        auto burrow = df::burrow::find(name_burrow_id);
-        name_burrow_id = -1;
-        if (burrow)
-            onBurrowRename(out, burrow);
-    }
-}
-
-struct DigJob {
-    int id;
-    df::job_type job;
-    df::coord pos;
-    df::tiletype old_tile;
-};
-
-static int next_job_id_save = 0;
-static std::map<int,DigJob> diggers;
-
-static void handle_dig_complete(color_ostream &out, df::job_type job, df::coord pos,
-                                df::tiletype old_tile, df::tiletype new_tile, df::unit *worker);
-
-DEFINE_LUA_EVENT_5(onDigComplete, handle_dig_complete,
-                   df::job_type, df::coord, df::tiletype, df::tiletype, df::unit*);
-
-static void detect_digging(color_ostream &out)
-{
-    for (auto it = diggers.begin(); it != diggers.end();)
-    {
-        auto worker = df::unit::find(it->first);
-
-        if (!worker || !worker->job.current_job ||
-            worker->job.current_job->id != it->second.id)
-        {
-            //out.print("Dig job %d expired.\n", it->second.id);
-
-            df::coord pos = it->second.pos;
-
-            if (auto block = Maps::getTileBlock(pos))
-            {
-                df::tiletype new_tile = block->tiletype[pos.x&15][pos.y&15];
-
-                //out.print("Tile %d -> %d\n", it->second.old_tile, new_tile);
-
-                if (new_tile != it->second.old_tile)
-                {
-                    onDigComplete(out, it->second.job, pos, it->second.old_tile, new_tile, worker);
-                }
-            }
-
-            auto cur = it; ++it; diggers.erase(cur);
-        }
-        else
-            ++it;
-    }
-
-    std::vector<df::job*> jvec;
-
-    if (Job::listNewlyCreated(&jvec, &next_job_id_save))
-    {
-        for (size_t i = 0; i < jvec.size(); i++)
-        {
-            auto job = jvec[i];
-            auto type = ENUM_ATTR(job_type, type, job->job_type);
-            if (type != job_type_class::Digging)
-                continue;
-
-            auto worker = Job::getWorker(job);
-            if (!worker)
-                continue;
-
-            df::coord pos = job->pos;
-            auto block = Maps::getTileBlock(pos);
-            if (!block)
-                continue;
-
-            auto &info = diggers[worker->id];
-
-            //out.print("New dig job %d.\n", job->id);
-
-            info.id = job->id;
-            info.job = job->job_type;
-            info.pos = pos;
-            info.old_tile = block->tiletype[pos.x&15][pos.y&15];
-        }
-    }
-}
-
-DFHACK_PLUGIN_IS_ENABLED(active);
-
-static bool auto_grow = false;
-static std::vector<int> grow_burrows;
-
-DFhackCExport command_result plugin_onupdate(color_ostream &out)
-{
-    if (!active)
-        return CR_OK;
-
-    detect_burrow_renames(out);
-
-    if (auto_grow)
-        detect_digging(out);
-
-    return CR_OK;
-}
-
-/*
- * Config and processing
- */
-
-static std::map<std::string,int> name_lookup;
-
-static void parse_names()
-{
-    auto &list = ui->burrows.list;
-
-    grow_burrows.clear();
-    name_lookup.clear();
-
-    for (size_t i = 0; i < list.size(); i++)
-    {
-        auto burrow = list[i];
-
-        std::string name = burrow->name;
-
-        if (!name.empty())
-        {
-            name_lookup[name] = burrow->id;
-
-            if (name[name.size()-1] == '+')
-            {
-                grow_burrows.push_back(burrow->id);
-                name.resize(name.size()-1);
-            }
-
-            if (!name.empty())
-                name_lookup[name] = burrow->id;
-        }
-    }
-}
-
-static void reset_tracking()
-{
-    diggers.clear();
-    next_job_id_save = 0;
-}
-
-static void init_map(color_ostream &out)
-{
-    auto config = World::GetPersistentData("burrows/config");
-    if (config.isValid())
-    {
-        auto_grow = !!(config.ival(0) & 1);
-    }
-
-    parse_names();
-    name_burrow_id = -1;
-
-    reset_tracking();
-    active = true;
-
-    if (auto_grow && !grow_burrows.empty())
-        out.print("Auto-growing %zu burrows.\n", grow_burrows.size());
-}
-
-static void deinit_map(color_ostream &out)
-{
-    active = false;
-    auto_grow = false;
-    reset_tracking();
-}
-
-static PersistentDataItem create_config(color_ostream &out)
-{
-    bool created;
-    auto rv = World::GetPersistentData("burrows/config", &created);
-    if (created && rv.isValid())
-        rv.ival(0) = 0;
-    if (!rv.isValid())
-        out.printerr("Could not write configuration.");
-    return rv;
-}
-
-static void enable_auto_grow(color_ostream &out, bool enable)
-{
-    if (enable == auto_grow)
-        return;
-
-    auto config = create_config(out);
-    if (!config.isValid())
-        return;
-
-    if (enable)
-        config.ival(0) |= 1;
-    else
-        config.ival(0) &= ~1;
-
-    auto_grow = enable;
-
-    if (enable)
-        reset_tracking();
-}
-
-static void handle_burrow_rename(color_ostream &out, df::burrow *burrow)
-{
-    parse_names();
-}
-
-static void add_to_burrows(std::vector<df::burrow*> &burrows, df::coord pos)
-{
-    for (size_t i = 0; i < burrows.size(); i++)
-        Burrows::setAssignedTile(burrows[i], pos, true);
-}
-
-static void add_walls_to_burrows(color_ostream &out, std::vector<df::burrow*> &burrows,
-                                MapExtras::MapCache &mc, df::coord pos1, df::coord pos2)
-{
-    for (int x = pos1.x; x <= pos2.x; x++)
-    {
-        for (int y = pos1.y; y <= pos2.y; y++)
-        {
-            for (int z = pos1.z; z <= pos2.z; z++)
-            {
-                df::coord pos(x,y,z);
-
-                auto tile = mc.tiletypeAt(pos);
-
-                if (isWallTerrain(tile))
-                    add_to_burrows(burrows, pos);
-            }
-        }
-    }
-}
-
-static void handle_dig_complete(color_ostream &out, df::job_type job, df::coord pos,
-                                df::tiletype old_tile, df::tiletype new_tile, df::unit *worker)
-{
-    if (!isWalkable(new_tile))
-        return;
-
-    std::vector<df::burrow*> to_grow;
-
-    for (size_t i = 0; i < grow_burrows.size(); i++)
-    {
-        auto b = df::burrow::find(grow_burrows[i]);
-        if (b && Burrows::isAssignedTile(b, pos))
-            to_grow.push_back(b);
-    }
-
-    //out.print("%d to grow.\n", to_grow.size());
-
-    if (to_grow.empty())
-        return;
-
-    MapExtras::MapCache mc;
-    bool changed = false;
-
-    if (!isWalkable(old_tile))
-    {
-        changed = true;
-        add_walls_to_burrows(out, to_grow, mc, pos+df::coord(-1,-1,0), pos+df::coord(1,1,0));
-
-        if (isWalkableUp(new_tile))
-            add_to_burrows(to_grow, pos+df::coord(0,0,1));
-
-        if (tileShape(new_tile) == tiletype_shape::RAMP)
-        {
-            add_walls_to_burrows(out, to_grow, mc,
-                                 pos+df::coord(-1,-1,1), pos+df::coord(1,1,1));
-        }
-    }
-
-    if (LowPassable(new_tile) && !LowPassable(old_tile))
-    {
-        changed = true;
-        add_to_burrows(to_grow, pos-df::coord(0,0,1));
-
-        if (tileShape(new_tile) == tiletype_shape::RAMP_TOP)
-        {
-            add_walls_to_burrows(out, to_grow, mc,
-                                 pos+df::coord(-1,-1,-1), pos+df::coord(1,1,-1));
-        }
-    }
-
-    if (changed && worker && !worker->job.current_job)
-        Job::checkDesignationsNow();
-}
-
-static void renameBurrow(color_ostream &out, df::burrow *burrow, std::string name)
-{
-    CHECK_NULL_POINTER(burrow);
-
-    // The event makes this absolutely necessary
-    CoreSuspender suspend;
-
-    burrow->name = name;
-    onBurrowRename(out, burrow);
-}
-
-static df::burrow *findByName(color_ostream &out, std::string name, bool silent = false)
-{
-    int id = -1;
-    if (name_lookup.count(name))
-        id = name_lookup[name];
-    auto rv = df::burrow::find(id);
-    if (!rv && !silent)
-        out.printerr("Burrow not found: '%s'\n", name.c_str());
-    return rv;
-}
-
-static void copyUnits(df::burrow *target, df::burrow *source, bool enable)
-{
-    CHECK_NULL_POINTER(target);
-    CHECK_NULL_POINTER(source);
-
-    if (source == target)
-    {
-        if (!enable)
-            Burrows::clearUnits(target);
-
-        return;
-    }
-
-    for (size_t i = 0; i < source->units.size(); i++)
-    {
-        auto unit = df::unit::find(source->units[i]);
-
-        if (unit)
-            Burrows::setAssignedUnit(target, unit, enable);
-    }
-}
-
-static void copyTiles(df::burrow *target, df::burrow *source, bool enable)
-{
-    CHECK_NULL_POINTER(target);
-    CHECK_NULL_POINTER(source);
-
-    if (source == target)
-    {
-        if (!enable)
-            Burrows::clearTiles(target);
-
-        return;
-    }
-
-    std::vector<df::map_block*> pvec;
-    Burrows::listBlocks(&pvec, source);
-
-    for (size_t i = 0; i < pvec.size(); i++)
-    {
-        auto block = pvec[i];
-        auto smask = Burrows::getBlockMask(source, block);
-        if (!smask)
-            continue;
-
-        auto tmask = Burrows::getBlockMask(target, block, enable);
-        if (!tmask)
-            continue;
-
-        if (enable)
-        {
-            for (int j = 0; j < 16; j++)
-                tmask->tile_bitmask[j] |= smask->tile_bitmask[j];
-        }
-        else
-        {
-            for (int j = 0; j < 16; j++)
-                tmask->tile_bitmask[j] &= ~smask->tile_bitmask[j];
-
-            if (!tmask->has_assignments())
-                Burrows::deleteBlockMask(target, block, tmask);
-        }
-    }
-}
-
-static void setTilesByDesignation(df::burrow *target, df::tile_designation d_mask,
-                                  df::tile_designation d_value, bool enable)
-{
-    CHECK_NULL_POINTER(target);
-
-    auto &blocks = world->map.map_blocks;
-
-    for (size_t i = 0; i < blocks.size(); i++)
-    {
-        auto block = blocks[i];
-        df::block_burrow *mask = NULL;
-
-        for (int x = 0; x < 16; x++)
-        {
-            for (int y = 0; y < 16; y++)
-            {
-                if ((block->designation[x][y].whole & d_mask.whole) != d_value.whole)
-                    continue;
-
-                if (!mask)
-                    mask = Burrows::getBlockMask(target, block, enable);
-                if (!mask)
-                    goto next_block;
-
-                mask->setassignment(x, y, enable);
-            }
-        }
-
-        if (mask && !enable && !mask->has_assignments())
-            Burrows::deleteBlockMask(target, block, mask);
-
-    next_block:;
-    }
-}
-
-static bool setTilesByKeyword(df::burrow *target, std::string name, bool enable)
-{
-    CHECK_NULL_POINTER(target);
-
-    df::tile_designation mask;
-    df::tile_designation value;
-
-    if (name == "ABOVE_GROUND")
-        mask.bits.subterranean = true;
-    else if (name == "SUBTERRANEAN")
-        mask.bits.subterranean = value.bits.subterranean = true;
-    else if (name == "LIGHT")
-        mask.bits.light = value.bits.light = true;
-    else if (name == "DARK")
-        mask.bits.light = true;
-    else if (name == "OUTSIDE")
-        mask.bits.outside = value.bits.outside = true;
-    else if (name == "INSIDE")
-        mask.bits.outside = true;
-    else if (name == "HIDDEN")
-        mask.bits.hidden = value.bits.hidden = true;
-    else if (name == "REVEALED")
-        mask.bits.hidden = true;
-    else
-        return false;
-
-    setTilesByDesignation(target, mask, value, enable);
-    return true;
-}
-
-DFHACK_PLUGIN_LUA_FUNCTIONS {
-    DFHACK_LUA_FUNCTION(renameBurrow),
-    DFHACK_LUA_FUNCTION(findByName),
-    DFHACK_LUA_FUNCTION(copyUnits),
-    DFHACK_LUA_FUNCTION(copyTiles),
-    DFHACK_LUA_FUNCTION(setTilesByKeyword),
-    DFHACK_LUA_END
-};
-
-DFHACK_PLUGIN_LUA_EVENTS {
-    DFHACK_LUA_EVENT(onBurrowRename),
-    DFHACK_LUA_EVENT(onDigComplete),
-    DFHACK_LUA_END
-};
-
-static command_result burrow(color_ostream &out, vector <string> &parameters)
-{
-    CoreSuspender suspend;
-
-    if (!active)
-    {
-        out.printerr("The plugin cannot be used without map.\n");
-        return CR_FAILURE;
-    }
-
-    string cmd;
-    if (!parameters.empty())
-        cmd = parameters[0];
-
-    if (cmd == "enable" || cmd == "disable")
-    {
-        if (parameters.size() < 2)
-            return CR_WRONG_USAGE;
-
-        bool state = (cmd == "enable");
-
-        for (size_t i = 1; i < parameters.size(); i++)
-        {
-            string &option = parameters[i];
-
-            if (option == "auto-grow")
-                enable_auto_grow(out, state);
-            else
-                return CR_WRONG_USAGE;
-        }
-    }
-    else if (cmd == "clear-units")
-    {
-        if (parameters.size() < 2)
-            return CR_WRONG_USAGE;
-
-        for (size_t i = 1; i < parameters.size(); i++)
-        {
-            auto target = findByName(out, parameters[i]);
-            if (!target)
-                return CR_WRONG_USAGE;
-
-            Burrows::clearUnits(target);
-        }
-    }
-    else if (cmd == "set-units" || cmd == "add-units" || cmd == "remove-units")
-    {
-        if (parameters.size() < 3)
-            return CR_WRONG_USAGE;
-
-        auto target = findByName(out, parameters[1]);
-        if (!target)
-            return CR_WRONG_USAGE;
-
-        if (cmd == "set-units")
-            Burrows::clearUnits(target);
-
-        bool enable = (cmd != "remove-units");
-
-        for (size_t i = 2; i < parameters.size(); i++)
-        {
-            auto source = findByName(out, parameters[i]);
-            if (!source)
-                return CR_WRONG_USAGE;
-
-            copyUnits(target, source, enable);
-        }
-    }
-    else if (cmd == "clear-tiles")
-    {
-        if (parameters.size() < 2)
-            return CR_WRONG_USAGE;
-
-        for (size_t i = 1; i < parameters.size(); i++)
-        {
-            auto target = findByName(out, parameters[i]);
-            if (!target)
-                return CR_WRONG_USAGE;
-
-            Burrows::clearTiles(target);
-        }
-    }
-    else if (cmd == "set-tiles" || cmd == "add-tiles" || cmd == "remove-tiles")
-    {
-        if (parameters.size() < 3)
-            return CR_WRONG_USAGE;
-
-        auto target = findByName(out, parameters[1]);
-        if (!target)
-            return CR_WRONG_USAGE;
-
-        if (cmd == "set-tiles")
-            Burrows::clearTiles(target);
-
-        bool enable = (cmd != "remove-tiles");
-
-        for (size_t i = 2; i < parameters.size(); i++)
-        {
-            if (setTilesByKeyword(target, parameters[i], enable))
-                continue;
-
-            auto source = findByName(out, parameters[i]);
-            if (!source)
-                return CR_WRONG_USAGE;
-
-            copyTiles(target, source, enable);
-        }
-    }
-    else
-    {
-        if (!parameters.empty() && cmd != "?")
-            out.printerr("Invalid command: %s\n", cmd.c_str());
-        return CR_WRONG_USAGE;
-    }
-
-    return CR_OK;
-}
diff --git a/plugins/channel-safely/channel-groups.cpp b/plugins/channel-safely/channel-groups.cpp
index 8f7f4b117..c1a5b5953 100644
--- a/plugins/channel-safely/channel-groups.cpp
+++ b/plugins/channel-safely/channel-groups.cpp
@@ -13,12 +13,66 @@ void ChannelJobs::load_channel_jobs() {
     while (node) {
         df::job* job = node->item;
         node = node->next;
-        if (is_dig_job(job)) {
+        if (is_channel_job(job)) {
             locations.emplace(job->pos);
+            jobs.emplace(job->pos, job);
         }
     }
 }
 
+bool ChannelJobs::has_cavein_conditions(const df::coord &map_pos) {
+    if likely(Maps::isValidTilePos(map_pos)) {
+        auto p = map_pos;
+        auto ttype = *Maps::getTileType(p);
+        if (!DFHack::isOpenTerrain(ttype)) {
+            // check shared neighbour for cave-in conditions
+            df::coord neighbours[4];
+            get_connected_neighbours(map_pos, neighbours);
+            int connectedness = 4;
+            for (auto n: neighbours) {
+                if (!Maps::isValidTilePos(n) || active.count(n) || DFHack::isOpenTerrain(*Maps::getTileType(n))) {
+                    connectedness--;
+                }
+            }
+            if (!connectedness) {
+                // do what?
+                p.z--;
+                if (!Maps::isValidTilePos(p)) return false;
+                ttype = *Maps::getTileType(p);
+                if (DFHack::isOpenTerrain(ttype) || DFHack::isFloorTerrain(ttype)) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+bool ChannelJobs::possible_cavein(const df::coord &job_pos) {
+    for (auto iter : active) {
+        if (iter == job_pos) continue;
+        if (calc_distance(job_pos, iter) <= 2) {
+            // find neighbours
+            df::coord n1[8];
+            df::coord n2[8];
+            get_neighbours(job_pos, n1);
+            get_neighbours(iter, n2);
+            // find shared neighbours
+            for (int i = 0; i < 7; ++i) {
+                for (int j = i + 1; j < 8; ++j) {
+                    if (n1[i] == n2[j]) {
+                        if (has_cavein_conditions(n1[i])) {
+                            WARN(jobs).print("Channel-Safely::jobs: Cave-in conditions detected at (" COORD ")\n", COORDARGS(n1[i]));
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}
+
 // adds map_pos to a group if an adjacent one exists, or creates one if none exist... if multiple exist they're merged into the first found
 void ChannelGroups::add(const df::coord &map_pos) {
     // if we've already added this, we don't need to do it again
@@ -37,6 +91,7 @@ void ChannelGroups::add(const df::coord &map_pos) {
     DEBUG(groups).print("    add(" COORD ")\n", COORDARGS(map_pos));
     // and so we begin iterating the neighbours
     for (auto &neighbour: neighbors) {
+        if unlikely(!Maps::isValidTilePos(neighbour)) continue;
         // go to the next neighbour if this one doesn't have a group
         if (!groups_map.count(neighbour)) {
             TRACE(groups).print(" -> neighbour is not designated\n");
@@ -82,7 +137,7 @@ void ChannelGroups::add(const df::coord &map_pos) {
             TRACE(groups).print(" -> brand new group\n");
             // we create a brand-new group to use
             group_index = groups.size();
-            groups.push_back(Group());
+            groups.emplace_back();
             group = &groups[group_index];
         }
     }
@@ -137,6 +192,7 @@ void ChannelGroups::scan(bool full_scan) {
     std::set<df::coord> gone_jobs;
     set_difference(last_jobs, jobs, gone_jobs);
     set_difference(jobs, last_jobs, new_jobs);
+    INFO(groups).print("gone jobs: %zd\nnew jobs: %zd\n",gone_jobs.size(), new_jobs.size());
     for (auto &pos : new_jobs) {
         add(pos);
     }
@@ -155,6 +211,7 @@ void ChannelGroups::scan(bool full_scan) {
                     if (!full_scan && !block->flags.bits.designated) {
                         continue;
                     }
+                    df::map_block* block_above = Maps::getBlock(bx, by, z+1);
                     // foreach tile
                     bool empty_group = true;
                     for (int16_t lx = 0; lx < 16; ++lx) {
@@ -168,7 +225,14 @@ void ChannelGroups::scan(bool full_scan) {
                                     jobs.erase(map_pos);
                                 }
                                 block->designation[lx][ly].bits.dig = df::tile_dig_designation::No;
-                            } else if (is_dig_designation(block->designation[lx][ly]) || block->occupancy[lx][ly].bits.dig_marked) {
+                            } else if (is_dig_designation(block->designation[lx][ly]) || block->occupancy[lx][ly].bits.dig_marked ) {
+                                // We have a dig designated, or marked. Some of these will not need intervention.
+                                if (block_above &&
+                                    !is_channel_designation(block->designation[lx][ly]) &&
+                                    !is_channel_designation(block_above->designation[lx][ly])) {
+                                    // if this tile isn't a channel designation, and doesn't have a channel designation above it.. we can skip it
+                                    continue;
+                                }
                                 for (df::block_square_event* event: block->block_events) {
                                     if (auto evT = virtual_cast<df::block_square_event_designation_priorityst>(event)) {
                                         // we want to let the user keep some designations free of being managed
@@ -203,6 +267,7 @@ void ChannelGroups::scan(bool full_scan) {
 void ChannelGroups::clear() {
     debug_map();
     WARN(groups).print(" <- clearing groups\n");
+    jobs.clear();
     group_blocks.clear();
     free_spots.clear();
     groups_map.clear();
@@ -269,13 +334,13 @@ size_t ChannelGroups::count(const df::coord &map_pos) const {
 
 // prints debug info about the groups stored, and their members
 void ChannelGroups::debug_groups() {
-    if (DFHack::debug_groups.isEnabled(DebugCategory::LTRACE)) {
+    if (DFHack::debug_groups.isEnabled(DebugCategory::LDEBUG)) {
         int idx = 0;
-        TRACE(groups).print(" debugging group data\n");
+        DEBUG(groups).print(" debugging group data\n");
         for (auto &group: groups) {
-            TRACE(groups).print("  group %d (size: %zu)\n", idx, group.size());
+            DEBUG(groups).print("  group %d (size: %zu)\n", idx, group.size());
             for (auto &pos: group) {
-                TRACE(groups).print("   (%d,%d,%d)\n", pos.x, pos.y, pos.z);
+                DEBUG(groups).print("   (%d,%d,%d)\n", pos.x, pos.y, pos.z);
             }
             idx++;
         }
@@ -284,10 +349,10 @@ void ChannelGroups::debug_groups() {
 
 // prints debug info group mappings
 void ChannelGroups::debug_map() {
-    if (DFHack::debug_groups.isEnabled(DebugCategory::LDEBUG)) {
+    if (DFHack::debug_groups.isEnabled(DebugCategory::LTRACE)) {
         INFO(groups).print("Group Mappings: %zu\n", groups_map.size());
         for (auto &pair: groups_map) {
-            DEBUG(groups).print(" map[" COORD "] = %d\n", COORDARGS(pair.first), pair.second);
+            TRACE(groups).print(" map[" COORD "] = %d\n", COORDARGS(pair.first), pair.second);
         }
     }
 }
diff --git a/plugins/channel-safely/channel-manager.cpp b/plugins/channel-safely/channel-manager.cpp
index e905f2cfb..67f8742b3 100644
--- a/plugins/channel-safely/channel-manager.cpp
+++ b/plugins/channel-safely/channel-manager.cpp
@@ -5,6 +5,35 @@
 #include <modules/EventManager.h> //hash function for df::coord
 #include <df/block_square_event_designation_priorityst.h>
 
+#define NUMARGS(...) std::tuple_size<decltype(std::make_tuple(__VA_ARGS__))>::value
+#define d_assert(condition, ...) \
+            static_assert(NUMARGS(__VA_ARGS__) >= 1, "d_assert(condition, format, ...) requires at least up to format as arguments"); \
+            if (!condition) {                                                   \
+                DFHack::Core::getInstance().getConsole().printerr(__VA_ARGS__); \
+                assert(0);                                                      \
+            }
+
+
+df::unit* find_dwarf(const df::coord &map_pos) {
+
+    df::unit* nearest = nullptr;
+    uint32_t distance;
+    for (auto unit : df::global::world->units.active) {
+        if (!nearest) {
+            nearest = unit;
+            distance = calc_distance(unit->pos, map_pos);
+        } else if (unit->status.labors[df::unit_labor::MINE]) {
+            uint32_t d = calc_distance(unit->pos, map_pos);
+            if (d < distance) {
+                nearest = unit;
+                distance = d;
+            } else if (Maps::canWalkBetween(unit->pos, map_pos)) {
+                return unit;
+            }
+        }
+    }
+    return nearest;
+}
 
 // sets mark flags as necessary, for all designations
 void ChannelManager::manage_groups() {
@@ -30,24 +59,111 @@ void ChannelManager::manage_group(const df::coord &map_pos, bool set_marker_mode
     INFO(manager).print("manage_group() is done\n");
 }
 
-void ChannelManager::manage_group(const Group &group, bool set_marker_mode, bool marker_mode) {
+void ChannelManager::manage_group(const Group &group, bool set_marker_mode, bool marker_mode) const {
     INFO(manager).print("manage_group()\n");
     if (!set_marker_mode) {
-        if (has_any_groups_above(groups, group)) {
-            marker_mode = true;
-        } else {
-            marker_mode = false;
+        marker_mode = has_any_groups_above(groups, group);
+    }
+    // cavein prevention
+    bool cavein_possible = false;
+    uint8_t least_access = 100;
+
+    std::unordered_map<df::coord, uint8_t> cavein_candidates;
+    if (!marker_mode) {
+        /* To prevent cave-ins we're looking at accessibility of tiles with open space below them
+         * If it has space below, it has somewhere to fall
+         * Accessibility tells us how close to a cave-in a tile is, low values are at risk of cave-ins
+         * To count access, we find a random miner dwarf and count how many tile neighbours they can path to
+         * */
+        // find a dwarf to path from
+        df::coord miner_pos = find_dwarf(*group.begin())->pos;
+
+        // Analyze designations
+        for (const auto &pos: group) {
+            df::coord below(pos);
+            below.z--;
+            const auto below_ttype = *Maps::getTileType(below);
+            // we can skip designations already queued for insta-digging
+            if (CSP::dignow_queue.count(pos)) continue;
+            if (DFHack::isOpenTerrain(below_ttype) || DFHack::isFloorTerrain(below_ttype)) {
+                // the tile below is not solid earth
+                // we're counting accessibility then dealing with 0 access
+                DEBUG(manager).print("analysis: cave-in condition found\n");
+                INFO(manager).print("(%d) checking accessibility of (" COORD ") from (" COORD ")\n", cavein_possible,COORDARGS(pos),COORDARGS(miner_pos));
+                auto access = count_accessibility(miner_pos, pos);
+                if (access == 0) {
+                    TRACE(groups).print(" has 0 access\n");
+                    if (config.insta_dig) {
+                        manage_one(pos, true, false);
+                        dig_now(DFHack::Core::getInstance().getConsole(), pos);
+                    } else {
+                        // todo: engage dig management, swap channel designations for dig
+                    }
+                } else {
+                    WARN(manager).print(" has %d access\n", access);
+                    cavein_possible = config.riskaverse;
+                    cavein_candidates.emplace(pos, access);
+                    least_access = std::min(access, least_access);
+                }
+            } else if (config.insta_dig && isEntombed(miner_pos, pos)) {
+                manage_one(pos, true, false);
+                dig_now(DFHack::Core::getInstance().getConsole(), pos);
+            }
         }
+        DEBUG(manager).print("cavein possible(%d)\n"
+                             "%zu candidates\n"
+                             "least access %d\n", cavein_possible, cavein_candidates.size(), least_access);
     }
-    for (auto &designation: group) {
-        manage_one(group, designation, true, marker_mode);
+    // managing designations
+    if (!group.empty()) {
+        DEBUG(manager).print("managing group #%d\n", groups.debugGIndex(*group.begin()));
+    }
+    for (auto &pos: group) {
+        // if no cave-in is possible [or we don't check for], we'll just execute normally and move on
+        if (!cavein_possible) {
+            TRACE(manager).print("cave-in evaluated false\n");
+            d_assert(manage_one(pos, true, marker_mode), "manage_one() is failing under !cavein");
+            continue;
+        }
+        // cavein is only possible if marker_mode is false
+        // we want to dig the cavein candidates first, the least accessible ones specifically
+        const static uint8_t MAX = 84; //arbitrary number that indicates the value has changed
+        const static uint8_t OFFSET = 2; //value has been tweaked to avoid cave-ins whilst activating as many designations as possible
+        if (CSP::dignow_queue.count(pos) || (cavein_candidates.count(pos) &&
+                                             least_access < MAX && cavein_candidates[pos] <= least_access+OFFSET)) {
+
+            TRACE(manager).print("cave-in evaluated true and either of dignow or (%d <= %d)\n", cavein_candidates[pos], least_access+OFFSET);
+            df::coord local(pos);
+            local.x %= 16;
+            local.y %= 16;
+            auto block = Maps::ensureTileBlock(pos);
+            // if we don't find the priority in block_events, it probably means bad things
+            for (df::block_square_event* event: block->block_events) {
+                if (auto evT = virtual_cast<df::block_square_event_designation_priorityst>(event)) {
+                    // we want to let the user keep some designations free of being managed
+                    auto b = std::max(0, cavein_candidates[pos] - least_access);
+                    auto v = 1000 + (b * 1700);
+                    DEBUG(manager).print("(" COORD ") 1000+1000(%d) -> %d {least-access: %d}\n",COORDARGS(pos), b, v, least_access);
+                    evT->priority[Coord(local)] = v;
+                }
+            }
+            d_assert(manage_one(pos, true, false), "manage_one() is failing for cavein ");
+            continue;
+        }
+        // cavein possible, but we failed to meet the criteria for activation
+        if (cavein_candidates.count(pos)) {
+            DEBUG(manager).print("cave-in evaluated true and the cavein candidate's accessibility check was made as (%d <= %d)\n", cavein_candidates[pos], least_access+OFFSET);
+        } else {
+            DEBUG(manager).print("cave-in evaluated true and the position was not a candidate, nor was it set for dignow\n");
+        }
+        d_assert(manage_one(pos, true, true), "manage_one() is failing to set a cave-in causing designation to marker mode");
     }
     INFO(manager).print("manage_group() is done\n");
 }
 
-bool ChannelManager::manage_one(const Group &group, const df::coord &map_pos, bool set_marker_mode, bool marker_mode) {
+bool ChannelManager::manage_one(const df::coord &map_pos, bool set_marker_mode, bool marker_mode) const {
     if (Maps::isValidTilePos(map_pos)) {
-        INFO(manager).print("manage_one(" COORD ")\n", COORDARGS(map_pos));
+        TRACE(manager).print("manage_one((" COORD "), %d, %d)\n", COORDARGS(map_pos), set_marker_mode, marker_mode);
         df::map_block* block = Maps::getTileBlock(map_pos);
         // we calculate the position inside the block*
         df::coord local(map_pos);
@@ -57,42 +173,28 @@ bool ChannelManager::manage_one(const Group &group, const df::coord &map_pos, bo
         // ensure that we aren't on the top-most layers
         if (map_pos.z < mapz - 3) {
             // do we already know whether to set marker mode?
-            if (set_marker_mode) {
-                DEBUG(manager).print("  -> marker_mode\n");
-                // if enabling marker mode, just do it
-                if (marker_mode) {
-                    tile_occupancy.bits.dig_marked = marker_mode;
-                    return true;
-                }
-                // if activating designation, check if it is safe to dig or not a channel designation
-                if (!is_channel_designation(block->designation[Coord(local)]) || is_safe_to_dig_down(map_pos)) {
-                    if (!block->flags.bits.designated) {
-                        block->flags.bits.designated = true;
-                    }
-                    tile_occupancy.bits.dig_marked = false;
-                    TileCache::Get().cache(map_pos, block->tiletype[Coord(local)]);
-                }
-                return false;
-
-            } else {
-                // next search for the designation priority
-                DEBUG(manager).print(" if(has_groups_above())\n");
-                // check that the group has no incomplete groups directly above it
-                if (has_group_above(groups, map_pos) || !is_safe_to_dig_down(map_pos)) {
-                    DEBUG(manager).print("  has_groups_above: setting marker mode\n");
-                    tile_occupancy.bits.dig_marked = true;
-                    if (jobs.count(map_pos)) {
-                        jobs.erase(map_pos);
-                    }
-                    WARN(manager).print(" <- manage_one() exits normally\n");
-                    return true;
+            if (!marker_mode) {
+                // marker_mode is set to true if it is unsafe to dig
+                marker_mode = (!set_marker_mode &&
+                               (has_group_above(groups, map_pos) || !is_safe_to_dig_down(map_pos))) ||
+                              (set_marker_mode &&
+                               is_channel_designation(block->designation[Coord(local)]) && !is_safe_to_dig_down(map_pos));
+            }
+            if (marker_mode) {
+                if (jobs.count(map_pos)) {
+                    cancel_job(map_pos);
                 }
+            } else if (!block->flags.bits.designated) {
+                block->flags.bits.designated = true;
             }
+            tile_occupancy.bits.dig_marked = marker_mode;
+            TRACE(manager).print("marker mode %s\n", marker_mode ? "ENABLED" : "DISABLED");
         } else {
             // if we are though, it should be totally safe to dig
             tile_occupancy.bits.dig_marked = false;
         }
-        WARN(manager).print(" <- manage_one() exits normally\n");
+        TRACE(manager).print(" <- manage_one() exits normally\n");
+        return true;
     }
     return false;
 }
diff --git a/plugins/channel-safely/channel-safely-plugin.cpp b/plugins/channel-safely/channel-safely-plugin.cpp
index 8af90c335..a297bf700 100644
--- a/plugins/channel-safely/channel-safely-plugin.cpp
+++ b/plugins/channel-safely/channel-safely-plugin.cpp
@@ -1,7 +1,10 @@
 /* Prevent channeling down into known open space.
 Author:  Josh Cooper
 Created: Aug. 4 2020
-Updated: Nov. 28 2022
+Updated: Dec. 8 2022
+*/
+/*
+This skeletal logic has not been kept up-to-date since ~v0.5
 
  Enable plugin:
  -> build groups
@@ -56,8 +59,6 @@ Updated: Nov. 28 2022
 #include <tile-cache.h>
 
 #include <Debug.h>
-#include <LuaTools.h>
-#include <LuaWrapper.h>
 #include <PluginManager.h>
 #include <modules/EventManager.h>
 #include <modules/Units.h>
@@ -98,7 +99,8 @@ enum FeatureConfigData {
     VISION,
     MONITOR,
     RESURRECT,
-    INSTADIG
+    INSTADIG,
+    RISKAVERSE
 };
 
 enum SettingConfigData {
@@ -110,12 +112,15 @@ enum SettingConfigData {
 
 // dig-now.cpp
 df::coord simulate_fall(const df::coord &pos) {
+    if unlikely(!Maps::isValidTilePos(pos)) {
+        ERR(plugin).print("Error: simulate_fall(" COORD ") - invalid coordinate\n", COORDARGS(pos));
+        return {};
+    }
     df::coord resting_pos(pos);
 
     while (Maps::ensureTileBlock(resting_pos)) {
         df::tiletype tt = *Maps::getTileType(resting_pos);
-        df::tiletype_shape_basic basic_shape = tileShapeBasic(tileShape(tt));
-        if (isWalkable(tt) && basic_shape != df::tiletype_shape_basic::Open)
+        if (isWalkable(tt))
             break;
         --resting_pos.z;
     }
@@ -128,6 +133,7 @@ df::coord simulate_area_fall(const df::coord &pos) {
     get_neighbours(pos, neighbours);
     df::coord lowest = simulate_fall(pos);
     for (auto p : neighbours) {
+        if unlikely(!Maps::isValidTilePos(p)) continue;
         auto nlow = simulate_fall(p);
         if (nlow.z < lowest.z) {
             lowest = nlow;
@@ -136,38 +142,13 @@ df::coord simulate_area_fall(const df::coord &pos) {
     return lowest;
 }
 
-// executes dig designations for the specified tile coordinates
-inline bool dig_now(color_ostream &out, const df::coord &map_pos) {
-    bool ret = false;
-
-    lua_State* state = Lua::Core::State;
-    static const char* module_name = "plugins.dig-now";
-    static const char* fn_name = "dig_now_tile";
-    // the stack layout isn't likely to change, ever
-    static auto args_lambda = [&map_pos](lua_State* L) {
-        Lua::Push(L, map_pos);
-    };
-    static auto res_lambda = [&ret](lua_State* L) {
-        ret = lua_toboolean(L, -1);
-    };
-
-    Lua::StackUnwinder top(state);
-    Lua::CallLuaModuleFunction(out, state, module_name, fn_name, 1, 1, args_lambda, res_lambda);
-    return ret;
-}
-
-// fully heals the unit specified, resurrecting if need be
-inline void resurrect(color_ostream &out, const int32_t &unit) {
-    std::vector<std::string> params{"-r", "--unit", std::to_string(unit)};
-    Core::getInstance().runCommand(out,"full-heal", params);
-}
-
 namespace CSP {
     std::unordered_map<df::unit*, int32_t> endangered_units;
     std::unordered_map<df::job*, int32_t> job_id_map;
     std::unordered_map<int32_t, df::job*> active_jobs;
     std::unordered_map<int32_t, df::unit*> active_workers;
 
+
     std::unordered_map<int32_t, df::coord> last_safe;
     std::unordered_set<df::coord> dignow_queue;
 
@@ -184,10 +165,11 @@ namespace CSP {
     void SaveSettings() {
         if (pfeature.isValid() && psetting.isValid()) {
             try {
-                pfeature.ival(MONITOR) = config.monitor_active;
+                pfeature.ival(MONITOR) = config.monitoring;
                 pfeature.ival(VISION) = config.require_vision;
-                pfeature.ival(INSTADIG) = config.insta_dig;
+                pfeature.ival(INSTADIG) = false; //config.insta_dig;
                 pfeature.ival(RESURRECT) = config.resurrect;
+                pfeature.ival(RISKAVERSE) = config.riskaverse;
 
                 psetting.ival(REFRESH_RATE) = config.refresh_freq;
                 psetting.ival(MONITOR_RATE) = config.monitor_freq;
@@ -209,10 +191,11 @@ namespace CSP {
             SaveSettings();
         } else {
             try {
-                config.monitor_active = pfeature.ival(MONITOR);
+                config.monitoring = pfeature.ival(MONITOR);
                 config.require_vision = pfeature.ival(VISION);
-                config.insta_dig = pfeature.ival(INSTADIG);
+                config.insta_dig = false; //pfeature.ival(INSTADIG);
                 config.resurrect = pfeature.ival(RESURRECT);
+                config.riskaverse = pfeature.ival(RISKAVERSE);
 
                 config.ignore_threshold = psetting.ival(IGNORE_THRESH);
                 config.fall_threshold = psetting.ival(FALL_THRESH);
@@ -227,28 +210,36 @@ namespace CSP {
 
     void UnpauseEvent(bool full_scan = false){
         CoreSuspender suspend; // we need exclusive access to df memory and this call stack doesn't already have a lock
-        INFO(monitor).print("UnpauseEvent()\n");
+        DEBUG(plugin).print("UnpauseEvent()\n");
         ChannelManager::Get().build_groups(full_scan);
         ChannelManager::Get().manage_groups();
-        ChannelManager::Get().debug();
-        INFO(monitor).print("UnpauseEvent() exits\n");
+        DEBUG(plugin).print("UnpauseEvent() exits\n");
     }
 
     void JobStartedEvent(color_ostream &out, void* j) {
         if (enabled && World::isFortressMode() && Maps::IsValid()) {
-            INFO(jobs).print("JobStartedEvent()\n");
+            TRACE(jobs).print("JobStartedEvent()\n");
             auto job = (df::job*) j;
             // validate job type
             if (ChannelManager::Get().exists(job->pos)) {
-                WARN(jobs).print(" valid channel job:\n");
+                DEBUG(jobs).print(" valid channel job:\n");
                 df::unit* worker = Job::getWorker(job);
                 // there is a valid worker (living citizen) on the job? right..
                 if (worker && Units::isAlive(worker) && Units::isCitizen(worker)) {
+                    ChannelManager::Get().jobs.mark_active(job->pos);
+                    if (config.riskaverse) {
+                        if (ChannelManager::Get().jobs.possible_cavein(job->pos)) {
+                            cancel_job(job);
+                            ChannelManager::Get().manage_one(job->pos, true, true);
+                        } else {
+                            ChannelManager::Get().manage_group(job->pos, true, false);
+                        }
+                    }
                     DEBUG(jobs).print("  valid worker:\n");
                     // track workers on jobs
                     df::coord &pos = job->pos;
-                    WARN(jobs).print(" -> Starting job at (" COORD ")\n", COORDARGS(pos));
-                    if (config.monitor_active || config.resurrect) {
+                    TRACE(jobs).print(" -> Starting job at (" COORD ")\n", COORDARGS(pos));
+                    if (config.monitoring || config.resurrect) {
                         job_id_map.emplace(job, job->id);
                         active_jobs.emplace(job->id, job);
                         active_workers[job->id] = worker;
@@ -263,16 +254,17 @@ namespace CSP {
                     Maps::getTileDesignation(job->pos)->bits.traffic = df::tile_traffic::Restricted;
                 }
             }
-            INFO(jobs).print(" <- JobStartedEvent() exits normally\n");
+            TRACE(jobs).print(" <- JobStartedEvent() exits normally\n");
         }
     }
 
     void JobCompletedEvent(color_ostream &out, void* j) {
         if (enabled && World::isFortressMode() && Maps::IsValid()) {
-            INFO(jobs).print("JobCompletedEvent()\n");
+            TRACE(jobs).print("JobCompletedEvent()\n");
             auto job = (df::job*) j;
             // we only care if the job is a channeling one
             if (ChannelManager::Get().exists(job->pos)) {
+                ChannelManager::Get().manage_group(job->pos, true, false);
                 // check job outcome
                 auto block = Maps::getTileBlock(job->pos);
                 df::coord local(job->pos);
@@ -283,15 +275,14 @@ namespace CSP {
                     // the job can be considered done
                     df::coord below(job->pos);
                     below.z--;
-                    WARN(jobs).print(" -> (" COORD ") is marked done, managing group below.\n", COORDARGS(job->pos));
-                    // mark done and manage below
+                    DEBUG(jobs).print(" -> (" COORD ") is marked done, managing group below.\n", COORDARGS(job->pos));
+                    // mark done and manage below (and the rest of the group, if there were cavein candidates)
                     block->designation[Coord(local)].bits.traffic = df::tile_traffic::Normal;
                     ChannelManager::Get().mark_done(job->pos);
                     ChannelManager::Get().manage_group(below);
-                    ChannelManager::Get().debug();
                     if (config.resurrect) {
                         // this is the only place we can be 100% sure of "safety"
-                        // (excluding deadly enemies that will have arrived)
+                        // (excluding deadly enemies that may have arrived, and future digging)
                         if (active_workers.count(job->id)) {
                             df::unit* worker = active_workers[job->id];
                             last_safe[worker->id] = worker->pos;
@@ -304,7 +295,7 @@ namespace CSP {
                 active_workers.erase(job->id);
                 active_jobs.erase(job->id);
             }
-            INFO(jobs).print("JobCompletedEvent() exits\n");
+            TRACE(jobs).print("JobCompletedEvent() exits\n");
         }
     }
 
@@ -312,16 +303,17 @@ namespace CSP {
         int32_t tick = df::global::world->frame_counter;
         auto report_id = (int32_t)(intptr_t(r));
         if (df::global::world) {
-            std::vector<df::report*> &reports = df::global::world->status.reports;
-            size_t idx = -1;
-            idx = df::report::binsearch_index(reports, report_id);
-            df::report* report = reports.at(idx);
+            df::report* report = df::report::find(report_id);
+            if (!report) {
+                WARN(plugin).print("Error: NewReportEvent() received an invalid report_id - a report* cannot be found\n");
+                return;
+            }
             switch (report->type) {
                 case announcement_type::CANCEL_JOB:
                     if (config.insta_dig) {
-                        if (report->text.find("cancels Dig") != std::string::npos) {
-                            dignow_queue.emplace(report->pos);
-                        } else if (report->text.find("path") != std::string::npos) {
+                        if (report->text.find("cancels Dig") != std::string::npos ||
+                            report->text.find("path") != std::string::npos) {
+
                             dignow_queue.emplace(report->pos);
                         }
                         DEBUG(plugin).print("%d, pos: " COORD ", pos2: " COORD "\n%s\n", report_id, COORDARGS(report->pos),
@@ -365,9 +357,7 @@ namespace CSP {
     }
 
     void OnUpdate(color_ostream &out) {
-        static auto print_res_msg = [](df::unit* unit) {
-            WARN(plugin).print("Channel-Safely: Resurrecting..\n   [id: %d]\n", unit->id);
-        };
+        CoreSuspender suspend;
         if (enabled && World::isFortressMode() && Maps::IsValid() && !World::ReadPauseState()) {
             static int32_t last_tick = df::global::world->frame_counter;
             static int32_t last_monitor_tick = df::global::world->frame_counter;
@@ -382,17 +372,18 @@ namespace CSP {
                 if (config.insta_dig) {
                     TRACE(monitor).print(" -> evaluate dignow queue\n");
                     for (auto iter = dignow_queue.begin(); iter != dignow_queue.end();) {
-                        dig_now(out, *iter); // teleports units to the bottom of a simulated fall
+                        auto map_pos = *iter;
+                        dig_now(out, map_pos); // teleports units to the bottom of a simulated fall
+                        ChannelManager::Get().mark_done(map_pos);
                         iter = dignow_queue.erase(iter);
-                        DEBUG(plugin).print(">INSTA-DIGGING<\n");
                     }
                 }
-                UnpauseEvent();
+                UnpauseEvent(false);
                 TRACE(monitor).print("OnUpdate() refresh done\n");
             }
 
             // Clean up stale df::job*
-            if ((config.monitor_active || config.resurrect) && tick - last_tick >= 1) {
+            if ((config.monitoring || config.resurrect) && tick - last_tick >= 1) {
                 last_tick = tick;
                 // make note of valid jobs
                 std::unordered_map<int32_t, df::job*> valid_jobs;
@@ -415,7 +406,7 @@ namespace CSP {
             }
 
             // Monitoring Active and Resurrecting Dead
-            if (config.monitor_active && tick - last_monitor_tick >= config.monitor_freq) {
+            if (config.monitoring && tick - last_monitor_tick >= config.monitor_freq) {
                 last_monitor_tick = tick;
                 TRACE(monitor).print("OnUpdate() monitoring now\n");
 
@@ -427,15 +418,9 @@ namespace CSP {
                     if (!Maps::isValidTilePos(job->pos)) continue;
                     TRACE(monitor).print(" -> check for job in tracking\n");
                     if (Units::isAlive(unit)) {
-                        if (!config.monitor_active) continue;
+                        if (!config.monitoring) continue;
                         TRACE(monitor).print(" -> compare positions of worker and job\n");
 
-                        // save position
-                        if (unit->pos != job->pos && isFloorTerrain(*Maps::getTileType(unit->pos))) {
-                            // worker is probably safe right now
-                            continue;
-                        }
-
                         // check for fall safety
                         if (unit->pos == job->pos && !is_safe_fall(job->pos)) {
                             // unsafe
@@ -456,7 +441,7 @@ namespace CSP {
                                 Maps::getTileOccupancy(job->pos)->bits.dig_marked = true;
 
                                 // prevent algorithm from re-enabling designation
-                                for (auto &be: Maps::getBlock(job->pos)->block_events) { ;
+                                for (auto &be: Maps::getBlock(job->pos)->block_events) {
                                     if (auto bsedp = virtual_cast<df::block_square_event_designation_priorityst>(
                                             be)) {
                                         df::coord local(job->pos);
@@ -475,7 +460,6 @@ namespace CSP {
                             df::coord lowest = simulate_fall(last_safe[unit->id]);
                             Units::teleport(unit, lowest);
                         }
-                        print_res_msg(unit);
                     }
                 }
                 TRACE(monitor).print("OnUpdate() monitoring done\n");
@@ -504,7 +488,6 @@ namespace CSP {
                             df::coord lowest = simulate_fall(last_safe[unit->id]);
                             Units::teleport(unit, lowest);
                         }
-                        print_res_msg(unit);
                     }
                 }
             }
@@ -547,7 +530,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
         EM::registerListener(EventType::JOB_COMPLETED, jobCompletionHandler, plugin_self);
         // manage designations to start off (first time building groups [very important])
         out.print("channel-safely: enabled!\n");
-        CSP::UnpauseEvent();
+        CSP::UnpauseEvent(true);
     } else if (!enable) {
         // don't need the groups if the plugin isn't going to be enabled
         EM::unregisterAll(plugin_self);
@@ -562,11 +545,10 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
         case SC_UNPAUSED:
             if (enabled && World::isFortressMode() && Maps::IsValid()) {
                 // manage all designations on unpause
-                CSP::UnpauseEvent();
+                CSP::UnpauseEvent(true);
             }
             break;
         case SC_MAP_LOADED:
-        case SC_WORLD_LOADED:
             // cache the map size
             Maps::getSize(mapx, mapy, mapz);
             CSP::ClearData();
@@ -609,24 +591,27 @@ command_result channel_safely(color_ostream &out, std::vector<std::string> &para
                 return DFHack::CR_WRONG_USAGE;
             }
             try {
-                if(parameters[1] == "monitor"){
-                    if (state != config.monitor_active) {
-                        config.monitor_active = state;
+                if(parameters[1] == "monitoring"){
+                    if (state != config.monitoring) {
+                        config.monitoring = state;
                         // if this is a fresh start
                         if (state && !config.resurrect) {
                             // we need a fresh start
                             CSP::active_workers.clear();
                         }
                     }
+                } else if (parameters[1] == "risk-averse") {
+                    config.riskaverse = state;
                 } else if (parameters[1] == "require-vision") {
                     config.require_vision = state;
                 } else if (parameters[1] == "insta-dig") {
-                    config.insta_dig = state;
+                    //config.insta_dig = state;
+                    config.insta_dig = false;
                 } else if (parameters[1] == "resurrect") {
                     if (state != config.resurrect) {
                         config.resurrect = state;
                         // if this is a fresh start
-                        if (state && !config.monitor_active) {
+                        if (state && !config.monitoring) {
                             // we need a fresh start
                             CSP::active_workers.clear();
                         }
@@ -656,9 +641,10 @@ command_result channel_safely(color_ostream &out, std::vector<std::string> &para
     } else {
         out.print("Channel-Safely is %s\n", enabled ? "ENABLED." : "DISABLED.");
         out.print(" FEATURES:\n");
-        out.print("  %-20s\t%s\n", "monitor-active: ", config.monitor_active ? "on." : "off.");
+        out.print("  %-20s\t%s\n", "risk-averse: ", config.riskaverse ? "on." : "off.");
+        out.print("  %-20s\t%s\n", "monitoring: ", config.monitoring ? "on." : "off.");
         out.print("  %-20s\t%s\n", "require-vision: ", config.require_vision ? "on." : "off.");
-        out.print("  %-20s\t%s\n", "insta-dig: ", config.insta_dig ? "on." : "off.");
+        //out.print("  %-20s\t%s\n", "insta-dig: ", config.insta_dig ? "on." : "off.");
         out.print("  %-20s\t%s\n", "resurrect: ", config.resurrect ? "on." : "off.");
         out.print(" SETTINGS:\n");
         out.print("  %-20s\t%" PRIi32 "\n", "refresh-freq: ", config.refresh_freq);
diff --git a/plugins/channel-safely/include/channel-groups.h b/plugins/channel-safely/include/channel-groups.h
index 8e3224c98..ef3f5d082 100644
--- a/plugins/channel-safely/include/channel-groups.h
+++ b/plugins/channel-safely/include/channel-groups.h
@@ -12,7 +12,7 @@
 
 using namespace DFHack;
 
-using Group = std::unordered_set<df::coord>;
+using Group = std::set<df::coord>;
 using Groups = std::vector<Group>;
 
 /* Used to build groups of adjacent channel designations/jobs
@@ -37,6 +37,12 @@ private:
 protected:
     void add(const df::coord &map_pos);
 public:
+    int debugGIndex(const df::coord &map_pos) const {
+        if (groups_map.count(map_pos)) {
+            return groups_map.find(map_pos)->second;
+        }
+        return -1;
+    }
     explicit ChannelGroups(ChannelJobs &jobs) : jobs(jobs) { groups.reserve(200); }
     void scan_one(const df::coord &map_pos);
     void scan(bool full_scan = false);
diff --git a/plugins/channel-safely/include/channel-jobs.h b/plugins/channel-safely/include/channel-jobs.h
index 3be704aeb..2e6c6a567 100644
--- a/plugins/channel-safely/include/channel-jobs.h
+++ b/plugins/channel-safely/include/channel-jobs.h
@@ -6,6 +6,7 @@
 #include <df/job.h>
 
 #include <unordered_set>
+#include <unordered_map>
 
 using namespace DFHack;
 
@@ -20,23 +21,32 @@ using namespace DFHack;
  */
 class ChannelJobs {
 private:
-    friend class ChannelGroup;
-
     using Jobs = std::unordered_set<df::coord>; // job* will exist until it is complete, and likely beyond
+    std::unordered_map<df::coord, df::job*> jobs;
     Jobs locations;
+    Jobs active;
+protected:
+    bool has_cavein_conditions(const df::coord &map_pos);
 public:
     void load_channel_jobs();
+    bool possible_cavein(const df::coord &job_pos);
+    void mark_active(const df::coord &map_pos) { active.emplace(map_pos); }
     void clear() {
+        active.clear();
         locations.clear();
+        jobs.clear();
     }
     int count(const df::coord &map_pos) const { return locations.count(map_pos); }
     Jobs::iterator erase(const df::coord &map_pos) {
+        active.erase(map_pos);
+        jobs.erase(map_pos);
         auto iter = locations.find(map_pos);
         if (iter != locations.end()) {
             return locations.erase(iter);
         }
         return iter;
     }
+    df::job* find_job(const df::coord &map_pos) const { return jobs.count(map_pos) ? jobs.find(map_pos)->second : nullptr; }
     Jobs::const_iterator find(const df::coord &map_pos) const { return locations.find(map_pos); }
     Jobs::const_iterator begin() const { return locations.begin(); }
     Jobs::const_iterator end() const { return locations.end(); }
diff --git a/plugins/channel-safely/include/channel-manager.h b/plugins/channel-safely/include/channel-manager.h
index 323ce8468..582916e06 100644
--- a/plugins/channel-safely/include/channel-manager.h
+++ b/plugins/channel-safely/include/channel-manager.h
@@ -12,11 +12,11 @@ using namespace DFHack;
 // Uses GroupData to detect an unsafe work environment
 class ChannelManager {
 private:
-    ChannelJobs jobs;
     ChannelManager()= default;
 protected:
 public:
     ChannelGroups groups = ChannelGroups(jobs);
+    ChannelJobs jobs;
 
     static ChannelManager& Get(){
         static ChannelManager instance;
@@ -27,13 +27,13 @@ public:
     void destroy_groups() { groups.clear(); debug(); }
     void manage_groups();
     void manage_group(const df::coord &map_pos, bool set_marker_mode = false, bool marker_mode = false);
-    void manage_group(const Group &group, bool set_marker_mode = false, bool marker_mode = false);
-    bool manage_one(const Group &group, const df::coord &map_pos, bool set_marker_mode = false, bool marker_mode = false);
+    void manage_group(const Group &group, bool set_marker_mode = false, bool marker_mode = false) const;
+    bool manage_one(const df::coord &map_pos, bool set_marker_mode = false, bool marker_mode = false) const;
     void mark_done(const df::coord &map_pos);
     bool exists(const df::coord &map_pos) const { return groups.count(map_pos); }
     void debug() {
         DEBUG(groups).print(" DEBUGGING GROUPS:\n");
-        groups.debug_groups();
         groups.debug_map();
+        groups.debug_groups();
     }
 };
diff --git a/plugins/channel-safely/include/inlines.h b/plugins/channel-safely/include/inlines.h
index a8686d235..362fd927a 100644
--- a/plugins/channel-safely/include/inlines.h
+++ b/plugins/channel-safely/include/inlines.h
@@ -2,21 +2,42 @@
 #include "plugin.h"
 #include "channel-manager.h"
 
+#include <TileTypes.h>
+#include <LuaTools.h>
+#include <LuaWrapper.h>
 #include <modules/Maps.h>
 #include <df/job.h>
-#include <TileTypes.h>
 
 #include <cinttypes>
 #include <unordered_set>
+#include <random>
 
-#define Coord(id) id.x][id.y
-#define COORD "%" PRIi16 " %" PRIi16 " %" PRIi16
-#define COORDARGS(id) id.x, id.y, id.z
+#define Coord(id) (id).x][(id).y
+#define COORD "%" PRIi16 ",%" PRIi16 ",%" PRIi16
+#define COORDARGS(id) (id).x, (id).y, (id).z
 
 namespace CSP {
     extern std::unordered_set<df::coord> dignow_queue;
 }
 
+inline uint32_t calc_distance(df::coord p1, df::coord p2) {
+    // calculate chebyshev (chessboard) distance
+    uint32_t distance = abs(p2.z - p1.z);
+    distance += std::max(abs(p2.x - p1.x), abs(p2.y - p1.y));
+    return distance;
+}
+
+inline void get_connected_neighbours(const df::coord &map_pos, df::coord(&neighbours)[4]) {
+    neighbours[0] = map_pos;
+    neighbours[1] = map_pos;
+    neighbours[2] = map_pos;
+    neighbours[3] = map_pos;
+    neighbours[0].y--;
+    neighbours[1].x--;
+    neighbours[2].x++;
+    neighbours[3].y++;
+}
+
 inline void get_neighbours(const df::coord &map_pos, df::coord(&neighbours)[8]) {
     neighbours[0] = map_pos;
     neighbours[1] = map_pos;
@@ -36,12 +57,44 @@ inline void get_neighbours(const df::coord &map_pos, df::coord(&neighbours)[8])
     neighbours[7].x++; neighbours[7].y++;
 }
 
+inline uint8_t count_accessibility(const df::coord &unit_pos, const df::coord &map_pos) {
+    df::coord neighbours[8];
+    df::coord connections[4];
+    get_neighbours(map_pos, neighbours);
+    get_connected_neighbours(map_pos, connections);
+    uint8_t accessibility = Maps::canWalkBetween(unit_pos, map_pos) ? 1 : 0;
+    for (auto n: neighbours) {
+        if unlikely(!Maps::isValidTilePos(n)) continue;
+        if (Maps::canWalkBetween(unit_pos, n)) {
+            accessibility++;
+        }
+    }
+    for (auto n : connections) {
+        if unlikely(Maps::isValidTilePos(n)) continue;
+        if (Maps::canWalkBetween(unit_pos, n)) {
+            accessibility++;
+        }
+    }
+    return accessibility;
+}
+
+inline bool isEntombed(const df::coord &unit_pos, const df::coord &map_pos) {
+    if likely(Maps::canWalkBetween(unit_pos, map_pos)) {
+        return false;
+    }
+    df::coord neighbours[8];
+    get_neighbours(map_pos, neighbours);
+    return std::all_of(neighbours+0, neighbours+8, [&unit_pos](df::coord n) {
+        return !Maps::isValidTilePos(n) || !Maps::canWalkBetween(unit_pos, n);
+    });
+}
+
 inline bool is_dig_job(const df::job* job) {
-    return job->job_type == df::job_type::Dig || job->job_type == df::job_type::DigChannel;
+    return job && (job->job_type == df::job_type::Dig || job->job_type == df::job_type::DigChannel);
 }
 
 inline bool is_channel_job(const df::job* job) {
-    return job->job_type == df::job_type::DigChannel;
+    return job && (job->job_type == df::job_type::DigChannel);
 }
 
 inline bool is_group_job(const ChannelGroups &groups, const df::job* job) {
@@ -60,54 +113,52 @@ inline bool is_safe_fall(const df::coord &map_pos) {
     df::coord below(map_pos);
     for (uint8_t zi = 0; zi < config.fall_threshold; ++zi) {
         below.z--;
+        // falling out of bounds is probably considerably unsafe for a dwarf
+        if unlikely(!Maps::isValidTilePos(below)) {
+            return false;
+        }
+        // if we require vision, and we can't see below.. we'll need to assume it's safe to get anything done
         if (config.require_vision && Maps::getTileDesignation(below)->bits.hidden) {
-            return true; //we require vision, and we can't see below.. so we gotta assume it's safe
+            return true;
         }
+        // finally, if we're not looking at open space (air to fall through) it's safe to fall to
         df::tiletype type = *Maps::getTileType(below);
         if (!DFHack::isOpenTerrain(type)) {
             return true;
         }
     }
+    // we exceeded the fall threshold, so it's not a safe fall
     return false;
 }
 
 inline bool is_safe_to_dig_down(const df::coord &map_pos) {
     df::coord pos(map_pos);
 
+    // todo: probably should rely on is_safe_fall, it looks like it could be simplified a great deal
     for (uint8_t zi = 0; zi <= config.fall_threshold; ++zi) {
-        // assume safe if we can't see and need vision
+        // if we're digging out of bounds, the game can handle that (hopefully)
+        if unlikely(!Maps::isValidTilePos(pos)) {
+            return true;
+        }
+        // if we require vision, and we can't see the tiles in question.. we'll need to assume it's safe to dig to get anything done
         if (config.require_vision && Maps::getTileDesignation(pos)->bits.hidden) {
             return true;
         }
+
         df::tiletype type = *Maps::getTileType(pos);
         if (zi == 0 && DFHack::isOpenTerrain(type)) {
+            // todo: remove? this is probably not useful.. and seems like the only considerable difference to is_safe_fall (aside from where each stops looking)
             // the starting tile is open space, that's obviously not safe
             return false;
         } else if (!DFHack::isOpenTerrain(type)) {
             // a tile after the first one is not open space
             return true;
         }
-        pos.z--;
+        pos.z--; // todo: this can probably move to the beginning of the loop
     }
     return false;
 }
 
-inline bool can_reach_designation(const df::coord &start, const df::coord &end) {
-    if (start != end) {
-        if (!Maps::canWalkBetween(start, end)) {
-            df::coord neighbours[8];
-            get_neighbours(end, neighbours);
-            for (auto &pos: neighbours) {
-                if (Maps::isValidTilePos(pos) && Maps::canWalkBetween(start, pos)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-    return true;
-}
-
 inline bool has_unit(const df::tile_occupancy* occupancy) {
     return occupancy->bits.unit || occupancy->bits.unit_grounded;
 }
@@ -135,15 +186,20 @@ inline bool has_any_groups_above(const ChannelGroups &groups, const Group &group
 }
 
 inline void cancel_job(df::job* job) {
-    if (job != nullptr) {
-        df::coord &pos = job->pos;
+    if (job) {
+        const df::coord &pos = job->pos;
         df::map_block* job_block = Maps::getTileBlock(pos);
         uint16_t x, y;
         x = pos.x % 16;
         y = pos.y % 16;
         df::tile_designation &designation = job_block->designation[x][y];
         auto type = job->job_type;
+        ChannelManager::Get().jobs.erase(pos);
+        Job::removeWorker(job);
+        Job::removePostings(job, true);
         Job::removeJob(job);
+        job_block->flags.bits.designated = true;
+        job_block->occupancy[x][y].bits.dig_marked = true;
         switch (type) {
             case job_type::Dig:
                 designation.bits.dig = df::tile_dig_designation::Default;
@@ -170,6 +226,96 @@ inline void cancel_job(df::job* job) {
     }
 }
 
+inline void cancel_job(const df::coord &map_pos) {
+    cancel_job(ChannelManager::Get().jobs.find_job(map_pos));
+    ChannelManager::Get().jobs.erase(map_pos);
+}
+
+// executes dig designations for the specified tile coordinates
+inline bool dig_now(color_ostream &out, const df::coord &map_pos) {
+    static std::default_random_engine rng;
+    std::uniform_int_distribution<> dist(0,5);
+    out.color(color_value::COLOR_YELLOW);
+    out.print("channel-safely: insta-dig: digging (" COORD ")<\n", COORDARGS(map_pos));
+
+    df::coord below(map_pos);
+    below.z--;
+    auto ttype_below = *Maps::getTileType(below);
+    if (isOpenTerrain(ttype_below) || isFloorTerrain(ttype_below)) {
+        *Maps::getTileType(map_pos) = tiletype::OpenSpace;
+    } else {
+        auto ttype_p = Maps::getTileType(map_pos);
+        if (isSoilMaterial(*ttype_p)) {
+            switch(dist(rng)) {
+                case 0:
+                    *ttype_p = tiletype::SoilFloor1;
+                    break;
+                case 1:
+                    *ttype_p = tiletype::SoilFloor2;
+                    break;
+                case 2:
+                    *ttype_p = tiletype::SoilFloor3;
+                    break;
+                case 3:
+                    *ttype_p = tiletype::SoilFloor4;
+                    break;
+                default:
+                    *ttype_p = tiletype::SoilFloor1;
+                    break;
+            }
+        } else if (isStoneMaterial(*ttype_p)) {
+            switch(dist(rng)) {
+                case 0:
+                    *ttype_p = tiletype::FeatureFloor1;
+                    break;
+                case 1:
+                    *ttype_p = tiletype::FeatureFloor2;
+                    break;
+                case 2:
+                    *ttype_p = tiletype::FeatureFloor3;
+                    break;
+                case 3:
+                    *ttype_p = tiletype::FeatureFloor4;
+                    break;
+                default:
+                    *ttype_p = tiletype::MineralFloor1;
+                    break;
+            }
+        } else {
+            out.print("Unknown type\n");
+            return false;
+        }
+    }
+
+    return true;
+    /*
+    bool ret = false;
+
+    lua_State* state = Lua::Core::State;
+    static const char* module_name = "plugins.dig-now";
+    static const char* fn_name = "dig_now_tile";
+    // the stack layout isn't likely to change, ever
+    static auto args_lambda = [&map_pos](lua_State* L) {
+        Lua::Push(L, map_pos);
+    };
+    static auto res_lambda = [&ret](lua_State* L) {
+        ret = lua_toboolean(L, -1);
+    };
+
+    Lua::StackUnwinder top(state);
+    Lua::CallLuaModuleFunction(out, state, module_name, fn_name, 1, 1, args_lambda, res_lambda);
+    return ret;
+     */
+}
+
+// fully heals the unit specified, resurrecting if need be
+inline void resurrect(color_ostream &out, const int32_t &unit) {
+    out.color(DFHack::COLOR_RED);
+    out.print("channel-safely: resurrecting [id: %d]\n", unit);
+    std::vector<std::string> params{"-r", "--unit", std::to_string(unit)};
+    Core::getInstance().runCommand(out,"full-heal", params);
+}
+
 template<class Ctr1, class Ctr2, class Ctr3>
 void set_difference(const Ctr1 &c1, const Ctr2 &c2, Ctr3 &c3) {
     for (const auto &a : c1) {
diff --git a/plugins/channel-safely/include/plugin.h b/plugins/channel-safely/include/plugin.h
index 23b2f8441..336d944ab 100644
--- a/plugins/channel-safely/include/plugin.h
+++ b/plugins/channel-safely/include/plugin.h
@@ -9,7 +9,8 @@ namespace DFHack {
 }
 
 struct Configuration {
-    bool monitor_active = false;
+    bool riskaverse = true;
+    bool monitoring = false;
     bool require_vision = true;
     bool insta_dig = false;
     bool resurrect = false;
diff --git a/plugins/cleanowned.cpp b/plugins/cleanowned.cpp
index 86ef0a2e1..c13f7826c 100644
--- a/plugins/cleanowned.cpp
+++ b/plugins/cleanowned.cpp
@@ -74,8 +74,6 @@ command_result df_cleanowned (color_ostream &out, vector <string> & parameters)
         return CR_FAILURE;
     }
 
-    out.print("Found total %zd items.\n", world->items.all.size());
-
     for (std::size_t i=0; i < world->items.all.size(); i++)
     {
         df::item * item = world->items.all[i];
@@ -149,14 +147,14 @@ command_result df_cleanowned (color_ostream &out, vector <string> & parameters)
             out.print(
                 "[%d] %s (wear level %d)",
                 item->id,
-                description.c_str(),
+                DF2CONSOLE(description).c_str(),
                 item->getWear()
             );
 
             df::unit *owner = Items::getOwner(item);
 
             if (owner)
-                out.print(", owner %s", Translation::TranslateName(&owner->name,false).c_str());
+                out.print(", owner %s", DF2CONSOLE(Translation::TranslateName(&owner->name,false)).c_str());
 
             if (!dry_run)
             {
diff --git a/plugins/confirm.cpp b/plugins/confirm.cpp
index 5cef6376f..bd6e41b64 100644
--- a/plugins/confirm.cpp
+++ b/plugins/confirm.cpp
@@ -15,16 +15,11 @@
 #include "modules/Gui.h"
 #include "uicommon.h"
 
-#include "df/building_tradedepotst.h"
+#include "df/gamest.h"
 #include "df/general_ref.h"
 #include "df/general_ref_contained_in_itemst.h"
 #include "df/interfacest.h"
 #include "df/viewscreen_dwarfmodest.h"
-#include "df/viewscreen_jobmanagementst.h"
-#include "df/viewscreen_justicest.h"
-#include "df/viewscreen_layer_militaryst.h"
-#include "df/viewscreen_locationsst.h"
-#include "df/viewscreen_tradegoodsst.h"
 
 using namespace DFHack;
 using namespace df::enums;
@@ -35,8 +30,8 @@ using std::vector;
 
 DFHACK_PLUGIN("confirm");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+REQUIRE_GLOBAL(game);
 REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(ui);
 
 typedef std::set<df::interface_key> ikey_set;
 command_result df_confirm (color_ostream &out, vector <string> & parameters);
@@ -46,11 +41,6 @@ static map<string, conf_wrapper*> confirmations;
 string active_id;
 queue<string> cmds;
 
-// true when confirm is paused
-bool paused = false;
-// if set, confirm will unpause when this screen is no longer on the stack
-df::viewscreen *paused_screen = NULL;
-
 namespace DFHack {
     DBG_DECLARE(confirm,status);
 }
@@ -72,11 +62,14 @@ string char_replace (string s, char a, char b)
 }
 
 bool set_conf_state (string name, bool state);
+bool set_conf_paused (string name, bool pause);
 
 class confirmation_base {
 public:
+    bool dirty = false;
     enum cstate { INACTIVE, ACTIVE, SELECTED };
     virtual string get_id() = 0;
+    virtual string get_focus_string() = 0;
     virtual bool set_state(cstate) = 0;
 
     static bool set_state(string id, cstate state)
@@ -96,10 +89,12 @@ confirmation_base *confirmation_base::active = nullptr;
 struct conf_wrapper {
 private:
     bool enabled;
+    bool paused;
     std::set<VMethodInterposeLinkBase*> hooks;
 public:
     conf_wrapper()
-        :enabled(false)
+        :enabled(false),
+        paused(false)
     {}
     void add_hook(VMethodInterposeLinkBase *hook)
     {
@@ -117,29 +112,35 @@ public:
         enabled = state;
         return true;
     }
+    bool set_paused (bool pause) {
+        paused = pause;
+        return true;
+    }
     inline bool is_enabled() { return enabled; }
+    inline bool is_paused() { return paused; }
 };
 
 namespace trade {
-    static bool goods_selected (const std::vector<char> &selected)
+    static bool goods_selected (std::vector<uint8_t> &selected)
     {
-        for (char c : selected)
-            if (c)
+        if(!game->main_interface.trade.open)
+            return false;
+
+        for (uint8_t sel : selected)
+            if (sel == 1)
                 return true;
         return false;
     }
-    inline bool trader_goods_selected (df::viewscreen_tradegoodsst *screen)
+    inline bool trader_goods_selected ()
     {
-        CHECK_NULL_POINTER(screen);
-        return goods_selected(screen->trader_selected);
+        return goods_selected(game->main_interface.trade.goodflag[0]);
     }
-    inline bool broker_goods_selected (df::viewscreen_tradegoodsst *screen)
+    inline bool broker_goods_selected ()
     {
-        CHECK_NULL_POINTER(screen);
-        return goods_selected(screen->broker_selected);
+        return goods_selected(game->main_interface.trade.goodflag[1]);
     }
 
-    static bool goods_all_selected(const std::vector<char> &selected, const std::vector<df::item*> &items)  \
+    /*static bool goods_all_selected(const std::vector<char>& selected, const std::vector<df::item*>& items)  \
     {
         for (size_t i = 0; i < selected.size(); ++i)
         {
@@ -162,16 +163,14 @@ namespace trade {
         }
         return true;
     }
-    inline bool trader_goods_all_selected(df::viewscreen_tradegoodsst *screen)
+    inline bool trader_goods_all_selected()
     {
-        CHECK_NULL_POINTER(screen);
         return goods_all_selected(screen->trader_selected, screen->trader_items);
     }
-    inline bool broker_goods_all_selected(df::viewscreen_tradegoodsst *screen)
+    inline bool broker_goods_all_selected()
     {
-        CHECK_NULL_POINTER(screen);
         return goods_all_selected(screen->broker_selected, screen->broker_items);
-    }
+    }*/
 }
 
 namespace conf_lua {
@@ -228,6 +227,7 @@ namespace conf_lua {
                 lua_newtable(L);
                 Lua::TableInsert(L, "id", item.first);
                 Lua::TableInsert(L, "enabled", item.second->is_enabled());
+                Lua::TableInsert(L, "paused", item.second->is_paused());
                 lua_settable(L, -3);
             }
             return 1;
@@ -240,28 +240,17 @@ namespace conf_lua {
                 lua_pushnil(L);
             return 1;
         }
-        int unpause(lua_State *)
-        {
-            DEBUG(status).print("unpausing\n");
-            paused = false;
-            paused_screen = NULL;
-            return 0;
-        }
-        int get_paused (lua_State *L)
-        {
-            Lua::Push(L, paused);
-            return 1;
-        }
     }
 }
 
 #define CONF_LUA_FUNC(ns, name) {#name, df::wrap_function(ns::name, true)}
 DFHACK_PLUGIN_LUA_FUNCTIONS {
     CONF_LUA_FUNC( , set_conf_state),
+    CONF_LUA_FUNC( , set_conf_paused),
     CONF_LUA_FUNC(trade, broker_goods_selected),
-    CONF_LUA_FUNC(trade, broker_goods_all_selected),
+    //CONF_LUA_FUNC(trade, broker_goods_all_selected),
     CONF_LUA_FUNC(trade, trader_goods_selected),
-    CONF_LUA_FUNC(trade, trader_goods_all_selected),
+    //CONF_LUA_FUNC(trade, trader_goods_all_selected),
     DFHACK_LUA_END
 };
 
@@ -270,14 +259,12 @@ DFHACK_PLUGIN_LUA_COMMANDS {
     CONF_LUA_CMD(get_ids),
     CONF_LUA_CMD(get_conf_data),
     CONF_LUA_CMD(get_active_id),
-    CONF_LUA_CMD(unpause),
-    CONF_LUA_CMD(get_paused),
     DFHACK_LUA_END
 };
 
 void show_options()
 {
-    cmds.push("gui/confirm-opts");
+    cmds.push("gui/confirm");
 }
 
 template <class T>
@@ -295,6 +282,7 @@ public:
         }
 
         state = s;
+        dirty = true;
         if (s == INACTIVE) {
             active_id = "";
             confirmation_base::active = nullptr;
@@ -306,45 +294,70 @@ public:
         return true;
     }
     bool feed (ikey_set *input) {
-        if (paused)
-        {
-            // we can only detect that we've left the screen by intercepting the
-            // ESC key
-            if (!paused_screen && input->count(df::interface_key::LEAVESCREEN))
-                conf_lua::api::unpause(NULL);
-            return false;
+        bool mouseExit = false;
+        if(df::global::enabler->mouse_rbut) {
+            mouseExit = true;
+        }
+        bool mouseSelect = false;
+        if(df::global::enabler->mouse_lbut) {
+            mouseSelect = true;
         }
-        else if (state == INACTIVE)
+
+        conf_wrapper *wrapper = confirmations[this->get_id()];
+        if(wrapper->is_paused()) {
+            std::string concernedFocus = this->get_focus_string();
+            if(!Gui::matchFocusString(this->get_focus_string()))
+                wrapper->set_paused(false);
+            return false;
+        } else if (state == INACTIVE)
         {
+            if(mouseExit) {
+                if(intercept_key("MOUSE_RIGHT") && set_state(ACTIVE)) {
+                    df::global::enabler->mouse_rbut = 0;
+                    df::global::enabler->mouse_rbut_down = 0;
+                    mouse_pos = df::coord2d(df::global::gps->mouse_x, df::global::gps->mouse_y);
+                    last_key_is_right_click = true;
+                    return true;
+                }
+            } else
+                last_key_is_right_click = false;
+
+            if(mouseSelect) {
+                if(intercept_key("MOUSE_LEFT") && set_state(ACTIVE)) {
+                    df::global::enabler->mouse_lbut = 0;
+                    df::global::enabler->mouse_lbut_down = 0;
+                    mouse_pos = df::coord2d(df::global::gps->mouse_x, df::global::gps->mouse_y);
+                    last_key_is_left_click = true;
+                    return true;
+                }
+            } else
+                last_key_is_left_click = false;
+
             for (df::interface_key key : *input)
             {
-                if (intercept_key(key))
+                if (intercept_key(key) && set_state(ACTIVE))
                 {
-                    if (set_state(ACTIVE))
-                    {
-                        last_key = key;
-                        return true;
-                    }
+                    last_key = key;
+                    return true;
                 }
             }
             return false;
         }
         else if (state == ACTIVE)
         {
-            if (input->count(df::interface_key::LEAVESCREEN))
+            if (input->count(df::interface_key::LEAVESCREEN) || mouseExit) {
+                if(mouseExit) {
+                    df::global::enabler->mouse_rbut = 0;
+                    df::global::enabler->mouse_rbut_down = 0;
+                }
                 set_state(INACTIVE);
-            else if (input->count(df::interface_key::SELECT))
+            } else if (input->count(df::interface_key::SELECT))
                 set_state(SELECTED);
             else if (input->count(df::interface_key::CUSTOM_P))
             {
                 DEBUG(status).print("pausing\n");
-                paused = true;
-                // only record the screen when we're not at the top viewscreen
-                // since this screen will *always* be on the stack. for
-                // dwarfmode screens, use ESC detection to discover when to
-                // unpause
-                if (!df::viewscreen_dwarfmodest::_identity.is_instance(screen))
-                    paused_screen = screen;
+
+                wrapper->set_paused(true);
                 set_state(INACTIVE);
             }
             else if (input->count(df::interface_key::CUSTOM_S))
@@ -360,17 +373,18 @@ public:
         return state == ACTIVE;
     }
     void render() {
-        static vector<string> lines;
-        static const std::string pause_message =
-               "Pause confirmations until you exit this screen";
-        Screen::Pen corner_ul = Screen::Pen((char)201, COLOR_GREY, COLOR_BLACK);
-        Screen::Pen corner_ur = Screen::Pen((char)187, COLOR_GREY, COLOR_BLACK);
-        Screen::Pen corner_dl = Screen::Pen((char)200, COLOR_GREY, COLOR_BLACK);
-        Screen::Pen corner_dr = Screen::Pen((char)188, COLOR_GREY, COLOR_BLACK);
-        Screen::Pen border_ud = Screen::Pen((char)205, COLOR_GREY, COLOR_BLACK);
-        Screen::Pen border_lr = Screen::Pen((char)186, COLOR_GREY, COLOR_BLACK);
         if (state == ACTIVE)
         {
+            static vector<string> lines;
+            static const std::string pause_message =
+                   "Pause confirmations until you exit this screen";
+            Screen::Pen corner_ul = Screen::Pen((char)201, COLOR_GREY, COLOR_BLACK);
+            Screen::Pen corner_ur = Screen::Pen((char)187, COLOR_GREY, COLOR_BLACK);
+            Screen::Pen corner_dl = Screen::Pen((char)200, COLOR_GREY, COLOR_BLACK);
+            Screen::Pen corner_dr = Screen::Pen((char)188, COLOR_GREY, COLOR_BLACK);
+            Screen::Pen border_ud = Screen::Pen((char)205, COLOR_GREY, COLOR_BLACK);
+            Screen::Pen border_lr = Screen::Pen((char)186, COLOR_GREY, COLOR_BLACK);
+
             split_string(&lines, get_message(), "\n");
             size_t max_length = 40;
             for (string line : lines)
@@ -397,7 +411,7 @@ public:
             Screen::paintTile(corner_ur, x2, y1);
             Screen::paintTile(corner_dl, x1, y2);
             Screen::paintTile(corner_dr, x2, y2);
-            string title = " " + get_title() + " ";
+            string title = ' ' + get_title() + ' ';
             Screen::paintString(Screen::Pen(' ', COLOR_DARKGREY, COLOR_BLACK),
                 x2 - 6, y1, "DFHack");
             Screen::paintString(Screen::Pen(' ', COLOR_BLACK, COLOR_GREY),
@@ -429,12 +443,36 @@ public:
         else if (state == SELECTED)
         {
             ikey_set tmp;
-            tmp.insert(last_key);
-            screen->feed(&tmp);
+            if(last_key_is_left_click) {
+                long prevx = df::global::gps->mouse_x;
+                long prevy = df::global::gps->mouse_y;
+                df::global::gps->mouse_x = mouse_pos.x;
+                df::global::gps->mouse_y = mouse_pos.y;
+                df::global::enabler->mouse_lbut = 1;
+                df::global::enabler->mouse_lbut_down = 1;
+                screen->feed(&tmp);
+                df::global::enabler->mouse_lbut = 0;
+                df::global::enabler->mouse_lbut_down = 0;
+                df::global::gps->mouse_x = prevx;
+                df::global::gps->mouse_y = prevy;
+            }
+            else if(last_key_is_right_click) {
+                tmp.insert(df::interface_key::LEAVESCREEN);
+                screen->feed(&tmp);
+            }
+            else {
+                tmp.insert(last_key);
+                screen->feed(&tmp);
+            }
             set_state(INACTIVE);
         }
+        if(dirty) {
+            dirty = false;
+            df::global::gps->force_full_display_count = 1;
+        }
     }
-    virtual string get_id() override = 0;
+    string get_id() override = 0;
+    string get_focus_string() override = 0;
     #define CONF_LUA_START using namespace conf_lua; Lua::StackUnwinder unwind(l_state); push(screen); push(get_id());
     bool intercept_key (df::interface_key key)
     {
@@ -445,6 +483,15 @@ public:
         else
             return false;
     };
+    bool intercept_key (std::string mouse_button = "MOUSE_LEFT")
+    {
+        CONF_LUA_START;
+        push(mouse_button);
+        if (call("intercept_key", 3, 1))
+            return lua_toboolean(l_state, -1);
+        else
+            return false;
+    };
     string get_title()
     {
         CONF_LUA_START;
@@ -473,6 +520,9 @@ public:
 protected:
     cstate state;
     df::interface_key last_key;
+    bool last_key_is_left_click;
+    bool last_key_is_right_click;
+    df::coord2d mouse_pos;
 };
 
 template<typename T>
@@ -501,23 +551,18 @@ struct cls##_hooks : cls::screen_type { \
         INTERPOSE_NEXT(render)(); \
         cls##_instance.render(); \
     } \
-    DEFINE_VMETHOD_INTERPOSE(bool, key_conflict, (df::interface_key key)) \
-    { \
-        return cls##_instance.key_conflict(key) || INTERPOSE_NEXT(key_conflict)(key); \
-    } \
 }; \
 IMPLEMENT_VMETHOD_INTERPOSE_PRIO(cls##_hooks, feed, prio); \
 IMPLEMENT_VMETHOD_INTERPOSE_PRIO(cls##_hooks, render, prio); \
-IMPLEMENT_VMETHOD_INTERPOSE_PRIO(cls##_hooks, key_conflict, prio); \
 static int conf_register_##cls = conf_register(&cls##_instance, {\
     &INTERPOSE_HOOK(cls##_hooks, feed), \
     &INTERPOSE_HOOK(cls##_hooks, render), \
-    &INTERPOSE_HOOK(cls##_hooks, key_conflict), \
 });
 
-#define DEFINE_CONFIRMATION(cls, screen) \
+#define DEFINE_CONFIRMATION(cls, screen, focusString) \
     class confirmation_##cls : public confirmation<df::screen> { \
         virtual string get_id() { static string id = char_replace(#cls, '_', '-'); return id; } \
+        virtual string get_focus_string() { return focusString; } \
     }; \
     IMPLEMENT_CONFIRMATION_HOOKS(confirmation_##cls, 0);
 
@@ -525,21 +570,39 @@ static int conf_register_##cls = conf_register(&cls##_instance, {\
     implemented in plugins/lua/confirm.lua.
     IDs (used in the "confirm enable/disable" command, by Lua, and in the docs)
     are obtained by replacing '_' with '-' in the first argument to DEFINE_CONFIRMATION
+
+    The second argument to DEFINE_CONFIRMATION determines the viewscreen that any
+    intercepted input will be fed to.
+
+    The third argument to DEFINE_CONFIRMATION determines the focus string that will
+    be used to determine if the confirmation should be unpaused. If a confirmation is paused
+    and the focus string is no longer found in the current focus, the confirmation will be
+    unpaused. Focus strings ending in "*" will use prefix matching e.g. "dwarfmode/Info*" would
+    match "dwarfmode/Info/Foo", "dwarfmode/Info/Bar" and so on. All matching is case insensitive.
 */
-DEFINE_CONFIRMATION(trade,              viewscreen_tradegoodsst);
-DEFINE_CONFIRMATION(trade_cancel,       viewscreen_tradegoodsst);
-DEFINE_CONFIRMATION(trade_seize,        viewscreen_tradegoodsst);
-DEFINE_CONFIRMATION(trade_offer,        viewscreen_tradegoodsst);
-DEFINE_CONFIRMATION(trade_select_all,   viewscreen_tradegoodsst);
-DEFINE_CONFIRMATION(haul_delete,        viewscreen_dwarfmodest);
-DEFINE_CONFIRMATION(depot_remove,       viewscreen_dwarfmodest);
-DEFINE_CONFIRMATION(squad_disband,      viewscreen_layer_militaryst);
-DEFINE_CONFIRMATION(uniform_delete,     viewscreen_layer_militaryst);
-DEFINE_CONFIRMATION(note_delete,        viewscreen_dwarfmodest);
-DEFINE_CONFIRMATION(route_delete,       viewscreen_dwarfmodest);
-DEFINE_CONFIRMATION(location_retire,    viewscreen_locationsst);
-DEFINE_CONFIRMATION(convict,            viewscreen_justicest);
-DEFINE_CONFIRMATION(order_remove,       viewscreen_jobmanagementst);
+
+DEFINE_CONFIRMATION(trade_cancel,         viewscreen_dwarfmodest, "dwarfmode/Trade");
+DEFINE_CONFIRMATION(haul_delete_route,    viewscreen_dwarfmodest, "dwarfmode/Hauling");
+DEFINE_CONFIRMATION(haul_delete_stop,     viewscreen_dwarfmodest, "dwarfmode/Hauling");
+DEFINE_CONFIRMATION(depot_remove,         viewscreen_dwarfmodest, "dwarfmode/ViewSheets/BUILDING");
+DEFINE_CONFIRMATION(squad_disband,        viewscreen_dwarfmodest, "dwarfmode/Squads");
+DEFINE_CONFIRMATION(order_remove,         viewscreen_dwarfmodest, "dwarfmode/Info/WORK_ORDERS");
+DEFINE_CONFIRMATION(zone_remove,          viewscreen_dwarfmodest, "dwarfmode/Zone");
+DEFINE_CONFIRMATION(burrow_remove,        viewscreen_dwarfmodest, "dwarfmode/Burrow");
+DEFINE_CONFIRMATION(stockpile_remove,     viewscreen_dwarfmodest, "dwarfmode/Some/Stockpile");
+
+// these are more complex to implement
+//DEFINE_CONFIRMATION(convict,            viewscreen_dwarfmodest);
+//DEFINE_CONFIRMATION(trade,              viewscreen_dwarfmodest);
+//DEFINE_CONFIRMATION(trade_seize,        viewscreen_dwarfmodest);
+//DEFINE_CONFIRMATION(trade_offer,        viewscreen_dwarfmodest);
+//DEFINE_CONFIRMATION(trade_select_all,   viewscreen_dwarfmodest);
+//DEFINE_CONFIRMATION(uniform_delete,     viewscreen_dwarfmodest);
+//DEFINE_CONFIRMATION(note_delete,        viewscreen_dwarfmodest);
+//DEFINE_CONFIRMATION(route_delete,       viewscreen_dwarfmodest);
+
+// locations can't be retired currently
+//DEFINE_CONFIRMATION(location_retire,    viewscreen_locationsst);
 
 DFhackCExport command_result plugin_init (color_ostream &out, vector <PluginCommand> &commands)
 {
@@ -554,15 +617,7 @@ DFhackCExport command_result plugin_init (color_ostream &out, vector <PluginComm
 
 DFhackCExport command_result plugin_enable (color_ostream &out, bool enable)
 {
-    if (is_enabled != enable)
-    {
-        for (auto c : confirmations)
-        {
-            if (!c.second->apply(enable))
-                return CR_FAILURE;
-        }
-        is_enabled = enable;
-    }
+    is_enabled = enable;
     if (is_enabled)
     {
         conf_lua::simple_call("check");
@@ -585,22 +640,6 @@ DFhackCExport command_result plugin_shutdown (color_ostream &out)
     return CR_OK;
 }
 
-static bool screen_found(df::viewscreen *target_screen)
-{
-    if (!df::global::gview)
-        return false;
-
-    df::viewscreen *screen = &df::global::gview->view;
-    while (screen)
-    {
-        if (screen == target_screen)
-            return true;
-        screen = screen->child;
-    }
-
-    return false;
-}
-
 DFhackCExport command_result plugin_onupdate (color_ostream &out)
 {
     while (!cmds.empty())
@@ -609,10 +648,6 @@ DFhackCExport command_result plugin_onupdate (color_ostream &out)
         cmds.pop();
     }
 
-    // if the screen that we paused on is no longer on the stack, unpause
-    if (paused_screen && !screen_found(paused_screen))
-        conf_lua::api::unpause(NULL);
-
     return CR_OK;
 }
 
@@ -637,6 +672,27 @@ bool set_conf_state (string name, bool state)
     return found;
 }
 
+bool set_conf_paused (string name, bool pause)
+{
+    bool found = false;
+    for (auto it : confirmations)
+    {
+        if (it.first == name)
+        {
+            found = true;
+            it.second->set_paused(pause);
+        }
+    }
+
+    if (pause == true)
+    {
+        // dismiss the confirmation too
+        confirmation_base::set_state(name, confirmation_base::INACTIVE);
+    }
+
+    return found;
+}
+
 void enable_conf (color_ostream &out, string name, bool state)
 {
     if (!set_conf_state(name, state))
diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp
index 57dbf7244..ebc6eb7fe 100644
--- a/plugins/createitem.cpp
+++ b/plugins/createitem.cpp
@@ -16,7 +16,7 @@
 #include "DataDefs.h"
 #include "df/game_type.h"
 #include "df/world.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/historical_entity.h"
 #include "df/world_site.h"
@@ -38,7 +38,7 @@ using namespace df::enums;
 DFHACK_PLUGIN("createitem");
 REQUIRE_GLOBAL(cursor);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(gametype);
 REQUIRE_GLOBAL(cur_year_tick);
 
@@ -78,7 +78,7 @@ bool makeItem (df::reaction_product_itemst *prod, df::unit *unit, bool second_it
 
     prod->produce(unit, &out_products, &out_items, &in_reag, &in_items, 1, job_skill::NONE,
         0, df::historical_entity::find(unit->civ_id),
-        (World::isFortressMode()) ? df::world_site::find(ui->site_id) : NULL, NULL);
+        (World::isFortressMode()) ? df::world_site::find(plotinfo->site_id) : NULL, NULL);
     if (!out_items.size())
         return false;
     // if we asked to make shoes and we got twice as many as we asked, then we're okay
@@ -178,6 +178,7 @@ command_result df_createitem (color_ostream &out, vector <string> & parameters)
             case item_type::BUCKET:
             case item_type::ANIMALTRAP:
             case item_type::BOX:
+            case item_type::BAG:
             case item_type::BIN:
             case item_type::BACKPACK:
             case item_type::QUIVER:
diff --git a/plugins/debug.cpp b/plugins/debug.cpp
index f4a22b8d1..a48fd2a05 100644
--- a/plugins/debug.cpp
+++ b/plugins/debug.cpp
@@ -43,7 +43,7 @@ namespace DFHack {
 DBG_DECLARE(debug,filter);
 DBG_DECLARE(debug,init);
 DBG_DECLARE(debug,command);
-DBG_DECLARE(debug,ui);
+DBG_DECLARE(debug,plotinfo);
 DBG_DECLARE(debug,example,DebugCategory::LINFO);
 }
 
diff --git a/plugins/design.cpp b/plugins/design.cpp
new file mode 100644
index 000000000..37ee32cbd
--- /dev/null
+++ b/plugins/design.cpp
@@ -0,0 +1,270 @@
+#include <bitset>
+#include <cstdint>
+#include <iostream>
+#include <map>
+#include <string>
+#include <vector>
+
+#include "ColorText.h"
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+#include "df/graphic_viewportst.h"
+#include "df/world.h"
+#include "modules/Gui.h"
+#include "modules/Persistence.h"
+#include "modules/Screen.h"
+#include "modules/World.h"
+
+DFHACK_PLUGIN("design");
+using DFHack::color_value;
+
+REQUIRE_GLOBAL(window_x);
+REQUIRE_GLOBAL(window_y);
+REQUIRE_GLOBAL(world);
+REQUIRE_GLOBAL(plotinfo);
+using namespace DFHack;
+using namespace df::enums;
+
+namespace DFHack {
+DBG_DECLARE(design, log, DebugCategory::LINFO);
+}
+
+DFhackCExport command_result plugin_init(color_ostream &out,
+                                         std::vector<PluginCommand> &commands) {
+    return CR_OK;
+}
+
+std::map<uint32_t, Screen::Pen> PENS;
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        DEBUG(log,out).print("clearing PENS\n");
+        PENS.clear();
+    }
+    return CR_OK;
+}
+
+struct DrawingPoint {
+    uint32_t penKey = 0;
+    std::pair<int, int> cursor_coords;
+
+    DrawingPoint() : penKey(0), cursor_coords({-1, -1}) {}
+};
+
+typedef std::map<int, std::map<int, DrawingPoint>> ShapeMap;
+ShapeMap arr;
+
+bool has_point(int x, int y) {
+    return arr.count(x) != 0 && arr.at(x).count(y) != 0;
+};
+
+// Key tuple is N, W, E, S
+typedef std::tuple<bool, bool, bool, bool> DirectionKey;
+std::map<DirectionKey, std::pair<int, int>> CURSORS_MAP = {
+    {{false, false, false, false}, {1, 2}},  // INSIDE
+    {{true, true, false, false}, {0, 1}},    // NW
+    {{true, false, false, false}, {1, 1}},   // NORTH
+    {{true, false, true, false}, {2, 1}},    // NE
+    {{false, true, false, false}, {0, 2}},   // WEST
+    {{false, false, true, false}, {2, 2}},   // EAST
+    {{false, true, false, true}, {0, 3}},    // SW
+    {{false, false, false, true}, {1, 3}},   // SOUTH
+    {{false, false, true, true}, {2, 3}},    // SE
+    {{true, true, true, false}, {3, 2}},     // N_NUB
+    {{true, false, true, true}, {5, 1}},     // E_NUB
+    {{true, true, false, true}, {3, 1}},     // W_NUB
+    {{false, true, true, true}, {4, 2}},     // S_NUB
+    {{false, true, true, false}, {3, 3}},    // VERT_NS
+    {{true, false, false, true}, {4, 1}},    // VERT_EW
+    {{true, true, true, true}, {4, 3}},      // POINT
+};
+
+enum PenMask {
+    North = 0,
+    South,
+    East,
+    West,
+    DragPoint,
+    MouseOver,
+    InShape,
+    ExtraPoint,
+    NumFlags
+};
+
+uint32_t gen_pen_key(bool n, bool s, bool e, bool w, bool is_drag_point,
+                     bool is_mouse_over, bool inshape, bool extra_point) {
+    std::bitset<static_cast<size_t>(PenMask::NumFlags)> ret;
+    ret[PenMask::North] = n;
+    ret[PenMask::South] = s;
+    ret[PenMask::East] = e;
+    ret[PenMask::West] = w;
+    ret[PenMask::DragPoint] = is_drag_point;
+    ret[PenMask::MouseOver] = is_mouse_over;
+    ret[PenMask::InShape] = inshape;
+    ret[PenMask::ExtraPoint] = extra_point;
+
+    return ret.to_ulong();
+}
+
+Screen::Pen make_pen(const std::pair<int, int> &direction, bool is_drag_point,
+                     bool is_mouse_over, bool inshape, bool extra_point) {
+    color_value color = COLOR_GREEN;
+    int ycursor_mod = 0;
+
+    if (!extra_point) {
+        if (is_drag_point) {
+            color = COLOR_CYAN;
+            ycursor_mod += 6;
+            if (is_mouse_over) {
+                color = COLOR_MAGENTA;
+                ycursor_mod += 3;
+            }
+        }
+    } else {
+        ycursor_mod += 15;
+        color = COLOR_LIGHTRED;
+
+        if (is_mouse_over) {
+            color = COLOR_RED;
+            ycursor_mod += 3;
+        }
+    }
+
+    Screen::Pen pen;
+    pen.ch = inshape ? 'X' : 'o';
+    pen.fg = color;
+    int selected_tile_texpos = 0;
+    Screen::findGraphicsTile("CURSORS", direction.first,
+                             direction.second + ycursor_mod,
+                             &selected_tile_texpos);
+    pen.tile = selected_tile_texpos;
+
+    return pen;
+}
+
+Screen::Pen get_pen(int x, int y, ShapeMap &arr, const std::string &type = "") {
+    bool n = false, w = false, e = false, s = false;
+    if (has_point(x, y)) {
+        if (y == 0 || !has_point(x, y - 1)) n = true;
+        if (x == 0 || !has_point(x - 1, y)) w = true;
+        if (!has_point(x + 1, y)) e = true;  // TODO check map size
+        if (!has_point(x, y + 1)) s = true;  // TODO check map size
+    }
+
+    bool is_drag_point = type == "drag_point";
+    bool is_extra = type == "extra_point";
+    bool is_in_shape = has_point(x, y);
+    auto mouse_pos = Gui::getMousePos();
+    bool mouse_over = mouse_pos.x == x && mouse_pos.y == y;
+
+    uint32_t pen_key = gen_pen_key(n, s, e, w, is_drag_point, mouse_over,
+                                   is_in_shape, is_extra);
+
+    if (CURSORS_MAP.count({n, w, e, s}) > 0 && has_point(x, y)) {
+        arr[x][y].cursor_coords = CURSORS_MAP.at({n, w, e, s});
+    }
+
+    if (PENS.find(pen_key) == PENS.end()) {
+        std::pair<int, int> cursor{-1, -1};
+
+        if (type != "") {
+            return make_pen(CURSORS_MAP.at({n, w, e, s}), is_drag_point,
+                            mouse_over, is_in_shape, is_extra);
+        }
+
+        if (CURSORS_MAP.count({n, w, e, s}) > 0) {
+            PENS.emplace(pen_key,
+                         make_pen(CURSORS_MAP.at({n, w, e, s}), is_drag_point,
+                                  mouse_over, is_in_shape, is_extra));
+            if (type == "" && has_point(x, y)) {
+                arr[x][y].penKey = pen_key;
+            }
+        }
+    }
+
+    return PENS.at(pen_key);
+}
+
+static int design_load_shape(lua_State *L) {
+    if (lua_istable(L, -1)) {
+        lua_pushnil(L);
+        while (lua_next(L, -2) != 0) {
+            int x = lua_tointeger(L, -2);
+
+            if (lua_istable(L, -1)) {
+                lua_pushnil(L);
+                while (lua_next(L, -2) != 0) {
+                    int y = lua_tointeger(L, -2);
+                    bool value = lua_toboolean(L, -1);
+
+                    if (value) {
+                        arr[x][y] = DrawingPoint();
+                    }
+                    lua_pop(L, 1);
+                }
+            }
+            lua_pop(L, 1);
+        }
+    }
+
+    return 0;
+}
+
+static int design_clear_shape(lua_State *L) {
+    arr.clear();
+
+    return 0;
+}
+
+static int design_draw_shape(lua_State *L) {
+    if (arr.size() == 0) {
+        design_load_shape(L);
+    }
+
+    for (auto x : arr) {
+        for (auto y : x.second) {
+            Screen::Pen cur_tile = Screen::readTile(x.first, y.first, true);
+            Screen::Pen pen = get_pen(x.first, y.first, arr);
+            cur_tile.tile = pen.tile;
+            Screen::paintTile(cur_tile, x.first - *window_x,
+                              y.first - *window_y, true);
+        }
+    }
+
+    return 0;
+}
+
+static int design_draw_points(lua_State *L) {
+    if (lua_istable(L, -1)) {
+        const char *str;
+        lua_rawgeti(L, -1, 2);
+        str = lua_tostring(L, -1);
+        lua_pop(L, 1);
+
+        lua_rawgeti(L, -1, 1);
+        int n = luaL_len(L, -1);
+        for (int i = 1; i <= n; i++) {
+            lua_rawgeti(L, -1, i);
+            int x, y;
+            lua_getfield(L, -1, "y");
+            y = lua_tointeger(L, -1);
+            lua_getfield(L, -2, "x");
+            x = lua_tointeger(L, -1);
+            lua_pop(L, 3);
+
+            Screen::Pen cur_tile = Screen::readTile(x, y, true);
+            Screen::Pen pen = get_pen(x, y, arr, str);
+            cur_tile.tile = pen.tile;
+            Screen::paintTile(cur_tile, x - *window_x, y - *window_y, true);
+        }
+        lua_pop(L, 1);
+    }
+
+    return 0;
+}
+
+DFHACK_PLUGIN_LUA_COMMANDS{DFHACK_LUA_COMMAND(design_draw_shape),
+                           DFHACK_LUA_COMMAND(design_draw_points),
+                           DFHACK_LUA_COMMAND(design_clear_shape),
+                           DFHACK_LUA_END};
diff --git a/plugins/devel/CMakeLists.txt b/plugins/devel/CMakeLists.txt
index febf169ca..210669a75 100644
--- a/plugins/devel/CMakeLists.txt
+++ b/plugins/devel/CMakeLists.txt
@@ -14,13 +14,13 @@ dfhack_plugin(frozen frozen.cpp)
 dfhack_plugin(kittens kittens.cpp LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} COMPILE_FLAGS_MSVC "/wd4316")
 dfhack_plugin(memview memview.cpp memutils.cpp LINK_LIBRARIES lua)
 dfhack_plugin(onceExample onceExample.cpp)
-dfhack_plugin(renderer-msg renderer-msg.cpp)
-dfhack_plugin(rprobe rprobe.cpp)
-dfhack_plugin(stepBetween stepBetween.cpp)
+# dfhack_plugin(renderer-msg renderer-msg.cpp)
+# dfhack_plugin(rprobe rprobe.cpp)
+# dfhack_plugin(stepBetween stepBetween.cpp)
 dfhack_plugin(stockcheck stockcheck.cpp)
 dfhack_plugin(stripcaged stripcaged.cpp)
 dfhack_plugin(tilesieve tilesieve.cpp)
-dfhack_plugin(zoom zoom.cpp)
+# dfhack_plugin(zoom zoom.cpp)
 
 if(UNIX)
     dfhack_plugin(ref-index ref-index.cpp)
diff --git a/plugins/devel/check-structures-sanity/CMakeLists.txt b/plugins/devel/check-structures-sanity/CMakeLists.txt
index f3eab5da6..69e326309 100644
--- a/plugins/devel/check-structures-sanity/CMakeLists.txt
+++ b/plugins/devel/check-structures-sanity/CMakeLists.txt
@@ -5,4 +5,4 @@ set(PLUGIN_SRCS
     validate.cpp
 )
 
-dfhack_plugin(check-structures-sanity ${PLUGIN_SRCS} LINK_LIBRARIES lua)
+dfhack_plugin(check-structures-sanity ${PLUGIN_SRCS} LINK_LIBRARIES lua COMPILE_FLAGS_GCC "-O0 -ggdb3" COMPILE_FLAGS_MSVC "/Od")
diff --git a/plugins/devel/check-structures-sanity/check-structures-sanity.h b/plugins/devel/check-structures-sanity/check-structures-sanity.h
index b606e9d86..ec27cd25a 100644
--- a/plugins/devel/check-structures-sanity/check-structures-sanity.h
+++ b/plugins/devel/check-structures-sanity/check-structures-sanity.h
@@ -82,6 +82,7 @@ public:
     bool failfast;
     bool noprogress;
     bool maybepointer;
+    uint8_t perturb_byte;
 
     Checker(color_ostream & out);
     bool queue_item(const QueueItem & item, CheckedStructure cs);
diff --git a/plugins/devel/check-structures-sanity/dispatch.cpp b/plugins/devel/check-structures-sanity/dispatch.cpp
index 05dcc0377..9d9198744 100644
--- a/plugins/devel/check-structures-sanity/dispatch.cpp
+++ b/plugins/devel/check-structures-sanity/dispatch.cpp
@@ -1,5 +1,7 @@
 #include "check-structures-sanity.h"
 
+#include <cinttypes>
+
 #include "df/large_integer.h"
 
 Checker::Checker(color_ostream & out) :
@@ -294,7 +296,7 @@ void Checker::dispatch_primitive(const QueueItem & item, const CheckedStructure
     else if (cs.identity == df::identity_traits<bool>::get())
     {
         auto val = *reinterpret_cast<const uint8_t *>(item.ptr);
-        if (val > 1 && val != 0xd2)
+        if (val > 1 && perturb_byte && val != perturb_byte && val != (perturb_byte ^ 0xff))
         {
             FAIL("invalid value for bool: " << int(val));
         }
@@ -375,6 +377,14 @@ void Checker::dispatch_container(const QueueItem & item, const CheckedStructure
     {
         // TODO: check DfArray
     }
+    else if (base_container.starts_with("map<"))
+    {
+        // TODO: check map
+    }
+    else if (base_container.starts_with("unordered_map<"))
+    {
+        // TODO: check unordered_map
+    }
     else
     {
         UNEXPECTED;
@@ -815,7 +825,7 @@ void Checker::check_stl_vector(const QueueItem & item, type_identity *item_ident
     auto vec_items = validate_vector_size(item, CheckedStructure(item_identity));
 
     // skip bad pointer vectors
-    if (item.path.length() > 4 && item.path.substr(item.path.length() - 4) == ".bad" && item_identity->type() == IDTYPE_POINTER)
+    if ((item.path.ends_with(".bad") || item.path.ends_with(".temp_save")) && item_identity->type() == IDTYPE_POINTER)
     {
         return;
     }
@@ -845,69 +855,51 @@ void Checker::check_stl_string(const QueueItem & item)
 #else
     struct string_data
     {
-        struct string_data_inner
+        uintptr_t start;
+        size_t length;
+        union
         {
-            size_t length;
+            char local_data[16];
             size_t capacity;
-            int32_t refcount;
-        } *ptr;
+        };
     };
 #endif
 
     auto string = reinterpret_cast<const string_data *>(item.ptr);
 #ifdef WIN32
-    bool is_local = string->capacity < 16;
+    const bool is_gcc = false;
+    const bool is_local = string->capacity < 16;
+#else
+    const bool is_gcc = true;
+    const bool is_local = string->start == reinterpret_cast<uintptr_t>(&string->local_data[0]);
+#endif
     const char *start = is_local ? &string->local_data[0] : reinterpret_cast<const char *>(string->start);
     ptrdiff_t length = string->length;
     ptrdiff_t capacity = string->capacity;
-#else
-    if (!is_valid_dereference(QueueItem(item, "?ptr?", string->ptr), 1))
+
+    (void)start;
+    if (length < 0)
     {
-        // nullptr is NOT okay here
-        FAIL("invalid string pointer " << stl_sprintf("%p", string->ptr));
-        return;
+        FAIL("string length is negative (" << length << ")");
     }
-    if (!is_valid_dereference(QueueItem(item, "?hdr?", string->ptr - 1), sizeof(*string->ptr)))
+    else if (is_gcc && length > 0 && !is_valid_dereference(QueueItem(item, "?start?", reinterpret_cast<void *>(string->start)), 1))
     {
+        // nullptr is NOT okay here
+        FAIL("invalid string pointer " << stl_sprintf("0x%" PRIxPTR, string->start));
         return;
     }
-    const char *start = reinterpret_cast<const char *>(string->ptr);
-    ptrdiff_t length = (string->ptr - 1)->length;
-    ptrdiff_t capacity = (string->ptr - 1)->capacity;
-#endif
-
-    (void)start;
-    if (length < 0)
+    else if (is_local && length >= 16)
     {
-        FAIL("string length is negative (" << length << ")");
+        FAIL("string length is too large for small string (" << length << ")");
     }
-    else if (capacity < 0)
+    else if ((!is_gcc || !is_local) && capacity < 0)
     {
         FAIL("string capacity is negative (" << capacity << ")");
     }
-    else if (capacity < length)
+    else if ((!is_gcc || !is_local) && capacity < length)
     {
         FAIL("string capacity (" << capacity << ") is less than length (" << length << ")");
     }
-
-#ifndef WIN32
-    const std::string empty_string;
-    auto empty_string_data = reinterpret_cast<const string_data *>(&empty_string);
-    if (sizes && string->ptr != empty_string_data->ptr)
-    {
-        size_t allocated_size = get_allocated_size(QueueItem(item, "?hdr?", string->ptr - 1));
-        size_t expected_size = sizeof(*string->ptr) + capacity + 1;
-
-        if (!allocated_size)
-        {
-            FAIL("pointer does not appear to be a string");
-        }
-        else if (allocated_size != expected_size)
-        {
-            FAIL("allocated string data size (" << allocated_size << ") does not match expected size (" << expected_size << ")");
-        }
-    }
-#endif
 }
 void Checker::check_possible_pointer(const QueueItem & item, const CheckedStructure & cs)
 {
diff --git a/plugins/devel/check-structures-sanity/main.cpp b/plugins/devel/check-structures-sanity/main.cpp
index 909c25dac..cefe14138 100644
--- a/plugins/devel/check-structures-sanity/main.cpp
+++ b/plugins/devel/check-structures-sanity/main.cpp
@@ -33,28 +33,33 @@ DFhackCExport command_result plugin_init(color_ostream &, std::vector<PluginComm
     return CR_OK;
 }
 
-bool check_malloc_perturb()
+// returns 0 if MALLOC_PERTURB_ is unset, or if set to 0, because 0 is not useful
+uint8_t check_malloc_perturb()
 {
-    struct T_test {
-        uint32_t data[1024];
-    };
-    auto test = new T_test;
-    bool ret = (test->data[0] == 0xd2d2d2d2);
-    delete test;
-    return ret;
+    const size_t TEST_DATA_LEN = 5000;  // >1 4kb page
+    std::unique_ptr<uint8_t[]> test_data{new uint8_t[TEST_DATA_LEN]};
+
+    uint8_t expected_perturb = test_data[0];
+    if (getenv("MALLOC_PERTURB_"))
+        expected_perturb = 0xff ^ static_cast<uint8_t>(atoi(getenv("MALLOC_PERTURB_")));
+
+    for (size_t i = 0; i < TEST_DATA_LEN; i++)
+        if (expected_perturb != test_data[i])
+            return 0;
+
+    return expected_perturb;
 }
 
 static command_result command(color_ostream & out, std::vector<std::string> & parameters)
 {
-    if (!check_malloc_perturb())
-    {
-        out.printerr("check-structures-sanity: MALLOC_PERTURB_ not set, cannot continue\n");
-        return CR_FAILURE;
-    }
+    uint8_t perturb_byte = check_malloc_perturb();
+    if (!perturb_byte)
+        out.printerr("check-structures-sanity: MALLOC_PERTURB_ not set. Some checks may be bypassed or fail.\n");
 
     CoreSuspender suspend;
 
     Checker checker(out);
+    checker.perturb_byte = perturb_byte;
 
     // check parameters with values first
 #define VAL_PARAM(name, expr_using_value) \
diff --git a/plugins/devel/check-structures-sanity/types.cpp b/plugins/devel/check-structures-sanity/types.cpp
index 86d691f1d..3e6ae5a2d 100644
--- a/plugins/devel/check-structures-sanity/types.cpp
+++ b/plugins/devel/check-structures-sanity/types.cpp
@@ -162,7 +162,7 @@ type_identity *Checker::wrap_in_stl_ptr_vector(type_identity *base)
     {
         return it->second.get();
     }
-    return (wrappers[base] = dts::make_unique<df::stl_ptr_vector_identity>(base, nullptr)).get();
+    return (wrappers[base] = std::make_unique<df::stl_ptr_vector_identity>(base, nullptr)).get();
 }
 
 type_identity *Checker::wrap_in_pointer(type_identity *base)
@@ -173,7 +173,7 @@ type_identity *Checker::wrap_in_pointer(type_identity *base)
     {
         return it->second.get();
     }
-    return (wrappers[base] = dts::make_unique<df::pointer_identity>(base)).get();
+    return (wrappers[base] = std::make_unique<df::pointer_identity>(base)).get();
 }
 
 std::map<size_t, std::vector<std::string>> known_types_by_size;
diff --git a/plugins/devel/kittens.cpp b/plugins/devel/kittens.cpp
index 89ece51b6..ec1114576 100644
--- a/plugins/devel/kittens.cpp
+++ b/plugins/devel/kittens.cpp
@@ -33,7 +33,7 @@ using namespace DFHack;
 
 DFHACK_PLUGIN("kittens");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(world);
 
 namespace DFHack {
@@ -119,9 +119,9 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
     }
     if(trackmenu_flg)
     {
-        if (last_menu != ui->main.mode)
+        if (last_menu != plotinfo->main.mode)
         {
-            last_menu = ui->main.mode;
+            last_menu = plotinfo->main.mode;
             out.print("Menu: %d\n",last_menu);
         }
     }
@@ -157,7 +157,7 @@ command_result trackmenu (color_ostream &out, vector <string> & parameters)
     else
     {
         is_enabled = true;
-        last_menu = ui->main.mode;
+        last_menu = plotinfo->main.mode;
         out.print("Menu: %d\n",last_menu);
         trackmenu_flg = true;
         return CR_OK;
diff --git a/plugins/devel/stockcheck.cpp b/plugins/devel/stockcheck.cpp
index 619fda9fd..796bc2fc9 100644
--- a/plugins/devel/stockcheck.cpp
+++ b/plugins/devel/stockcheck.cpp
@@ -5,7 +5,7 @@
 
 #include "DataDefs.h"
 #include "df/world.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/building_stockpilest.h"
 #include "df/global_objects.h"
 #include "df/item.h"
@@ -24,7 +24,7 @@ using namespace DFHack;
 using namespace df::enums;
 
 using df::global::world;
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::selection_rect;
 
 using df::building_stockpilest;
@@ -35,7 +35,7 @@ DFHACK_PLUGIN("stockcheck");
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    if (world && ui) {
+    if (world && plotinfo) {
         commands.push_back(
             PluginCommand("stockcheck", "Check for unprotected rottable items.",
                 stockcheck, false,
diff --git a/plugins/devel/stripcaged.cpp b/plugins/devel/stripcaged.cpp
index 30d0b0d2b..e96e63fb1 100644
--- a/plugins/devel/stripcaged.cpp
+++ b/plugins/devel/stripcaged.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include "modules/World.h"
 #include "MiscUtils.h"
 
-#include <df/ui.h>
+#include <df/plotinfost.h>
 #include "df/world.h"
 #include "df/world_raws.h"
 #include "df/building_def.h"
@@ -34,7 +34,7 @@ using namespace DFHack;
 using namespace df::enums;
 using df::global::world;
 using df::global::cursor;
-using df::global::ui;
+using df::global::plotinfo;
 
 using namespace DFHack::Gui;
 
diff --git a/plugins/dig-now.cpp b/plugins/dig-now.cpp
index 1bca6784c..028d4af6d 100644
--- a/plugins/dig-now.cpp
+++ b/plugins/dig-now.cpp
@@ -6,6 +6,7 @@
 #include "PluginManager.h"
 #include "TileTypes.h"
 #include "LuaTools.h"
+#include "Debug.h"
 
 #include "modules/Buildings.h"
 #include "modules/Gui.h"
@@ -14,24 +15,142 @@
 #include "modules/Random.h"
 #include "modules/Units.h"
 #include "modules/World.h"
+#include "modules/EventManager.h"
+#include "modules/Job.h"
 
 #include <df/historical_entity.h>
 #include <df/map_block.h>
 #include <df/reaction_product_itemst.h>
 #include <df/tile_designation.h>
 #include <df/tile_occupancy.h>
-#include <df/ui.h>
+#include <df/plotinfost.h>
 #include <df/unit.h>
 #include <df/vermin.h>
 #include <df/world.h>
 #include <df/world_site.h>
 
+#include <cinttypes>
+#include <unordered_set>
+#include <unordered_map>
+
 DFHACK_PLUGIN("dig-now");
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(world);
 
+// Debugging
+namespace DFHack {
+    DBG_DECLARE(dignow, general, DebugCategory::LINFO);
+    DBG_DECLARE(dignow, channels, DebugCategory::LINFO);
+}
+
+#define COORD "%" PRIi16 " %" PRIi16 " %" PRIi16
+#define COORDARGS(id) id.x, id.y, id.z
+
 using namespace DFHack;
 
+struct designation{
+    df::coord pos;
+    df::tile_designation type;
+    df::tile_occupancy occupancy;
+    designation() = default;
+    designation(const df::coord &c, const df::tile_designation &td, const df::tile_occupancy &to) : pos(c), type(td), occupancy(to) {}
+
+    bool operator==(const designation &rhs) const {
+        return pos == rhs.pos;
+    }
+
+    bool operator!=(const designation &rhs) const {
+        return !(rhs == *this);
+    }
+};
+
+namespace std {
+    template<>
+    struct hash<designation> {
+        std::size_t operator()(const designation &c) const {
+            std::hash<df::coord> hash_coord;
+            return hash_coord(c.pos);
+        }
+    };
+}
+
+class DesignationJobs {
+private:
+    std::unordered_map<df::coord, designation> designations;
+    std::unordered_map<df::coord, df::job*> jobs;
+public:
+    void load(MapExtras::MapCache &map) {
+        designations.clear();
+        DEBUG(general).print("DesignationJobs: reading jobs list\n");
+        df::job_list_link* node = df::global::world->jobs.list.next;
+        while (node) {
+            df::job* job = node->item;
+            node = node->next;
+
+            if(!job || !Maps::isValidTilePos(job->pos))
+                continue;
+
+            df::tile_designation td = map.designationAt(job->pos);
+            df::tile_occupancy to = map.occupancyAt(job->pos);
+            const auto ctd = td.whole;
+            const auto cto = to.whole;
+            switch (job->job_type){
+                case job_type::Dig:
+                    td.bits.dig = tile_dig_designation::Default;
+                    break;
+                case job_type::DigChannel:
+                    td.bits.dig = tile_dig_designation::Channel;
+                    break;
+                case job_type::CarveRamp:
+                    td.bits.dig = tile_dig_designation::Ramp;
+                    break;
+                case job_type::CarveUpwardStaircase:
+                    td.bits.dig = tile_dig_designation::UpStair;
+                    break;
+                case job_type::CarveDownwardStaircase:
+                    td.bits.dig = tile_dig_designation::DownStair;
+                    break;
+                case job_type::CarveUpDownStaircase:
+                    td.bits.dig = tile_dig_designation::UpDownStair;
+                    break;
+                case job_type::SmoothWall:
+                case job_type::SmoothFloor:
+                    td.bits.smooth = 1;
+                    break;
+                case job_type::CarveTrack:
+                    to.bits.carve_track_north = (job->item_category.whole >> 18) & 1;
+                    to.bits.carve_track_south = (job->item_category.whole >> 19) & 1;
+                    to.bits.carve_track_west = (job->item_category.whole >> 20) & 1;
+                    to.bits.carve_track_east = (job->item_category.whole >> 21) & 1;
+                    break;
+                default:
+                    break;
+            }
+            if (ctd != td.whole || cto != to.whole) {
+                // we found a designation job
+                designations.emplace(job->pos, designation(job->pos, td, to));
+                jobs.emplace(job->pos, job);
+            }
+        }
+        DEBUG(general).print("DesignationJobs: DONE reading jobs list\n");
+    }
+    void remove(const df::coord &pos) {
+        if(jobs.count(pos)) {
+            Job::removeJob(jobs[pos]);
+            jobs.erase(pos);
+        }
+    }
+    designation get(const df::coord &pos) {
+        if (designations.count(pos)) {
+            return designations[pos];
+        }
+        return {};
+    }
+    bool count(const df::coord &pos) {
+        return jobs.count(pos);
+    }
+};
+
 struct boulder_percent_options {
     // percent chance ([0..100]) for creating a boulder for the given rock type
     uint32_t layer;
@@ -269,21 +388,37 @@ struct dug_tile_info {
         df::tiletype tt = map.tiletypeAt(pos);
         tmat = tileMaterial(tt);
 
+        itype = df::item_type::BOULDER;
+        imat = -1;
+
+        df::tiletype_shape shape = tileShape(tt);
+        if (shape == df::tiletype_shape::WALL || shape == df::tiletype_shape::FORTIFICATION) {
+            switch (tmat) {
+                case df::tiletype_material::STONE:
+                case df::tiletype_material::MINERAL:
+                case df::tiletype_material::FEATURE:
+                    imat = map.baseMaterialAt(pos).mat_index;
+                    break;
+                case df::tiletype_material::LAVA_STONE:
+                {
+                    MaterialInfo mi;
+                    if (mi.findInorganic("OBSIDIAN"))
+                        imat = mi.index;
+                    return; // itype should always be BOULDER, regardless of vein
+                }
+                default:
+                    break;
+            }
+        }
+
         switch (map.BlockAtTile(pos)->veinTypeAt(pos)) {
             case df::inclusion_type::CLUSTER_ONE:
             case df::inclusion_type::CLUSTER_SMALL:
                 itype = df::item_type::ROUGH;
                 break;
             default:
-                itype = df::item_type::BOULDER;
+                break;
         }
-
-        imat = -1;
-        if (tileShape(tt) == df::tiletype_shape::WALL
-                && (tmat == df::tiletype_material::STONE
-                    || tmat == df::tiletype_material::MINERAL
-                    || tmat == df::tiletype_material::FEATURE))
-            imat = map.baseMaterialAt(pos).mat_index;
     }
 };
 
@@ -296,7 +431,6 @@ static bool is_diggable(MapExtras::MapCache &map, const DFCoord &pos,
     case df::tiletype_material::RIVER:
     case df::tiletype_material::TREE:
     case df::tiletype_material::ROOT:
-    case df::tiletype_material::LAVA_STONE:
     case df::tiletype_material::MAGMA:
     case df::tiletype_material::HFS:
     case df::tiletype_material::UNDERWORLD_GATE:
@@ -320,8 +454,10 @@ static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
                      std::vector<dug_tile_info> &dug_tiles) {
     df::tiletype tt = map.tiletypeAt(pos);
 
-    if (!is_diggable(map, pos, tt))
+    if (!is_diggable(map, pos, tt)) {
+        DEBUG(general).print("dig_tile: not diggable\n");
         return false;
+    }
 
     df::tiletype target_type = df::tiletype::Void;
     switch(designation) {
@@ -341,19 +477,22 @@ static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
             DFCoord pos_below(pos.x, pos.y, pos.z-1);
             if (can_dig_channel(tt) && map.ensureBlockAt(pos_below)
                     && is_diggable(map, pos_below, map.tiletypeAt(pos_below))) {
+                TRACE(channels).print("dig_tile: channeling at (" COORD ") [can_dig_channel: true]\n",COORDARGS(pos_below));
                 target_type = df::tiletype::OpenSpace;
                 DFCoord pos_above(pos.x, pos.y, pos.z+1);
-                if (map.ensureBlockAt(pos_above))
+                if (map.ensureBlockAt(pos_above)) {
                     remove_ramp_top(map, pos_above);
-                df::tile_dig_designation td_below =
-                        map.designationAt(pos_below).bits.dig;
-                if (dig_tile(out, map, pos_below,
-                             df::tile_dig_designation::Ramp, dug_tiles)) {
+                }
+                df::tile_dig_designation td_below = map.designationAt(pos_below).bits.dig;
+                if (dig_tile(out, map, pos_below, df::tile_dig_designation::Ramp, dug_tiles)) {
                     clean_ramps(map, pos_below);
-                    if (td_below == df::tile_dig_designation::Default)
+                    if (td_below == df::tile_dig_designation::Default) {
                         dig_tile(out, map, pos_below, td_below, dug_tiles);
+                    }
                     return true;
                 }
+            } else {
+                DEBUG(channels).print("dig_tile: failed to channel at (" COORD ") [can_dig_channel: false]\n", COORDARGS(pos_below));
             }
             break;
         }
@@ -407,7 +546,8 @@ static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
     if (target_type == df::tiletype::Void || target_type == tt)
         return false;
 
-    dug_tiles.push_back(dug_tile_info(map, pos));
+    dug_tiles.emplace_back(map, pos);
+    TRACE(general).print("dig_tile: digging the designation tile at (" COORD ")\n",COORDARGS(pos));
     dig_type(map, pos, target_type);
 
     // let light filter down to newly exposed tiles
@@ -594,9 +734,14 @@ static void do_dig(color_ostream &out, std::vector<DFCoord> &dug_coords,
                    item_coords_t &item_coords, const dig_now_options &options) {
     MapExtras::MapCache map;
     Random::MersenneRNG rng;
+    DesignationJobs jobs;
 
+    DEBUG(general).print("do_dig(): starting..\n");
+    jobs.load(map);
     rng.init();
 
+    DEBUG(general).print("do_dig(): reading map..\n");
+    std::unordered_set<designation> buffer;
     // go down levels instead of up so stacked ramps behave as expected
     for (int16_t z = options.end.z; z >= options.start.z; --z) {
         for (int16_t y = options.start.y; y <= options.end.y; ++y) {
@@ -609,49 +754,73 @@ static void do_dig(color_ostream &out, std::vector<DFCoord> &dug_coords,
                 DFCoord pos(x, y, z);
                 df::tile_designation td = map.designationAt(pos);
                 df::tile_occupancy to = map.occupancyAt(pos);
-                if (td.bits.dig != df::tile_dig_designation::No &&
-                        !to.bits.dig_marked) {
-                    std::vector<dug_tile_info> dug_tiles;
-                    if (dig_tile(out, map, pos, td.bits.dig, dug_tiles)) {
-                        for (auto info : dug_tiles) {
-                            td = map.designationAt(info.pos);
-                            td.bits.dig = df::tile_dig_designation::No;
-                            map.setDesignationAt(info.pos, td);
-
-                            dug_coords.push_back(info.pos);
-                            refresh_adjacent_smooth_walls(map, info.pos);
-                            if (info.imat < 0)
-                                continue;
-                            if (produces_item(options.boulder_percents,
-                                              map, rng, info)) {
-                                auto k = std::make_pair(info.itype, info.imat);
-                                item_coords[k].push_back(info.pos);
-                            }
-                        }
-                    }
-                } else if (td.bits.smooth == 1) {
-                    if (smooth_tile(out, map, pos)) {
-                        to = map.occupancyAt(pos);
-                        td.bits.smooth = 0;
-                        map.setDesignationAt(pos, td);
-                    }
-                } else if (to.bits.carve_track_north == 1
-                                || to.bits.carve_track_east == 1
-                                || to.bits.carve_track_south == 1
-                                || to.bits.carve_track_west == 1) {
-                    if (carve_tile(map, pos, to)) {
-                        to = map.occupancyAt(pos);
-                        to.bits.carve_track_north = 0;
-                        to.bits.carve_track_east = 0;
-                        to.bits.carve_track_south = 0;
-                        to.bits.carve_track_west = 0;
-                        map.setOccupancyAt(pos, to);
+                if (jobs.count(pos)) {
+                    buffer.emplace(jobs.get(pos));
+                    jobs.remove(pos);
+                    // if it does get removed, then we're gonna buffer the jobs info then remove the job
+                } else if ((td.bits.dig != df::tile_dig_designation::No && !to.bits.dig_marked)
+                    || td.bits.smooth == 1
+                    || to.bits.carve_track_north == 1
+                    || to.bits.carve_track_east == 1
+                    || to.bits.carve_track_south == 1
+                    || to.bits.carve_track_west == 1) {
+
+                    // we're only buffering designations, so that processing doesn't affect what we're buffering
+                    buffer.emplace(pos, td, to);
+                }
+            }
+        }
+    }
+
+    DEBUG(general).print("do_dig(): processing designations..\n");
+    // process designations
+    for(auto &d : buffer) {
+        auto pos = d.pos;
+        auto td = d.type;
+        auto to = d.occupancy;
+
+        if (td.bits.dig != df::tile_dig_designation::No && !to.bits.dig_marked) {
+            std::vector<dug_tile_info> dug_tiles;
+
+            if (dig_tile(out, map, pos, td.bits.dig, dug_tiles)) {
+                for (auto info: dug_tiles) {
+                    td = map.designationAt(info.pos);
+                    td.bits.dig = df::tile_dig_designation::No;
+                    map.setDesignationAt(info.pos, td);
+
+                    dug_coords.push_back(info.pos);
+                    refresh_adjacent_smooth_walls(map, info.pos);
+                    if (info.imat < 0)
+                        continue;
+                    if (produces_item(options.boulder_percents,
+                                      map, rng, info)) {
+                        auto k = std::make_pair(info.itype, info.imat);
+                        item_coords[k].push_back(info.pos);
                     }
                 }
             }
+        } else if (td.bits.smooth == 1) {
+            if (smooth_tile(out, map, pos)) {
+                td = map.designationAt(pos);
+                td.bits.smooth = 0;
+                map.setDesignationAt(pos, td);
+            }
+        } else if (to.bits.carve_track_north == 1
+                   || to.bits.carve_track_east == 1
+                   || to.bits.carve_track_south == 1
+                   || to.bits.carve_track_west == 1) {
+            if (carve_tile(map, pos, to)) {
+                to = map.occupancyAt(pos);
+                to.bits.carve_track_north = 0;
+                to.bits.carve_track_east = 0;
+                to.bits.carve_track_south = 0;
+                to.bits.carve_track_west = 0;
+                map.setOccupancyAt(pos, to);
+            }
         }
     }
 
+    DEBUG(general).print("do_dig(): write changes to map..\n");
     map.WriteAll();
 }
 
@@ -663,8 +832,7 @@ static DFCoord simulate_fall(const DFCoord &pos) {
 
     while (Maps::ensureTileBlock(resting_pos)) {
         df::tiletype tt = *Maps::getTileType(resting_pos);
-        df::tiletype_shape_basic basic_shape = tileShapeBasic(tileShape(tt));
-        if (isWalkable(tt) && basic_shape != df::tiletype_shape_basic::Open)
+        if (isWalkable(tt))
             break;
         --resting_pos.z;
     }
@@ -678,7 +846,7 @@ static void create_boulders(color_ostream &out,
     df::unit *unit = world->units.active[0];
     df::historical_entity *civ = df::historical_entity::find(unit->civ_id);
     df::world_site *site = World::isFortressMode() ?
-            df::world_site::find(ui->site_id) : NULL;
+            df::world_site::find(plotinfo->site_id) : NULL;
 
     std::vector<df::reaction_reagent *> in_reag;
     std::vector<df::item *> in_items;
@@ -805,10 +973,20 @@ static void post_process_dug_tiles(color_ostream &out,
             }
 
             if (to.bits.item) {
-                for (auto item : world->items.other.IN_PLAY) {
-                    if (item->pos == pos && item->flags.bits.on_ground)
-                        item->moveToGround(
-                                resting_pos.x, resting_pos.y, resting_pos.z);
+                std::vector<df::item*> items;
+                if (auto b = Maps::ensureTileBlock(pos)) {
+                    for (auto item_id : b->items) {
+                        auto item = df::item::find(item_id);
+                        if (item && item->pos == pos)
+                            items.emplace_back(item);
+                    }
+                }
+                if (!items.empty()) {
+                    // fresh MapCache since tile properties are being actively changed
+                    MapExtras::MapCache mc;
+                    for (auto item : items)
+                        Items::moveToGround(mc, item, resting_pos);
+                    mc.WriteAll();
                 }
             }
         }
diff --git a/plugins/dig.cpp b/plugins/dig.cpp
index 945bf3613..7be7b815f 100644
--- a/plugins/dig.cpp
+++ b/plugins/dig.cpp
@@ -4,19 +4,19 @@
 #include <stack>
 #include <string>
 #include <cmath>
+#include <memory>
 
 #include "Core.h"
 #include "Console.h"
 #include "Export.h"
 #include "PluginManager.h"
-#include "uicommon.h"
 
 #include "modules/Gui.h"
 #include "modules/MapCache.h"
 #include "modules/Maps.h"
 #include "modules/Materials.h"
 
-#include "df/ui_sidebar_menus.h"
+#include "df/gamest.h"
 
 using std::vector;
 using std::string;
@@ -33,7 +33,7 @@ command_result digcircle (color_ostream &out, vector <string> & parameters);
 command_result digtype (color_ostream &out, vector <string> & parameters);
 
 DFHACK_PLUGIN("dig");
-REQUIRE_GLOBAL(ui_sidebar_menus);
+REQUIRE_GLOBAL(game);
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(window_z);
 
@@ -213,7 +213,7 @@ bool lineY (MapExtras::MapCache & MCache,
 
 int32_t parse_priority(color_ostream &out, vector<string> &parameters)
 {
-    int32_t default_priority = ui_sidebar_menus->designation.priority;
+    int32_t default_priority = game->main_interface.designation.priority;
 
     for (auto it = parameters.begin(); it != parameters.end(); ++it)
     {
@@ -1073,14 +1073,13 @@ command_result digv (color_ostream &out, vector <string> & parameters)
         con.printerr("I won't dig the borders. That would be cheating!\n");
         return CR_FAILURE;
     }
-    MapExtras::MapCache * MCache = new MapExtras::MapCache;
+    std::unique_ptr<MapExtras::MapCache> MCache = std::make_unique<MapExtras::MapCache>();
     df::tile_designation des = MCache->designationAt(xy);
     df::tiletype tt = MCache->tiletypeAt(xy);
     int16_t veinmat = MCache->veinMaterialAt(xy);
     if( veinmat == -1 )
     {
         con.printerr("This tile is not a vein.\n");
-        delete MCache;
         return CR_FAILURE;
     }
     con.print("%d/%d/%d tiletype: %d, veinmat: %d, designation: 0x%x ... DIGGING!\n", cx,cy,cz, tt, veinmat, des.whole);
@@ -1193,7 +1192,6 @@ command_result digv (color_ostream &out, vector <string> & parameters)
         }
     }
     MCache->WriteAll();
-    delete MCache;
     return CR_OK;
 }
 
@@ -1260,7 +1258,7 @@ command_result digl (color_ostream &out, vector <string> & parameters)
         con.printerr("I won't dig the borders. That would be cheating!\n");
         return CR_FAILURE;
     }
-    MapExtras::MapCache * MCache = new MapExtras::MapCache;
+    std::unique_ptr<MapExtras::MapCache> MCache = std::make_unique<MapExtras::MapCache>();
     df::tile_designation des = MCache->designationAt(xy);
     df::tiletype tt = MCache->tiletypeAt(xy);
     int16_t veinmat = MCache->veinMaterialAt(xy);
@@ -1268,7 +1266,6 @@ command_result digl (color_ostream &out, vector <string> & parameters)
     if( veinmat != -1 )
     {
         con.printerr("This is a vein. Use digv instead!\n");
-        delete MCache;
         return CR_FAILURE;
     }
     con.print("%d/%d/%d tiletype: %d, basemat: %d, designation: 0x%x ... DIGGING!\n", cx,cy,cz, tt, basemat, des.whole);
@@ -1409,7 +1406,6 @@ command_result digl (color_ostream &out, vector <string> & parameters)
         }
     }
     MCache->WriteAll();
-    delete MCache;
     return CR_OK;
 }
 
@@ -1425,9 +1421,13 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
         return CR_FAILURE;
     }
 
+    uint32_t zMin = 0;
     uint32_t xMax,yMax,zMax;
     Maps::getSize(xMax,yMax,zMax);
 
+    bool hidden = false;
+    bool automine = true;
+
     int32_t targetDigType = -1;
     for (string parameter : parameters) {
         if ( parameter == "clear" )
@@ -1444,8 +1444,16 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
             targetDigType = tile_dig_designation::DownStair;
         else if ( parameter == "up" )
             targetDigType = tile_dig_designation::UpStair;
-        else if ( parameter == "-z" )
+        else if ( parameter == "-z" || parameter == "--cur-zlevel" )
+            {zMax = *window_z + 1; zMin = *window_z;}
+        else if ( parameter == "--zdown" || parameter == "-d")
             zMax = *window_z + 1;
+        else if ( parameter == "--zup" || parameter == "-u")
+            zMin = *window_z;
+        else if ( parameter == "--hidden" || parameter == "-h")
+            hidden = true;
+        else if ( parameter == "--no-auto" || parameter == "-a" )
+            automine = false;
         else
         {
             out.printerr("Invalid parameter: '%s'.\n", parameter.c_str());
@@ -1463,14 +1471,21 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
         return CR_FAILURE;
     }
     DFHack::DFCoord xy ((uint32_t)cx,(uint32_t)cy,cz);
-    MapExtras::MapCache * mCache = new MapExtras::MapCache;
+    std::unique_ptr<MapExtras::MapCache> mCache = std::make_unique<MapExtras::MapCache>();
     df::tile_designation baseDes = mCache->designationAt(xy);
+
+    if (baseDes.bits.hidden && !hidden) {
+        out.printerr("Cursor is pointing at a hidden tile. Point the cursor at a visible tile when using the --hidden option.\n");
+        return CR_FAILURE;
+    }
+
+    df::tile_occupancy baseOcc = mCache->occupancyAt(xy);
+
     df::tiletype tt = mCache->tiletypeAt(xy);
     int16_t veinmat = mCache->veinMaterialAt(xy);
     if( veinmat == -1 )
     {
         out.printerr("This tile is not a vein.\n");
-        delete mCache;
         return CR_FAILURE;
     }
     out.print("(%d,%d,%d) tiletype: %d, veinmat: %d, designation: 0x%x ... DIGGING!\n", cx,cy,cz, tt, veinmat, baseDes.whole);
@@ -1486,8 +1501,12 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
             baseDes.bits.dig = tile_dig_designation::Default;
         }
     }
+    // Auto dig only works on default dig designation. Setting dig_auto for any other designation
+    // prevents dwarves from digging that tile at all.
+    if (baseDes.bits.dig == tile_dig_designation::Default && automine) baseOcc.bits.dig_auto = true;
+    else baseOcc.bits.dig_auto = false;
 
-    for( uint32_t z = 0; z < zMax; z++ )
+    for( uint32_t z = zMin; z < zMax; z++ )
     {
         for( uint32_t x = 1; x < tileXMax-1; x++ )
         {
@@ -1507,18 +1526,22 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
                 if ( !mCache->testCoord(current) )
                 {
                     out.printerr("testCoord failed at (%d,%d,%d)\n", x, y, z);
-                    delete mCache;
                     return CR_FAILURE;
                 }
 
                 df::tile_designation designation = mCache->designationAt(current);
+
+                if (designation.bits.hidden && !hidden) continue;
+
+                df::tile_occupancy occupancy = mCache->occupancyAt(current);
                 designation.bits.dig = baseDes.bits.dig;
-                mCache->setDesignationAt(current, designation,priority);
+                occupancy.bits.dig_auto = baseOcc.bits.dig_auto;
+                mCache->setDesignationAt(current, designation, priority);
+                mCache->setOccupancyAt(current, occupancy);
             }
         }
     }
 
     mCache->WriteAll();
-    delete mCache;
     return CR_OK;
 }
diff --git a/plugins/diggingInvaders/assignJob.cpp b/plugins/diggingInvaders/assignJob.cpp
index 2eaad9eb5..eb74433b8 100644
--- a/plugins/diggingInvaders/assignJob.cpp
+++ b/plugins/diggingInvaders/assignJob.cpp
@@ -25,7 +25,7 @@
 #include "df/job_type.h"
 #include "df/reaction_product_itemst.h"
 #include "df/reaction_reagent.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/unit_inventory_item.h"
 #include "df/world.h"
@@ -252,7 +252,7 @@ int32_t assignJob(color_ostream& out, Edge firstImportantEdge, unordered_map<df:
             vector<df::item*> in_items;
             prod->produce(firstInvader, &out_products, &out_items, &in_reag, &in_items, 1, df::job_skill::NONE,
                 0, df::historical_entity::find(firstInvader->civ_id),
-                df::world_site::find(df::global::ui->site_id), NULL);
+                df::world_site::find(df::global::plotinfo->site_id), NULL);
 
             if ( out_items.size() != 1 ) {
                 out.print("%s, %d: wrong size: %zu.\n", __FILE__, __LINE__, out_items.size());
diff --git a/plugins/diggingInvaders/diggingInvaders.cpp b/plugins/diggingInvaders/diggingInvaders.cpp
index 457a00e50..cf0047cd8 100644
--- a/plugins/diggingInvaders/diggingInvaders.cpp
+++ b/plugins/diggingInvaders/diggingInvaders.cpp
@@ -47,7 +47,7 @@
 #include "df/tiletype_material.h"
 #include "df/tiletype_shape.h"
 #include "df/tiletype_shape_basic.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/unit_inventory_item.h"
 #include "df/world.h"
diff --git a/plugins/dwarfmonitor.cpp b/plugins/dwarfmonitor.cpp
index 4355104a7..27e5b87e0 100644
--- a/plugins/dwarfmonitor.cpp
+++ b/plugins/dwarfmonitor.cpp
@@ -4,7 +4,7 @@
 #include "DataDefs.h"
 
 #include "df/job.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/world.h"
@@ -53,7 +53,7 @@ using std::deque;
 DFHACK_PLUGIN("dwarfmonitor");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 
 typedef int16_t activity_type;
 
@@ -951,7 +951,7 @@ public:
         {
             df::unit *selected_unit = (selected_column == 1) ? dwarf_activity_column.getFirstSelectedElem() : nullptr;
             Screen::dismiss(this);
-            Screen::show(dts::make_unique<ViewscreenDwarfStats>(selected_unit), plugin_self);
+            Screen::show(std::make_unique<ViewscreenDwarfStats>(selected_unit), plugin_self);
         }
         else if  (input->count(interface_key::CUSTOM_SHIFT_Z))
         {
@@ -1676,7 +1676,7 @@ private:
 
 
 static void open_stats_screen() {
-    Screen::show(dts::make_unique<ViewscreenFortStats>(), plugin_self);
+    Screen::show(std::make_unique<ViewscreenFortStats>(), plugin_self);
 }
 
 static void add_work_history(df::unit *unit, activity_type type) {
@@ -1776,12 +1776,12 @@ static command_result dwarfmonitor_cmd(color_ostream &, vector <string> & parame
     if (cmd == 's' || cmd == 'S') {
         CoreSuspender guard;
         if(Maps::IsValid())
-            Screen::show(dts::make_unique<ViewscreenFortStats>(), plugin_self);
+            Screen::show(std::make_unique<ViewscreenFortStats>(), plugin_self);
     }
     else if (cmd == 'p' || cmd == 'P') {
         CoreSuspender guard;
         if(Maps::IsValid())
-            Screen::show(dts::make_unique<ViewscreenPreferences>(), plugin_self);
+            Screen::show(std::make_unique<ViewscreenPreferences>(), plugin_self);
     }
     else
         return CR_WRONG_USAGE;
diff --git a/plugins/dwarfvet.cpp b/plugins/dwarfvet.cpp
index 356fda238..dcd8e0f8c 100644
--- a/plugins/dwarfvet.cpp
+++ b/plugins/dwarfvet.cpp
@@ -20,735 +20,170 @@
  * THE SOFTWARE.
  **/
 
-#include "Console.h"
-#include "Core.h"
-#include "DataDefs.h"
-#include "Export.h"
+#include "Debug.h"
+#include "LuaTools.h"
 #include "PluginManager.h"
-#include "modules/EventManager.h"
+
+#include "modules/Persistence.h"
 #include "modules/Units.h"
-#include "modules/Buildings.h"
-#include "modules/Maps.h"
-#include "modules/Job.h"
+#include "modules/World.h"
 
-#include "df/animal_training_level.h"
-#include "df/building_type.h"
-#include "df/caste_raw.h"
-#include "df/caste_raw_flags.h"
-#include "df/creature_raw.h"
-#include "df/job.h"
-#include "df/general_ref_unit_workerst.h"
-#include "df/profession.h"
-#include "df/ui.h"
-#include "df/unit.h"
-#include "df/unit_health_info.h"
-#include "df/unit_health_flags.h"
 #include "df/world.h"
 
-#include <map>
-#include <unordered_set>
-#include <vector>
-
 using namespace DFHack;
-using namespace DFHack::Units;
-using namespace DFHack::Buildings;
-
-using namespace std;
+using std::string;
+using std::vector;
 
 DFHACK_PLUGIN("dwarfvet");
-DFHACK_PLUGIN_IS_ENABLED(dwarfvet_enabled);
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
-REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(world);
 
-static unordered_set<int32_t> tracked_units;
-static int32_t howOften = 100;
-
-struct hospital_spot {
-    int32_t x;
-    int32_t y;
-    int32_t z;
-};
-
-class Patient {
-  public:
-    // Constructor/Deconstrctor
-    Patient(int32_t id, size_t spot_index, int32_t x, int32_t y, int32_t z);
-    int32_t getID() { return this->id; };
-    size_t getSpotIndex() { return this->spot_index; };
-    int32_t returnX() { return this->spot_in_hospital.x; };
-    int32_t returnY() { return this->spot_in_hospital.y; };
-    int32_t returnZ() { return this->spot_in_hospital.z; };
-
-  private:
-    struct hospital_spot spot_in_hospital;
-    int32_t id;
-    size_t spot_index;
-};
-
-Patient::Patient(int32_t id, size_t spot_index, int32_t x, int32_t y, int32_t z){
-    this->id = id;
-    this->spot_index = spot_index;
-    this->spot_in_hospital.x = x;
-    this->spot_in_hospital.y = y;
-    this->spot_in_hospital.z = z;
+namespace DFHack {
+    // for configuration-related logging
+    DBG_DECLARE(dwarfvet, status, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(dwarfvet, cycle, DebugCategory::LINFO);
 }
 
-class AnimalHospital {
-
-  public:
-    // Constructor
-    AnimalHospital(df::building *, color_ostream &out);
-    ~AnimalHospital();
-    int32_t getID() { return id; }
-    bool acceptPatient(int32_t id, color_ostream&);
-    void processPatients(color_ostream &out);
-    void dischargePatient(Patient * patient, color_ostream &out);
-    void calculateHospital(bool force, color_ostream &out);
-    void reportUsage(color_ostream &out);
-
-    // GC
-    bool to_be_deleted;
-
-  private:
-    int spots_open;
-    int32_t id;
-    int32_t x1;
-    int32_t x2;
-    int32_t y1;
-    int32_t y2;
-    int32_t z;
-    int height;
-    int length;
-
-    // Doing an actual array in C++ is *annoying*, bloody copy constructors */
-    vector<bool> spots_in_use;
-    vector<int32_t> building_in_hospital_notification; /* If present, we already notified about this */
-    vector<Patient*> accepted_patients;
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+static PersistentDataItem config;
+enum ConfigValues {
+    CONFIG_IS_ENABLED = 0,
 };
-
-AnimalHospital::AnimalHospital(df::building * building, color_ostream &out) {
-    // Copy in what we need to know
-    id = building->id;
-    x1 = building->x1;
-    x2 = building->x2;
-    y1 = building->y1;
-    y2 = building->y2;
-    z = building->z;
-
-    // Determine how many spots we have for animals
-    this->length = x2-x1+1;
-    this->height = y2-y1+1;
-
-    // And calculate the hospital!
-    this->calculateHospital(true, out);
+static int get_config_val(int index) {
+    if (!config.isValid())
+        return -1;
+    return config.ival(index);
 }
-
-AnimalHospital::~AnimalHospital() {
-    // Go through and delete all the patients
-    for (Patient* accepted_patient : this->accepted_patients) {
-        delete accepted_patient;
-   }
+static bool get_config_bool(int index) {
+    return get_config_val(index) == 1;
 }
-
-bool AnimalHospital::acceptPatient(int32_t id, color_ostream &out) {
-    // This function determines if we can accept a patient, and if we will.
-    this->calculateHospital(true, out);
-
-    // First, do we have room?
-    if (!spots_open) return false;
-
-    // Yup, let's find the next open spot,
-    // and give it to our patient
-    int spot_cur = 0;
-    for (vector<bool>::iterator spot = this->spots_in_use.begin(); spot != this->spots_in_use.end(); spot++) {
-        if (*spot == false) {
-            *spot = true;
-            break;
-        }
-        spot_cur++;
-    }
-
-    spots_open--;
-
-    // Convert the spot into x/y/z cords.
-    int offset_y = spot_cur/length;
-    int offset_x =  spot_cur%length;
-
-    // Create the patient!
-    Patient * patient = new Patient(id,
-        spot_cur,
-        this->x1+offset_x,
-        this->y1+offset_y,
-        this->z
-    );
-
-    accepted_patients.push_back(patient);
-    return true;
+static void set_config_val(int index, int value) {
+    if (config.isValid())
+        config.ival(index) = value;
 }
-
-// Before any use of the hospital, we need to make calculate open spots
-// and such. This can change (i.e. stuff built in hospital) and
-// such so it should be called on each function.
-void AnimalHospital::reportUsage(color_ostream &out) {
-    // Debugging tool to see parts of the hospital in use
-    int length_cursor = this->length;
-
-    for (bool spot : this->spots_in_use) {
-        if (spot) out.print("X");
-        else out.print("-");
-        length_cursor--;
-        if (length_cursor <= 0) {
-            out.print("\n");
-            length_cursor = this->length;
-        }
-    }
-    out.print("\n");
-
+static void set_config_bool(int index, bool value) {
+    set_config_val(index, value ? 1 : 0);
 }
 
-void AnimalHospital::calculateHospital(bool force, color_ostream &out) {
-    // Only calculate out the hospital if we actually have a patient in it
-    // (acceptPatient will forcibly rerun this to make sure everything OK
-
-    // Should reduce FPS impact of each calculation tick when the hospitals
-    // are not in use
-    //if (!force || (spots_open == length*height)) {
-        // Hospital is idle, don't recalculate
-    //    return;
-    //}
+static const int32_t CYCLE_TICKS = 2459; // a prime number that's around 2 days
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
 
-    // Calculate out the total area of the hospital
-    // This can change if a hospital has been resized
-    this->spots_open = length*height;
-    this->spots_in_use.assign(this->spots_open, false);
-
-    // The spots_in_use maps one to one with a spot
-    // starting at the upper-left hand corner, then
-    // across, then down. i.e.
-    //
-    // given hospital zone:
-    //
-    // UU
-    // uU
-    //
-    // where U is in use, and u isn't, the array
-    // would be t,t,f,t
-
-    // Walk the building array and see what stuff is in the hospital,
-    // then walk the patient array and remark those spots as used.
-
-    // If a patient is in an invalid spot, reassign it
-    for (df::building *building : world->buildings.all) {
-
-        // Check that we're not comparing ourselves;
-        if (building->id == this->id) {
-            continue;
-        }
-
-        // Check if the building is on our z level, if it isn't
-        // then it can't overlap the hospital (until Toady implements
-        // multi-z buildings
-        if (building->z != this->z) {
-            continue;
-        }
-
-        // DF defines activity zones multiple times in the building structure
-        // If axises agree with each other, we're looking at a reflection of
-        // ourselves
-        if (building->x1 == this->x1 &&
-            building->x2 == this->x2 &&
-            building->y1 == this->y1 &&
-            building->y2 == this->y2) {
-            continue;
-        }
-
-        // Check for X/Y overlap
-        // I can't believe I had to look this up -_-;
-        // http://stackoverflow.com/questions/306316/determine-if-two-rectangles-overlap-each-other
-        if ((this->x1 > building->x2 ||
-              building->x1 > this->x2 ||
-              this->y1 > building->y2 ||
-              building->y1 > this->y2)) {
-            continue;
-        }
-
-        // Crap, building overlaps, we need to figure out where it is in the hospital
-        // NOTE: under some conditions, this generates a false warning. Not a lot I can do about it
-
-        // Mark spots used by that building as used; FIXME: handle special logic for traction benches and such
-        int overlap_x1 = std::max(building->x1, this->x1);
-        int overlap_y1 = std::max(building->y1, this->y1);
-        int overlap_x2 = std::min(building->x2, this->x2);
-        int overlap_y2 = std::min(building->y2, this->y2);
-        for (int x = overlap_x1; x <= overlap_x2; x++) {
-            for (int y = overlap_y1; y <= overlap_y2; y++) {
-                int spot_index = (x - this->x1) + (this->length * (y - this->y1));
-                spots_in_use.at(spot_index) = true;
-            }
-        }
-    }
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+static void dwarfvet_cycle(color_ostream &out);
 
+DFhackCExport command_result plugin_init(color_ostream &out, vector <PluginCommand> &commands) {
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Allow animals to be treated at hospitals.",
+        do_command));
+    return CR_OK;
 }
 
-// Self explanatory
-void AnimalHospital::dischargePatient(Patient * patient, color_ostream &out) {
-    int32_t id = patient->getID();
-
-    // Remove them from the hospital
-
-    // We can safely iterate here because once we delete the unit
-    // we no longer use the iterator
-    for (vector<Patient*>::iterator accepted_patient = this->accepted_patients.begin(); accepted_patient != this->accepted_patients.end(); accepted_patient++) {
-        if ( (*accepted_patient)->getID() == id) {
-            out.print("Discharging unit %d from hospital %d\n", id, this->id);
-            // Reclaim their spot
-            spots_in_use.at((*accepted_patient)->getSpotIndex()) = false;
-            this->spots_open++;
-            delete (*accepted_patient);
-            this->accepted_patients.erase(accepted_patient);
-            break;
-        }
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
     }
 
-    // And the master list
-    tracked_units.erase(id);
-
-    return;
-}
-
-void AnimalHospital::processPatients(color_ostream &out) {
-    // Where the magic happens
-    for (Patient *patient : this->accepted_patients) {
-        int id = patient->getID();
-        df::unit *real_unit = df::unit::find(id);
-
-        // Check to make sure the unit hasn't expired before assigning a job, or if they've been healed
-        if (!real_unit || !Units::isActive(real_unit) || !real_unit->health->flags.bits.needs_healthcare) {
-            // discharge the patient from the hospital
-            this->dischargePatient(patient, out);
-            return;
-        }
-
-        // Give the unit a job if they don't have any
-        if (!real_unit->job.current_job) {
-            // Create REST struct
-            df::job * job = new df::job;
-            DFHack::Job::linkIntoWorld(job);
-
-            job->pos.x = patient->returnX();
-            job->pos.y = patient->returnY();
-            job->pos.z = patient->returnZ();
-            job->flags.bits.special = 1;
-            job->job_type = df::enums::job_type::Rest;
-            df::general_ref *ref = df::allocate<df::general_ref_unit_workerst>();
-            ref->setID(real_unit->id);
-            job->general_refs.push_back(ref);
-            real_unit->job.current_job = job;
-            job->wait_timer = 1600;
-            out.print("Telling intelligent unit %d to report to the hospital!\n", real_unit->id);
-        }
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(status,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+    } else {
+        DEBUG(status,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
     }
+    return CR_OK;
 }
 
+DFhackCExport command_result plugin_load_data(color_ostream &out) {
+    cycle_timestamp = 0;
+    config = World::GetPersistentData(CONFIG_KEY);
 
-static vector<AnimalHospital*> animal_hospital_zones;
-
-void delete_animal_hospital_vector(color_ostream &out) {
-    if (dwarfvet_enabled) {
-        out.print("Clearing all animal hospitals\n");
-    }
-    for (AnimalHospital *animal_hospital : animal_hospital_zones) {
-        delete animal_hospital;
+    if (!config.isValid()) {
+        DEBUG(status,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
     }
-    animal_hospital_zones.clear();
-}
-
-command_result dwarfvet(color_ostream &out, std::vector <std::string> & parameters);
-
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    commands.push_back(PluginCommand(
-        "dwarfvet",
-        "Allows animals to be treated at animal hospitals",
-        dwarfvet));
-    return CR_OK;
-}
 
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
+    is_enabled = get_config_bool(CONFIG_IS_ENABLED);
+    DEBUG(status,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
     return CR_OK;
 }
 
-bool isActiveAnimalHospital(df::building * building) {
-    if (Buildings::isHospital(building) && Buildings::isAnimalTraining(building) && Buildings::isActive(building)) {
-        return true;
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        if (is_enabled) {
+            DEBUG(status,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
+        }
     }
-
-    return false;
+    return CR_OK;
 }
 
-bool compareAnimalHospitalZones(df::building * hospital1, df::building * hospital2) {
-    // We compare hospitals by checking if positions are identical, not by ID
-    // since activity zones can easily be changed in size
-
-    if ( hospital1->x1 == hospital2->x1 &&
-         hospital1->x2 == hospital2->x2 &&
-         hospital1->y1 == hospital2->y1 &&
-         hospital1->y2 == hospital2->y2 &&
-         hospital1->z == hospital2->z) {
-        return true;
-    }
-
-    return false;
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && world->frame_counter - cycle_timestamp >= CYCLE_TICKS)
+        dwarfvet_cycle(out);
+    return CR_OK;
 }
 
-void tickHandler(color_ostream& out, void* data) {
-    if ( !dwarfvet_enabled )
-        return;
-    CoreSuspender suspend;
-    int32_t own_race_id = df::global::ui->race_id;
-
-    /**
-     * Generate a list of animal hospitals on the map
-     *
-     * Since activity zones can change any instant given user interaction
-     * we need to be constantly on the lookout for changed zones, and update
-     * our cached list on the fly if necessary.
-     **/
-
-    vector<df::building*> hospitals_on_map;
-
-    // Because C++ iterators suck, we're going to build a temporary vector with the AHZ, and then
-    // copy it for my own bloody sanity (and compilance with the STL spec)
-    vector<AnimalHospital*> ahz_scratch;
-
-    // Holding area for things to be added to the scratch
-    vector<df::building*> to_be_added;
-
-
-    // Walk the building tree, and generate a list of animal hospitals on the map
-    for (df::building* building : df::building::get_vector()) {
-        if (isActiveAnimalHospital(building)) {
-            hospitals_on_map.push_back(building);
-        }
-    }
-
-    int count_of_hospitals = hospitals_on_map.size();
-    int hospitals_cached = animal_hospital_zones.size();
-    //out.print ("count_of_Hospitals: %d, hospitals_cached: %d\n", count_of_hospitals, hospitals_cached);
-    // It's possible our hospital cache is empty, if so, simply copy it, and jump to the main logic
-    if (!hospitals_cached && count_of_hospitals) {
-        out.print("Populating hospital cache:\n");
-        for (df::building *current_hospital : hospitals_on_map) {
-            AnimalHospital * hospital = new AnimalHospital(current_hospital, out);
-            out.print("  Found animal hospital %d  at x1: %d, y1: %d, z: %d from valid hospital list\n",
-                        hospital->getID(),
-                        current_hospital->x1,
-                        current_hospital->y1,
-                        current_hospital->z
-            );
-            animal_hospital_zones.push_back(hospital);
-        }
-
-        goto processUnits;
-    }
-
-    if (!count_of_hospitals && !hospitals_cached) {
-        // No hospitals found, cache is empty, just return
-        goto cleanup;
-    }
-
-    // Now walk our list of known hospitals, do a bit of checking, then compare
-    // TODO: this doesn't handle zone resizes at all
-
-    for (AnimalHospital *animal_hospital : animal_hospital_zones) {
-        // If a zone is changed at all, DF seems to reallocate it.
-        //
-        // Each AnimalHospital has a "to_be_deleted" bool. We're going to set that to true, and clear it if we can't
-        // find a matching hospital. This limits the number of times we need to walk through the AHZ list to twice, and
-        // lets us cleanly report it later
-        //
-        // Surviving hospitals will be copied to scratch which will become the new AHZ vector
-
-        animal_hospital->to_be_deleted = true;
-        for (df::building *current_hospital : hospitals_on_map) {
-
-            /* Keep the hospital if its still valid */
-            if (animal_hospital->getID() == current_hospital->id) {
-                ahz_scratch.push_back(animal_hospital);
-                animal_hospital->to_be_deleted = false;
-                break;
-            }
-
-        }
-    }
-
-    // Report what we're deleting by checking the to_be_deleted bool.
-    //
-    // Whatsever left is added to the pending add list
-    for (AnimalHospital *animal_hospital : animal_hospital_zones) {
-        if (animal_hospital->to_be_deleted) {
-            out.print("Hospital #%d removed\n", animal_hospital->getID());
-            delete animal_hospital;
-        }
-    }
+static bool call_dwarfvet_lua(color_ostream *out, const char *fn_name,
+        int nargs = 0, int nres = 0,
+        Lua::LuaLambda && args_lambda = Lua::DEFAULT_LUA_LAMBDA,
+        Lua::LuaLambda && res_lambda = Lua::DEFAULT_LUA_LAMBDA) {
+    DEBUG(status).print("calling dwarfvet lua function: '%s'\n", fn_name);
 
-    /* Now we need to walk the scratch and add anything that is a hospital and wasn't in the vector */
+    CoreSuspender guard;
 
-    for (df::building *current_hospital : hospitals_on_map) {
-        bool new_hospital = true;
-
-        for (AnimalHospital *animal_hospital : ahz_scratch) {
-            if (animal_hospital->getID() == current_hospital->id) {
-                // Next if we're already here
-                new_hospital = false;
-                break;
-            }
-        }
-
-        // Add it if its new
-        if (new_hospital == true) to_be_added.push_back(current_hospital);
-    }
-
-    /* Now add it to the scratch AHZ */
-    for (df::building *current_hospital : to_be_added) {
-        // Add it to the vector
-        out.print("Adding new hospital #id: %d at x1 %d y1: %d z: %d\n",
-                current_hospital->id,
-                current_hospital->x1,
-                current_hospital->y1,
-                current_hospital->z
-                );
-        AnimalHospital * hospital = new AnimalHospital(current_hospital, out);
-        ahz_scratch.push_back(hospital);
-    }
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
 
-    /* Copy the scratch to the AHZ */
-    animal_hospital_zones = ahz_scratch;
+    if (!out)
+        out = &Core::getInstance().getConsole();
 
-    // We always recheck the cache instead of counts because someone might have removed then added a hospital
-/*    if (hospitals_cached != count_of_hospitals) {
-        out.print("Hospitals on the map changed, rebuilding cache\n");
-
-        for (vector<df::building*>::iterator current_hospital = hospitals_on_map.begin(); current_hospital != hospitals_on_map.end(); current_hospital++) {
-            bool add_hospital = true;
-
-            for (vector<AnimalHospital*>::iterator map_hospital = animal_hospital_zones.begin(); map_hospital != animal_hospital_zones.end(); map_hospital++) {
-                if (compareAnimalHospitalZones(*map_hospital, *current_hospital)) {
-                    // Same hospital, we're good
-                    add_hospital = false;
-                    break;
-                }
-            }
-
-            // Add it to the list
-            if (add_hospital) {
-                 out.print("Adding zone at x1: %d, y1: %d to valid hospital list\n", (*current_hospital)->x1, (*current_hospital)->y1);
-                animal_hospital_zones.push_back(*current_hospital);
-            }
-        }
-    }
-*/
-processUnits:
-    /* Code borrowed from petcapRemover.cpp */
-    for (df::unit *unit : df::unit::get_vector()) {
-        /* As hilarious as it would be, lets not treat FB :) */
-        if ( !Units::isActive(unit) || unit->flags1.bits.active_invader || unit->flags2.bits.underworld || unit->flags2.bits.visitor_uninvited || unit->flags2.bits.visitor ) {
-            continue;
-       }
-
-        if ( !Units::isTamable(unit)) {
-            continue;
-       }
-
-      /**
-       * So, for a unit to be elligable for the hospital, all the following must be true
-       *
-       * 1. It must be a member of our civilization
-       * 2. It must be tame (semi-wild counts for this)
-       * 2.1 If its not a dwarf, AND untame clear its civ out so traps work
-       * 3. It must have a health struct (which is generated by combat)
-       * 4. health->needs_healthcare must be set to true
-       * 5. If health->requires_recovery is set, the creature can't move under its own power
-       *    and a Recover Wounded or Pen/Pasture job MUST be created by hand - TODO
-       * 6. An open spot in the "Animal Hospital" (activity zone with hospital+animal training set)
-       *     must be available
-       *
-       * I apologize if this excessively verbose, but the healthcare system is stupidly conplex
-       * and there's tons of edgecases to watch out for, and I want someone else to ACTUALLY
-       * beside me able to understand what's going on
-       */
-
-        // 1. Make sure its our own civ
-        if (!Units::isOwnCiv(unit)) {
-            continue;
-        }
-
-        // 2. Check for tameness
-        if (unit->training_level == df::animal_training_level::WildUntamed) {
-            // We don't IMMEDIATELY continue here, if the unit is
-            // part of our civ, it indiciates it WAS tamed, and reverted
-            // from SemiWild. Clear its civ flag so it looses TRAPAVOID
-            //
-            // Unfortunately, dwarves (or whatever is CIV_SELECTABLE)
-            // also have a default taming level of WildUntamed so
-            // check for this case
-            //
-            // Furthermore, it MIGHT be a werebeast, so check THAT too
-            // and exclude those as well.
-            //
-            // Finally, this breaks makeown. I might need to write a patch
-            // to set the tameness of "makeowned" units so dwarfvet can notice
-            // it
-
-            if (unit->race == own_race_id ||  unit->enemy.normal_race == own_race_id) {
-                continue;
-            } else {
-                unit->civ_id = -1;
-                out.print ("Clearing civ on unit: %d", unit->id);
-            }
-        }
-
-        // 3. Check for health struct
-        if (!unit->health) {
-            // Unit has not been injured ever; health struct MIA
-            continue;
-        }
-
-        // 4. Check the healthcare flags
-        if (unit->health->flags.bits.needs_healthcare) {
-            /**
-             * So, for dwarves to care for a unit it must be resting in
-             * in a hospital zone. Since non-dwarves never take jobs
-             * this why animal healthcare doesn't work for animals despite
-             * animal caretaker being coded in DF itself
-             *
-             * How a unit gets there is dependent on several factors. If
-             * a unit can move under its own power, it will take the rest
-             * job, with a position of a bed in the hospital, then move
-             * into that bed and fall asleep. This triggers a doctor to
-             * treat the unit.
-             *
-             * If a unit *can't* move, it will set needs_recovery, which
-             * creates a "Recover Wounded" job in the job list, and then
-             * create the "Rest" job as listed above. Another dwarf with
-             * the right labors will go recover the unit, then the above
-             * logic kicks off.
-             *
-             * The necessary flags seem to be properly set for all units
-             * on the map, so in theory, we just need to make the jobs and
-             * we're in business, but from a realism POV, I don't think
-             * non-sentient animals would be smart enough to go to the
-             * hospital on their own, so instead, we're going to do the following
-             *
-             * If a unit CAN_THINK, and can move let it act like a dwarf,
-             * it will try and find an open spot in the hospital, and if so,
-             * go there to be treated. In vanilla, the only tamable animal
-             * with CAN_THINK are Gremlins, so this is actually an edge case
-             * but its the easiest to code.
-             *
-             * TODO: figure out exact logic for non-thinking critters.
-             */
-
-            // Now we need to find if this unit can be accepted at a hospital
-            bool awareOfUnit = tracked_units.count(unit->id);
-            // New unit for dwarfvet to be aware of!
-            if (!awareOfUnit) {
-                // The master list handles all patients which are accepted
-                // Check if this is a unit we're already aware of
-
-                for (auto animal_hospital : animal_hospital_zones) {
-                    if (animal_hospital->acceptPatient(unit->id, out)) {
-                        out.print("Accepted patient %d at hospital %d\n", unit->id, animal_hospital->getID());
-                        tracked_units.insert(unit->id);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    // The final step, process all patients!
-    for (AnimalHospital *animal_hospital : animal_hospital_zones) {
-        animal_hospital->calculateHospital(true, out);
-        animal_hospital->processPatients(out);
-    }
-
-cleanup:
-    EventManager::unregisterAll(plugin_self);
-    EventManager::EventHandler handle(tickHandler, howOften);
-    EventManager::registerTick(handle, howOften, plugin_self);
+    return Lua::CallLuaModuleFunction(*out, L, "plugins.dwarfvet", fn_name,
+            nargs, nres,
+            std::forward<Lua::LuaLambda&&>(args_lambda),
+            std::forward<Lua::LuaLambda&&>(res_lambda));
 }
 
-command_result dwarfvet (color_ostream &out, std::vector <std::string> & parameters)
-{
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
     CoreSuspender suspend;
 
-    for ( size_t a = 0; a < parameters.size(); a++ ) {
-        if ( parameters[a] == "enable" ) {
-            out.print("dwarfvet enabled!\n");
-            dwarfvet_enabled = true;
-        }
-        if ( parameters[a] == "disable") {
-            out.print("dwarvet disabled!\n");
-            dwarfvet_enabled = false;
-        }
-        if ( parameters[a] == "report") {
-            out.print("Current animal hospitals are:\n");
-            for (df::building *building : df::building::get_vector()) {
-                if (isActiveAnimalHospital(building)) {
-                    out.print("  at x1: %d, x2: %d, y1: %d, y2: %d, z: %d\n", building->x1, building->x2, building->y1, building->y2, building->z);
-                }
-            }
-            return CR_OK;
-        }
-        if ( parameters[a] == "report-usage") {
-            out.print("Current animal hospitals are:\n");
-            for (AnimalHospital *animal_hospital : animal_hospital_zones) {
-                animal_hospital->calculateHospital(true, out);
-                animal_hospital->reportUsage(out);
-            }
-            return CR_OK;
-        }
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
     }
 
-    if ( !dwarfvet_enabled ) {
-        return CR_OK;
+    bool show_help = false;
+    if (!call_dwarfvet_lua(&out, "parse_commandline", 1, 1,
+            [&](lua_State *L) {
+                Lua::PushVector(L, parameters);
+            },
+            [&](lua_State *L) {
+                show_help = !lua_toboolean(L, -1);
+            })) {
+        return CR_FAILURE;
     }
 
-    EventManager::unregisterAll(plugin_self);
-    EventManager::EventHandler handle(tickHandler, howOften);
-    EventManager::registerTick(handle, howOften, plugin_self);
-
-    return CR_OK;
+    return show_help ? CR_WRONG_USAGE : CR_OK;
 }
 
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    if (enable && !dwarfvet_enabled) {
-        dwarfvet_enabled = true;
-    }
-    else if (!enable && dwarfvet_enabled) {
-        delete_animal_hospital_vector(out);
-        dwarfvet_enabled = false;
-    }
+static void dwarfvet_cycle(color_ostream &out) {
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
 
-    return CR_OK;
+    DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
+    call_dwarfvet_lua(&out, "checkup");
 }
 
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event)
-    {
-    case DFHack::SC_MAP_LOADED:
-        break;
-    case DFHack::SC_MAP_UNLOADED:
-        delete_animal_hospital_vector(out);
-        dwarfvet_enabled = false;
-        break;
-    default:
-        break;
-    }
-    return CR_OK;
-}
+DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(dwarfvet_cycle),
+    DFHACK_LUA_END
+};
diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp
index 1fb845d15..9a76794c2 100644
--- a/plugins/embark-assistant/finder_ui.cpp
+++ b/plugins/embark-assistant/finder_ui.cpp
@@ -123,7 +123,7 @@ namespace embark_assist {
 
         struct states {
             embark_assist::defs::find_callbacks find_callback;
-            uis ui;
+            uis plotinfo;
             display_maps finder_list;  //  Don't need the element key, but it's easier to use the same type.
             uint16_t finder_list_focus;
             bool finder_list_active;
@@ -171,13 +171,13 @@ namespace embark_assist {
             size_t civ = 0;
 
             while (true) {
-                for (size_t k = 0; k < state->ui[static_cast<int8_t>(i)]->list.size(); k++) {
-                    if (state->ui[static_cast<int8_t>(i) + civ]->current_value == state->ui[static_cast<int8_t>(i) + civ]->list[k].key) {
-                        fprintf(outfile, "[%s:%s]\n", state->finder_list[static_cast<int8_t>(i) + civ].text.c_str(), state->ui[static_cast<int8_t>(i) + civ]->list[k].text.c_str());
+                for (size_t k = 0; k < state->plotinfo[static_cast<int8_t>(i)]->list.size(); k++) {
+                    if (state->plotinfo[static_cast<int8_t>(i) + civ]->current_value == state->plotinfo[static_cast<int8_t>(i) + civ]->list[k].key) {
+                        fprintf(outfile, "[%s:%s]\n", state->finder_list[static_cast<int8_t>(i) + civ].text.c_str(), state->plotinfo[static_cast<int8_t>(i) + civ]->list[k].text.c_str());
                         break;
                     }
                 }
-//                fprintf(outfile, "[%s:%i]\n", state->finder_list[static_cast<int8_t>(i)].text.c_str(), state->ui[static_cast<int8_t>(i)]->current_value);
+//                fprintf(outfile, "[%s:%i]\n", state->finder_list[static_cast<int8_t>(i)].text.c_str(), state->plotinfo[static_cast<int8_t>(i)]->current_value);
                 if (i == last_fields) {
                     civ++;
 
@@ -229,10 +229,10 @@ namespace embark_assist {
 
                         found = false;
 
-                        for (size_t l = 0; l < state->ui[static_cast<int8_t>(i) + civ]->list.size(); l++) {
+                        for (size_t l = 0; l < state->plotinfo[static_cast<int8_t>(i) + civ]->list.size(); l++) {
                             for (int m = k + 1; m < count; m++) {
-                                if (state->ui[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] != line[m]) {
-                                    if (state->ui[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] == '\0' &&
+                                if (state->plotinfo[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] != line[m]) {
+                                    if (state->plotinfo[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] == '\0' &&
                                         line[m] == ']') {
                                         found = true;
                                     }
@@ -291,13 +291,13 @@ namespace embark_assist {
 
                         found = false;
 
-                        for (size_t l = 0; l < state->ui[static_cast<int8_t>(i) + civ]->list.size(); l++) {
+                        for (size_t l = 0; l < state->plotinfo[static_cast<int8_t>(i) + civ]->list.size(); l++) {
                             for (int m = k + 1; m < count; m++) {
-                                if (state->ui[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] != line[m]) {
-                                    if (state->ui[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] == '\0' &&
+                                if (state->plotinfo[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] != line[m]) {
+                                    if (state->plotinfo[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] == '\0' &&
                                         line[m] == ']') {
-                                        state->ui[static_cast<int8_t>(i) + civ]->current_value = state->ui[static_cast<int8_t>(i) + civ]->list[l].key;
-                                        state->ui[static_cast<int8_t>(i) + civ]->current_display_value = l;
+                                        state->plotinfo[static_cast<int8_t>(i) + civ]->current_value = state->plotinfo[static_cast<int8_t>(i) + civ]->list[l].key;
+                                        state->plotinfo[static_cast<int8_t>(i) + civ]->current_display_value = l;
                                         found = true;
                                     }
 
@@ -1095,7 +1095,7 @@ namespace embark_assist {
 
                         if (l < state->civs.size() - 1) {
                             element->current_value = element->list[0].key;
-                            state->ui.push_back(element);
+                            state->plotinfo.push_back(element);
                             element = new ui_lists;
                             element->current_display_value = 0;
                             element->current_index = 0;
@@ -1108,7 +1108,7 @@ namespace embark_assist {
                 }
 
                 element->current_value = element->list[0].key;
-                state->ui.push_back(element);
+                state->plotinfo.push_back(element);
 
                 switch (i) {
                 case fields::x_dim:
@@ -1333,21 +1333,21 @@ namespace embark_assist {
             //  off to compensate for the list starting with 1 at index 0.
             //
             auto screen = Gui::getViewscreenByType<df::viewscreen_choose_start_sitest>(0);
-            state->ui[static_cast<int8_t>(fields::x_dim)]->current_display_value =
+            state->plotinfo[static_cast<int8_t>(fields::x_dim)]->current_display_value =
                 screen->location.embark_pos_max.x -
                 screen->location.embark_pos_min.x;
-            state->ui[static_cast<int8_t>(fields::x_dim)]->current_index =
-                state->ui[static_cast<int8_t>(fields::x_dim)]->current_display_value;
-            state->ui[static_cast<int8_t>(fields::x_dim)]->current_value =
-                state->ui[static_cast<int8_t>(fields::x_dim)]->current_display_value + 1;
+            state->plotinfo[static_cast<int8_t>(fields::x_dim)]->current_index =
+                state->plotinfo[static_cast<int8_t>(fields::x_dim)]->current_display_value;
+            state->plotinfo[static_cast<int8_t>(fields::x_dim)]->current_value =
+                state->plotinfo[static_cast<int8_t>(fields::x_dim)]->current_display_value + 1;
 
-            state->ui[static_cast<int8_t>(fields::y_dim)]->current_display_value =
+            state->plotinfo[static_cast<int8_t>(fields::y_dim)]->current_display_value =
                 screen->location.embark_pos_max.y -
                 screen->location.embark_pos_min.y;
-            state->ui[static_cast<int8_t>(fields::y_dim)]->current_index =
-                state->ui[static_cast<int8_t>(fields::y_dim)]->current_display_value;
-            state->ui[static_cast<int8_t>(fields::y_dim)]->current_value =
-                state->ui[static_cast<int8_t>(fields::y_dim)]->current_display_value + 1;
+            state->plotinfo[static_cast<int8_t>(fields::y_dim)]->current_index =
+                state->plotinfo[static_cast<int8_t>(fields::y_dim)]->current_display_value;
+            state->plotinfo[static_cast<int8_t>(fields::y_dim)]->current_value =
+                state->plotinfo[static_cast<int8_t>(fields::y_dim)]->current_display_value + 1;
         }
 
         //==========================================================================================================
@@ -1360,234 +1360,234 @@ namespace embark_assist {
             while (true) {
                 switch (i) {
                 case fields::x_dim:
-                    finder.x_dim = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.x_dim = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::y_dim:
-                    finder.y_dim = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.y_dim = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::savagery_calm:
                     finder.savagery[0] =
-                        static_cast<embark_assist::defs::evil_savagery_values>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::evil_savagery_values>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::savagery_medium:
                     finder.savagery[1] =
-                        static_cast<embark_assist::defs::evil_savagery_values>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::evil_savagery_values>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
                 case fields::savagery_savage:
                     finder.savagery[2] =
-                        static_cast<embark_assist::defs::evil_savagery_values>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::evil_savagery_values>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::good:
                     finder.evilness[0] =
-                        static_cast<embark_assist::defs::evil_savagery_values>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::evil_savagery_values>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::neutral:
                     finder.evilness[1] =
-                        static_cast<embark_assist::defs::evil_savagery_values>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::evil_savagery_values>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::evil:
                     finder.evilness[2] =
-                        static_cast<embark_assist::defs::evil_savagery_values>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::evil_savagery_values>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::aquifer:
                     finder.aquifer =
-                        static_cast<embark_assist::defs::aquifer_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::aquifer_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::min_river:
                     finder.min_river =
-                        static_cast<embark_assist::defs::river_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::river_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::max_river:
                     finder.max_river =
-                        static_cast<embark_assist::defs::river_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::river_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::min_waterfall:
-                    finder.min_waterfall = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.min_waterfall = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::flat:
                     finder.flat =
-                        static_cast<embark_assist::defs::yes_no_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::yes_no_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::soil_min_everywhere:
                     finder.soil_min_everywhere =
-                        static_cast<embark_assist::defs::all_present_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::all_present_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::freezing:
                     finder.freezing =
-                        static_cast<embark_assist::defs::freezing_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::freezing_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::blood_rain:
                     finder.blood_rain =
-                        static_cast<embark_assist::defs::yes_no_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::yes_no_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::syndrome_rain:
                     finder.syndrome_rain =
-                        static_cast<embark_assist::defs::syndrome_rain_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::syndrome_rain_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::reanimation:
                     finder.reanimation =
-                        static_cast<embark_assist::defs::reanimation_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::reanimation_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::clay:
                     finder.clay =
-                        static_cast<embark_assist::defs::present_absent_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::present_absent_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::sand:
                     finder.sand =
-                        static_cast<embark_assist::defs::present_absent_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::present_absent_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::flux:
                     finder.flux =
-                        static_cast<embark_assist::defs::present_absent_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::present_absent_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::coal:
                     finder.coal =
-                        static_cast<embark_assist::defs::present_absent_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::present_absent_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::soil_min:
                     finder.soil_min =
-                        static_cast<embark_assist::defs::soil_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::soil_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::soil_max:
                     finder.soil_max =
-                        static_cast<embark_assist::defs::soil_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::soil_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::spire_count_min:
-                    finder.spire_count_min = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.spire_count_min = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::spire_count_max:
-                    finder.spire_count_max = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.spire_count_max = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::magma_min:
                     finder.magma_min =
-                        static_cast<embark_assist::defs::magma_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::magma_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::magma_max:
                     finder.magma_max =
-                        static_cast<embark_assist::defs::magma_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                        static_cast<embark_assist::defs::magma_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::biome_count_min:
-                    finder.biome_count_min = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.biome_count_min = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::biome_count_max:
-                    finder.biome_count_max = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.biome_count_max = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::region_type_1:
-                    finder.region_type_1 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.region_type_1 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::region_type_2:
-                    finder.region_type_2 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.region_type_2 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::region_type_3:
-                    finder.region_type_3 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.region_type_3 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::biome_1:
-                    finder.biome_1 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.biome_1 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::biome_2:
-                    finder.biome_2 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.biome_2 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::biome_3:
-                    finder.biome_3 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.biome_3 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::min_trees:
-                    finder.min_trees = static_cast<embark_assist::defs::tree_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                    finder.min_trees = static_cast<embark_assist::defs::tree_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::max_trees:
-                    finder.max_trees = static_cast<embark_assist::defs::tree_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                    finder.max_trees = static_cast<embark_assist::defs::tree_ranges>(state->plotinfo[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::metal_1:
-                    finder.metal_1 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.metal_1 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::metal_2:
-                    finder.metal_2 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.metal_2 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::metal_3:
-                    finder.metal_3 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.metal_3 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::economic_1:
-                    finder.economic_1 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.economic_1 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::economic_2:
-                    finder.economic_2 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.economic_2 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::economic_3:
-                    finder.economic_3 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.economic_3 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::mineral_1:
-                    finder.mineral_1 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.mineral_1 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::mineral_2:
-                    finder.mineral_2 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.mineral_2 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::mineral_3:
-                    finder.mineral_3 = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.mineral_3 = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::min_necro_neighbors:
-                    finder.min_necro_neighbors = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.min_necro_neighbors = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::max_necro_neighbors:
-                    finder.max_necro_neighbors = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.max_necro_neighbors = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::min_civ_neighbors:
-                    finder.min_civ_neighbors = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.min_civ_neighbors = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::max_civ_neighbors:
-                    finder.max_civ_neighbors = state->ui[static_cast<uint8_t>(i)]->current_value;
+                    finder.max_civ_neighbors = state->plotinfo[static_cast<uint8_t>(i)]->current_value;
                     break;
 
                 case fields::neighbors:
                     for (size_t k = 0; k < state->civs.size(); k++) {
-                        finder.neighbors.push_back({ state->civs[k].id, static_cast<embark_assist::defs::present_absent_ranges>(state->ui[static_cast<uint8_t>(i) + k]->current_value) });
+                        finder.neighbors.push_back({ state->civs[k].id, static_cast<embark_assist::defs::present_absent_ranges>(state->plotinfo[static_cast<uint8_t>(i) + k]->current_value) });
                     }
                     break;
                 }
@@ -1641,10 +1641,10 @@ namespace embark_assist {
                     }
                 }
                 else {
-                    if (state->ui[state->finder_list_focus]->current_index > 0) {
-                        state->ui[state->finder_list_focus]->current_index--;
+                    if (state->plotinfo[state->finder_list_focus]->current_index > 0) {
+                        state->plotinfo[state->finder_list_focus]->current_index--;
                     } else {
-                        state->ui[state->finder_list_focus]->current_index = static_cast<uint16_t>(state->ui[state->finder_list_focus]->list.size()) - 1;
+                        state->plotinfo[state->finder_list_focus]->current_index = static_cast<uint16_t>(state->plotinfo[state->finder_list_focus]->list.size()) - 1;
                     }
                 }
 
@@ -1657,17 +1657,17 @@ namespace embark_assist {
                     }
                 }
                 else {
-                    if (state->ui[state->finder_list_focus]->current_index < state->ui[state->finder_list_focus]->list.size() - 1) {
-                        state->ui[state->finder_list_focus]->current_index++;
+                    if (state->plotinfo[state->finder_list_focus]->current_index < state->plotinfo[state->finder_list_focus]->list.size() - 1) {
+                        state->plotinfo[state->finder_list_focus]->current_index++;
                     } else {
-                        state->ui[state->finder_list_focus]->current_index = 0;
+                        state->plotinfo[state->finder_list_focus]->current_index = 0;
                     }
                 }
 
             } else if (input->count(df::interface_key::SELECT)) {
                 if (!state->finder_list_active) {
-                    state->ui[state->finder_list_focus]->current_display_value = state->ui[state->finder_list_focus]->current_index;
-                    state->ui[state->finder_list_focus]->current_value = state->ui[state->finder_list_focus]->list[state->ui[state->finder_list_focus]->current_index].key;
+                    state->plotinfo[state->finder_list_focus]->current_display_value = state->plotinfo[state->finder_list_focus]->current_index;
+                    state->plotinfo[state->finder_list_focus]->current_value = state->plotinfo[state->finder_list_focus]->list[state->plotinfo[state->finder_list_focus]->current_index].key;
                     state->finder_list_active = true;
                 }
 
@@ -1743,7 +1743,7 @@ namespace embark_assist {
                     embark_assist::screen::paintString(active_pen,
                         21,
                         top_row + i - offset,
-                        state->ui[i]->list[state->ui[i]->current_display_value].text);
+                        state->plotinfo[i]->list[state->plotinfo[i]->current_display_value].text);
                 }
                 else {
                     embark_assist::screen::paintString(normal_pen, 1, top_row + i - offset, state->finder_list[i].text);
@@ -1751,38 +1751,38 @@ namespace embark_assist {
                     embark_assist::screen::paintString(white_pen,
                         21,
                         top_row + i - offset,
-                        state->ui[i]->list[state->ui[i]->current_display_value].text);
+                        state->plotinfo[i]->list[state->plotinfo[i]->current_display_value].text);
                 }
             }
 
             //  Implement scrolling lists if they don't fit on the screen.
             offset = 0;
 
-            if (int32_t(state->ui[state->finder_list_focus]->list.size()) > screen_size.y - top_row - 1) {
+            if (int32_t(state->plotinfo[state->finder_list_focus]->list.size()) > screen_size.y - top_row - 1) {
                 offset = (screen_size.y - top_row - 1) / 2;
-                if (state->ui[state->finder_list_focus]->current_index < offset) {
+                if (state->plotinfo[state->finder_list_focus]->current_index < offset) {
                     offset = 0;
                 }
                 else {
-                    offset = state->ui[state->finder_list_focus]->current_index - offset;
+                    offset = state->plotinfo[state->finder_list_focus]->current_index - offset;
                 }
 
-                if (int32_t(state->ui[state->finder_list_focus]->list.size() - offset) < screen_size.y - top_row - 1) {
-                    offset = static_cast<uint16_t>(state->ui[state->finder_list_focus]->list.size()) - (screen_size.y - top_row - 1);
+                if (int32_t(state->plotinfo[state->finder_list_focus]->list.size() - offset) < screen_size.y - top_row - 1) {
+                    offset = static_cast<uint16_t>(state->plotinfo[state->finder_list_focus]->list.size()) - (screen_size.y - top_row - 1);
                 }
             }
 
-            for (uint16_t i = offset; i < state->ui[state->finder_list_focus]->list.size(); i++) {
-                if (i == state->ui[state->finder_list_focus]->current_index) {
+            for (uint16_t i = offset; i < state->plotinfo[state->finder_list_focus]->list.size(); i++) {
+                if (i == state->plotinfo[state->finder_list_focus]->current_index) {
                     if (!state->finder_list_active) {  // Negated expression to get the display lines in the same order as above.
-                        embark_assist::screen::paintString(active_pen, list_column, top_row + i - offset, state->ui[state->finder_list_focus]->list[i].text);
+                        embark_assist::screen::paintString(active_pen, list_column, top_row + i - offset, state->plotinfo[state->finder_list_focus]->list[i].text);
                     }
                     else {
-                        embark_assist::screen::paintString(passive_pen, list_column, top_row + i - offset, state->ui[state->finder_list_focus]->list[i].text);
+                        embark_assist::screen::paintString(passive_pen, list_column, top_row + i - offset, state->plotinfo[state->finder_list_focus]->list[i].text);
                     }
                 }
                 else {
-                    embark_assist::screen::paintString(normal_pen, list_column, top_row + i - offset, state->ui[state->finder_list_focus]->list[i].text);
+                    embark_assist::screen::paintString(normal_pen, list_column, top_row + i - offset, state->plotinfo[state->finder_list_focus]->list[i].text);
                 }
             }
 
@@ -1805,7 +1805,7 @@ void embark_assist::finder_ui::init(DFHack::Plugin *plugin_self, embark_assist::
         embark_assist::finder_ui::ui_setup(find_callback, max_inorganic);
     }
     if (!fileresult) {
-        Screen::show(dts::make_unique<ViewscreenFindUi>(), plugin_self);
+        Screen::show(std::make_unique<ViewscreenFindUi>(), plugin_self);
     }
     else
     {
@@ -1823,8 +1823,8 @@ void embark_assist::finder_ui::activate() {
 
 void embark_assist::finder_ui::shutdown() {
     if (embark_assist::finder_ui::state) {
-        for (uint16_t i = 0; i < embark_assist::finder_ui::state->ui.size(); i++) {
-            delete embark_assist::finder_ui::state->ui[i];
+        for (uint16_t i = 0; i < embark_assist::finder_ui::state->plotinfo.size(); i++) {
+            delete embark_assist::finder_ui::state->plotinfo[i];
         }
 
         delete embark_assist::finder_ui::state;
diff --git a/plugins/embark-assistant/help_ui.cpp b/plugins/embark-assistant/help_ui.cpp
index a49a9b5e0..804617d92 100644
--- a/plugins/embark-assistant/help_ui.cpp
+++ b/plugins/embark-assistant/help_ui.cpp
@@ -411,5 +411,5 @@ namespace embark_assist{
 //===============================================================================
 
 void embark_assist::help_ui::init(DFHack::Plugin *plugin_self) {
-    Screen::show(dts::make_unique<embark_assist::help_ui::ViewscreenHelpUi>(), plugin_self);
+    Screen::show(std::make_unique<embark_assist::help_ui::ViewscreenHelpUi>(), plugin_self);
 }
diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
index 80bf58fbd..9655fa886 100644
--- a/plugins/embark-assistant/survey.cpp
+++ b/plugins/embark-assistant/survey.cpp
@@ -790,7 +790,7 @@ void embark_assist::survey::high_level_world_survey(embark_assist::defs::geo_dat
                     offset_count++;
 
                     results.biome_index[l] = world_data->region_map[adjusted.x][adjusted.y].region_id;
-                    results.biome[l] = DFHack::Maps::GetBiomeTypeWithRef(adjusted.x, adjusted.y, k);
+                    results.biome[l] = DFHack::Maps::getBiomeTypeWithRef(adjusted.x, adjusted.y, k);
                     temperature = world_data->region_map[adjusted.x][adjusted.y].temperature;
                     negative = temperature < 0;
 
diff --git a/plugins/embark-tools.cpp b/plugins/embark-tools.cpp
index 924def798..19e4ef7b6 100644
--- a/plugins/embark-tools.cpp
+++ b/plugins/embark-tools.cpp
@@ -694,7 +694,7 @@ struct choose_start_site_hook : df::viewscreen_choose_start_sitest
 
     void display_settings()
     {
-        Screen::show(dts::make_unique<embark_tools_settings>(), plugin_self);
+        Screen::show(std::make_unique<embark_tools_settings>(), plugin_self);
     }
 
     inline bool is_valid_page()
diff --git a/plugins/eventful.cpp b/plugins/eventful.cpp
index 980b2db9c..dfddab9e8 100644
--- a/plugins/eventful.cpp
+++ b/plugins/eventful.cpp
@@ -39,7 +39,7 @@ using namespace df::enums;
 DFHACK_PLUGIN("eventful");
 REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 
 typedef df::reaction_product_itemst item_product;
 
diff --git a/plugins/examples/persistent_per_save_example.cpp b/plugins/examples/persistent_per_save_example.cpp
index 5a7bf5224..f066be6ef 100644
--- a/plugins/examples/persistent_per_save_example.cpp
+++ b/plugins/examples/persistent_per_save_example.cpp
@@ -6,6 +6,7 @@
 // savegame that had this plugin enabled is loaded.
 
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "df/world.h"
@@ -18,6 +19,7 @@
 #include "modules/World.h"
 
 using std::string;
+using std::unordered_map;
 using std::vector;
 
 using namespace DFHack;
@@ -28,42 +30,70 @@ DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 REQUIRE_GLOBAL(world);
 
 // logging levels can be dynamically controlled with the `debugfilter` command.
+// the names "config" and "cycle" are arbitrary and are just used to categorize
+// your log messages.
 namespace DFHack {
     // for configuration-related logging
-    DBG_DECLARE(persistent_per_save_example, status, DebugCategory::LINFO);
+    DBG_DECLARE(persistent_per_save_example, config, DebugCategory::LINFO);
     // for logging during the periodic scan
     DBG_DECLARE(persistent_per_save_example, cycle, DebugCategory::LINFO);
 }
 
 static const string CONFIG_KEY = string(plugin_name) + "/config";
+static const string ELEM_CONFIG_KEY_PREFIX = string(plugin_name) + "/elem/";
 static PersistentDataItem config;
+static unordered_map<int, PersistentDataItem> elems;
+
 enum ConfigValues {
     CONFIG_IS_ENABLED = 0,
-    CONFIG_CYCLE_TICKS = 1,
+    CONFIG_SOMETHING_ELSE = 1,
+};
+
+enum ElemConfigValues {
+    ELEM_CONFIG_ID = 0,
+    ELEM_CONFIG_SOMETHING_ELSE = 1,
 };
-static int get_config_val(int index) {
-    if (!config.isValid())
+
+static int get_config_val(PersistentDataItem &c, int index) {
+    if (!c.isValid())
         return -1;
-    return config.ival(index);
+    return c.ival(index);
+}
+static bool get_config_bool(PersistentDataItem &c, int index) {
+    return get_config_val(c, index) == 1;
 }
-static bool get_config_bool(int index) {
-    return get_config_val(index) == 1;
+static void set_config_val(PersistentDataItem &c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
 }
-static void set_config_val(int index, int value) {
-    if (config.isValid())
-        config.ival(index) = value;
+static void set_config_bool(PersistentDataItem &c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
 }
-static void set_config_bool(int index, bool value) {
-    set_config_val(index, value ? 1 : 0);
+
+static PersistentDataItem & ensure_elem_config(color_ostream &out, int id) {
+    if (elems.count(id))
+        return elems[id];
+    string keyname = ELEM_CONFIG_KEY_PREFIX + int_to_string(id);
+    DEBUG(config,out).print("creating new persistent key for elem id %d\n", id);
+    elems.emplace(id, World::GetPersistentData(keyname, NULL));
+    return elems[id];
+}
+static void remove_elem_config(color_ostream &out, int id) {
+    if (!elems.count(id))
+        return;
+    DEBUG(config,out).print("removing persistent key for elem id %d\n", id);
+    World::DeletePersistentData(elems[id]);
+    elems.erase(id);
 }
 
+static const int32_t CYCLE_TICKS = 1200; // one day
 static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
 
 static command_result do_command(color_ostream &out, vector<string> &parameters);
 static void do_cycle(color_ostream &out);
 
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
-    DEBUG(status,out).print("initializing %s\n", plugin_name);
+    DEBUG(config,out).print("initializing %s\n", plugin_name);
 
     // provide a configuration interface for the plugin
     commands.push_back(PluginCommand(
@@ -82,11 +112,13 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 
     if (enable != is_enabled) {
         is_enabled = enable;
-        DEBUG(status,out).print("%s from the API; persisting\n",
+        DEBUG(config,out).print("%s from the API; persisting\n",
                                 is_enabled ? "enabled" : "disabled");
-        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        if (enable)
+            do_cycle(out);
     } else {
-        DEBUG(status,out).print("%s from the API, but already %s; no action\n",
+        DEBUG(config,out).print("%s from the API, but already %s; no action\n",
                                 is_enabled ? "enabled" : "disabled",
                                 is_enabled ? "enabled" : "disabled");
     }
@@ -94,34 +126,46 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 }
 
 DFhackCExport command_result plugin_shutdown (color_ostream &out) {
-    DEBUG(status,out).print("shutting down %s\n", plugin_name);
+    DEBUG(config,out).print("shutting down %s\n", plugin_name);
 
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
     config = World::GetPersistentData(CONFIG_KEY);
 
     if (!config.isValid()) {
-        DEBUG(status,out).print("no config found in this save; initializing\n");
+        DEBUG(config,out).print("no config found in this save; initializing\n");
         config = World::AddPersistentData(CONFIG_KEY);
-        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
-        set_config_val(CONFIG_CYCLE_TICKS, 6000);
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        set_config_val(config, CONFIG_SOMETHING_ELSE, 6000);
     }
 
     // we have to copy our enabled flag into the global plugin variable, but
     // all the other state we can directly read/modify from the persistent
     // data structure.
-    is_enabled = get_config_bool(CONFIG_IS_ENABLED);
-    DEBUG(status,out).print("loading persisted enabled state: %s\n",
+    is_enabled = get_config_bool(config, CONFIG_IS_ENABLED);
+    DEBUG(config,out).print("loading persisted enabled state: %s\n",
                             is_enabled ? "true" : "false");
+
+    // load other config elements, if applicable
+    elems.clear();
+    vector<PersistentDataItem> elem_configs;
+    World::GetPersistentData(&elem_configs, ELEM_CONFIG_KEY_PREFIX, true);
+    const size_t num_elem_configs = elem_configs.size();
+    for (size_t idx = 0; idx < num_elem_configs; ++idx) {
+        auto &c = elem_configs[idx];
+        elems.emplace(get_config_val(c, ELEM_CONFIG_ID), c);
+    }
+
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
     if (event == DFHack::SC_WORLD_UNLOADED) {
         if (is_enabled) {
-            DEBUG(status,out).print("world unloaded; disabling %s\n",
+            DEBUG(config,out).print("world unloaded; disabling %s\n",
                                     plugin_name);
             is_enabled = false;
         }
@@ -130,7 +174,7 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 }
 
 DFhackCExport command_result plugin_onupdate(color_ostream &out) {
-    if (is_enabled && world->frame_counter - cycle_timestamp >= get_config_val(CONFIG_CYCLE_TICKS))
+    if (is_enabled && world->frame_counter - cycle_timestamp >= CYCLE_TICKS)
         do_cycle(out);
     return CR_OK;
 }
@@ -146,8 +190,8 @@ static command_result do_command(color_ostream &out, vector<string> &parameters)
 
     // TODO: configuration logic
     // simple commandline parsing can be done in C++, but there are lua libraries
-    // that can easily handle more complex commandlines. see the blueprint plugin
-    // for an example.
+    // that can easily handle more complex commandlines. see the seedwatch plugin
+    // for a simple example.
 
     return CR_OK;
 }
@@ -162,5 +206,5 @@ static void do_cycle(color_ostream &out) {
 
     DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
 
-    // TODO: logic that runs every get_config_val(CONFIG_CYCLE_TICKS) ticks
+    // TODO: logic that runs every CYCLE_TICKS ticks
 }
diff --git a/plugins/faststart.cpp b/plugins/faststart.cpp
new file mode 100644
index 000000000..de014801c
--- /dev/null
+++ b/plugins/faststart.cpp
@@ -0,0 +1,69 @@
+// Fast Startup tweak
+
+#include "Core.h"
+#include <Console.h>
+#include <Export.h>
+#include <PluginManager.h>
+#include <MiscUtils.h>
+#include <VTableInterpose.h>
+
+#include "df/viewscreen_initial_prepst.h"
+#include <vector>
+
+using namespace DFHack;
+using namespace df::enums;
+using std::vector;
+
+// Uncomment this to make the Loading screen as fast as possible
+// This has the side effect of removing the dwarf face animation
+// (and briefly making the game become unresponsive)
+
+//#define REALLY_FAST
+
+DFHACK_PLUGIN("faststart");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
+struct prep_hook : df::viewscreen_initial_prepst
+{
+    typedef df::viewscreen_initial_prepst interpose_base;
+
+    DEFINE_VMETHOD_INTERPOSE(void, logic, ())
+    {
+#ifdef REALLY_FAST
+        while (breakdown_level != interface_breakdown_types::STOPSCREEN)
+        {
+            render_count++;
+            INTERPOSE_NEXT(logic)();
+        }
+#else
+        render_count = 4;
+        INTERPOSE_NEXT(logic)();
+#endif
+    }
+};
+
+IMPLEMENT_VMETHOD_INTERPOSE(prep_hook, logic);
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
+{
+    if (enable != is_enabled)
+    {
+        if (!INTERPOSE_HOOK(prep_hook, logic).apply(enable))
+            return CR_FAILURE;
+
+        is_enabled = enable;
+    }
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
+{
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown ( color_ostream &out )
+{
+    INTERPOSE_HOOK(prep_hook, logic).remove();
+    return CR_OK;
+}
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 6819b6191..87f1c0e76 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -1,11 +1,5 @@
-// (un)designate matching plants for gathering/cutting
-#include <set>
-
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
+#include "Debug.h"
 #include "PluginManager.h"
-#include "DataDefs.h"
 #include "TileTypes.h"
 
 #include "df/map_block.h"
@@ -14,7 +8,7 @@
 #include "df/plant_growth.h"
 #include "df/plant_raw.h"
 #include "df/tile_dig_designation.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/world.h"
 #include "df/world_data.h"
 #include "df/world_object_data.h"
@@ -31,8 +25,13 @@ using std::set;
 using namespace DFHack;
 using namespace df::enums;
 
+namespace DFHack
+{
+DBG_DECLARE(getplants, log, DebugCategory::LINFO);
+}
+
 DFHACK_PLUGIN("getplants");
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(cur_year);
 REQUIRE_GLOBAL(cur_year_tick);
@@ -74,49 +73,38 @@ enum class selectability {
 //  is one of the issues in bug 6940 on the bug tracker (the others cases are detected and
 //  result in the plants not being usable for farming or even collectable at all).
 
-//selectability selectablePlant(color_ostream &out, const df::plant_raw *plant, bool farming)
-selectability selectablePlant(const df::plant_raw *plant, bool farming)
-{
+selectability selectablePlant(color_ostream& out, const df::plant_raw* plant, bool farming) {
     const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant->material_defs.type[plant_material_def::basic_mat], plant->material_defs.idx[plant_material_def::basic_mat]);
     bool outOfSeason = false;
     selectability result = selectability::Nonselectable;
 
-    if (plant->flags.is_set(plant_raw_flags::TREE))
-    {
-//        out.print("%s is a selectable tree\n", plant->id.c_str());
-        if (farming)
-        {
+    if (plant->flags.is_set(plant_raw_flags::TREE)) {
+        DEBUG(log, out).print("%s is a selectable tree\n", plant->id.c_str());
+        if (farming) {
             return selectability::Nonselectable;
         }
-        else
-        {
+        else {
             return selectability::Selectable;
         }
     }
-    else if (plant->flags.is_set(plant_raw_flags::GRASS))
-    {
-//        out.print("%s is a non selectable Grass\n", plant->id.c_str());
+    else if (plant->flags.is_set(plant_raw_flags::GRASS)) {
+        DEBUG(log, out).print("%s is a non selectable Grass\n", plant->id.c_str());
         return selectability::Grass;
     }
 
-    if (farming && plant->material_defs.type[plant_material_def::seed] == -1)
-    {
+    if (farming && plant->material_defs.type[plant_material_def::seed] == -1) {
         return selectability::Nonselectable;
     }
 
     if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
-        basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED))
-    {
-//        out.print("%s is edible\n", plant->id.c_str());
-        if (farming)
-        {
-            if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW))
-            {
+        basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED)) {
+        DEBUG(log, out).print("%s is edible\n", plant->id.c_str());
+        if (farming) {
+            if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW)) {
                 result = selectability::Selectable;
             }
         }
-        else
-        {
+        else {
             return selectability::Selectable;
         }
     }
@@ -125,54 +113,43 @@ selectability selectablePlant(const df::plant_raw *plant, bool farming)
         plant->flags.is_set(plant_raw_flags::MILL) ||
         plant->flags.is_set(plant_raw_flags::EXTRACT_VIAL) ||
         plant->flags.is_set(plant_raw_flags::EXTRACT_BARREL) ||
-        plant->flags.is_set(plant_raw_flags::EXTRACT_STILL_VIAL))
-    {
-//        out.print("%s is thread/mill/extract\n", plant->id.c_str());
-        if (farming)
-        {
+        plant->flags.is_set(plant_raw_flags::EXTRACT_STILL_VIAL)) {
+        DEBUG(log, out).print("%s is thread/mill/extract\n", plant->id.c_str());
+        if (farming) {
             result = selectability::Selectable;
         }
-        else
-        {
+        else {
             return selectability::Selectable;
         }
     }
 
     if (basic_mat.material->reaction_product.id.size() > 0 ||
-        basic_mat.material->reaction_class.size() > 0)
-    {
-//        out.print("%s has a reaction\n", plant->id.c_str());
-        if (farming)
-        {
+        basic_mat.material->reaction_class.size() > 0) {
+        DEBUG(log, out).print("%s has a reaction\n", plant->id.c_str());
+        if (farming) {
             result = selectability::Selectable;
         }
-        else
-        {
+        else {
             return selectability::Selectable;
         }
     }
 
-    for (size_t i = 0; i < plant->growths.size(); i++)
-    {
+    for (size_t i = 0; i < plant->growths.size(); i++) {
         if (plant->growths[i]->item_type == df::item_type::SEEDS ||  //  Only trees have seed growths in vanilla, but raws can be modded...
-            plant->growths[i]->item_type == df::item_type::PLANT_GROWTH)
-        {
+            plant->growths[i]->item_type == df::item_type::PLANT_GROWTH) {
             const DFHack::MaterialInfo growth_mat = DFHack::MaterialInfo(plant->growths[i]->mat_type, plant->growths[i]->mat_index);
             if ((plant->growths[i]->item_type == df::item_type::SEEDS &&
-                 (growth_mat.material->flags.is_set(material_flags::EDIBLE_COOKED) ||
-                  growth_mat.material->flags.is_set(material_flags::EDIBLE_RAW))) ||
+                (growth_mat.material->flags.is_set(material_flags::EDIBLE_COOKED) ||
+                    growth_mat.material->flags.is_set(material_flags::EDIBLE_RAW))) ||
                 (plant->growths[i]->item_type == df::item_type::PLANT_GROWTH &&
-                 growth_mat.material->flags.is_set(material_flags::LEAF_MAT)))  //  Will change name to STOCKPILE_PLANT_GROWTH any day now...
+                    growth_mat.material->flags.is_set(material_flags::LEAF_MAT)))  //  Will change name to STOCKPILE_PLANT_GROWTH any day now...
             {
                 bool seedSource = plant->growths[i]->item_type == df::item_type::SEEDS;
 
-                if (plant->growths[i]->item_type == df::item_type::PLANT_GROWTH)
-                {
-                    for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++)
-                    {
+                if (plant->growths[i]->item_type == df::item_type::PLANT_GROWTH) {
+                    for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++) {
                         if (growth_mat.material->reaction_product.material.mat_type[k] == plant->material_defs.type[plant_material_def::seed] &&
-                            growth_mat.material->reaction_product.material.mat_index[k] == plant->material_defs.idx[plant_material_def::seed])
-                        {
+                            growth_mat.material->reaction_product.material.mat_index[k] == plant->material_defs.idx[plant_material_def::seed]) {
                             seedSource = true;
                             break;
                         }
@@ -181,52 +158,46 @@ selectability selectablePlant(const df::plant_raw *plant, bool farming)
 
                 if (*cur_year_tick >= plant->growths[i]->timing_1 &&
                     (plant->growths[i]->timing_2 == -1 ||
-                        *cur_year_tick <= plant->growths[i]->timing_2))
-                {
-//                     out.print("%s has an edible seed or a stockpile growth\n", plant->id.c_str());
-                    if (!farming || seedSource)
-                    {
+                        *cur_year_tick <= plant->growths[i]->timing_2)) {
+                    DEBUG(log, out).print("%s has an edible seed or a stockpile growth\n", plant->id.c_str());
+                    if (!farming || seedSource) {
                         return selectability::Selectable;
                     }
                 }
-                else
-                {
-                    if (!farming || seedSource)
-                    {
+                else {
+                    if (!farming || seedSource) {
                         outOfSeason = true;
                     }
                 }
             }
         }
-/*            else if (plant->growths[i]->behavior.bits.has_seed)  //  This code designates beans, etc. when DF doesn't, but plant gatherers still fail to collect anything, so it's useless: bug #0006940.
-            {
-                const DFHack::MaterialInfo seed_mat = DFHack::MaterialInfo(plant->material_defs.type[plant_material_def::seed], plant->material_defs.idx[plant_material_def::seed]);
-
-                if (seed_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
-                    seed_mat.material->flags.is_set(material_flags::EDIBLE_COOKED))
-                {
-                    if (*cur_year_tick >= plant->growths[i]->timing_1 &&
-                        (plant->growths[i]->timing_2 == -1 ||
-                            *cur_year_tick <= plant->growths[i]->timing_2))
+        /*            else if (plant->growths[i]->behavior.bits.has_seed)  //  This code designates beans, etc. when DF doesn't, but plant gatherers still fail to collect anything, so it's useless: bug #0006940.
                     {
-                        return selectability::Selectable;
-                    }
-                    else
-                    {
-                        outOfSeason = true;
-                    }
-                }
-            }  */
+                        const DFHack::MaterialInfo seed_mat = DFHack::MaterialInfo(plant->material_defs.type[plant_material_def::seed], plant->material_defs.idx[plant_material_def::seed]);
+
+                        if (seed_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
+                            seed_mat.material->flags.is_set(material_flags::EDIBLE_COOKED))
+                        {
+                            if (*cur_year_tick >= plant->growths[i]->timing_1 &&
+                                (plant->growths[i]->timing_2 == -1 ||
+                                    *cur_year_tick <= plant->growths[i]->timing_2))
+                            {
+                                return selectability::Selectable;
+                            }
+                            else
+                            {
+                                outOfSeason = true;
+                            }
+                        }
+                    }  */
     }
 
-    if (outOfSeason)
-    {
-//        out.print("%s has an out of season growth\n", plant->id.c_str());
+    if (outOfSeason) {
+        DEBUG(log, out).print("%s has an out of season growth\n", plant->id.c_str());
         return selectability::OutOfSeason;
     }
-    else
-    {
-//        out.printerr("%s cannot be gathered\n", plant->id.c_str());
+    else {
+        DEBUG(log, out).print("%s cannot be gathered\n", plant->id.c_str());
         return result;
     }
 }
@@ -240,17 +211,17 @@ bool ripe(int32_t x, int32_t y, int32_t start, int32_t end) {
 }
 
 //  Looks in the picked growths vector to see if a matching growth has been marked as picked.
-bool picked(const df::plant *plant, int32_t growth_subtype) {
-    df::world_data *world_data = world->world_data;
-    df::world_site *site = df::world_site::find(ui->site_id);
+bool picked(const df::plant* plant, int32_t growth_subtype) {
+    df::world_data* world_data = world->world_data;
+    df::world_site* site = df::world_site::find(plotinfo->site_id);
     int32_t pos_x = site->global_min_x + plant->pos.x / 48;
     int32_t pos_y = site->global_min_y + plant->pos.y / 48;
     size_t id = pos_x + pos_y * 16 * world_data->world_width;
-    df::world_object_data *object_data = df::world_object_data::find(id);
+    df::world_object_data* object_data = df::world_object_data::find(id);
     if (!object_data) {
         return false;
     }
-    df::map_block_column *column = world->map.map_block_columns[(plant->pos.x / 16) * world->map.x_count_block + (plant->pos.y / 16)];
+    df::map_block_column* column = world->map.map_block_columns[(plant->pos.x / 16) * world->map.x_count_block + (plant->pos.y / 16)];
 
     for (size_t i = 0; i < object_data->picked_growths.x.size(); i++) {
         if (object_data->picked_growths.x[i] == plant->pos.x &&
@@ -265,13 +236,20 @@ bool picked(const df::plant *plant, int32_t growth_subtype) {
     return false;
 }
 
-bool designate(const df::plant *plant, bool farming) {
-    df::plant_raw *plant_raw = world->raws.plants.all[plant->material];
+bool designate(color_ostream& out, const df::plant* plant, bool farming) {
+    TRACE(log, out).print("Attempting to designate %s at (%i, %i, %i)\n", world->raws.plants.all[plant->material]->id.c_str(), plant->pos.x, plant->pos.y, plant->pos.z);
+
+    if (!farming) {
+        bool istree = (tileMaterial(Maps::getTileBlock(plant->pos)->tiletype[plant->pos.x % 16][plant->pos.y % 16]) == tiletype_material::TREE);
+        if (istree)
+            return Designations::markPlant(plant);
+    }
+
+    df::plant_raw* plant_raw = world->raws.plants.all[plant->material];
     const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant_raw->material_defs.type[plant_material_def::basic_mat], plant_raw->material_defs.idx[plant_material_def::basic_mat]);
 
     if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
-        basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED))
-    {
+        basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED)) {
         return Designations::markPlant(plant);
     }
 
@@ -279,63 +257,60 @@ bool designate(const df::plant *plant, bool farming) {
         plant_raw->flags.is_set(plant_raw_flags::MILL) ||
         plant_raw->flags.is_set(plant_raw_flags::EXTRACT_VIAL) ||
         plant_raw->flags.is_set(plant_raw_flags::EXTRACT_BARREL) ||
-        plant_raw->flags.is_set(plant_raw_flags::EXTRACT_STILL_VIAL))
-    {
+        plant_raw->flags.is_set(plant_raw_flags::EXTRACT_STILL_VIAL)) {
         if (!farming) {
             return Designations::markPlant(plant);
         }
     }
 
     if (basic_mat.material->reaction_product.id.size() > 0 ||
-        basic_mat.material->reaction_class.size() > 0)
-    {
+        basic_mat.material->reaction_class.size() > 0) {
         if (!farming) {
             return Designations::markPlant(plant);
         }
     }
 
-    for (size_t i = 0; i < plant_raw->growths.size(); i++)
-    {
-        if (plant_raw->growths[i]->item_type == df::item_type::SEEDS ||  //  Only trees have seed growths in vanilla, but raws can be modded...
-            plant_raw->growths[i]->item_type == df::item_type::PLANT_GROWTH)
-        {
-            const DFHack::MaterialInfo growth_mat = DFHack::MaterialInfo(plant_raw->growths[i]->mat_type, plant_raw->growths[i]->mat_index);
-            if ((plant_raw->growths[i]->item_type == df::item_type::SEEDS &&
-                (growth_mat.material->flags.is_set(material_flags::EDIBLE_COOKED) ||
-                    growth_mat.material->flags.is_set(material_flags::EDIBLE_RAW))) ||
-                    (plant_raw->growths[i]->item_type == df::item_type::PLANT_GROWTH &&
-                        growth_mat.material->flags.is_set(material_flags::LEAF_MAT)))  //  Will change name to STOCKPILE_PLANT_GROWTH any day now...
-            {
-                bool seedSource = plant_raw->growths[i]->item_type == df::item_type::SEEDS;
+    for (size_t i = 0; i < plant_raw->growths.size(); i++) {
+        TRACE(log, out).print("growth item type=%d\n", plant_raw->growths[i]->item_type);
+        //  Only trees have seed growths in vanilla, but raws can be modded...
+        if (plant_raw->growths[i]->item_type != df::item_type::SEEDS &&
+            plant_raw->growths[i]->item_type != df::item_type::PLANT_GROWTH)
+            continue;
 
-                if (plant_raw->growths[i]->item_type == df::item_type::PLANT_GROWTH)
-                {
-                    for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++)
-                    {
-                        if (growth_mat.material->reaction_product.material.mat_type[k] == plant_raw->material_defs.type[plant_material_def::seed] &&
-                            growth_mat.material->reaction_product.material.mat_index[k] == plant_raw->material_defs.idx[plant_material_def::seed])
-                        {
-                            seedSource = true;
-                            break;
-                        }
-                    }
-                }
+        const DFHack::MaterialInfo growth_mat = DFHack::MaterialInfo(plant_raw->growths[i]->mat_type, plant_raw->growths[i]->mat_index);
+        TRACE(log, out).print("edible_cooked=%d edible_raw=%d leaf_mat=%d\n",
+            growth_mat.material->flags.is_set(material_flags::EDIBLE_COOKED),
+            growth_mat.material->flags.is_set(material_flags::EDIBLE_RAW),
+            growth_mat.material->flags.is_set(material_flags::LEAF_MAT));
+        if (!(plant_raw->growths[i]->item_type == df::item_type::SEEDS &&
+            (growth_mat.material->flags.is_set(material_flags::EDIBLE_COOKED) ||
+                growth_mat.material->flags.is_set(material_flags::EDIBLE_RAW))) &&
+            !(plant_raw->growths[i]->item_type == df::item_type::PLANT_GROWTH &&
+                growth_mat.material->flags.is_set(material_flags::LEAF_MAT)))  //  Will change name to STOCKPILE_PLANT_GROWTH any day now...
+            continue;
 
-                if ((!farming || seedSource) &&
-                    ripe(plant->pos.x, plant->pos.y, plant_raw->growths[i]->timing_1, plant_raw->growths[i]->timing_2) &&
-                    !picked(plant, i))
-                {
-                    return Designations::markPlant(plant);
+        bool seedSource = plant_raw->growths[i]->item_type == df::item_type::SEEDS;
+
+        if (plant_raw->growths[i]->item_type == df::item_type::PLANT_GROWTH) {
+            for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++) {
+                if (growth_mat.material->reaction_product.material.mat_type[k] == plant_raw->material_defs.type[plant_material_def::seed] &&
+                    growth_mat.material->reaction_product.material.mat_index[k] == plant_raw->material_defs.idx[plant_material_def::seed]) {
+                    seedSource = true;
+                    break;
                 }
             }
         }
+
+        if ((!farming || seedSource) &&
+            ripe(plant->pos.x, plant->pos.y, plant_raw->growths[i]->timing_1, plant_raw->growths[i]->timing_2) &&
+            !picked(plant, i))
+            return Designations::markPlant(plant);
     }
 
     return false;
 }
 
-command_result df_getplants (color_ostream &out, vector <string> & parameters)
-{
+command_result df_getplants(color_ostream& out, vector <string>& parameters) {
     string plantMatStr = "";
     std::vector<selectability> plantSelections;
     std::vector<size_t> collectionCount;
@@ -347,16 +322,14 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
     plantSelections.resize(world->raws.plants.all.size());
     collectionCount.resize(world->raws.plants.all.size());
 
-    for (size_t i = 0; i < plantSelections.size(); i++)
-    {
+    for (size_t i = 0; i < plantSelections.size(); i++) {
         plantSelections[i] = selectability::Unselected;
         collectionCount[i] = 0;
     }
 
     bool anyPlantsSelected = false;
 
-    for (size_t i = 0; i < parameters.size(); i++)
-    {
+    for (size_t i = 0; i < parameters.size(); i++) {
         if (parameters[i] == "help" || parameters[i] == "?")
             return CR_WRONG_USAGE;
         else if (parameters[i] == "-t")
@@ -373,79 +346,62 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
             verbose = true;
         else if (parameters[i] == "-f")
             farming = true;
-        else if (parameters[i] == "-n")
-        {
-            if (parameters.size() > i + 1)
-            {
+        else if (parameters[i] == "-n") {
+            if (parameters.size() > i + 1) {
                 maxCount = atoi(parameters[i + 1].c_str());
-                if (maxCount >= 1)
-                {
+                if (maxCount >= 1) {
                     i++;  //  We've consumed the next parameter, so we need to progress the iterator.
                 }
-                else
-                {
+                else {
                     out.printerr("-n requires a positive integer parameter!\n");
                     return CR_WRONG_USAGE;
                 }
             }
-            else
-            {
+            else {
                 out.printerr("-n requires a positive integer parameter!\n");
                 return CR_WRONG_USAGE;
             }
         }
         else
-            plantNames.insert(parameters[i]);
+            plantNames.insert(toUpper(parameters[i]));
     }
-    if (treesonly && shrubsonly)
-    {
+    if (treesonly && shrubsonly) {
         out.printerr("Cannot specify both -t and -s at the same time!\n");
         return CR_WRONG_USAGE;
     }
-    if (treesonly && farming)
-    {
+    if (treesonly && farming) {
         out.printerr("Cannot specify both -t and -f at the same time!\n");
         return CR_WRONG_USAGE;
     }
-    if (all && exclude)
-    {
+    if (all && exclude) {
         out.printerr("Cannot specify both -a and -x at the same time!\n");
         return CR_WRONG_USAGE;
     }
-    if (all && plantNames.size())
-    {
+    if (all && plantNames.size()) {
         out.printerr("Cannot specify -a along with plant IDs!\n");
         return CR_WRONG_USAGE;
     }
 
     CoreSuspender suspend;
 
-    for (size_t i = 0; i < world->raws.plants.all.size(); i++)
-    {
-        df::plant_raw *plant = world->raws.plants.all[i];
-        if (all)
-        {
-//            plantSelections[i] = selectablePlant(out, plant, farming);
-            plantSelections[i] = selectablePlant(plant, farming);
+    for (size_t i = 0; i < world->raws.plants.all.size(); i++) {
+        df::plant_raw* plant = world->raws.plants.all[i];
+        if (all) {
+            plantSelections[i] = selectablePlant(out, plant, farming);
         }
-         else if (plantNames.find(plant->id) != plantNames.end())
-        {
+        else if (plantNames.find(plant->id) != plantNames.end()) {
             plantNames.erase(plant->id);
-//            plantSelections[i] = selectablePlant(out, plant, farming);
-            plantSelections[i] = selectablePlant(plant, farming);
-            switch (plantSelections[i])
-            {
+            plantSelections[i] = selectablePlant(out, plant, farming);
+            switch (plantSelections[i]) {
             case selectability::Grass:
                 out.printerr("%s is a grass and cannot be gathered\n", plant->id.c_str());
                 break;
 
             case selectability::Nonselectable:
-                if (farming)
-                {
+                if (farming) {
                     out.printerr("%s does not have any parts that can be gathered for seeds for farming\n", plant->id.c_str());
                 }
-                else
-                {
+                else {
                     out.printerr("%s does not have any parts that can be gathered\n", plant->id.c_str());
                 }
                 break;
@@ -462,8 +418,7 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
             }
         }
     }
-    if (plantNames.size() > 0)
-    {
+    if (plantNames.size() > 0) {
         out.printerr("Invalid plant ID(s):");
         for (set<string>::const_iterator it = plantNames.begin(); it != plantNames.end(); it++)
             out.printerr(" %s", it->c_str());
@@ -471,33 +426,26 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
         return CR_FAILURE;
     }
 
-    for (size_t i = 0; i < plantSelections.size(); i++)
-    {
+    for (size_t i = 0; i < plantSelections.size(); i++) {
         if (plantSelections[i] == selectability::OutOfSeason ||
-            plantSelections[i] == selectability::Selectable)
-        {
+            plantSelections[i] == selectability::Selectable) {
             anyPlantsSelected = true;
             break;
         }
     }
 
-    if (!anyPlantsSelected)
-    {
+    if (!anyPlantsSelected) {
         out.print("Valid plant IDs:\n");
-        for (size_t i = 0; i < world->raws.plants.all.size(); i++)
-        {
-            df::plant_raw *plant = world->raws.plants.all[i];
-//            switch (selectablePlant(out, plant, farming))
-            switch (selectablePlant(plant, farming))
-                {
+        for (size_t i = 0; i < world->raws.plants.all.size(); i++) {
+            df::plant_raw* plant = world->raws.plants.all[i];
+            switch (selectablePlant(out, plant, farming)) {
             case selectability::Grass:
             case selectability::Nonselectable:
                 continue;
 
             case selectability::OutOfSeason:
             {
-                if (!treesonly)
-                {
+                if (!treesonly) {
                     out.print("* (shrub) %s - %s is out of season\n", plant->id.c_str(), plant->name.c_str());
                 }
                 break;
@@ -522,22 +470,21 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
     }
 
     count = 0;
-    for (size_t i = 0; i < world->plants.all.size(); i++)
-    {
-        const df::plant *plant = world->plants.all[i];
-        df::map_block *cur = Maps::getTileBlock(plant->pos);
+    for (size_t i = 0; i < world->plants.all.size(); i++) {
+        const df::plant* plant = world->plants.all[i];
+        df::map_block* cur = Maps::getTileBlock(plant->pos);
+
+        TRACE(log, out).print("Examining %s at (%i, %i, %i) [index=%d]\n", world->raws.plants.all[plant->material]->id.c_str(), plant->pos.x, plant->pos.y, plant->pos.z, (int)i);
 
         int x = plant->pos.x % 16;
         int y = plant->pos.y % 16;
         if (plantSelections[plant->material] == selectability::OutOfSeason ||
-            plantSelections[plant->material] == selectability::Selectable)
-        {
+            plantSelections[plant->material] == selectability::Selectable) {
             if (exclude ||
                 plantSelections[plant->material] == selectability::OutOfSeason)
                 continue;
         }
-        else
-        {
+        else {
             if (!exclude)
                 continue;
         }
@@ -552,37 +499,29 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
             continue;
         if (collectionCount[plant->material] >= maxCount)
             continue;
-        if (deselect && Designations::unmarkPlant(plant))
-        {
+        if (deselect && Designations::unmarkPlant(plant)) {
             collectionCount[plant->material]++;
             ++count;
         }
-        if (!deselect && designate(plant, farming))
-        {
-//            out.print("Designated %s at (%i, %i, %i), %d\n", world->raws.plants.all[plant->material]->id.c_str(), plant->pos.x, plant->pos.y, plant->pos.z, (int)i);
+        if (!deselect && designate(out, plant, farming)) {
+            DEBUG(log, out).print("Designated %s at (%i, %i, %i), %d\n", world->raws.plants.all[plant->material]->id.c_str(), plant->pos.x, plant->pos.y, plant->pos.z, (int)i);
             collectionCount[plant->material]++;
             ++count;
         }
     }
-    if (count)
-    {
-        if (verbose)
-        {
-            for (size_t i = 0; i < plantSelections.size(); i++)
-            {
-                if (collectionCount[i] > 0)
-                    out.print("Updated %d %s designations.\n", (int)collectionCount[i], world->raws.plants.all[i]->id.c_str());
-            }
-            out.print("\n");
+    if (count && verbose) {
+        for (size_t i = 0; i < plantSelections.size(); i++) {
+            if (collectionCount[i] > 0)
+                out.print("Updated %d %s designations.\n", (int)collectionCount[i], world->raws.plants.all[i]->id.c_str());
         }
+        out.print("\n");
     }
     out.print("Updated %d plant designations.\n", (int)count);
 
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
-{
+DFhackCExport command_result plugin_init(color_ostream& out, vector <PluginCommand>& commands) {
     commands.push_back(PluginCommand(
         "getplants",
         "Designate trees for chopping and shrubs for gathering.",
@@ -590,7 +529,6 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCom
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
+DFhackCExport command_result plugin_shutdown(color_ostream& out) {
     return CR_OK;
 }
diff --git a/plugins/hotkeys.cpp b/plugins/hotkeys.cpp
index 6bb6a1600..ef2ca9422 100644
--- a/plugins/hotkeys.cpp
+++ b/plugins/hotkeys.cpp
@@ -26,7 +26,6 @@ static const string INVOKE_HOTKEYS_COMMAND = "hotkeys";
 static const std::string MENU_SCREEN_FOCUS_STRING = "dfhack/lua/hotkeys/menu";
 
 static bool valid = false; // whether the following two vars contain valid data
-static string current_focus;
 static map<string, string> current_bindings;
 static vector<string> sorted_keys;
 
@@ -38,20 +37,34 @@ static bool can_invoke(const string &cmdline, df::viewscreen *screen) {
 }
 
 static int cleanupHotkeys(lua_State *) {
-    DEBUG(log).print("cleaning up old stub keybindings for %s\n", current_focus.c_str());
+    DEBUG(log).print("cleaning up old stub keybindings for: %s\n", join_strings(", ", Gui::getCurFocus(true)).c_str());
     std::for_each(sorted_keys.begin(), sorted_keys.end(), [](const string &sym) {
         string keyspec = sym + "@" + MENU_SCREEN_FOCUS_STRING;
         DEBUG(log).print("clearing keybinding: %s\n", keyspec.c_str());
         Core::getInstance().ClearKeyBindings(keyspec);
     });
     valid = false;
-    current_focus = "";
     sorted_keys.clear();
     current_bindings.clear();
     return 0;
 }
 
-static void add_binding_if_valid(const string &sym, const string &cmdline, df::viewscreen *screen, bool filtermenu) {
+static bool should_hide_armok(color_ostream &out, const string &cmdline) {
+    bool should_hide = false;
+
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+    Lua::CallLuaModuleFunction(out, L, "plugins.hotkeys", "should_hide_armok", 1, 1,
+        [&](lua_State *L){
+            Lua::Push(L, cmdline);
+        }, [&](lua_State *L){
+            should_hide = lua_toboolean(L, -1);
+        });
+
+    return should_hide;
+}
+
+static void add_binding_if_valid(color_ostream &out, const string &sym, const string &cmdline, df::viewscreen *screen, bool filtermenu) {
     if (!can_invoke(cmdline, screen))
         return;
 
@@ -61,6 +74,11 @@ static void add_binding_if_valid(const string &sym, const string &cmdline, df::v
         return;
     }
 
+    if (should_hide_armok(out, cmdline)) {
+        DEBUG(log).print("filtering out armok keybinding\n");
+        return;
+    }
+
     current_bindings[sym] = cmdline;
     sorted_keys.push_back(sym);
     string keyspec = sym + "@" + MENU_SCREEN_FOCUS_STRING;
@@ -69,7 +87,7 @@ static void add_binding_if_valid(const string &sym, const string &cmdline, df::v
     Core::getInstance().AddKeyBinding(keyspec, binding);
 }
 
-static void find_active_keybindings(df::viewscreen *screen, bool filtermenu) {
+static void find_active_keybindings(color_ostream &out, df::viewscreen *screen, bool filtermenu) {
     DEBUG(log).print("scanning for active keybindings\n");
     if (valid)
         cleanupHotkeys(NULL);
@@ -85,12 +103,11 @@ static void find_active_keybindings(df::viewscreen *screen, bool filtermenu) {
     }
 
     for (int i = 1; i <= 12; i++) {
-        valid_keys.push_back("F" + int_to_string(i));
+        valid_keys.push_back('F' + int_to_string(i));
     }
 
     valid_keys.push_back("`");
 
-    current_focus = Gui::getFocusString(screen);
     for (int shifted = 0; shifted < 2; shifted++) {
         for (int alt = 0; alt < 2; alt++) {
             for (int ctrl = 0; ctrl < 2; ctrl++) {
@@ -106,15 +123,15 @@ static void find_active_keybindings(df::viewscreen *screen, bool filtermenu) {
                         string::size_type colon_pos = invoke_cmd->find(":");
                         // colons at location 0 are for commands like ":lua"
                         if (colon_pos == string::npos || colon_pos == 0) {
-                            add_binding_if_valid(sym, *invoke_cmd, screen, filtermenu);
+                            add_binding_if_valid(out, sym, *invoke_cmd, screen, filtermenu);
                         }
                         else {
                             vector<string> tokens;
                             split_string(&tokens, *invoke_cmd, ":");
                             string focus = tokens[0].substr(1);
-                            if (prefix_matches(focus, current_focus)) {
+                            if(Gui::matchFocusString(focus)) {
                                 auto cmdline = trim(tokens[1]);
-                                add_binding_if_valid(sym, cmdline, screen, filtermenu);
+                                add_binding_if_valid(out, sym, cmdline, screen, filtermenu);
                             }
                         }
                     }
@@ -127,7 +144,10 @@ static void find_active_keybindings(df::viewscreen *screen, bool filtermenu) {
 }
 
 static int getHotkeys(lua_State *L) {
-    find_active_keybindings(Gui::getCurViewscreen(true), true);
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    find_active_keybindings(*out, Gui::getCurViewscreen(true), true);
     Lua::PushVector(L, sorted_keys);
     Lua::Push(L, current_bindings);
     return 2;
@@ -143,10 +163,10 @@ static void list(color_ostream &out) {
     DEBUG(log).print("listing active hotkeys\n");
     bool was_valid = valid;
     if (!valid)
-        find_active_keybindings(Gui::getCurViewscreen(true), false);
+        find_active_keybindings(out, Gui::getCurViewscreen(true), false);
 
-    out.print("Valid keybindings for the current screen (%s)\n",
-              current_focus.c_str());
+    out.print("Valid keybindings for the current focus:\n %s\n",
+              join_strings("\n", Gui::getCurFocus(true)).c_str());
     std::for_each(sorted_keys.begin(), sorted_keys.end(), [&](const string &sym) {
         out.print("%s: %s\n", sym.c_str(), current_bindings[sym].c_str());
     });
@@ -158,7 +178,7 @@ static void list(color_ostream &out) {
 static bool invoke_command(color_ostream &out, const size_t index) {
     auto screen = Core::getTopViewscreen();
     if (sorted_keys.size() <= index ||
-            Gui::getFocusString(screen) != MENU_SCREEN_FOCUS_STRING)
+            !Gui::matchFocusString(MENU_SCREEN_FOCUS_STRING))
         return false;
 
     auto cmd = current_bindings[sorted_keys[index]];
@@ -179,6 +199,8 @@ static command_result hotkeys_cmd(color_ostream &out, vector <string> & paramete
         return Core::getInstance().runCommand(out, INVOKE_MENU_COMMAND );
     }
 
+    CoreSuspender guard;
+
     if (parameters[0] == "list") {
         list(out);
         return CR_OK;
@@ -188,8 +210,6 @@ static command_result hotkeys_cmd(color_ostream &out, vector <string> & paramete
     if (parameters.size() != 2 || parameters[0] != "invoke")
         return CR_WRONG_USAGE;
 
-    CoreSuspender guard;
-
     int index = string_to_int(parameters[1], -1);
     if (index < 0)
         return CR_WRONG_USAGE;
diff --git a/plugins/jobutils.cpp b/plugins/jobutils.cpp
index 5f5994435..35b6f2cb5 100644
--- a/plugins/jobutils.cpp
+++ b/plugins/jobutils.cpp
@@ -11,8 +11,8 @@
 
 #include "DataDefs.h"
 #include "df/world.h"
-#include "df/ui.h"
-#include "df/ui_build_selector.h"
+#include "df/plotinfost.h"
+#include "df/buildreq.h"
 #include "df/ui_build_item_req.h"
 #include "df/build_req_choice_genst.h"
 #include "df/build_req_choice_specst.h"
@@ -33,7 +33,7 @@ using namespace df::enums;
 
 DFHACK_PLUGIN("jobutils");
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(ui_build_selector);
 REQUIRE_GLOBAL(ui_workshop_job_cursor);
 REQUIRE_GLOBAL(job_next_id);
@@ -48,7 +48,7 @@ static command_result job_cmd(color_ostream &out, vector <string> & parameters);
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    if (!world || !ui)
+    if (!world || !plotinfo)
         return CR_FAILURE;
 
     commands.push_back(
@@ -232,9 +232,9 @@ static command_result job_material(color_ostream &out, vector <string> & paramet
     else
         return CR_WRONG_USAGE;
 
-    if (ui->main.mode == ui_sidebar_mode::QueryBuilding)
+    if (plotinfo->main.mode == ui_sidebar_mode::QueryBuilding)
         return job_material_in_job(out, new_mat);
-    if (ui->main.mode == ui_sidebar_mode::Build)
+    if (plotinfo->main.mode == ui_sidebar_mode::Build)
         return job_material_in_build(out, new_mat);
 
     return CR_WRONG_USAGE;
diff --git a/plugins/logistics.cpp b/plugins/logistics.cpp
new file mode 100644
index 000000000..d4d2f0afe
--- /dev/null
+++ b/plugins/logistics.cpp
@@ -0,0 +1,768 @@
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+
+#include "modules/Buildings.h"
+#include "modules/Job.h"
+#include "modules/Persistence.h"
+#include "modules/Units.h"
+#include "modules/World.h"
+
+#include "df/building.h"
+#include "df/building_stockpilest.h"
+#include "df/building_tradedepotst.h"
+#include "df/caravan_state.h"
+#include "df/general_ref_building_holderst.h"
+#include "df/plotinfost.h"
+#include "df/training_assignment.h"
+#include "df/world.h"
+
+using std::string;
+using std::unordered_map;
+using std::vector;
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("logistics");
+
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
+REQUIRE_GLOBAL(plotinfo);
+REQUIRE_GLOBAL(world);
+
+namespace DFHack {
+DBG_DECLARE(logistics, status, DebugCategory::LINFO);
+DBG_DECLARE(logistics, cycle, DebugCategory::LINFO);
+}
+
+static const string CONFIG_KEY_PREFIX = string(plugin_name) + "/";
+static unordered_map<int32_t, PersistentDataItem> watched_stockpiles;
+
+enum StockpileConfigValues {
+    STOCKPILE_CONFIG_STOCKPILE_NUMBER = 0,
+    STOCKPILE_CONFIG_MELT = 1,
+    STOCKPILE_CONFIG_TRADE = 2,
+    STOCKPILE_CONFIG_DUMP = 3,
+    STOCKPILE_CONFIG_TRAIN = 4,
+    STOCKPILE_CONFIG_MELT_MASTERWORKS = 5,
+};
+
+static int get_config_val(PersistentDataItem& c, int index) {
+    if (!c.isValid())
+        return -1;
+    return c.ival(index);
+}
+
+static bool get_config_bool(PersistentDataItem& c, int index) {
+    return get_config_val(c, index) == 1;
+}
+
+static void set_config_val(PersistentDataItem& c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
+}
+
+static void set_config_bool(PersistentDataItem& c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
+}
+
+static PersistentDataItem& ensure_stockpile_config(color_ostream& out, int stockpile_number) {
+    DEBUG(cycle, out).print("ensuring stockpile config stockpile_number=%d\n", stockpile_number);
+    if (watched_stockpiles.count(stockpile_number)) {
+        DEBUG(cycle, out).print("stockpile exists in watched_stockpiles\n");
+        return watched_stockpiles[stockpile_number];
+    }
+
+    string keyname = CONFIG_KEY_PREFIX + int_to_string(stockpile_number);
+    DEBUG(status, out).print("creating new persistent key for stockpile %d\n", stockpile_number);
+    watched_stockpiles.emplace(stockpile_number, World::GetPersistentData(keyname, NULL));
+    PersistentDataItem& c = watched_stockpiles[stockpile_number];
+    set_config_val(c, STOCKPILE_CONFIG_STOCKPILE_NUMBER, stockpile_number);
+    set_config_bool(c, STOCKPILE_CONFIG_MELT, false);
+    set_config_bool(c, STOCKPILE_CONFIG_TRADE, false);
+    set_config_bool(c, STOCKPILE_CONFIG_DUMP, false);
+    set_config_bool(c, STOCKPILE_CONFIG_TRAIN, false);
+    set_config_bool(c, STOCKPILE_CONFIG_MELT_MASTERWORKS, false);
+    return c;
+}
+
+static void remove_stockpile_config(color_ostream& out, int stockpile_number) {
+    if (!watched_stockpiles.count(stockpile_number))
+        return;
+    DEBUG(status, out).print("removing persistent key for stockpile %d\n", stockpile_number);
+    World::DeletePersistentData(watched_stockpiles[stockpile_number]);
+    watched_stockpiles.erase(stockpile_number);
+}
+
+static const int32_t CYCLE_TICKS = 600;
+static int32_t cycle_timestamp = 0; // world->frame_counter at last cycle
+
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+static void do_cycle(color_ostream& out, int32_t& melt_count, int32_t& trade_count, int32_t& dump_count, int32_t& train_count);
+
+DFhackCExport command_result plugin_init(color_ostream &out, vector<PluginCommand> &commands) {
+    DEBUG(status, out).print("initializing %s\n", plugin_name);
+
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Automatically mark and route items in monitored stockpiles.",
+        do_command));
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    is_enabled = enable;
+    DEBUG(status, out).print("now %s\n", is_enabled ? "enabled" : "disabled");
+    return CR_OK;
+}
+
+static df::building_stockpilest* find_stockpile(int32_t stockpile_number) {
+    return binsearch_in_vector(world->buildings.other.STOCKPILE,
+            &df::building_stockpilest::stockpile_number, stockpile_number);
+}
+
+static void validate_stockpile_configs(color_ostream& out,
+        unordered_map<df::building_stockpilest *, PersistentDataItem> &cache) {
+    vector<int> to_remove;
+    for (auto& entry : watched_stockpiles) {
+        int stockpile_number = entry.first;
+        PersistentDataItem &c = entry.second;
+        auto bld = find_stockpile(stockpile_number);
+        if (!bld || (
+                !get_config_bool(c, STOCKPILE_CONFIG_MELT) &&
+                !get_config_bool(c, STOCKPILE_CONFIG_TRADE) &&
+                !get_config_bool(c, STOCKPILE_CONFIG_DUMP) &&
+                !get_config_bool(c, STOCKPILE_CONFIG_TRAIN))) {
+            to_remove.push_back(stockpile_number);
+            continue;
+        }
+        cache.emplace(bld, c);
+    }
+    for (int stockpile_number : to_remove)
+        remove_stockpile_config(out, stockpile_number);
+}
+
+// remove this function once saves from 50.08 are no longer compatible
+static void migrate_old_keys(color_ostream &out) {
+    vector<PersistentDataItem> old_data;
+    World::GetPersistentData(&old_data, "automelt/stockpile/", true);
+    const size_t num_old_keys = old_data.size();
+    for (size_t idx = 0; idx < num_old_keys; ++idx) {
+        auto& old_c = old_data[idx];
+        int32_t bld_id = get_config_val(old_c, 0);
+        bool melt_was_on = get_config_bool(old_c, 1);
+        World::DeletePersistentData(old_c);
+        auto bld = df::building::find(bld_id);
+        if (!bld || bld->getType() != df::building_type::Stockpile ||
+                watched_stockpiles.count(static_cast<df::building_stockpilest *>(bld)->stockpile_number))
+            continue;
+        auto &c = ensure_stockpile_config(out, static_cast<df::building_stockpilest *>(bld)->stockpile_number);
+        set_config_bool(c, STOCKPILE_CONFIG_MELT, melt_was_on);
+    }
+}
+
+DFhackCExport command_result plugin_load_data(color_ostream &out) {
+    cycle_timestamp = 0;
+
+    vector<PersistentDataItem> loaded_persist_data;
+    World::GetPersistentData(&loaded_persist_data, CONFIG_KEY_PREFIX, true);
+    watched_stockpiles.clear();
+    const size_t num_watched_stockpiles = loaded_persist_data.size();
+    for (size_t idx = 0; idx < num_watched_stockpiles; ++idx) {
+        auto& c = loaded_persist_data[idx];
+        watched_stockpiles.emplace(get_config_val(c, STOCKPILE_CONFIG_STOCKPILE_NUMBER), c);
+    }
+    migrate_old_keys(out);
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (!is_enabled || !Core::getInstance().isWorldLoaded())
+        return CR_OK;
+    if (world->frame_counter - cycle_timestamp >= CYCLE_TICKS) {
+        int32_t melt_count = 0, trade_count = 0, dump_count = 0, train_count = 0;
+        do_cycle(out, melt_count, trade_count, dump_count, train_count);
+        if (0 < melt_count)
+            out.print("logistics: marked %d item(s) for melting\n", melt_count);
+        if (0 < trade_count)
+            out.print("logistics: marked %d item(s) for trading\n", trade_count);
+        if (0 < dump_count)
+            out.print("logistics: marked %d item(s) for dumping\n", dump_count);
+        if (0 < train_count)
+            out.print("logistics: marked %d animal(s) for training\n", dump_count);
+    }
+    return CR_OK;
+}
+
+static bool call_logistics_lua(color_ostream* out, const char* fn_name,
+        int nargs = 0, int nres = 0,
+        Lua::LuaLambda && args_lambda = Lua::DEFAULT_LUA_LAMBDA,
+        Lua::LuaLambda && res_lambda = Lua::DEFAULT_LUA_LAMBDA) {
+    DEBUG(status).print("calling logistics lua function: '%s'\n", fn_name);
+
+    CoreSuspender guard;
+
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!out)
+        out = &Core::getInstance().getConsole();
+
+    return Lua::CallLuaModuleFunction(*out, L, "plugins.logistics", fn_name,
+            nargs, nres,
+            std::forward<Lua::LuaLambda&&>(args_lambda),
+            std::forward<Lua::LuaLambda&&>(res_lambda));
+}
+
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
+
+    bool show_help = false;
+    if (!call_logistics_lua(&out, "parse_commandline", 1, 1,
+            [&](lua_State *L) {
+                Lua::PushVector(L, parameters);
+            },
+            [&](lua_State *L) {
+                show_help = !lua_toboolean(L, -1);
+            })) {
+        return CR_FAILURE;
+    }
+
+    return show_help ? CR_WRONG_USAGE : CR_OK;
+}
+
+/////////////////////////////////////////////////////
+// cycle
+//
+
+typedef unordered_map<int32_t, size_t> StatMap;
+
+struct ProcessorStats {
+    size_t newly_designated = 0;
+    StatMap designated_counts, can_designate_counts;
+};
+
+class StockProcessor {
+public:
+    const string name;
+    const int32_t stockpile_number;
+    const bool enabled;
+    ProcessorStats &stats;
+protected:
+    StockProcessor(const string &name, int32_t stockpile_number, bool enabled, ProcessorStats &stats)
+            : name(name), stockpile_number(stockpile_number), enabled(enabled), stats(stats) { }
+public:
+    virtual bool is_designated(color_ostream &out, df::item *item) = 0;
+    virtual bool can_designate(color_ostream &out, df::item *item) = 0;
+    virtual bool designate(color_ostream &out, df::item *item) = 0;
+};
+
+class MeltStockProcessor : public StockProcessor {
+public:
+    MeltStockProcessor(int32_t stockpile_number, bool enabled, ProcessorStats &stats, bool melt_masterworks)
+            : StockProcessor("melt", stockpile_number, enabled, stats), melt_masterworks(melt_masterworks) { }
+
+    bool is_designated(color_ostream &out, df::item *item) override {
+        return item->flags.bits.melt;
+    }
+
+    bool can_designate(color_ostream &out, df::item *item) override {
+        MaterialInfo mat(item);
+        if (mat.getCraftClass() != df::craft_material_class::Metal)
+            return false;
+
+        if (item->getType() == df::item_type::BAR)
+            return false;
+
+        for (auto &g : item->general_refs) {
+            switch (g->getType()) {
+            case df::general_ref_type::CONTAINS_ITEM:
+            case df::general_ref_type::UNIT_HOLDER:
+            case df::general_ref_type::CONTAINS_UNIT:
+                return false;
+            case df::general_ref_type::CONTAINED_IN_ITEM:
+            {
+                df::item *c = g->getItem();
+                for (auto &gg : c->general_refs) {
+                    if (gg->getType() == df::general_ref_type::UNIT_HOLDER)
+                        return false;
+                }
+                break;
+            }
+            default:
+                break;
+            }
+        }
+
+        if (!melt_masterworks && item->getQuality() >= df::item_quality::Masterful)
+            return false;
+        if (item->flags.bits.artifact)
+            return false;
+
+        return true;
+    }
+
+    bool designate(color_ostream &out, df::item *item) override {
+        insert_into_vector(world->items.other.ANY_MELT_DESIGNATED, &df::item::id, item);
+        item->flags.bits.melt = 1;
+        return true;
+    }
+
+    private:
+    const bool melt_masterworks;
+};
+
+class TradeStockProcessor: public StockProcessor {
+public:
+    TradeStockProcessor(int32_t stockpile_number, bool enabled, ProcessorStats& stats)
+            : StockProcessor("trade", stockpile_number, enabled && get_active_trade_depot(), stats),
+              depot(get_active_trade_depot()) { }
+
+    bool is_designated(color_ostream& out, df::item* item) override {
+        auto ref = Items::getSpecificRef(item, df::specific_ref_type::JOB);
+        return ref && ref->data.job &&
+                ref->data.job->job_type == df::job_type::BringItemToDepot;
+    }
+
+    bool can_designate(color_ostream& out, df::item* item) override {
+        return Items::canTradeAnyWithContents(item);
+    }
+
+    bool designate(color_ostream& out, df::item* item) override {
+        if (!depot)
+            return false;
+        return Items::markForTrade(item, depot);
+    }
+
+private:
+    df::building_tradedepotst * const depot;
+
+    static df::building_tradedepotst * get_active_trade_depot() {
+        // at least one non-tribute caravan must be approaching or ready to trade
+        if (!plotinfo->caravans.size())
+            return NULL;
+        bool found = false;
+        for (auto caravan : plotinfo->caravans) {
+            if (caravan->flags.bits.tribute)
+                continue;
+            auto trade_state = caravan->trade_state;
+            auto time_remaining = caravan->time_remaining;
+            if ((trade_state == df::caravan_state::T_trade_state::Approaching ||
+                    trade_state == df::caravan_state::T_trade_state::AtDepot) && time_remaining != 0) {
+                found = true;
+                break;
+            }
+        }
+        if (!found)
+            return NULL;
+
+        // at least one trade depot must be ready to receive goods
+        for (auto bld : world->buildings.other.TRADE_DEPOT) {
+            if (bld->getBuildStage() < bld->getMaxBuildStage())
+                continue;
+
+            if (bld->jobs.size() == 1 &&
+                    bld->jobs[0]->job_type == df::job_type::DestroyBuilding)
+                continue;
+
+            return bld;
+        }
+        return NULL;
+    }
+};
+
+class DumpStockProcessor: public StockProcessor {
+public:
+    DumpStockProcessor(int32_t stockpile_number, bool enabled, ProcessorStats& stats)
+        : StockProcessor("dump", stockpile_number, enabled, stats) { }
+
+    bool is_designated(color_ostream& out, df::item* item) override {
+        return item->flags.bits.dump;
+    }
+
+    bool can_designate(color_ostream& out, df::item* item) override {
+        return true;
+    }
+
+    bool designate(color_ostream& out, df::item* item) override {
+        item->flags.bits.dump = true;
+        return true;
+     }
+};
+
+class TrainStockProcessor : public StockProcessor {
+public:
+    TrainStockProcessor(int32_t stockpile_number, bool enabled, ProcessorStats& stats)
+        : StockProcessor("train", stockpile_number, enabled, stats) {}
+
+    bool is_designated(color_ostream& out, df::item* item) override {
+        auto unit = get_caged_unit(item);
+        return unit && Units::isMarkedForTraining(unit);
+    }
+
+    bool can_designate(color_ostream& out, df::item* item) override {
+        auto unit = get_caged_unit(item);
+        return unit && !Units::isInvader(unit) &&
+            Units::isTamable(unit) && !Units::isTame(unit) &&
+            !Units::isMarkedForTraining(unit);
+    }
+
+    bool designate(color_ostream& out, df::item* item) override {
+        auto unit = get_caged_unit(item);
+        if (!unit)
+            return false;
+        df::training_assignment *assignment = new df::training_assignment();
+        assignment->animal_id = unit->id;
+        assignment->trainer_id = -1;
+        assignment->flags.bits.any_trainer = true;
+        insert_into_vector(df::global::plotinfo->equipment.training_assignments,
+            &df::training_assignment::animal_id, assignment);
+        return true;
+    }
+
+private:
+    static df::unit* get_caged_unit(df::item* item) {
+        if (item->getType() != df::item_type::CAGE)
+            return NULL;
+        auto gref = Items::getGeneralRef(item, df::general_ref_type::CONTAINS_UNIT);
+        if (!gref)
+            return NULL;
+        return gref->getUnit();
+    }
+};
+
+static const struct BadFlags {
+    const uint32_t whole;
+
+    BadFlags() : whole(get_bad_flags()) { }
+
+private:
+    uint32_t get_bad_flags() {
+        df::item_flags flags;
+        #define F(x) flags.bits.x = true;
+        F(forbid); F(garbage_collect); F(hostile); F(on_fire);
+        F(rotten); F(trader); F(in_building); F(construction);
+        F(artifact); F(spider_web); F(owned); F(in_job);
+        #undef F
+        return flags.whole;
+    }
+} bad_flags;
+
+static void scan_item(color_ostream &out, df::item *item, StockProcessor &processor) {
+    DEBUG(cycle,out).print("scan_item [%s] item_id=%d\n", processor.name.c_str(), item->id);
+
+    if (DBG_NAME(cycle).isEnabled(DebugCategory::LTRACE)) {
+        string name = "";
+        item->getItemDescription(&name, 0);
+        TRACE(cycle,out).print("item: %s\n", name.c_str());
+    }
+
+    if (item->flags.whole & bad_flags.whole) {
+        TRACE(cycle,out).print("rejected flag check\n");
+        return;
+    }
+
+    if (processor.is_designated(out, item)) {
+        TRACE(cycle,out).print("already designated\n");
+        ++processor.stats.designated_counts[processor.stockpile_number];
+        return;
+    }
+
+    if (!processor.can_designate(out, item)) {
+        TRACE(cycle,out).print("cannot designate\n");
+        return;
+    }
+
+    if (!processor.enabled) {
+        ++processor.stats.can_designate_counts[processor.stockpile_number];
+        return;
+    }
+
+    processor.designate(out, item);
+    ++processor.stats.newly_designated;
+    ++processor.stats.designated_counts[processor.stockpile_number];
+}
+
+static void scan_stockpile(color_ostream &out, df::building_stockpilest *bld,
+        MeltStockProcessor &melt_stock_processor,
+        TradeStockProcessor &trade_stock_processor,
+        DumpStockProcessor &dump_stock_processor,
+        TrainStockProcessor &train_stock_processor) {
+    auto id = bld->id;
+    Buildings::StockpileIterator items;
+    for (items.begin(bld); !items.done(); ++items) {
+        df::item *item = *items;
+        scan_item(out, item, trade_stock_processor);
+        if (0 == (item->flags.whole & bad_flags.whole) &&
+                item->isAssignedToThisStockpile(id)) {
+            TRACE(cycle,out).print("assignedToStockpile\n");
+            vector<df::item *> contents;
+            Items::getContainedItems(item, &contents);
+            for (df::item *contained_item : contents) {
+                scan_item(out, contained_item, melt_stock_processor);
+                scan_item(out, contained_item, dump_stock_processor);
+            }
+            continue;
+        }
+        scan_item(out, item, melt_stock_processor);
+        scan_item(out, item, dump_stock_processor);
+        scan_item(out, item, train_stock_processor);
+    }
+}
+
+static void do_cycle(color_ostream& out, int32_t& melt_count, int32_t& trade_count, int32_t& dump_count, int32_t& train_count) {
+    DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
+    cycle_timestamp = world->frame_counter;
+
+    ProcessorStats melt_stats, trade_stats, dump_stats, train_stats;
+    unordered_map<df::building_stockpilest *, PersistentDataItem> cache;
+    validate_stockpile_configs(out, cache);
+
+    for (auto &entry : cache) {
+        df::building_stockpilest *bld = entry.first;
+        PersistentDataItem &c = entry.second;
+        int32_t stockpile_number = bld->stockpile_number;
+
+        bool melt = get_config_bool(c, STOCKPILE_CONFIG_MELT);
+        bool melt_masterworks = get_config_bool(c, STOCKPILE_CONFIG_MELT_MASTERWORKS);
+        bool trade = get_config_bool(c, STOCKPILE_CONFIG_TRADE);
+        bool dump = get_config_bool(c, STOCKPILE_CONFIG_DUMP);
+        bool train = get_config_bool(c, STOCKPILE_CONFIG_TRAIN);
+
+        MeltStockProcessor melt_stock_processor(stockpile_number, melt, melt_stats, melt_masterworks);
+        TradeStockProcessor trade_stock_processor(stockpile_number, trade, trade_stats);
+        DumpStockProcessor dump_stock_processor(stockpile_number, dump, dump_stats);
+        TrainStockProcessor train_stock_processor(stockpile_number, train, train_stats);
+
+        scan_stockpile(out, bld, melt_stock_processor,
+                trade_stock_processor, dump_stock_processor, train_stock_processor);
+    }
+
+    melt_count = melt_stats.newly_designated;
+    trade_count = trade_stats.newly_designated;
+    dump_count = dump_stats.newly_designated;
+    TRACE(cycle,out).print("exit %s do_cycle\n", plugin_name);
+}
+
+/////////////////////////////////////////////////////
+// Lua API
+//
+
+static int logistics_getStockpileData(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering logistics_getStockpileData\n");
+
+    unordered_map<df::building_stockpilest *, PersistentDataItem> cache;
+    validate_stockpile_configs(*out, cache);
+
+    ProcessorStats melt_stats, trade_stats, dump_stats, train_stats;
+
+    for (auto bld : df::global::world->buildings.other.STOCKPILE) {
+        int32_t stockpile_number = bld->stockpile_number;
+        MeltStockProcessor melt_stock_processor(stockpile_number, false, melt_stats, false);
+        TradeStockProcessor trade_stock_processor(stockpile_number, false, trade_stats);
+        DumpStockProcessor dump_stock_processor(stockpile_number, false, dump_stats);
+        TrainStockProcessor train_stock_processor(stockpile_number, false, train_stats);
+
+        scan_stockpile(*out, bld, melt_stock_processor,
+                trade_stock_processor, dump_stock_processor, train_stock_processor);
+    }
+
+    unordered_map<string, StatMap> stats;
+    stats.emplace("melt_designated", melt_stats.designated_counts);
+    stats.emplace("melt_can_designate", melt_stats.can_designate_counts);
+    stats.emplace("trade_designated", trade_stats.designated_counts);
+    stats.emplace("trade_can_designate", trade_stats.can_designate_counts);
+    stats.emplace("dump_designated", dump_stats.designated_counts);
+    stats.emplace("dump_can_designate", dump_stats.can_designate_counts);
+    stats.emplace("train_designated", train_stats.designated_counts);
+    stats.emplace("train_can_designate", train_stats.can_designate_counts);
+    Lua::Push(L, stats);
+
+    unordered_map<int32_t, unordered_map<string, string>> configs;
+    for (auto &entry : cache) {
+        df::building_stockpilest *bld = entry.first;
+        PersistentDataItem &c = entry.second;
+
+        bool melt = get_config_bool(c, STOCKPILE_CONFIG_MELT);
+        bool melt_masterworks = get_config_bool(c, STOCKPILE_CONFIG_MELT_MASTERWORKS);
+        bool trade = get_config_bool(c, STOCKPILE_CONFIG_TRADE);
+        bool dump = get_config_bool(c, STOCKPILE_CONFIG_DUMP);
+        bool train = get_config_bool(c, STOCKPILE_CONFIG_TRAIN);
+
+        unordered_map<string, string> config;
+        config.emplace("melt", melt ? "true" : "false");
+        config.emplace("melt_masterworks", melt_masterworks ? "true" : "false");
+        config.emplace("trade", trade ? "true" : "false");
+        config.emplace("dump", dump ? "true" : "false");
+        config.emplace("train", train ? "true" : "false");
+
+        configs.emplace(bld->stockpile_number, config);
+    }
+    Lua::Push(L, configs);
+
+    TRACE(cycle, *out).print("exit logistics_getStockpileData\n");
+
+    return 2;
+}
+
+static void logistics_cycle(color_ostream &out) {
+    DEBUG(status, out).print("entering logistics_cycle\n");
+    int32_t melt_count = 0, trade_count = 0, dump_count = 0, train_count = 0;
+    do_cycle(out, melt_count, trade_count, dump_count, train_count);
+    out.print("logistics: marked %d item(s) for melting\n", melt_count);
+    out.print("logistics: marked %d item(s) for trading\n", trade_count);
+    out.print("logistics: marked %d item(s) for dumping\n", dump_count);
+    out.print("logistics: marked %d animal(s) for train\n", train_count);
+}
+
+static void find_stockpiles(lua_State *L, int idx,
+        vector<df::building_stockpilest*> &sps) {
+    if (lua_isnumber(L, idx)) {
+        sps.emplace_back(find_stockpile(lua_tointeger(L, -1)));
+        return;
+    }
+
+    const char * pname = lua_tostring(L, -1);
+    if (!pname || !*pname)
+        return;
+    string name(pname);
+    for (auto sp : world->buildings.other.STOCKPILE) {
+        if (name == sp->name)
+            sps.emplace_back(sp);
+    }
+}
+
+static unordered_map<string, int> get_stockpile_config(int32_t stockpile_number) {
+    unordered_map<string, int> stockpile_config;
+    stockpile_config.emplace("stockpile_number", stockpile_number);
+    if (watched_stockpiles.count(stockpile_number)) {
+        PersistentDataItem &c = watched_stockpiles[stockpile_number];
+        stockpile_config.emplace("melt", get_config_bool(c, STOCKPILE_CONFIG_MELT));
+        stockpile_config.emplace("melt_masterworks", get_config_bool(c, STOCKPILE_CONFIG_MELT_MASTERWORKS));
+        stockpile_config.emplace("trade", get_config_bool(c, STOCKPILE_CONFIG_TRADE));
+        stockpile_config.emplace("dump", get_config_bool(c, STOCKPILE_CONFIG_DUMP));
+        stockpile_config.emplace("train", get_config_bool(c, STOCKPILE_CONFIG_TRAIN));
+    } else {
+        stockpile_config.emplace("melt", false);
+        stockpile_config.emplace("melt_masterworks", false);
+        stockpile_config.emplace("trade", false);
+        stockpile_config.emplace("dump", false);
+        stockpile_config.emplace("train", false);
+    }
+    return stockpile_config;
+}
+
+static int logistics_getStockpileConfigs(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status, *out).print("entering logistics_getStockpileConfigs\n");
+
+    unordered_map<df::building_stockpilest*, PersistentDataItem> cache;
+    validate_stockpile_configs(*out, cache);
+
+    vector<df::building_stockpilest*> sps;
+    find_stockpiles(L, -1, sps);
+    if (sps.empty())
+        return 0;
+
+    vector<unordered_map<string, int>> configs;
+    for (auto sp : sps)
+        configs.emplace_back(get_stockpile_config(sp->stockpile_number));
+    Lua::PushVector(L, configs);
+    return 1;
+}
+
+static void logistics_setStockpileConfig(color_ostream& out, int stockpile_number, bool melt, bool trade, bool dump, bool train, bool melt_masterworks) {
+    DEBUG(status, out).print("entering logistics_setStockpileConfig stockpile_number=%d, melt=%d, trade=%d, dump=%d, train=%d, melt_masterworks=%d\n",
+        stockpile_number, melt, trade, dump, train, melt_masterworks);
+
+    if (!find_stockpile(stockpile_number)) {
+        out.printerr("invalid stockpile number: %d\n", stockpile_number);
+        return;
+    }
+
+    auto &c = ensure_stockpile_config(out, stockpile_number);
+    set_config_bool(c, STOCKPILE_CONFIG_MELT, melt);
+    set_config_bool(c, STOCKPILE_CONFIG_MELT_MASTERWORKS, melt_masterworks);
+    set_config_bool(c, STOCKPILE_CONFIG_TRADE, trade);
+    set_config_bool(c, STOCKPILE_CONFIG_DUMP, dump);
+    set_config_bool(c, STOCKPILE_CONFIG_TRAIN, train);
+}
+
+static int logistics_clearStockpileConfig(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status, *out).print("entering logistics_clearStockpileConfig\n");
+
+    vector<df::building_stockpilest*> sps;
+    find_stockpiles(L, -1, sps);
+    if (sps.empty())
+        return 0;
+
+    for (auto sp : sps)
+        remove_stockpile_config(*out, sp->stockpile_number);
+    return 0;
+}
+
+static void logistics_clearAllStockpileConfigs(color_ostream &out) {
+    DEBUG(status, out).print("entering logistics_clearAllStockpileConfigs\n");
+    for (auto &entry : watched_stockpiles)
+        World::DeletePersistentData(entry.second);
+    watched_stockpiles.clear();
+}
+
+static int logistics_getGlobalCounts(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(status,*out).print("entering logistics_getGlobalCounts\n");
+
+    size_t num_melt = df::global::world->items.other.ANY_MELT_DESIGNATED.size();
+
+    size_t num_trade = 0;
+    for (auto link = world->jobs.list.next; link; link = link->next) {
+        df::job *job = link->item;
+        if (job->job_type == df::job_type::BringItemToDepot)
+            ++num_trade;
+    }
+
+    size_t num_dump = 0;
+    for (auto item : world->items.other.IN_PLAY) {
+        if (item->flags.bits.dump)
+            ++num_dump;
+    }
+
+    size_t num_train = 0;
+    // TODO
+
+    unordered_map<string, size_t> results;
+    results.emplace("total_melt", num_melt);
+    results.emplace("total_trade", num_trade);
+    results.emplace("total_dump", num_dump);
+    results.emplace("total_train", num_train);
+    Lua::Push(L, results);
+
+    TRACE(cycle, *out).print("exit logistics_getGlobalCounts\n");
+
+    return 1;
+}
+
+DFHACK_PLUGIN_LUA_FUNCTIONS{
+    DFHACK_LUA_FUNCTION(logistics_cycle),
+    DFHACK_LUA_FUNCTION(logistics_setStockpileConfig),
+    DFHACK_LUA_FUNCTION(logistics_clearAllStockpileConfigs),
+    DFHACK_LUA_END};
+
+DFHACK_PLUGIN_LUA_COMMANDS{
+    DFHACK_LUA_COMMAND(logistics_getStockpileData),
+    DFHACK_LUA_COMMAND(logistics_getStockpileConfigs),
+    DFHACK_LUA_COMMAND(logistics_clearStockpileConfig),
+    DFHACK_LUA_COMMAND(logistics_getGlobalCounts),
+    DFHACK_LUA_END};
diff --git a/plugins/lua/autobutcher.lua b/plugins/lua/autobutcher.lua
index f357f8fb1..51417bf9f 100644
--- a/plugins/lua/autobutcher.lua
+++ b/plugins/lua/autobutcher.lua
@@ -19,7 +19,7 @@ end
 local function process_args(opts, args)
     if args[1] == 'help' then
         opts.help = true
-        return
+        return {}
     end
 
     return argparse.processArgsGetopt(args, {
@@ -67,7 +67,7 @@ function parse_commandline(opts, ...)
         process_races(opts, positionals, 6)
     elseif command == 'ticks' then
         local ticks = tonumber(positionals[2])
-        if not is_positive_int(arg) then
+        if not is_positive_int(ticks) then
             qerror('number of ticks must be a positive integer: ' .. ticks)
         else
             opts.ticks = ticks
diff --git a/plugins/lua/autochop.lua b/plugins/lua/autochop.lua
new file mode 100644
index 000000000..239db9ec8
--- /dev/null
+++ b/plugins/lua/autochop.lua
@@ -0,0 +1,120 @@
+local _ENV = mkmodule('plugins.autochop')
+
+local argparse = require('argparse')
+
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
+    end
+
+    return argparse.processArgsGetopt(args, {
+            {'h', 'help', handler=function() opts.help = true end},
+        })
+end
+
+function setTargets(max, min)
+    max = tonumber(max)
+    max = max and math.floor(max) or nil
+    if not max or max < 0 then
+        qerror('target maximum must be a non-negative integer')
+    end
+
+    min = tonumber(min)
+    min = min and math.floor(min) or nil
+    if min and (min < 0 or min > max) then
+        qerror('target minimum must be between 0 and the maximum, inclusive')
+    end
+    if not min then
+        min = math.floor(max * 0.8)
+    end
+    autochop_setTargets(max, min)
+end
+
+local function do_set_burrow_config(var_name, val, burrows)
+    for _,bspec in ipairs(argparse.stringList(burrows)) do
+        local config = autochop_getBurrowConfig(bspec)
+        config[var_name] = val
+        autochop_setBurrowConfig(config.id, config.chop, config.clearcut,
+                config.protect_brewable, config.protect_edible,
+                config.protect_cookable)
+    end
+end
+
+local function do_set_burrow_protect_config(types, val, burrows)
+    for _,tname in ipairs(argparse.stringList(types)) do
+        do_set_burrow_config('protect_'..tname, val, burrows)
+    end
+end
+
+function parse_commandline(...)
+    local args, opts = {...}, {}
+    local positionals = process_args(opts, args)
+
+    if opts.help or not positionals then
+        return false
+    end
+
+    local command = positionals[1]
+    if not command or command == 'status' then
+        autochop_printStatus()
+    elseif command == 'designate' then
+        autochop_designate()
+    elseif command == 'undesignate' then
+        autochop_undesignate()
+    elseif command == 'target' then
+        setTargets(args[2], args[3])
+    elseif command == 'chop' then
+        do_set_burrow_config('chop', true, args[2])
+    elseif command == 'nochop' then
+        do_set_burrow_config('chop', false, args[2])
+    elseif command == 'clearcut' or command == 'clear' then
+        do_set_burrow_config('clearcut', true, args[2])
+    elseif command == 'noclearcut' or command == 'noclear' then
+        do_set_burrow_config('clearcut', false, args[2])
+    elseif command == 'protect' then
+        do_set_burrow_protect_config(args[2], true, args[3])
+    elseif command == 'unprotect' or command == 'noprotect' then
+        do_set_burrow_protect_config(args[2], false, args[3])
+    else
+        return false
+    end
+
+    return true
+end
+
+-- used by gui/autochop
+function setBurrowConfig(config)
+    autochop_setBurrowConfig(config.id, config.chop, config.clearcut,
+            config.protect_brewable, config.protect_edible,
+            config.protect_cookable)
+end
+
+function getTreeCountsAndBurrowConfigs()
+    local data = {autochop_getTreeCountsAndBurrowConfigs()}
+    local ret = {}
+    ret.summary = table.remove(data, 1)
+    ret.tree_counts = table.remove(data, 1)
+    ret.designated_tree_counts = table.remove(data, 1)
+    local unparsed_burrow_configs = table.remove(data, 1)
+
+    ret.burrow_configs = {}
+    for idx,c in pairs(unparsed_burrow_configs) do
+        local burrow = df.burrow.find(c.id)
+        if not burrow then goto continue end
+        c.name = burrow.name
+        if #c.name == 0 then
+            c.name = ('Burrow %d'):format(c.id + 1)
+        end
+        c.chop = c.chop ~= 0
+        c.clearcut = c.clearcut ~= 0
+        c.protect_brewable = c.protect_brewable ~= 0
+        c.protect_edible = c.protect_edible ~= 0
+        c.protect_cookable = c.protect_cookable ~= 0
+        table.insert(ret.burrow_configs, c)
+        ::continue::
+    end
+    return ret
+end
+
+return _ENV
diff --git a/plugins/lua/autolabor.lua b/plugins/lua/autolabor.lua
new file mode 100644
index 000000000..a2c0e88cd
--- /dev/null
+++ b/plugins/lua/autolabor.lua
@@ -0,0 +1,51 @@
+local _ENV = mkmodule('plugins.autolabor')
+
+local gui = require('gui')
+local overlay = require('plugins.overlay')
+local widgets = require('gui.widgets')
+
+AutolaborOverlay = defclass(AutolaborOverlay, overlay.OverlayWidget)
+AutolaborOverlay.ATTRS{
+    default_pos={x=7,y=-13},
+    default_enabled=true,
+    viewscreens='dwarfmode/Info/LABOR/WORK_DETAILS',
+    frame={w=29, h=5},
+    frame_style=gui.MEDIUM_FRAME,
+    frame_background=gui.CLEAR_PEN,
+}
+
+function AutolaborOverlay:init()
+    self:addviews{
+        widgets.Label{
+            frame={t=0, l=0},
+            text_pen=COLOR_LIGHTRED,
+            text='DFHack autolabor is active!',
+            visible=isEnabled,
+        },
+        widgets.Label{
+            frame={t=0, l=0},
+            text_pen=COLOR_LIGHTRED,
+            text='Dwarf Therapist is active!',
+            visible=function() return not isEnabled() end,
+        },
+        widgets.Label{
+            frame={t=1, l=0},
+            text_pen=COLOR_WHITE,
+            text={
+                'Any changes made on this', NEWLINE,
+                'screen will have no effect.'
+            },
+        },
+    }
+end
+
+function AutolaborOverlay:render(dc)
+    if df.global.game.external_flag ~= 1 then return end
+    AutolaborOverlay.super.render(self, dc)
+end
+
+OVERLAY_WIDGETS = {
+    overlay=AutolaborOverlay,
+}
+
+return _ENV
diff --git a/plugins/lua/automaterial.lua b/plugins/lua/automaterial.lua
deleted file mode 100644
index 1cd7e9faf..000000000
--- a/plugins/lua/automaterial.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local _ENV = mkmodule('plugins.automaterial')
-
-local buildingplan = require('plugins.buildingplan')
-
--- construct the building and register it with buildingplan for item selection
-function build_with_buildingplan_box_select(subtype, x, y, z)
-    local pos = xyz2pos(x, y, z)
-    local bld, err = dfhack.buildings.constructBuilding{
-            type=df.building_type.Construction, subtype=subtype, pos=pos}
-    -- it's not a user error if we can't place a building here; just indicate
-    -- that no building was placed by returning false.
-    if err then return false end
-    buildingplan.addPlannedBuilding(bld)
-    return true
-end
-
-function build_with_buildingplan_ui()
-    for _,bld in ipairs(buildingplan.construct_buildings_from_ui_state()) do
-        buildingplan.addPlannedBuilding(bld)
-    end
-end
-
-return _ENV
diff --git a/plugins/lua/blueprint.lua b/plugins/lua/blueprint.lua
index 718b211e8..6aa154d2d 100644
--- a/plugins/lua/blueprint.lua
+++ b/plugins/lua/blueprint.lua
@@ -9,17 +9,17 @@ local valid_phase_list = {
     'construct',
     'build',
     'place',
-    'zone',
-    'query',
-    'rooms',
+    -- 'zone',
+    -- 'query',
+    -- 'rooms',
 }
 valid_phases = utils.invert(valid_phase_list)
 
 local meta_phase_list = {
     'build',
     'place',
-    'zone',
-    'query',
+    -- 'zone',
+    -- 'query',
 }
 meta_phases = utils.invert(meta_phase_list)
 
@@ -167,7 +167,7 @@ end
 
 function parse_commandline(opts, ...)
     local positionals = process_args(opts, {...})
-    if opts.help then return end
+    if not positionals or opts.help then return end
 
     local width, height = tonumber(positionals[1]), tonumber(positionals[2])
     if is_bad_dim(width) or is_bad_dim(height) then
@@ -206,8 +206,8 @@ end
 
 -- returns the name of the output file for the given context
 function get_filename(opts, phase, ordinal)
-    local fullname = 'blueprints/' .. opts.name
-    local _,_,basename = fullname:find('/([^/]+)/?$')
+    local fullname = 'dfhack-config/blueprints/' .. opts.name
+    local _,_,basename = opts.name:find('([^/]+)/*$')
     if not basename then
         -- should not happen since opts.name should already be validated
         error(('could not parse basename out of "%s"'):format(fullname))
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 43122a7da..7e034b988 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -2,10 +2,8 @@ local _ENV = mkmodule('plugins.buildingplan')
 
 --[[
 
- Native functions:
+ Public native functions:
 
- * void setSetting(string name, boolean value)
- * bool isPlanModeEnabled(df::building_type type, int16_t subtype, int32_t custom)
  * bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)
  * bool isPlannedBuilding(df::building *bld)
  * void addPlannedBuilding(df::building *bld)
@@ -14,249 +12,137 @@ local _ENV = mkmodule('plugins.buildingplan')
 
 --]]
 
-local dialogs = require('gui.dialogs')
-local guidm = require('gui.dwarfmode')
+local argparse = require('argparse')
+local inspector = require('plugins.buildingplan.inspectoroverlay')
+local mechanisms = require('plugins.buildingplan.mechanisms')
+local pens = require('plugins.buildingplan.pens')
+local planner = require('plugins.buildingplan.planneroverlay')
 require('dfhack.buildings')
 
--- does not need the core suspended
-function get_num_filters(btype, subtype, custom)
-    local filters = dfhack.buildings.getFiltersByType(
-        {}, btype, subtype, custom)
-    if filters then return #filters end
-    return 0
-end
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
+    end
 
-local function to_title_case(str)
-    str = str:gsub('(%a)([%w_]*)',
-        function (first, rest) return first:upper()..rest:lower() end)
-    str = str:gsub('_', ' ')
-    return str
+    return argparse.processArgsGetopt(args, {
+            {'h', 'help', handler=function() opts.help = true end},
+        })
 end
 
-local function get_filter(btype, subtype, custom, reverse_idx)
-    local filters = dfhack.buildings.getFiltersByType(
-        {}, btype, subtype, custom)
-    if not filters or reverse_idx < 0 or reverse_idx >= #filters then
-        error(string.format('invalid index: %d', reverse_idx))
-    end
-    return filters[#filters-reverse_idx]
-end
+function parse_commandline(...)
+    local args, opts = {...}, {}
+    local positionals = process_args(opts, args)
 
--- returns a reasonable label for the item based on the qualities of the filter
--- does not need the core suspended
--- reverse_idx is 0-based and is expected to be counted from the *last* filter
-function get_item_label(btype, subtype, custom, reverse_idx)
-    local filter = get_filter(btype, subtype, custom, reverse_idx)
-    if filter.has_tool_use then
-        return to_title_case(df.tool_uses[filter.has_tool_use])
+    if opts.help then
+        return false
     end
-    if filter.item_type then
-        return to_title_case(df.item_type[filter.item_type])
-    end
-    if filter.flags2 and filter.flags2.building_material then
-        if filter.flags2.fire_safe then
-            return "Fire-safe building material";
-        end
-        if filter.flags2.magma_safe then
-            return "Magma-safe building material";
-        end
-        return "Generic building material";
-    end
-    if filter.vector_id then
-        return to_title_case(df.job_item_vector_id[filter.vector_id])
-    end
-    return "Unknown";
-end
 
--- returns whether the items matched by the specified filter can have a quality
--- rating. This also conveniently indicates whether an item can be decorated.
--- does not need the core suspended
--- reverse_idx is 0-based and is expected to be counted from the *last* filter
-function item_can_be_improved(btype, subtype, custom, reverse_idx)
-    local filter = get_filter(btype, subtype, custom, reverse_idx)
-    if filter.flags2 and filter.flags2.building_material then
-        return false;
+    local command = table.remove(positionals, 1)
+    if not command or command == 'status' then
+        printStatus()
+    elseif command == 'set' and positionals then
+        setSetting(positionals[1], positionals[2] == 'true')
+    elseif command == 'reset' then
+        resetFilters()
+    else
+        return false
     end
-    return filter.item_type ~= df.item_type.WOOD and
-            filter.item_type ~= df.item_type.BLOCKS and
-            filter.item_type ~= df.item_type.BAR and
-            filter.item_type ~= df.item_type.BOULDER
-end
 
--- needs the core suspended
--- returns a vector of constructed buildings (usually of size 1, but potentially
--- more for constructions)
-function construct_buildings_from_ui_state()
-    local uibs = df.global.ui_build_selector
-    local world = df.global.world
-    local direction = world.selected_direction
-    local _, width, height = dfhack.buildings.getCorrectSize(
-        world.building_width, world.building_height, uibs.building_type,
-        uibs.building_subtype, uibs.custom_type, direction)
-    -- the cursor is at the center of the building; we need the upper-left
-    -- corner of the building
-    local pos = guidm.getCursorPos()
-    pos.x = pos.x - math.floor(width/2)
-    pos.y = pos.y - math.floor(height/2)
-    local min_x, max_x = pos.x, pos.x
-    local min_y, max_y = pos.y, pos.y
-    if width == 1 and height == 1 and
-            (world.building_width > 1 or world.building_height > 1) then
-        min_x = math.ceil(pos.x - world.building_width/2)
-        max_x = min_x + world.building_width - 1
-        min_y = math.ceil(pos.y - world.building_height/2)
-        max_y = min_y + world.building_height - 1
-    end
-    local blds = {}
-    for y=min_y,max_y do for x=min_x,max_x do
-        local bld, err = dfhack.buildings.constructBuilding{
-            type=uibs.building_type, subtype=uibs.building_subtype,
-            custom=uibs.custom_type, pos=xyz2pos(x, y, pos.z),
-            width=width, height=height, direction=direction}
-        if err then
-            for _,b in ipairs(blds) do
-                dfhack.buildings.deconstruct(b)
-            end
-            error(err)
-        end
-        -- assign fields for the types that need them. we can't pass them all in
-        -- to the call to constructBuilding since attempting to assign unrelated
-        -- fields to building types that don't support them causes errors.
-        for k,v in pairs(bld) do
-            if k == 'friction' then bld.friction = uibs.friction end
-            if k == 'use_dump' then bld.use_dump = uibs.use_dump end
-            if k == 'dump_x_shift' then bld.dump_x_shift = uibs.dump_x_shift end
-            if k == 'dump_y_shift' then bld.dump_y_shift = uibs.dump_y_shift end
-            if k == 'speed' then bld.speed = uibs.speed end
-        end
-        table.insert(blds, bld)
-    end end
-    return blds
+    return true
 end
 
---
--- GlobalSettings dialog
---
-
-local GlobalSettings = defclass(GlobalSettings, dialogs.MessageBox)
-GlobalSettings.focus_path = 'buildingplan_globalsettings'
-
-GlobalSettings.ATTRS{
-    settings = {}
-}
-
-function GlobalSettings:onDismiss()
-    for k,v in pairs(self.settings) do
-        -- call back into C++ to save changes
-        setSetting(k, v)
-    end
+function is_suspendmanager_enabled()
+    local ok, sm = pcall(reqscript, 'suspendmanager')
+    return ok and sm.isEnabled()
 end
 
--- does not need the core suspended.
-function show_global_settings_dialog(settings)
-    GlobalSettings{
-        frame_title="Buildingplan Global Settings",
-        settings=settings,
-    }:show()
+function get_num_filters(btype, subtype, custom)
+    local filters = dfhack.buildings.getFiltersByType({}, btype, subtype, custom)
+    return filters and #filters or 0
 end
 
-function GlobalSettings:toggle_setting(name)
-    self.settings[name] = not self.settings[name]
+function get_job_item(btype, subtype, custom, index)
+    local filters = dfhack.buildings.getFiltersByType({}, btype, subtype, custom)
+    if not filters or not filters[index] then return nil end
+    local obj = df.job_item:new()
+    obj:assign(filters[index])
+    return obj
 end
 
-function GlobalSettings:get_setting_string(name)
-    if self.settings[name] then return 'On' end
-    return 'Off'
+local function to_title_case(str)
+    str = str:gsub('(%a)([%w_]*)',
+        function (first, rest) return first:upper()..rest:lower() end)
+    str = str:gsub('_', ' ')
+    return str
 end
 
-function GlobalSettings:get_setting_pen(name)
-    if self.settings[name] then return COLOR_LIGHTGREEN end
-    return COLOR_LIGHTRED
-end
+function get_desc(filter)
+    local desc = 'Unknown'
+    if filter.has_tool_use and filter.has_tool_use > -1 then
+        desc = to_title_case(df.tool_uses[filter.has_tool_use])
+    elseif filter.flags2 and filter.flags2.screw then
+        desc = 'Screw'
+    elseif filter.item_type and filter.item_type > -1 then
+        desc = to_title_case(df.item_type[filter.item_type])
+    elseif filter.vector_id and filter.vector_id > -1 then
+        desc = to_title_case(df.job_item_vector_id[filter.vector_id])
+    elseif filter.flags2 and filter.flags2.building_material then
+        if filter.flags2.magma_safe then
+            desc = 'Magma-safe material'
+        elseif filter.flags2.fire_safe then
+            desc = 'Fire-safe material'
+        else
+            desc = 'Building material'
+        end
+    end
 
-function GlobalSettings:is_setting_enabled(name)
-    return self.settings[name]
-end
+    if desc:endswith('s') then
+        desc = desc:sub(1,-2)
+    end
+    if desc == 'Trappart' then
+        desc = 'Mechanism'
+    elseif desc == 'Wood' then
+        desc = 'Log'
+    elseif desc == 'Any weapon' then
+        desc = 'Weapon'
+    elseif desc == 'Any spike' then
+        desc = 'Spike'
+    elseif desc == 'Ballistapart' then
+        desc = 'Ballista part'
+    elseif desc == 'Catapultpart' then
+        desc = 'Catapult part'
+    elseif desc == 'Smallgem' then
+        desc = 'Small, cut gem'
+    end
 
-function GlobalSettings:make_setting_label_token(text, key, name, width)
-    return {text=text, key=key, key_sep=': ', key_pen=COLOR_LIGHTGREEN,
-            on_activate=self:callback('toggle_setting', name), width=width}
+    return desc
 end
 
-function GlobalSettings:make_setting_value_token(name)
-    return {text=self:callback('get_setting_string', name),
-            enabled=self:callback('is_setting_enabled', name),
-            pen=self:callback('get_setting_pen', name),
-            dpen=COLOR_GRAY}
+function reload_pens()
+    pens.reload_pens()
 end
 
--- mockup:
---[[
-                          Buildingplan Global Settings
-
-  e: Enable all: Off
-    Enables buildingplan for all building types. Use this to avoid having to
-    manually enable buildingplan for each building type that you want to plan.
-    Note that DFHack quickfort will use buildingplan to manage buildings
-    regardless of whether buildingplan is "enabled" for the building type.
-
-  Allowed types for generic, fire-safe, and magma-safe building material:
-  b: Blocks:   On
-  s: Boulders: On
-  w: Wood:     On
-  r: Bars:     Off
-    Changes to these settings will be applied to newly-planned buildings.
-
-  A: Apply building material filter settings to existing planned buildings
-    Use this if your planned buildings can't be completed because the settings
-    above were too restrictive when the buildings were originally planned.
-
-  M: Edit list of materials to avoid
-  potash
-  pearlash
-  ash
-  coal
-    Buildingplan will avoid using these material types when a planned building's
-    material filter is set to 'any'. They can stil be matched when they are
-    explicitly allowed by a planned building's material filter. Changes to this
-    list take effect for existing buildings immediately.
-
-  g: Allow bags: Off
-    This allows bags to be placed where a 'coffer' is planned.
-
-  f: Legacy Quickfort Mode: Off
-    Compatibility mode for the legacy Python-based Quickfort application. This
-    setting is not needed for DFHack quickfort.
---]]
-function GlobalSettings:init()
+function signal_reset()
+    planner.reset_counts_flag = true
+    inspector.reset_inspector_flag = true
+end
 
-    self.subviews.label:setText{
-        self:make_setting_label_token('Enable all', 'CUSTOM_E', 'all_enabled', 12),
-            self:make_setting_value_token('all_enabled'), '\n',
-        '  Enables buildingplan for all building types. Use this to avoid having\n',
-        '  to manually enable buildingplan for each building type that you want\n',
-        '  to plan. Note that DFHack quickfort will use buildingplan to manage\n',
-        '  buildings regardless of whether buildingplan is "enabled" for the\n',
-        '  building type.\n',
-        '\n',
-        'Allowed types for generic, fire-safe, and magma-safe building material:\n',
-        self:make_setting_label_token('Blocks', 'CUSTOM_B', 'blocks', 10),
-            self:make_setting_value_token('blocks'), '\n',
-        self:make_setting_label_token('Boulders', 'CUSTOM_S', 'boulders', 10),
-            self:make_setting_value_token('boulders'), '\n',
-        self:make_setting_label_token('Wood', 'CUSTOM_W', 'logs', 10),
-            self:make_setting_value_token('logs'), '\n',
-        self:make_setting_label_token('Bars', 'CUSTOM_R', 'bars', 10),
-            self:make_setting_value_token('bars'), '\n',
-        '  Changes to these settings will be applied to newly-planned buildings.\n',
-        '  If no types are enabled above, then any building material is allowed.\n',
-        '\n',
-        self:make_setting_label_token('Legacy Quickfort Mode', 'CUSTOM_F',
-                                      'quickfort_mode', 23),
-            self:make_setting_value_token('quickfort_mode'), '\n',
-        '  Compatibility mode for the legacy Python-based Quickfort application.\n',
-        '  This setting is not needed for DFHack quickfort.'
-    }
+-- for use during development to reload all buildingplan modules
+function reload_modules()
+    reload('plugins.buildingplan.pens')
+    reload('plugins.buildingplan.filterselection')
+    reload('plugins.buildingplan.itemselection')
+    reload('plugins.buildingplan.planneroverlay')
+    reload('plugins.buildingplan.inspectoroverlay')
+    reload('plugins.buildingplan.mechanisms')
+    reload('plugins.buildingplan')
 end
 
+OVERLAY_WIDGETS = {
+    planner=planner.PlannerOverlay,
+    inspector=inspector.InspectorOverlay,
+    mechanisms=mechanisms.MechanismOverlay,
+}
+
 return _ENV
diff --git a/plugins/lua/buildingplan/filterselection.lua b/plugins/lua/buildingplan/filterselection.lua
new file mode 100644
index 000000000..e25b58eec
--- /dev/null
+++ b/plugins/lua/buildingplan/filterselection.lua
@@ -0,0 +1,608 @@
+local _ENV = mkmodule('plugins.buildingplan.filterselection')
+
+local gui = require('gui')
+local pens = require('plugins.buildingplan.pens')
+local widgets = require('gui.widgets')
+
+local uibs = df.global.buildreq
+local to_pen = dfhack.pen.parse
+
+local function get_cur_filters()
+    return dfhack.buildings.getFiltersByType({}, uibs.building_type,
+            uibs.building_subtype, uibs.custom_type)
+end
+
+--------------------------------
+-- QualityAndMaterialsPage
+--
+
+QualityAndMaterialsPage = defclass(QualityAndMaterialsPage, widgets.Panel)
+QualityAndMaterialsPage.ATTRS{
+    frame={t=0, l=0},
+    index=DEFAULT_NIL,
+    desc=DEFAULT_NIL,
+}
+
+local TYPE_COL_WIDTH = 20
+local HEADER_HEIGHT = 7
+local QUALITY_HEIGHT = 9
+local FOOTER_HEIGHT = 4
+
+-- returns whether the items matched by the specified filter can have a quality
+-- rating. This also conveniently indicates whether an item can be decorated.
+local function can_be_improved(idx)
+    local filter = get_cur_filters()[idx]
+    if filter.flags2 and filter.flags2.building_material then
+        return false;
+    end
+    return filter.item_type ~= df.item_type.WOOD and
+            filter.item_type ~= df.item_type.BLOCKS and
+            filter.item_type ~= df.item_type.BAR and
+            filter.item_type ~= df.item_type.BOULDER
+end
+
+local function mat_sort_by_name(a, b)
+    return a.name < b.name
+end
+
+local function mat_sort_by_quantity(a, b)
+    return a.quantity > b.quantity or
+            (a.quantity == b.quantity and mat_sort_by_name(a, b))
+end
+
+function QualityAndMaterialsPage:init()
+    self.dirty = true
+    self.summary = ''
+
+    local enable_item_quality = can_be_improved(self.index)
+
+    self:addviews{
+        widgets.Panel{
+            view_id='header',
+            frame={l=0, t=0, h=HEADER_HEIGHT, r=0},
+            frame_inset={l=1},
+            subviews={
+                widgets.Label{
+                    frame={l=0, t=0},
+                    text='Current filter:',
+                },
+                widgets.WrappedLabel{
+                    frame={l=16, t=0, h=2, r=0},
+                    text_pen=COLOR_LIGHTCYAN,
+                    text_to_wrap=function() return self.summary end,
+                    auto_height=false,
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='mat_sort',
+                    frame={l=0, t=3, w=21},
+                    label='Sort by:',
+                    key='CUSTOM_SHIFT_R',
+                    options={
+                        {label='name', value=mat_sort_by_name},
+                        {label='available', value=mat_sort_by_quantity}
+                    },
+                    on_change=function() self.dirty = true end,
+                },
+                widgets.ToggleHotkeyLabel{
+                    view_id='hide_zero',
+                    frame={l=0, t=4, w=24},
+                    label='Hide unavailable:',
+                    key='CUSTOM_SHIFT_H',
+                    initial_option=false,
+                    on_change=function() self.dirty = true end,
+                },
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=26, t=3},
+                    label_text='Search: ',
+                    on_char=function(ch) return ch:match('[%l -]') end,
+                },
+                widgets.Label{
+                    frame={l=1, b=0},
+                    text='Type',
+                    text_pen=COLOR_LIGHTRED,
+                },
+                widgets.Label{
+                    frame={l=TYPE_COL_WIDTH, b=0},
+                    text='Material',
+                    text_pen=COLOR_LIGHTRED,
+                },
+            },
+        },
+        widgets.Panel{
+            view_id='materials_lists',
+            frame={l=0, t=HEADER_HEIGHT, r=0, b=FOOTER_HEIGHT+QUALITY_HEIGHT},
+            frame_style=gui.INTERIOR_FRAME,
+            subviews={
+                widgets.List{
+                    view_id='materials_categories',
+                    frame={l=1, t=0, b=0, w=TYPE_COL_WIDTH-3},
+                    scroll_keys={},
+                    icon_width=2,
+                    cursor_pen=COLOR_CYAN,
+                    on_submit=self:callback('toggle_category'),
+                },
+                widgets.FilteredList{
+                    view_id='materials_mats',
+                    frame={l=TYPE_COL_WIDTH, t=0, r=0, b=0},
+                    icon_width=2,
+                    on_submit=self:callback('toggle_material'),
+                },
+            },
+        },
+        widgets.Panel{
+            view_id='divider',
+            frame={l=TYPE_COL_WIDTH-1, t=HEADER_HEIGHT, b=FOOTER_HEIGHT+QUALITY_HEIGHT, w=1},
+            on_render=self:callback('draw_divider'),
+        },
+        widgets.Panel{
+            view_id='quality_panel',
+            frame={l=0, r=0, h=QUALITY_HEIGHT, b=FOOTER_HEIGHT},
+            frame_style=gui.INTERIOR_FRAME,
+            frame_title='Item quality',
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='decorated',
+                    frame={l=0, t=1, w=23},
+                    key='CUSTOM_SHIFT_D',
+                    label='Decorated only:',
+                    options={
+                        {label='No', value=false},
+                        {label='Yes', value=true},
+                    },
+                    enabled=enable_item_quality,
+                    on_change=self:callback('set_decorated'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='min_quality',
+                    frame={l=0, t=3, w=18},
+                    label='Min quality:',
+                    label_below=true,
+                    key_back='CUSTOM_SHIFT_Z',
+                    key='CUSTOM_SHIFT_X',
+                    options={
+                        {label='Ordinary', value=0},
+                        {label='Well Crafted', value=1},
+                        {label='Finely Crafted', value=2},
+                        {label='Superior', value=3},
+                        {label='Exceptional', value=4},
+                        {label='Masterful', value=5},
+                        {label='Artifact', value=6},
+                    },
+                    enabled=enable_item_quality,
+                    on_change=function(val) self:set_min_quality(val+1) end,
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='max_quality',
+                    frame={r=1, t=3, w=18},
+                    label='Max quality:',
+                    label_below=true,
+                    key_back='CUSTOM_SHIFT_Q',
+                    key='CUSTOM_SHIFT_W',
+                    options={
+                        {label='Ordinary', value=0},
+                        {label='Well Crafted', value=1},
+                        {label='Finely Crafted', value=2},
+                        {label='Superior', value=3},
+                        {label='Exceptional', value=4},
+                        {label='Masterful', value=5},
+                        {label='Artifact', value=6},
+                    },
+                    enabled=enable_item_quality,
+                    on_change=function(val) self:set_max_quality(val+1) end,
+                },
+                widgets.RangeSlider{
+                    frame={l=0, t=6},
+                    num_stops=7,
+                    get_left_idx_fn=function()
+                        return self.subviews.min_quality:getOptionValue() + 1
+                    end,
+                    get_right_idx_fn=function()
+                        return self.subviews.max_quality:getOptionValue() + 1
+                    end,
+                    on_left_change=self:callback('set_min_quality'),
+                    on_right_change=self:callback('set_max_quality'),
+                    active=enable_item_quality,
+                },
+            },
+        },
+        widgets.Panel{
+            view_id='footer',
+            frame={l=0, r=0, b=0, h=FOOTER_HEIGHT},
+            frame_inset={t=1, l=1},
+            subviews={
+                widgets.HotkeyLabel{
+                    frame={l=0, t=0},
+                    label='Toggle',
+                    auto_width=true,
+                    key='SELECT',
+                },
+                widgets.HotkeyLabel{
+                    frame={l=0, t=2},
+                    label='Done',
+                    auto_width=true,
+                    key='LEAVESCREEN',
+                },
+                widgets.HotkeyLabel{
+                    frame={l=30, t=0},
+                    label='Invert selection',
+                    auto_width=true,
+                    key='CUSTOM_SHIFT_I',
+                    on_activate=self:callback('invert_materials'),
+                },
+                widgets.HotkeyLabel{
+                    frame={l=30, t=2},
+                    label='Reset filter',
+                    auto_width=true,
+                    key='CUSTOM_SHIFT_X',
+                    on_activate=self:callback('clear_filter'),
+                },
+            },
+        }
+    }
+
+    -- replace the FilteredList's built-in EditField with our own
+    self.subviews.materials_mats.list.frame.t = 0
+    self.subviews.materials_mats.edit.visible = false
+    self.subviews.materials_mats.edit = self.subviews.search
+    self.subviews.search.on_change = self.subviews.materials_mats:callback('onFilterChange')
+end
+
+local MAT_ENABLED_PEN = to_pen{ch=string.char(251), fg=COLOR_LIGHTGREEN}
+local MAT_DISABLED_PEN = to_pen{ch='x', fg=COLOR_RED}
+
+local function make_cat_choice(label, cat, key, cats)
+    local enabled = cats[cat]
+    local icon = nil
+    if not cats.unset then
+        icon = enabled and MAT_ENABLED_PEN or MAT_DISABLED_PEN
+    end
+    return {
+        text=label,
+        key=key,
+        enabled=enabled,
+        cat=cat,
+        icon=icon,
+    }
+end
+
+local function make_mat_choice(name, props, enabled, cats)
+    local quantity = tonumber(props.count)
+    local text = ('%5d - %s'):format(quantity, name)
+    local icon = nil
+    if not cats.unset then
+        icon = enabled and MAT_ENABLED_PEN or MAT_DISABLED_PEN
+    end
+    return {
+        text=text,
+        enabled=enabled,
+        icon=icon,
+        name=name,
+        cat=props.category,
+        quantity=quantity,
+    }
+end
+
+function QualityAndMaterialsPage:refresh()
+    local summary = self.desc
+    local subviews = self.subviews
+
+    local buildingplan = require('plugins.buildingplan')
+
+    local heat = buildingplan.getHeatSafetyFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type)
+    if heat >= 2 then summary = 'Magma safe ' .. summary
+    elseif heat == 1 then summary = 'Fire safe ' .. summary
+    else summary = 'Any ' .. summary
+    end
+
+    local specials = buildingplan.getSpecials(uibs.building_type, uibs.building_subtype, uibs.custom_type)
+    if next(specials) then
+        local specials_list = {}
+        for special in pairs(specials) do
+            table.insert(specials_list, special)
+        end
+        summary = summary .. ' [' .. table.concat(specials_list, ', ') .. ']'
+    end
+
+    local quality = buildingplan.getQualityFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1)
+    subviews.decorated:setOption(quality.decorated ~= 0)
+    subviews.min_quality:setOption(quality.min_quality)
+    subviews.max_quality:setOption(quality.max_quality)
+
+    local cats = buildingplan.getMaterialMaskFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1)
+    local category_choices={
+        make_cat_choice('Stone', 'stone', 'CUSTOM_SHIFT_S', cats),
+        make_cat_choice('Wood', 'wood', 'CUSTOM_SHIFT_O', cats),
+        make_cat_choice('Metal', 'metal', 'CUSTOM_SHIFT_M', cats),
+        make_cat_choice('Glass', 'glass', 'CUSTOM_SHIFT_G', cats),
+        make_cat_choice('Gem', 'gem', 'CUSTOM_SHIFT_E', cats),
+        make_cat_choice('Clay', 'clay', 'CUSTOM_SHIFT_C', cats),
+        make_cat_choice('Cloth', 'cloth', 'CUSTOM_SHIFT_L', cats),
+        make_cat_choice('Silk', 'silk', 'CUSTOM_SHIFT_K', cats),
+        make_cat_choice('Yarn', 'yarn', 'CUSTOM_SHIFT_Y', cats),
+    }
+    self.subviews.materials_categories:setChoices(category_choices)
+
+    local mats = buildingplan.getMaterialFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1)
+    local mat_choices = {}
+    local hide_zero = self.subviews.hide_zero:getOptionValue()
+    local enabled_mat_names = {}
+    for name,props in pairs(mats) do
+        local enabled = props.enabled == 'true' and cats[props.category]
+        if not cats.unset and enabled then
+            table.insert(enabled_mat_names, name)
+        end
+        if not hide_zero or tonumber(props.count) > 0 then
+            table.insert(mat_choices, make_mat_choice(name, props, enabled, cats))
+        end
+    end
+    table.sort(mat_choices, self.subviews.mat_sort:getOptionValue())
+
+    local prev_filter = self.subviews.search.text
+    self.subviews.materials_mats:setChoices(mat_choices)
+    self.subviews.materials_mats:setFilter(prev_filter)
+
+    if #enabled_mat_names > 0 then
+        table.sort(enabled_mat_names)
+        summary = summary .. (' of %s'):format(table.concat(enabled_mat_names, ', '))
+    end
+
+    self.summary = summary
+    self.dirty = false
+    self:updateLayout()
+end
+
+function QualityAndMaterialsPage:toggle_category(_, choice)
+    local cats = {}
+    if not choice.icon then
+        -- toggling from unset to something is set
+        table.insert(cats, choice.cat)
+    else
+        choice.enabled = not choice.enabled
+        for _,c in ipairs(self.subviews.materials_categories:getChoices()) do
+            if c.enabled then
+                table.insert(cats, c.cat)
+            end
+        end
+    end
+    require('plugins.buildingplan').setMaterialMaskFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1, cats)
+    self.dirty = true
+end
+
+function QualityAndMaterialsPage:toggle_material(_, choice)
+    local mats = {}
+    if not choice.icon then
+        -- toggling from unset to something is set
+        table.insert(mats, choice.name)
+    else
+        for _,c in ipairs(self.subviews.materials_mats:getChoices()) do
+            local enabled = c.enabled
+            if choice.name == c.name then
+                enabled = not c.enabled
+            end
+            if enabled then
+                table.insert(mats, c.name)
+            end
+        end
+    end
+    require('plugins.buildingplan').setMaterialFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1, mats)
+    self.dirty = true
+end
+
+function QualityAndMaterialsPage:invert_materials()
+    local mats = {}
+    for _,c in ipairs(self.subviews.materials_mats:getChoices()) do
+        if not c.icon then return end
+        if not c.enabled then
+            table.insert(mats, c.name)
+        end
+    end
+    require('plugins.buildingplan').setMaterialFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1, mats)
+    self.dirty = true
+end
+
+function QualityAndMaterialsPage:clear_filter()
+    require('plugins.buildingplan').clearFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1)
+    self.dirty = true
+end
+
+function QualityAndMaterialsPage:set_decorated(decorated)
+    local subviews = self.subviews
+    require('plugins.buildingplan').setQualityFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1,
+            decorated and 1 or 0, subviews.min_quality:getOptionValue(), subviews.max_quality:getOptionValue())
+    self.dirty = true
+end
+
+function QualityAndMaterialsPage:set_min_quality(idx)
+    idx = math.min(6, math.max(0, idx-1))
+    local subviews = self.subviews
+    subviews.min_quality:setOption(idx)
+    if subviews.max_quality:getOptionValue() < idx then
+        subviews.max_quality:setOption(idx)
+    end
+    require('plugins.buildingplan').setQualityFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1,
+            subviews.decorated:getOptionValue() and 1 or 0, idx, subviews.max_quality:getOptionValue())
+    self.dirty = true
+end
+
+function QualityAndMaterialsPage:set_max_quality(idx)
+    idx = math.min(6, math.max(0, idx-1))
+    local subviews = self.subviews
+    subviews.max_quality:setOption(idx)
+    if subviews.min_quality:getOptionValue() > idx then
+        subviews.min_quality:setOption(idx)
+    end
+    require('plugins.buildingplan').setQualityFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.index-1,
+            subviews.decorated:getOptionValue() and 1 or 0, subviews.min_quality:getOptionValue(), idx)
+    self.dirty = true
+end
+
+function QualityAndMaterialsPage:draw_divider(dc)
+    local y2 = dc.height - 1
+    for y=0,y2 do
+        dc:seek(0, y)
+        if y == 0 then
+            dc:char(nil, pens.VERT_TOP_PEN)
+        elseif y == y2 then
+            dc:char(nil, pens.VERT_BOT_PEN)
+        else
+            dc:char(nil, pens.VERT_MID_PEN)
+        end
+    end
+end
+
+function QualityAndMaterialsPage:onRenderFrame(dc, rect)
+    QualityAndMaterialsPage.super.onRenderFrame(self, dc, rect)
+    if self.dirty then
+        self:refresh()
+    end
+end
+
+--------------------------------
+-- GlobalSettingsPage
+--
+
+GlobalSettingsPage = defclass(GlobalSettingsPage, widgets.ResizingPanel)
+GlobalSettingsPage.ATTRS{
+    autoarrange_subviews=true,
+    frame={t=0, l=0},
+    frame_style=gui.INTERIOR_FRAME,
+}
+
+function GlobalSettingsPage:init()
+    self:addviews{
+        widgets.WrappedLabel{
+            frame={l=0},
+            text_to_wrap='These options will affect the selection of "Generic Materials" for all future buildings.',
+        },
+        widgets.Panel{
+            frame={h=1},
+        },
+        widgets.ToggleHotkeyLabel{
+            view_id='blocks',
+            frame={l=0},
+            key='CUSTOM_B',
+            label='Blocks',
+            label_width=8,
+            on_change=self:callback('update_setting', 'blocks'),
+        },
+        widgets.ToggleHotkeyLabel{
+            view_id='logs',
+            frame={l=0},
+            key='CUSTOM_L',
+            label='Logs',
+            label_width=8,
+            on_change=self:callback('update_setting', 'logs'),
+        },
+        widgets.ToggleHotkeyLabel{
+            view_id='boulders',
+            frame={l=0},
+            key='CUSTOM_O',
+            label='Boulders',
+            label_width=8,
+            on_change=self:callback('update_setting', 'boulders'),
+        },
+        widgets.ToggleHotkeyLabel{
+            view_id='bars',
+            frame={l=0},
+            key='CUSTOM_R',
+            label='Bars',
+            label_width=8,
+            on_change=self:callback('update_setting', 'bars'),
+        },
+    }
+
+    self:init_settings()
+end
+
+function GlobalSettingsPage:init_settings()
+    local settings = require('plugins.buildingplan').getGlobalSettings()
+    local subviews = self.subviews
+    subviews.blocks:setOption(settings.blocks)
+    subviews.logs:setOption(settings.logs)
+    subviews.boulders:setOption(settings.boulders)
+    subviews.bars:setOption(settings.bars)
+end
+
+function GlobalSettingsPage:update_setting(setting, val)
+    dfhack.run_command('buildingplan', 'set', setting, tostring(val))
+    self:init_settings()
+end
+
+--------------------------------
+-- FilterSelection
+--
+
+FilterSelection = defclass(FilterSelection, widgets.Window)
+FilterSelection.ATTRS{
+    frame_title='Choose filters',
+    frame={w=55, h=53, l=30, t=8},
+    frame_inset={t=1},
+    resizable=true,
+    index=DEFAULT_NIL,
+    desc=DEFAULT_NIL,
+    autoarrange_subviews=true,
+}
+
+function FilterSelection:init()
+    self:addviews{
+        widgets.TabBar{
+            frame={t=0},
+            labels={
+                'Quality and materials',
+                'Global settings',
+            },
+            on_select=function(idx)
+                self.subviews.pages:setSelected(idx)
+                self:updateLayout()
+            end,
+            get_cur_page=function() return self.subviews.pages:getSelected() end,
+            key='CUSTOM_CTRL_T',
+        },
+        widgets.Widget{
+            frame={h=1},
+        },
+        widgets.Pages{
+            view_id='pages',
+            frame={t=5, l=0, b=0, r=0},
+            subviews={
+                QualityAndMaterialsPage{
+                    index=self.index,
+                    desc=self.desc
+                },
+                GlobalSettingsPage{},
+            },
+        },
+    }
+end
+
+FilterSelectionScreen = defclass(FilterSelectionScreen, gui.ZScreen)
+FilterSelectionScreen.ATTRS {
+    focus_path='dwarfmode/Building/Placement/dfhack/lua/buildingplan/filterselection',
+    pass_movement_keys=true,
+    pass_mouse_clicks=false,
+    defocusable=false,
+    index=DEFAULT_NIL,
+    desc=DEFAULT_NIL,
+}
+
+function FilterSelectionScreen:init()
+    self:addviews{
+        FilterSelection{
+            index=self.index,
+            desc=self.desc
+        }
+    }
+end
+
+function FilterSelectionScreen:onShow()
+    -- don't let the building "shadow" follow the mouse cursor while this screen is open
+    df.global.game.main_interface.bottom_mode_selected = -1
+end
+
+function FilterSelectionScreen:onDismiss()
+    -- re-enable building shadow
+    df.global.game.main_interface.bottom_mode_selected = df.main_bottom_mode_type.BUILDING_PLACEMENT
+end
+
+return _ENV
diff --git a/plugins/lua/buildingplan/inspectoroverlay.lua b/plugins/lua/buildingplan/inspectoroverlay.lua
new file mode 100644
index 000000000..3c6f0ed5e
--- /dev/null
+++ b/plugins/lua/buildingplan/inspectoroverlay.lua
@@ -0,0 +1,148 @@
+local _ENV = mkmodule('plugins.buildingplan.inspectoroverlay')
+
+local gui = require('gui')
+local overlay = require('plugins.overlay')
+local widgets = require('gui.widgets')
+
+reset_inspector_flag = false
+
+local function get_building_filters()
+    local bld = dfhack.gui.getSelectedBuilding()
+    return dfhack.buildings.getFiltersByType({},
+            bld:getType(), bld:getSubtype(), bld:getCustomType())
+end
+
+--------------------------------
+-- InspectorLine
+--
+
+InspectorLine = defclass(InspectorLine, widgets.Panel)
+InspectorLine.ATTRS{
+    idx=DEFAULT_NIL,
+}
+
+function InspectorLine:init()
+    self.frame.h = 2
+    self.visible = function() return #get_building_filters() >= self.idx end
+    self:addviews{
+        widgets.Label{
+            frame={t=0, l=0},
+            text={{text=self:callback('get_desc_string')}},
+        },
+        widgets.Label{
+            frame={t=1, l=2},
+            text={{text=self:callback('get_status_line')}},
+        },
+    }
+end
+
+function InspectorLine:get_desc_string()
+    if self.desc then return self.desc end
+    self.desc = require('plugins.buildingplan').getDescString(dfhack.gui.getSelectedBuilding(), self.idx-1)
+    return self.desc
+end
+
+function InspectorLine:get_status_line()
+    if self.status then return self.status end
+    local queue_pos = require('plugins.buildingplan').getQueuePosition(dfhack.gui.getSelectedBuilding(), self.idx-1)
+    if queue_pos <= 0 then
+        return 'Item attached'
+    end
+    self.status = ('Position in line: %d'):format(queue_pos)
+    return self.status
+end
+
+function InspectorLine:reset()
+    self.desc = nil
+    self.status = nil
+end
+
+--------------------------------
+-- InspectorOverlay
+--
+
+InspectorOverlay = defclass(InspectorOverlay, overlay.OverlayWidget)
+InspectorOverlay.ATTRS{
+    default_pos={x=-41,y=14},
+    default_enabled=true,
+    viewscreens='dwarfmode/ViewSheets/BUILDING',
+    frame={w=30, h=15},
+    frame_style=gui.MEDIUM_FRAME,
+    frame_background=gui.CLEAR_PEN,
+}
+
+function InspectorOverlay:init()
+    self:addviews{
+        widgets.Label{
+            frame={t=0, l=0},
+            text='Waiting for items:',
+        },
+        InspectorLine{view_id='item1', frame={t=2, l=0}, idx=1},
+        InspectorLine{view_id='item2', frame={t=4, l=0}, idx=2},
+        InspectorLine{view_id='item3', frame={t=6, l=0}, idx=3},
+        InspectorLine{view_id='item4', frame={t=8, l=0}, idx=4},
+        widgets.HotkeyLabel{
+            frame={t=11, l=0},
+            label='adjust filters',
+            key='CUSTOM_CTRL_F',
+            visible=false, -- until implemented
+        },
+        widgets.HotkeyLabel{
+            frame={t=12, l=0},
+            label='make top priority',
+            key='CUSTOM_CTRL_T',
+            on_activate=self:callback('make_top_priority'),
+        },
+    }
+end
+
+function InspectorOverlay:reset()
+    self.subviews.item1:reset()
+    self.subviews.item2:reset()
+    self.subviews.item3:reset()
+    self.subviews.item4:reset()
+    reset_inspector_flag = false
+end
+
+function InspectorOverlay:make_top_priority()
+    require('plugins.buildingplan').makeTopPriority(dfhack.gui.getSelectedBuilding())
+    self:reset()
+end
+
+local RESUME_BUTTON_FRAME = {t=15, h=3, r=73, w=25}
+
+local function mouse_is_over_resume_button(rect)
+    local x,y = dfhack.screen.getMousePos()
+    if not x then return false end
+    if y < RESUME_BUTTON_FRAME.t or y > RESUME_BUTTON_FRAME.t + RESUME_BUTTON_FRAME.h - 1 then
+        return false
+    end
+    if x > rect.x2 - RESUME_BUTTON_FRAME.r + 1 or x < rect.x2 - RESUME_BUTTON_FRAME.r - RESUME_BUTTON_FRAME.w + 2 then
+        return false
+    end
+    return true
+end
+
+function InspectorOverlay:onInput(keys)
+    if not require('plugins.buildingplan').isPlannedBuilding(dfhack.gui.getSelectedBuilding(true)) then
+        return false
+    end
+    if keys._MOUSE_L and mouse_is_over_resume_button(self.frame_parent_rect) then
+        return true
+    elseif keys._MOUSE_L or keys._MOUSE_R or keys.LEAVESCREEN then
+        self:reset()
+    end
+    return InspectorOverlay.super.onInput(self, keys)
+end
+
+function InspectorOverlay:render(dc)
+    if not require('plugins.buildingplan').isPlannedBuilding(dfhack.gui.getSelectedBuilding(true)) then
+        return
+    end
+    if reset_inspector_flag then
+        self:reset()
+    end
+    InspectorOverlay.super.render(self, dc)
+end
+
+return _ENV
diff --git a/plugins/lua/buildingplan/itemselection.lua b/plugins/lua/buildingplan/itemselection.lua
new file mode 100644
index 000000000..bc836bc33
--- /dev/null
+++ b/plugins/lua/buildingplan/itemselection.lua
@@ -0,0 +1,442 @@
+local _ENV = mkmodule('plugins.buildingplan.itemselection')
+
+local gui = require('gui')
+local pens = require('plugins.buildingplan.pens')
+local utils = require('utils')
+local widgets = require('gui.widgets')
+
+local uibs = df.global.buildreq
+local to_pen = dfhack.pen.parse
+
+local BUILD_TEXT_PEN = to_pen{fg=COLOR_BLACK, bg=COLOR_GREEN, keep_lower=true}
+local BUILD_TEXT_HPEN = to_pen{fg=COLOR_WHITE, bg=COLOR_GREEN, keep_lower=true}
+
+-- map of building type -> {set=set of recently used, list=list of recently used}
+-- most recent entries are at the *end* of the list
+local recently_used = {}
+
+function get_automaterial_selection(building_type)
+    local tracker = recently_used[building_type]
+    if not tracker or not tracker.list then return end
+    return tracker.list[#tracker.list]
+end
+
+local function get_artifact_name(item)
+    local gref = dfhack.items.getGeneralRef(item, df.general_ref_type.IS_ARTIFACT)
+    if not gref then return end
+    local artifact = df.artifact_record.find(gref.artifact_id)
+    if not artifact then return end
+    return dfhack.TranslateName(artifact.name)
+end
+
+function get_item_description(item_id, item, safety_label)
+    item = item or df.item.find(item_id)
+    if not item then
+        return ('No %s safe mechanisms available'):format(safety_label:lower())
+    end
+    local desc = item.flags.artifact and get_artifact_name(item) or
+        dfhack.items.getDescription(item, 0, true)
+    local wear_level = item:getWear()
+    if wear_level == 1 then desc = ('x%sx'):format(desc)
+    elseif wear_level == 2 then desc = ('X%sX'):format(desc)
+    elseif wear_level == 3 then desc = ('XX%sXX'):format(desc)
+    end
+    return desc
+end
+
+local function sort_by_type(a, b)
+    local ad, bd = a.data, b.data
+    return ad.item_type < bd.item_type or
+            (ad.item_type == bd.item_type and ad.item_subtype < bd.item_subtype) or
+            (ad.item_type == bd.item_type and ad.item_subtype == bd.item_subtype and a.search_key < b.search_key) or
+            (ad.item_type == bd.item_type and ad.item_subtype == bd.item_subtype and a.search_key == b.search_key and ad.quality > bd.quality)
+end
+
+local function sort_by_recency(a, b)
+    local tracker = recently_used[uibs.building_type]
+    if not tracker then return sort_by_type(a, b) end
+    local recent_a, recent_b = tracker.set[a.search_key], tracker.set[b.search_key]
+    -- if they're both in the set, return the one with the greater index,
+    -- indicating more recent
+    if recent_a and recent_b then return recent_a > recent_b end
+    if recent_a and not recent_b then return true end
+    if not recent_a and recent_b then return false end
+    return sort_by_type(a, b)
+end
+
+local function sort_by_name(a, b)
+    return a.search_key < b.search_key or
+            (a.search_key == b.search_key and sort_by_type(a, b))
+end
+
+local function sort_by_quantity(a, b)
+    local ad, bd = a.data, b.data
+    return ad.quantity > bd.quantity or
+            (ad.quantity == bd.quantity and sort_by_type(a, b))
+end
+
+ItemSelection = defclass(ItemSelection, widgets.Window)
+ItemSelection.ATTRS{
+    frame_title='Choose items',
+    frame={w=56, h=24, l=4, t=7},
+    resizable=true,
+    get_available_items_fn=DEFAULT_NIL,
+    desc=DEFAULT_NIL,
+    quantity=DEFAULT_NIL,
+    autoselect=DEFAULT_NIL,
+    on_submit=DEFAULT_NIL,
+    on_cancel=DEFAULT_NIL,
+}
+
+function ItemSelection:init()
+    self.num_selected = 0
+    self.selected_set = {}
+    local plural = self.quantity == 1 and '' or 's'
+
+    local choices = self:get_choices(sort_by_recency)
+
+    if self.autoselect then
+        self:do_autoselect(choices)
+        if self.num_selected >= self.quantity then
+            self:submit(choices)
+            return
+        end
+    end
+
+    self:addviews{
+        widgets.Panel{
+            view_id='header',
+            frame={t=0, h=3},
+            subviews={
+                widgets.Label{
+                    frame={t=0, l=0, r=16},
+                    text={
+                        self.desc, plural, NEWLINE,
+                        ('Select up to %d item%s ('):format(self.quantity, plural),
+                        {text=function() return self.num_selected end},
+                        ' selected)',
+                    },
+                },
+                widgets.Label{
+                    frame={r=0, w=15, t=0, h=3},
+                    text_pen=BUILD_TEXT_PEN,
+                    text_hpen=BUILD_TEXT_HPEN,
+                    text={
+                        '               ', NEWLINE,
+                        '   Autoselect  ', NEWLINE,
+                        '               ',
+                    },
+                    on_click=self:callback('submit'),
+                    visible=function() return self.num_selected < self.quantity end,
+                },
+                widgets.Label{
+                    frame={r=0, w=15, t=0, h=3},
+                    text_pen=BUILD_TEXT_PEN,
+                    text_hpen=BUILD_TEXT_HPEN,
+                    text={
+                        '               ', NEWLINE,
+                        '    Continue   ', NEWLINE,
+                        '               ',
+                    },
+                    on_click=self:callback('submit'),
+                    visible=function() return self.num_selected >= self.quantity end,
+                },
+            },
+        },
+    }
+
+    self:addviews{
+        widgets.Panel{
+            view_id='body',
+            frame={t=self.subviews.header.frame.h, b=4},
+            subviews={
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=1, t=0},
+                    label_text='Search: ',
+                    on_char=function(ch) return ch:match('[%l -]') end,
+                },
+                widgets.CycleHotkeyLabel{
+                    frame={l=1, t=2},
+                    key='CUSTOM_SHIFT_R',
+                    label='Sort by:',
+                    options={
+                        {label='Recently used', value=sort_by_recency},
+                        {label='Name', value=sort_by_name},
+                        {label='Amount', value=sort_by_quantity},
+                    },
+                    on_change=self:callback('on_sort'),
+                },
+                widgets.Panel{
+                    frame={l=0, t=3, r=0, b=0},
+                    frame_style=gui.INTERIOR_FRAME,
+                    subviews={
+                        widgets.FilteredList{
+                            view_id='flist',
+                            frame={t=0, b=0},
+                            choices=choices,
+                            icon_width=2,
+                            on_submit=self:callback('toggle_group'),
+                        },
+                    },
+                },
+            },
+        },
+        widgets.Panel{
+            view_id='footer',
+            frame={l=1, r=1, b=0, h=3},
+            subviews={
+                widgets.HotkeyLabel{
+                    frame={l=0, h=1, t=0},
+                    key='KEYBOARD_CURSOR_RIGHT_FAST',
+                    key_sep='----: ', -- these hypens function as "padding" to be overwritten by the next Label
+                    label='Use one',
+                    auto_width=true,
+                    on_activate=function() self:increment_group(self.subviews.flist.list:getSelected()) end,
+                },
+                widgets.Label{
+                    frame={l=6, w=5, t=0},
+                    text_pen=COLOR_LIGHTGREEN,
+                    text='Right', -- this overrides the "6----" characters from the previous HotkeyLabel
+                },
+                widgets.HotkeyLabel{
+                    frame={l=1, h=1, t=1},
+                    key='KEYBOARD_CURSOR_LEFT_FAST',
+                    key_sep='---: ', -- these hypens function as "padding" to be overwritten by the next Label
+                    label='Use one fewer',
+                    auto_width=true,
+                    on_activate=function() self:decrement_group(self.subviews.flist.list:getSelected()) end,
+                },
+                widgets.Label{
+                    frame={l=7, w=4, t=1},
+                    text_pen=COLOR_LIGHTGREEN,
+                    text='Left', -- this overrides the "4---" characters from the previous HotkeyLabel
+                },
+                widgets.HotkeyLabel{
+                    frame={l=6, t=2, h=2},
+                    key='SELECT',
+                    label='Use all/none',
+                    auto_width=true,
+                    on_activate=function() self:toggle_group(self.subviews.flist.list:getSelected()) end,
+                },
+                widgets.HotkeyLabel{
+                    frame={r=5, t=0},
+                    key='LEAVESCREEN',
+                    label='Go back',
+                    auto_width=true,
+                    on_activate=self:callback('on_cancel'),
+                },
+                widgets.HotkeyLabel{
+                    frame={r=4, t=2},
+                    key='CUSTOM_SHIFT_C',
+                    label='Continue',
+                    auto_width=true,
+                    on_activate=self:callback('submit'),
+                },
+            },
+        },
+    }
+
+    self.subviews.flist.list.frame.t = 0
+    self.subviews.flist.edit.visible = false
+    self.subviews.flist.edit = self.subviews.search
+    self.subviews.search.on_change = self.subviews.flist:callback('onFilterChange')
+end
+
+-- resort and restore selection
+function ItemSelection:on_sort(sort_fn)
+    local flist = self.subviews.flist
+    local saved_filter = flist:getFilter()
+    flist:setFilter('')
+    flist:setChoices(self:get_choices(sort_fn), flist:getSelected())
+    flist:setFilter(saved_filter)
+end
+
+local function make_search_key(str)
+    local out = ''
+    for c in str:gmatch("[%w%s]") do
+        out = out .. c
+    end
+    return out
+end
+
+function ItemSelection:get_choices(sort_fn)
+    local item_ids = self.get_available_items_fn()
+    local buckets = {}
+    for _,item_id in ipairs(item_ids) do
+        local item = df.item.find(item_id)
+        if not item then goto continue end
+        local desc = get_item_description(item_id, item)
+        if buckets[desc] then
+            local bucket = buckets[desc]
+            table.insert(bucket.data.item_ids, item_id)
+            bucket.data.quantity = bucket.data.quantity + 1
+        else
+            local entry = {
+                search_key=make_search_key(desc),
+                icon=self:callback('get_entry_icon', item_id),
+                data={
+                    item_ids={item_id},
+                    item_type=item:getType(),
+                    item_subtype=item:getSubtype(),
+                    quantity=1,
+                    quality=item:getQuality(),
+                    selected=0,
+                },
+            }
+            buckets[desc] = entry
+        end
+        ::continue::
+    end
+    local choices = {}
+    for desc,choice in pairs(buckets) do
+        local data = choice.data
+        choice.text = {
+            {width=10, text=function() return ('%d/%d'):format(data.selected, data.quantity) end},
+            {gap=2, text=desc},
+        }
+        table.insert(choices, choice)
+    end
+    table.sort(choices, sort_fn)
+    return choices
+end
+
+function ItemSelection:do_autoselect(choices)
+    if #choices == 0 then return end
+    local desired = get_automaterial_selection(uibs.building_type)
+    if choices[1].search_key ~= desired then return end
+    self:toggle_group(1, choices[1])
+end
+
+function ItemSelection:increment_group(idx, choice)
+    local data = choice.data
+    if self.quantity <= self.num_selected then return false end
+    if data.selected >= data.quantity then return false end
+    data.selected = data.selected + 1
+    self.num_selected = self.num_selected + 1
+    local item_id = data.item_ids[data.selected]
+    self.selected_set[item_id] = true
+    return true
+end
+
+function ItemSelection:decrement_group(idx, choice)
+    local data = choice.data
+    if data.selected <= 0 then return false end
+    local item_id = data.item_ids[data.selected]
+    self.selected_set[item_id] = nil
+    self.num_selected = self.num_selected - 1
+    data.selected = data.selected - 1
+    return true
+end
+
+function ItemSelection:toggle_group(idx, choice)
+    local data = choice.data
+    if data.selected > 0 then
+        while self:decrement_group(idx, choice) do end
+    else
+        while self:increment_group(idx, choice) do end
+    end
+end
+
+function ItemSelection:get_entry_icon(item_id)
+    return self.selected_set[item_id] and pens.SELECTED_ITEM_PEN or nil
+end
+
+local function track_recently_used(choices)
+    -- use same set for all subtypes
+    local tracker = ensure_key(recently_used, uibs.building_type)
+    for _,choice in ipairs(choices) do
+        local data = choice.data
+        if data.selected <= 0 then goto continue end
+        local key = choice.search_key
+        local recent_set = ensure_key(tracker, 'set')
+        local recent_list = ensure_key(tracker, 'list')
+        if recent_set[key] then
+            if recent_list[#recent_list] ~= key then
+                for i,v in ipairs(recent_list) do
+                    if v == key then
+                        table.remove(recent_list, i)
+                        table.insert(recent_list, key)
+                        break
+                    end
+                end
+                tracker.set = utils.invert(recent_list)
+            end
+        else
+            -- only keep most recent 10
+            if #recent_list >= 10 then
+                -- remove least recently used from list and set
+                recent_set[table.remove(recent_list, 1)] = nil
+            end
+            table.insert(recent_list, key)
+            recent_set[key] = #recent_list
+        end
+        ::continue::
+    end
+end
+
+function ItemSelection:submit(choices)
+    local selected_items = {}
+    for item_id in pairs(self.selected_set) do
+        table.insert(selected_items, item_id)
+    end
+    if #selected_items > 0 then
+        track_recently_used(choices or self.subviews.flist:getChoices())
+    end
+    self.on_submit(selected_items)
+end
+
+function ItemSelection:onInput(keys)
+    if keys.LEAVESCREEN or keys._MOUSE_R then
+        self.on_cancel()
+        return true
+    elseif keys._MOUSE_L then
+        local list = self.subviews.flist.list
+        local idx = list:getIdxUnderMouse()
+        if idx then
+            list:setSelected(idx)
+            local modstate = dfhack.internal.getModstate()
+            if modstate & 2 > 0 then -- ctrl
+                local choice = list:getChoices()[idx]
+                if modstate & 1 > 0 then -- shift
+                    self:decrement_group(idx, choice)
+                else
+                    self:increment_group(idx, choice)
+                end
+                return true
+            end
+        end
+    end
+    return ItemSelection.super.onInput(self, keys)
+end
+
+ItemSelectionScreen = defclass(ItemSelectionScreen, gui.ZScreen)
+ItemSelectionScreen.ATTRS {
+    focus_path='dwarfmode/Building/Placement/dfhack/lua/buildingplan/itemselection',
+    force_pause=true,
+    pass_movement_keys=true,
+    pass_pause=false,
+    pass_mouse_clicks=false,
+    defocusable=false,
+    get_available_items_fn=DEFAULT_NIL,
+    desc=DEFAULT_NIL,
+    quantity=DEFAULT_NIL,
+    autoselect=DEFAULT_NIL,
+    on_submit=DEFAULT_NIL,
+    on_cancel=DEFAULT_NIL,
+}
+
+function ItemSelectionScreen:init()
+    self:addviews{
+        ItemSelection{
+            get_available_items_fn=self.get_available_items_fn,
+            desc=self.desc,
+            quantity=self.quantity,
+            autoselect=self.autoselect,
+            on_submit=self.on_submit,
+            on_cancel=self.on_cancel,
+        }
+    }
+end
+
+return _ENV
diff --git a/plugins/lua/buildingplan/mechanisms.lua b/plugins/lua/buildingplan/mechanisms.lua
new file mode 100644
index 000000000..163255ca3
--- /dev/null
+++ b/plugins/lua/buildingplan/mechanisms.lua
@@ -0,0 +1,172 @@
+local _ENV = mkmodule('plugins.buildingplan.mechanisms')
+
+local itemselection = require('plugins.buildingplan.itemselection')
+local overlay = require('plugins.overlay')
+local widgets = require('gui.widgets')
+
+local view_sheets = df.global.game.main_interface.view_sheets
+
+--------------------------------
+-- MechanismOverlay
+--
+
+MechanismOverlay = defclass(MechanismOverlay, overlay.OverlayWidget)
+MechanismOverlay.ATTRS{
+    default_pos={x=5,y=5},
+    default_enabled=true,
+    viewscreens='dwarfmode/LinkingLever',
+    frame={w=57, h=13},
+}
+
+function MechanismOverlay:init()
+    self:addviews{
+        widgets.BannerPanel{
+            frame={t=5, l=1, r=1, h=1},
+            subviews={
+                widgets.Label{
+                    frame={t=0, l=1},
+                    text='Mechanism safety:'
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='safety_lever',
+                    frame={t=0, l=20, w=15},
+                    key='CUSTOM_G',
+                    label='Lever:',
+                    options={
+                        {label='Any', value=0},
+                        {label='Magma', value=2, pen=COLOR_RED},
+                        {label='Fire', value=1, pen=COLOR_LIGHTRED},
+                    },
+                    initial_option=0,
+                    on_change=self:callback('choose_mechanism', 'lever', true),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='safety_target',
+                    frame={t=0, l=38, w=16},
+                    key='CUSTOM_SHIFT_G',
+                    label='Target:',
+                    options={
+                        {label='Any', value=0},
+                        {label='Magma', value=2, pen=COLOR_RED},
+                        {label='Fire', value=1, pen=COLOR_LIGHTRED},
+                    },
+                    initial_option=0,
+                    on_change=self:callback('choose_mechanism', 'target', true),
+                },
+            }
+        },
+        widgets.HotkeyLabel{
+            frame={t=7, l=8, w=49, h=2},
+            key='CUSTOM_M',
+            label=function()
+                return itemselection.get_item_description(view_sheets.linking_lever_mech_lever_id,
+                    nil,
+                    self.subviews.safety_lever:getOptionLabel())
+            end,
+            auto_height=false,
+            enabled=function() return view_sheets.linking_lever_mech_lever_id ~= -1 end,
+            on_activate=self:callback('choose_mechanism', 'lever', false),
+        },
+        widgets.HotkeyLabel{
+            frame={t=10, l=8, w=49, h=2},
+            key='CUSTOM_SHIFT_M',
+            label=function()
+                return itemselection.get_item_description(view_sheets.linking_lever_mech_target_id,
+                    nil,
+                    self.subviews.safety_target:getOptionLabel())
+            end,
+            auto_height=false,
+            enabled=function() return view_sheets.linking_lever_mech_target_id ~= -1 end,
+            on_activate=self:callback('choose_mechanism', 'target', false),
+        },
+    }
+end
+
+local item_selection_dlg
+local function reset_dlg()
+    if item_selection_dlg then
+        if item_selection_dlg:isActive() then
+            item_selection_dlg:dismiss()
+        end
+        item_selection_dlg = nil
+    end
+end
+
+local function get_available_items(safety, other_mechanism)
+    local item_ids = require('plugins.buildingplan').getAvailableItemsByHeat(
+        df.building_type.Trap, df.trap_type.Lever, -1, 0, safety)
+    for idx,item_id in ipairs(item_ids) do
+        if item_id == other_mechanism then
+            table.remove(item_ids, idx)
+            break
+        end
+    end
+    return item_ids
+end
+
+function MechanismOverlay:save_id(which, item_id)
+    local saved_id = ('saved_%s_id'):format(which)
+    local ui_id = ('linking_lever_mech_%s_id'):format(which)
+    view_sheets[ui_id] = item_id
+    self[saved_id] = item_id
+end
+
+function MechanismOverlay:choose_mechanism(which, autoselect)
+    local widget_id = 'safety_' .. which
+    local safety = self.subviews[widget_id]:getOptionValue()
+    local ui_other_id = ('linking_lever_mech_%s_id'):format(which == 'lever' and 'target' or 'lever')
+    local available_item_ids = get_available_items(safety, view_sheets[ui_other_id])
+
+    if autoselect then
+        self:save_id(which, available_item_ids[1] or -1)
+        return
+    end
+
+    -- to integrate with ItemSelection's last used sorting
+    df.global.buildreq.building_type = df.building_type.Trap
+
+    local desc = self.subviews[widget_id]:getOptionLabel()
+    if desc ~= 'Any' then
+        desc = desc .. ' safe'
+    end
+    desc = desc .. ' mechanism'
+
+    item_selection_dlg = item_selection_dlg or itemselection.ItemSelectionScreen{
+        get_available_items_fn=function() return available_item_ids end,
+        desc=desc,
+        quantity=1,
+        autoselect=false,
+        on_cancel=reset_dlg,
+        on_submit=function(chosen_ids)
+            self:save_id(which, chosen_ids[1] or available_item_ids[1] -1)
+            reset_dlg()
+        end,
+    }:show()
+end
+
+function MechanismOverlay:onInput(keys)
+    if MechanismOverlay.super.onInput(self, keys) then
+        return true
+    end
+    if keys._MOUSE_L then
+        if self:getMousePos() then
+            -- don't let clicks bleed through the panel
+            return true
+        end
+        -- don't allow the lever to be linked if mechanisms are not set
+        return view_sheets.linking_lever_mech_lever_id == -1 or
+            view_sheets.linking_lever_mech_target_id == -1
+    end
+end
+
+function MechanismOverlay:onRenderFrame(dc, rect)
+    MechanismOverlay.super.onRenderFrame(self, dc, rect)
+    if self.saved_lever_id ~= view_sheets.linking_lever_mech_lever_id then
+        self:choose_mechanism('lever', true)
+    end
+    if self.saved_target_id ~= view_sheets.linking_lever_mech_target_id then
+        self:choose_mechanism('target', true)
+    end
+end
+
+return _ENV
diff --git a/plugins/lua/buildingplan/pens.lua b/plugins/lua/buildingplan/pens.lua
new file mode 100644
index 000000000..2ab76da06
--- /dev/null
+++ b/plugins/lua/buildingplan/pens.lua
@@ -0,0 +1,38 @@
+local _ENV = mkmodule('plugins.buildingplan.pens')
+
+local gui = require('gui')
+local textures = require('gui.textures')
+
+GOOD_TILE_PEN, BAD_TILE_PEN = nil, nil
+VERT_TOP_PEN, VERT_MID_PEN, VERT_BOT_PEN = nil, nil, nil
+HORI_LEFT_PEN, HORI_MID_PEN, HORI_RIGHT_PEN = nil, nil, nil
+BUTTON_START_PEN, BUTTON_END_PEN = nil, nil
+SELECTED_ITEM_PEN = nil
+MINI_TEXT_PEN, MINI_TEXT_HPEN, MINI_BUTT_PEN, MINI_BUTT_HPEN = nil, nil, nil, nil
+
+local to_pen = dfhack.pen.parse
+
+function reload_pens()
+    GOOD_TILE_PEN = to_pen{ch='o', fg=COLOR_GREEN, tile=dfhack.screen.findGraphicsTile('CURSORS', 1, 2)}
+    BAD_TILE_PEN = to_pen{ch='X', fg=COLOR_RED, tile=dfhack.screen.findGraphicsTile('CURSORS', 3, 0)}
+
+    VERT_TOP_PEN = to_pen { tile = curry(textures.tp_border_thin, 11), ch = 194, fg = COLOR_GREY, bg = COLOR_BLACK }
+    VERT_MID_PEN = to_pen { tile = curry(textures.tp_border_thin, 5), ch = 179, fg = COLOR_GREY, bg = COLOR_BLACK }
+    VERT_BOT_PEN = to_pen { tile = curry(textures.tp_border_thin, 12), ch = 193, fg = COLOR_GREY, bg = COLOR_BLACK }
+
+    HORI_LEFT_PEN = to_pen { tile = curry(textures.tp_border_medium, 13), ch = 195, fg = COLOR_GREY, bg = COLOR_BLACK }
+    HORI_MID_PEN = to_pen { tile = curry(textures.tp_border_medium, 6), ch = 196, fg = COLOR_GREY, bg = COLOR_BLACK }
+    HORI_RIGHT_PEN = to_pen { tile = curry(textures.tp_border_medium, 14), ch = 180, fg = COLOR_GREY, bg = COLOR_BLACK }
+
+    BUTTON_START_PEN = to_pen { tile = curry(textures.tp_control_panel, 14), ch = '[', fg = COLOR_YELLOW }
+    BUTTON_END_PEN = to_pen { tile = curry(textures.tp_control_panel, 16), ch = ']', fg = COLOR_YELLOW }
+    SELECTED_ITEM_PEN = to_pen { tile = curry(textures.tp_control_panel, 10), ch = string.char(251), fg = COLOR_YELLOW }
+
+    MINI_TEXT_PEN = to_pen{fg=COLOR_BLACK, bg=COLOR_GREY}
+    MINI_TEXT_HPEN = to_pen{fg=COLOR_BLACK, bg=COLOR_WHITE}
+    MINI_BUTT_PEN = to_pen{fg=COLOR_BLACK, bg=COLOR_LIGHTRED}
+    MINI_BUTT_HPEN = to_pen{fg=COLOR_WHITE, bg=COLOR_RED}
+end
+reload_pens()
+
+return _ENV
diff --git a/plugins/lua/buildingplan/planneroverlay.lua b/plugins/lua/buildingplan/planneroverlay.lua
new file mode 100644
index 000000000..06872ea09
--- /dev/null
+++ b/plugins/lua/buildingplan/planneroverlay.lua
@@ -0,0 +1,1041 @@
+local _ENV = mkmodule('plugins.buildingplan.planneroverlay')
+
+local itemselection = require('plugins.buildingplan.itemselection')
+local filterselection = require('plugins.buildingplan.filterselection')
+local gui = require('gui')
+local guidm = require('gui.dwarfmode')
+local json = require('json')
+local overlay = require('plugins.overlay')
+local pens = require('plugins.buildingplan.pens')
+local utils = require('utils')
+local widgets = require('gui.widgets')
+require('dfhack.buildings')
+
+config = config or json.open('dfhack-config/buildingplan.json')
+
+local uibs = df.global.buildreq
+
+reset_counts_flag = false
+
+local function get_cur_filters()
+    return dfhack.buildings.getFiltersByType({}, uibs.building_type,
+            uibs.building_subtype, uibs.custom_type)
+end
+
+local function is_choosing_area()
+    return uibs.selection_pos.x >= 0
+end
+
+-- TODO: reuse data in quickfort database
+local function get_selection_size_limits()
+    local btype = uibs.building_type
+    if btype == df.building_type.Bridge
+            or btype == df.building_type.FarmPlot
+            or btype == df.building_type.RoadPaved
+            or btype == df.building_type.RoadDirt then
+        return {w=31, h=31}
+    elseif btype == df.building_type.AxleHorizontal then
+        return uibs.direction == 1 and {w=1, h=31} or {w=31, h=1}
+    elseif btype == df.building_type.Rollers then
+        return (uibs.direction == 1 or uibs.direction == 3) and {w=31, h=1} or {w=1, h=31}
+    end
+end
+
+local function get_selected_bounds(selection_pos, pos)
+    selection_pos = selection_pos or uibs.selection_pos
+    if not is_choosing_area() then return end
+
+    pos = pos or uibs.pos
+
+    local bounds = {
+        x1=math.min(selection_pos.x, pos.x),
+        x2=math.max(selection_pos.x, pos.x),
+        y1=math.min(selection_pos.y, pos.y),
+        y2=math.max(selection_pos.y, pos.y),
+        z1=math.min(selection_pos.z, pos.z),
+        z2=math.max(selection_pos.z, pos.z),
+    }
+
+    -- clamp to map edges
+    bounds = {
+        x1=math.max(0, bounds.x1),
+        x2=math.min(df.global.world.map.x_count-1, bounds.x2),
+        y1=math.max(0, bounds.y1),
+        y2=math.min(df.global.world.map.y_count-1, bounds.y2),
+        z1=math.max(0, bounds.z1),
+        z2=math.min(df.global.world.map.z_count-1, bounds.z2),
+    }
+
+    local limits = get_selection_size_limits()
+    if limits then
+        -- clamp to building type area limit
+        bounds = {
+            x1=math.max(selection_pos.x - (limits.w-1), bounds.x1),
+            x2=math.min(selection_pos.x + (limits.w-1), bounds.x2),
+            y1=math.max(selection_pos.y - (limits.h-1), bounds.y1),
+            y2=math.min(selection_pos.y + (limits.h-1), bounds.y2),
+            z1=bounds.z1,
+            z2=bounds.z2,
+        }
+    end
+
+    return bounds
+end
+
+local function get_cur_area_dims(bounds)
+    if not bounds and not is_choosing_area() then return 1, 1, 1 end
+    bounds = bounds or get_selected_bounds()
+    if not bounds then return 1, 1, 1 end
+    return bounds.x2 - bounds.x1 + 1,
+            bounds.y2 - bounds.y1 + 1,
+            bounds.z2 - bounds.z1 + 1
+end
+
+local function is_pressure_plate()
+    return uibs.building_type == df.building_type.Trap
+            and uibs.building_subtype == df.trap_type.PressurePlate
+end
+
+local function is_weapon_trap()
+    return uibs.building_type == df.building_type.Trap
+            and uibs.building_subtype == df.trap_type.WeaponTrap
+end
+
+local function is_spike_trap()
+    return uibs.building_type == df.building_type.Weapon
+end
+
+local function is_weapon_or_spike_trap()
+    return is_weapon_trap() or is_spike_trap()
+end
+
+-- adjusted from CycleHotkeyLabel on the planner panel
+local weapon_quantity = 1
+
+-- TODO: this should account for erroring constructions
+local function get_quantity(filter, hollow, bounds)
+    if is_pressure_plate() then
+        local flags = uibs.plate_info.flags
+        return (flags.units and 1 or 0) + (flags.water and 1 or 0) +
+                    (flags.magma and 1 or 0) + (flags.track and 1 or 0)
+    elseif (is_weapon_trap() and filter.vector_id == df.job_item_vector_id.ANY_WEAPON) or is_spike_trap() then
+        return weapon_quantity
+    end
+    local quantity = filter.quantity or 1
+    local dimx, dimy, dimz = get_cur_area_dims(bounds)
+    if quantity < 1 then
+        return (((dimx * dimy) // 4) + 1) * dimz
+    end
+    if hollow and dimx > 2 and dimy > 2 then
+        return quantity * (2*dimx + 2*dimy - 4) * dimz
+    end
+    return quantity * dimx * dimy * dimz
+end
+
+local function cur_building_has_no_area()
+    if uibs.building_type == df.building_type.Construction then return false end
+    local filters = dfhack.buildings.getFiltersByType({},
+            uibs.building_type, uibs.building_subtype, uibs.custom_type)
+    -- this works because all variable-size buildings have either no item
+    -- filters or a quantity of -1 for their first (and only) item
+    return filters and filters[1] and (not filters[1].quantity or filters[1].quantity > 0)
+end
+
+local function is_construction()
+    return uibs.building_type == df.building_type.Construction
+end
+
+local function is_tutorial_open()
+    local help = df.global.game.main_interface.help
+    return help.open and
+            help.context == df.help_context_type.START_TUTORIAL_WORKSHOPS_AND_TASKS
+end
+
+local function is_plannable()
+    return not is_tutorial_open() and
+            get_cur_filters() and
+            not (is_construction() and
+                uibs.building_subtype == df.construction_type.TrackNSEW)
+end
+
+local function is_slab()
+    return uibs.building_type == df.building_type.Slab
+end
+
+local function is_cage()
+    return uibs.building_type == df.building_type.Cage
+end
+
+local function is_stairs()
+    return is_construction()
+            and uibs.building_subtype == df.construction_type.UpDownStair
+end
+
+local function is_single_level_stairs()
+    if not is_stairs() then return false end
+    local _, _, dimz = get_cur_area_dims()
+    return dimz == 1
+end
+
+local function is_multi_level_stairs()
+    if not is_stairs() then return false end
+    local _, _, dimz = get_cur_area_dims()
+    return dimz > 1
+end
+
+local direction_panel_frame = {t=4, h=13, w=46, r=28}
+
+local direction_panel_types = utils.invert{
+    df.building_type.Bridge,
+    df.building_type.ScrewPump,
+    df.building_type.WaterWheel,
+    df.building_type.AxleHorizontal,
+    df.building_type.Rollers,
+}
+
+local function has_direction_panel()
+    return direction_panel_types[uibs.building_type]
+        or (uibs.building_type == df.building_type.Trap
+            and uibs.building_subtype == df.trap_type.TrackStop)
+end
+
+local pressure_plate_panel_frame = {t=4, h=37, w=46, r=28}
+
+local function has_pressure_plate_panel()
+    return is_pressure_plate()
+end
+
+local function is_over_options_panel()
+    local frame = nil
+    if has_direction_panel() then
+        frame = direction_panel_frame
+    elseif has_pressure_plate_panel() then
+        frame = pressure_plate_panel_frame
+    else
+        return false
+    end
+    local v = widgets.Widget{frame=frame}
+    local rect = gui.mkdims_wh(0, 0, dfhack.screen.getWindowSize())
+    v:updateLayout(gui.ViewRect{rect=rect})
+    return v:getMousePos()
+end
+
+--------------------------------
+-- ItemLine
+--
+
+ItemLine = defclass(ItemLine, widgets.Panel)
+ItemLine.ATTRS{
+    idx=DEFAULT_NIL,
+    is_selected_fn=DEFAULT_NIL,
+    is_hollow_fn=DEFAULT_NIL,
+    on_select=DEFAULT_NIL,
+    on_filter=DEFAULT_NIL,
+    on_clear_filter=DEFAULT_NIL,
+}
+
+function ItemLine:init()
+    self.frame.h = 2
+    self.visible = function() return #get_cur_filters() >= self.idx end
+    self:addviews{
+        widgets.Label{
+            view_id='item_symbol',
+            frame={t=0, l=0},
+            text=string.char(16), -- this is the "â–º" character
+            text_pen=COLOR_YELLOW,
+            auto_width=true,
+            visible=self.is_selected_fn,
+        },
+        widgets.Label{
+            view_id='item_desc',
+            frame={t=0, l=2},
+            text={
+                {text=self:callback('get_item_line_text'),
+                 pen=function() return gui.invert_color(COLOR_WHITE, self.is_selected_fn()) end},
+            },
+        },
+        widgets.Label{
+            view_id='item_filter',
+            frame={t=0, l=28},
+            text={
+                {text=self:callback('get_filter_text'),
+                 pen=function() return gui.invert_color(COLOR_LIGHTCYAN, self.is_selected_fn()) end},
+            },
+            auto_width=true,
+            on_click=function() self.on_filter(self.idx) end,
+        },
+        widgets.Label{
+            frame={t=0, l=42},
+            text='[clear]',
+            text_pen=COLOR_LIGHTRED,
+            auto_width=true,
+            visible=self:callback('has_filter'),
+            on_click=function() self.on_clear_filter(self.idx) end,
+        },
+        widgets.Label{
+            frame={t=1, l=2},
+            text={
+                {gap=2, text=function() return self.note end,
+                 pen=function() return self.note_pen end},
+            },
+        },
+    }
+end
+
+function ItemLine:reset()
+    self.desc = nil
+    self.available = nil
+end
+
+function ItemLine:onInput(keys)
+    if keys._MOUSE_L and self:getMousePos() then
+        self.on_select(self.idx)
+    end
+    return ItemLine.super.onInput(self, keys)
+end
+
+function ItemLine:get_item_line_text()
+    local idx = self.idx
+    local filter = get_cur_filters()[idx]
+    local quantity = get_quantity(filter, self.is_hollow_fn())
+
+    local buildingplan = require('plugins.buildingplan')
+    self.desc = self.desc or buildingplan.get_desc(filter)
+
+    self.available = self.available or buildingplan.countAvailableItems(
+        uibs.building_type, uibs.building_subtype, uibs.custom_type, idx - 1)
+    if self.available >= quantity then
+        self.note_pen = COLOR_GREEN
+        self.note = (' %d available now'):format(self.available)
+    elseif self.available >= 0 then
+        self.note_pen = COLOR_BROWN
+        self.note = (' Will link next (need to make %d)'):format(quantity - self.available)
+    else
+        self.note_pen = COLOR_BROWN
+        self.note = (' Will link later (need to make %d)'):format(-self.available + quantity)
+    end
+    self.note = string.char(192) .. self.note -- character 192 is "â””"
+
+    return ('%d %s%s'):format(quantity, self.desc, quantity == 1 and '' or 's')
+end
+
+function ItemLine:has_filter()
+    return require('plugins.buildingplan').hasFilter(
+        uibs.building_type, uibs.building_subtype, uibs.custom_type, self.idx-1)
+end
+
+function ItemLine:get_filter_text()
+    -- TODO: make this show the filter's materials instead of "edit filters"
+    return self:has_filter() and '[edit filters]' or '[any material]'
+end
+
+function ItemLine:reduce_quantity(used_quantity)
+    if not self.available then return end
+    local filter = get_cur_filters()[self.idx]
+    used_quantity = used_quantity or get_quantity(filter, self.is_hollow_fn())
+    self.available = self.available - used_quantity
+end
+
+local function get_placement_errors()
+    local out = ''
+    for _,str in ipairs(uibs.errors) do
+        if #out > 0 then out = out .. NEWLINE end
+        out = out .. str.value
+    end
+    return out
+end
+
+--------------------------------
+-- PlannerOverlay
+--
+
+PlannerOverlay = defclass(PlannerOverlay, overlay.OverlayWidget)
+PlannerOverlay.ATTRS{
+    default_pos={x=5,y=9},
+    default_enabled=true,
+    viewscreens='dwarfmode/Building/Placement',
+    frame={w=56, h=22},
+}
+
+function PlannerOverlay:init()
+    self.selected = 1
+    self.state = ensure_key(config.data, 'planner')
+
+    local main_panel = widgets.Panel{
+        view_id='main',
+        frame={t=1, l=0, r=0, h=14},
+        frame_style=gui.INTERIOR_MEDIUM_FRAME,
+        frame_background=gui.CLEAR_PEN,
+        visible=self:callback('is_not_minimized'),
+    }
+
+    local minimized_panel = widgets.Panel{
+        frame={t=0, r=1, w=20, h=1},
+        subviews={
+            widgets.Label{
+                frame={t=0, r=3, h=1},
+                text={
+                    {text=' show Planner ', pen=pens.MINI_TEXT_PEN, hpen=pens.MINI_TEXT_HPEN},
+                    {text='['..string.char(31)..']', pen=pens.MINI_BUTT_PEN, hpen=pens.MINI_BUTT_HPEN},
+                },
+                visible=self:callback('is_minimized'),
+                on_click=self:callback('toggle_minimized'),
+            },
+            widgets.Label{
+                frame={t=0, r=3, h=1},
+                text={
+                    {text=' hide Planner ', pen=pens.MINI_TEXT_PEN, hpen=pens.MINI_TEXT_HPEN},
+                    {text='['..string.char(30)..']', pen=pens.MINI_BUTT_PEN, hpen=pens.MINI_BUTT_HPEN},
+                },
+                visible=self:callback('is_not_minimized'),
+                on_click=self:callback('toggle_minimized'),
+            },
+            widgets.HelpButton{
+                frame={t=0, r=0},
+                command='buildingplan',
+            }
+        },
+    }
+
+    local function make_is_selected_fn(idx)
+        return function() return self.selected == idx end
+    end
+
+    local function on_select_fn(idx)
+        self.selected = idx
+    end
+
+    local function is_hollow_fn()
+        return self.subviews.hollow:getOptionValue()
+    end
+
+    local buildingplan = require('plugins.buildingplan')
+
+    main_panel:addviews{
+        widgets.Label{
+            frame={},
+            auto_width=true,
+            text='No items required.',
+            visible=function() return #get_cur_filters() == 0 end,
+        },
+        ItemLine{view_id='item1', frame={t=0, l=0, r=0}, idx=1,
+                 is_selected_fn=make_is_selected_fn(1), is_hollow_fn=is_hollow_fn,
+                 on_select=on_select_fn, on_filter=self:callback('set_filter'),
+                 on_clear_filter=self:callback('clear_filter')},
+        ItemLine{view_id='item2', frame={t=2, l=0, r=0}, idx=2,
+                 is_selected_fn=make_is_selected_fn(2), is_hollow_fn=is_hollow_fn,
+                 on_select=on_select_fn, on_filter=self:callback('set_filter'),
+                 on_clear_filter=self:callback('clear_filter')},
+        ItemLine{view_id='item3', frame={t=4, l=0, r=0}, idx=3,
+                 is_selected_fn=make_is_selected_fn(3), is_hollow_fn=is_hollow_fn,
+                 on_select=on_select_fn, on_filter=self:callback('set_filter'),
+                 on_clear_filter=self:callback('clear_filter')},
+        ItemLine{view_id='item4', frame={t=6, l=0, r=0}, idx=4,
+                 is_selected_fn=make_is_selected_fn(4), is_hollow_fn=is_hollow_fn,
+                 on_select=on_select_fn, on_filter=self:callback('set_filter'),
+                 on_clear_filter=self:callback('clear_filter')},
+        widgets.CycleHotkeyLabel{
+            view_id='hollow',
+            frame={b=4, l=1, w=21},
+            key='CUSTOM_H',
+            label='Hollow area:',
+            visible=is_construction,
+            options={
+                {label='No', value=false},
+                {label='Yes', value=true, pen=COLOR_GREEN},
+            },
+        },
+        widgets.CycleHotkeyLabel{
+            view_id='stairs_top_subtype',
+            frame={b=7, l=1, w=30},
+            key='CUSTOM_R',
+            label='Top stair type:   ',
+            visible=is_multi_level_stairs,
+            options={
+                {label='Auto', value='auto'},
+                {label='UpDown', value=df.construction_type.UpDownStair},
+                {label='Down', value=df.construction_type.DownStair},
+            },
+        },
+        widgets.CycleHotkeyLabel {
+            view_id='stairs_bottom_subtype',
+            frame={b=6, l=1, w=30},
+            key='CUSTOM_B',
+            label='Bottom Stair Type:',
+            visible=is_multi_level_stairs,
+            options={
+                {label='Auto', value='auto'},
+                {label='UpDown', value=df.construction_type.UpDownStair},
+                {label='Up', value=df.construction_type.UpStair},
+            },
+        },
+        widgets.CycleHotkeyLabel{
+            view_id='stairs_only_subtype',
+            frame={b=7, l=1, w=30},
+            key='CUSTOM_R',
+            label='Single level stair:',
+            visible=is_single_level_stairs,
+            options={
+                {label='Up', value=df.construction_type.UpStair},
+                {label='UpDown', value=df.construction_type.UpDownStair},
+                {label='Down', value=df.construction_type.DownStair},
+            },
+        },
+        widgets.CycleHotkeyLabel {  -- TODO: this thing also needs a slider
+            view_id='weapons',
+            frame={b=4, l=1, w=28},
+            key='CUSTOM_T',
+            key_back='CUSTOM_SHIFT_T',
+            label='Number of weapons:',
+            visible=is_weapon_or_spike_trap,
+            options={
+                        {label='(1)', value=1, pen=COLOR_YELLOW},
+                        {label='(2)', value=2, pen=COLOR_YELLOW},
+                        {label='(3)', value=3, pen=COLOR_YELLOW},
+                        {label='(4)', value=4, pen=COLOR_YELLOW},
+                        {label='(5)', value=5, pen=COLOR_YELLOW},
+                        {label='(6)', value=6, pen=COLOR_YELLOW},
+                        {label='(7)', value=7, pen=COLOR_YELLOW},
+                        {label='(8)', value=8, pen=COLOR_YELLOW},
+                        {label='(9)', value=9, pen=COLOR_YELLOW},
+                        {label='(10)', value=10, pen=COLOR_YELLOW},
+                    },
+            on_change=function(val) weapon_quantity = val end,
+        },
+        widgets.ToggleHotkeyLabel {
+            view_id='engraved',
+            frame={b=4, l=1, w=22},
+            key='CUSTOM_T',
+            label='Engraved only:',
+            visible=is_slab,
+            on_change=function(val)
+                buildingplan.setSpecial(uibs.building_type, uibs.building_subtype, uibs.custom_type, 'engraved', val)
+            end,
+        },
+        widgets.ToggleHotkeyLabel {
+            view_id='empty',
+            frame={b=4, l=1, w=22},
+            key='CUSTOM_T',
+            label='Empty only:',
+            visible=is_cage,
+            on_change=function(val)
+                buildingplan.setSpecial(uibs.building_type, uibs.building_subtype, uibs.custom_type, 'empty', val)
+            end,
+        },
+        widgets.Label{
+            frame={b=4, l=23},
+            text_pen=COLOR_DARKGREY,
+            text={
+                'Selected area: ',
+                {text=function()
+                     return ('%dx%dx%d'):format(get_cur_area_dims(self.saved_placement))
+                 end
+                },
+            },
+            visible=function()
+                return not cur_building_has_no_area() and (self.saved_placement or is_choosing_area())
+            end,
+        },
+        widgets.Panel{
+            visible=function() return #get_cur_filters() > 0 end,
+            subviews={
+                widgets.HotkeyLabel{
+                    frame={b=1, l=1, w=22},
+                    key='CUSTOM_F',
+                    label=function()
+                        return buildingplan.hasFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.selected - 1)
+                        and 'Edit filter' or 'Set filter'
+                     end,
+                    on_activate=function() self:set_filter(self.selected) end,
+                },
+                widgets.HotkeyLabel{
+                    frame={b=0, l=1, w=22},
+                    key='CUSTOM_X',
+                    label='Clear filter',
+                    on_activate=function() self:clear_filter(self.selected) end,
+                    enabled=function()
+                        return buildingplan.hasFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, self.selected - 1)
+                    end
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='choose',
+                    frame={b=0, l=23},
+                    key='CUSTOM_Z',
+                    label='Choose items:',
+                    label_below=true,
+                    options={
+                        {label='With filters', value=0},
+                        {
+                            label=function()
+                                local automaterial = itemselection.get_automaterial_selection(uibs.building_type)
+                                return ('Last used (%s)'):format(automaterial or 'pick manually')
+                            end,
+                            value=2,
+                        },
+                        {label='Manually', value=1},
+                    },
+                    initial_option=0,
+                    on_change=function(choose)
+                        buildingplan.setChooseItems(uibs.building_type, uibs.building_subtype, uibs.custom_type, choose)
+                    end,
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='safety',
+                    frame={b=2, l=23, w=25},
+                    key='CUSTOM_G',
+                    label='Building safety:',
+                    options={
+                        {label='Any', value=0},
+                        {label='Magma', value=2, pen=COLOR_RED},
+                        {label='Fire', value=1, pen=COLOR_LIGHTRED},
+                    },
+                    initial_option=0,
+                    on_change=function(heat)
+                        buildingplan.setHeatSafetyFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, heat)
+                    end,
+                },
+            },
+        },
+    }
+
+    local divider_widget = widgets.Panel{
+        view_id='divider',
+        frame={t=10, l=0, r=0, h=1},
+        on_render=self:callback('draw_divider_h'),
+        visible=self:callback('is_not_minimized'),
+    }
+
+    local error_panel = widgets.ResizingPanel{
+        view_id='errors',
+        frame={t=15, l=0, r=0},
+        frame_style=gui.BOLD_FRAME,
+        frame_background=gui.CLEAR_PEN,
+        visible=self:callback('is_not_minimized'),
+    }
+
+    error_panel:addviews{
+        widgets.WrappedLabel{
+            frame={t=0, l=1, r=0},
+            text_pen=COLOR_LIGHTRED,
+            text_to_wrap=get_placement_errors,
+            visible=function() return #uibs.errors > 0 end,
+        },
+        widgets.Label{
+            frame={t=0, l=1, r=0},
+            text_pen=COLOR_GREEN,
+            text='OK to build',
+            visible=function() return #uibs.errors == 0 end,
+        },
+    }
+
+    local prev_next_selector = widgets.Panel{
+        frame={h=1},
+        auto_width=true,
+        subviews={
+                widgets.HotkeyLabel{
+                    frame={t=0, l=1, w=9},
+                    key='CUSTOM_SHIFT_Q',
+                    key_sep='\0',
+                    label=': Prev/',
+                    on_activate=function() self.selected = ((self.selected - 2) % #get_cur_filters()) + 1 end,
+                },
+                widgets.HotkeyLabel{
+                    frame={t=0, l=2, w=1},
+                    key='CUSTOM_Q',
+                    on_activate=function() self.selected = (self.selected % #get_cur_filters()) + 1 end,
+                },
+                widgets.Label{
+                    frame={t=0,l=10},
+                    text='next item',
+                    on_click=function() self.selected = (self.selected % #get_cur_filters()) + 1 end,
+                },
+            },
+        visible=function() return #get_cur_filters() > 1 end,
+    }
+
+    local black_bar = widgets.Panel{
+        frame={t=0, l=1, w=37, h=1},
+        frame_inset=0,
+        frame_background=gui.CLEAR_PEN,
+        visible=self:callback('is_not_minimized'),
+        subviews={
+            prev_next_selector,
+        },
+    }
+
+    self:addviews{
+        black_bar,
+        minimized_panel,
+        main_panel,
+        divider_widget,
+        error_panel,
+    }
+end
+
+function PlannerOverlay:is_minimized()
+    return self.state.minimized
+end
+
+function PlannerOverlay:is_not_minimized()
+    return not self.state.minimized
+end
+
+function PlannerOverlay:toggle_minimized()
+    self.state.minimized = not self.state.minimized
+    config:write()
+    self:reset()
+end
+
+function PlannerOverlay:draw_divider_h(dc)
+    local x2 = dc.width -1
+    for x=0,x2 do
+        dc:seek(x, 0)
+        if x == 0 then
+            dc:char(nil, pens.HORI_LEFT_PEN)
+        elseif x == x2 then
+            dc:char(nil, pens.HORI_RIGHT_PEN)
+        else
+            dc:char(nil, pens.HORI_MID_PEN)
+        end
+    end
+end
+
+function PlannerOverlay:reset()
+    self.subviews.item1:reset()
+    self.subviews.item2:reset()
+    self.subviews.item3:reset()
+    self.subviews.item4:reset()
+    reset_counts_flag = false
+end
+
+function PlannerOverlay:set_filter(idx)
+    filterselection.FilterSelectionScreen{index=idx, desc=require('plugins.buildingplan').get_desc(get_cur_filters()[idx])}:show()
+end
+
+function PlannerOverlay:clear_filter(idx)
+    desc=require('plugins.buildingplan').clearFilter(uibs.building_type, uibs.building_subtype, uibs.custom_type, idx-1)
+end
+
+local function get_placement_data()
+    local direction = uibs.direction
+    local bounds = get_selected_bounds()
+    local width, height, depth = get_cur_area_dims(bounds)
+    local _, adjusted_width, adjusted_height = dfhack.buildings.getCorrectSize(
+            width, height, uibs.building_type, uibs.building_subtype,
+            uibs.custom_type, direction)
+    -- get the upper-left corner of the building/area at min z-level
+    local start_pos = bounds and xyz2pos(bounds.x1, bounds.y1, bounds.z1) or
+            xyz2pos(
+                uibs.pos.x - adjusted_width//2,
+                uibs.pos.y - adjusted_height//2,
+                uibs.pos.z)
+    if uibs.building_type == df.building_type.ScrewPump then
+        if direction == df.screw_pump_direction.FromSouth then
+            start_pos.y = start_pos.y + 1
+        elseif direction == df.screw_pump_direction.FromEast then
+            start_pos.x = start_pos.x + 1
+        end
+    end
+    local min_x, max_x = start_pos.x, start_pos.x
+    local min_y, max_y = start_pos.y, start_pos.y
+    local min_z, max_z = start_pos.z, start_pos.z
+    if adjusted_width == 1 and adjusted_height == 1
+            and (width > 1 or height > 1 or depth > 1) then
+        max_x = min_x + width - 1
+        max_y = min_y + height - 1
+        max_z = math.max(uibs.selection_pos.z, uibs.pos.z)
+    end
+    return {
+        x1=min_x, y1=min_y, z1=min_z,
+        x2=max_x, y2=max_y, z2=max_z,
+        width=adjusted_width,
+        height=adjusted_height
+    }
+end
+
+function PlannerOverlay:save_placement()
+    self.saved_placement = get_placement_data()
+    if (uibs.selection_pos:isValid()) then
+        self.saved_selection_pos_valid = true
+        self.saved_selection_pos = copyall(uibs.selection_pos)
+        self.saved_pos = copyall(uibs.pos)
+        uibs.selection_pos:clear()
+    else
+        local sp = self.saved_placement
+        self.saved_selection_pos = xyz2pos(sp.x1, sp.y1, sp.z1)
+        self.saved_pos = xyz2pos(sp.x2, sp.y2, sp.z2)
+        self.saved_pos.x = self.saved_pos.x + sp.width - 1
+        self.saved_pos.y = self.saved_pos.y + sp.height - 1
+    end
+end
+
+function PlannerOverlay:restore_placement()
+    if self.saved_selection_pos_valid then
+        uibs.selection_pos = self.saved_selection_pos
+        self.saved_selection_pos_valid = nil
+    else
+        uibs.selection_pos:clear()
+    end
+    self.saved_selection_pos = nil
+    self.saved_pos = nil
+    local placement_data = self.saved_placement
+    self.saved_placement = nil
+    return placement_data
+end
+
+function PlannerOverlay:onInput(keys)
+    if not is_plannable() then return false end
+    if keys.LEAVESCREEN or keys._MOUSE_R then
+        if uibs.selection_pos:isValid() then
+            uibs.selection_pos:clear()
+            return true
+        end
+        self.selected = 1
+        self.subviews.hollow:setOption(false)
+        self:reset()
+        reset_counts_flag = true
+        return false
+    end
+    if keys.CUSTOM_ALT_M then
+        self:toggle_minimized()
+        return true
+    end
+    if PlannerOverlay.super.onInput(self, keys) then
+        return true
+    end
+    if self:is_minimized() then return false end
+    if keys._MOUSE_L then
+        if is_over_options_panel() then return false end
+        local detect_rect = copyall(self.frame_rect)
+        detect_rect.height = self.subviews.main.frame_rect.height +
+                self.subviews.errors.frame_rect.height
+        detect_rect.y2 = detect_rect.y1 + detect_rect.height - 1
+        if self.subviews.main:getMousePos(gui.ViewRect{rect=detect_rect})
+                or self.subviews.errors:getMousePos() then
+            return true
+        end
+        if not is_construction() and #uibs.errors > 0 then return true end
+        if dfhack.gui.getMousePos() then
+            if is_choosing_area() or cur_building_has_no_area() then
+                local filters = get_cur_filters()
+                local num_filters = #filters
+                local choose = self.subviews.choose:getOptionValue()
+                if choose == 0 then
+                    self:place_building(get_placement_data())
+                else
+                    local bounds = get_selected_bounds()
+                    self:save_placement()
+                    local autoselect = choose == 2
+                    local is_hollow = self.subviews.hollow:getOptionValue()
+                    local chosen_items, active_screens = {}, {}
+                    local pending = num_filters
+                    df.global.game.main_interface.bottom_mode_selected = -1
+                    for idx = num_filters,1,-1 do
+                        chosen_items[idx] = {}
+                        local filter = filters[idx]
+                        local get_available_items_fn = function()
+                            return require('plugins.buildingplan').getAvailableItems(
+                                uibs.building_type, uibs.building_subtype, uibs.custom_type, idx-1)
+                        end
+                        local selection_screen = itemselection.ItemSelectionScreen{
+                            get_available_items_fn=get_available_items_fn,
+                            desc=require('plugins.buildingplan').get_desc(filter),
+                            quantity=get_quantity(filter, is_hollow, bounds),
+                            autoselect=autoselect,
+                            on_submit=function(items)
+                                chosen_items[idx] = items
+                                if active_screens[idx] then
+                                    active_screens[idx]:dismiss()
+                                    active_screens[idx] = nil
+                                else
+                                    active_screens[idx] = true
+                                end
+                                pending = pending - 1
+                                if pending == 0 then
+                                    df.global.game.main_interface.bottom_mode_selected = df.main_bottom_mode_type.BUILDING_PLACEMENT
+                                    self:place_building(self:restore_placement(), chosen_items)
+                                end
+                            end,
+                            on_cancel=function()
+                                for _,scr in pairs(active_screens) do
+                                    scr:dismiss()
+                                end
+                                df.global.game.main_interface.bottom_mode_selected = df.main_bottom_mode_type.BUILDING_PLACEMENT
+                                self:restore_placement()
+                            end,
+                        }
+                        if active_screens[idx] then
+                            -- we've already returned via autoselect
+                            active_screens[idx] = nil
+                        else
+                            active_screens[idx] = selection_screen:show()
+                        end
+                    end
+                end
+                return true
+            elseif not is_choosing_area() then
+                return false
+            end
+       end
+   end
+   return keys._MOUSE_L_DOWN or keys.SELECT
+end
+
+function PlannerOverlay:render(dc)
+    if not is_plannable() then return end
+    self.subviews.errors:updateLayout()
+    PlannerOverlay.super.render(self, dc)
+end
+
+local ONE_BY_ONE = xy2pos(1, 1)
+
+function PlannerOverlay:onRenderFrame(dc, rect)
+    PlannerOverlay.super.onRenderFrame(self, dc, rect)
+
+    if reset_counts_flag then
+        self:reset()
+        local buildingplan = require('plugins.buildingplan')
+        self.subviews.engraved:setOption(buildingplan.getSpecials(
+            uibs.building_type, uibs.building_subtype, uibs.custom_type).engraved or false)
+        self.subviews.empty:setOption(buildingplan.getSpecials(
+            uibs.building_type, uibs.building_subtype, uibs.custom_type).empty or false)
+        self.subviews.choose:setOption(buildingplan.getChooseItems(
+            uibs.building_type, uibs.building_subtype, uibs.custom_type))
+        self.subviews.safety:setOption(buildingplan.getHeatSafetyFilter(
+            uibs.building_type, uibs.building_subtype, uibs.custom_type))
+    end
+
+    if self:is_minimized() then return end
+
+    local bounds = get_selected_bounds(self.saved_selection_pos, self.saved_pos)
+    if not bounds then return end
+
+    local hollow = self.subviews.hollow:getOptionValue()
+    local default_pen = (self.saved_selection_pos or #uibs.errors == 0) and pens.GOOD_TILE_PEN or pens.BAD_TILE_PEN
+
+    local get_pen_fn = is_construction() and function(pos)
+        return dfhack.buildings.checkFreeTiles(pos, ONE_BY_ONE) and pens.GOOD_TILE_PEN or pens.BAD_TILE_PEN
+    end or function()
+        return default_pen
+    end
+
+    local function get_overlay_pen(pos)
+        if not hollow then return get_pen_fn(pos) end
+        if pos.x == bounds.x1 or pos.x == bounds.x2 or
+                pos.y == bounds.y1 or pos.y == bounds.y2 then
+            return get_pen_fn(pos)
+        end
+        return gui.TRANSPARENT_PEN
+    end
+
+    guidm.renderMapOverlay(get_overlay_pen, bounds)
+end
+
+function PlannerOverlay:get_stairs_subtype(pos, bounds)
+    local subtype = uibs.building_subtype
+    if pos.z == bounds.z1 then
+        local opt = bounds.z1 == bounds.z2 and self.subviews.stairs_only_subtype:getOptionValue() or
+            self.subviews.stairs_bottom_subtype:getOptionValue()
+        if opt == 'auto' then
+            local tt = dfhack.maps.getTileType(pos)
+            local shape = df.tiletype.attrs[tt].shape
+            if shape ~= df.tiletype_shape.STAIR_DOWN and shape ~= df.tiletype_shape.STAIR_UPDOWN then
+                subtype = df.construction_type.UpStair
+            end
+        else
+            subtype = opt
+        end
+    elseif pos.z == bounds.z2 then
+        local opt = self.subviews.stairs_top_subtype:getOptionValue()
+        if opt == 'auto' then
+            local tt = dfhack.maps.getTileType(pos)
+            local shape = df.tiletype.attrs[tt].shape
+            if shape ~= df.tiletype_shape.STAIR_UP and shape ~= df.tiletype_shape.STAIR_UPDOWN then
+                subtype = df.construction_type.DownStair
+            end
+        else
+            subtype = opt
+        end
+    end
+    return subtype
+end
+
+function PlannerOverlay:place_building(placement_data, chosen_items)
+    local pd = placement_data
+    local blds = {}
+    local hollow = self.subviews.hollow:getOptionValue()
+    local subtype = uibs.building_subtype
+    local filters = get_cur_filters()
+    if is_pressure_plate() or is_spike_trap() then
+        filters[1].quantity = get_quantity(filters[1])
+    elseif is_weapon_trap() then
+        filters[2].quantity = get_quantity(filters[2])
+    end
+    for z=pd.z1,pd.z2 do for y=pd.y1,pd.y2 do for x=pd.x1,pd.x2 do
+        if hollow and x ~= pd.x1 and x ~= pd.x2 and y ~= pd.y1 and y ~= pd.y2 then
+            goto continue
+        end
+        local pos = xyz2pos(x, y, z)
+        if is_stairs() then
+            subtype = self:get_stairs_subtype(pos, pd)
+        end
+        local bld, err = dfhack.buildings.constructBuilding{pos=pos,
+            type=uibs.building_type, subtype=subtype, custom=uibs.custom_type,
+            width=pd.width, height=pd.height,
+            direction=uibs.direction, filters=filters}
+        if err then
+            -- it's ok if some buildings fail to build
+            goto continue
+        end
+        -- assign fields for the types that need them. we can't pass them all in
+        -- to the call to constructBuilding since attempting to assign unrelated
+        -- fields to building types that don't support them causes errors.
+        for k,v in pairs(bld) do
+            if k == 'friction' then bld.friction = uibs.friction end
+            if k == 'use_dump' then bld.use_dump = uibs.use_dump end
+            if k == 'dump_x_shift' then bld.dump_x_shift = uibs.dump_x_shift end
+            if k == 'dump_y_shift' then bld.dump_y_shift = uibs.dump_y_shift end
+            if k == 'speed' then bld.speed = uibs.speed end
+            if k == 'plate_info' then utils.assign(bld.plate_info, uibs.plate_info) end
+        end
+        table.insert(blds, bld)
+        ::continue::
+    end end end
+    local used_quantity = is_construction() and #blds or false
+    self.subviews.item1:reduce_quantity(used_quantity)
+    self.subviews.item2:reduce_quantity(used_quantity)
+    self.subviews.item3:reduce_quantity(used_quantity)
+    self.subviews.item4:reduce_quantity(used_quantity)
+    local buildingplan = require('plugins.buildingplan')
+    for _,bld in ipairs(blds) do
+        -- attach chosen items and reduce job_item quantity
+        if chosen_items then
+            local job = bld.jobs[0]
+            local jitems = job.job_items
+            local num_filters = #get_cur_filters()
+            for idx=1,num_filters do
+                local item_ids = chosen_items[idx]
+                local jitem = jitems[num_filters-idx]
+                while jitem.quantity > 0 and #item_ids > 0 do
+                    local item_id = item_ids[#item_ids]
+                    local item = df.item.find(item_id)
+                    if not item then
+                        dfhack.printerr(('item no longer available: %d'):format(item_id))
+                        break
+                    end
+                    if not dfhack.job.attachJobItem(job, item, df.job_item_ref.T_role.Hauled, idx-1, -1) then
+                        dfhack.printerr(('cannot attach item: %d'):format(item_id))
+                        break
+                    end
+                    jitem.quantity = jitem.quantity - 1
+                    item_ids[#item_ids] = nil
+                end
+            end
+        end
+        buildingplan.addPlannedBuilding(bld)
+    end
+    buildingplan.scheduleCycle()
+    uibs.selection_pos:clear()
+end
+
+return _ENV
diff --git a/plugins/lua/burrow.lua b/plugins/lua/burrow.lua
new file mode 100644
index 000000000..42257dc50
--- /dev/null
+++ b/plugins/lua/burrow.lua
@@ -0,0 +1,228 @@
+local _ENV = mkmodule('plugins.burrow')
+
+local argparse = require('argparse')
+local overlay = require('plugins.overlay')
+local widgets = require('gui.widgets')
+
+---------------------------------
+-- BurrowDesignationOverlay
+--
+
+local selection_rect = df.global.selection_rect
+local if_burrow = df.global.game.main_interface.burrow
+
+local function is_choosing_area(pos)
+    return if_burrow.doing_rectangle and
+        selection_rect.start_z >= 0 and
+        (pos or dfhack.gui.getMousePos())
+end
+
+local function reset_selection_rect()
+    selection_rect.start_x = -30000
+    selection_rect.start_y = -30000
+    selection_rect.start_z = -30000
+end
+
+local function clamp(pos)
+    return xyz2pos(
+        math.max(0, math.min(df.global.world.map.x_count-1, pos.x)),
+        math.max(0, math.min(df.global.world.map.y_count-1, pos.y)),
+        math.max(0, math.min(df.global.world.map.z_count-1, pos.z)))
+end
+
+local function get_bounds(pos1, pos2)
+    pos1 = clamp(pos1 or dfhack.gui.getMousePos(true))
+    pos2 = clamp(pos2 or xyz2pos(selection_rect.start_x, selection_rect.start_y, selection_rect.start_z))
+    return {
+        x1=math.min(pos1.x, pos2.x),
+        x2=math.max(pos1.x, pos2.x),
+        y1=math.min(pos1.y, pos2.y),
+        y2=math.max(pos1.y, pos2.y),
+        z1=math.min(pos1.z, pos2.z),
+        z2=math.max(pos1.z, pos2.z),
+    }
+end
+
+local function get_cur_area_dims()
+    local bounds = get_bounds()
+    return bounds.x2 - bounds.x1 + 1,
+            bounds.y2 - bounds.y1 + 1,
+            bounds.z2 - bounds.z1 + 1
+end
+
+BurrowDesignationOverlay = defclass(BurrowDesignationOverlay, overlay.OverlayWidget)
+BurrowDesignationOverlay.ATTRS{
+    default_pos={x=6,y=9},
+    viewscreens='dwarfmode/Burrow/Paint',
+    default_enabled=true,
+    frame={w=54, h=1},
+}
+
+function BurrowDesignationOverlay:init()
+    self:addviews{
+        widgets.BannerPanel{
+            frame={t=0, l=0},
+            subviews={
+                widgets.Label{
+                    frame={t=0, l=1},
+                    text='Double-click to fill. Shift double-click to 3D fill.',
+                    auto_width=true,
+                    visible=function() return not is_choosing_area() end,
+                },
+                widgets.Label{
+                    frame={t=0, l=1},
+                    text_pen=COLOR_DARKGREY,
+                    text={
+                        '3D box select enabled: ',
+                        {text=function() return ('%dx%dx%d'):format(get_cur_area_dims()) end},
+                    },
+                    visible=is_choosing_area,
+                },
+            },
+        },
+    }
+end
+
+local function flood_fill(pos, erasing, do_3d, painting_burrow)
+    local opts = {zlevel=not do_3d}
+    if erasing then
+        burrow_tiles_flood_remove(painting_burrow, pos, opts)
+    else
+        burrow_tiles_flood_add(painting_burrow, pos, opts)
+    end
+    reset_selection_rect()
+end
+
+local function box_fill(bounds, erasing, painting_burrow)
+    if bounds.z1 == bounds.z2 then return end
+    if erasing then
+        burrow_tiles_box_remove(painting_burrow, bounds)
+    else
+        burrow_tiles_box_add(painting_burrow, bounds)
+    end
+end
+
+function BurrowDesignationOverlay:onInput(keys)
+    if self:inputToSubviews(keys) then
+        return true
+    -- don't perform burrow modifications immediately -- painting_burrow may not yet
+    -- have been initialized. instead, allow clicks to go through so that vanilla
+    -- behavior is triggered before we modify the burrow further
+    elseif keys._MOUSE_L then
+        local pos = dfhack.gui.getMousePos(true)
+        if pos then
+            local now_ms = dfhack.getTickCount()
+            if not same_xyz(pos, self.saved_pos) then
+                self.last_click_ms = now_ms
+                self.saved_pos = pos
+            else
+                if now_ms - self.last_click_ms <= widgets.DOUBLE_CLICK_MS then
+                    self.last_click_ms = 0
+                    self.pending_fn = curry(flood_fill, pos, if_burrow.erasing, dfhack.internal.getModifiers().shift)
+                    return
+                else
+                    self.last_click_ms = now_ms
+                end
+            end
+            if is_choosing_area(pos) then
+                self.pending_fn = curry(box_fill, get_bounds(pos), if_burrow.erasing)
+                return
+            end
+        end
+    end
+end
+
+function BurrowDesignationOverlay:onRenderBody(dc)
+    BurrowDesignationOverlay.super.onRenderBody(self, dc)
+    local pending_fn = self.pending_fn
+    self.pending_fn = nil
+    if pending_fn and if_burrow.painting_burrow then
+        pending_fn(if_burrow.painting_burrow)
+    end
+end
+
+OVERLAY_WIDGETS = {
+    designation=BurrowDesignationOverlay,
+}
+
+rawset_default(_ENV, dfhack.burrows)
+
+---------------------------------
+-- commandline handling
+--
+
+local function set_add_remove(mode, which, params, _)
+    local target_burrow = table.remove(params, 1)
+    _ENV[('burrow_%s_%s'):format(mode, which)](target_burrow, params)
+end
+
+local function tiles_box_add_remove(which, params, opts)
+    local target_burrow = table.remove(params, 1)
+    local pos1 = argparse.coords(params[1] or 'here', 'pos')
+    local pos2 = opts.cursor or argparse.coords(params[2] or 'here', 'pos')
+    local bounds = get_bounds(pos1, pos2)
+    _ENV['burrow_tiles_box_'..which](target_burrow, bounds)
+end
+
+local function tiles_flood_add_remove(which, params, opts)
+    local target_burrow = table.remove(params, 1)
+    local pos = opts.cursor or argparse.coords('here', 'pos')
+    _ENV['burrow_tiles_flood_'..which](target_burrow, pos, opts)
+end
+
+local function run_command(mode, command, params, opts)
+    if mode == 'tiles' then
+        if command == 'clear' then
+            burrow_tiles_clear(params)
+        elseif command == 'set' or command == 'add' or command == 'remove' then
+            set_add_remove('tiles', command, params, opts)
+        elseif command == 'box-add' or command == 'box-remove' then
+            tiles_box_add_remove(command:sub(5), params, opts)
+        elseif command == 'flood-add' or command == 'flood-remove' then
+            tiles_flood_add_remove(command:sub(7), params, opts)
+        else
+            return false
+        end
+    elseif mode == 'units' then
+        if command == 'clear' then
+            burrow_units_clear(params)
+        elseif command == 'set' or command == 'add' or command == 'remove' then
+            set_add_remove('units', command, params, opts)
+        else
+            return false
+        end
+    else
+        return false
+    end
+    return true
+end
+
+function parse_commandline(...)
+    local args, opts = {...}, {}
+
+    if args[1] == 'help' then
+        return false
+    end
+
+    local positionals = argparse.processArgsGetopt(args, {
+            {'c', 'cursor', hasArg=true,
+             handler=function(optarg) opts.cursor = argparse.coords(optarg, 'cursor') end},
+            {'h', 'help', handler=function() opts.help = true end},
+            {'z', 'cur-zlevel', handler=function() opts.zlevel = true end},
+        })
+
+    if opts.help then
+        return false
+    end
+
+    local mode = table.remove(positionals, 1)
+    local command = table.remove(positionals, 1)
+    local ret = run_command(mode, command, positionals, opts)
+
+    if not ret then return false end
+
+    print('done')
+    return true
+end
+
+return _ENV
diff --git a/plugins/lua/burrows.lua b/plugins/lua/burrows.lua
deleted file mode 100644
index 7c8753bf7..000000000
--- a/plugins/lua/burrows.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local _ENV = mkmodule('plugins.burrows')
-
---[[
-
- Native events:
-
- * onBurrowRename(burrow)
- * onDigComplete(job_type,pos,old_tiletype,new_tiletype)
-
- Native functions:
-
- * findByName(name) -> burrow
- * copyUnits(dest,src,enable)
- * copyTiles(dest,src,enable)
- * setTilesByKeyword(dest,kwd,enable) -> success
-
- 'enable' selects between add and remove modes
-
---]]
-
-rawset_default(_ENV, dfhack.burrows)
-
-return _ENV
diff --git a/plugins/lua/confirm.lua b/plugins/lua/confirm.lua
index e36a4fb86..2fcbfa721 100644
--- a/plugins/lua/confirm.lua
+++ b/plugins/lua/confirm.lua
@@ -1,7 +1,5 @@
 local _ENV = mkmodule('plugins.confirm')
 
-local ui = df.global.ui
-
 local confs = {}
 -- Wraps df.interface_key[foo] functionality but fails with invalid keys
 keys = {}
@@ -11,10 +9,14 @@ setmetatable(keys, {
     end,
     __newindex = function() error('Table is read-only') end
 })
+-- Mouse keys will be sent as a string instead of interface_key
+local MOUSE_LEFT = "MOUSE_LEFT"
+local MOUSE_RIGHT = "MOUSE_RIGHT"
+
 --[[ The screen where a confirmation has been triggered
 Note that this is *not* necessarily the topmost viewscreen, so do not use
 gui.getCurViewscreen() or related functions. ]]
-screen = nil
+--screen = nil
 
 function if_nil(obj, default)
     if obj == nil then
@@ -55,20 +57,97 @@ is equivalent to:
 
 ]]
 
+trade_cancel = defconf('trade-cancel')
+function trade_cancel.intercept_key(key)
+    return dfhack.gui.matchFocusString("dwarfmode/Trade") and
+    (key == keys.LEAVESCREEN or key == MOUSE_RIGHT) and
+    (trader_goods_selected() or broker_goods_selected())
+end
+trade_cancel.title = "Cancel trade"
+trade_cancel.message = "Are you sure you want leave this screen?\nSelected items will not be saved."
+
+haul_delete_route = defconf('haul-delete-route')
+function haul_delete_route.intercept_key(key)
+    return df.global.game.main_interface.current_hover == 180 and key == MOUSE_LEFT
+end
+haul_delete_route.title = "Confirm deletion"
+haul_delete_route.message = "Are you sure you want to delete this route?"
+
+haul_delete_stop = defconf('haul-delete-stop')
+function haul_delete_stop.intercept_key(key)
+    return df.global.game.main_interface.current_hover == 185 and key == MOUSE_LEFT
+end
+haul_delete_stop.title = "Confirm deletion"
+haul_delete_stop.message = "Are you sure you want to delete this stop?"
+
+depot_remove = defconf('depot-remove')
+function depot_remove.intercept_key(key)
+    if df.global.game.main_interface.current_hover == 301 and
+            key == MOUSE_LEFT and
+            df.building_tradedepotst:is_instance(dfhack.gui.getSelectedBuilding(true)) then
+        for _, caravan in pairs(df.global.plotinfo.caravans) do
+            if caravan.time_remaining > 0 then
+                return true
+            end
+        end
+    end
+end
+depot_remove.title = "Confirm depot removal"
+depot_remove.message = "Are you sure you want to remove this depot?\n" ..
+    "Merchants are present and will lose profits."
+
+squad_disband = defconf('squad-disband')
+function squad_disband.intercept_key(key)
+    return key == MOUSE_LEFT and df.global.game.main_interface.current_hover == 343
+end
+squad_disband.title = "Disband squad"
+squad_disband.message = "Are you sure you want to disband this squad?"
+
+order_remove = defconf('order-remove')
+function order_remove.intercept_key(key)
+    return key == MOUSE_LEFT and df.global.game.main_interface.current_hover == 222
+end
+order_remove.title = "Remove manager order"
+order_remove.message = "Are you sure you want to remove this order?"
+
+zone_remove = defconf('zone-remove')
+function zone_remove.intercept_key(key)
+    return key == MOUSE_LEFT and df.global.game.main_interface.current_hover == 130
+end
+zone_remove.title = "Remove zone"
+zone_remove.message = "Are you sure you want to remove this zone?"
+
+burrow_remove = defconf('burrow-remove')
+function burrow_remove.intercept_key(key)
+    return key == MOUSE_LEFT and
+        (df.global.game.main_interface.current_hover == 171 or
+         df.global.game.main_interface.current_hover == 168)
+end
+burrow_remove.title = "Remove burrow"
+burrow_remove.message = "Are you sure you want to remove this burrow?"
+
+stockpile_remove = defconf('stockpile-remove')
+function stockpile_remove.intercept_key(key)
+    return key == MOUSE_LEFT and df.global.game.main_interface.current_hover == 118
+end
+stockpile_remove.title = "Remove stockpile"
+stockpile_remove.message = "Are you sure you want to remove this stockpile?"
+
+-- these confirmations have more complex button detection requirements
+--[[
 trade = defconf('trade')
 function trade.intercept_key(key)
-    return screen.in_edit_count == 0 and
-        key == keys.TRADE_TRADE
+    dfhack.gui.matchFocusString("dwarfmode/Trade") and key == MOUSE_LEFT and hovering over trade button?
 end
 trade.title = "Confirm trade"
 function trade.get_message()
-    if trader_goods_selected(screen) and broker_goods_selected(screen) then
+    if trader_goods_selected() and broker_goods_selected() then
         return "Are you sure you want to trade the selected goods?"
-    elseif trader_goods_selected(screen) then
+    elseif trader_goods_selected() then
         return "You are not giving any items. This is likely\n" ..
             "to irritate the merchants.\n" ..
             "Attempt to trade anyway?"
-    elseif broker_goods_selected(screen) then
+    elseif broker_goods_selected() then
         return "You are not receiving any items. You may want to\n" ..
             "offer these items instead or choose items to receive.\n" ..
             "Attempt to trade anyway?"
@@ -79,19 +158,10 @@ function trade.get_message()
     end
 end
 
-trade_cancel = defconf('trade-cancel')
-function trade_cancel.intercept_key(key)
-    return screen.in_edit_count == 0 and
-        key == keys.LEAVESCREEN and
-        (trader_goods_selected(screen) or broker_goods_selected(screen))
-end
-trade_cancel.title = "Cancel trade"
-trade_cancel.message = "Are you sure you want leave this screen?\nSelected items will not be saved."
-
 trade_seize = defconf('trade-seize')
 function trade_seize.intercept_key(key)
     return screen.in_edit_count == 0 and
-        trader_goods_selected(screen) and
+        trader_goods_selected() and
         key == keys.TRADE_SEIZE
 end
 trade_seize.title = "Confirm seize"
@@ -100,7 +170,7 @@ trade_seize.message = "Are you sure you want to seize these goods?"
 trade_offer = defconf('trade-offer')
 function trade_offer.intercept_key(key)
     return screen.in_edit_count == 0 and
-        broker_goods_selected(screen) and
+        broker_goods_selected() and
         key == keys.TRADE_OFFER
 end
 trade_offer.title = "Confirm offer"
@@ -109,9 +179,9 @@ trade_offer.message = "Are you sure you want to offer these goods?\nYou will rec
 trade_select_all = defconf('trade-select-all')
 function trade_select_all.intercept_key(key)
     if screen.in_edit_count == 0 and key == keys.SEC_SELECT then
-        if screen.in_right_pane and broker_goods_selected(screen) and not broker_goods_all_selected(screen) then
+        if screen.in_right_pane and broker_goods_selected() and not broker_goods_all_selected() then
             return true
-        elseif not screen.in_right_pane and trader_goods_selected(screen) and not trader_goods_all_selected(screen) then
+        elseif not screen.in_right_pane and trader_goods_selected() and not trader_goods_all_selected() then
             return true
         end
     end
@@ -121,49 +191,6 @@ trade_select_all.title = "Confirm selection"
 trade_select_all.message = "Selecting all goods will overwrite your current selection\n" ..
         "and cannot be undone. Continue?"
 
-haul_delete = defconf('haul-delete')
-function haul_delete.intercept_key(key)
-    if ui.main.mode == df.ui_sidebar_mode.Hauling and
-            #ui.hauling.view_routes > 0 and
-            not ui.hauling.in_name and
-            not ui.hauling.in_stop and
-            not ui.hauling.in_assign_vehicle then
-        return key == keys.D_HAULING_REMOVE
-    end
-    return false
-end
-haul_delete.title = "Confirm deletion"
-function haul_delete.get_message()
-    local t = ui.hauling.view_stops[ui.hauling.cursor_top] and "stop" or "route"
-    return "Are you sure you want to delete this " ..
-        (ui.hauling.view_stops[ui.hauling.cursor_top] and "stop" or "route") .. "?"
-end
-
-depot_remove = defconf('depot-remove')
-function depot_remove.intercept_key(key)
-    if df.building_tradedepotst:is_instance(dfhack.gui.getSelectedBuilding(true)) and
-            key == keys.DESTROYBUILDING then
-        for _, caravan in pairs(ui.caravans) do
-            if caravan.time_remaining > 0 then
-                return true
-            end
-        end
-    end
-end
-depot_remove.title = "Confirm depot removal"
-depot_remove.message = "Are you sure you want to remove this depot?\n" ..
-    "Merchants are present and will lose profits."
-
-squad_disband = defconf('squad-disband')
-function squad_disband.intercept_key(key)
-    return key == keys.D_MILITARY_DISBAND_SQUAD and
-        screen.page == screen._type.T_page.Positions and
-        screen.num_squads > 0 and
-        not screen.in_rename_alert
-end
-squad_disband.title = "Disband squad"
-squad_disband.message = "Are you sure you want to disband this squad?"
-
 uniform_delete = defconf('uniform-delete')
 function uniform_delete.intercept_key(key)
     return key == keys.D_MILITARY_DELETE_UNIFORM and
@@ -193,17 +220,6 @@ end
 route_delete.title = "Delete route"
 route_delete.message = "Are you sure you want to delete this route?"
 
-location_retire = defconf('location-retire')
-function location_retire.intercept_key(key)
-    return key == keys.LOCATION_RETIRE and
-        (screen.menu == df.viewscreen_locationsst.T_menu.Locations or
-            screen.menu == df.viewscreen_locationsst.T_menu.Occupations) and
-        screen.in_edit == df.viewscreen_locationsst.T_in_edit.None and
-        screen.locations[screen.location_idx]
-end
-location_retire.title = "Retire location"
-location_retire.message = "Are you sure you want to retire this location?"
-
 convict = defconf('convict')
 convict.title = "Confirm conviction"
 function convict.intercept_key(key)
@@ -218,14 +234,21 @@ function convict.get_message()
     return "Are you sure you want to convict " .. name .. "?\n" ..
         "This action is irreversible."
 end
+]]--
 
-order_remove = defconf('order-remove')
-function order_remove.intercept_key(key)
-    return key == keys.MANAGER_REMOVE and
-        not screen.in_max_workshops
+-- locations cannot be retired currently
+--[[
+location_retire = defconf('location-retire')
+function location_retire.intercept_key(key)
+    return key == keys.LOCATION_RETIRE and
+        (screen.menu == df.viewscreen_locationsst.T_menu.Locations or
+            screen.menu == df.viewscreen_locationsst.T_menu.Occupations) and
+        screen.in_edit == df.viewscreen_locationsst.T_in_edit.None and
+        screen.locations[screen.location_idx]
 end
-order_remove.title = "Remove manager order"
-order_remove.message = "Are you sure you want to remove this order?"
+location_retire.title = "Retire location"
+location_retire.message = "Are you sure you want to retire this location?"
+]]--
 
 -- End of confirmation definitions
 
diff --git a/plugins/lua/design.lua b/plugins/lua/design.lua
new file mode 100644
index 000000000..ec3b4c79b
--- /dev/null
+++ b/plugins/lua/design.lua
@@ -0,0 +1,3 @@
+local _ENV = mkmodule('plugins.design')
+
+return _ENV
diff --git a/plugins/lua/dig.lua b/plugins/lua/dig.lua
new file mode 100644
index 000000000..e24885c08
--- /dev/null
+++ b/plugins/lua/dig.lua
@@ -0,0 +1,49 @@
+local _ENV = mkmodule('plugins.dig')
+
+local overlay = require('plugins.overlay')
+local pathable = require('plugins.pathable')
+
+WarmDampOverlay = defclass(WarmDampOverlay, overlay.OverlayWidget)
+WarmDampOverlay.ATTRS{
+    viewscreens={
+        'dwarfmode/Designate/DIG_DIG',
+        'dwarfmode/Designate/DIG_REMOVE_STAIRS_RAMPS',
+        'dwarfmode/Designate/DIG_STAIR_UP',
+        'dwarfmode/Designate/DIG_STAIR_UPDOWN',
+        'dwarfmode/Designate/DIG_STAIR_DOWN',
+        'dwarfmode/Designate/DIG_RAMP',
+        'dwarfmode/Designate/DIG_CHANNEL',
+        'dwarfmode/Designate/DIG_FROM_MARKER',
+        'dwarfmode/Designate/DIG_TO_MARKER',
+    },
+    default_enabled=true,
+    overlay_only=true,
+}
+
+function WarmDampOverlay:onRenderFrame()
+    pathable.paintScreenWarmDamp()
+end
+
+CarveOverlay = defclass(CarveOverlay, overlay.OverlayWidget)
+CarveOverlay.ATTRS{
+    viewscreens={
+        'dwarfmode/Designate/SMOOTH',
+        'dwarfmode/Designate/ENGRAVE',
+        'dwarfmode/Designate/TRACK',
+        'dwarfmode/Designate/FORTIFY',
+        'dwarfmode/Designate/ERASE',
+    },
+    default_enabled=true,
+    overlay_only=true,
+}
+
+function CarveOverlay:onRenderFrame()
+    pathable.paintScreenCarve()
+end
+
+OVERLAY_WIDGETS = {
+    asciiwarmdamp=WarmDampOverlay,
+    asciicarve=CarveOverlay,
+}
+
+return _ENV
diff --git a/plugins/lua/dwarfvet.lua b/plugins/lua/dwarfvet.lua
new file mode 100644
index 000000000..2bda976b7
--- /dev/null
+++ b/plugins/lua/dwarfvet.lua
@@ -0,0 +1,178 @@
+local _ENV = mkmodule('plugins.dwarfvet')
+
+local argparse = require('argparse')
+local utils = require('utils')
+
+local function is_valid_animal(unit)
+    return unit and
+        dfhack.units.isActive(unit) and
+        dfhack.units.isAnimal(unit) and
+        dfhack.units.isFortControlled(unit) and
+        dfhack.units.isTame(unit) and
+        not dfhack.units.isDead(unit)
+end
+
+local function get_cur_patients()
+    local cur_patients = {}
+    for _,job in utils.listpairs(df.global.world.jobs.list) do
+        if job.job_type ~= df.job_type.Rest then goto continue end
+        local unit = dfhack.job.getWorker(job)
+        if is_valid_animal(unit) then
+            cur_patients[unit] = true
+        end
+        ::continue::
+    end
+    return cur_patients
+end
+
+local function get_new_patients(cur_patients)
+    cur_patients = cur_patients or get_cur_patients()
+    local new_patients = {}
+    for _,unit in ipairs(df.global.world.units.active) do
+        if unit.job.current_job then goto continue end
+        if cur_patients[unit] or not is_valid_animal(unit) then goto continue end
+        if not unit.health or not unit.health.flags.needs_healthcare then goto continue end
+        table.insert(new_patients, unit)
+        ::continue::
+    end
+    return new_patients
+end
+
+local function print_status()
+    print(('dwarfvet is %srunning'):format(isEnabled() and '' or 'not '))
+    print()
+    print('The following animals are receiving treatment:')
+    local cur_patients = get_cur_patients()
+    if not next(cur_patients) then
+        print('  None')
+    else
+        for unit in pairs(cur_patients) do
+            print(('  %s (%d)'):format(dfhack.units.getReadableName(unit), unit.id))
+        end
+    end
+    print()
+    print('The following animals are injured and need treatment:')
+    local new_patients = get_new_patients(cur_patients)
+    if #new_patients == 0 then
+        print('  None')
+    else
+        for _,unit in ipairs(new_patients) do
+            print(('  %s (%d)'):format(dfhack.units.getReadableName(unit), unit.id))
+        end
+    end
+end
+
+HospitalZone = defclass(HospitalZone)
+HospitalZone.ATTRS{
+    zone=DEFAULT_NIL,
+}
+
+local ONE_TILE = xy2pos(1, 1)
+
+function HospitalZone:find_spot(unit_pos)
+    self.x = self.x or self.zone.x1
+    self.y = self.y or self.zone.y1
+    local zone = self.zone
+    for y=self.y,zone.y2 do
+        for x=self.x,zone.x2 do
+            local pos = xyz2pos(x, y, zone.z)
+            if dfhack.maps.canWalkBetween(unit_pos, pos) and
+                dfhack.buildings.containsTile(zone, x, y) and
+                dfhack.buildings.checkFreeTiles(pos, ONE_TILE)
+            then
+                return pos
+            end
+        end
+    end
+end
+
+-- TODO: If health.requires_recovery is set, the creature can't move under its own power
+--   and a Recover Wounded or Pen/Pasture job must be created by hand
+function HospitalZone:assign_spot(unit, unit_pos)
+    local pos = self:find_spot(unit_pos)
+    if not pos then return false end
+    local job = df.new(df.job)
+    dfhack.job.linkIntoWorld(job, true)
+    job.pos.x = pos.x
+    job.pos.y = pos.y
+    job.pos.z = pos.z
+    job.flags.special = true
+    job.job_type = df.job_type.Rest
+    local gref = df.new(df.general_ref_unit_workerst)
+    gref.unit_id = unit.id
+    job.general_refs:insert('#', gref)
+    unit.job.current_job = job
+    return true
+end
+
+local function get_hospital_zones()
+    local hospital_zones = {}
+    local site = df.global.world.world_data.active_site[0]
+    for _,location in ipairs(site.buildings) do
+        if not df.abstract_building_hospitalst:is_instance(location) then goto continue end
+        for _,bld_id in ipairs(location.contents.building_ids) do
+            local zone = df.building.find(bld_id)
+            if zone then
+                table.insert(hospital_zones, HospitalZone{zone=zone})
+            end
+        end
+        ::continue::
+    end
+    return hospital_zones
+end
+
+local function distance(zone, pos)
+    return math.abs(zone.x1 - pos.x) + math.abs(zone.y1 - pos.y) + 50*math.abs(zone.z - pos.z)
+end
+
+function checkup()
+    local new_patients = get_new_patients()
+    if #new_patients == 0 then return end
+    local hospital_zones = get_hospital_zones()
+    local assigned = 0
+    for _,unit in ipairs(new_patients) do
+        local unit_pos = xyz2pos(dfhack.units.getPosition(unit))
+        table.sort(hospital_zones,
+            function(a, b) return distance(a.zone, unit_pos) < distance(b.zone, unit_pos) end)
+        for _,hospital_zone in ipairs(hospital_zones) do
+            if hospital_zone:assign_spot(unit, unit_pos) then
+                assigned = assigned + 1
+                break
+            end
+        end
+    end
+    print(('dwarfvet scheduled treatment for %d of %d injured animals'):format(assigned, #new_patients))
+end
+
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
+    end
+
+    return argparse.processArgsGetopt(args, {
+            {'h', 'help', handler=function() opts.help = true end},
+        })
+end
+
+function parse_commandline(args)
+    local opts = {}
+    local positionals = process_args(opts, args)
+
+    if opts.help or not positionals then
+        return false
+    end
+
+    local command = positionals[1]
+    if not command or command == 'status' then
+        print_status()
+    elseif command == 'now' then
+        dwarfvet_cycle()
+    else
+        return false
+    end
+
+    return true
+end
+
+return _ENV
diff --git a/plugins/lua/eventful.lua b/plugins/lua/eventful.lua
index 1e3170c45..4cbcbeef2 100644
--- a/plugins/lua/eventful.lua
+++ b/plugins/lua/eventful.lua
@@ -54,10 +54,10 @@ local function onPostSidebar(workshop)
     if shop_id then
         if _registeredStuff.shopNonNative and _registeredStuff.shopNonNative[shop_id]  then
             if _registeredStuff.shopNonNative[shop_id].all then
-                --[[for _,button in ipairs(df.global.ui_sidebar_menus.workshop_job.choices_all) do
+                --[[for _,button in ipairs(df.global.game.workshop_job.choices_all) do
                     button.is_hidden=true
                 end]]
-                df.global.ui_sidebar_menus.workshop_job.choices_visible:resize(0)
+                df.global.game.workshop_job.choices_visible:resize(0)
             else
                 --todo by name
             end
@@ -72,7 +72,7 @@ local function onPostSidebar(workshop)
                 new_button.job_type=df.job_type.CustomReaction --could be used for other stuff too i guess...
                 new_button.reaction_name=reaction_name
                 new_button.is_custom=true
-                local wjob=df.global.ui_sidebar_menus.workshop_job
+                local wjob=df.global.game.workshop_job
                 wjob.choices_all:insert("#",new_button)
                 wjob.choices_visible:insert("#",new_button)
             end
diff --git a/plugins/lua/fortplan.lua b/plugins/lua/fortplan.lua
deleted file mode 100644
index 71e69c69d..000000000
--- a/plugins/lua/fortplan.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local _ENV = mkmodule('plugins.fortplan')
-
-require('dfhack.buildings')
-
-function construct_building_from_params(building_type, x, y, z)
-    local pos = xyz2pos(x, y, z)
-    local bld, err =
-            dfhack.buildings.constructBuilding{type=building_type, pos=pos}
-    if err then error(err) end
-    return bld
-end
-
-return _ENV
diff --git a/plugins/lua/hotkeys.lua b/plugins/lua/hotkeys.lua
index c5e36293f..4c33f93ca 100644
--- a/plugins/lua/hotkeys.lua
+++ b/plugins/lua/hotkeys.lua
@@ -5,60 +5,107 @@ local helpdb = require('helpdb')
 local overlay = require('plugins.overlay')
 local widgets = require('gui.widgets')
 
+local logo_textures = dfhack.textures.loadTileset('hack/data/art/logo.png', 8, 12, true)
+local logo_hovered_textures = dfhack.textures.loadTileset('hack/data/art/logo_hovered.png', 8, 12, true)
+
+local function get_command(cmdline)
+    local first_word = cmdline:trim():split(' +')[1]
+    if first_word:startswith(':') then first_word = first_word:sub(2) end
+    return first_word
+end
+
+function should_hide_armok(cmdline)
+    local command = get_command(cmdline)
+    return dfhack.getHideArmokTools() and
+            helpdb.is_entry(command) and
+            helpdb.get_entry_tags(command).armok
+end
+
 -- ----------------- --
 -- HotspotMenuWidget --
 -- ----------------- --
 
 HotspotMenuWidget = defclass(HotspotMenuWidget, overlay.OverlayWidget)
 HotspotMenuWidget.ATTRS{
-    default_pos={x=2,y=2},
-    hotspot=true,
-    viewscreens='all',
-    overlay_onupdate_max_freq_seconds=0,
+    default_pos={x=5,y=1},
+    default_enabled=true,
+    version=2,
+    viewscreens={
+        'adopt_region',
+        'choose_game_type',
+        -- 'choose_start_site', -- conflicts with vanilla panel layouts
+        'dwarfmode',
+        'export_region',
+        'game_cleaner',
+        'initial_prep',
+        -- 'legends', -- conflicts with vanilla export button and info text
+        -- 'loadgame', -- disable temporarily while we get texture reloading sorted
+        -- 'new_arena', -- conflicts with vanilla panel layouts
+        -- 'new_region', -- conflicts with vanilla panel layouts
+        'savegame',
+        'setupdwarfgame',
+        'title/Default',
+        'update_region',
+        'world'
+    },
     frame={w=4, h=3}
 }
 
 function HotspotMenuWidget:init()
-    self:addviews{widgets.Label{text={'!DF!', NEWLINE, '!Ha!', NEWLINE, '!ck!'}}}
-    self.mouseover = false
-end
-
-function HotspotMenuWidget:overlay_onupdate()
-    local hasMouse = self:getMousePos()
-    if hasMouse and not self.mouseover then
-        self.mouseover = true
-        return true
+    local to_pen = dfhack.pen.parse
+    local function tp(idx, ch)
+        return to_pen{
+            tile=function() return dfhack.textures.getTexposByHandle(logo_textures[idx]) end,
+            ch=ch,
+            fg=COLOR_GREY,
+        }
+    end
+    local function tph(idx, ch)
+        return to_pen{
+            tile=function() return dfhack.textures.getTexposByHandle(logo_hovered_textures[idx]) end,
+            ch=ch,
+            fg=COLOR_WHITE,
+            bold=true,
+        }
+    end
+    local function get_tile_token(idx, ch)
+        return {
+            tile=tp(idx, ch),
+            htile=tph(idx, ch),
+            width=1,
+        }
     end
-    self.mouseover = hasMouse
+
+    self:addviews{
+        widgets.Label{
+            text={
+                get_tile_token(1, 179), get_tile_token(2, 'D'), get_tile_token(3, 'F'), get_tile_token(4, 179), NEWLINE,
+                get_tile_token(5, 179), get_tile_token(6, 'H'), get_tile_token(7, 'a'), get_tile_token(8, 179), NEWLINE,
+                get_tile_token(9, 179), get_tile_token(10, 'c'), get_tile_token(11, 'k'), get_tile_token(12, 179),
+            },
+            on_click=function() dfhack.run_command('hotkeys') end,
+        },
+    }
 end
 
 function HotspotMenuWidget:overlay_trigger()
-    local hotkeys, bindings = getHotkeys()
-    return MenuScreen{
-        hotspot_frame=self.frame,
-        hotkeys=hotkeys,
-        bindings=bindings,
-        mouseover=self.mouseover}:show()
+    return MenuScreen{hotspot=self}:show()
 end
 
 -- register the menu hotspot with the overlay
 OVERLAY_WIDGETS = {menu=HotspotMenuWidget}
 
--- ---------- --
--- MenuScreen --
--- ---------- --
+-- ---- --
+-- Menu --
+-- ---- --
 
 local ARROW = string.char(26)
 local MAX_LIST_WIDTH = 45
 local MAX_LIST_HEIGHT = 15
 
-MenuScreen = defclass(MenuScreen, gui.Screen)
-MenuScreen.ATTRS{
-    focus_path='hotkeys/menu',
-    hotspot_frame=DEFAULT_NIL,
-    hotkeys=DEFAULT_NIL,
-    bindings=DEFAULT_NIL,
-    mouseover=false,
+Menu = defclass(Menu, widgets.Panel)
+Menu.ATTRS{
+    hotspot=DEFAULT_NIL,
 }
 
 -- get a map from the binding string to a list of hotkey strings that all
@@ -72,8 +119,8 @@ local function get_bindings_to_hotkeys(hotkeys, bindings)
     return bindings_to_hotkeys
 end
 
--- number of non-text tiles: icon, space, space between cmd and hk, scrollbar
-local LIST_BUFFER = 2 + 1 + 1
+-- number of non-text tiles: icon, space between cmd and hk, scrollbar+margin
+local LIST_BUFFER = 2 + 1 + 3
 
 local function get_choices(hotkeys, bindings, is_inverted)
     local choices, max_width, seen = {}, 0, {}
@@ -109,29 +156,42 @@ local function get_choices(hotkeys, bindings, is_inverted)
     -- adjust width of command fields so the hotkey tokens are right justified
     for _,choice in ipairs(choices) do
         local command_token = choice.text[1]
-        command_token.width = max_width - choice.hk_width - 3
+        command_token.width = max_width - choice.hk_width - (LIST_BUFFER - 1)
     end
 
     return choices, max_width
 end
 
-function MenuScreen:init()
-    local is_inverted = not not self.hotspot_frame.b
-    local choices,list_width = get_choices(self.hotkeys, self.bindings,
-                                           is_inverted)
+function Menu:init()
+    local hotkeys, bindings = getHotkeys()
+    if #hotkeys == 0 then
+        hotkeys = {''}
+        bindings = {['']='gui/launcher'}
+    end
+
+    local is_inverted = not not self.hotspot.frame.b
+    local choices,list_width = get_choices(hotkeys, bindings, is_inverted)
 
-    local list_frame = copyall(self.hotspot_frame)
+    list_width = math.max(35, list_width)
+
+    local list_frame = copyall(self.hotspot.frame)
+    local list_widget_frame = {h=math.min(#choices, MAX_LIST_HEIGHT)}
+    local quickstart_frame = {}
     list_frame.w = list_width + 2
-    list_frame.h = math.min(#choices, MAX_LIST_HEIGHT) + 2
+    list_frame.h = list_widget_frame.h + 4
     if list_frame.t then
         list_frame.t = math.max(0, list_frame.t - 1)
+        list_widget_frame.t = 0
+        quickstart_frame.b = 0
     else
         list_frame.b = math.max(0, list_frame.b - 1)
+        list_widget_frame.b = 0
+        quickstart_frame.t = 0
     end
     if list_frame.l then
-        list_frame.l = math.max(0, list_frame.l - 1)
+        list_frame.l = math.max(0, list_frame.l + 5)
     else
-        list_frame.r = math.max(0, list_frame.r - 1)
+        list_frame.r = math.max(0, list_frame.r + 5)
     end
 
     local help_frame = {w=list_frame.w, l=list_frame.l, r=list_frame.r}
@@ -142,28 +202,37 @@ function MenuScreen:init()
     end
 
     self:addviews{
-        widgets.ResizingPanel{
+        widgets.Panel{
             view_id='list_panel',
-            autoarrange_subviews=true,
             frame=list_frame,
-            frame_style=gui.GREY_LINE_FRAME,
+            frame_style=gui.PANEL_FRAME,
             frame_background=gui.CLEAR_PEN,
             subviews={
                 widgets.List{
                     view_id='list',
+                    frame=list_widget_frame,
                     choices=choices,
                     icon_width=2,
                     on_select=self:callback('onSelect'),
                     on_submit=self:callback('onSubmit'),
                     on_submit2=self:callback('onSubmit2'),
                 },
+                widgets.Panel{frame={h=1}},
+                widgets.HotkeyLabel{
+                    frame=quickstart_frame,
+                    label='Quickstart guide',
+                    key='STRING_A063',
+                    on_activate=function()
+                        self:onSubmit(nil, {command='quickstart-guide'})
+                    end,
+                },
             },
         },
         widgets.ResizingPanel{
             view_id='help_panel',
             autoarrange_subviews=true,
             frame=help_frame,
-            frame_style=gui.GREY_LINE_FRAME,
+            frame_style=gui.PANEL_FRAME,
             frame_background=gui.CLEAR_PEN,
             subviews={
                 widgets.WrappedLabel{
@@ -180,59 +249,63 @@ function MenuScreen:init()
     end
 end
 
-function MenuScreen:onDismiss()
-    cleanupHotkeys()
-end
-
-function MenuScreen:onSelect(_, choice)
+function Menu:onSelect(_, choice)
     if not choice or #self.subviews == 0 then return end
-    local first_word = choice.command:trim():split(' +')[1]
-    if first_word:startswith(':') then first_word = first_word:sub(2) end
-    self.subviews.help.text_to_wrap = helpdb.is_entry(first_word) and
-            helpdb.get_entry_short_help(first_word) or 'Command not found'
+    local command = get_command(choice.command)
+    self.subviews.help.text_to_wrap = helpdb.is_entry(command) and
+            helpdb.get_entry_short_help(command) or 'Command not found'
     self.subviews.help_panel:updateLayout()
 end
 
-function MenuScreen:onSubmit(_, choice)
+function Menu:onSubmit(_, choice)
     if not choice then return end
-    dfhack.screen.hideGuard(self, dfhack.run_command, choice.command)
-    self:dismiss()
+    dfhack.screen.hideGuard(self.parent_view, dfhack.run_command, choice.command)
+    self.parent_view:dismiss()
 end
 
-function MenuScreen:onSubmit2(_, choice)
+function Menu:onSubmit2(_, choice)
     if not choice then return end
-    self:dismiss()
+    self.parent_view:dismiss()
     dfhack.run_script('gui/launcher', choice.command)
 end
 
-function MenuScreen:onInput(keys)
-    if keys.LEAVESCREEN then
-        self:dismiss()
-        return true
-    elseif keys.STANDARDSCROLL_RIGHT then
+function Menu:onInput(keys)
+    if keys.LEAVESCREEN or keys._MOUSE_R then
+        return false
+    elseif keys.KEYBOARD_CURSOR_RIGHT then
         self:onSubmit2(self.subviews.list:getSelected())
         return true
-    elseif keys._MOUSE_L_DOWN then
+    elseif keys._MOUSE_L then
         local list = self.subviews.list
         local x = list:getMousePos()
         if x == 0 then -- clicked on icon
             self:onSubmit2(list:getSelected())
             return true
         end
+        if not self:getMouseFramePos() then
+            self.parent_view:dismiss()
+            return true
+        end
     end
-    return self:inputToSubviews(keys)
+    self:inputToSubviews(keys)
+    return true -- we're modal
 end
 
-function MenuScreen:onRenderFrame(dc, rect)
+function Menu:onRenderFrame(dc, rect)
     if self.initialize then
         self.initialize()
         self.initialize = nil
     end
-    self:renderParent()
+    Menu.super.onRenderFrame(self, dc, rect)
+end
+
+function Menu:getMouseFramePos()
+    return self.subviews.list_panel:getMouseFramePos() or
+            self.subviews.help_panel:getMouseFramePos()
 end
 
-function MenuScreen:onRenderBody(dc)
-    local panel = self.subviews.list_panel
+function Menu:onRenderBody(dc)
+    Menu.super.onRenderBody(self, dc)
     local list = self.subviews.list
     local idx = list:getIdxUnderMouse()
     if idx and idx ~= self.last_mouse_idx then
@@ -240,14 +313,29 @@ function MenuScreen:onRenderBody(dc)
         -- selection, don't override the selection until the mouse moves to
         -- another item
         list:setSelected(idx)
-        self.mouseover = true
         self.last_mouse_idx = idx
-    elseif not panel:getMousePos(gui.ViewRect{rect=panel.frame_rect})
-            and self.mouseover then
-        -- once the mouse has entered the list area, leaving the frame should
-        -- close the menu screen
-        self:dismiss()
     end
 end
 
+-- ---------- --
+-- MenuScreen --
+-- ---------- --
+
+MenuScreen = defclass(MenuScreen, gui.ZScreen)
+MenuScreen.ATTRS {
+    focus_path='hotkeys/menu',
+    initial_pause=false,
+    hotspot=DEFAULT_NIL,
+}
+
+function MenuScreen:init()
+    self:addviews{
+        Menu{hotspot=self.hotspot},
+    }
+end
+
+function MenuScreen:onDismiss()
+    cleanupHotkeys()
+end
+
 return _ENV
diff --git a/plugins/lua/logistics.lua b/plugins/lua/logistics.lua
new file mode 100644
index 000000000..2f260cc59
--- /dev/null
+++ b/plugins/lua/logistics.lua
@@ -0,0 +1,167 @@
+local _ENV = mkmodule('plugins.logistics')
+
+local argparse = require('argparse')
+local utils = require('utils')
+
+local function make_stat(name, stockpile_number, stats, configs)
+    return {
+        enabled=configs[stockpile_number] and configs[stockpile_number][name] == 'true',
+        designated=stats[name..'_designated'][stockpile_number] or 0,
+        can_designate=stats[name..'_can_designate'][stockpile_number] or 0,
+    }
+end
+
+function getStockpileData()
+    local stats, configs = logistics_getStockpileData()
+    local data = {}
+    for _,bld in ipairs(df.global.world.buildings.other.STOCKPILE) do
+        local stockpile_number, name = bld.stockpile_number, bld.name
+        local sort_key = tostring(name):lower()
+        if #name == 0 then
+            name = ('Stockpile #%d'):format(bld.stockpile_number)
+            sort_key = ('stockpile #%09d'):format(bld.stockpile_number)
+        end
+        table.insert(data, {
+            stockpile_number=stockpile_number,
+            name=name,
+            sort_key=sort_key,
+            melt=make_stat('melt', stockpile_number, stats, configs),
+            trade=make_stat('trade', stockpile_number, stats, configs),
+            dump=make_stat('dump', stockpile_number, stats, configs),
+            train=make_stat('train', stockpile_number, stats, configs),
+            melt_masterworks=configs[stockpile_number] and configs[stockpile_number].melt_masterworks == 'true',
+        })
+    end
+    table.sort(data, function(a, b) return a.sort_key < b.sort_key end)
+    return data
+end
+
+local function print_stockpile_data(data)
+    local name_len = 4
+    for _,sp in ipairs(data) do
+        name_len = math.min(40, math.max(name_len, #sp.name))
+    end
+
+    local has_melt_mastworks = false
+
+    print('Designated/designatable items in stockpiles:')
+    print()
+    local fmt = '%6s  %-' .. name_len .. 's  %4s %10s  %5s %11s  %4s %10s  %5s %11s';
+    print(fmt:format('number', 'name', 'melt', 'melt items', 'trade', 'trade items', 'dump', 'dump items', 'train', 'train items'))
+    local function uline(len) return ('-'):rep(len) end
+    print(fmt:format(uline(6), uline(name_len), uline(4), uline(10), uline(5), uline(11), uline(4), uline(10), uline(5), uline(11)))
+    local function get_enab(stats, ch) return ('[%s]'):format(stats.enabled and (ch or 'x') or ' ') end
+    local function get_dstat(stats) return ('%d/%d'):format(stats.designated, stats.designated + stats.can_designate) end
+    for _,sp in ipairs(data) do
+        has_melt_mastworks = has_melt_mastworks or sp.melt_masterworks
+        print(fmt:format(sp.stockpile_number, sp.name, get_enab(sp.melt, sp.melt_masterworks and 'X'), get_dstat(sp.melt),
+            get_enab(sp.trade), get_dstat(sp.trade), get_enab(sp.dump), get_dstat(sp.dump), get_enab(sp.train), get_dstat(sp.train)))
+    end
+    if has_melt_mastworks then
+        print()
+        print('An "X" in the "melt" column indicates that masterworks in the stockpile will be melted.')
+    end
+end
+
+local function print_status()
+    print(('logistics is %sactively monitoring stockpiles and marking items')
+            :format(isEnabled() and '' or 'not '))
+
+    if df.global.gamemode ~= df.game_mode.DWARF or not dfhack.isMapLoaded() then
+        return
+    end
+
+    local data = getStockpileData()
+    print()
+    if not data[1] then
+        print 'No stockpiles defined -- go make some!'
+    else
+        print_stockpile_data(data)
+    end
+
+    local global_stats = logistics_getGlobalCounts()
+    print()
+    print(('Total items marked for melting: %5d'):format(global_stats.total_melt))
+    print(('Total items marked for trading: %5d'):format(global_stats.total_trade))
+    print(('Total items marked for dumping: %5d'):format(global_stats.total_dump))
+    print(('Total animals marked for training: %2d'):format(global_stats.total_train))
+end
+
+local function for_stockpiles(opts, fn)
+    if not opts.sp then
+        local selected_sp = dfhack.gui.getSelectedStockpile()
+        if not selected_sp then qerror('please specify or select a stockpile') end
+        fn(selected_sp.stockpile_number)
+        return
+    end
+    for _,sp in ipairs(argparse.stringList(opts.sp)) do
+        fn(sp)
+    end
+end
+
+local function do_add_stockpile_config(features, opts)
+    for_stockpiles(opts, function(sp)
+        local configs = logistics_getStockpileConfigs(tonumber(sp) or sp)
+        if not configs then
+            dfhack.printerr('invalid stockpile: '..sp)
+        else
+            for _,config in ipairs(configs) do
+                logistics_setStockpileConfig(config.stockpile_number,
+                    features.melt or config.melt == 1,
+                    features.trade or config.trade == 1,
+                    features.dump or config.dump == 1,
+                    features.train or config.train == 1,
+                    not not opts.melt_masterworks)
+            end
+        end
+    end)
+end
+
+local function do_clear_stockpile_config(all, opts)
+    if all then
+        logistics_clearAllStockpileConfigs()
+        return
+    end
+    for_stockpiles(opts, function(sp)
+        logistics_clearStockpileConfig(tonumber(sp) or sp)
+    end)
+end
+
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
+    end
+
+    return argparse.processArgsGetopt(args, {
+        {'h', 'help', handler=function() opts.help = true end},
+        {'m', 'melt-masterworks', handler=function() opts.melt_masterworks = true end},
+        {'s', 'stockpile', hasArg=true, handler=function(arg) opts.sp = arg end},
+    })
+end
+
+function parse_commandline(args)
+    local opts = {}
+    local positionals = process_args(opts, args)
+
+    if opts.help or not positionals then
+        return false
+    end
+
+    local command = table.remove(positionals, 1)
+    if not command or command == 'status' then
+        print_status()
+    elseif command == 'now' then
+        logistics_cycle()
+    elseif command == 'add' then
+        do_add_stockpile_config(utils.invert(positionals), opts)
+    elseif command == 'clear' then
+        do_clear_stockpile_config(utils.invert(positionals).all, opts)
+    else
+        return false
+    end
+
+    return true
+end
+
+return _ENV
diff --git a/plugins/lua/misery.lua b/plugins/lua/misery.lua
new file mode 100644
index 000000000..cd507c9b3
--- /dev/null
+++ b/plugins/lua/misery.lua
@@ -0,0 +1,43 @@
+local _ENV = mkmodule('plugins.misery')
+
+local argparse = require('argparse')
+
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
+    end
+
+    return argparse.processArgsGetopt(args, {
+            {'h', 'help', handler=function() opts.help = true end},
+        })
+end
+
+function status()
+    print(('misery is %s'):format(isEnabled() and "enabled" or "disabled"))
+    print(('misery factor is: %d'):format(misery_getFactor()))
+end
+
+function parse_commandline(...)
+    local args, opts = {...}, {}
+    local positionals = process_args(opts, args)
+
+    if opts.help then
+        return false
+    end
+
+    local command = table.remove(positionals, 1)
+    if not command or command == 'status' then
+        status()
+    elseif command == 'factor' then
+        misery_setFactor(positionals[1])
+    elseif command == 'clear' then
+        misery_clear()
+    else
+        return false
+    end
+
+    return true
+end
+
+return _ENV
diff --git a/plugins/lua/orders.lua b/plugins/lua/orders.lua
new file mode 100644
index 000000000..d01ad79be
--- /dev/null
+++ b/plugins/lua/orders.lua
@@ -0,0 +1,264 @@
+local _ENV = mkmodule('plugins.orders')
+
+local dialogs = require('gui.dialogs')
+local gui = require('gui')
+local overlay = require('plugins.overlay')
+local widgets = require('gui.widgets')
+
+--
+-- OrdersOverlay
+--
+
+local function do_sort()
+    dfhack.run_command('orders', 'sort')
+end
+
+local function do_clear()
+    dialogs.showYesNoPrompt('Clear manager orders?',
+        'Are you sure you want to clear the manager orders?', nil,
+        function() dfhack.run_command('orders', 'clear') end)
+end
+
+local function get_import_choices()
+    return dfhack.run_command_silent('orders', 'list'):split('\n')
+end
+
+local function do_import()
+    local dlg
+    local function get_dlg() return dlg end
+    dlg = dialogs.ListBox{
+        frame_title='Import/Delete Manager Orders',
+        with_filter=true,
+        choices=get_import_choices(),
+        on_select=function(_, choice)
+            dfhack.run_command('orders', 'import', choice.text)
+        end,
+        dismiss_on_select2=false,
+        on_select2=function(_, choice)
+            if choice.text:startswith('library/') then return end
+            local fname = 'dfhack-config/orders/'..choice.text..'.json'
+            if not dfhack.filesystem.isfile(fname) then return end
+            dialogs.showYesNoPrompt('Delete orders file?',
+                'Are you sure you want to delete "' .. fname .. '"?', nil,
+                function()
+                    print('deleting ' .. fname)
+                    os.remove(fname)
+                    local list = get_dlg().subviews.list
+                    local filter = list:getFilter()
+                    list:setChoices(get_import_choices(), list:getSelected())
+                    list:setFilter(filter)
+                end)
+        end,
+        select2_hint='Delete file',
+    }:show()
+end
+
+local function do_export()
+    dialogs.InputBox{
+        frame_title='Export Manager Orders',
+        on_input=function(text)
+            dfhack.run_command('orders', 'export', text)
+        end
+    }:show()
+end
+
+local function do_recheck()
+    dfhack.run_command('orders', 'recheck')
+end
+
+OrdersOverlay = defclass(OrdersOverlay, overlay.OverlayWidget)
+OrdersOverlay.ATTRS{
+    default_pos={x=53,y=-6},
+    default_enabled=true,
+    viewscreens='dwarfmode/Info/WORK_ORDERS/Default',
+    frame={w=43, h=4},
+}
+
+function OrdersOverlay:init()
+    self.minimized = false
+
+    local main_panel = widgets.Panel{
+        frame={t=0, l=0, r=0, h=4},
+        frame_style=gui.MEDIUM_FRAME,
+        frame_background=gui.CLEAR_PEN,
+        visible=function() return not self.minimized end,
+        subviews={
+            widgets.HotkeyLabel{
+                frame={t=0, l=0},
+                label='import',
+                key='CUSTOM_CTRL_I',
+                auto_width=true,
+                on_activate=do_import,
+            },
+            widgets.HotkeyLabel{
+                frame={t=1, l=0},
+                label='export',
+                key='CUSTOM_CTRL_E',
+                auto_width=true,
+                on_activate=do_export,
+            },
+            widgets.HotkeyLabel{
+                frame={t=0, l=15},
+                label='recheck conditions',
+                key='CUSTOM_CTRL_K',
+                auto_width=true,
+                on_activate=do_recheck,
+            },
+            widgets.HotkeyLabel{
+                frame={t=1, l=15},
+                label='sort',
+                key='CUSTOM_CTRL_O',
+                auto_width=true,
+                on_activate=do_sort,
+            },
+            widgets.HotkeyLabel{
+                frame={t=1, l=28},
+                label='clear',
+                key='CUSTOM_CTRL_C',
+                auto_width=true,
+                on_activate=do_clear,
+            },
+        },
+    }
+
+    local minimized_panel = widgets.Panel{
+        frame={t=0, r=4, w=3, h=1},
+        subviews={
+            widgets.Label{
+                frame={t=0, l=0, w=1, h=1},
+                text='[',
+                text_pen=COLOR_RED,
+                visible=function() return self.minimized end,
+            },
+            widgets.Label{
+                frame={t=0, l=1, w=1, h=1},
+                text={{text=function() return self.minimized and string.char(31) or string.char(30) end}},
+                text_pen=dfhack.pen.parse{fg=COLOR_BLACK, bg=COLOR_GREY},
+                text_hpen=dfhack.pen.parse{fg=COLOR_BLACK, bg=COLOR_WHITE},
+                on_click=function() self.minimized = not self.minimized end,
+            },
+            widgets.Label{
+                frame={t=0, r=0, w=1, h=1},
+                text=']',
+                text_pen=COLOR_RED,
+                visible=function() return self.minimized end,
+            },
+        },
+    }
+
+    self:addviews{
+        main_panel,
+        minimized_panel,
+        widgets.HelpButton{
+            frame={t=0, r=1},
+            command='orders',
+            visible=function() return not self.minimized end,
+        },
+    }
+end
+
+function OrdersOverlay:onInput(keys)
+    if df.global.game.main_interface.job_details.open then return end
+    if keys.CUSTOM_ALT_M then
+        self.minimized = not self.minimized
+        return true
+    end
+    if OrdersOverlay.super.onInput(self, keys) then
+        return true
+    end
+end
+
+function OrdersOverlay:render(dc)
+    if df.global.game.main_interface.job_details.open then return end
+    OrdersOverlay.super.render(self, dc)
+end
+
+-- Resets the selected work order to the `Checking` state
+
+local function set_current_inactive()
+    local scrConditions = df.global.game.main_interface.info.work_orders.conditions
+    if scrConditions.open then
+        dfhack.run_command('orders', 'recheck', 'this')
+    else
+        qerror("Order conditions is not open")
+    end
+end
+
+local function can_recheck()
+    local scrConditions = df.global.game.main_interface.info.work_orders.conditions
+    local order = scrConditions.wq
+    return order.status.active and #order.item_conditions > 0
+end
+
+-- -------------------
+-- RecheckOverlay
+--
+
+local focusString = 'dwarfmode/Info/WORK_ORDERS/Conditions'
+
+RecheckOverlay = defclass(RecheckOverlay, overlay.OverlayWidget)
+RecheckOverlay.ATTRS{
+    default_pos={x=6,y=8},
+    default_enabled=true,
+    viewscreens=focusString,
+    -- width is the sum of lengths of `[` + `Ctrl+A` + `: ` + button.label + `]`
+    frame={w=1 + 6 + 2 + 19 + 1, h=3},
+}
+
+local function areTabsInTwoRows()
+    -- get the tile above the order status icon
+    local pen = dfhack.screen.readTile(7, 7, false)
+    -- in graphics mode, `0` when one row, something else when two (`67` aka 'C' from "Creatures")
+    -- in ASCII mode, `32` aka ' ' when one row, something else when two (`196` aka '-' from tab frame's top)
+    return (pen.ch ~= 0 and pen.ch ~= 32)
+end
+
+function RecheckOverlay:updateTextButtonFrame()
+    local twoRows = areTabsInTwoRows()
+    if (self._twoRows == twoRows) then return false end
+
+    self._twoRows = twoRows
+    local frame = twoRows
+            and {b=0, l=0, r=0, h=1}
+            or  {t=0, l=0, r=0, h=1}
+    self.subviews.button.frame = frame
+
+    return true
+end
+
+function RecheckOverlay:init()
+    self:addviews{
+        widgets.TextButton{
+            view_id = 'button',
+            -- frame={t=0, l=0, r=0, h=1}, -- is set in `updateTextButtonFrame()`
+            label='re-check conditions',
+            key='CUSTOM_CTRL_A',
+            on_activate=set_current_inactive,
+            enabled=can_recheck,
+        },
+    }
+
+    self:updateTextButtonFrame()
+end
+
+function RecheckOverlay:onRenderBody(dc)
+    if (self.frame_rect.y1 == 7) then
+        -- only apply this logic if the overlay is on the same row as
+        -- originally thought: just above the order status icon
+
+        if self:updateTextButtonFrame() then
+            self:updateLayout()
+        end
+    end
+
+    RecheckOverlay.super.onRenderBody(self, dc)
+end
+
+-- -------------------
+
+OVERLAY_WIDGETS = {
+    recheck=RecheckOverlay,
+    overlay=OrdersOverlay,
+}
+
+return _ENV
diff --git a/plugins/lua/overlay.lua b/plugins/lua/overlay.lua
index 4fc375d72..d8b3c4f81 100644
--- a/plugins/lua/overlay.lua
+++ b/plugins/lua/overlay.lua
@@ -8,6 +8,7 @@ local widgets = require('gui.widgets')
 
 local OVERLAY_CONFIG_FILE = 'dfhack-config/overlay.json'
 local OVERLAY_WIDGETS_VAR = 'OVERLAY_WIDGETS'
+local GLOBAL_KEY = 'OVERLAY'
 
 local DEFAULT_X_POS, DEFAULT_Y_POS = -2, -2
 
@@ -43,7 +44,12 @@ end
 
 local function triggered_screen_has_lock()
     if not trigger_lock_holder_screen then return false end
-    if trigger_lock_holder_screen:isActive() then return true end
+    if trigger_lock_holder_screen:isActive() then
+        if trigger_lock_holder_screen.raise then
+            trigger_lock_holder_screen:raise()
+        end
+        return true
+    end
     return register_trigger_lock_screen(nil, nil)
 end
 
@@ -76,19 +82,18 @@ function normalize_list(element_or_list)
     return {element_or_list}
 end
 
--- normalize "short form" viewscreen names to "long form"
+-- normalize "short form" viewscreen names to "long form" and remove any focus
 local function normalize_viewscreen_name(vs_name)
-    if vs_name == 'all' or vs_name:match('viewscreen_.*st') then
-        return vs_name
+    if vs_name == 'all' or vs_name:match('^viewscreen_.*st') then
+        return vs_name:match('^[^/]+')
     end
-    return 'viewscreen_' .. vs_name .. 'st'
+    return 'viewscreen_' .. vs_name:match('^[^/]+') .. 'st'
 end
 
--- reduce "long form" viewscreen names to "short form"
+-- reduce "long form" viewscreen names to "short form"; keep focus
 function simplify_viewscreen_name(vs_name)
-    _,_,short_name = vs_name:find('^viewscreen_(.*)st$')
-    if short_name then return short_name end
-    return vs_name
+    local short_name = vs_name:match('^viewscreen_([^/]+)st')
+    return short_name or vs_name
 end
 
 local function is_empty(tbl)
@@ -179,7 +184,6 @@ end
 
 local function do_disable(args, quiet)
     local disable_fn = function(name, db_entry)
-        if db_entry.widget.always_enabled then return end
         overlay_config[name].enabled = false
         if db_entry.widget.hotspot then
             active_hotspot_widgets[name] = nil
@@ -237,17 +241,37 @@ local function do_list(args)
     end
 end
 
+local function get_focus_strings(viewscreens)
+    local focus_strings = nil
+    for _,vs in ipairs(viewscreens) do
+        if vs:match('/') then
+            focus_strings = focus_strings or {}
+            vs = simplify_viewscreen_name(vs)
+            table.insert(focus_strings, vs)
+        end
+    end
+    return focus_strings
+end
+
 local function load_widget(name, widget_class)
     local widget = widget_class{name=name}
     widget_db[name] = {
         widget=widget,
+        focus_strings=get_focus_strings(normalize_list(widget.viewscreens)),
         next_update_ms=widget.overlay_onupdate and 0 or math.huge,
     }
     if not overlay_config[name] then overlay_config[name] = {} end
+    if widget.version ~= overlay_config[name].version then
+        overlay_config[name] = {}
+    end
     local config = overlay_config[name]
+    config.version = widget.version
+    if config.enabled == nil then
+        config.enabled = widget.default_enabled
+    end
     config.pos = sanitize_pos(config.pos or widget.default_pos)
     widget.frame = make_frame(config.pos, widget.frame)
-    if config.enabled or widget.always_enabled then
+    if config.enabled then
         do_enable(name, true, true)
     else
         config.enabled = false
@@ -272,7 +296,7 @@ local function load_widgets(env_name, env)
 end
 
 -- called directly from cpp on plugin enable
-function reload()
+function rescan()
     reset()
 
     for _,plugin in ipairs(dfhack.internal.listPlugins()) do
@@ -292,6 +316,14 @@ function reload()
     reposition_widgets()
 end
 
+dfhack.onStateChange[GLOBAL_KEY] = function(sc)
+    if sc ~= SC_WORLD_LOADED then
+        return
+    end
+    -- pick up widgets from active mods
+    rescan()
+end
+
 local function dump_widget_config(name, widget)
     local pos = overlay_config[name].pos
     print(('widget %s is positioned at x=%d, y=%d'):format(name, pos.x, pos.y))
@@ -343,7 +375,7 @@ end
 local function do_trigger(args, quiet)
     if triggered_screen_has_lock() then
         dfhack.printerr(('cannot trigger widget; widget "%s" is already active')
-                        :format(active_triggered_widget))
+                        :format(trigger_lock_holder_description))
         return
     end
     do_by_names_or_numbers(args[1], function(name, db_entry)
@@ -401,8 +433,12 @@ end
 -- reduces the next call by a small random amount to introduce jitter into the
 -- widget processing timings
 local function do_update(name, db_entry, now_ms, vs)
-    if db_entry.next_update_ms > now_ms then return end
     local w = db_entry.widget
+    if w.overlay_onupdate_max_freq_seconds ~= 0 and
+        db_entry.next_update_ms > now_ms
+    then
+        return
+    end
     db_entry.next_update_ms = get_next_onupdate_timestamp(now_ms, w)
     if detect_frame_change(w, function() return w:overlay_onupdate(vs) end) then
         if register_trigger_lock_screen(w:overlay_trigger(), name) then
@@ -419,53 +455,86 @@ function update_hotspot_widgets()
     end
 end
 
+local function matches_focus_strings(db_entry, vs_name, vs)
+    if not db_entry.focus_strings then return true end
+    local matched = true
+    local simple_vs_name = simplify_viewscreen_name(vs_name)
+    for _,fs in ipairs(db_entry.focus_strings) do
+        if fs:startswith(simple_vs_name) then
+            matched = false
+            if dfhack.gui.matchFocusString(fs, vs) then
+                return true
+            end
+        end
+    end
+    return matched
+end
+
 local function _update_viewscreen_widgets(vs_name, vs, now_ms)
     local vs_widgets = active_viewscreen_widgets[vs_name]
     if not vs_widgets then return end
+    local is_all = vs_name == 'all'
     now_ms = now_ms or dfhack.getTickCount()
     for name,db_entry in pairs(vs_widgets) do
-        if do_update(name, db_entry, now_ms, vs) then return end
+        if (is_all or matches_focus_strings(db_entry, vs_name, vs)) and
+                do_update(name, db_entry, now_ms, vs) then
+            return
+        end
     end
     return now_ms
 end
 
--- not subject to trigger lock since these widgets are already filtered by
--- viewscreen
 function update_viewscreen_widgets(vs_name, vs)
+    if triggered_screen_has_lock() then return end
     local now_ms = _update_viewscreen_widgets(vs_name, vs, nil)
-    _update_viewscreen_widgets('all', vs, now_ms)
+    if now_ms then
+        _update_viewscreen_widgets('all', vs, now_ms)
+    end
 end
 
-local function _feed_viewscreen_widgets(vs_name, keys)
+local function _feed_viewscreen_widgets(vs_name, vs, keys)
     local vs_widgets = active_viewscreen_widgets[vs_name]
     if not vs_widgets then return false end
     for _,db_entry in pairs(vs_widgets) do
         local w = db_entry.widget
-        if detect_frame_change(w, function() return w:onInput(keys) end) then
+        if (not vs or matches_focus_strings(db_entry, vs_name, vs)) and
+                detect_frame_change(w, function() return w:onInput(keys) end) then
             return true
         end
     end
     return false
 end
 
-function feed_viewscreen_widgets(vs_name, keys)
-    return _feed_viewscreen_widgets(vs_name, keys) or
-            _feed_viewscreen_widgets('all', keys)
+function feed_viewscreen_widgets(vs_name, vs, keys)
+    if not _feed_viewscreen_widgets(vs_name, vs, keys) and
+            not _feed_viewscreen_widgets('all', nil, keys) then
+        return false
+    end
+    return true
 end
 
-local function _render_viewscreen_widgets(vs_name, dc)
+local function _render_viewscreen_widgets(vs_name, vs, dc)
     local vs_widgets = active_viewscreen_widgets[vs_name]
-    if not vs_widgets then return false end
+    if not vs_widgets then return end
     dc = dc or gui.Painter.new()
     for _,db_entry in pairs(vs_widgets) do
         local w = db_entry.widget
-        detect_frame_change(w, function() w:render(dc) end)
+        if not vs or matches_focus_strings(db_entry, vs_name, vs) then
+            detect_frame_change(w, function() w:render(dc) end)
+        end
     end
+    return dc
 end
 
-function render_viewscreen_widgets(vs_name)
-    local dc = _render_viewscreen_widgets(vs_name, nil)
-    _render_viewscreen_widgets('all', dc)
+local force_refresh
+
+function render_viewscreen_widgets(vs_name, vs)
+    local dc = _render_viewscreen_widgets(vs_name, vs, nil)
+    _render_viewscreen_widgets('all', nil, dc)
+    if force_refresh then
+        force_refresh = nil
+        df.global.gps.force_full_display_count = 1
+    end
 end
 
 -- called when the DF window is resized
@@ -474,6 +543,7 @@ function reposition_widgets()
     for _,db_entry in pairs(widget_db) do
         db_entry.widget:updateLayout(sr)
     end
+    force_refresh = true
 end
 
 -- ------------------------------------------------- --
@@ -484,11 +554,11 @@ OverlayWidget = defclass(OverlayWidget, widgets.Panel)
 OverlayWidget.ATTRS{
     name=DEFAULT_NIL, -- this is set by the framework to the widget name
     default_pos={x=DEFAULT_X_POS, y=DEFAULT_Y_POS}, -- 1-based widget screen pos
+    default_enabled=false, -- initial enabled state if not in config
     overlay_only=false, -- true if there is no widget to reposition
     hotspot=false, -- whether to call overlay_onupdate on all screens
     viewscreens={}, -- override with associated viewscreen or list of viewscrens
     overlay_onupdate_max_freq_seconds=5, -- throttle calls to overlay_onupdate
-    always_enabled=false, -- for overlays that should never be disabled
 }
 
 function OverlayWidget:init()
@@ -505,4 +575,62 @@ function OverlayWidget:init()
     self.frame.h = self.frame.h or 1
 end
 
+-- ------------------- --
+-- TitleVersionOverlay --
+-- ------------------- --
+
+TitleVersionOverlay = defclass(TitleVersionOverlay, OverlayWidget)
+TitleVersionOverlay.ATTRS{
+    default_pos={x=11, y=1},
+    version=2,
+    default_enabled=true,
+    viewscreens='title/Default',
+    frame={w=35, h=5},
+    autoarrange_subviews=1,
+}
+
+function TitleVersionOverlay:init()
+    local text = {}
+    table.insert(text, 'DFHack ' .. dfhack.getDFHackVersion() ..
+            (dfhack.isRelease() and '' or (' (git: %s)'):format(dfhack.getGitCommit(true))))
+    if #dfhack.getDFHackBuildID() > 0 then
+        table.insert(text, NEWLINE)
+        table.insert(text, 'Build ID: ' .. dfhack.getDFHackBuildID())
+    end
+    if dfhack.isPrerelease() then
+        table.insert(text, NEWLINE)
+        table.insert(text, {text='Pre-release build', pen=COLOR_LIGHTRED})
+    end
+
+    for _,t in ipairs(text) do
+        self.frame.w = math.max(self.frame.w, #t)
+    end
+
+    self:addviews{
+        widgets.Label{
+            frame={t=0, l=0},
+            text=text,
+            text_pen=COLOR_WHITE,
+        },
+        widgets.HotkeyLabel{
+            frame={l=0},
+            label='Quickstart guide',
+            auto_width=true,
+            key='STRING_A063',
+            on_activate=function() dfhack.run_script('quickstart-guide') end,
+        },
+        widgets.HotkeyLabel{
+            frame={l=0},
+            label='Control panel',
+            auto_width=true,
+            key='STRING_A047',
+            on_activate=function() dfhack.run_script('gui/control-panel') end,
+        },
+    }
+end
+
+OVERLAY_WIDGETS = {
+    title_version = TitleVersionOverlay,
+}
+
 return _ENV
diff --git a/plugins/lua/seedwatch.lua b/plugins/lua/seedwatch.lua
new file mode 100644
index 000000000..991cd45bb
--- /dev/null
+++ b/plugins/lua/seedwatch.lua
@@ -0,0 +1,67 @@
+local _ENV = mkmodule('plugins.seedwatch')
+
+local argparse = require('argparse')
+
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
+    end
+
+    return argparse.processArgsGetopt(args, {
+            {'h', 'help', handler=function() opts.help = true end},
+        })
+end
+
+local function print_status()
+    print(('seedwatch is %s'):format(isEnabled() and "enabled" or "disabled"))
+    print()
+    print('usable seed counts and current targets:')
+    local watch_map, seed_counts = seedwatch_getData()
+    local sum = 0
+    local plants = df.global.world.raws.plants.all
+    for k,v in pairs(seed_counts) do
+        print(('  %4d/%d %s'):format(v, watch_map[k] or 0, plants[k].id))
+        sum = sum + v
+    end
+    print()
+    print(('total usable seeds: %d'):format(sum))
+end
+
+local function set_target(name, num)
+    if not name or #name == 0 then
+        qerror('must specify "all" or plant name')
+    end
+
+    num = tonumber(num)
+    num = num and math.floor(num) or nil
+    if not num or num < 0 then
+        qerror('target must be a non-negative integer')
+    end
+
+    seedwatch_setTarget(name, num)
+end
+
+function parse_commandline(...)
+    local args, opts = {...}, {}
+    local positionals = process_args(opts, args)
+
+    if opts.help then
+        return false
+    end
+
+    local command = positionals[1]
+    if not command or command == 'status' then
+        print_status()
+    elseif command == 'clear' then
+        set_target('all', 0)
+    elseif positionals[2] then
+        set_target(command, positionals[2])
+    else
+        return false
+    end
+
+    return true
+end
+
+return _ENV
diff --git a/plugins/lua/siege-engine.lua b/plugins/lua/siege-engine.lua
index 5d8cc9050..25f405615 100644
--- a/plugins/lua/siege-engine.lua
+++ b/plugins/lua/siege-engine.lua
@@ -146,7 +146,7 @@ function getBaseUnitWeight(unit)
             return -30
         elseif flags1.diplomat or flags1.merchant or flags1.forest then
             return -5
-        elseif flags1.tame and unit.civ_id == df.global.ui.civ_id then
+        elseif flags1.tame and unit.civ_id == df.global.plotinfo.civ_id then
             return -1
         end
     end
diff --git a/plugins/lua/sort.lua b/plugins/lua/sort.lua
index acd2eef6a..98e357ee7 100644
--- a/plugins/lua/sort.lua
+++ b/plugins/lua/sort.lua
@@ -1,5 +1,1315 @@
 local _ENV = mkmodule('plugins.sort')
 
+local gui = require('gui')
+local overlay = require('plugins.overlay')
+local setbelief = reqscript('modtools/set-belief')
+local sortoverlay = require('plugins.sort.sortoverlay')
+local utils = require('utils')
+local widgets = require('gui.widgets')
+
+local GLOBAL_KEY = 'sort'
+
+local CH_UP = string.char(30)
+local CH_DN = string.char(31)
+
+local function get_rating(val, baseline, range, highest, high, med, low)
+    val = val - (baseline or 0)
+    range = range or 100
+    local percentile = (math.min(range, val) * 100) // range
+    if percentile < (low or 25) then return percentile, COLOR_RED end
+    if percentile < (med or 50) then return percentile, COLOR_LIGHTRED end
+    if percentile < (high or 75) then return percentile, COLOR_YELLOW end
+    if percentile < (highest or 90) then return percentile, COLOR_GREEN end
+    return percentile, COLOR_LIGHTGREEN
+end
+
+local function sort_noop(a, b)
+    -- this function is used as a marker and never actually gets called
+    error('sort_noop should not be called')
+end
+
+local function get_name(unit)
+    return unit and dfhack.toSearchNormalized(dfhack.TranslateName(dfhack.units.getVisibleName(unit)))
+end
+
+local function sort_by_name_desc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local name1 = get_name(unit1)
+    local name2 = get_name(unit2)
+    return utils.compare_name(name1, name2)
+end
+
+local function sort_by_name_asc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local name1 = get_name(unit1)
+    local name2 = get_name(unit2)
+    return utils.compare_name(name2, name1)
+end
+
+local active_units = df.global.world.units.active
+local active_idx_cache = {}
+local function get_active_idx_cache()
+    local num_active_units = #active_units
+    if num_active_units == 0 or active_idx_cache[active_units[num_active_units-1].id] ~= num_active_units-1 then
+        active_idx_cache = {}
+        for i,active_unit in ipairs(active_units) do
+            active_idx_cache[active_unit.id] = i
+        end
+    end
+    return active_idx_cache
+end
+
+local function is_original_dwarf(unit)
+    return df.global.plotinfo.fortress_age == unit.curse.time_on_site // 10
+end
+
+local WAVE_END_GAP = 10000
+
+local function get_most_recent_wave_oldest_active_idx(cache)
+    local oldest_unit
+    for idx=#active_units-1,0,-1 do
+        local unit = active_units[idx]
+        if not dfhack.units.isCitizen(unit) then goto continue end
+        if oldest_unit and unit.curse.time_on_site - oldest_unit.curse.time_on_site > WAVE_END_GAP then
+            return cache[oldest_unit.id]
+        else
+            oldest_unit = unit
+        end
+        ::continue::
+    end
+end
+
+-- return green for most recent wave, red for the first wave, yellow for all others
+-- rating is a three digit number that indicates the (potentially approximate) order
+local function get_arrival_rating(unit)
+    local cache = get_active_idx_cache()
+    local unit_active_idx = cache[unit.id]
+    if not unit_active_idx then return end
+    local most_recent_wave_oldest_active_idx = get_most_recent_wave_oldest_active_idx(cache)
+    if not most_recent_wave_oldest_active_idx then return end
+    local num_active_units = #active_units
+    local rating = num_active_units < 1000 and unit_active_idx or ((unit_active_idx * 1000) // #active_units)
+    if most_recent_wave_oldest_active_idx < unit_active_idx then
+        return rating, COLOR_LIGHTGREEN
+    end
+    if is_original_dwarf(unit) then
+        return rating, COLOR_RED
+    end
+    return rating, COLOR_YELLOW
+end
+
+local function sort_by_arrival_desc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local cache = get_active_idx_cache()
+    if not cache[unit_id_1] then return -1 end
+    if not cache[unit_id_2] then return 1 end
+    return utils.compare(cache[unit_id_2], cache[unit_id_1])
+end
+
+local function sort_by_arrival_asc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local cache = get_active_idx_cache()
+    if not cache[unit_id_1] then return -1 end
+    if not cache[unit_id_2] then return 1 end
+    return utils.compare(cache[unit_id_1], cache[unit_id_2])
+end
+
+local function get_stress(unit)
+    return unit and
+        unit.status.current_soul and
+        unit.status.current_soul.personality.stress
+end
+
+local function get_stress_rating(unit)
+    return get_rating(dfhack.units.getStressCategory(unit), 0, 100, 4, 3, 2, 1)
+end
+
+local function sort_by_stress_desc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local happiness1 = get_stress(unit1)
+    local happiness2 = get_stress(unit2)
+    if happiness1 == happiness2 then
+        return sort_by_name_desc(unit_id_1, unit_id_2)
+    end
+    if not happiness2 then return -1 end
+    if not happiness1 then return 1 end
+    return utils.compare(happiness2, happiness1)
+end
+
+local function sort_by_stress_asc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local happiness1 = get_stress(unit1)
+    local happiness2 = get_stress(unit2)
+    if happiness1 == happiness2 then
+        return sort_by_name_desc(unit_id_1, unit_id_2)
+    end
+    if not happiness2 then return 1 end
+    if not happiness1 then return -1 end
+    return utils.compare(happiness1, happiness2)
+end
+
+local function get_skill(skill, unit)
+    return unit and
+        unit.status.current_soul and
+        (utils.binsearch(unit.status.current_soul.skills, skill, 'id'))
+end
+
+local function get_skill_rating(skill, unit)
+    local uskill = get_skill(skill, unit)
+    if not uskill then return nil end
+    return get_rating(uskill.rating, 0, 100, 10, 5, 1, 0)
+end
+
+local MELEE_WEAPON_SKILLS = {
+    df.job_skill.AXE,
+    df.job_skill.SWORD,
+    df.job_skill.MACE,
+    df.job_skill.HAMMER,
+    df.job_skill.SPEAR,
+}
+
+local function melee_skill_effectiveness(unit)
+    -- Physical attributes
+    local strength = dfhack.units.getPhysicalAttrValue(unit, df.physical_attribute_type.STRENGTH)
+    local agility = dfhack.units.getPhysicalAttrValue(unit, df.physical_attribute_type.AGILITY)
+    local toughness = dfhack.units.getPhysicalAttrValue(unit, df.physical_attribute_type.TOUGHNESS)
+    local endurance = dfhack.units.getPhysicalAttrValue(unit, df.physical_attribute_type.ENDURANCE)
+    local body_size_base = unit.body.size_info.size_base
+
+    -- Mental attributes
+    local willpower = dfhack.units.getMentalAttrValue(unit, df.mental_attribute_type.WILLPOWER)
+    local spatial_sense = dfhack.units.getMentalAttrValue(unit, df.mental_attribute_type.SPATIAL_SENSE)
+    local kinesthetic_sense = dfhack.units.getMentalAttrValue(unit, df.mental_attribute_type.KINESTHETIC_SENSE)
+
+    -- Skills
+    -- Finding the highest skill
+    local skill_rating = 0
+    for _, skill in ipairs(MELEE_WEAPON_SKILLS) do
+        local melee_skill = dfhack.units.getNominalSkill(unit, skill, true)
+        skill_rating = math.max(skill_rating, melee_skill)
+    end
+    local melee_combat_rating = dfhack.units.getNominalSkill(unit, df.job_skill.MELEE_COMBAT, true)
+
+    local rating = skill_rating * 27000 + melee_combat_rating * 9000
+            + strength * 180 + body_size_base * 100 + kinesthetic_sense * 50 + endurance * 50
+            + agility * 30 + toughness * 20 + willpower * 20 + spatial_sense * 20
+    return rating
+end
+
+local function get_melee_skill_effectiveness_rating(unit)
+    return get_rating(melee_skill_effectiveness(unit), 350000, 2750000, 64, 52, 40, 28)
+end
+
+local function make_sort_by_melee_skill_effectiveness_desc()
+    return function(unit_id_1, unit_id_2)
+        if unit_id_1 == unit_id_2 then return 0 end
+        local unit1 = df.unit.find(unit_id_1)
+        local unit2 = df.unit.find(unit_id_2)
+        if not unit1 then return -1 end
+        if not unit2 then return 1 end
+        local rating1 = melee_skill_effectiveness(unit1)
+        local rating2 = melee_skill_effectiveness(unit2)
+        if rating1 == rating2 then return sort_by_name_desc(unit_id_1, unit_id_2) end
+        return utils.compare(rating2, rating1)
+    end
+end
+
+local function make_sort_by_melee_skill_effectiveness_asc()
+    return function(unit_id_1, unit_id_2)
+        if unit_id_1 == unit_id_2 then return 0 end
+        local unit1 = df.unit.find(unit_id_1)
+        local unit2 = df.unit.find(unit_id_2)
+        if not unit1 then return -1 end
+        if not unit2 then return 1 end
+        local rating1 = melee_skill_effectiveness(unit1)
+        local rating2 = melee_skill_effectiveness(unit2)
+        if rating1 == rating2 then return sort_by_name_desc(unit_id_1, unit_id_2) end
+        return utils.compare(rating1, rating2)
+    end
+end
+
+local RANGED_WEAPON_SKILLS = {
+    df.job_skill.CROSSBOW,
+}
+
+-- Function could easily be adapted to different weapon types.
+local function ranged_skill_effectiveness(unit)
+    -- Physical attributes
+    local agility = dfhack.units.getPhysicalAttrValue(unit, df.physical_attribute_type.AGILITY)
+
+    -- Mental attributes
+    local spatial_sense = dfhack.units.getMentalAttrValue(unit, df.mental_attribute_type.SPATIAL_SENSE)
+    local kinesthetic_sense = dfhack.units.getMentalAttrValue(unit, df.mental_attribute_type.KINESTHETIC_SENSE)
+    local focus = dfhack.units.getMentalAttrValue(unit, df.mental_attribute_type.FOCUS)
+
+    -- Skills
+    -- Finding the highest skill
+    local skill_rating = 0
+    for _, skill in ipairs(RANGED_WEAPON_SKILLS) do
+        local ranged_skill = dfhack.units.getNominalSkill(unit, skill, true)
+        skill_rating = math.max(skill_rating, ranged_skill)
+    end
+    local ranged_combat = dfhack.units.getNominalSkill(unit, df.job_skill.RANGED_COMBAT, true)
+
+    local rating = skill_rating * 24000 + ranged_combat * 8000
+    + agility * 15 + spatial_sense * 15 + kinesthetic_sense * 6 + focus * 6
+    return rating
+end
+
+local function get_ranged_skill_effectiveness_rating(unit)
+    return get_rating(ranged_skill_effectiveness(unit), 0, 800000, 72, 52, 31, 11)
+end
+
+local function make_sort_by_ranged_skill_effectiveness_desc()
+    return function(unit_id_1, unit_id_2)
+        if unit_id_1 == unit_id_2 then return 0 end
+        local unit1 = df.unit.find(unit_id_1)
+        local unit2 = df.unit.find(unit_id_2)
+        if not unit1 then return -1 end
+        if not unit2 then return 1 end
+        local rating1 = ranged_skill_effectiveness(unit1)
+        local rating2 = ranged_skill_effectiveness(unit2)
+        if rating1 == rating2 then return sort_by_name_desc(unit_id_1, unit_id_2) end
+        return utils.compare(rating2, rating1)
+    end
+end
+
+local function make_sort_by_ranged_skill_effectiveness_asc()
+    return function(unit_id_1, unit_id_2)
+        if unit_id_1 == unit_id_2 then return 0 end
+        local unit1 = df.unit.find(unit_id_1)
+        local unit2 = df.unit.find(unit_id_2)
+        if not unit1 then return -1 end
+        if not unit2 then return 1 end
+        local rating1 = ranged_skill_effectiveness(unit1)
+        local rating2 = ranged_skill_effectiveness(unit2)
+        if rating1 == rating2 then return sort_by_name_desc(unit_id_1, unit_id_2) end
+        return utils.compare(rating1, rating2)
+    end
+end
+
+local function make_sort_by_skill_desc(sort_skill)
+    return function(unit_id_1, unit_id_2)
+        if unit_id_1 == unit_id_2 then return 0 end
+        if unit_id_1 == -1 then return -1 end
+        if unit_id_2 == -1 then return 1 end
+        local s1 = get_skill(sort_skill, df.unit.find(unit_id_1))
+        local s2 = get_skill(sort_skill, df.unit.find(unit_id_2))
+        if s1 == s2 then return sort_by_name_desc(unit_id_1, unit_id_2) end
+        if not s2 then return -1 end
+        if not s1 then return 1 end
+        if s1.rating ~= s2.rating then
+            return utils.compare(s2.rating, s1.rating)
+        end
+        if s1.experience ~= s2.experience then
+            return utils.compare(s2.experience, s1.experience)
+        end
+        return sort_by_name_desc(unit_id_1, unit_id_2)
+    end
+end
+
+local function make_sort_by_skill_asc(sort_skill)
+    return function(unit_id_1, unit_id_2)
+        if unit_id_1 == unit_id_2 then return 0 end
+        if unit_id_1 == -1 then return -1 end
+        if unit_id_2 == -1 then return 1 end
+        local s1 = get_skill(sort_skill, df.unit.find(unit_id_1))
+        local s2 = get_skill(sort_skill, df.unit.find(unit_id_2))
+        if s1 == s2 then return sort_by_name_desc(unit_id_1, unit_id_2) end
+        if not s2 then return 1 end
+        if not s1 then return -1 end
+        if s1.rating ~= s2.rating then
+            return utils.compare(s1.rating, s2.rating)
+        end
+        if s1.experience ~= s2.experience then
+            return utils.compare(s1.experience, s2.experience)
+        end
+        return sort_by_name_desc(unit_id_1, unit_id_2)
+    end
+end
+
+-- Statistical rating that is higher for dwarves that are mentally stable
+local function get_mental_stability(unit)
+    local altruism = unit.status.current_soul.personality.traits.ALTRUISM
+    local anxiety_propensity = unit.status.current_soul.personality.traits.ANXIETY_PROPENSITY
+    local bravery = unit.status.current_soul.personality.traits.BRAVERY
+    local cheer_propensity = unit.status.current_soul.personality.traits.CHEER_PROPENSITY
+    local curious = unit.status.current_soul.personality.traits.CURIOUS
+    local discord = unit.status.current_soul.personality.traits.DISCORD
+    local dutifulness = unit.status.current_soul.personality.traits.DUTIFULNESS
+    local emotionally_obsessive = unit.status.current_soul.personality.traits.EMOTIONALLY_OBSESSIVE
+    local humor = unit.status.current_soul.personality.traits.HUMOR
+    local love_propensity = unit.status.current_soul.personality.traits.LOVE_PROPENSITY
+    local perseverence = unit.status.current_soul.personality.traits.PERSEVERENCE
+    local politeness = unit.status.current_soul.personality.traits.POLITENESS
+    local privacy = unit.status.current_soul.personality.traits.PRIVACY
+    local stress_vulnerability = unit.status.current_soul.personality.traits.STRESS_VULNERABILITY
+    local tolerant = unit.status.current_soul.personality.traits.TOLERANT
+
+    local craftsmanship = setbelief.getUnitBelief(unit, df.value_type['CRAFTSMANSHIP'])
+    local family = setbelief.getUnitBelief(unit, df.value_type['FAMILY'])
+    local harmony = setbelief.getUnitBelief(unit, df.value_type['HARMONY'])
+    local independence = setbelief.getUnitBelief(unit, df.value_type['INDEPENDENCE'])
+    local knowledge = setbelief.getUnitBelief(unit, df.value_type['KNOWLEDGE'])
+    local leisure_time = setbelief.getUnitBelief(unit, df.value_type['LEISURE_TIME'])
+    local nature = setbelief.getUnitBelief(unit, df.value_type['NATURE'])
+    local skill = setbelief.getUnitBelief(unit, df.value_type['SKILL'])
+
+    -- calculate the rating using the defined variables
+    local rating = (craftsmanship * -0.01) + (family * -0.09) + (harmony * 0.05)
+                 + (independence * 0.06) + (knowledge * -0.30) + (leisure_time * 0.24)
+                 + (nature * 0.27) + (skill * -0.21) + (altruism * 0.13)
+                 + (anxiety_propensity * -0.06) + (bravery * 0.06)
+                 + (cheer_propensity * 0.41) + (curious * -0.06) + (discord * 0.14)
+                 + (dutifulness * -0.03) + (emotionally_obsessive * -0.13)
+                 + (humor * -0.05) + (love_propensity * 0.15) + (perseverence * -0.07)
+                 + (politeness * -0.14) + (privacy * 0.03) + (stress_vulnerability * -0.20)
+                 + (tolerant * -0.11)
+
+    return rating
+end
+
+local function sort_by_mental_stability_desc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local rating1 = get_mental_stability(unit1)
+    local rating2 = get_mental_stability(unit2)
+    if rating1 == rating2 then
+        -- sorting by stress is opposite
+        -- more mental stable dwarves should have less stress
+        return sort_by_stress_asc(unit_id_1, unit_id_2)
+    end
+    return utils.compare(rating2, rating1)
+end
+
+local function sort_by_mental_stability_asc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local rating1 = get_mental_stability(unit1)
+    local rating2 = get_mental_stability(unit2)
+    if rating1 == rating2 then
+        return sort_by_stress_desc(unit_id_1, unit_id_2)
+    end
+    return utils.compare(rating1, rating2)
+end
+
+-- Statistical rating that is higher for more potent dwarves in long run melee military training
+-- Rating considers fighting melee opponents
+-- Wounds are not considered!
+local function get_melee_combat_potential(unit)
+    -- Physical attributes
+    local strength = unit.body.physical_attrs.STRENGTH.max_value
+    local agility = unit.body.physical_attrs.AGILITY.max_value
+    local toughness = unit.body.physical_attrs.TOUGHNESS.max_value
+    local endurance = unit.body.physical_attrs.ENDURANCE.max_value
+    local body_size_base = unit.body.size_info.size_base
+
+    -- Mental attributes
+    local willpower = unit.status.current_soul.mental_attrs.WILLPOWER.max_value
+    local spatial_sense = unit.status.current_soul.mental_attrs.SPATIAL_SENSE.max_value
+    local kinesthetic_sense = unit.status.current_soul.mental_attrs.KINESTHETIC_SENSE.max_value
+
+    -- assume highest skill ratings
+    local skill_rating = df.skill_rating.Legendary5
+    local melee_combat_rating = df.skill_rating.Legendary5
+
+    -- melee combat potential rating
+    local rating = skill_rating * 27000 + melee_combat_rating * 9000
+            + strength * 180 + body_size_base * 100 + kinesthetic_sense * 50 + endurance * 50
+            + agility * 30 + toughness * 20 + willpower * 20 + spatial_sense * 20
+    return rating
+end
+
+local function get_melee_combat_potential_rating(unit)
+    return get_rating(get_melee_combat_potential(unit), 350000, 2750000, 64, 52, 40, 28)
+end
+
+local function sort_by_melee_combat_potential_desc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local rating1 = get_melee_combat_potential(unit1)
+    local rating2 = get_melee_combat_potential(unit2)
+    if rating1 == rating2 then
+        return sort_by_mental_stability_desc(unit_id_1, unit_id_2)
+    end
+    return utils.compare(rating2, rating1)
+end
+
+local function sort_by_melee_combat_potential_asc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local rating1 = get_melee_combat_potential(unit1)
+    local rating2 = get_melee_combat_potential(unit2)
+    if rating1 == rating2 then
+        return sort_by_mental_stability_asc(unit_id_1, unit_id_2)
+    end
+    return utils.compare(rating1, rating2)
+end
+
+-- Statistical rating that is higher for more potent dwarves in long run ranged military training
+-- Wounds are not considered!
+local function get_ranged_combat_potential(unit)
+    -- Physical attributes
+    local agility = unit.body.physical_attrs.AGILITY.max_value
+
+    -- Mental attributes
+    local focus = unit.status.current_soul.mental_attrs.FOCUS.max_value
+    local spatial_sense = unit.status.current_soul.mental_attrs.SPATIAL_SENSE.max_value
+    local kinesthetic_sense = unit.status.current_soul.mental_attrs.KINESTHETIC_SENSE.max_value
+
+    -- assume highest skill ratings
+    local skill_rating = df.skill_rating.Legendary5
+    local ranged_combat = df.skill_rating.Legendary5
+
+    -- ranged combat potential formula
+    local rating = skill_rating * 24000 + ranged_combat * 8000
+            + agility * 15 + spatial_sense * 15 + kinesthetic_sense * 6 + focus * 6
+    return rating
+end
+
+local function get_ranged_combat_potential_rating(unit)
+    return get_rating(get_ranged_combat_potential(unit), 0, 800000, 72, 52, 31, 11)
+end
+
+local function sort_by_ranged_combat_potential_desc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local rating1 = get_ranged_combat_potential(unit1)
+    local rating2 = get_ranged_combat_potential(unit2)
+    if rating1 == rating2 then
+        return sort_by_mental_stability_desc(unit_id_1, unit_id_2)
+    end
+    return utils.compare(rating2, rating1)
+end
+
+local function sort_by_ranged_combat_potential_asc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local rating1 = get_ranged_combat_potential(unit1)
+    local rating2 = get_ranged_combat_potential(unit2)
+    if rating1 == rating2 then
+        return sort_by_mental_stability_asc(unit_id_1, unit_id_2)
+    end
+    return utils.compare(rating1, rating2)
+end
+
+local function get_need(unit)
+    if not unit or not unit.status.current_soul then return end
+    for _, need in ipairs(unit.status.current_soul.personality.needs) do
+        if need.id == df.need_type.MartialTraining and need.focus_level < 0 then
+            return -need.focus_level
+        end
+    end
+end
+
+local function get_need_rating(unit)
+    local focus_level = get_need(unit)
+    if not focus_level then return end
+    -- convert to stress ratings so we can use stress faces as labels
+    if focus_level > 100000 then return 0 end
+    if focus_level > 10000 then return 1 end
+    if focus_level > 1000 then return 2 end
+    if focus_level > 100 then return 3 end
+    return 6
+end
+
+local function sort_by_need_desc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local rating1 = get_need(unit1)
+    local rating2 = get_need(unit2)
+    if rating1 == rating2 then
+        return sort_by_stress_desc(unit_id_1, unit_id_2)
+    end
+    if not rating2 then return -1 end
+    if not rating1 then return 1 end
+    return utils.compare(rating2, rating1)
+end
+
+local function sort_by_need_asc(unit_id_1, unit_id_2)
+    if unit_id_1 == unit_id_2 then return 0 end
+    local unit1 = df.unit.find(unit_id_1)
+    local unit2 = df.unit.find(unit_id_2)
+    if not unit1 then return -1 end
+    if not unit2 then return 1 end
+    local rating1 = get_need(unit1)
+    local rating2 = get_need(unit2)
+    if rating1 == rating2 then
+        return sort_by_stress_asc(unit_id_1, unit_id_2)
+    end
+    if not rating2 then return 1 end
+    if not rating1 then return -1 end
+    return utils.compare(rating1, rating2)
+end
+
+local sort_by_any_melee_desc=make_sort_by_melee_skill_effectiveness_desc()
+local sort_by_any_melee_asc=make_sort_by_melee_skill_effectiveness_asc()
+local sort_by_any_ranged_desc=make_sort_by_ranged_skill_effectiveness_desc()
+local sort_by_any_ranged_asc=make_sort_by_ranged_skill_effectiveness_asc()
+local sort_by_teacher_desc=make_sort_by_skill_desc(df.job_skill.TEACHING)
+local sort_by_teacher_asc=make_sort_by_skill_asc(df.job_skill.TEACHING)
+local sort_by_tactics_desc=make_sort_by_skill_desc(df.job_skill.MILITARY_TACTICS)
+local sort_by_tactics_asc=make_sort_by_skill_asc(df.job_skill.MILITARY_TACTICS)
+local sort_by_axe_desc=make_sort_by_skill_desc(df.job_skill.AXE)
+local sort_by_axe_asc=make_sort_by_skill_asc(df.job_skill.AXE)
+local sort_by_sword_desc=make_sort_by_skill_desc(df.job_skill.SWORD)
+local sort_by_sword_asc=make_sort_by_skill_asc(df.job_skill.SWORD)
+local sort_by_mace_desc=make_sort_by_skill_desc(df.job_skill.MACE)
+local sort_by_mace_asc=make_sort_by_skill_asc(df.job_skill.MACE)
+local sort_by_hammer_desc=make_sort_by_skill_desc(df.job_skill.HAMMER)
+local sort_by_hammer_asc=make_sort_by_skill_asc(df.job_skill.HAMMER)
+local sort_by_spear_desc=make_sort_by_skill_desc(df.job_skill.SPEAR)
+local sort_by_spear_asc=make_sort_by_skill_asc(df.job_skill.SPEAR)
+local sort_by_crossbow_desc=make_sort_by_skill_desc(df.job_skill.CROSSBOW)
+local sort_by_crossbow_asc=make_sort_by_skill_asc(df.job_skill.CROSSBOW)
+
+local SORT_LIBRARY = {
+    {label='melee effectiveness', desc_fn=sort_by_any_melee_desc, asc_fn=sort_by_any_melee_asc, rating_fn=get_melee_skill_effectiveness_rating},
+    {label='ranged effectiveness', desc_fn=sort_by_any_ranged_desc, asc_fn=sort_by_any_ranged_asc, rating_fn=get_ranged_skill_effectiveness_rating},
+    {label='name', desc_fn=sort_by_name_desc, asc_fn=sort_by_name_asc},
+    {label='teacher skill', desc_fn=sort_by_teacher_desc, asc_fn=sort_by_teacher_asc, rating_fn=curry(get_skill_rating, df.job_skill.TEACHING)},
+    {label='tactics skill', desc_fn=sort_by_tactics_desc, asc_fn=sort_by_tactics_asc, rating_fn=curry(get_skill_rating, df.job_skill.MILITARY_TACTICS)},
+    {label='arrival order', desc_fn=sort_by_arrival_desc, asc_fn=sort_by_arrival_asc, rating_fn=get_arrival_rating},
+    {label='stress level', desc_fn=sort_by_stress_desc, asc_fn=sort_by_stress_asc, rating_fn=get_stress_rating, use_stress_faces=true},
+    {label='need for training', desc_fn=sort_by_need_desc, asc_fn=sort_by_need_asc, rating_fn=get_need_rating, use_stress_faces=true},
+    {label='axe skill', desc_fn=sort_by_axe_desc, asc_fn=sort_by_axe_asc, rating_fn=curry(get_skill_rating, df.job_skill.AXE)},
+    {label='sword skill', desc_fn=sort_by_sword_desc, asc_fn=sort_by_sword_asc, rating_fn=curry(get_skill_rating, df.job_skill.SWORD)},
+    {label='mace skill', desc_fn=sort_by_mace_desc, asc_fn=sort_by_mace_asc, rating_fn=curry(get_skill_rating, df.job_skill.MACE)},
+    {label='hammer skill', desc_fn=sort_by_hammer_desc, asc_fn=sort_by_hammer_asc, rating_fn=curry(get_skill_rating, df.job_skill.HAMMER)},
+    {label='spear skill', desc_fn=sort_by_spear_desc, asc_fn=sort_by_spear_asc, rating_fn=curry(get_skill_rating, df.job_skill.SPEAR)},
+    {label='crossbow skill', desc_fn=sort_by_crossbow_desc, asc_fn=sort_by_crossbow_asc, rating_fn=curry(get_skill_rating, df.job_skill.CROSSBOW)},
+    {label='melee potential', desc_fn=sort_by_melee_combat_potential_desc, asc_fn=sort_by_melee_combat_potential_asc, rating_fn=get_melee_combat_potential_rating},
+    {label='ranged potential', desc_fn=sort_by_ranged_combat_potential_desc, asc_fn=sort_by_ranged_combat_potential_asc, rating_fn=get_ranged_combat_potential_rating},
+}
+
+local RATING_FNS = {}
+local STRESS_FACE_FNS = {}
+for _, opt in ipairs(SORT_LIBRARY) do
+    RATING_FNS[opt.desc_fn] = opt.rating_fn
+    RATING_FNS[opt.asc_fn] = opt.rating_fn
+    if opt.use_stress_faces then
+        STRESS_FACE_FNS[opt.desc_fn] = true
+        STRESS_FACE_FNS[opt.asc_fn] = true
+    end
+end
+
+-- ----------------------
+-- SquadAssignmentOverlay
+--
+
+SquadAssignmentOverlay = defclass(SquadAssignmentOverlay, overlay.OverlayWidget)
+SquadAssignmentOverlay.ATTRS{
+    default_pos={x=18, y=5},
+    default_enabled=true,
+    viewscreens='dwarfmode/UnitSelector/SQUAD_FILL_POSITION',
+    version='2',
+    frame={w=38, h=31},
+}
+
+-- allow initial spacebar or two successive spacebars to fall through and
+-- pause/unpause the game
+local function search_on_char(ch, text)
+    if ch == ' ' then return text:match('%S$') end
+    return ch:match('[%l _-]')
+end
+
+function SquadAssignmentOverlay:init()
+    self.dirty = true
+
+    local sort_options = {}
+    for _, opt in ipairs(SORT_LIBRARY) do
+        table.insert(sort_options, {
+            label=opt.label..CH_DN,
+            value=opt.desc_fn,
+            pen=COLOR_GREEN,
+        })
+        table.insert(sort_options, {
+            label=opt.label..CH_UP,
+            value=opt.asc_fn,
+            pen=COLOR_YELLOW,
+        })
+    end
+
+    local main_panel = widgets.Panel{
+        frame={l=0, r=0, t=0, b=0},
+        frame_style=gui.FRAME_PANEL,
+        frame_background=gui.CLEAR_PEN,
+        autoarrange_subviews=true,
+        autoarrange_gap=1,
+    }
+    main_panel:addviews{
+        widgets.EditField{
+            view_id='search',
+            frame={l=0},
+            label_text='Search: ',
+            on_char=search_on_char,
+            on_change=function() self:refresh_list() end,
+        },
+        widgets.Panel{
+            frame={l=0, r=0, h=15},
+            frame_style=gui.FRAME_INTERIOR,
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='sort',
+                    frame={t=0, l=0},
+                    label='Sort by:',
+                    key='CUSTOM_SHIFT_S',
+                    options=sort_options,
+                    initial_option=sort_by_any_melee_desc,
+                    on_change=self:callback('refresh_list', 'sort'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_any_melee',
+                    frame={t=2, l=0, w=11},
+                    options={
+                        {label='melee eff.', value=sort_noop},
+                        {label='melee eff.'..CH_DN, value=sort_by_any_melee_desc, pen=COLOR_GREEN},
+                        {label='melee eff.'..CH_UP, value=sort_by_any_melee_asc, pen=COLOR_YELLOW},
+                    },
+                    initial_option=sort_by_any_melee_desc,
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_any_melee'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_any_ranged',
+                    frame={t=2, r=8, w=12},
+                    options={
+                        {label='ranged eff.', value=sort_noop},
+                        {label='ranged eff.'..CH_DN, value=sort_by_any_ranged_desc, pen=COLOR_GREEN},
+                        {label='ranged eff.'..CH_UP, value=sort_by_any_ranged_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_any_ranged'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_name',
+                    frame={t=2, r=0, w=5},
+                    options={
+                        {label='name', value=sort_noop},
+                        {label='name'..CH_DN, value=sort_by_name_desc, pen=COLOR_GREEN},
+                        {label='name'..CH_UP, value=sort_by_name_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_name'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_teacher',
+                    frame={t=4, l=0, w=8},
+                    options={
+                        {label='teacher', value=sort_noop},
+                        {label='teacher'..CH_DN, value=sort_by_teacher_desc, pen=COLOR_GREEN},
+                        {label='teacher'..CH_UP, value=sort_by_teacher_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_teacher'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_tactics',
+                    frame={t=4, l=10, w=8},
+                    options={
+                        {label='tactics', value=sort_noop},
+                        {label='tactics'..CH_DN, value=sort_by_tactics_desc, pen=COLOR_GREEN},
+                        {label='tactics'..CH_UP, value=sort_by_tactics_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_tactics'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_arrival',
+                    frame={t=4, r=0, w=14},
+                    options={
+                        {label='arrival order', value=sort_noop},
+                        {label='arrival order'..CH_DN, value=sort_by_arrival_desc, pen=COLOR_GREEN},
+                        {label='arrival order'..CH_UP, value=sort_by_arrival_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_arrival'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_stress',
+                    frame={t=6, l=0, w=7},
+                    options={
+                        {label='stress', value=sort_noop},
+                        {label='stress'..CH_DN, value=sort_by_stress_desc, pen=COLOR_GREEN},
+                        {label='stress'..CH_UP, value=sort_by_stress_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_stress'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_need',
+                    frame={t=6, r=0, w=18},
+                    options={
+                        {label='need for training', value=sort_noop},
+                        {label='need for training'..CH_DN, value=sort_by_need_desc, pen=COLOR_GREEN},
+                        {label='need for training'..CH_UP, value=sort_by_need_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_need'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_axe',
+                    frame={t=8, l=0, w=4},
+                    options={
+                        {label='axe', value=sort_noop},
+                        {label='axe'..CH_DN, value=sort_by_axe_desc, pen=COLOR_GREEN},
+                        {label='axe'..CH_UP, value=sort_by_axe_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_axe'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_sword',
+                    frame={t=8, w=6},
+                    options={
+                        {label='sword', value=sort_noop},
+                        {label='sword'..CH_DN, value=sort_by_sword_desc, pen=COLOR_GREEN},
+                        {label='sword'..CH_UP, value=sort_by_sword_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_sword'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_mace',
+                    frame={t=8, r=0, w=5},
+                    options={
+                        {label='mace', value=sort_noop},
+                        {label='mace'..CH_DN, value=sort_by_mace_desc, pen=COLOR_GREEN},
+                        {label='mace'..CH_UP, value=sort_by_mace_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_mace'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_hammer',
+                    frame={t=10, l=0, w=7},
+                    options={
+                        {label='hammer', value=sort_noop},
+                        {label='hammer'..CH_DN, value=sort_by_hammer_desc, pen=COLOR_GREEN},
+                        {label='hammer'..CH_UP, value=sort_by_hammer_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_hammer'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_spear',
+                    frame={t=10, w=6},
+                    options={
+                        {label='spear', value=sort_noop},
+                        {label='spear'..CH_DN, value=sort_by_spear_desc, pen=COLOR_GREEN},
+                        {label='spear'..CH_UP, value=sort_by_spear_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_spear'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_crossbow',
+                    frame={t=10, r=0, w=9},
+                    options={
+                        {label='crossbow', value=sort_noop},
+                        {label='crossbow'..CH_DN, value=sort_by_crossbow_desc, pen=COLOR_GREEN},
+                        {label='crossbow'..CH_UP, value=sort_by_crossbow_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_crossbow'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_melee_combat_potential',
+                    frame={t=12, l=0, w=16},
+                    options={
+                        {label='melee potential', value=sort_noop},
+                        {label='melee potential'..CH_DN, value=sort_by_melee_combat_potential_desc, pen=COLOR_GREEN},
+                        {label='melee potential'..CH_UP, value=sort_by_melee_combat_potential_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_melee_combat_potential'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_ranged_combat_potential',
+                    frame={t=12, r=0, w=17},
+                    options={
+                        {label='ranged potential', value=sort_noop},
+                        {label='ranged potential'..CH_DN, value=sort_by_ranged_combat_potential_desc, pen=COLOR_GREEN},
+                        {label='ranged potential'..CH_UP, value=sort_by_ranged_combat_potential_asc, pen=COLOR_YELLOW},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_ranged_combat_potential'),
+                },
+            },
+        },
+        widgets.CycleHotkeyLabel{
+            view_id='military',
+            frame={l=0},
+            key='CUSTOM_SHIFT_Q',
+            label='Units in other squads:',
+            options={
+                {label='Include', value='include', pen=COLOR_GREEN},
+                {label='Only', value='only', pen=COLOR_YELLOW},
+                {label='Exclude', value='exclude', pen=COLOR_RED},
+            },
+            initial_option='include',
+            on_change=function() self:refresh_list() end,
+        },
+        widgets.CycleHotkeyLabel{
+            view_id='officials',
+            frame={l=0},
+            key='CUSTOM_SHIFT_O',
+            label='Appointed officials:',
+            options={
+                {label='Include', value='include', pen=COLOR_GREEN},
+                {label='Only', value='only', pen=COLOR_YELLOW},
+                {label='Exclude', value='exclude', pen=COLOR_RED},
+            },
+            initial_option='include',
+            on_change=function() self:refresh_list() end,
+        },
+        widgets.CycleHotkeyLabel{
+            view_id='nobles',
+            frame={l=0, w=20},
+            key='CUSTOM_SHIFT_N',
+            label='Nobility:',
+            options={
+                {label='Include', value='include', pen=COLOR_GREEN},
+                {label='Only', value='only', pen=COLOR_YELLOW},
+                {label='Exclude', value='exclude', pen=COLOR_RED},
+            },
+            initial_option='include',
+            on_change=function() self:refresh_list() end,
+        },
+        widgets.CycleHotkeyLabel{
+            view_id='infant',
+            frame={l=0},
+            key='CUSTOM_SHIFT_M',
+            label='Mothers with infants:',
+            options={
+                {label='Include', value='include', pen=COLOR_GREEN},
+                {label='Only', value='only', pen=COLOR_YELLOW},
+                {label='Exclude', value='exclude', pen=COLOR_RED},
+            },
+            initial_option='include',
+            on_change=function() self:refresh_list() end,
+        },
+        widgets.CycleHotkeyLabel{
+            view_id='unstable',
+            frame={l=0},
+            key='CUSTOM_SHIFT_F',
+            label='Weak mental fortitude:',
+            options={
+                {label='Include', value='include', pen=COLOR_GREEN},
+                {label='Only', value='only', pen=COLOR_YELLOW},
+                {label='Exclude', value='exclude', pen=COLOR_RED},
+            },
+            initial_option='include',
+            on_change=function() self:refresh_list() end,
+        },
+        widgets.CycleHotkeyLabel{
+            view_id='maimed',
+            frame={l=0},
+            key='CUSTOM_SHIFT_I',
+            label='Critically injured:',
+            options={
+                {label='Include', value='include', pen=COLOR_GREEN},
+                {label='Only', value='only', pen=COLOR_YELLOW},
+                {label='Exclude', value='exclude', pen=COLOR_RED},
+            },
+            initial_option='include',
+            on_change=function() self:refresh_list() end,
+        },
+    }
+
+    self:addviews{
+        main_panel,
+        widgets.HelpButton{
+            frame={t=0, r=1},
+            command='sort',
+        },
+    }
+end
+
+local function normalize_search_key(search_key)
+    local out = ''
+    for c in dfhack.toSearchNormalized(search_key):gmatch("[%w%s]") do
+        out = out .. c:lower()
+    end
+    return out
+end
+
+local function is_in_military(unit)
+    return unit.military.squad_id > -1
+end
+
+local function is_elected_or_appointed_official(unit)
+    for _,occupation in ipairs(unit.occupations) do
+        if occupation.type ~= df.occupation_type.MERCENARY then
+            return true
+        end
+    end
+    for _, noble_pos in ipairs(dfhack.units.getNoblePositions(unit) or {}) do
+        if noble_pos.position.flags.ELECTED or
+            (noble_pos.position.mandate_max == 0 and noble_pos.position.demand_max == 0)
+        then
+            return true
+        end
+    end
+    return false
+end
+
+local function is_nobility(unit)
+    for _, noble_pos in ipairs(dfhack.units.getNoblePositions(unit) or {}) do
+        if not noble_pos.position.flags.ELECTED and
+            (noble_pos.position.mandate_max > 0 or noble_pos.position.demand_max > 0)
+        then
+            return true
+        end
+    end
+    return false
+end
+
+local function has_infant(unit)
+    for _, baby in ipairs(df.global.world.units.other.ANY_BABY2) do
+        if baby.relationship_ids.Mother == unit.id then
+            return true
+        end
+    end
+    return false
+end
+
+local function is_unstable(unit)
+    -- stddev percentiles are 61, 48, 35, 23
+    -- let's go with one stddev below the mean (35) as the cutoff
+    local _, color = get_rating(get_mental_stability(unit), -40, 80, 35, 0, 0, 0)
+    return color ~= COLOR_LIGHTGREEN
+end
+
+local function is_maimed(unit)
+    return not unit.flags2.vision_good or
+        unit.status2.limbs_grasp_count < 2 or
+        unit.status2.limbs_stand_count == 0
+end
+
+local function filter_matches(unit_id, filter)
+    if unit_id == -1 then return true end
+    local unit = df.unit.find(unit_id)
+    if not unit then return false end
+    if filter.military == 'only' and not is_in_military(unit) then return false end
+    if filter.military == 'exclude' and is_in_military(unit) then return false end
+    if filter.officials == 'only' and not is_elected_or_appointed_official(unit) then return false end
+    if filter.officials == 'exclude' and is_elected_or_appointed_official(unit) then return false end
+    if filter.nobles == 'only' and not is_nobility(unit) then return false end
+    if filter.nobles == 'exclude' and is_nobility(unit) then return false end
+    if filter.infant == 'only' and not has_infant(unit) then return false end
+    if filter.infant == 'exclude' and has_infant(unit) then return false end
+    if filter.unstable == 'only' and not is_unstable(unit) then return false end
+    if filter.unstable == 'exclude' and is_unstable(unit) then return false end
+    if filter.maimed == 'only' and not is_maimed(unit) then return false end
+    if filter.maimed == 'exclude' and is_maimed(unit) then return false end
+    if #filter.search == 0 then return true end
+    local search_key = sortoverlay.get_unit_search_key(unit)
+    return normalize_search_key(search_key):find(dfhack.toSearchNormalized(filter.search))
+end
+
+local function is_noop_filter(filter)
+    return #filter.search == 0 and
+        filter.military == 'include' and
+        filter.officials == 'include' and
+        filter.nobles == 'include' and
+        filter.infant == 'include' and
+        filter.unstable == 'include' and
+        filter.maimed == 'include'
+end
+
+local function is_filter_equal(a, b)
+    return a.search == b.search and
+        a.military == b.military and
+        a.officials == b.officials and
+        a.nobles == b.nobles and
+        a.infant == b.infant and
+        a.unstable == b.unstable and
+        a.maimed == b.maimed
+end
+
+local unit_selector = df.global.game.main_interface.unit_selector
+
+-- this function uses the unused itemid and selected vectors to keep state,
+-- taking advantage of the fact that they are reset by DF when the list of units changes
+local function filter_vector(filter, prev_filter)
+    local unid_is_filtered = #unit_selector.selected >= 0 and unit_selector.selected[0] ~= 0
+    if is_noop_filter(filter) or #unit_selector.selected == 0 then
+        if not unid_is_filtered then
+            -- we haven't modified the unid vector; nothing to do here
+            return
+        end
+        -- restore the unid vector
+        unit_selector.unid:assign(unit_selector.itemid)
+        -- clear our "we meddled" flag
+        unit_selector.selected[0] = 0
+        return
+    end
+    if unid_is_filtered and is_filter_equal(filter, prev_filter) then
+        -- filter hasn't changed; we don't need to refilter
+        return
+    end
+    if unid_is_filtered then
+        -- restore the unid vector
+        unit_selector.unid:assign(unit_selector.itemid)
+    else
+        -- save the unid vector and set our meddle flag
+        unit_selector.itemid:assign(unit_selector.unid)
+        unit_selector.selected[0] = 1
+    end
+    -- do the actual filtering
+    for idx=#unit_selector.unid-1,0,-1 do
+        if not filter_matches(unit_selector.unid[idx], filter) then
+            unit_selector.unid:erase(idx)
+        end
+    end
+    -- fix up scroll position if it would be off the end of the list
+    if unit_selector.scroll_position + 10 > #unit_selector.unid then
+        unit_selector.scroll_position = math.max(0, #unit_selector.unid - 10)
+    end
+end
+
+local use_stress_faces = false
+local rating_annotations = {}
+
+local function annotate_visible_units(sort_fn)
+    use_stress_faces = STRESS_FACE_FNS[sort_fn]
+    rating_annotations = {}
+    rating_fn = RATING_FNS[sort_fn]
+    local max_idx = math.min(#unit_selector.unid-1, unit_selector.scroll_position+9)
+    for idx = unit_selector.scroll_position, max_idx do
+        local annotation_idx = idx - unit_selector.scroll_position + 1
+        local unit = df.unit.find(unit_selector.unid[idx])
+        rating_annotations[annotation_idx] = nil
+        if unit and rating_fn then
+            local val, color = rating_fn(unit)
+            if val then
+                rating_annotations[annotation_idx] = {val=val, color=color}
+            end
+        end
+    end
+end
+
+local SORT_WIDGET_NAMES = {
+    'sort',
+    'sort_any_melee',
+    'sort_any_ranged',
+    'sort_name',
+    'sort_teacher',
+    'sort_tactics',
+    'sort_arrival',
+    'sort_stress',
+    'sort_need',
+    'sort_axe',
+    'sort_sword',
+    'sort_mace',
+    'sort_hammer',
+    'sort_spear',
+    'sort_crossbow',
+    'sort_melee_combat_potential',
+    'sort_ranged_combat_potential',
+}
+
+function SquadAssignmentOverlay:refresh_list(sort_widget, sort_fn)
+    sort_widget = sort_widget or 'sort'
+    sort_fn = sort_fn or self.subviews.sort:getOptionValue()
+    if sort_fn == sort_noop then
+        self.subviews[sort_widget]:cycle()
+        return
+    end
+    for _,widget_name in ipairs(SORT_WIDGET_NAMES) do
+        self.subviews[widget_name]:setOption(sort_fn)
+    end
+    local filter = {
+        search=self.subviews.search.text,
+        military=self.subviews.military:getOptionValue(),
+        officials=self.subviews.officials:getOptionValue(),
+        nobles=self.subviews.nobles:getOptionValue(),
+        infant=self.subviews.infant:getOptionValue(),
+        unstable=self.subviews.unstable:getOptionValue(),
+        maimed=self.subviews.maimed:getOptionValue(),
+    }
+    filter_vector(filter, self.prev_filter or {})
+    self.prev_filter = filter
+    utils.sort_vector(unit_selector.unid, nil, sort_fn)
+    annotate_visible_units(sort_fn)
+    self.saved_scroll_position = unit_selector.scroll_position
+end
+
+function SquadAssignmentOverlay:onInput(keys)
+    if keys._MOUSE_R or (keys._MOUSE_L and not self:getMouseFramePos()) then
+        -- if any click is made outside of our window, we may need to refresh our list
+        self.dirty = true
+    end
+    return SquadAssignmentOverlay.super.onInput(self, keys)
+end
+
+function SquadAssignmentOverlay:onRenderFrame(dc, frame_rect)
+    SquadAssignmentOverlay.super.onRenderFrame(self, dc, frame_rect)
+    if self.dirty then
+        self:refresh_list()
+        self.dirty = false
+    elseif self.saved_scroll_position ~= unit_selector.scroll_position then
+        annotate_visible_units(self.subviews.sort:getOptionValue())
+        self.saved_scroll_position = unit_selector.scroll_position
+    end
+end
+
+-- ----------------------
+-- SquadAnnotationOverlay
+--
+
+SquadAnnotationOverlay = defclass(SquadAnnotationOverlay, overlay.OverlayWidget)
+SquadAnnotationOverlay.ATTRS{
+    default_pos={x=56, y=5},
+    default_enabled=true,
+    viewscreens='dwarfmode/UnitSelector/SQUAD_FILL_POSITION',
+    frame={w=5, h=35},
+    frame_style=gui.FRAME_INTERIOR_MEDIUM,
+    frame_background=gui.CLEAR_PEN,
+}
+
+function get_annotation_text(idx)
+    local elem = rating_annotations[idx]
+    if not elem or not tonumber(elem.val) then return ' - ' end
+
+    return tostring(math.tointeger(elem.val))
+end
+
+function get_annotation_color(idx)
+    local elem = rating_annotations[idx]
+    return elem and elem.color or nil
+end
+
+local to_pen = dfhack.pen.parse
+local DASH_PEN = to_pen{ch='-', fg=COLOR_WHITE, keep_lower=true}
+
+local FACE_TILES = {}
+local function init_face_tiles()
+    for idx=0,6 do
+        FACE_TILES[idx] = {}
+        local face_off = (6 - idx) * 2
+        for y=0,1 do
+            for x=0,1 do
+                local tile = dfhack.screen.findGraphicsTile('INTERFACE_BITS', 32 + face_off + x, 6 + y)
+                ensure_key(FACE_TILES[idx], y)[x] = tile
+            end
+        end
+    end
+
+    for idx,color in ipairs{COLOR_RED, COLOR_LIGHTRED, COLOR_YELLOW, COLOR_WHITE, COLOR_GREEN, COLOR_LIGHTGREEN, COLOR_LIGHTCYAN} do
+        local face = {}
+        ensure_key(face, 0)[0] = to_pen{tile=FACE_TILES[idx-1][0][0], ch=1, fg=color}
+        ensure_key(face, 0)[1] = to_pen{tile=FACE_TILES[idx-1][0][1], ch='\\', fg=color}
+        ensure_key(face, 1)[0] = to_pen{tile=FACE_TILES[idx-1][1][0], ch='\\', fg=color}
+        ensure_key(face, 1)[1] = to_pen{tile=FACE_TILES[idx-1][1][1], ch='/', fg=color}
+        FACE_TILES[idx-1] = face
+    end
+end
+init_face_tiles()
+
+function get_stress_face_tile(idx, x, y)
+    local elem = rating_annotations[idx]
+    if not elem or not elem.val or elem.val < 0 then
+        return x == 0 and y == 1 and DASH_PEN or gui.CLEAR_PEN
+    end
+    local val = math.min(6, elem.val)
+    return safe_index(FACE_TILES, val, y, x)
+end
+
+function SquadAnnotationOverlay:init()
+    for idx = 1, 10 do
+        self:addviews{
+            widgets.Label{
+                frame={t=idx*3+1, h=1, w=3},
+                text={
+                    {
+                        text=curry(get_annotation_text, idx),
+                        pen=curry(get_annotation_color, idx),
+                        width=3,
+                        rjustify=true,
+                    },
+                },
+                visible=function() return not use_stress_faces end,
+            },
+            widgets.Label{
+                frame={t=idx*3, r=0, h=2, w=2},
+                auto_height=false,
+                text={
+                    {width=1, tile=curry(get_stress_face_tile, idx, 0, 0)},
+                    {width=1, tile=curry(get_stress_face_tile, idx, 1, 0)},
+                    NEWLINE,
+                    {width=1, tile=curry(get_stress_face_tile, idx, 0, 1)},
+                    {width=1, tile=curry(get_stress_face_tile, idx, 1, 1)},
+                },
+                visible=function() return use_stress_faces end,
+            },
+        }
+    end
+end
+
+OVERLAY_WIDGETS = {
+    squad_assignment=SquadAssignmentOverlay,
+    squad_annotation=SquadAnnotationOverlay,
+    info=require('plugins.sort.info').InfoOverlay,
+    workanimals=require('plugins.sort.info').WorkAnimalOverlay,
+    candidates=require('plugins.sort.info').CandidatesOverlay,
+    interrogation=require('plugins.sort.info').InterrogationOverlay,
+    location_selector=require('plugins.sort.locationselector').LocationSelectorOverlay,
+    unit_selector=require('plugins.sort.unitselector').UnitSelectorOverlay,
+    worker_assignment=require('plugins.sort.unitselector').WorkerAssignmentOverlay,
+    burrow_assignment=require('plugins.sort.unitselector').BurrowAssignmentOverlay,
+    slab=require('plugins.sort.slab').SlabOverlay,
+    world=require('plugins.sort.world').WorldOverlay,
+    places=require('plugins.sort.places').PlacesOverlay,
+}
+
+dfhack.onStateChange[GLOBAL_KEY] = function(sc)
+    if sc ~= SC_MAP_LOADED or df.global.gamemode ~= df.game_mode.DWARF then
+        return
+    end
+
+    init_face_tiles()
+end
+
+--[[
 local utils = require('utils')
 local units = require('plugins.sort.units')
 local items = require('plugins.sort.items')
@@ -51,5 +1361,6 @@ function parse_ordering_spec(type,...)
 end
 
 make_sort_order = utils.make_sort_order
+]]
 
 return _ENV
diff --git a/plugins/lua/sort/info.lua b/plugins/lua/sort/info.lua
new file mode 100644
index 000000000..318438cf1
--- /dev/null
+++ b/plugins/lua/sort/info.lua
@@ -0,0 +1,706 @@
+local _ENV = mkmodule('plugins.sort.info')
+
+local gui = require('gui')
+local overlay = require('plugins.overlay')
+local sortoverlay = require('plugins.sort.sortoverlay')
+local widgets = require('gui.widgets')
+local utils = require('utils')
+
+local info = df.global.game.main_interface.info
+local administrators = info.administrators
+local creatures = info.creatures
+local justice = info.justice
+local objects = info.artifacts
+local tasks = info.jobs
+local work_details = info.labor.work_details
+
+-- these sort functions attempt to match the vanilla info panel sort behavior, which
+-- is not quite the same as the rest of DFHack. For example, in other DFHack sorts,
+-- we'd always sort by name descending as a secondary sort. To match vanilla sorting,
+-- if the primary sort is ascending, the secondary name sort will also be ascending.
+--
+-- also note that vanilla sorts are not stable, so there might still be some jitter
+-- if the player clicks one of the vanilla sort widgets after searching
+local function sort_by_name_desc(a, b)
+    return a.sort_name < b.sort_name
+end
+
+local function sort_by_name_asc(a, b)
+    return a.sort_name > b.sort_name
+end
+
+local function sort_by_prof_desc(a, b)
+    if a.profession_list_order1 == b.profession_list_order1 then
+        return sort_by_name_desc(a, b)
+    end
+    return a.profession_list_order1 < b.profession_list_order1
+end
+
+local function sort_by_prof_asc(a, b)
+    if a.profession_list_order1 == b.profession_list_order1 then
+        return sort_by_name_asc(a, b)
+    end
+    return a.profession_list_order1 > b.profession_list_order1
+end
+
+local function sort_by_job_name_desc(a, b)
+    if a.job_sort_name == b.job_sort_name then
+        return sort_by_name_desc(a, b)
+    end
+    return a.job_sort_name < b.job_sort_name
+end
+
+local function sort_by_job_name_asc(a, b)
+    if a.job_sort_name == b.job_sort_name then
+        -- use descending tertiary sort for visual stability
+        return sort_by_name_desc(a, b)
+    end
+    return a.job_sort_name > b.job_sort_name
+end
+
+local function sort_by_job_desc(a, b)
+    if not not a.jb == not not b.jb then
+        return sort_by_job_name_desc(a, b)
+    end
+    return not not a.jb
+end
+
+local function sort_by_job_asc(a, b)
+    if not not a.jb == not not b.jb then
+        return sort_by_job_name_asc(a, b)
+    end
+    return not not b.jb
+end
+
+local function sort_by_stress_desc(a, b)
+    if a.stress == b.stress then
+        return sort_by_name_desc(a, b)
+    end
+    return a.stress > b.stress
+end
+
+local function sort_by_stress_asc(a, b)
+    if a.stress == b.stress then
+        return sort_by_name_asc(a, b)
+    end
+    return a.stress < b.stress
+end
+
+local function get_sort()
+    if creatures.sorting_cit_job then
+        return creatures.sorting_cit_job_is_ascending and sort_by_job_asc or sort_by_job_desc
+    elseif creatures.sorting_cit_stress then
+        return creatures.sorting_cit_stress_is_ascending and sort_by_stress_asc or sort_by_stress_desc
+    elseif creatures.sorting_cit_nameprof_doing_prof then
+        return creatures.sorting_cit_nameprof_is_ascending and sort_by_prof_asc or sort_by_prof_desc
+    else
+        return creatures.sorting_cit_nameprof_is_ascending and sort_by_name_asc or sort_by_name_desc
+    end
+end
+
+local function get_cri_unit_search_key(cri_unit)
+    return ('%s %s'):format(
+        cri_unit.un and sortoverlay.get_unit_search_key(cri_unit.un) or '',
+        cri_unit.job_sort_name)
+end
+
+local function get_race_name(raw_id)
+    local raw = df.creature_raw.find(raw_id)
+    if not raw then return end
+    return raw.name[1]
+end
+
+-- get name in both dwarvish and English
+local function get_artifact_search_key(artifact)
+    return ('%s %s'):format(dfhack.TranslateName(artifact.name), dfhack.TranslateName(artifact.name, true))
+end
+
+local function work_details_search(vec, data, text, incremental)
+    if work_details.selected_work_detail_index ~= data.selected then
+        data.saved_original = nil
+        data.selected = work_details.selected_work_detail_index
+    end
+    sortoverlay.single_vector_search(
+        {get_search_key_fn=sortoverlay.get_unit_search_key},
+        vec, data, text, incremental)
+end
+
+local function restore_allocated_data(vec, data)
+    if not data.saved_visible or not data.saved_original then return end
+    for _,elem in ipairs(data.saved_original) do
+        if not utils.linear_index(data.saved_visible, elem) then
+            vec:insert('#', elem)
+        end
+    end
+end
+
+local function serialize_skills(unit)
+    if not unit or not unit.status or not unit.status.current_soul then
+        return ''
+    end
+    local skills = {}
+    for _, skill in ipairs(unit.status.current_soul.skills) do
+        if skill.rating > 0 then -- ignore dabbling
+            table.insert(skills, df.job_skill[skill.id])
+        end
+    end
+    return table.concat(skills, ' ')
+end
+
+local function get_candidate_search_key(cand)
+    if not cand.un then return end
+    return ('%s %s'):format(
+        sortoverlay.get_unit_search_key(cand.un),
+        serialize_skills(cand.un))
+end
+
+-- ----------------------
+-- InfoOverlay
+--
+
+InfoOverlay = defclass(InfoOverlay, sortoverlay.SortOverlay)
+InfoOverlay.ATTRS{
+    default_pos={x=64, y=8},
+    viewscreens='dwarfmode/Info',
+    frame={w=40, h=6},
+}
+
+function get_squad_options()
+    local options = {{label='Any', value='all', pen=COLOR_GREEN}}
+    local fort = df.historical_entity.find(df.global.plotinfo.group_id)
+    if not fort then return options end
+    for _, squad_id in ipairs(fort.squads) do
+        table.insert(options, {
+            label=dfhack.military.getSquadName(squad_id),
+            value=squad_id,
+            pen=COLOR_YELLOW,
+        })
+    end
+    return options
+end
+
+function get_burrow_options()
+    local options = {
+        {label='Any', value='all', pen=COLOR_GREEN},
+        {label='Unburrowed', value='none', pen=COLOR_LIGHTRED},
+    }
+    for _, burrow in ipairs(df.global.plotinfo.burrows.list) do
+        table.insert(options, {
+            label=#burrow.name > 0 and burrow.name or ('Burrow %d'):format(burrow.id + 1),
+            value=burrow.id,
+            pen=COLOR_YELLOW,
+        })
+    end
+    return options
+end
+
+function matches_squad_burrow_filters(unit, subset, target_squad_id, target_burrow_id)
+    if subset == 'all' then
+        return true
+    elseif subset == 'civilian' then
+        return unit.military.squad_id == -1
+    elseif subset == 'military' then
+        local squad_id = unit.military.squad_id
+        if squad_id == -1 then return false end
+        if target_squad_id == 'all' then return true end
+        return target_squad_id == squad_id
+    elseif subset == 'burrow' then
+        if target_burrow_id == 'all' then return #unit.burrows + #unit.inactive_burrows > 0 end
+        if target_burrow_id == 'none' then return #unit.burrows + #unit.inactive_burrows == 0 end
+        return utils.binsearch(unit.burrows, target_burrow_id) or
+            utils.binsearch(unit.inactive_burrows, target_burrow_id)
+    end
+    return true
+end
+
+function InfoOverlay:init()
+    self:addviews{
+        widgets.BannerPanel{
+            view_id='panel',
+            frame={l=0, t=0, r=0, h=1},
+            visible=self:callback('get_key'),
+            subviews={
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=1, t=0, r=1},
+                    label_text="Search: ",
+                    key='CUSTOM_ALT_S',
+                    on_change=function(text) self:do_search(text) end,
+                },
+            },
+        },
+        widgets.BannerPanel{
+            view_id='subset_panel',
+            frame={l=0, t=1, r=0, h=1},
+            visible=function() return self:get_key() == 'PET_WA' end,
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='subset',
+                    frame={l=1, t=0, r=1},
+                    key='CUSTOM_SHIFT_F',
+                    label='Show:',
+                    options={
+                        {label='All', value='all', pen=COLOR_GREEN},
+                        {label='Military', value='military', pen=COLOR_YELLOW},
+                        {label='Civilians', value='civilian', pen=COLOR_CYAN},
+                        {label='Burrowed', value='burrow', pen=COLOR_MAGENTA},
+                    },
+                    on_change=function(value)
+                        local squad = self.subviews.squad
+                        local burrow = self.subviews.burrow
+                        squad.visible = false
+                        burrow.visible = false
+                        if value == 'military' then
+                            squad.options = get_squad_options()
+                            squad:setOption('all')
+                            squad.visible = true
+                        elseif value == 'burrow' then
+                            burrow.options = get_burrow_options()
+                            burrow:setOption('all')
+                            burrow.visible = true
+                        end
+                        self:do_search(self.subviews.search.text, true)
+                    end,
+                },
+            },
+        },
+        widgets.BannerPanel{
+            view_id='subfilter_panel',
+            frame={l=0, t=2, r=0, h=1},
+            visible=function()
+                local subset = self.subviews.subset:getOptionValue()
+                return self:get_key() == 'PET_WA' and (subset == 'military' or subset == 'burrow')
+            end,
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='squad',
+                    frame={l=1, t=0, r=1},
+                    key='CUSTOM_SHIFT_S',
+                    label='Squad:',
+                    options={
+                        {label='Any', value='all', pen=COLOR_GREEN},
+                    },
+                    visible=false,
+                    on_change=function() self:do_search(self.subviews.search.text, true) end,
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='burrow',
+                    frame={l=1, t=0, r=1},
+                    key='CUSTOM_SHIFT_B',
+                    label='Burrow:',
+                    options={
+                        {label='Any', value='all', pen=COLOR_GREEN},
+                    },
+                    visible=false,
+                    on_change=function() self:do_search(self.subviews.search.text, true) end,
+                },
+            },
+        },
+    }
+
+    local CRI_UNIT_VECS = {
+        CITIZEN=creatures.cri_unit.CITIZEN,
+        PET=creatures.cri_unit.PET,
+        OTHER=creatures.cri_unit.OTHER,
+        DECEASED=creatures.cri_unit.DECEASED,
+    }
+    for key,vec in pairs(CRI_UNIT_VECS) do
+        self:register_handler(key, vec,
+            curry(sortoverlay.single_vector_search,
+                {
+                    get_search_key_fn=get_cri_unit_search_key,
+                    get_sort_fn=get_sort
+                }),
+            curry(restore_allocated_data, vec))
+    end
+
+    self:register_handler('JOBS', tasks.cri_job,
+        curry(sortoverlay.single_vector_search, {get_search_key_fn=get_cri_unit_search_key}),
+        curry(restore_allocated_data, tasks.cri_job))
+    self:register_handler('PET_OT', creatures.atk_index,
+        curry(sortoverlay.single_vector_search, {get_search_key_fn=get_race_name}))
+    self:register_handler('PET_AT', creatures.trainer,
+        curry(sortoverlay.single_vector_search, {get_search_key_fn=sortoverlay.get_unit_search_key}))
+    self:register_handler('PET_WA', creatures.work_animal_recipient,
+        curry(sortoverlay.single_vector_search, {
+            get_search_key_fn=sortoverlay.get_unit_search_key,
+            matches_filters_fn=self:callback('matches_filters'),
+        }))
+    self:register_handler('WORK_DETAILS', work_details.assignable_unit, work_details_search)
+
+    for idx,name in ipairs(df.artifacts_mode_type) do
+        if idx < 0 then goto continue end
+        self:register_handler(name, objects.list[idx],
+            curry(sortoverlay.single_vector_search, {get_search_key_fn=get_artifact_search_key}))
+        ::continue::
+    end
+end
+
+function InfoOverlay:reset()
+    InfoOverlay.super.reset(self)
+    self.subviews.subset:setOption('all')
+end
+
+function InfoOverlay:get_key()
+    if info.current_mode == df.info_interface_mode_type.CREATURES then
+        if creatures.current_mode == df.unit_list_mode_type.PET then
+            if creatures.showing_overall_training then
+                return 'PET_OT'
+            elseif creatures.adding_trainer then
+                return 'PET_AT'
+            elseif creatures.assign_work_animal then
+                return 'PET_WA'
+            end
+        end
+        return df.unit_list_mode_type[creatures.current_mode]
+    elseif info.current_mode == df.info_interface_mode_type.JOBS then
+        return 'JOBS'
+    elseif info.current_mode == df.info_interface_mode_type.ARTIFACTS then
+        return df.artifacts_mode_type[objects.mode]
+    elseif info.current_mode == df.info_interface_mode_type.LABOR then
+        if info.labor.mode == df.labor_mode_type.WORK_DETAILS then
+            return 'WORK_DETAILS'
+        end
+    end
+end
+
+local function resize_overlay(self)
+    local sw = dfhack.screen.getWindowSize()
+    local overlay_width = math.min(40, sw-(self.frame_rect.x1 + 30))
+    if overlay_width ~= self.frame.w then
+        self.frame.w = overlay_width
+        return true
+    end
+end
+
+local function is_tabs_in_two_rows()
+    return dfhack.screen.readTile(64, 6, false).ch == 0
+end
+
+local function get_panel_offsets()
+    local tabs_in_two_rows = is_tabs_in_two_rows()
+    local shift_right = info.current_mode == df.info_interface_mode_type.ARTIFACTS or
+        info.current_mode == df.info_interface_mode_type.LABOR
+    local l_offset = (not tabs_in_two_rows and shift_right) and 4 or 0
+    local t_offset = 1
+    if tabs_in_two_rows then
+        t_offset = shift_right and 0 or 3
+    end
+    if info.current_mode == df.info_interface_mode_type.JOBS then
+        t_offset = t_offset - 1
+    end
+    return l_offset, t_offset
+end
+
+function InfoOverlay:updateFrames()
+    local ret = resize_overlay(self)
+    local l, t = get_panel_offsets()
+    local frame = self.subviews.panel.frame
+    if frame.l == l and frame.t == t then return ret end
+    frame.l, frame.t = l, t
+    local frame2 = self.subviews.subset_panel.frame
+    frame2.l, frame2.t = l, t + 1
+    local frame3 = self.subviews.subfilter_panel.frame
+    frame3.l, frame3.t = l, t + 2
+    return true
+end
+
+function InfoOverlay:onRenderBody(dc)
+    InfoOverlay.super.onRenderBody(self, dc)
+    if self:updateFrames() then
+        self:updateLayout()
+    end
+    if self.refresh_search then
+        self.refresh_search = nil
+        self:do_search(self.subviews.search.text)
+    end
+end
+
+function InfoOverlay:onInput(keys)
+    if keys._MOUSE_L and self:get_key() == 'WORK_DETAILS' then
+        self.refresh_search = true
+    end
+    return InfoOverlay.super.onInput(self, keys)
+end
+
+function InfoOverlay:matches_filters(unit)
+    return matches_squad_burrow_filters(unit, self.subviews.subset:getOptionValue(),
+        self.subviews.squad:getOptionValue(), self.subviews.burrow:getOptionValue())
+end
+
+-- ----------------------
+-- CandidatesOverlay
+--
+
+CandidatesOverlay = defclass(CandidatesOverlay, sortoverlay.SortOverlay)
+CandidatesOverlay.ATTRS{
+    default_pos={x=54, y=8},
+    viewscreens='dwarfmode/Info/ADMINISTRATORS/Candidates',
+    frame={w=27, h=3},
+}
+
+function CandidatesOverlay:init()
+    self:addviews{
+        widgets.BannerPanel{
+            view_id='panel',
+            frame={l=0, t=0, r=0, h=1},
+            subviews={
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=1, t=0, r=1},
+                    label_text="Search: ",
+                    key='CUSTOM_ALT_S',
+                    on_change=function(text) self:do_search(text) end,
+                },
+            },
+        },
+    }
+
+    self:register_handler('CANDIDATE', administrators.candidate,
+        curry(sortoverlay.single_vector_search, {get_search_key_fn=get_candidate_search_key}),
+        curry(restore_allocated_data, administrators.candidate))
+end
+
+function CandidatesOverlay:get_key()
+    if administrators.choosing_candidate then
+        return 'CANDIDATE'
+    end
+end
+
+function CandidatesOverlay:updateFrames()
+    local t = is_tabs_in_two_rows() and 2 or 0
+    local frame = self.subviews.panel.frame
+    if frame.t == t then return end
+    frame.t = t
+    return true
+end
+
+function CandidatesOverlay:onRenderBody(dc)
+    CandidatesOverlay.super.onRenderBody(self, dc)
+    if self:updateFrames() then
+        self:updateLayout()
+    end
+end
+
+-- ----------------------
+-- WorkAnimalOverlay
+--
+
+WorkAnimalOverlay = defclass(WorkAnimalOverlay, overlay.OverlayWidget)
+WorkAnimalOverlay.ATTRS{
+    default_pos={x=-33, y=12},
+    viewscreens='dwarfmode/Info/CREATURES/AssignWorkAnimal',
+    default_enabled=true,
+    frame={w=29, h=1},
+}
+
+function WorkAnimalOverlay:init()
+    self:addviews{
+        widgets.Label{
+            view_id='annotations',
+            frame={t=0, l=0},
+            text='',
+        }
+    }
+end
+
+local function get_work_animal_counts()
+    local counts = {}
+    for _,unit in ipairs(df.global.world.units.active) do
+        if not dfhack.units.isOwnCiv(unit) or
+            (not dfhack.units.isWar(unit) and not dfhack.units.isHunter(unit))
+        then
+            goto continue
+        end
+        local owner_id = unit.relationship_ids.Pet
+        if owner_id == -1 then goto continue end
+        counts[owner_id] = (counts[owner_id] or 0) + 1
+        ::continue::
+    end
+    return counts
+end
+
+function WorkAnimalOverlay:onRenderFrame(dc, rect)
+    local _, sh = dfhack.screen.getWindowSize()
+    local _, t = get_panel_offsets()
+    local list_height = sh - (17 + t)
+    local num_elems = list_height // 3
+    local max_elem = math.min(#creatures.work_animal_recipient-1,
+        creatures.scroll_position_work_animal+num_elems-1)
+
+    local annotations = {}
+    local counts = get_work_animal_counts()
+    for idx=creatures.scroll_position_work_animal,max_elem do
+        table.insert(annotations, NEWLINE)
+        table.insert(annotations, NEWLINE)
+        local animal_count = counts[creatures.work_animal_recipient[idx].id]
+        if animal_count and animal_count > 0 then
+            table.insert(annotations, {text='[', pen=COLOR_RED})
+            table.insert(annotations, ('Assigned work animals: %d'):format(animal_count))
+            table.insert(annotations, {text=']', pen=COLOR_RED})
+        end
+        table.insert(annotations, NEWLINE)
+    end
+
+    self.subviews.annotations.frame.t = t
+    self.subviews.annotations:setText(annotations)
+    self.frame.h = list_height + t
+
+    WorkAnimalOverlay.super.onRenderFrame(self, dc, rect)
+end
+
+-- ----------------------
+-- InterrogationOverlay
+--
+
+InterrogationOverlay = defclass(InterrogationOverlay, sortoverlay.SortOverlay)
+InterrogationOverlay.ATTRS{
+    default_pos={x=47, y=10},
+    viewscreens='dwarfmode/Info/JUSTICE',
+    frame={w=27, h=9},
+}
+
+function InterrogationOverlay:init()
+    self:addviews{
+        widgets.Panel{
+            view_id='panel',
+            frame={l=0, t=4, h=5, r=0},
+            frame_background=gui.CLEAR_PEN,
+            frame_style=gui.FRAME_MEDIUM,
+            visible=self:callback('get_key'),
+            subviews={
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=0, t=0, r=0},
+                    label_text="Search: ",
+                    key='CUSTOM_ALT_S',
+                    on_change=function(text) self:do_search(text) end,
+                },
+                widgets.ToggleHotkeyLabel{
+                    view_id='include_interviewed',
+                    frame={l=0, t=1, w=23},
+                    key='CUSTOM_SHIFT_I',
+                    label='Interviewed:',
+                    options={
+                        {label='Include', value=true, pen=COLOR_GREEN},
+                        {label='Exclude', value=false, pen=COLOR_RED},
+                    },
+                    visible=function() return justice.interrogating end,
+                    on_change=function() self:do_search(self.subviews.search.text, true) end,
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='subset',
+                    frame={l=0, t=2, w=28},
+                    key='CUSTOM_SHIFT_F',
+                    label='Show:',
+                    options={
+                        {label='All', value='all', pen=COLOR_GREEN},
+                        {label='Risky visitors', value='risky', pen=COLOR_RED},
+                        {label='Other visitors', value='visitors', pen=COLOR_LIGHTRED},
+                        {label='Residents', value='residents', pen=COLOR_YELLOW},
+                        {label='Citizens', value='citizens', pen=COLOR_CYAN},
+                        {label='Animals', value='animals', pen=COLOR_BLUE},
+                        {label='Deceased or missing', value='deceased', pen=COLOR_MAGENTA},
+                        {label='Others', value='others', pen=COLOR_GRAY},
+                    },
+                    on_change=function() self:do_search(self.subviews.search.text, true) end,
+                },
+            },
+        },
+    }
+
+    self:register_handler('INTERROGATING', justice.interrogation_list,
+        curry(sortoverlay.flags_vector_search,
+            {
+                get_search_key_fn=sortoverlay.get_unit_search_key,
+                get_elem_id_fn=function(unit) return unit.id end,
+                matches_filters_fn=self:callback('matches_filters'),
+            },
+        justice.interrogation_list_flag))
+    self:register_handler('CONVICTING', justice.conviction_list,
+        curry(sortoverlay.single_vector_search,
+            {
+                get_search_key_fn=sortoverlay.get_unit_search_key,
+                matches_filters_fn=self:callback('matches_filters'),
+            }))
+end
+
+function InterrogationOverlay:reset()
+    InterrogationOverlay.super.reset(self)
+    self.subviews.include_interviewed:setOption(true, false)
+    self.subviews.subset:setOption('all')
+end
+
+function InterrogationOverlay:get_key()
+    if justice.interrogating then
+        return 'INTERROGATING'
+    elseif justice.convicting then
+        return 'CONVICTING'
+    end
+end
+
+local RISKY_PROFESSIONS = utils.invert{
+    df.profession.THIEF,
+    df.profession.MASTER_THIEF,
+    df.profession.CRIMINAL,
+}
+
+local function is_risky(unit)
+    if RISKY_PROFESSIONS[unit.profession] or RISKY_PROFESSIONS[unit.profession2] then
+        return true
+    end
+    if dfhack.units.getReadableName(unit):endswith('necromancer') then return true end
+    return not dfhack.units.isAlive(unit)  -- detect intelligent undead
+end
+
+function InterrogationOverlay:matches_filters(unit, flag)
+    if justice.interrogating then
+        local include_interviewed = self.subviews.include_interviewed:getOptionValue()
+        if not include_interviewed and flag == 2 then return false end
+    end
+    local subset = self.subviews.subset:getOptionValue()
+    if subset == 'all' then
+        return true
+    elseif dfhack.units.isDead(unit) or not dfhack.units.isActive(unit) then
+        return subset == 'deceased'
+    elseif dfhack.units.isInvader(unit) or dfhack.units.isOpposedToLife(unit)
+        or unit.flags2.visitor_uninvited or unit.flags4.agitated_wilderness_creature
+    then
+        return subset == 'others'
+    elseif dfhack.units.isVisiting(unit) then
+        local risky = is_risky(unit)
+        return (subset == 'risky' and risky) or (subset == 'visitors' and not risky)
+    elseif dfhack.units.isAnimal(unit) then
+        return subset == 'animals'
+    elseif dfhack.units.isCitizen(unit) then
+        return subset == 'citizens'
+    elseif unit.flags2.roaming_wilderness_population_source then
+        return subset == 'others'
+    end
+    return subset == 'residents'
+end
+
+function InterrogationOverlay:render(dc)
+    local sw = dfhack.screen.getWindowSize()
+    local info_panel_border = 31 -- from edges of panel to screen edges
+    local info_panel_width = sw - info_panel_border
+    local info_panel_center = info_panel_width // 2
+    local panel_x_offset = (info_panel_center + 5) - self.frame_rect.x1
+    local frame_w = math.min(panel_x_offset + 37, info_panel_width - 56)
+    local panel_l = panel_x_offset
+    local panel_t = is_tabs_in_two_rows() and 4 or 0
+
+    if self.frame.w ~= frame_w or
+        self.subviews.panel.frame.l ~= panel_l or
+        self.subviews.panel.frame.t ~= panel_t
+    then
+        self.frame.w = frame_w
+        self.subviews.panel.frame.l = panel_l
+        self.subviews.panel.frame.t = panel_t
+        self:updateLayout()
+    end
+
+    InterrogationOverlay.super.render(self, dc)
+end
+
+return _ENV
diff --git a/plugins/lua/sort/locationselector.lua b/plugins/lua/sort/locationselector.lua
new file mode 100644
index 000000000..f4a707073
--- /dev/null
+++ b/plugins/lua/sort/locationselector.lua
@@ -0,0 +1,145 @@
+local _ENV = mkmodule('plugins.sort.locationselector')
+
+local sortoverlay = require('plugins.sort.sortoverlay')
+local widgets = require('gui.widgets')
+
+local location_selector = df.global.game.main_interface.location_selector
+
+-- ----------------------
+-- LocationSelectorOverlay
+--
+
+LocationSelectorOverlay = defclass(LocationSelectorOverlay, sortoverlay.SortOverlay)
+LocationSelectorOverlay.ATTRS{
+    default_pos={x=48, y=6},
+    viewscreens='dwarfmode/LocationSelector',
+    frame={w=26, h=3},
+}
+
+local function add_spheres(hf, spheres)
+    if not hf then return end
+    for _, sphere in ipairs(hf.info.spheres.spheres) do
+        spheres[sphere] = true
+    end
+end
+
+local function stringify_spheres(spheres)
+    local strs = {}
+    for sphere in pairs(spheres) do
+        table.insert(strs, df.sphere_type[sphere])
+    end
+    return table.concat(strs, ' ')
+end
+
+function get_religion_string(religion_id, religion_type)
+    if religion_id == -1 then return end
+    local entity
+    local spheres = {}
+    if religion_type == df.temple_deity_type.Deity then
+        entity = df.historical_figure.find(religion_id)
+        add_spheres(entity, spheres)
+    elseif religion_type == df.temple_deity_type.Religion then
+        entity = df.historical_entity.find(religion_id)
+        if entity then
+            for _, deity in ipairs(entity.relations.deities) do
+                add_spheres(df.historical_figure.find(deity), spheres)
+            end
+        end
+    end
+    if not entity then return end
+    return ('%s %s'):format(dfhack.TranslateName(entity.name, true), stringify_spheres(spheres))
+end
+
+function get_profession_string(profession)
+    local profession_string = df.profession[profession]:gsub('_', ' ')
+    local dwarfified_string = profession_string:gsub('[Mm][Aa][Nn]', 'dwarf')
+    return profession_string .. ' ' .. dwarfified_string
+end
+
+function LocationSelectorOverlay:init()
+    local panel = widgets.Panel{
+        visible=self:callback('get_key'),
+    }
+    panel:addviews{
+        widgets.BannerPanel{
+            frame={l=0, t=0, r=0, h=1},
+            subviews={
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=1, t=0, r=1},
+                    label_text="Search: ",
+                    key='CUSTOM_ALT_S',
+                    on_change=function(text) self:do_search(text) end,
+                },
+            },
+        },
+        widgets.BannerPanel{
+            frame={l=0, t=2, r=0, h=1},
+            subviews={
+                widgets.ToggleHotkeyLabel{
+                    view_id='hide_established',
+                    frame={l=1, t=0, r=1},
+                    label="Hide established:",
+                    key='CUSTOM_SHIFT_E',
+                    initial_option=false,
+                    on_change=function() self:do_search(self.subviews.search.text, true) end,
+                },
+            },
+        },
+    }
+    self:addviews{panel}
+
+    self:register_handler('TEMPLE', location_selector.valid_religious_practice_id,
+        curry(sortoverlay.flags_vector_search,
+            {
+                get_search_key_fn=get_religion_string,
+                matches_filters_fn=self:callback('matches_temple_filter'),
+            },
+            location_selector.valid_religious_practice))
+    self:register_handler('GUILDHALL', location_selector.valid_craft_guild_type,
+        curry(sortoverlay.single_vector_search,
+            {
+                get_search_key_fn=get_profession_string,
+                matches_filters_fn=self:callback('matches_guildhall_filter'),
+            }))
+end
+
+function LocationSelectorOverlay:get_key()
+    if location_selector.choosing_temple_religious_practice then
+        return 'TEMPLE'
+    elseif location_selector.choosing_craft_guild then
+        return 'GUILDHALL'
+    end
+end
+
+function LocationSelectorOverlay:reset()
+    LocationSelectorOverlay.super.reset(self)
+    self.cache = nil
+    self.subviews.hide_established:setOption(false, false)
+end
+
+function LocationSelectorOverlay:get_cache()
+    if self.cache then return self.cache end
+    local cache = {}
+    for _,location in ipairs(df.global.world.world_data.active_site[0].buildings) do
+        if df.abstract_building_templest:is_instance(location) then
+            ensure_keys(cache, 'temple', location.deity_type)[location.deity_data.Religion] = true
+        elseif df.abstract_building_guildhallst:is_instance(location) then
+            ensure_keys(cache, 'guildhall')[location.contents.profession] = true
+        end
+    end
+    self.cache = cache
+    return self.cache
+end
+
+function LocationSelectorOverlay:matches_temple_filter(id, flag)
+    local hide_established = self.subviews.hide_established:getOptionValue()
+    return not hide_established or not safe_index(self:get_cache(), 'temple', flag, id)
+end
+
+function LocationSelectorOverlay:matches_guildhall_filter(id)
+    local hide_established = self.subviews.hide_established:getOptionValue()
+    return not hide_established or not safe_index(self:get_cache(), 'guildhall', id)
+end
+
+return _ENV
diff --git a/plugins/lua/sort/places.lua b/plugins/lua/sort/places.lua
new file mode 100644
index 000000000..10f18b94c
--- /dev/null
+++ b/plugins/lua/sort/places.lua
@@ -0,0 +1,157 @@
+local _ENV = mkmodule('plugins.sort.places')
+
+local sortoverlay = require('plugins.sort.sortoverlay')
+local locationselector = require('plugins.sort.locationselector')
+local widgets = require('gui.widgets')
+local utils = require('utils')
+
+local info = df.global.game.main_interface.info
+local buildings = info.buildings
+
+local zone_names = {
+    [df.civzone_type.MeetingHall] = 'Meeting Area',
+    [df.civzone_type.Bedroom] = 'Bedroom',
+    [df.civzone_type.DiningHall] = 'Dining Hall',
+    [df.civzone_type.Pen] = 'Pen Pasture',
+    [df.civzone_type.Pond] = 'Pit Pond',
+    [df.civzone_type.WaterSource] = 'Water Source',
+    [df.civzone_type.Dungeon] = 'Dungeon',
+    [df.civzone_type.FishingArea] = 'Fishing',
+    [df.civzone_type.SandCollection] = 'Sand',
+    [df.civzone_type.Office] = 'Office',
+    [df.civzone_type.Dormitory] = 'Dormitory',
+    [df.civzone_type.Barracks] = 'Barrachs',
+    [df.civzone_type.ArcheryRange] = 'Archery Range',
+    [df.civzone_type.Dump] = 'Garbage Dump',
+    [df.civzone_type.AnimalTraining] = 'Animal Training',
+    [df.civzone_type.Tomb] = 'Tomb',
+    [df.civzone_type.PlantGathering] = 'Gather Fruit',
+    [df.civzone_type.ClayCollection] = 'Clay'
+}
+
+-- I used strings rather than df.civzone_type because nobody is going to search "MeadHall" they're going to search "Tavern"
+local language_name_types = {
+    [df.language_name_type.SymbolFood] = 'Inn Tavern',
+    [df.language_name_type.Temple] = 'Temple',
+    [df.language_name_type.Hospital] = 'Hospital',
+    [df.language_name_type.Guildhall] = 'Guildhall',
+    [df.language_name_type.Library] = 'Library',
+}
+
+local function get_location_religion(religion_id, religion_type)
+    if religion_type == df.temple_deity_type.None then return 'Temple'
+    else return locationselector.get_religion_string(religion_id, religion_type) or '' end
+end
+
+local function get_default_zone_name(zone_type)
+    return zone_names[zone_type] or ''
+end
+
+local function get_zone_search_key(zone)
+    local site = df.global.world.world_data.active_site[0]
+    local result = {}
+
+    -- allow zones to be searchable by their name
+    if #zone.name == 0 then
+        table.insert(result, get_default_zone_name(zone.type))
+    else
+        table.insert(result, zone.name)
+    end
+
+    -- allow zones w/ assignments to be searchable by their assigned unit
+    if zone.assigned_unit ~= nil then
+        table.insert(result, sortoverlay.get_unit_search_key(zone.assigned_unit))
+    end
+
+    -- allow zones to be searchable by type
+    if zone.location_id == -1 then -- zone is NOT a special location and we don't need to do anything special for type searching
+        table.insert(result, df.civzone_type[zone.type]);
+    else -- zone is a special location and we need to get its type from world data
+        local building, success = utils.binsearch(site.buildings, zone.location_id, 'id')
+
+        if success and building.name then
+            table.insert(result, language_name_types[building.name.type] or '')
+            if building.name.has_name then
+                table.insert(result, dfhack.TranslateName(building.name, true))
+            end
+        end
+    end
+
+    -- allow barracks to be searchable by assigned squad
+    for _, squad in ipairs(zone.squad_room_info) do
+        table.insert(result, dfhack.military.getSquadName(squad.squad_id))
+    end
+
+    return table.concat(result, ' ')
+end
+
+local function get_location_search_key(zone)
+    local site = df.global.world.world_data.active_site[0]
+    local result = {}
+
+    -- get language_name and type (we dont need user-given zone name because it does not appear on this page)
+    local building, success = utils.binsearch(site.buildings, zone.location_id, 'id')
+    if success and building.name then
+        table.insert(result, language_name_types[building.name.type] or '')
+        if building.name.has_name then
+            table.insert(result, dfhack.TranslateName(building.name, true))
+        end
+
+        -- for temples and guildhalls, get assigned organization
+        if df.abstract_building_templest:is_instance(building) then
+            table.insert(result, get_location_religion(building.deity_data.Deity or building.deity_data.Religion, building.deity_type))
+        elseif df.abstract_building_guildhallst:is_instance(building) then
+            local dwarfified_profession = locationselector.get_profession_string(building.contents.profession)
+            table.insert(result, dwarfified_profession)
+        end
+
+    end
+
+    return table.concat(result, ' ')
+end
+
+-- ----------------------
+-- PlacesOverlay
+--
+
+PlacesOverlay = defclass(PlacesOverlay, sortoverlay.SortOverlay)
+PlacesOverlay.ATTRS{
+    default_pos={x=71, y=9},
+    viewscreens='dwarfmode/Info',
+    frame={w=40, h=6}
+}
+
+function PlacesOverlay:init()
+    self:addviews{
+        widgets.BannerPanel{
+            frame={l=0, t=0, r=0, h=1},
+            visible=self:callback('get_key'),
+            subviews={
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=1, t=0, r=1},
+                    label_text="Search: ",
+                    key='CUSTOM_ALT_S',
+                    on_change=function(text) self:do_search(text) end,
+                },
+            },
+        },
+    }
+
+    self:register_handler('ZONES', buildings.list[df.buildings_mode_type.ZONES], curry(sortoverlay.single_vector_search, {get_search_key_fn=get_zone_search_key}))
+    self:register_handler('LOCATIONS', buildings.list[df.buildings_mode_type.LOCATIONS], curry(sortoverlay.single_vector_search, {get_search_key_fn=get_location_search_key}))
+end
+
+function PlacesOverlay:get_key()
+    if info.current_mode == df.info_interface_mode_type.BUILDINGS then
+        -- TODO: Replace nested if with 'return df.buildings_mode_type[buildings.mode]' once other handlers are written
+        -- Not there right now so it doesn't render a search bar on unsupported Places subpages
+        if buildings.mode == df.buildings_mode_type.ZONES then
+            return 'ZONES'
+        elseif buildings.mode == df.buildings_mode_type.LOCATIONS then
+            return 'LOCATIONS'
+        end
+    end
+end
+
+return _ENV
diff --git a/plugins/lua/sort/slab.lua b/plugins/lua/sort/slab.lua
new file mode 100644
index 000000000..5945763c9
--- /dev/null
+++ b/plugins/lua/sort/slab.lua
@@ -0,0 +1,114 @@
+local _ENV = mkmodule('plugins.sort.slab')
+
+local gui = require('gui')
+local sortoverlay = require('plugins.sort.sortoverlay')
+local widgets = require('gui.widgets')
+
+local building = df.global.game.main_interface.building
+
+-- ----------------------
+-- SlabOverlay
+--
+
+SlabOverlay = defclass(SlabOverlay, sortoverlay.SortOverlay)
+SlabOverlay.ATTRS{
+    default_pos={x=-40, y=12},
+    viewscreens='dwarfmode/ViewSheets/BUILDING/Workshop',
+    frame={w=57, h=3},
+}
+
+function SlabOverlay:init()
+    local panel = widgets.Panel{
+        frame_background=gui.CLEAR_PEN,
+        visible=self:callback('get_key'),
+    }
+    panel:addviews{
+        widgets.BannerPanel{
+            frame={l=0, t=0, r=0, h=1},
+            subviews={
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=1, t=0, r=1},
+                    label_text="Search: ",
+                    key='CUSTOM_ALT_S',
+                    on_change=function(text) self:do_search(text) end,
+                },
+            },
+        },
+        widgets.BannerPanel{
+            frame={l=0, t=2, r=0, h=1},
+            subviews={
+                widgets.ToggleHotkeyLabel{
+                    view_id='only_needs_slab',
+                    frame={l=1, t=0, r=1},
+                    label="Show only citizens who need a slab:",
+                    key='CUSTOM_SHIFT_E',
+                    initial_option=false,
+                    on_change=function() self:do_search(self.subviews.search.text, true) end,
+                },
+            },
+        },
+    }
+    self:addviews{panel}
+
+    self:register_handler('SLAB', building.filtered_button,
+        curry(sortoverlay.single_vector_search,
+            {
+                get_search_key_fn=self:callback('get_search_key'),
+                matches_filters_fn=self:callback('matches_filters'),
+            }))
+end
+
+function SlabOverlay:onInput(keys)
+    if SlabOverlay.super.onInput(self, keys) then return true end
+    if keys._MOUSE_L and self:get_key() and self:getMousePos() then
+        return true
+    end
+end
+
+function SlabOverlay:get_key()
+    -- DF fails to set building.category back to NONE if there are no units that
+    -- can be memorialized, so we have to manually check for a populated button vector
+    if #building.button > 0 and
+        building.category == df.interface_category_building.SELECT_MEMORIAL_UNIT
+    then
+        return 'SLAB'
+    else
+        if safe_index(self.state, 'SLAB', 'saved_original') then
+            -- elements get freed as soon as the screen changes
+            self.state.SLAB.saved_original = nil
+        end
+    end
+end
+
+function SlabOverlay:reset()
+    SlabOverlay.super.reset(self)
+    self.subviews.only_needs_slab:setOption(false, false)
+end
+
+local function get_unit(if_button)
+    local hf = df.historical_figure.find(if_button.spec_id)
+    return hf and df.unit.find(hf.unit_id) or nil
+end
+
+function SlabOverlay:get_search_key(if_button)
+    local unit = get_unit(if_button)
+    if not unit then return if_button.filter_str end
+    return sortoverlay.get_unit_search_key(unit)
+end
+
+local function needs_slab(if_button)
+    local unit = get_unit(if_button)
+    if not unit then return false end
+    if not dfhack.units.isOwnGroup(unit) then return false end
+    local info = dfhack.toSearchNormalized(if_button.info)
+    if not info:find('no slabs engraved', 1, true) then return false end
+    return info:find('not memorialized', 1, true) or info:find('ghost', 1, true)
+end
+
+function SlabOverlay:matches_filters(if_button)
+    local only_needs_slab = self.subviews.only_needs_slab:getOptionValue()
+    return not only_needs_slab or needs_slab(if_button)
+end
+
+return _ENV
diff --git a/plugins/lua/sort/sortoverlay.lua b/plugins/lua/sort/sortoverlay.lua
new file mode 100644
index 000000000..82d7d8fca
--- /dev/null
+++ b/plugins/lua/sort/sortoverlay.lua
@@ -0,0 +1,186 @@
+local _ENV = mkmodule('plugins.sort.sortoverlay')
+
+local overlay = require('plugins.overlay')
+local utils = require('utils')
+
+function get_unit_search_key(unit)
+    return ('%s %s %s'):format(
+        dfhack.units.getReadableName(unit),
+        dfhack.units.getProfessionName(unit),
+        dfhack.TranslateName(unit.name, true, true))  -- get English last name
+end
+
+local function copy_to_lua_table(vec)
+    local tab = {}
+    for k,v in ipairs(vec) do
+        tab[k+1] = v
+    end
+    return tab
+end
+
+-- ----------------------
+-- SortOverlay
+--
+
+SortOverlay = defclass(SortOverlay, overlay.OverlayWidget)
+SortOverlay.ATTRS{
+    default_enabled=true,
+    hotspot=true,
+    overlay_onupdate_max_freq_seconds=0,
+    -- subclasses expected to provide default_pos, viewscreens (single string), and frame
+    -- viewscreens should be the top-level scope within which the search widget state is maintained
+    -- once the player leaves that scope, widget state will be reset
+}
+
+function SortOverlay:init()
+    self.state = {}
+    self.handlers = {}
+    -- subclasses expected to provide an EditField widget with view_id='search'
+end
+
+function SortOverlay:register_handler(key, vec, search_fn, cleanup_fn)
+    self.handlers[key] = {
+        vec=vec,
+        search_fn=search_fn,
+        cleanup_fn=cleanup_fn
+    }
+end
+
+-- handles reset and clean up when the player exits the handled scope
+function SortOverlay:overlay_onupdate()
+    if self.overlay_onupdate_max_freq_seconds == 0 and
+        not dfhack.gui.matchFocusString(self.viewscreens, dfhack.gui.getDFViewscreen(true))
+    then
+        for key,data in pairs(self.state) do
+            local cleanup_fn = safe_index(self.handlers, key, 'cleanup_fn')
+            if cleanup_fn then
+                cleanup_fn(data)
+            end
+        end
+        self:reset()
+        self.overlay_onupdate_max_freq_seconds = 300
+    end
+end
+
+function SortOverlay:reset()
+    self.state = {}
+    self.subviews.search:setText('')
+    self.subviews.search:setFocus(false)
+end
+
+-- returns the current context key for dereferencing the handler
+-- subclasses must override
+function SortOverlay:get_key()
+    return nil
+end
+
+-- handles saving/restoring search strings when the player moves between different contexts
+function SortOverlay:onRenderBody(dc)
+    if next(self.state) then
+        local key = self:get_key()
+        if self.state.cur_key ~= key then
+            self.state.cur_key = key
+            local prev_text = key and ensure_key(self.state, key).prev_text or ''
+            self.subviews.search:setText(prev_text)
+            self:do_search(self.subviews.search.text, true)
+        end
+    end
+    self.overlay_onupdate_max_freq_seconds = 0
+    SortOverlay.super.onRenderBody(self, dc)
+end
+
+function SortOverlay:onInput(keys)
+    if keys._MOUSE_R and self.subviews.search.focus and self:get_key() then
+        self.subviews.search:setFocus(false)
+        return true
+    end
+    return SortOverlay.super.onInput(self, keys)
+end
+
+function SortOverlay:do_search(text, force_full_search)
+    if not force_full_search and not next(self.state) and text == '' then return end
+    -- the EditField state is guaranteed to be consistent with the current
+    -- context since when clicking to switch tabs, onRenderBody is always called
+    -- before this text_input callback, even if a key is pressed before the next
+    -- graphical frame would otherwise be printed. if this ever becomes untrue,
+    -- then we can add an on_char handler to the EditField that also checks for
+    -- context transitions.
+    local key = self:get_key()
+    if not key then return end
+    local prev_text = ensure_key(self.state, key).prev_text
+    -- some screens reset their contents between context switches; regardless,
+    -- a switch back to the context should results in an incremental search
+    local incremental = not force_full_search and prev_text and text:startswith(prev_text)
+    local handler = self.handlers[key]
+    handler.search_fn(handler.vec, self.state[key], text, incremental)
+    self.state[key].prev_text = text
+end
+
+local function filter_vec(fns, flags_vec, vec, text, erase_fn)
+    if fns.matches_filters_fn or text ~= '' then
+        local search_tokens = text:split()
+        for idx = #vec-1,0,-1 do
+            local flag = flags_vec and flags_vec[idx] or nil
+            local search_key = fns.get_search_key_fn and fns.get_search_key_fn(vec[idx], flag) or nil
+            if (search_key and not utils.search_text(search_key, search_tokens)) or
+                (fns.matches_filters_fn and not fns.matches_filters_fn(vec[idx], flag))
+            then
+                erase_fn(idx)
+            end
+        end
+    end
+end
+
+function single_vector_search(fns, vec, data, text, incremental)
+    vec = utils.getval(vec)
+    if not data.saved_original then
+        data.saved_original = copy_to_lua_table(vec)
+        data.saved_original_size = #vec
+    elseif not incremental then
+        vec:assign(data.saved_original)
+        vec:resize(data.saved_original_size)
+    end
+    filter_vec(fns, nil, vec, text, function(idx) vec:erase(idx) end)
+    data.saved_visible = copy_to_lua_table(vec)
+    data.saved_visible_size = #vec
+    if fns.get_sort_fn then
+        table.sort(data.saved_visible, fns.get_sort_fn())
+        vec:assign(data.saved_visible)
+        vec:resize(data.saved_visible_size)
+    end
+end
+
+-- doesn't support sorting since nothing that uses this needs it yet
+function flags_vector_search(fns, flags_vec, vec, data, text, incremental)
+    local get_elem_id_fn = fns.get_elem_id_fn or function(elem) return elem end
+    flags_vec, vec = utils.getval(flags_vec), utils.getval(vec)
+    if not data.saved_original then
+        -- we save the sizes since trailing nils get lost in the lua -> vec assignment
+        data.saved_original = copy_to_lua_table(vec)
+        data.saved_original_size = #vec
+        data.saved_flags = copy_to_lua_table(flags_vec)
+        data.saved_flags_size = #flags_vec
+        data.saved_idx_map = {}
+        for idx,elem in ipairs(data.saved_original) do
+            data.saved_idx_map[get_elem_id_fn(elem)] = idx  -- 1-based idx
+        end
+    else  -- sync flag changes to saved vector
+        for idx,elem in ipairs(vec) do  -- 0-based idx
+            data.saved_flags[data.saved_idx_map[get_elem_id_fn(elem)]] = flags_vec[idx]
+        end
+    end
+
+    if not incremental then
+        vec:assign(data.saved_original)
+        vec:resize(data.saved_original_size)
+        flags_vec:assign(data.saved_flags)
+        flags_vec:resize(data.saved_flags_size)
+    end
+
+    filter_vec(fns, flags_vec, vec, text, function(idx)
+        vec:erase(idx)
+        flags_vec:erase(idx)
+    end)
+end
+
+return _ENV
diff --git a/plugins/lua/sort/unitselector.lua b/plugins/lua/sort/unitselector.lua
new file mode 100644
index 000000000..25228386c
--- /dev/null
+++ b/plugins/lua/sort/unitselector.lua
@@ -0,0 +1,285 @@
+local _ENV = mkmodule('plugins.sort.unitselector')
+
+local info = require('plugins.sort.info')
+local gui = require('gui')
+local sortoverlay = require('plugins.sort.sortoverlay')
+local utils = require('utils')
+local widgets = require('gui.widgets')
+
+local unit_selector = df.global.game.main_interface.unit_selector
+
+-- ----------------------
+-- UnitSelectorOverlay
+--
+
+local WIDGET_WIDTH = 31
+
+UnitSelectorOverlay = defclass(UnitSelectorOverlay, sortoverlay.SortOverlay)
+UnitSelectorOverlay.ATTRS{
+    default_pos={x=62, y=6},
+    viewscreens='dwarfmode/UnitSelector',
+    frame={w=31, h=1},
+    -- pen, pit, chain, and cage assignment are handled by dedicated screens
+    -- squad fill position screen has a specialized overlay
+    -- we *could* add search functionality to vanilla screens for pit and cage,
+    -- but then we'd have to handle the itemid vector
+    handled_screens={
+        ZONE_BEDROOM_ASSIGNMENT='already',
+        ZONE_OFFICE_ASSIGNMENT='already',
+        ZONE_DINING_HALL_ASSIGNMENT='already',
+        ZONE_TOMB_ASSIGNMENT='already',
+        OCCUPATION_ASSIGNMENT='selected',
+        SQUAD_KILL_ORDER='selected',
+    },
+}
+
+local function get_unit_id_search_key(unit_id)
+    local unit = df.unit.find(unit_id)
+    if not unit then return end
+    return sortoverlay.get_unit_search_key(unit)
+end
+
+function UnitSelectorOverlay:init()
+    self:addviews{
+        widgets.BannerPanel{
+            frame={l=0, t=0, w=WIDGET_WIDTH, h=1},
+            visible=self:callback('get_key'),
+            subviews={
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=1, t=0, r=1},
+                    label_text="Search: ",
+                    key='CUSTOM_ALT_S',
+                    on_change=function(text) self:do_search(text) end,
+                },
+            },
+        },
+    }
+
+    self:register_handlers()
+end
+
+function UnitSelectorOverlay:register_handlers()
+    for name,flags_vec in pairs(self.handled_screens) do
+        self:register_handler(name, unit_selector.unid,
+            curry(sortoverlay.flags_vector_search, {get_search_key_fn=get_unit_id_search_key},
+            unit_selector[flags_vec]))
+    end
+end
+
+function UnitSelectorOverlay:get_key()
+    local key = df.unit_selector_context_type[unit_selector.context]
+    if self.handled_screens[key] then
+        return key
+    end
+end
+
+function UnitSelectorOverlay:onRenderBody(dc)
+    UnitSelectorOverlay.super.onRenderBody(self, dc)
+    if self.refresh_search then
+        self.refresh_search = nil
+        self:do_search(self.subviews.search.text)
+    end
+end
+
+function UnitSelectorOverlay:onInput(keys)
+    if UnitSelectorOverlay.super.onInput(self, keys) then
+        return true
+    end
+    if keys._MOUSE_L then
+        self.refresh_search = true
+    end
+end
+
+-- -----------------------
+-- WorkerAssignmentOverlay
+--
+
+WorkerAssignmentOverlay = defclass(WorkerAssignmentOverlay, UnitSelectorOverlay)
+WorkerAssignmentOverlay.ATTRS{
+    default_pos={x=6, y=6},
+    viewscreens='dwarfmode/UnitSelector',
+    frame={w=31, h=1},
+    handled_screens={WORKER_ASSIGNMENT='selected'},
+}
+
+-- -----------------------
+-- BurrowAssignmentOverlay
+--
+
+local DEFAULT_OVERLAY_WIDTH = 58
+
+BurrowAssignmentOverlay = defclass(BurrowAssignmentOverlay, UnitSelectorOverlay)
+BurrowAssignmentOverlay.ATTRS{
+    viewscreens='dwarfmode/UnitSelector',
+    frame={w=DEFAULT_OVERLAY_WIDTH, h=5},
+    handled_screens={BURROW_ASSIGNMENT='selected'},
+}
+
+local function get_screen_width()
+    local sw = dfhack.screen.getWindowSize()
+    return sw
+end
+
+local function toggle_all()
+    if #unit_selector.unid == 0 then return end
+    local burrow = df.burrow.find(unit_selector.burrow_id)
+    if not burrow then return end
+    local target_state = unit_selector.selected[0] == 0
+    local target_val = target_state and 1 or 0
+    for i,unit_id in ipairs(unit_selector.unid) do
+        local unit = df.unit.find(unit_id)
+        if unit then
+            dfhack.burrows.setAssignedUnit(burrow, unit, target_state)
+            unit_selector.selected[i] = target_val
+        end
+    end
+end
+
+function BurrowAssignmentOverlay:init()
+    self:addviews{
+        widgets.Panel{
+            view_id='top_mask',
+            frame={l=WIDGET_WIDTH, r=0, t=0, h=1},
+            frame_background=gui.CLEAR_PEN,
+            visible=function() return get_screen_width() >= 144 end,
+        },
+        widgets.Panel{
+            view_id='wide_mask',
+            frame={r=0, t=1, h=2, w=DEFAULT_OVERLAY_WIDTH},
+            frame_background=gui.CLEAR_PEN,
+            visible=function() return get_screen_width() >= 144 end,
+        },
+        widgets.Panel{
+            view_id='narrow_mask',
+            frame={l=0, t=1, h=2, w=24},
+            frame_background=gui.CLEAR_PEN,
+            visible=function() return get_screen_width() < 144 end,
+        },
+        widgets.BannerPanel{
+            view_id='subset_panel',
+            frame={l=0, t=1, w=WIDGET_WIDTH, h=1},
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='subset',
+                    frame={l=1, t=0, r=1},
+                    key='CUSTOM_SHIFT_F',
+                    label='Show:',
+                    options={
+                        {label='All', value='all', pen=COLOR_GREEN},
+                        {label='Military', value='military', pen=COLOR_YELLOW},
+                        {label='Civilians', value='civilian', pen=COLOR_CYAN},
+                        {label='Burrowed', value='burrow', pen=COLOR_MAGENTA},
+                    },
+                    on_change=function(value)
+                        local squad = self.subviews.squad
+                        local burrow = self.subviews.burrow
+                        squad.visible = false
+                        burrow.visible = false
+                        if value == 'military' then
+                            squad.options = info.get_squad_options()
+                            squad:setOption('all')
+                            squad.visible = true
+                        elseif value == 'burrow' then
+                            burrow.options = info.get_burrow_options()
+                            burrow:setOption('all')
+                            burrow.visible = true
+                        end
+                        self:do_search(self.subviews.search.text, true)
+                    end,
+                },
+            },
+        },
+        widgets.BannerPanel{
+            view_id='subfilter_panel',
+            frame={l=0, t=2, w=WIDGET_WIDTH, h=1},
+            visible=function()
+                local subset = self.subviews.subset:getOptionValue()
+                return subset == 'military' or subset == 'burrow'
+            end,
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='squad',
+                    frame={l=1, t=0, r=1},
+                    key='CUSTOM_SHIFT_S',
+                    label='Squad:',
+                    options={
+                        {label='Any', value='all', pen=COLOR_GREEN},
+                    },
+                    visible=false,
+                    on_change=function() self:do_search(self.subviews.search.text, true) end,
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='burrow',
+                    frame={l=1, t=0, r=1},
+                    key='CUSTOM_SHIFT_B',
+                    label='Burrow:',
+                    options={
+                        {label='Any', value='all', pen=COLOR_GREEN},
+                    },
+                    visible=false,
+                    on_change=function() self:do_search(self.subviews.search.text, true) end,
+                },
+            },
+        },
+        widgets.BannerPanel{
+            frame={r=0, t=4, w=25, h=1},
+            subviews={
+                widgets.HotkeyLabel{
+                    frame={l=1, t=0, r=1},
+                    label='Select all/none',
+                    key='CUSTOM_CTRL_A',
+                    on_activate=toggle_all,
+                },
+            },
+        },
+    }
+end
+
+function BurrowAssignmentOverlay:register_handlers()
+    for name,flags_vec in pairs(self.handled_screens) do
+        self:register_handler(name, unit_selector.unid,
+            curry(sortoverlay.flags_vector_search, {
+                get_search_key_fn=get_unit_id_search_key,
+                matches_filters_fn=self:callback('matches_filters'),
+            },
+            unit_selector[flags_vec]))
+    end
+end
+
+function BurrowAssignmentOverlay:reset()
+    BurrowAssignmentOverlay.super.reset(self)
+    self.subviews.subset:setOption('all')
+end
+
+function BurrowAssignmentOverlay:matches_filters(unit_id)
+    local unit = df.unit.find(unit_id)
+    if not unit then return false end
+    return info.matches_squad_burrow_filters(unit, self.subviews.subset:getOptionValue(),
+        self.subviews.squad:getOptionValue(), self.subviews.burrow:getOptionValue())
+end
+
+local function clicked_on_mask(self, keys)
+    if not keys._MOUSE_L then return false end
+    for _,mask in ipairs{'top_mask', 'wide_mask', 'narrow_mask'} do
+        if utils.getval(self.subviews[mask].visible) then
+            if self.subviews[mask]:getMousePos() then
+                return true
+            end
+        end
+    end
+    return false
+end
+
+function BurrowAssignmentOverlay:onInput(keys)
+    return BurrowAssignmentOverlay.super.onInput(self, keys) or
+        clicked_on_mask(self, keys)
+end
+
+function BurrowAssignmentOverlay:onRenderFrame(dc, rect)
+    local sw = get_screen_width()
+    self.frame.w = math.min(DEFAULT_OVERLAY_WIDTH, sw - 94)
+    BurrowAssignmentOverlay.super.onRenderFrame(self, dc, rect)
+end
+
+return _ENV
diff --git a/plugins/lua/sort/world.lua b/plugins/lua/sort/world.lua
new file mode 100644
index 000000000..a4cf6c0e5
--- /dev/null
+++ b/plugins/lua/sort/world.lua
@@ -0,0 +1,88 @@
+local _ENV = mkmodule('plugins.sort.world')
+
+local sortoverlay = require('plugins.sort.sortoverlay')
+local widgets = require('gui.widgets')
+
+-- ----------------------
+-- WorldOverlay
+--
+
+WorldOverlay = defclass(WorldOverlay, sortoverlay.SortOverlay)
+WorldOverlay.ATTRS{
+    default_pos={x=-18, y=2},
+    viewscreens='world/ARTIFACTS',
+    frame={w=40, h=1},
+}
+
+local function get_world_artifact_search_key(artifact, rumor)
+    local search_key = ('%s %s'):format(dfhack.TranslateName(artifact.name, true),
+        dfhack.items.getDescription(artifact.item, 0))
+    if rumor then
+        local hf = df.historical_figure.find(rumor.hfid)
+        if hf then
+            search_key = ('%s %s %s'):format(search_key,
+                dfhack.TranslateName(hf.name),
+                dfhack.TranslateName(hf.name, true))
+        end
+        local ws = df.world_site.find(rumor.stid)
+        if ws then
+            search_key = ('%s %s'):format(search_key,
+                dfhack.TranslateName(ws.name, true))
+        end
+    else
+        local hf = df.historical_figure.find(artifact.holder_hf)
+        if hf then
+            local unit = df.unit.find(hf.unit_id)
+            if unit then
+                search_key = ('%s %s'):format(search_key,
+                    dfhack.units.getReadableName(unit))
+            end
+        end
+    end
+    return search_key
+end
+
+local function cleanup_artifact_vectors(data)
+    local vs_world = dfhack.gui.getDFViewscreen(true)
+    vs_world.artifact:assign(data.saved_original)
+    vs_world.artifact:resize(data.saved_original_size)
+    vs_world.artifact_arl:assign(data.saved_flags)
+    vs_world.artifact_arl:resize(data.saved_flags_size)
+end
+
+function WorldOverlay:init()
+    self:addviews{
+        widgets.BannerPanel{
+            frame={l=0, t=0, r=0, h=1},
+            visible=self:callback('get_key'),
+            subviews={
+                widgets.EditField{
+                    view_id='search',
+                    frame={l=1, t=0, r=1},
+                    label_text="Search: ",
+                    key='CUSTOM_ALT_S',
+                    on_change=function(text) self:do_search(text) end,
+                },
+            },
+        },
+    }
+
+    self:register_handler('ARTIFACTS',
+        function() return dfhack.gui.getDFViewscreen(true).artifact end,
+        curry(sortoverlay.flags_vector_search,
+            {
+                get_search_key_fn=get_world_artifact_search_key,
+                get_elem_id_fn=function(artifact_record) return artifact_record.id end,
+            },
+            function() return dfhack.gui.getDFViewscreen(true).artifact_arl end),
+        cleanup_artifact_vectors)
+end
+
+function WorldOverlay:get_key()
+    local scr = dfhack.gui.getDFViewscreen(true)
+    if scr.view_mode == df.world_view_mode_type.ARTIFACTS then
+        return 'ARTIFACTS'
+    end
+end
+
+return _ENV
diff --git a/plugins/lua/stockflow.lua b/plugins/lua/stockflow.lua
index 91a3284ff..d6c9fc070 100644
--- a/plugins/lua/stockflow.lua
+++ b/plugins/lua/stockflow.lua
@@ -234,7 +234,7 @@ function material_reactions(reactions, itemtypes, mat_info)
 end
 
 function clothing_reactions(reactions, mat_info, filter)
-    local resources = df.historical_entity.find(df.global.ui.civ_id).resources
+    local resources = df.historical_entity.find(df.global.plotinfo.civ_id).resources
     local itemdefs = df.global.world.raws.itemdefs
     local job_types = df.job_type
     resource_reactions(reactions, job_types.MakeArmor,  mat_info, resources.armor_type,  itemdefs.armor,  {permissible = filter})
@@ -408,7 +408,7 @@ function collect_reactions()
     -- Reactions defined in the raws.
     -- Not all reactions are allowed to the civilization.
     -- That includes "Make sharp rock" by default.
-    local entity = df.historical_entity.find(df.global.ui.civ_id)
+    local entity = df.historical_entity.find(df.global.plotinfo.civ_id)
     if not entity then
         -- No global civilization; arena mode?
         -- Anyway, skip remaining reactions, since many depend on the civ.
diff --git a/plugins/lua/stockpiles.lua b/plugins/lua/stockpiles.lua
index ca8c28cd4..1173fa2d9 100644
--- a/plugins/lua/stockpiles.lua
+++ b/plugins/lua/stockpiles.lua
@@ -1,244 +1,555 @@
 local _ENV = mkmodule('plugins.stockpiles')
 
---[[
+local argparse = require('argparse')
+local gui = require('gui')
+local logistics = require('plugins.logistics')
+local overlay = require('plugins.overlay')
+local widgets = require('gui.widgets')
+
+local STOCKPILES_DIR = 'dfhack-config/stockpiles'
+local STOCKPILES_LIBRARY_DIR = 'hack/data/stockpiles'
 
- Native functions:
+local BAD_FILENAME_REGEX = '[^%w._]'
 
- * stockpiles_list_settings(dir_path), list files in directory
- * stockpiles_load(file), with full path
- * stockpiles_save(file), with full path
- * isEnabled()
+--------------------
+-- plugin logic
+--------------------
 
---]]
---
-function safe_require(module)
-    local status, module = pcall(require, module)
-    return status and module or nil
+local function get_sp_name(name, num)
+    if #name > 0 then return name end
+    return ('Stockpile %d'):format(num)
 end
 
+local STATUS_FMT = '%6s %s'
+local function print_status()
+    local sps = df.global.world.buildings.other.STOCKPILE
+    print(('Current stockpiles: %d'):format(#sps))
+    if #sps > 0 then
+        print()
+        print(STATUS_FMT:format('ID', 'Name'))
+        print(STATUS_FMT:format('------', '----------'))
+    end
+    for _, sp in ipairs(sps) do
+        print(STATUS_FMT:format(sp.id, get_sp_name(sp.name, sp.stockpile_number)))
+    end
+end
 
-local gui = require 'gui'
-local widgets = require('gui.widgets')
-local dlg = require('gui.dialogs')
-local script = require 'gui.script'
-local persist = safe_require('persist-table')
+local function list_dir(path, prefix, filters)
+    local paths = dfhack.filesystem.listdir_recursive(path, 0, false)
+    if not paths then
+        dfhack.printerr(('Cannot find stockpile settings directory: "%s"'):format(path))
+        return
+    end
+    local normalized_filters = {}
+    for _, filter in ipairs(filters or {}) do table.insert(normalized_filters, filter:lower()) end
+    for _, v in ipairs(paths) do
+        local normalized_path = prefix .. v.path:lower()
+        if v.isdir or not normalized_path:endswith('.dfstock') then goto continue end
+        normalized_path = normalized_path:sub(1, -9)
+        if #normalized_filters > 0 then
+            local matched = false
+            for _, filter in ipairs(normalized_filters) do
+                if normalized_path:find(filter, 1, true) then
+                    matched = true
+                    break
+                end
+            end
+            if not matched then goto continue end
+        end
+        print(('%s%s'):format(prefix, v.path:sub(1, -9)))
+        ::continue::
+    end
+end
 
+local function list_settings_files(filters)
+    list_dir(STOCKPILES_DIR, '', filters)
+    list_dir(STOCKPILES_LIBRARY_DIR, 'library/', filters)
+end
 
-function ListFilterDialog(args)
-    args.text = args.prompt or 'Type or select an option'
-    args.text_pen = COLOR_WHITE
-    args.with_filter = true
-    args.icon_width = 2
+local function assert_safe_name(name)
+    if not name or #name == 0 then qerror('name missing or empty') end
+    if name:find(BAD_FILENAME_REGEX) then
+        qerror('name can only contain numbers, letters, periods, and underscores')
+    end
+end
 
-    local choices = {}
+local function get_sp_id(opts)
+    if opts.id then return opts.id end
+    local sp = dfhack.gui.getSelectedStockpile(true)
+    if sp then return sp.id end
+    return nil
+end
 
-    if not args.hide_none then
-        table.insert(choices, {
-            icon = '?', text = args.none_caption or 'none',
-            index = -1, name = -1
-        })
-    end
+local included_elements = {containers=1, general=2, categories=4, types=8}
 
-    local filter = args.item_filter
+function export_stockpile(name, opts)
+    assert_safe_name(name)
+    name = STOCKPILES_DIR .. '/' .. name
 
-    for i,v in ipairs(args.items) do
-        if not filter or filter(v,-1) then
-            local name = v
-            local icon
-            table.insert(choices, {
-                icon = icon, search_key = string.lower(name), text = name, index = i
-            })
-        end
+    local includedElements = 0
+    for _, inc in ipairs(opts.includes) do
+        includedElements = includedElements | included_elements[inc]
     end
 
-    args.choices = choices
+    if includedElements == 0 then
+        for _, v in pairs(included_elements) do includedElements = includedElements | v end
+    end
 
-    if args.on_select then
-        local cb = args.on_select
-        args.on_select = function(idx, obj)
-            return cb(obj.index, args.items[obj.index])
-        end
+    stockpiles_export(name, get_sp_id(opts), includedElements)
+end
+
+local function normalize_name(name)
+    local is_library = false
+    if name:startswith('library/') then
+        name = name:sub(9)
+        is_library = true
     end
+    assert_safe_name(name)
+    if not is_library and dfhack.filesystem.exists(STOCKPILES_DIR .. '/' .. name .. '.dfstock') then
+        return STOCKPILES_DIR .. '/' .. name
+    end
+    return STOCKPILES_LIBRARY_DIR .. '/' .. name
+end
 
-    return dlg.ListBox(args)
+function import_stockpile(name, opts)
+    name = normalize_name(name)
+    stockpiles_import(name, get_sp_id(opts), opts.mode, table.concat(opts.filters or {}, ','))
 end
 
-function showFilterPrompt(title, list, text,item_filter,hide_none)
-    ListFilterDialog{
-        frame_title=title,
-        items=list,
-        prompt=text,
-        item_filter=item_filter,
-        hide_none=hide_none,
-        on_select=script.mkresume(true),
-        on_cancel=script.mkresume(false),
-        on_close=script.qresume(nil)
-    }:show()
+function import_route(name, route_id, stop_id, mode, filters)
+    name = normalize_name(name)
+    stockpiles_route_import(name, route_id, stop_id, mode, table.concat(filters or {}, ','))
+end
 
-    return script.wait()
+local function parse_include(arg)
+    local includes = argparse.stringList(arg, 'include')
+    for _, v in ipairs(includes) do
+        if not included_elements[v] then qerror(('invalid included element: "%s"'):format(v)) end
+    end
+    return includes
 end
 
-function init()
-    if persist == nil then return end
-    if dfhack.isMapLoaded() then
-        if persist.GlobalTable.stockpiles == nil then
-            persist.GlobalTable.stockpiles = {}
-            persist.GlobalTable.stockpiles['settings_path'] = './stocksettings'
-        end
+local valid_modes = {set=true, enable=true, disable=true}
+
+local function parse_mode(arg)
+    if not valid_modes[arg] then qerror(('invalid mode: "%s"'):format(arg)) end
+    return arg
+end
+
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
     end
+
+    opts.includes = {}
+    opts.mode = 'set'
+    opts.filters = {}
+
+    return argparse.processArgsGetopt(args, {
+        {
+            'h',
+            'help',
+            handler=function()
+                opts.help = true
+            end,
+        }, {
+            'm',
+            'mode',
+            hasArg=true,
+            handler=function(arg)
+                opts.mode = parse_mode(arg)
+            end,
+        }, {
+            'f',
+            'filter',
+            hasArg=true,
+            handler=function(arg)
+                opts.filters = argparse.stringList(arg)
+            end,
+        }, {
+            'i',
+            'include',
+            hasArg=true,
+            handler=function(arg)
+                opts.includes = parse_include(arg)
+            end,
+        }, {
+            's',
+            'stockpile',
+            hasArg=true,
+            handler=function(arg)
+                opts.id = argparse.nonnegativeInt(arg, 'stockpile')
+            end,
+        },
+    })
 end
 
-function tablify(iterableObject)
-    t={}
-    for k,v in ipairs(iterableObject) do
-        t[k] = v~=nil and v or 'nil'
+function parse_commandline(args)
+    local opts = {}
+    local positionals = process_args(opts, args)
+
+    if opts.help or not positionals then return false end
+
+    local command = table.remove(positionals, 1)
+    if not command or command == 'status' then
+        print_status()
+    elseif command == 'list' then
+        list_settings_files(positionals)
+    elseif command == 'export' then
+        export_stockpile(positionals[1], opts)
+    elseif command == 'import' then
+        import_stockpile(positionals[1], opts)
+    else
+        return false
     end
-    return t
+
+    return true
 end
 
-local filename_invalid_regex = '[^A-Za-z0-9 ._-]'
+--------------------
+-- dialogs
+--------------------
+
+StockpilesExport = defclass(StockpilesExport, widgets.Window)
+StockpilesExport.ATTRS{frame_title='Export stockpile settings', frame={w=33, h=15}, resizable=true}
+
+function StockpilesExport:init()
+    self:addviews{
+        widgets.EditField{
+            view_id='edit',
+            frame={t=0, l=0, r=0},
+            label_text='name: ',
+            on_char=function(ch)
+                return not ch:match(BAD_FILENAME_REGEX)
+            end,
+        }, widgets.Label{frame={t=2, l=0}, text='Include which elements?'},
+        widgets.ToggleHotkeyLabel{frame={t=4, l=0}, label='General settings', initial_option=false},
+        widgets.ToggleHotkeyLabel{
+            frame={t=5, l=0},
+            label='Container settings',
+            initial_option=false,
+        }, widgets.ToggleHotkeyLabel{frame={t=6, l=0}, label='Categories', initial_option=true},
+        widgets.ToggleHotkeyLabel{frame={t=7, l=0}, label='Subtypes', initial_option=true},
+        widgets.HotkeyLabel{
+            frame={t=10, l=0},
+            label='export',
+            key='SELECT',
+            enabled=function()
+                return #self.subviews.edit.text > 0
+            end,
+            on_activate=self:callback('on_submit'),
+        },
+    }
+end
 
-function valid_filename(filename)
-    return not filename:match(filename_invalid_regex)
+function StockpilesExport:on_submit(text)
+    self:dismiss()
 end
 
-function sanitize_filename(filename)
-    local ret = ''
-    for i = 1, #filename do
-        local ch = filename:sub(i, i)
-        if valid_filename(ch) then
-            ret = ret .. ch
-        else
-            ret = ret .. '-'
-        end
-    end
-    return ret
+StockpilesExportScreen = defclass(StockpilesExportScreen, gui.ZScreenModal)
+StockpilesExportScreen.ATTRS{focus_path='stockpiles/export'}
+
+function StockpilesExportScreen:init()
+    self:addviews{StockpilesExport{}}
+end
+
+function StockpilesExportScreen:onDismiss()
+    export_view = nil
+end
+
+local function do_export()
+    export_view = export_view and export_view:raise() or StockpilesExportScreen{}:show()
 end
 
-FilenameInputBox = defclass(FilenameInputBox, dlg.InputBox)
-function FilenameInputBox:onInput(keys)
-    if not valid_filename(string.char(keys._STRING or 0)) and not keys.STRING_A000 then
-        keys._STRING = nil
+--------------------
+-- ConfigModal
+--------------------
+
+ConfigModal = defclass(ConfigModal, gui.ZScreenModal)
+ConfigModal.ATTRS{
+    focus_path='stockpiles_config',
+    on_close=DEFAULT_NIL,
+}
+
+function ConfigModal:init()
+    local sp = dfhack.gui.getSelectedStockpile(true)
+    local cur_setting = false
+    if sp then
+        local config = logistics.logistics_getStockpileConfigs(sp.stockpile_number)[1]
+        cur_setting = config.melt_masterworks == 1
     end
-    FilenameInputBox.super.onInput(self, keys)
+
+    self:addviews{
+        widgets.Window{
+            frame={w=35, h=10},
+            frame_title='Advanced logistics settings',
+            subviews={
+                widgets.ToggleHotkeyLabel{
+                    view_id='melt_masterworks',
+                    frame={l=0, t=0},
+                    key='CUSTOM_M',
+                    label='Melt masterworks',
+                    initial_option=cur_setting,
+                },
+            },
+        },
+    }
+end
+
+function ConfigModal:onDismiss()
+    self.on_close{melt_masterworks=self.subviews.melt_masterworks:getOptionValue()}
 end
 
-function showFilenameInputPrompt(title, text, tcolor, input, min_width)
-    FilenameInputBox{
-        frame_title = title,
-        text = text,
-        text_pen = tcolor,
-        input = input,
-        frame_width = min_width,
-        on_input = script.mkresume(true),
-        on_cancel = script.mkresume(false),
-        on_close = script.qresume(nil)
-    }:show()
+--------------------
+-- MinimizeButton
+--------------------
+
+MinimizeButton = defclass(MinimizeButton, widgets.Widget)
+MinimizeButton.ATTRS{
+    label_unminimized='minimize',
+    label_minimized='restore',
+    label_pos='left',
+    symbol_minimize=string.char(31),
+    symbol_restore=string.char(30),
+    get_minimized_fn=DEFAULT_NIL,
+    on_click=DEFAULT_NIL,
+}
+
+function MinimizeButton:init()
+    self.hovered = false
 
-    return script.wait()
+    ensure_key(self, 'frame').h = 1
+
+    local is_hovered = function()
+        return self.hovered
+    end
+    local is_not_hovered = function()
+        return not self.hovered
+    end
+    local get_action_symbol = function()
+        return self.get_minimized_fn() and self.symbol_minimize or self.symbol_restore
+    end
+    local get_label = function()
+        local label = self.get_minimized_fn() and self.label_minimized or self.label_unminimized
+        return (' %s '):format(label)
+    end
+
+    local hovered_text = {'[', {text=get_action_symbol}, ']'}
+    table.insert(hovered_text, self.label_pos == 'left' and 1 or #hovered_text + 1,
+            {text=get_label, hpen=dfhack.pen.parse{fg=COLOR_BLACK, bg=COLOR_WHITE}})
+
+    self:addviews{
+        widgets.Label{
+            view_id='unhovered_label',
+            frame={t=0, w=3, h=1},
+            text={'[', {text=get_action_symbol}, ']'},
+            text_pen=dfhack.pen.parse{fg=COLOR_BLACK, bg=COLOR_LIGHTRED},
+            text_hpen=dfhack.pen.parse{fg=COLOR_WHITE, bg=COLOR_RED},
+            on_click=function()
+                self.on_click()
+                self:updateLayout()
+            end,
+            visible=is_not_hovered,
+        }, widgets.Label{
+            view_id='hovered_label',
+            frame={t=0, h=1},
+            text=hovered_text,
+            auto_width=true,
+            text_pen=dfhack.pen.parse{fg=COLOR_BLACK, bg=COLOR_LIGHTRED},
+            text_hpen=dfhack.pen.parse{fg=COLOR_WHITE, bg=COLOR_RED},
+            on_click=function()
+                self.on_click()
+                self:updateLayout()
+            end,
+            visible=is_hovered,
+        },
+    }
+
+    if self.label_pos == 'left' then
+        self.subviews.unhovered_label.frame.r = 0
+        self.subviews.hovered_label.frame.r = 0
+    else
+        self.subviews.unhovered_label.frame.l = 0
+        self.subviews.hovered_label.frame.l = 0
+    end
 end
 
-function load_settings()
-    init()
-    local path = get_path()
-    local ok, list = pcall(stockpiles_list_settings, path)
-    if not ok then
-        show_message_box("Stockpile Settings", "The stockpile settings folder doesn't exist.", true)
-        return
+function MinimizeButton:onRenderFrame()
+    local prev_hovered = self.hovered
+    if self.hovered then
+        self.hovered = self.subviews.hovered_label:getMousePos()
+    else
+        self.hovered = self.subviews.unhovered_label:getMousePos()
     end
-    if #list == 0 then
-        show_message_box("Stockpile Settings", "There are no saved stockpile settings.", true)
-        return
+    if self.hovered ~= prev_hovered then
+        self:updateLayout()
+        df.global.gps.force_full_display_count = 1
     end
+end
+
+--------------------
+-- StockpilesOverlay
+--------------------
+
+StockpilesOverlay = defclass(StockpilesOverlay, overlay.OverlayWidget)
+StockpilesOverlay.ATTRS{
+    default_pos={x=24, y=-6},
+    default_enabled=true,
+    viewscreens='dwarfmode/Some/Stockpile',
+    frame={w=65, h=4},
+}
 
-    local choice_list = {}
-    for i,v in ipairs(list) do
-        choice_list[i] = string.gsub(v, "/", "/ ")
-        choice_list[i] = string.gsub(choice_list[i], "-", " - ")
-        choice_list[i] = string.gsub(choice_list[i], "_", " ")
+function StockpilesOverlay:init()
+    self.minimized = false
+
+    local function is_expanded()
+        return not self.minimized
     end
 
-    script.start(function()
-        local ok2,index,name=showFilterPrompt('Stockpile Settings', choice_list, 'Choose a stockpile', function(item) return true end, true)
-        if ok2 then
-            local filename = list[index];
-            stockpiles_load(path..'/'..filename)
-        end
-    end)
+    local main_panel = widgets.Panel{
+        view_id='main',
+        frame_style=gui.MEDIUM_FRAME,
+        frame_background=gui.CLEAR_PEN,
+        visible=is_expanded,
+        subviews={
+            -- widgets.HotkeyLabel{
+            --     frame={t=0, l=0},
+            --     label='import settings',
+            --     auto_width=true,
+            --     key='CUSTOM_CTRL_I',
+            --     on_activate=do_import,
+            -- }, widgets.HotkeyLabel{
+            --     frame={t=1, l=0},
+            --     label='export settings',
+            --     auto_width=true,
+            --     key='CUSTOM_CTRL_E',
+            --     on_activate=do_export,
+            -- },
+            widgets.Panel{
+                frame={t=0, l=0},
+                subviews={
+                    widgets.Label{
+                        frame={t=0, l=0, h=1},
+                        auto_height=false,
+                        text={'Designate items/animals brought to this stockpile for:'},
+                        text_pen=COLOR_DARKGREY,
+                    }, widgets.ToggleHotkeyLabel{
+                        view_id='melt',
+                        frame={t=1, l=0},
+                        auto_width=true,
+                        key='CUSTOM_CTRL_M',
+                        option_gap=-1,
+                        options={{label='Melting', value=true, pen=COLOR_RED},
+                                {label='Melting', value=false}},
+                        initial_option=false,
+                        on_change=self:callback('toggleLogisticsFeature', 'melt'),
+                    }, widgets.ToggleHotkeyLabel{
+                        view_id='trade',
+                        frame={t=1, l=16},
+                        auto_width=true,
+                        key='CUSTOM_CTRL_T',
+                        option_gap=-1,
+                        options={{label='Trading', value=true, pen=COLOR_YELLOW},
+                                {label='Trading', value=false}},
+                        initial_option=false,
+                        on_change=self:callback('toggleLogisticsFeature', 'trade'),
+                    }, widgets.ToggleHotkeyLabel{
+                        view_id='dump',
+                        frame={t=1, l=32},
+                        auto_width=true,
+                        key='CUSTOM_CTRL_U',
+                        option_gap=-1,
+                        options={{label='Dumping', value=true, pen=COLOR_LIGHTMAGENTA},
+                                {label='Dumping', value=false}},
+                        initial_option=false,
+                        on_change=self:callback('toggleLogisticsFeature', 'dump'),
+                    }, widgets.ToggleHotkeyLabel{
+                        view_id='train',
+                        frame={t=1, l=48},
+                        auto_width=true,
+                        key='CUSTOM_CTRL_A',
+                        option_gap=-1,
+                        options={{label='Training', value=true, pen=COLOR_LIGHTBLUE},
+                                {label='Training', value=false}},
+                        initial_option=false,
+                        on_change=self:callback('toggleLogisticsFeature', 'train'),
+                    },
+                },
+            },
+        },
+    }
+
+    self:addviews{
+        main_panel,
+        MinimizeButton{
+            frame={t=0, r=9},
+            get_minimized_fn=function() return self.minimized end,
+            on_click=self:callback('toggleMinimized'),
+        },
+        widgets.ConfigureButton{
+            frame={t=0, r=5},
+            on_click=function() ConfigModal{on_close=self:callback('on_custom_config')}:show() end,
+            visible=is_expanded,
+        },
+        widgets.HelpButton{
+            frame={t=0, r=1},
+            command='stockpiles',
+            visible=is_expanded,
+        },
+    }
 end
 
-function save_settings(stockpile)
-    init()
-    script.start(function()
-        local suggested = stockpile.name
-        if #suggested == 0 then
-            suggested = 'Stock1'
-        end
-        suggested = sanitize_filename(suggested)
-        local path = get_path()
-        local sok,filename = showFilenameInputPrompt('Stockpile Settings', 'Enter filename', COLOR_WHITE, suggested)
-        if sok then
-            if filename == nil or filename == '' or not valid_filename(filename) then
-                script.showMessage('Stockpile Settings', 'Invalid File Name', COLOR_RED)
-            else
-                if not dfhack.filesystem.exists(path) then
-                    dfhack.filesystem.mkdir(path)
-                end
-                stockpiles_save(path..'/'..filename)
-            end
-        end
-    end)
-end
-
-function manage_settings(sp)
-    init()
-    if not guard() then return false end
-    script.start(function()
-        local list = {'Load', 'Save'}
-        local tok,i = script.showListPrompt('Stockpile Settings','Load or Save Settings?',COLOR_WHITE,tablify(list))
-        if tok then
-            if i == 1 then
-                load_settings()
-            else
-                save_settings(sp)
-            end
-        end
-    end)
+function StockpilesOverlay:overlay_onupdate()
+    -- periodically pick up changes made from other interfaces
+    self.cur_stockpile = nil
 end
 
-function show_message_box(title, msg, iserror)
-    local color = COLOR_WHITE
-    if iserror then
-        color = COLOR_RED
+function StockpilesOverlay:onRenderFrame()
+    local sp = dfhack.gui.getSelectedStockpile(true)
+    if sp and self.cur_stockpile ~= sp then
+        local config = logistics.logistics_getStockpileConfigs(sp.stockpile_number)[1]
+        self.subviews.melt:setOption(config.melt == 1)
+        self.subviews.trade:setOption(config.trade == 1)
+        self.subviews.dump:setOption(config.dump == 1)
+        self.subviews.train:setOption(config.train == 1)
+        self.cur_stockpile = sp
     end
-    script.start(function()
-        script.showMessage(title, msg, color)
-    end)
 end
 
-function guard()
-    if not string.match(dfhack.gui.getCurFocus(), '^dwarfmode/QueryBuilding/Some/Stockpile') then
-        qerror("This script requires a stockpile selected in the 'q' mode")
-        return false
-    end
-    return true
+function StockpilesOverlay:toggleLogisticsFeature(feature)
+    self.cur_stockpile = nil
+    local sp = dfhack.gui.getSelectedStockpile(true)
+    if not sp then return end
+    local config = logistics.logistics_getStockpileConfigs(sp.stockpile_number)[1]
+    -- logical xor
+    logistics.logistics_setStockpileConfig(config.stockpile_number,
+            (feature == 'melt') ~= (config.melt == 1), (feature == 'trade') ~= (config.trade == 1),
+            (feature == 'dump') ~= (config.dump == 1), (feature == 'train') ~= (config.train == 1),
+            config.melt_masterworks == 1)
 end
 
-function set_path(path)
-    init()
-    if persist == nil then
-        qerror("This version of DFHack doesn't support setting the stockpile settings path. Sorry.")
-        return
-    end
-    persist.GlobalTable.stockpiles['settings_path'] = path
+function StockpilesOverlay:on_custom_config(custom)
+    local sp = dfhack.gui.getSelectedStockpile(true)
+    if not sp then return end
+    local config = logistics.logistics_getStockpileConfigs(sp.stockpile_number)[1]
+    logistics.logistics_setStockpileConfig(config.stockpile_number,
+            config.melt == 1, config.trade == 1, config.dump == 1, config.train == 1, custom.melt_masterworks)
+end
+
+function StockpilesOverlay:toggleMinimized()
+    self.minimized = not self.minimized
+    self.cur_stockpile = nil
 end
 
-function get_path()
-    init()
-    if persist == nil then
-        return "stocksettings"
+function StockpilesOverlay:onInput(keys)
+    if keys.CUSTOM_ALT_M then
+        self:toggleMinimized()
+        return true
     end
-    return persist.GlobalTable.stockpiles['settings_path']
+    return StockpilesOverlay.super.onInput(self, keys)
 end
 
+OVERLAY_WIDGETS = {overlay=StockpilesOverlay}
+
 return _ENV
diff --git a/plugins/lua/stocks.lua b/plugins/lua/stocks.lua
new file mode 100644
index 000000000..b87052530
--- /dev/null
+++ b/plugins/lua/stocks.lua
@@ -0,0 +1,55 @@
+local _ENV = mkmodule('plugins.stocks')
+
+local gui = require('gui')
+local overlay = require('plugins.overlay')
+local widgets = require('gui.widgets')
+
+local stocks = df.global.game.main_interface.stocks
+
+local function collapse_all()
+    local num_sections = #stocks.current_type_a_expanded
+    for idx=0,num_sections-1 do
+        stocks.current_type_a_expanded[idx] = false
+    end
+    stocks.i_height = num_sections * 3
+end
+
+-- -------------------
+-- StocksOverlay
+--
+
+StocksOverlay = defclass(StocksOverlay, overlay.OverlayWidget)
+StocksOverlay.ATTRS{
+    default_pos={x=-3,y=-20},
+    default_enabled=true,
+    viewscreens='dwarfmode/Stocks',
+    frame={w=27, h=5},
+    frame_style=gui.MEDIUM_FRAME,
+    frame_background=gui.CLEAR_PEN,
+}
+
+function StocksOverlay:init()
+    self:addviews{
+        widgets.HotkeyLabel{
+            frame={t=0, l=0},
+            label='collapse all',
+            key='CUSTOM_CTRL_X',
+            on_activate=collapse_all,
+        },
+        widgets.Label{
+            frame={t=2, l=0},
+            text = 'Shift+Scroll',
+            text_pen=COLOR_LIGHTGREEN,
+        },
+        widgets.Label{
+            frame={t=2, l=12},
+            text = ': fast scroll',
+        },
+    }
+end
+
+OVERLAY_WIDGETS = {
+    overlay=StocksOverlay,
+}
+
+return _ENV
diff --git a/plugins/lua/tailor.lua b/plugins/lua/tailor.lua
new file mode 100644
index 000000000..46b3526d9
--- /dev/null
+++ b/plugins/lua/tailor.lua
@@ -0,0 +1,64 @@
+local _ENV = mkmodule('plugins.tailor')
+
+local argparse = require('argparse')
+local utils = require('utils')
+
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
+    end
+
+    return argparse.processArgsGetopt(args, {
+            {'h', 'help', handler=function() opts.help = true end},
+        })
+end
+
+function status()
+    print(('tailor is %s'):format(isEnabled() and "enabled" or "disabled"))
+    print('materials preference order:')
+    for _,name in ipairs(tailor_getMaterialPreferences()) do
+        print(('  %s'):format(name))
+    end
+end
+
+function setMaterials(names)
+    local idxs = utils.invert(names)
+    tailor_setMaterialPreferences(
+            idxs.silk or -1,
+            idxs.cloth or -1,
+            idxs.yarn or -1,
+            idxs.leather or -1,
+            idxs.adamantine or -1)
+end
+
+function setDebugMode(opt)
+    local fl = (opt[1] == "true" or opt[1] == "on")
+    tailor_setDebugFlag(fl)
+end
+
+function parse_commandline(...)
+    local args, opts = {...}, {}
+    local positionals = process_args(opts, args)
+
+    if opts.help then
+        return false
+    end
+
+    local command = table.remove(positionals, 1)
+    if not command or command == 'status' then
+        status()
+    elseif command == 'now' then
+        tailor_doCycle()
+    elseif command == 'materials' then
+        setMaterials(positionals)
+    elseif command == 'debugging' then
+        setDebugMode(positionals)
+    else
+        return false
+    end
+
+    return true
+end
+
+return _ENV
diff --git a/plugins/lua/zone.lua b/plugins/lua/zone.lua
new file mode 100644
index 000000000..eb984093b
--- /dev/null
+++ b/plugins/lua/zone.lua
@@ -0,0 +1,1092 @@
+local _ENV = mkmodule('plugins.zone')
+
+local gui = require('gui')
+local overlay = require('plugins.overlay')
+local utils = require('utils')
+local widgets = require('gui.widgets')
+
+local CH_UP = string.char(30)
+local CH_DN = string.char(31)
+local CH_MALE = string.char(11)
+local CH_FEMALE = string.char(12)
+local CH_NEUTER = '?'
+
+local DISPOSITION = {
+    NONE={label='Unknown', value=0},
+    PET={label='Pet', value=1},
+    TAME={label='Domesticated', value=2},
+    TRAINED={label='Partially trained', value=3},
+    WILD_TRAINABLE={label='Wild (trainable)', value=4},
+    WILD_UNTRAINABLE={label='Wild (untrainable)', value=5},
+    HOSTILE={label='Hostile', value=6},
+}
+local DISPOSITION_REVMAP = {}
+for k, v in pairs(DISPOSITION) do
+    DISPOSITION_REVMAP[v.value] = k
+end
+
+-- -------------------
+-- AssignAnimal
+--
+
+local STATUS_COL_WIDTH = 18
+local DISPOSITION_COL_WIDTH = 18
+local GENDER_COL_WIDTH = 6
+local SLIDER_LABEL_WIDTH = math.max(STATUS_COL_WIDTH, DISPOSITION_COL_WIDTH) + 4
+local SLIDER_WIDTH = 48
+
+AssignAnimal = defclass(AssignAnimal, widgets.Window)
+AssignAnimal.ATTRS {
+    frame_title='Animal and prisoner assignment',
+    frame={w=6+SLIDER_WIDTH*2, h=47},
+    resizable=true,
+    resize_min={h=27},
+    target_name=DEFAULT_NIL,
+    status=DEFAULT_NIL,
+    status_revmap=DEFAULT_NIL,
+    get_status=DEFAULT_NIL,
+    get_allow_vermin=DEFAULT_NIL,
+    get_multi_select=DEFAULT_NIL,
+    attach=DEFAULT_NIL,
+    initial_min_disposition=DISPOSITION.PET.value,
+}
+
+local function sort_noop(a, b)
+    -- this function is used as a marker and never actually gets called
+    error('sort_noop should not be called')
+end
+
+local function sort_by_race_desc(a, b)
+    if a.data.race == b.data.race then
+        return a.data.gender < b.data.gender
+    end
+    return a.data.race < b.data.race
+end
+
+local function sort_by_race_asc(a, b)
+    if a.data.race == b.data.race then
+        return a.data.gender < b.data.gender
+    end
+    return a.data.race > b.data.race
+end
+
+local function sort_by_name_desc(a, b)
+    if a.search_key == b.search_key then
+        return sort_by_race_desc(a, b)
+    end
+    return a.search_key < b.search_key
+end
+
+local function sort_by_name_asc(a, b)
+    if a.search_key == b.search_key then
+        return sort_by_race_desc(a, b)
+    end
+    return a.search_key > b.search_key
+end
+
+local function sort_by_gender_desc(a, b)
+    if a.data.gender == b.data.gender then
+        return sort_by_race_desc(a, b)
+    end
+    return a.data.gender < b.data.gender
+end
+
+local function sort_by_gender_asc(a, b)
+    if a.data.gender == b.data.gender then
+        return sort_by_race_desc(a, b)
+    end
+    return a.data.gender > b.data.gender
+end
+
+local function sort_by_disposition_desc(a, b)
+    if a.data.disposition == b.data.disposition then
+        return sort_by_race_desc(a, b)
+    end
+    return a.data.disposition < b.data.disposition
+end
+
+local function sort_by_disposition_asc(a, b)
+    if a.data.disposition == b.data.disposition then
+        return sort_by_race_desc(a, b)
+    end
+    return a.data.disposition > b.data.disposition
+end
+
+local function sort_by_status_desc(a, b)
+    if a.data.status == b.data.status then
+        return sort_by_race_desc(a, b)
+    end
+    return a.data.status < b.data.status
+end
+
+local function sort_by_status_asc(a, b)
+    if a.data.status == b.data.status then
+        return sort_by_race_desc(a, b)
+    end
+    return a.data.status > b.data.status
+end
+
+function AssignAnimal:init()
+    local status_options = {}
+    for k, v in ipairs(self.status_revmap) do
+        status_options[k] = self.status[v]
+    end
+
+    local disposition_options = {}
+    for k, v in ipairs(DISPOSITION_REVMAP) do
+        disposition_options[k] = DISPOSITION[v]
+    end
+
+    local can_assign_pets = self.initial_min_disposition == DISPOSITION.PET.value
+
+    self:addviews{
+        widgets.CycleHotkeyLabel{
+            view_id='sort',
+            frame={l=0, t=0, w=26},
+            label='Sort by:',
+            key='CUSTOM_SHIFT_S',
+            options={
+                {label='status'..CH_DN, value=sort_by_status_desc},
+                {label='status'..CH_UP, value=sort_by_status_asc},
+                {label='disposition'..CH_DN, value=sort_by_disposition_desc},
+                {label='disposition'..CH_UP, value=sort_by_disposition_asc},
+                {label='gender'..CH_DN, value=sort_by_gender_desc},
+                {label='gender'..CH_UP, value=sort_by_gender_asc},
+                {label='race'..CH_DN, value=sort_by_race_desc},
+                {label='race'..CH_UP, value=sort_by_race_asc},
+                {label='name'..CH_DN, value=sort_by_name_desc},
+                {label='name'..CH_UP, value=sort_by_name_asc},
+            },
+            initial_option=sort_by_status_desc,
+            on_change=self:callback('refresh_list', 'sort'),
+        },
+        widgets.EditField{
+            view_id='search',
+            frame={l=35, t=0},
+            label_text='Search: ',
+            on_char=function(ch) return ch:match('[%l -]') end,
+        },
+        widgets.Panel{
+            frame={t=2, l=0, w=SLIDER_WIDTH, h=4},
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='min_status',
+                    frame={l=0, t=0, w=SLIDER_LABEL_WIDTH},
+                    label='Min status:',
+                    label_below=true,
+                    key_back='CUSTOM_SHIFT_Z',
+                    key='CUSTOM_SHIFT_X',
+                    options=status_options,
+                    initial_option=1,
+                    on_change=function(val)
+                        if self.subviews.max_status:getOptionValue() < val then
+                            self.subviews.max_status:setOption(val)
+                        end
+                        self:refresh_list()
+                    end,
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='max_status',
+                    frame={r=1, t=0, w=SLIDER_LABEL_WIDTH},
+                    label='Max status:',
+                    label_below=true,
+                    key_back='CUSTOM_SHIFT_Q',
+                    key='CUSTOM_SHIFT_W',
+                    options=status_options,
+                    initial_option=#self.status_revmap,
+                    on_change=function(val)
+                        if self.subviews.min_status:getOptionValue() > val then
+                            self.subviews.min_status:setOption(val)
+                        end
+                        self:refresh_list()
+                    end,
+                },
+                widgets.RangeSlider{
+                    frame={l=0, t=3},
+                    num_stops=#self.status_revmap,
+                    get_left_idx_fn=function()
+                        return self.subviews.min_status:getOptionValue()
+                    end,
+                    get_right_idx_fn=function()
+                        return self.subviews.max_status:getOptionValue()
+                    end,
+                    on_left_change=function(idx) self.subviews.min_status:setOption(idx, true) end,
+                    on_right_change=function(idx) self.subviews.max_status:setOption(idx, true) end,
+                },
+            },
+        },
+        widgets.Panel{
+            frame={t=7, l=0, w=SLIDER_WIDTH, h=4},
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='min_disposition',
+                    frame={l=0, t=0, w=SLIDER_LABEL_WIDTH},
+                    label='Min disposition:',
+                    label_below=true,
+                    key_back='CUSTOM_SHIFT_C',
+                    key='CUSTOM_SHIFT_V',
+                    options=disposition_options,
+                    initial_option=self.initial_min_disposition,
+                    on_change=function(val)
+                        if self.subviews.max_disposition:getOptionValue() < val then
+                            self.subviews.max_disposition:setOption(val)
+                        end
+                        self:refresh_list()
+                    end,
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='max_disposition',
+                    frame={r=1, t=0, w=SLIDER_LABEL_WIDTH},
+                    label='Max disposition:',
+                    label_below=true,
+                    key_back='CUSTOM_SHIFT_E',
+                    key='CUSTOM_SHIFT_R',
+                    options=disposition_options,
+                    initial_option=DISPOSITION.HOSTILE.value,
+                    on_change=function(val)
+                        if self.subviews.min_disposition:getOptionValue() > val then
+                            self.subviews.min_disposition:setOption(val)
+                        end
+                        self:refresh_list()
+                    end,
+                },
+                widgets.RangeSlider{
+                    frame={l=0, t=3},
+                    num_stops=6,
+                    get_left_idx_fn=function()
+                        return self.subviews.min_disposition:getOptionValue()
+                    end,
+                    get_right_idx_fn=function()
+                        return self.subviews.max_disposition:getOptionValue()
+                    end,
+                    on_left_change=function(idx) self.subviews.min_disposition:setOption(idx, true) end,
+                    on_right_change=function(idx) self.subviews.max_disposition:setOption(idx, true) end,
+                },
+            },
+        },
+        widgets.Panel{
+            frame={t=3, l=SLIDER_WIDTH+2, r=0, h=3},
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='egg',
+                    frame={l=0, t=0, w=23},
+                    key_back='CUSTOM_SHIFT_B',
+                    key='CUSTOM_SHIFT_N',
+                    label='Egg layers:',
+                    options={
+                        {label='Include', value='include', pen=COLOR_GREEN},
+                        {label='Only', value='only', pen=COLOR_YELLOW},
+                        {label='Exclude', value='exclude', pen=COLOR_RED},
+                    },
+                    initial_option='include',
+                    on_change=function() self:refresh_list() end,
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='graze',
+                    frame={l=0, t=2, w=20},
+                    key_back='CUSTOM_SHIFT_T',
+                    key='CUSTOM_SHIFT_Y',
+                    label='Grazers:',
+                    options={
+                        {label='Include', value='include', pen=COLOR_GREEN},
+                        {label='Only', value='only', pen=COLOR_YELLOW},
+                        {label='Exclude', value='exclude', pen=COLOR_RED},
+                    },
+                    initial_option='include',
+                    on_change=function() self:refresh_list() end,
+                },
+            },
+        },
+        widgets.Panel{
+            view_id='list_panel',
+            frame={t=12, l=0, r=0, b=4+(can_assign_pets and 0 or 1)},
+            subviews={
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_status',
+                    frame={t=0, l=0, w=7},
+                    options={
+                        {label='status', value=sort_noop},
+                        {label='status'..CH_DN, value=sort_by_status_desc},
+                        {label='status'..CH_UP, value=sort_by_status_asc},
+                    },
+                    initial_option=sort_by_status_desc,
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_status'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_disposition',
+                    frame={t=0, l=STATUS_COL_WIDTH+2, w=12},
+                    options={
+                        {label='disposition', value=sort_noop},
+                        {label='disposition'..CH_DN, value=sort_by_disposition_desc},
+                        {label='disposition'..CH_UP, value=sort_by_disposition_asc},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_disposition'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_gender',
+                    frame={t=0, l=STATUS_COL_WIDTH+2+DISPOSITION_COL_WIDTH+2, w=7},
+                    options={
+                        {label='gender', value=sort_noop},
+                        {label='gender'..CH_DN, value=sort_by_gender_desc},
+                        {label='gender'..CH_UP, value=sort_by_gender_asc},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_gender'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_race',
+                    frame={t=0, l=STATUS_COL_WIDTH+2+DISPOSITION_COL_WIDTH+2+GENDER_COL_WIDTH+2, w=5},
+                    options={
+                        {label='race', value=sort_noop},
+                        {label='race'..CH_DN, value=sort_by_race_desc},
+                        {label='race'..CH_UP, value=sort_by_race_asc},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_race'),
+                },
+                widgets.CycleHotkeyLabel{
+                    view_id='sort_name',
+                    frame={t=0, l=STATUS_COL_WIDTH+2+DISPOSITION_COL_WIDTH+2+GENDER_COL_WIDTH+2+7, w=5},
+                    options={
+                        {label='name', value=sort_noop},
+                        {label='name'..CH_DN, value=sort_by_name_desc},
+                        {label='name'..CH_UP, value=sort_by_name_asc},
+                    },
+                    option_gap=0,
+                    on_change=self:callback('refresh_list', 'sort_name'),
+                },
+                widgets.FilteredList{
+                    view_id='list',
+                    frame={l=0, t=2, r=0, b=0},
+                    on_submit=self:callback('toggle_item'),
+                    on_submit2=self:callback('toggle_range'),
+                    on_select=self:callback('select_item'),
+                },
+            }
+        },
+        widgets.HotkeyLabel{
+            frame={l=0, b=2+(can_assign_pets and 0 or 1)},
+            label='Assign all/none',
+            key='CUSTOM_CTRL_A',
+            on_activate=self:callback('toggle_visible'),
+            visible=self.get_multi_select,
+            auto_width=true,
+        },
+        widgets.WrappedLabel{
+            frame={b=0, l=0, r=0},
+            text_to_wrap=function()
+                return 'Click to assign/unassign to ' .. self.target_name .. '.' ..
+                    (self.get_multi_select() and ' Shift click to assign/unassign a range.' or '') ..
+                    (not can_assign_pets and '\nNote that pets cannot be assigned to cages or restraints.' or '')
+            end,
+        },
+    }
+
+    -- replace the FilteredList's built-in EditField with our own
+    self.subviews.list.list.frame.t = 0
+    self.subviews.list.edit.visible = false
+    self.subviews.list.edit = self.subviews.search
+    self.subviews.search.on_change = self.subviews.list:callback('onFilterChange')
+
+    self.subviews.list:setChoices(self:get_choices())
+end
+
+function AssignAnimal:refresh_list(sort_widget, sort_fn)
+    sort_widget = sort_widget or 'sort'
+    sort_fn = sort_fn or self.subviews.sort:getOptionValue()
+    if sort_fn == sort_noop then
+        self.subviews[sort_widget]:cycle()
+        return
+    end
+    for _,widget_name in ipairs{'sort', 'sort_status', 'sort_disposition', 'sort_gender', 'sort_race', 'sort_name'} do
+        self.subviews[widget_name]:setOption(sort_fn)
+    end
+    local list = self.subviews.list
+    local saved_filter = list:getFilter()
+    list:setFilter('')
+    list:setChoices(self:get_choices(), list:getSelected())
+    list:setFilter(saved_filter)
+end
+
+function add_words(words, str)
+    for word in dfhack.toSearchNormalized(str):gmatch("[%w-]+") do
+        table.insert(words, word:lower())
+    end
+end
+
+function make_search_key(desc, race_raw)
+    local words = {}
+    add_words(words, desc)
+    if race_raw then
+        add_words(words, race_raw.name[0])
+    end
+    return table.concat(words, ' ')
+end
+
+function AssignAnimal:make_choice_text(data)
+    local gender_ch = CH_NEUTER
+    if data.gender == df.pronoun_type.she then
+        gender_ch = CH_FEMALE
+    elseif data.gender == df.pronoun_type.he then
+        gender_ch = CH_MALE
+    end
+    return {
+        {width=STATUS_COL_WIDTH, text=function() return self.status[self.status_revmap[data.status]].label end},
+        {gap=2, width=DISPOSITION_COL_WIDTH, text=function() return DISPOSITION[DISPOSITION_REVMAP[data.disposition]].label end},
+        {gap=2, width=GENDER_COL_WIDTH, text=gender_ch},
+        {gap=2, text=data.desc},
+    }
+end
+
+local function get_general_ref(unit_or_vermin, ref_type)
+    local is_unit = df.unit:is_instance(unit_or_vermin)
+    return dfhack[is_unit and 'units' or 'items'].getGeneralRef(unit_or_vermin, ref_type)
+end
+
+local function get_cage_ref(unit_or_vermin)
+    return get_general_ref(unit_or_vermin, df.general_ref_type.CONTAINED_IN_ITEM)
+end
+
+local function get_built_cage(item_cage)
+    if not item_cage then return end
+    local built_cage_ref = dfhack.items.getGeneralRef(item_cage, df.general_ref_type.BUILDING_HOLDER)
+    if not built_cage_ref then return end
+    local built_cage = df.building.find(built_cage_ref.building_id)
+    if not built_cage then return end
+    if built_cage:getType() == df.building_type.Cage then
+        return built_cage
+    end
+end
+
+local function get_bld_assignments()
+    local assignments = {}
+    for _,cage in ipairs(df.global.world.buildings.other.CAGE) do
+        for _,unit_id in ipairs(cage.assigned_units) do
+            assignments[unit_id] = cage
+        end
+    end
+    for _,chain in ipairs(df.global.world.buildings.other.CHAIN) do
+        if chain.assigned then
+            assignments[chain.assigned.id] = chain
+        end
+    end
+    return assignments
+end
+
+local function get_unit_disposition(unit)
+    local disposition = DISPOSITION.NONE
+    if dfhack.units.isInvader(unit) or dfhack.units.isOpposedToLife(unit) then
+        disposition = DISPOSITION.HOSTILE
+    elseif dfhack.units.isPet(unit) then
+        disposition = DISPOSITION.PET
+    elseif dfhack.units.isDomesticated(unit) then
+        disposition = DISPOSITION.TAME
+    elseif dfhack.units.isTame(unit) then
+        disposition = DISPOSITION.TRAINED
+    elseif dfhack.units.isTamable(unit) then
+        disposition = DISPOSITION.WILD_TRAINABLE
+    else
+        disposition = DISPOSITION.WILD_UNTRAINABLE
+    end
+    return disposition.value
+end
+
+local function get_item_disposition(item)
+    if dfhack.units.casteFlagSet(item.race, item.caste, df.caste_raw_flags.OPPOSED_TO_LIFE) then
+        return DISPOSITION.HOSTILE.value
+    end
+
+    if df.item_petst:is_instance(item) then
+        if item.owner_id > -1 then
+            return DISPOSITION.PET.value
+        end
+        return DISPOSITION.TAME.value
+    end
+
+    if dfhack.units.casteFlagSet(item.race, item.caste, df.caste_raw_flags.PET) or
+        dfhack.units.casteFlagSet(item.race, item.caste, df.caste_raw_flags.PET_EXOTIC)
+    then
+        return DISPOSITION.WILD_TRAINABLE.value
+    end
+    return DISPOSITION.WILD_UNTRAINABLE.value
+end
+
+local function is_assignable_unit(unit)
+    return dfhack.units.isActive(unit) and
+        ((dfhack.units.isAnimal(unit) and dfhack.units.isOwnCiv(unit)) or get_cage_ref(unit)) and
+        not dfhack.units.isDead(unit) and
+        not dfhack.units.isMerchant(unit) and
+        not dfhack.units.isForest(unit)
+end
+
+local function is_assignable_item(item)
+    -- all vermin/small pets are assignable
+    return true
+end
+
+local function get_vermin_desc(vermin, raw)
+    if not raw then return 'Unknown vermin' end
+    if vermin.stack_size > 1 then
+        return ('%s [%d]'):format(raw.name[1], vermin.stack_size)
+    end
+    return ('%s'):format(raw.name[0])
+end
+
+local function get_small_pet_desc(raw)
+    if not raw then return 'Unknown small pet' end
+    return ('tame %s'):format(raw.name[0])
+end
+
+function AssignAnimal:cache_choices()
+    if self.choices then return self.choices end
+
+    local bld_assignments = get_bld_assignments()
+    local choices = {}
+    for _, unit in ipairs(df.global.world.units.active) do
+        if not is_assignable_unit(unit) then goto continue end
+        local raw = df.creature_raw.find(unit.race)
+        local data = {
+            unit=unit,
+            desc=dfhack.units.getReadableName(unit),
+            gender=unit.sex,
+            race=raw and raw.creature_id or '',
+            status=self.get_status(unit, bld_assignments),
+            disposition=get_unit_disposition(unit),
+            egg=dfhack.units.isEggLayerRace(unit),
+            graze=dfhack.units.isGrazer(unit),
+        }
+        local choice = {
+            search_key=make_search_key(data.desc, raw),
+            data=data,
+            text=self:make_choice_text(data),
+        }
+        table.insert(choices, choice)
+        ::continue::
+    end
+    for _, vermin in ipairs(df.global.world.items.other.VERMIN) do
+        if not is_assignable_item(vermin) then goto continue end
+        local raw = df.creature_raw.find(vermin.race)
+        local data = {
+            vermin=vermin,
+            desc=get_vermin_desc(vermin, raw),
+            gender=df.pronoun_type.it,
+            race=raw and raw.creature_id or '',
+            status=self.get_status(vermin, bld_assignments),
+            disposition=get_item_disposition(vermin),
+        }
+        local choice = {
+            search_key=make_search_key(data.desc, raw),
+            data=data,
+            text=self:make_choice_text(data),
+        }
+        table.insert(choices, choice)
+        ::continue::
+    end
+    for _, small_pet in ipairs(df.global.world.items.other.PET) do
+        if not is_assignable_item(small_pet) then goto continue end
+        local raw = df.creature_raw.find(small_pet.race)
+        local data = {
+            vermin=small_pet,
+            desc=get_small_pet_desc(raw),
+            gender=df.pronoun_type.it,
+            race=raw and raw.creature_id or '',
+            status=self.get_status(small_pet, bld_assignments),
+            disposition=get_item_disposition(small_pet),
+        }
+        local choice = {
+            search_key=make_search_key(data.desc, raw),
+            data=data,
+            text=self:make_choice_text(data),
+        }
+        table.insert(choices, choice)
+        ::continue::
+    end
+
+    self.choices = choices
+    return choices
+end
+
+function AssignAnimal:get_choices()
+    local raw_choices = self:cache_choices()
+    local show_vermin = self.get_allow_vermin()
+    local min_status = self.subviews.min_status:getOptionValue()
+    local max_status = self.subviews.max_status:getOptionValue()
+    local min_disposition = self.subviews.min_disposition:getOptionValue()
+    local max_disposition = self.subviews.max_disposition:getOptionValue()
+    local egg = self.subviews.egg:getOptionValue()
+    local graze = self.subviews.graze:getOptionValue()
+    local choices = {}
+    for _,choice in ipairs(raw_choices) do
+        local data = choice.data
+        if not show_vermin and data.vermin then goto continue end
+        if min_status > data.status then goto continue end
+        if max_status < data.status then goto continue end
+        if min_disposition > data.disposition then goto continue end
+        if max_disposition < data.disposition then goto continue end
+        if egg == 'only' and not data.egg then goto continue end
+        if egg == 'exclude' and data.egg then goto continue end
+        if graze == 'only' and not data.graze then goto continue end
+        if graze == 'exclude' and data.graze then goto continue end
+        table.insert(choices, choice)
+        ::continue::
+    end
+    table.sort(choices, self.subviews.sort:getOptionValue())
+    return choices
+end
+
+local function get_bld_assigned_vec(bld, unit_or_vermin)
+    if not bld then return end
+    return df.unit:is_instance(unit_or_vermin) and bld.assigned_units or bld.assigned_items
+end
+
+local function get_assigned_unit_or_vermin_idx(bld, unit_or_vermin, vec)
+    vec = vec or get_bld_assigned_vec(bld, unit_or_vermin)
+    if not vec then return end
+    for assigned_idx, assigned_id in ipairs(vec) do
+        if assigned_id == unit_or_vermin.id then
+            return assigned_idx
+        end
+    end
+end
+
+local function unassign_unit_or_vermin(bld, unit_or_vermin)
+    if not bld then return end
+    if df.building_chainst:is_instance(bld) then
+        if bld.assigned == unit_or_vermin then
+            bld.assigned = nil
+        end
+        return
+    end
+    local vec = get_bld_assigned_vec(bld, unit_or_vermin)
+    local idx = get_assigned_unit_or_vermin_idx(bld, unit_or_vermin, vec)
+    if vec and idx then
+        vec:erase(idx)
+    end
+end
+
+local function detach_unit_or_vermin(unit_or_vermin, bld_assignments)
+    for idx = #unit_or_vermin.general_refs-1, 0, -1 do
+        local ref = unit_or_vermin.general_refs[idx]
+        if df.general_ref_building_civzone_assignedst:is_instance(ref) then
+            unassign_unit_or_vermin(df.building.find(ref.building_id), unit_or_vermin)
+            unit_or_vermin.general_refs:erase(idx)
+            ref:delete()
+        elseif df.general_ref_contained_in_itemst:is_instance(ref) then
+            local built_cage = get_built_cage(df.item.find(ref.item_id))
+            if built_cage and built_cage:getType() == df.building_type.Cage then
+                unassign_unit_or_vermin(built_cage, unit_or_vermin)
+                -- unit's general ref will be removed when the unit is released from the cage
+            end
+        end
+    end
+    bld_assignments = bld_assignments or get_bld_assignments()
+    if bld_assignments[unit_or_vermin.id] then
+        unassign_unit_or_vermin(bld_assignments[unit_or_vermin.id], unit_or_vermin)
+    end
+end
+
+function AssignAnimal:toggle_item_base(choice, target_value, bld_assignments)
+    local true_value = self.status[self.status_revmap[1]].value
+
+    if target_value == nil then
+        target_value = choice.data.status ~= true_value
+    end
+
+    if target_value and choice.data.status == true_value then
+        return target_value
+    end
+    if not target_value and choice.data.status ~= true_value then
+        return target_value
+    end
+
+    if self.initial_min_disposition ~= DISPOSITION.PET.value and choice.data.disposition == DISPOSITION.PET.value then
+        return target_value
+    end
+
+    local unit_or_vermin = choice.data.unit or choice.data.vermin
+    detach_unit_or_vermin(unit_or_vermin, bld_assignments)
+
+    if target_value then
+        local displaced_unit = self.attach(unit_or_vermin)
+        if displaced_unit then
+            -- assigning a unit to a restraint can unassign a different unit
+            for _, c in ipairs(self.subviews.list:getChoices()) do
+                if c.data.unit == displaced_unit then
+                    c.data.status = self.get_status(displaced_unit)
+                end
+            end
+        end
+    end
+
+    -- don't pass bld_assignments since it may no longer be valid
+    choice.data.status = self.get_status(unit_or_vermin)
+
+    return target_value
+end
+
+function AssignAnimal:select_item(idx, choice)
+    if not dfhack.internal.getModifiers().shift then
+        self.prev_list_idx = self.subviews.list.list:getSelected()
+    end
+end
+
+function AssignAnimal:toggle_item(idx, choice)
+    self:toggle_item_base(choice)
+end
+
+function AssignAnimal:toggle_range(idx, choice)
+    if not self.get_multi_select() then
+        self:toggle_item(idx, choice)
+        return
+    end
+    if not self.prev_list_idx then
+        self:toggle_item(idx, choice)
+        return
+    end
+    local choices = self.subviews.list:getVisibleChoices()
+    local list_idx = self.subviews.list.list:getSelected()
+    local bld_assignments = get_bld_assignments()
+    local target_value
+    for i = list_idx, self.prev_list_idx, list_idx < self.prev_list_idx and 1 or -1 do
+        target_value = self:toggle_item_base(choices[i], target_value, bld_assignments)
+    end
+    self.prev_list_idx = list_idx
+end
+
+function AssignAnimal:toggle_visible()
+    local bld_assignments = get_bld_assignments()
+    local target_value
+    for _, choice in ipairs(self.subviews.list:getVisibleChoices()) do
+        target_value = self:toggle_item_base(choice, target_value, bld_assignments)
+    end
+end
+
+-- -------------------
+-- AssignAnimalScreen
+--
+
+view = view or nil
+
+AssignAnimalScreen = defclass(AssignAnimalScreen, gui.ZScreen)
+AssignAnimalScreen.ATTRS {
+    focus_path='zone/assign',
+    is_valid_ui_state=DEFAULT_NIL,
+    status=DEFAULT_NIL,
+    status_revmap=DEFAULT_NIL,
+    get_status=DEFAULT_NIL,
+    get_allow_vermin=DEFAULT_NIL,
+    get_multi_select=DEFAULT_NIL,
+    attach=DEFAULT_NIL,
+    initial_min_disposition=DEFAULT_NIL,
+    target_name=DEFAULT_NIL,
+}
+
+function AssignAnimalScreen:init()
+    self:addviews{
+        AssignAnimal{
+            status=self.status,
+            status_revmap=self.status_revmap,
+            get_status=self.get_status,
+            get_allow_vermin=self.get_allow_vermin,
+            get_multi_select=self.get_multi_select,
+            attach=self.attach,
+            initial_min_disposition=self.initial_min_disposition,
+            target_name=self.target_name,
+        }
+    }
+end
+
+function AssignAnimalScreen:onInput(keys)
+    local handled = AssignAnimalScreen.super.onInput(self, keys)
+    if not self.is_valid_ui_state() then
+        if view then
+            view:dismiss()
+        end
+        return
+    end
+    if keys._MOUSE_L then
+        -- if any click is made outside of our window, we need to recheck unit properties
+        local window = self.subviews[1]
+        if not window:getMouseFramePos() then
+            for _, choice in ipairs(self.subviews.list:getChoices()) do
+                choice.data.status = self.get_status(choice.data.unit or choice.data.vermin)
+            end
+            window:refresh_list()
+        end
+    end
+    return handled
+end
+
+function AssignAnimalScreen:onRenderFrame()
+    if view and not self.is_valid_ui_state() then
+        view:dismiss()
+    end
+end
+
+function AssignAnimalScreen:onDismiss()
+    view = nil
+end
+
+-- -------------------
+-- PasturePondOverlay
+--
+
+PasturePondOverlay = defclass(PasturePondOverlay, overlay.OverlayWidget)
+PasturePondOverlay.ATTRS{
+    default_pos={x=7,y=13},
+    default_enabled=true,
+    viewscreens={'dwarfmode/Zone/Some/Pen', 'dwarfmode/Zone/Some/Pond'},
+    frame={w=31, h=4},
+}
+
+local function is_valid_zone()
+    return df.global.game.main_interface.bottom_mode_selected == df.main_bottom_mode_type.ZONE and
+        df.global.game.main_interface.civzone.cur_bld and
+        (df.global.game.main_interface.civzone.cur_bld.type == df.civzone_type.Pen or
+         df.global.game.main_interface.civzone.cur_bld.type == df.civzone_type.Pond)
+end
+
+local function is_pit_selected()
+    return df.global.game.main_interface.bottom_mode_selected == df.main_bottom_mode_type.ZONE and
+        df.global.game.main_interface.civzone.cur_bld and
+        df.global.game.main_interface.civzone.cur_bld.type == df.civzone_type.Pond
+end
+
+local function attach_to_zone(unit_or_vermin)
+    local zone = df.global.game.main_interface.civzone.cur_bld
+    local ref = df.new(df.general_ref_building_civzone_assignedst)
+    ref.building_id = zone.id;
+    unit_or_vermin.general_refs:insert('#', ref)
+    local is_unit = df.unit:is_instance(unit_or_vermin)
+    local vec = is_unit and zone.assigned_units or zone.assigned_items
+    utils.insert_sorted(vec, unit_or_vermin.id)
+end
+
+local PASTURE_STATUS = {
+    NONE={label='Unknown', value=0},
+    ASSIGNED_HERE={label='Assigned here', value=1},
+    PASTURED={label='In other pasture', value=2},
+    PITTED={label='In other pit/pond', value=3},
+    RESTRAINED={label='On restraint', value=4},
+    BUILT_CAGE={label='In built cage', value=5},
+    ITEM_CAGE={label='In stockpiled cage', value=6},
+    ROAMING={label='Roaming', value=7},
+}
+local PASTURE_STATUS_REVMAP = {}
+for k, v in pairs(PASTURE_STATUS) do
+    PASTURE_STATUS_REVMAP[v.value] = k
+end
+
+local function get_zone_status(unit_or_vermin, bld_assignments)
+    local assigned_zone_ref = get_general_ref(unit_or_vermin, df.general_ref_type.BUILDING_CIVZONE_ASSIGNED)
+    if assigned_zone_ref then
+        if df.global.game.main_interface.civzone.cur_bld.id == assigned_zone_ref.building_id then
+            return PASTURE_STATUS.ASSIGNED_HERE.value
+        else
+            local civzone = df.building.find(assigned_zone_ref.building_id)
+            if civzone.type == df.civzone_type.Pen then
+                return PASTURE_STATUS.PASTURED.value
+            elseif civzone.type == df.civzone_type.Pond then
+                return PASTURE_STATUS.PITTED.value
+            else
+                return PASTURE_STATUS.NONE.value
+            end
+        end
+    end
+    if get_general_ref(unit_or_vermin, df.general_ref_type.BUILDING_CHAIN) then
+        return PASTURE_STATUS.RESTRAINED.value
+    end
+    local cage_ref = get_cage_ref(unit_or_vermin)
+    if cage_ref then
+        if get_built_cage(df.item.find(cage_ref.item_id)) then
+            return PASTURE_STATUS.BUILT_CAGE.value
+        else
+            return PASTURE_STATUS.ITEM_CAGE.value
+        end
+    end
+    bld_assignments = bld_assignments or get_bld_assignments()
+    if bld_assignments and bld_assignments[unit_or_vermin.id] then
+        if df.building_chainst:is_instance(bld_assignments[unit_or_vermin.id]) then
+            return PASTURE_STATUS.RESTRAINED.value
+        end
+        return PASTURE_STATUS.BUILT_CAGE.value
+    end
+    return PASTURE_STATUS.ROAMING.value
+end
+
+local function show_pasture_pond_screen()
+    return AssignAnimalScreen{
+        is_valid_ui_state=is_valid_zone,
+        status=PASTURE_STATUS,
+        status_revmap=PASTURE_STATUS_REVMAP,
+        get_status=get_zone_status,
+        get_allow_vermin=is_pit_selected,
+        get_multi_select=function() return true end,
+        attach=attach_to_zone,
+        target_name='pasture/pond/pit',
+    }:show()
+end
+
+function PasturePondOverlay:init()
+    self:addviews{
+        widgets.TextButton{
+            frame={t=0, l=0, w=23, h=1},
+            label='DFHack assign',
+            key='CUSTOM_CTRL_T',
+            on_activate=function() view = view and view:raise() or show_pasture_pond_screen() end,
+        },
+        widgets.TextButton{
+            frame={b=0, l=0, w=28, h=1},
+            label='DFHack autobutcher',
+            key='CUSTOM_CTRL_B',
+            on_activate=function() dfhack.run_script('gui/autobutcher') end,
+        },
+    }
+end
+
+-- -------------------
+-- CageChainOverlay
+--
+
+CageChainOverlay = defclass(CageChainOverlay, overlay.OverlayWidget)
+CageChainOverlay.ATTRS{
+    default_pos={x=-40,y=34},
+    default_enabled=true,
+    viewscreens={'dwarfmode/ViewSheets/BUILDING/Cage', 'dwarfmode/ViewSheets/BUILDING/Chain'},
+    frame={w=23, h=1},
+    frame_background=gui.CLEAR_PEN,
+}
+
+local function is_valid_building()
+    local bld = dfhack.gui.getSelectedBuilding(true)
+    if not bld or bld:getBuildStage() ~= bld:getMaxBuildStage() then return false end
+    local bt = bld:getType()
+    if bt ~= df.building_type.Cage and bt ~= df.building_type.Chain then return false end
+    for _,zone in ipairs(bld.relations) do
+        if zone.type == df.civzone_type.Dungeon then return false end
+    end
+    return true
+end
+
+local function is_cage_selected()
+    local bld = dfhack.gui.getSelectedBuilding(true)
+    return bld and bld:getType() == df.building_type.Cage
+end
+
+local function attach_to_building(unit_or_vermin)
+    local bld = dfhack.gui.getSelectedBuilding(true)
+    if not bld then return end
+    local is_unit = df.unit:is_instance(unit_or_vermin)
+    if is_unit and unit_or_vermin.relationship_ids[df.unit_relationship_type.Pet] ~= -1 then
+        -- pet owners would just release them
+        return
+    end
+    if bld:getType() == df.building_type.Cage then
+        local vec = is_unit and bld.assigned_units or bld.assigned_items
+        vec:insert('#', unit_or_vermin.id)
+    elseif is_unit and bld:getType() == df.building_type.Chain then
+        local prev_unit = bld.assigned
+        bld.assigned = unit_or_vermin
+        return prev_unit
+    end
+end
+
+local function get_built_chain(unit_or_vermin)
+    local built_chain_ref = get_general_ref(unit_or_vermin, df.general_ref_type.BUILDING_CHAIN)
+    if not built_chain_ref then return end
+    return df.building.find(built_chain_ref.building_id)
+end
+
+local CAGE_STATUS = {
+    NONE={label='Unknown', value=0},
+    ASSIGNED_HERE={label='Assigned here', value=1},
+    PASTURED={label='In pasture', value=2},
+    PITTED={label='In pit/pond', value=3},
+    RESTRAINED={label='On other chain', value=4},
+    BUILT_CAGE={label='In built cage', value=5},
+    ITEM_CAGE={label='In stockpiled cage', value=6},
+    ROAMING={label='Roaming', value=7},
+}
+local CAGE_STATUS_REVMAP = {}
+for k, v in pairs(CAGE_STATUS) do
+    CAGE_STATUS_REVMAP[v.value] = k
+end
+
+local function get_cage_status(unit_or_vermin, bld_assignments)
+    local bld = dfhack.gui.getSelectedBuilding(true)
+    local is_chain = bld and df.building_chainst:is_instance(bld)
+
+    if is_chain and bld.assigned == unit_or_vermin then
+        return CAGE_STATUS.ASSIGNED_HERE.value
+    elseif not is_chain and get_assigned_unit_or_vermin_idx(bld, unit_or_vermin) then
+        return CAGE_STATUS.ASSIGNED_HERE.value
+    end
+    local cage_ref = get_cage_ref(unit_or_vermin)
+    if cage_ref then
+        if get_built_cage(df.item.find(cage_ref.item_id)) then
+            return CAGE_STATUS.BUILT_CAGE.value
+        end
+        return CAGE_STATUS.ITEM_CAGE.value
+    end
+    local built_chain = get_built_chain(unit_or_vermin)
+    if built_chain then
+        if bld and bld == built_chain then
+            return CAGE_STATUS.ASSIGNED_HERE.value
+        end
+        return CAGE_STATUS.RESTRAINED.value
+    end
+    local assigned_zone_ref = get_general_ref(unit_or_vermin, df.general_ref_type.BUILDING_CIVZONE_ASSIGNED)
+    if assigned_zone_ref then
+        local civzone = df.building.find(assigned_zone_ref.building_id)
+        if civzone.type == df.civzone_type.Pen then
+            return CAGE_STATUS.PASTURED.value
+        elseif civzone.type == df.civzone_type.Pond then
+            return CAGE_STATUS.PITTED.value
+        else
+            return CAGE_STATUS.NONE.value
+        end
+    end
+    bld_assignments = bld_assignments or get_bld_assignments()
+    if bld_assignments and bld_assignments[unit_or_vermin.id] then
+        if df.building_chainst:is_instance(bld_assignments[unit_or_vermin.id]) then
+            return CAGE_STATUS.RESTRAINED.value
+        end
+        return CAGE_STATUS.BUILT_CAGE.value
+    end
+    return CAGE_STATUS.ROAMING.value
+end
+
+local function show_cage_chain_screen()
+    return AssignAnimalScreen{
+        is_valid_ui_state=is_valid_building,
+        status=CAGE_STATUS,
+        status_revmap=CAGE_STATUS_REVMAP,
+        get_status=get_cage_status,
+        get_allow_vermin=is_cage_selected,
+        get_multi_select=is_cage_selected,
+        attach=attach_to_building,
+        initial_min_disposition=DISPOSITION.TAME.value,
+        target_name='cage/restraint',
+    }:show()
+end
+
+function CageChainOverlay:init()
+    self:addviews{
+        widgets.TextButton{
+            frame={t=0, l=0, r=0, h=1},
+            label='DFHack assign',
+            key='CUSTOM_CTRL_T',
+            visible=is_valid_building,
+            on_activate=function() view = view and view:raise() or show_cage_chain_screen() end,
+        },
+    }
+end
+
+OVERLAY_WIDGETS = {
+    pasturepond=PasturePondOverlay,
+    cagechain=CageChainOverlay,
+}
+
+return _ENV
diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index 2d3f3bc0a..0a8e18a27 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -8,6 +8,7 @@
 #include <modules/Screen.h>
 #include <modules/Translation.h>
 #include <modules/Units.h>
+#include <modules/Military.h>
 #include <modules/Filesystem.h>
 #include <modules/Job.h>
 #include <vector>
@@ -19,7 +20,7 @@
 
 #include "df/activity_event.h"
 #include "df/world.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/graphic.h"
 #include "df/enabler.h"
 #include "df/viewscreen_unitlistst.h"
@@ -49,7 +50,7 @@ using namespace df::enums;
 DFHACK_PLUGIN("manipulator");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(enabler);
 
@@ -1305,7 +1306,7 @@ void viewscreen_unitlaborsst::refreshNames()
             cur->job_mode = UnitInfo::JOB;
         }
         if (unit->military.squad_id > -1) {
-            cur->squad_effective_name = Units::getSquadName(unit);
+            cur->squad_effective_name = Military::getSquadName(unit->military.squad_id);
             cur->squad_info = stl_sprintf("%i", unit->military.squad_position + 1) + "." + cur->squad_effective_name;
         } else {
             cur->squad_effective_name = "";
@@ -1874,14 +1875,14 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
 
     if (events->count(interface_key::CUSTOM_B))
     {
-        Screen::show(dts::make_unique<viewscreen_unitbatchopst>(units, true, &do_refresh_names), plugin_self);
+        Screen::show(std::make_unique<viewscreen_unitbatchopst>(units, true, &do_refresh_names), plugin_self);
     }
 
     if (events->count(interface_key::CUSTOM_E))
     {
         vector<UnitInfo*> tmp;
         tmp.push_back(cur);
-        Screen::show(dts::make_unique<viewscreen_unitbatchopst>(tmp, false, &do_refresh_names), plugin_self);
+        Screen::show(std::make_unique<viewscreen_unitbatchopst>(tmp, false, &do_refresh_names), plugin_self);
     }
 
     if (events->count(interface_key::CUSTOM_P))
@@ -1892,11 +1893,11 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
                 has_selected = true;
 
         if (has_selected) {
-            Screen::show(dts::make_unique<viewscreen_unitprofessionset>(units, true), plugin_self);
+            Screen::show(std::make_unique<viewscreen_unitprofessionset>(units, true), plugin_self);
         } else {
             vector<UnitInfo*> tmp;
             tmp.push_back(cur);
-            Screen::show(dts::make_unique<viewscreen_unitprofessionset>(tmp, false), plugin_self);
+            Screen::show(std::make_unique<viewscreen_unitprofessionset>(tmp, false), plugin_self);
         }
     }
 
@@ -1972,9 +1973,9 @@ void viewscreen_unitlaborsst::render()
         Screen::paintTile(Screen::Pen(columns[col_offset].label[0], fg, bg), col_offsets[DISP_COLUMN_LABORS] + col, 1);
         Screen::paintTile(Screen::Pen(columns[col_offset].label[1], fg, bg), col_offsets[DISP_COLUMN_LABORS] + col, 2);
         df::profession profession = columns[col_offset].profession;
-        if ((profession != profession::NONE) && (ui->race_id != -1))
+        if ((profession != profession::NONE) && (plotinfo->race_id != -1))
         {
-            auto graphics = world->raws.creatures.all[ui->race_id]->graphics;
+            auto graphics = world->raws.creatures.all[plotinfo->race_id]->graphics;
             Screen::paintTile(
                 Screen::Pen(' ', fg, 0,
                     graphics.profession_add_color[creature_graphics_role::DEFAULT][profession],
@@ -2285,7 +2286,7 @@ struct unitlist_hook : df::viewscreen_unitlistst
         {
             if (units[page].size())
             {
-                Screen::show(dts::make_unique<viewscreen_unitlaborsst>(units[page], cursor_pos[page]), plugin_self);
+                Screen::show(std::make_unique<viewscreen_unitlaborsst>(units[page], cursor_pos[page]), plugin_self);
                 return;
             }
         }
diff --git a/plugins/misery.cpp b/plugins/misery.cpp
index 224060c6b..5e3bf6e1f 100644
--- a/plugins/misery.cpp
+++ b/plugins/misery.cpp
@@ -1,195 +1,275 @@
 #include <algorithm>
-#include <map>
 #include <string>
 #include <vector>
 
-#include "DataDefs.h"
-#include "Export.h"
-#include "PluginManager.h"
-
-#include "modules/Units.h"
-
 #include "df/emotion_type.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/unit_personality.h"
 #include "df/unit_soul.h"
 #include "df/unit_thought_type.h"
 #include "df/world.h"
 
-using namespace std;
+#include "modules/Persistence.h"
+#include "modules/Units.h"
+#include "modules/World.h"
+
+#include "Core.h"
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+
+using std::string;
+using std::vector;
+
 using namespace DFHack;
 
 DFHACK_PLUGIN("misery");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
-REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(cur_year);
 REQUIRE_GLOBAL(cur_year_tick);
+REQUIRE_GLOBAL(world);
 
-typedef df::unit_personality::T_emotions Emotion;
-
-static int factor = 1;
-static int tick = 0;
-const int INTERVAL = 1000;
+namespace DFHack {
+    DBG_DECLARE(misery, cycle, DebugCategory::LINFO);
+    DBG_DECLARE(misery, config, DebugCategory::LINFO);
+}
 
-command_result misery(color_ostream& out, vector<string>& parameters);
-void add_misery(df::unit *unit);
-void clear_misery(df::unit *unit);
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+static PersistentDataItem config;
 
-const int FAKE_EMOTION_FLAG = (1 << 30);
-const int STRENGTH_MULTIPLIER = 100;
+enum ConfigValues {
+    CONFIG_IS_ENABLED = 0,
+    CONFIG_FACTOR = 1,
+};
 
-bool is_valid_unit (df::unit *unit) {
-    if (!Units::isOwnRace(unit) || !Units::isOwnCiv(unit))
-        return false;
-    if (!Units::isActive(unit))
-        return false;
-    return true;
+static int get_config_val(PersistentDataItem &c, int index) {
+    if (!c.isValid())
+        return -1;
+    return c.ival(index);
+}
+static bool get_config_bool(PersistentDataItem &c, int index) {
+    return get_config_val(c, index) == 1;
+}
+static void set_config_val(PersistentDataItem &c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
+}
+static void set_config_bool(PersistentDataItem &c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
 }
 
-inline bool is_fake_emotion (Emotion *e) {
-    return e->flags.whole & FAKE_EMOTION_FLAG;
+static const int32_t CYCLE_TICKS = 1200; // one day
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
+
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+static void do_cycle(color_ostream &out);
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    DEBUG(config,out).print("initializing %s\n", plugin_name);
+
+    // provide a configuration interface for the plugin
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Make citizens more miserable.",
+        do_command));
+
+    return CR_OK;
 }
 
-void add_misery (df::unit *unit) {
-    // Add a fake miserable thought
-    // Remove any fake ones that already exist
-    if (!unit || !unit->status.current_soul)
-        return;
-    clear_misery(unit);
-    auto &emotions = unit->status.current_soul->personality.emotions;
-    Emotion *e = new Emotion;
-    e->type = df::emotion_type::MISERY;
-    e->thought = df::unit_thought_type::SoapyBath;
-    e->flags.whole |= FAKE_EMOTION_FLAG;
-    emotions.push_back(e);
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
 
-    for (Emotion *e : emotions) {
-        if (is_fake_emotion(e)) {
-            e->year = *cur_year;
-            e->year_tick = *cur_year_tick;
-            e->strength = STRENGTH_MULTIPLIER * factor;
-            e->severity = STRENGTH_MULTIPLIER * factor;
-        }
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(config,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        if (enable)
+            do_cycle(out);
+    } else {
+        DEBUG(config,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
     }
+    return CR_OK;
 }
 
-void clear_misery (df::unit *unit) {
-    if (!unit || !unit->status.current_soul)
-        return;
-    auto &emotions = unit->status.current_soul->personality.emotions;
-    auto it = remove_if(emotions.begin(), emotions.end(), [](Emotion *e) {
-        if (is_fake_emotion(e)) {
-            delete e;
-            return true;
-        }
-        return false;
-    });
-    emotions.erase(it, emotions.end());
-}
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(config,out).print("shutting down %s\n", plugin_name);
 
-DFhackCExport command_result plugin_shutdown(color_ostream& out) {
-    factor = 0;
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_onupdate(color_ostream& out) {
-    static bool wasLoaded = false;
-    if ( factor == 0 || !world || !world->map.block_index ) {
-        if ( wasLoaded ) {
-            //we just unloaded the game: clear all data
-            factor = 0;
-            is_enabled = false;
-            wasLoaded = false;
-        }
-        return CR_OK;
-    }
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
+    config = World::GetPersistentData(CONFIG_KEY);
 
-    if ( !wasLoaded ) {
-        wasLoaded = true;
+    if (!config.isValid()) {
+        DEBUG(config,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        set_config_val(config, CONFIG_FACTOR, 2);
     }
 
-    if ( tick < INTERVAL ) {
-        tick++;
-        return CR_OK;
-    }
-    tick = 0;
+    is_enabled = get_config_bool(config, CONFIG_IS_ENABLED);
+    DEBUG(config,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
 
-    //TODO: consider units.active
-    for (df::unit *unit : world->units.all) {
-        if (is_valid_unit(unit)) {
-            add_misery(unit);
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        if (is_enabled) {
+            DEBUG(config,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
         }
     }
-
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_init(color_ostream& out, vector<PluginCommand> &commands) {
-    commands.push_back(PluginCommand(
-        "misery",
-        "Increase the intensity of negative dwarven thoughts.",
-        misery));
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && world->frame_counter - cycle_timestamp >= CYCLE_TICKS)
+        do_cycle(out);
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    if (enable != is_enabled)
-    {
-        is_enabled = enable;
-        factor = enable ? 1 : 0;
-        tick = INTERVAL;
-    }
+static bool call_misery_lua(color_ostream *out, const char *fn_name,
+        int nargs = 0, int nres = 0,
+        Lua::LuaLambda && args_lambda = Lua::DEFAULT_LUA_LAMBDA,
+        Lua::LuaLambda && res_lambda = Lua::DEFAULT_LUA_LAMBDA) {
+    DEBUG(config).print("calling misery lua function: '%s'\n", fn_name);
 
-    return CR_OK;
+    CoreSuspender guard;
+
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!out)
+        out = &Core::getInstance().getConsole();
+
+    return Lua::CallLuaModuleFunction(*out, L, "plugins.misery", fn_name,
+            nargs, nres,
+            std::forward<Lua::LuaLambda&&>(args_lambda),
+            std::forward<Lua::LuaLambda&&>(res_lambda));
 }
 
-command_result misery(color_ostream &out, vector<string>& parameters) {
-    if ( !world || !world->map.block_index ) {
-        out.printerr("misery can only be enabled in fortress mode with a fully-loaded game.\n");
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
+
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
         return CR_FAILURE;
     }
 
-    if ( parameters.size() < 1 || parameters.size() > 2 ) {
-        return CR_WRONG_USAGE;
+    bool show_help = false;
+    if (!call_misery_lua(&out, "parse_commandline", parameters.size(), 1,
+            [&](lua_State *L) {
+                for (const string &param : parameters)
+                    Lua::Push(L, param);
+            },
+            [&](lua_State *L) {
+                show_help = !lua_toboolean(L, -1);
+            })) {
+        return CR_FAILURE;
     }
 
-    if ( parameters[0] == "disable" ) {
-        if ( parameters.size() > 1 ) {
-            return CR_WRONG_USAGE;
-        }
-        factor = 0;
-        is_enabled = false;
-        return CR_OK;
-    } else if ( parameters[0] == "enable" ) {
-        is_enabled = true;
-        factor = 1;
-        if ( parameters.size() == 2 ) {
-            int a = atoi(parameters[1].c_str());
-            if ( a < 1 ) {
-                out.printerr("Second argument must be a positive integer.\n");
-                return CR_WRONG_USAGE;
-            }
-            factor = a;
-        }
-        tick = INTERVAL;
-    } else if ( parameters[0] == "clear" ) {
-        for (df::unit *unit : world->units.all) {
-            if (is_valid_unit(unit)) {
-                clear_misery(unit);
-            }
-        }
-    } else {
-        int a = atoi(parameters[0].c_str());
-        if ( a < 0 ) {
-            return CR_WRONG_USAGE;
+    return show_help ? CR_WRONG_USAGE : CR_OK;
+}
+
+/////////////////////////////////////////////////////
+// cycle logic
+//
+
+const int FAKE_EMOTION_FLAG = (1 << 30);
+const int STRENGTH_MULTIPLIER = 100;
+
+typedef df::unit_personality::T_emotions Emotion;
+
+static bool is_fake_emotion(Emotion *e) {
+    return e->flags.whole & FAKE_EMOTION_FLAG;
+}
+
+static void clear_misery(df::unit *unit) {
+    if (!unit || !unit->status.current_soul)
+        return;
+    auto &emotions = unit->status.current_soul->personality.emotions;
+    auto it = std::remove_if(emotions.begin(), emotions.end(), [](Emotion *e) {
+        if (is_fake_emotion(e)) {
+            delete e;
+            return true;
         }
-        factor = a;
-        is_enabled = factor > 0;
+        return false;
+    });
+    emotions.erase(it, emotions.end());
+}
+// clears fake negative thoughts then runs the given lambda
+static void affect_units(
+        std::function<void(df::unit *)> &&process_unit = [](df::unit *){}) {
+    for (auto unit : world->units.active) {
+        if (!Units::isCitizen(unit) || !unit->status.current_soul)
+            continue;
+
+        clear_misery(unit);
+        std::forward<std::function<void(df::unit *)> &&>(process_unit)(unit);
     }
+}
 
-    return CR_OK;
+static void do_cycle(color_ostream &out) {
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
+
+    DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
+
+    int strength = STRENGTH_MULTIPLIER * get_config_val(config, CONFIG_FACTOR);
+
+    affect_units([&](df::unit *unit) {
+        Emotion *e = new Emotion;
+        e->type = df::emotion_type::MISERY;
+        e->thought = df::unit_thought_type::SoapyBath;
+        e->flags.whole |= FAKE_EMOTION_FLAG;
+        e->year = *cur_year;
+        e->year_tick = *cur_year_tick;
+        e->strength = strength;
+        e->severity = strength;
+        unit->status.current_soul->personality.emotions.push_back(e);
+    });
 }
+
+/////////////////////////////////////////////////////
+// Lua API
+//
+
+static void misery_clear(color_ostream &out) {
+    DEBUG(config,out).print("entering misery_clear\n");
+    affect_units();
+}
+
+static void misery_setFactor(color_ostream &out, int32_t factor) {
+    DEBUG(config,out).print("entering misery_setFactor\n");
+    if (1 >= factor) {
+        out.printerr("factor must be at least 2\n");
+        return;
+    }
+    set_config_val(config, CONFIG_FACTOR, factor);
+    if (is_enabled)
+        do_cycle(out);
+}
+
+static int misery_getFactor(color_ostream &out) {
+    DEBUG(config,out).print("entering tailor_getFactor\n");
+    return get_config_val(config, CONFIG_FACTOR);
+}
+
+DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(misery_clear),
+    DFHACK_LUA_FUNCTION(misery_setFactor),
+    DFHACK_LUA_FUNCTION(misery_getFactor),
+    DFHACK_LUA_END
+};
diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp
index 124664fa2..1a088141a 100644
--- a/plugins/mousequery.cpp
+++ b/plugins/mousequery.cpp
@@ -6,8 +6,8 @@
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/world.h"
 #include "df/items_other_id.h"
-#include "df/ui_build_selector.h"
-#include "df/ui_sidebar_menus.h"
+#include "df/buildreq.h"
+#include "df/gamest.h"
 
 #include "modules/Gui.h"
 #include "modules/World.h"
@@ -26,7 +26,7 @@ DFHACK_PLUGIN("mousequery");
 REQUIRE_GLOBAL(enabler);
 REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(ui_build_selector);
 
 using namespace df::enums::ui_sidebar_mode;
@@ -196,7 +196,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
 
     bool isInDesignationMenu()
     {
-        switch (ui->main.mode)
+        switch (plotinfo->main.mode)
         {
         case DesignateMine:
         case DesignateRemoveRamps:
@@ -230,7 +230,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
             return true;
 
         case Burrows:
-            return ui->burrows.in_define_mode;
+            return plotinfo->burrows.in_define_mode;
 
         default:
             return false;
@@ -242,7 +242,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
         if (isInDesignationMenu())
             return box_designation_enabled;
 
-        switch (ui->main.mode)
+        switch (plotinfo->main.mode)
         {
         case DesignateItemsClaim:
         case DesignateItemsForbid:
@@ -281,8 +281,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
     {
         bool selectableMode =
             isInDesignationMenu() ||
-            ui->main.mode == Stockpiles ||
-            ui->main.mode == Zones;
+            plotinfo->main.mode == Stockpiles ||
+            plotinfo->main.mode == Zones;
 
         if (selectableMode)
         {
@@ -314,7 +314,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
         }
         else
         {
-            switch (ui->main.mode)
+            switch (plotinfo->main.mode)
             {
             case QueryBuilding:
                 if (cursor_still_here)
@@ -369,8 +369,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
         if (mx < 1 || mx > dims.map_x2 || my < 1 || my > dims.map_y2)
             return false;
 
-        if (ui->main.mode == df::ui_sidebar_mode::Zones ||
-            ui->main.mode == df::ui_sidebar_mode::Stockpiles)
+        if (plotinfo->main.mode == df::ui_sidebar_mode::Zones ||
+            plotinfo->main.mode == df::ui_sidebar_mode::Stockpiles)
         {
             int32_t x, y, z;
             if (Gui::getDesignationCoords(x, y, z))
@@ -417,8 +417,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
         enabler->mouse_rbut = 0;
 
         using namespace df::enums::ui_sidebar_mode;
-        if ((ui->main.mode == QueryBuilding || ui->main.mode == BuildingItems ||
-            ui->main.mode == ViewUnits || ui->main.mode == LookAround) ||
+        if ((plotinfo->main.mode == QueryBuilding || plotinfo->main.mode == BuildingItems ||
+            plotinfo->main.mode == ViewUnits || plotinfo->main.mode == LookAround) ||
             (isInTrackableMode() && tracking_enabled))
         {
             sendKey(df::interface_key::LEAVESCREEN);
@@ -707,8 +707,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
             if (Gui::getDesignationCoords(x, y, z))
             {
                 color = COLOR_WHITE;
-                if (ui->main.mode == df::ui_sidebar_mode::Zones ||
-                    ui->main.mode == df::ui_sidebar_mode::Stockpiles)
+                if (plotinfo->main.mode == df::ui_sidebar_mode::Zones ||
+                    plotinfo->main.mode == df::ui_sidebar_mode::Stockpiles)
                 {
                     auto dX = abs(x - mpos.x);
                     if (dX > 30)
diff --git a/plugins/nestboxes.cpp b/plugins/nestboxes.cpp
index 403a8cb37..f8758a0d9 100644
--- a/plugins/nestboxes.cpp
+++ b/plugins/nestboxes.cpp
@@ -1,120 +1,158 @@
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
+#include "Debug.h"
 #include "PluginManager.h"
 
-#include "DataDefs.h"
+#include "modules/Items.h"
+#include "modules/Job.h"
+#include "modules/Persistence.h"
+#include "modules/World.h"
+
 #include "df/world.h"
-#include "df/ui.h"
 #include "df/building_nest_boxst.h"
-#include "df/building_type.h"
-#include "df/buildings_other_id.h"
-#include "df/global_objects.h"
 #include "df/item.h"
+#include "df/item_eggst.h"
 #include "df/unit.h"
-#include "df/building.h"
-#include "df/items_other_id.h"
-#include "df/creature_raw.h"
-#include "modules/MapCache.h"
-#include "modules/Items.h"
 
-
-using std::vector;
 using std::string;
-using std::endl;
 using namespace DFHack;
 using namespace df::enums;
 
-using df::global::world;
-using df::global::ui;
+DFHACK_PLUGIN("nestboxes");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
-static command_result nestboxes(color_ostream &out, vector <string> & parameters);
+REQUIRE_GLOBAL(world);
 
-DFHACK_PLUGIN("nestboxes");
+namespace DFHack {
+    // for configuration-related logging
+    DBG_DECLARE(nestboxes, config, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(nestboxes, cycle, DebugCategory::LINFO);
+}
 
-DFHACK_PLUGIN_IS_ENABLED(enabled);
-
-static void eggscan(color_ostream &out)
-{
-    CoreSuspender suspend;
-
-    for (df::building *build : world->buildings.other[df::buildings_other_id::NEST_BOX])
-    {
-        auto type = build->getType();
-        if (df::enums::building_type::NestBox == type)
-        {
-            bool fertile = false;
-            df::building_nest_boxst *nb = virtual_cast<df::building_nest_boxst>(build);
-            if (nb->claimed_by != -1)
-            {
-                df::unit* u = df::unit::find(nb->claimed_by);
-                if (u && u->pregnancy_timer > 0)
-                    fertile = true;
-            }
-            for (size_t j = 1; j < nb->contained_items.size(); j++)
-            {
-                df::item* item = nb->contained_items[j]->item;
-                if (item->flags.bits.forbid != fertile)
-                {
-                    item->flags.bits.forbid = fertile;
-                    out << item->getStackSize() << " eggs " << (fertile ? "forbidden" : "unforbidden.") << endl;
-                }
-            }
-        }
-    }
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+static PersistentDataItem config;
+
+enum ConfigValues {
+    CONFIG_IS_ENABLED = 0,
+};
+
+static int get_config_val(PersistentDataItem &c, int index) {
+    if (!c.isValid())
+        return -1;
+    return c.ival(index);
+}
+static bool get_config_bool(PersistentDataItem &c, int index) {
+    return get_config_val(c, index) == 1;
+}
+static void set_config_val(PersistentDataItem &c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
 }
+static void set_config_bool(PersistentDataItem &c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
+}
+
+static const int32_t CYCLE_TICKS = 50; // need to react quickly when eggs are laid/unforbidden
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
+
+static void do_cycle(color_ostream &out);
 
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    DEBUG(config,out).print("initializing %s\n", plugin_name);
 
-DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    if (world && ui) {
-        commands.push_back(
-            PluginCommand(
-                "nestboxes",
-                "Protect fertile eggs incubating in a nestbox.",
-                nestboxes));
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(config,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        if (enable)
+            do_cycle(out);
+    } else {
+        DEBUG(config,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
     }
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(config,out).print("shutting down %s\n", plugin_name);
+
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_onupdate(color_ostream &out)
-{
-    if (!enabled)
-        return CR_OK;
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
+    config = World::GetPersistentData(CONFIG_KEY);
 
-    static unsigned cnt = 0;
-    if ((++cnt % 5) != 0)
-        return CR_OK;
+    if (!config.isValid()) {
+        DEBUG(config,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+    }
 
-    eggscan(out);
+    is_enabled = get_config_bool(config, CONFIG_IS_ENABLED);
+    DEBUG(config,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
 
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    enabled = enable;
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        if (is_enabled) {
+            DEBUG(config,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
+        }
+    }
     return CR_OK;
 }
 
-static command_result nestboxes(color_ostream &out, vector <string> & parameters)
-{
-    CoreSuspender suspend;
-
-    if (parameters.size() == 1) {
-        if (parameters[0] == "enable")
-            enabled = true;
-        else if (parameters[0] == "disable")
-            enabled = false;
-        else
-            return CR_WRONG_USAGE;
-    } else {
-        out << "Plugin " << (enabled ? "enabled" : "disabled") << "." << endl;
-    }
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && world->frame_counter - cycle_timestamp >= CYCLE_TICKS)
+        do_cycle(out);
     return CR_OK;
 }
+
+/////////////////////////////////////////////////////
+// cycle logic
+//
+
+static void do_cycle(color_ostream &out) {
+    DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
+
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
+
+    for (df::building_nest_boxst *nb : world->buildings.other.NEST_BOX) {
+        bool fertile = false;
+        if (nb->claimed_by != -1) {
+            df::unit *u = df::unit::find(nb->claimed_by);
+            if (u && u->pregnancy_timer > 0)
+                fertile = true;
+        }
+        for (auto &contained_item : nb->contained_items) {
+            auto *item = virtual_cast<df::item_eggst>(contained_item->item);
+            if (item && item->flags.bits.forbid != fertile) {
+                item->flags.bits.forbid = fertile;
+                if (fertile && item->flags.bits.in_job) {
+                    // cancel any job involving the egg
+                    df::specific_ref *sref = Items::getSpecificRef(
+                            item, df::specific_ref_type::JOB);
+                    if (sref && sref->data.job)
+                        Job::removeJob(sref->data.job);
+                }
+                out.print("%d eggs %s.\n", item->getStackSize(), fertile ? "forbidden" : "unforbidden");
+            }
+        }
+    }
+}
diff --git a/plugins/orders.cpp b/plugins/orders.cpp
index 800a0db6e..4b4c0ed4f 100644
--- a/plugins/orders.cpp
+++ b/plugins/orders.cpp
@@ -10,6 +10,7 @@
 #include "json/json.h"
 
 #include "df/building.h"
+#include "df/gamest.h"
 #include "df/historical_figure.h"
 #include "df/itemdef_ammost.h"
 #include "df/itemdef_armorst.h"
@@ -36,12 +37,14 @@
 using namespace DFHack;
 using namespace df::enums;
 
+using df::global::game;
+
 DFHACK_PLUGIN("orders");
 
 REQUIRE_GLOBAL(world);
 
 static const std::string ORDERS_DIR = "dfhack-config/orders";
-static const std::string ORDERS_LIBRARY_DIR = "dfhack-config/orders/library";
+static const std::string ORDERS_LIBRARY_DIR = "hack/data/orders";
 
 static command_result orders_command(color_ostream & out, std::vector<std::string> & parameters);
 
@@ -64,6 +67,8 @@ static command_result orders_export_command(color_ostream & out, const std::stri
 static command_result orders_import_command(color_ostream & out, const std::string & name);
 static command_result orders_clear_command(color_ostream & out);
 static command_result orders_sort_command(color_ostream & out);
+static command_result orders_recheck_command(color_ostream & out);
+static command_result orders_recheck_current_command(color_ostream & out);
 
 static command_result orders_command(color_ostream & out, std::vector<std::string> & parameters)
 {
@@ -86,6 +91,11 @@ static command_result orders_command(color_ostream & out, std::vector<std::strin
         return orders_list_command(out);
     }
 
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+
     if (parameters[0] == "export" && parameters.size() == 2)
     {
         return orders_export_command(out, parameters[1]);
@@ -106,6 +116,19 @@ static command_result orders_command(color_ostream & out, std::vector<std::strin
         return orders_sort_command(out);
     }
 
+    if (parameters[0] == "recheck" && parameters.size() == 1)
+    {
+        return orders_recheck_command(out);
+    }
+
+    if (parameters[0] == "recheck" && parameters.size() == 2)
+    {
+        if (parameters[1] == "this")
+        {
+            return orders_recheck_current_command(out);
+        }
+    }
+
     return CR_WRONG_USAGE;
 }
 
@@ -139,20 +162,9 @@ static command_result orders_list_command(color_ostream & out)
     // support subdirs so we can identify and ignore subdirs with ".json" names.
     // also listdir_recursive will alphabetize the list for us.
     std::map<std::string, bool> files;
-    if (0 < Filesystem::listdir_recursive(ORDERS_DIR, files, 0, false))
-    {
-        out << COLOR_LIGHTRED << "Unable to list files in directory: " << ORDERS_DIR << std::endl;
-        return CR_FAILURE;
-    }
-
-    if (files.empty())
-    {
-        out << COLOR_YELLOW << "No exported orders yet. Create manager orders and export them with 'orders export <name>', or copy pre-made orders .json files into " << ORDERS_DIR << "." << std::endl;
-        return CR_OK;
-    }
+    Filesystem::listdir_recursive(ORDERS_DIR, files, 0, false);
 
-    for (auto it : files)
-    {
+    for (auto it : files) {
         if (it.second)
             continue; // skip directories
         std::string name = it.first;
@@ -1021,3 +1033,31 @@ static command_result orders_sort_command(color_ostream & out)
 
     return CR_OK;
 }
+
+static command_result orders_recheck_command(color_ostream & out)
+{
+    size_t count = 0;
+    for (auto it : world->manager_orders) {
+        if (it->item_conditions.size() && it->status.bits.active) {
+            ++count;
+            it->status.bits.active = false;
+            it->status.bits.validated = false;
+        }
+    }
+    out << "Re-checking conditions for " << count << " manager orders." << std::endl;
+    return CR_OK;
+}
+
+static command_result orders_recheck_current_command(color_ostream & out)
+{
+    if (game->main_interface.info.work_orders.conditions.open)
+    {
+        game->main_interface.info.work_orders.conditions.wq->status.bits.active = false;
+    }
+    else
+    {
+        out << COLOR_LIGHTRED << "Order conditions is not open" << std::endl;
+        return CR_FAILURE;
+    }
+    return CR_OK;
+}
diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index 4c7384f3b..c94397956 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -1,3 +1,4 @@
+#include "df/enabler.h"
 #include "df/viewscreen_adopt_regionst.h"
 #include "df/viewscreen_choose_game_typest.h"
 #include "df/viewscreen_choose_start_sitest.h"
@@ -7,12 +8,14 @@
 #include "df/viewscreen_initial_prepst.h"
 #include "df/viewscreen_legendsst.h"
 #include "df/viewscreen_loadgamest.h"
+#include "df/viewscreen_new_arenast.h"
 #include "df/viewscreen_new_regionst.h"
 #include "df/viewscreen_savegamest.h"
 #include "df/viewscreen_setupdwarfgamest.h"
 #include "df/viewscreen_titlest.h"
 #include "df/viewscreen_update_regionst.h"
 #include "df/viewscreen_worldst.h"
+#include "df/world.h"
 
 #include "Debug.h"
 #include "LuaTools.h"
@@ -27,6 +30,9 @@ using namespace DFHack;
 DFHACK_PLUGIN("overlay");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
+REQUIRE_GLOBAL(world);
+REQUIRE_GLOBAL(enabler);
+
 namespace DFHack {
     DBG_DECLARE(overlay, control, DebugCategory::LINFO);
     DBG_DECLARE(overlay, event, DebugCategory::LINFO);
@@ -67,15 +73,20 @@ struct viewscreen_overlay : T {
     }
     DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key> *input)) {
         bool input_is_handled = false;
-        call_overlay_lua(NULL, "feed_viewscreen_widgets", 2, 1,
-                [&](lua_State *L) {
-                    Lua::Push(L, T::_identity.getName());
-                    Lua::PushInterfaceKeys(L, *input);
-                }, [&](lua_State *L) {
-                    input_is_handled = lua_toboolean(L, -1);
-                });
+        // don't send input to the overlays if there is a modal dialog up
+        if (!world->status.popups.size())
+            call_overlay_lua(NULL, "feed_viewscreen_widgets", 3, 1,
+                    [&](lua_State *L) {
+                        Lua::Push(L, T::_identity.getName());
+                        Lua::Push(L, this);
+                        Lua::PushInterfaceKeys(L, Screen::normalize_text_keys(*input));
+                    }, [&](lua_State *L) {
+                        input_is_handled = lua_toboolean(L, -1);
+                    });
         if (!input_is_handled)
             INTERPOSE_NEXT(feed)(input);
+        else
+            dfhack_lua_viewscreen::markInputAsHandled();
     }
     DEFINE_VMETHOD_INTERPOSE(void, render, ()) {
         INTERPOSE_NEXT(render)();
@@ -102,6 +113,7 @@ IMPLEMENT_HOOKS(game_cleaner)
 IMPLEMENT_HOOKS(initial_prep)
 IMPLEMENT_HOOKS(legends)
 IMPLEMENT_HOOKS(loadgame)
+IMPLEMENT_HOOKS(new_arena)
 IMPLEMENT_HOOKS(new_region)
 IMPLEMENT_HOOKS(savegame)
 IMPLEMENT_HOOKS(setupdwarfgame)
@@ -122,7 +134,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 
     if (enable) {
         screenSize = Screen::getWindowSize();
-        call_overlay_lua(&out, "reload");
+        call_overlay_lua(&out, "rescan");
     }
 
     DEBUG(control).print("%sing interpose hooks\n", enable ? "enabl" : "disabl");
@@ -136,6 +148,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
             INTERPOSE_HOOKS_FAILED(initial_prep) ||
             INTERPOSE_HOOKS_FAILED(legends) ||
             INTERPOSE_HOOKS_FAILED(loadgame) ||
+            INTERPOSE_HOOKS_FAILED(new_arena) ||
             INTERPOSE_HOOKS_FAILED(new_region) ||
             INTERPOSE_HOOKS_FAILED(savegame) ||
             INTERPOSE_HOOKS_FAILED(setupdwarfgame) ||
diff --git a/plugins/pathable.cpp b/plugins/pathable.cpp
index 7ed7fffd0..be6537d32 100644
--- a/plugins/pathable.cpp
+++ b/plugins/pathable.cpp
@@ -1,16 +1,29 @@
+#include "Debug.h"
+#include "MemAccess.h"
+#include "PluginManager.h"
+#include "TileTypes.h"
+
+#include "modules/EventManager.h"
 #include "modules/Gui.h"
+#include "modules/Job.h"
 #include "modules/Maps.h"
 #include "modules/Screen.h"
+#include "modules/Textures.h"
 
-#include "Debug.h"
-#include "LuaTools.h"
-#include "PluginManager.h"
+#include "df/block_square_event_designation_priorityst.h"
+#include "df/init.h"
+#include "df/job_list_link.h"
+#include "df/map_block.h"
+#include "df/tile_designation.h"
+#include "df/world.h"
+
+#include <functional>
 
 using namespace DFHack;
 
 DFHACK_PLUGIN("pathable");
 
-REQUIRE_GLOBAL(gps);
+REQUIRE_GLOBAL(init);
 REQUIRE_GLOBAL(window_x);
 REQUIRE_GLOBAL(window_y);
 REQUIRE_GLOBAL(window_z);
@@ -20,7 +33,10 @@ namespace DFHack {
     DBG_DECLARE(pathable, log, DebugCategory::LINFO);
 }
 
+static std::vector<TexposHandle> textures;
+
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector<PluginCommand> &commands) {
+    textures = Textures::loadTileset("hack/data/art/pathable.png", 32, 32, true);
     return CR_OK;
 }
 
@@ -28,7 +44,7 @@ DFhackCExport command_result plugin_shutdown(color_ostream &out) {
     return CR_OK;
 }
 
-static void paintScreen(df::coord target, bool skip_unrevealed = false) {
+static void paintScreenPathable(df::coord target, bool show_hidden = false) {
     DEBUG(log).print("entering paintScreen\n");
 
     bool use_graphics = Screen::inGraphicsMode();
@@ -36,6 +52,14 @@ static void paintScreen(df::coord target, bool skip_unrevealed = false) {
     int selected_tile_texpos = 0;
     Screen::findGraphicsTile("CURSORS", 4, 3, &selected_tile_texpos);
 
+    long pathable_tile_texpos = init->load_bar_texpos[1];
+    long unpathable_tile_texpos = init->load_bar_texpos[4];
+    long on_off_texpos = Textures::getTexposByHandle(textures[0]);
+    if (on_off_texpos > 0) {
+        pathable_tile_texpos = on_off_texpos;
+        unpathable_tile_texpos = Textures::getTexposByHandle(textures[1]);
+    }
+
     auto dims = Gui::getDwarfmodeViewDims().map();
     for (int y = dims.first.y; y <= dims.second.y; ++y) {
         for (int x = dims.first.x; x <= dims.second.x; ++x) {
@@ -50,7 +74,7 @@ static void paintScreen(df::coord target, bool skip_unrevealed = false) {
                 continue;
             }
 
-            if (skip_unrevealed && !Maps::isTileVisible(map_pos)) {
+            if (!show_hidden && !Maps::isTileVisible(map_pos)) {
                 TRACE(log).print("skipping hidden tile\n");
                 continue;
             }
@@ -75,7 +99,8 @@ static void paintScreen(df::coord target, bool skip_unrevealed = false) {
                 if (map_pos == target) {
                     cur_tile.tile = selected_tile_texpos;
                 } else{
-                    cur_tile.tile = can_walk ? 779 : 782;
+                    cur_tile.tile = can_walk ?
+                            pathable_tile_texpos : unpathable_tile_texpos;
                 }
             } else {
                 int color = can_walk ? COLOR_GREEN : COLOR_RED;
@@ -98,7 +123,314 @@ static void paintScreen(df::coord target, bool skip_unrevealed = false) {
     }
 }
 
+static bool is_warm(const df::coord &pos) {
+    auto block = Maps::getTileBlock(pos);
+    if (!block)
+        return false;
+    return block->temperature_1[pos.x&15][pos.y&15] >= 10075;
+}
+
+static bool is_rough_wall(int16_t x, int16_t y, int16_t z) {
+    df::tiletype *tt = Maps::getTileType(x, y, z);
+    if (!tt)
+        return false;
+
+    return tileShape(*tt) == df::tiletype_shape::WALL &&
+        tileSpecial(*tt) != df::tiletype_special::SMOOTH;
+}
+
+static bool will_leak(int16_t x, int16_t y, int16_t z) {
+    auto des = Maps::getTileDesignation(x, y, z);
+    if (!des)
+        return false;
+    if (des->bits.liquid_type == df::tile_liquid::Water && des->bits.flow_size >= 1)
+        return true;
+    if (des->bits.water_table && is_rough_wall(x, y, z))
+        return true;
+    return false;
+}
+
+static bool is_damp(const df::coord &pos) {
+    return will_leak(pos.x-1, pos.y-1, pos.z) ||
+        will_leak(pos.x, pos.y-1, pos.z) ||
+        will_leak(pos.x+1, pos.y-1, pos.z) ||
+        will_leak(pos.x-1, pos.y, pos.z) ||
+        will_leak(pos.x+1, pos.y, pos.z) ||
+        will_leak(pos.x-1, pos.y+1, pos.z) ||
+        will_leak(pos.x, pos.y+1, pos.z) ||
+        will_leak(pos.x+1, pos.y+1, pos.z);
+        will_leak(pos.x, pos.y+1, pos.z+1);
+}
+
+static void paintScreenWarmDamp(bool show_hidden = false) {
+    DEBUG(log).print("entering paintScreenDampWarm\n");
+
+    if (Screen::inGraphicsMode())
+        return;
+
+    auto dims = Gui::getDwarfmodeViewDims().map();
+    for (int y = dims.first.y; y <= dims.second.y; ++y) {
+        for (int x = dims.first.x; x <= dims.second.x; ++x) {
+            df::coord map_pos(*window_x + x, *window_y + y, *window_z);
+
+            if (!Maps::isValidTilePos(map_pos))
+                continue;
+
+            if (!show_hidden && !Maps::isTileVisible(map_pos)) {
+                TRACE(log).print("skipping hidden tile\n");
+                continue;
+            }
+
+            TRACE(log).print("scanning map tile at (%d, %d, %d) screen offset (%d, %d)\n",
+                map_pos.x, map_pos.y, map_pos.z, x, y);
+
+            Screen::Pen cur_tile = Screen::readTile(x, y, true);
+            if (!cur_tile.valid()) {
+                DEBUG(log).print("cannot read tile at offset %d, %d\n", x, y);
+                continue;
+            }
+
+            int color = is_warm(map_pos) ? COLOR_RED : is_damp(map_pos) ? COLOR_BLUE : COLOR_BLACK;
+            if (color == COLOR_BLACK) {
+                TRACE(log).print("skipping non-warm, non-damp tile\n");
+                continue;
+            }
+
+            // this will also change the color of the cursor or any selection box that overlaps
+            // the tile. this is intentional since it makes the UI more readable
+            if (cur_tile.fg && cur_tile.ch != ' ') {
+                cur_tile.fg = color;
+                cur_tile.bg = 0;
+            } else {
+                cur_tile.fg = 0;
+                cur_tile.bg = color;
+            }
+
+            cur_tile.bold = false;
+
+            if (cur_tile.tile)
+                cur_tile.tile_mode = Screen::Pen::CharColor;
+
+            Screen::paintTile(cur_tile, x, y, true);
+        }
+    }
+}
+
+struct designation{
+    df::coord pos;
+    df::tile_designation td;
+    df::tile_occupancy to;
+    designation() = default;
+    designation(const df::coord &c, const df::tile_designation &td, const df::tile_occupancy &to) : pos(c), td(td), to(to) {}
+
+    bool operator==(const designation &rhs) const {
+        return pos == rhs.pos;
+    }
+
+    bool operator!=(const designation &rhs) const {
+        return !(rhs == *this);
+    }
+};
+
+namespace std {
+    template<>
+    struct hash<designation> {
+        std::size_t operator()(const designation &c) const {
+            std::hash<df::coord> hash_coord;
+            return hash_coord(c.pos);
+        }
+    };
+}
+
+class Designations {
+private:
+    std::unordered_map<df::coord, designation> designations;
+public:
+    Designations() {
+        df::job_list_link *link = world->jobs.list.next;
+        for (; link; link = link->next) {
+            df::job *job = link->item;
+
+            if(!job || !Maps::isValidTilePos(job->pos))
+                continue;
+
+            df::tile_designation td;
+            df::tile_occupancy to;
+            bool keep_if_taken = false;
+
+            switch (job->job_type) {
+                case df::job_type::SmoothWall:
+                case df::job_type::SmoothFloor:
+                    keep_if_taken = true;
+                    // fallthrough
+                case df::job_type::CarveFortification:
+                    td.bits.smooth = 1;
+                    break;
+                case df::job_type::DetailWall:
+                case df::job_type::DetailFloor:
+                    td.bits.smooth = 2;
+                    break;
+                case job_type::CarveTrack:
+                    to.bits.carve_track_north = (job->item_category.whole >> 18) & 1;
+                    to.bits.carve_track_south = (job->item_category.whole >> 19) & 1;
+                    to.bits.carve_track_west = (job->item_category.whole >> 20) & 1;
+                    to.bits.carve_track_east = (job->item_category.whole >> 21) & 1;
+                    break;
+                default:
+                    continue;
+            }
+            if (keep_if_taken || !Job::getWorker(job))
+                designations.emplace(job->pos, designation(job->pos, td, to));
+        }
+    }
+
+    // get from job; if no job, then fall back to querying map
+    designation get(const df::coord &pos) const {
+        if (designations.count(pos)) {
+            return designations.at(pos);
+        }
+        auto pdes = Maps::getTileDesignation(pos);
+        auto pocc = Maps::getTileOccupancy(pos);
+        if (!pdes || !pocc)
+            return {};
+        return designation(pos, *pdes, *pocc);
+    }
+};
+
+static bool is_designated_for_smoothing(const designation &designation) {
+    return designation.td.bits.smooth == 1;
+}
+
+static bool is_designated_for_engraving(const designation &designation) {
+    return designation.td.bits.smooth == 2;
+}
+
+static bool is_designated_for_track_carving(const designation &designation) {
+    const df::tile_occupancy &occ = designation.to;
+    return occ.bits.carve_track_east || occ.bits.carve_track_north || occ.bits.carve_track_south || occ.bits.carve_track_west;
+}
+
+static char get_track_char(const designation &designation) {
+    const df::tile_occupancy &occ = designation.to;
+    if (occ.bits.carve_track_east && occ.bits.carve_track_north && occ.bits.carve_track_south && occ.bits.carve_track_west)
+        return (char)0xCE; // NSEW
+    if (occ.bits.carve_track_east && occ.bits.carve_track_north && occ.bits.carve_track_south)
+        return (char)0xCC; // NSE
+    if (occ.bits.carve_track_east && occ.bits.carve_track_north && occ.bits.carve_track_west)
+        return (char)0xCA; // NEW
+    if (occ.bits.carve_track_east && occ.bits.carve_track_south && occ.bits.carve_track_west)
+        return (char)0xCB; // SEW
+    if (occ.bits.carve_track_north && occ.bits.carve_track_south && occ.bits.carve_track_west)
+        return (char)0xB9; // NSW
+    if (occ.bits.carve_track_north && occ.bits.carve_track_south)
+        return (char)0xBA; // NS
+    if (occ.bits.carve_track_east && occ.bits.carve_track_west)
+        return (char)0xCD; // EW
+    if (occ.bits.carve_track_east && occ.bits.carve_track_north)
+        return (char)0xC8; // NE
+    if (occ.bits.carve_track_north && occ.bits.carve_track_west)
+        return (char)0xBC; // NW
+    if (occ.bits.carve_track_east && occ.bits.carve_track_south)
+        return (char)0xC9; // SE
+    if (occ.bits.carve_track_south && occ.bits.carve_track_west)
+        return (char)0xBB; // SW
+    if (occ.bits.carve_track_north)
+        return (char)0xD0; // N
+    if (occ.bits.carve_track_south)
+        return (char)0xD2; // S
+    if (occ.bits.carve_track_east)
+        return (char)0xC6; // E
+    if (occ.bits.carve_track_west)
+        return (char)0xB5; // W
+    return (char)0xC5; // single line cross; should never happen
+}
+
+static bool is_smooth_wall(const df::coord &pos) {
+    df::tiletype *tt = Maps::getTileType(pos);
+    return tt && tileSpecial(*tt) == df::tiletype_special::SMOOTH
+                && tileShape(*tt) == df::tiletype_shape::WALL;
+}
+
+static bool blink(int delay) {
+    return (Core::getInstance().p->getTickCount()/delay) % 2 == 0;
+}
+
+static char get_tile_char(const df::coord &pos, char desig_char, bool draw_priority) {
+    if (!draw_priority)
+        return desig_char;
+
+    std::vector<df::block_square_event_designation_priorityst *> priorities;
+    Maps::SortBlockEvents(Maps::getTileBlock(pos), NULL, NULL, NULL, NULL, NULL, NULL, NULL, &priorities);
+    if (priorities.empty())
+        return desig_char;
+    switch (priorities[0]->priority[pos.x % 16][pos.y % 16] / 1000) {
+    case 1: return '1';
+    case 2: return '2';
+    case 3: return '3';
+    case 4: return '4';
+    case 5: return '5';
+    case 6: return '6';
+    case 7: return '7';
+    default:
+        return '4';
+    }
+}
+
+static void paintScreenCarve() {
+    DEBUG(log).print("entering paintScreenCarve\n");
+
+    if (Screen::inGraphicsMode() || blink(500))
+        return;
+
+    Designations designations;
+    bool draw_priority = blink(1000);
+
+    auto dims = Gui::getDwarfmodeViewDims().map();
+    for (int y = dims.first.y; y <= dims.second.y; ++y) {
+        for (int x = dims.first.x; x <= dims.second.x; ++x) {
+            df::coord map_pos(*window_x + x, *window_y + y, *window_z);
+
+            if (!Maps::isValidTilePos(map_pos))
+                continue;
+
+            if (!Maps::isTileVisible(map_pos)) {
+                TRACE(log).print("skipping hidden tile\n");
+                continue;
+            }
+
+            TRACE(log).print("scanning map tile at (%d, %d, %d) screen offset (%d, %d)\n",
+                map_pos.x, map_pos.y, map_pos.z, x, y);
+
+            Screen::Pen cur_tile;
+            cur_tile.fg = COLOR_DARKGREY;
+
+            auto des = designations.get(map_pos);
+
+            if (is_designated_for_smoothing(des)) {
+                if (is_smooth_wall(map_pos))
+                    cur_tile.ch = get_tile_char(map_pos, (char)206, draw_priority); // hash, indicating a fortification designation
+                else
+                    cur_tile.ch = get_tile_char(map_pos, (char)219, draw_priority); // solid block, indicating a smoothing designation
+            }
+            else if (is_designated_for_engraving(des)) {
+                cur_tile.ch = get_tile_char(map_pos, (char)10, draw_priority); // solid block with a circle on it
+            }
+            else if (is_designated_for_track_carving(des)) {
+                cur_tile.ch = get_tile_char(map_pos, get_track_char(des), draw_priority); // directional track
+            }
+            else {
+                TRACE(log).print("skipping tile with no carving designation\n");
+                continue;
+            }
+
+            Screen::paintTile(cur_tile, x, y, true);
+        }
+    }
+}
+
 DFHACK_PLUGIN_LUA_FUNCTIONS {
-    DFHACK_LUA_FUNCTION(paintScreen),
+    DFHACK_LUA_FUNCTION(paintScreenPathable),
+    DFHACK_LUA_FUNCTION(paintScreenWarmDamp),
+    DFHACK_LUA_FUNCTION(paintScreenCarve),
     DFHACK_LUA_END
 };
diff --git a/plugins/power-meter.cpp b/plugins/power-meter.cpp
index c61c3c8ee..f5f4ac63f 100644
--- a/plugins/power-meter.cpp
+++ b/plugins/power-meter.cpp
@@ -29,8 +29,8 @@
 #include "df/machine_info.h"
 #include "df/report.h"
 #include "df/tile_designation.h"
-#include "df/ui.h"
-#include "df/ui_build_selector.h"
+#include "df/plotinfost.h"
+#include "df/buildreq.h"
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/world.h"
 
@@ -43,7 +43,7 @@ using namespace df::enums;
 DFHACK_PLUGIN("power-meter");
 REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(ui_build_selector);
 
 static const uint32_t METER_BIT = 0x80000000U;
diff --git a/plugins/preserve-tombs.cpp b/plugins/preserve-tombs.cpp
new file mode 100644
index 000000000..be560e1ce
--- /dev/null
+++ b/plugins/preserve-tombs.cpp
@@ -0,0 +1,287 @@
+#include "Debug.h"
+#include "PluginManager.h"
+#include "MiscUtils.h"
+
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <algorithm>
+#include <utility>
+#include <cstdint>
+
+#include "modules/Units.h"
+#include "modules/Buildings.h"
+#include "modules/Persistence.h"
+#include "modules/EventManager.h"
+#include "modules/World.h"
+#include "modules/Translation.h"
+
+#include "df/world.h"
+#include "df/unit.h"
+#include "df/building.h"
+#include "df/building_civzonest.h"
+
+using namespace DFHack;
+using namespace df::enums;
+
+
+// <BOILERPLATE>
+DFHACK_PLUGIN("preserve-tombs");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
+REQUIRE_GLOBAL(world);
+
+
+static const std::string CONFIG_KEY = std::string(plugin_name) + "/config";
+static PersistentDataItem config;
+
+static int32_t cycle_timestamp;
+static constexpr int32_t cycle_freq = 100;
+
+enum ConfigValues {
+    CONFIG_IS_ENABLED = 0,
+};
+
+static std::unordered_map<int32_t, int32_t> tomb_assignments;
+
+namespace DFHack {
+    DBG_DECLARE(preservetombs, config, DebugCategory::LINFO);
+    DBG_DECLARE(preservetombs, cycle, DebugCategory::LINFO);
+    DBG_DECLARE(preservetombs, event, DebugCategory::LINFO);
+}
+
+
+static int get_config_val(PersistentDataItem &c, int index) {
+    if (!c.isValid())
+        return -1;
+    return c.ival(index);
+}
+static bool get_config_bool(PersistentDataItem &c, int index) {
+    return get_config_val(c, index) == 1;
+}
+static void set_config_val(PersistentDataItem &c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
+}
+static void set_config_bool(PersistentDataItem &c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
+}
+
+static bool assign_to_tomb(int32_t unit_id, int32_t building_id);
+static void update_tomb_assignments(color_ostream& out);
+void onUnitDeath(color_ostream& out, void* ptr);
+static command_result do_command(color_ostream& out, std::vector<std::string>& params);
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Preserve tomb assignments when assigned units die.",
+        do_command));
+    return CR_OK;
+}
+
+static command_result do_command(color_ostream& out, std::vector<std::string>& params) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot use %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+    if (params.size() == 0 || params[0] == "status") {
+        out.print("%s is currently %s\n", plugin_name, is_enabled ? "enabled" : "disabled");
+        if (is_enabled) {
+            out.print("tracked tomb assignments:\n");
+            std::for_each(tomb_assignments.begin(), tomb_assignments.end(), [&out](const auto& p){
+                auto& [unit_id, building_id] = p;
+                auto* unit = df::unit::find(unit_id);
+                std::string name = unit ? Translation::TranslateName(&unit->name) : "UNKNOWN UNIT" ;
+                out.print("%s (id %d) -> building %d\n", name.c_str(), unit_id, building_id);
+            });
+        }
+        return CR_OK;
+    }
+    if (params[0] == "now") {
+        if (!is_enabled) {
+            out.printerr("Cannot update %s when not enabled", plugin_name);
+            return CR_FAILURE;
+        }
+        CoreSuspender suspend;
+        update_tomb_assignments(out);
+        out.print("Updated tomb assignments\n");
+        return CR_OK;
+    }
+    return CR_WRONG_USAGE;
+}
+
+// event listener
+EventManager::EventHandler assign_tomb_handler(onUnitDeath, 0);
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(config,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        if (enable) {
+            EventManager::registerListener(EventManager::EventType::UNIT_DEATH, assign_tomb_handler, plugin_self);
+            update_tomb_assignments(out);
+        }
+        else {
+            tomb_assignments.clear();
+            EventManager::unregisterAll(plugin_self);
+        }
+    } else {
+        DEBUG(config,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(config,out).print("shutting down %s\n", plugin_name);
+
+// PluginManager handles unregistering our handler from EventManager,
+// so we don't have to do that here
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
+    config = World::GetPersistentData(CONFIG_KEY);
+
+    if (!config.isValid()) {
+        DEBUG(config,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+    }
+
+    is_enabled = get_config_bool(config, CONFIG_IS_ENABLED);
+    DEBUG(config,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        tomb_assignments.clear();
+        if (is_enabled) {
+            DEBUG(config,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
+        }
+        EventManager::unregisterAll(plugin_self);
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && world->frame_counter - cycle_timestamp >= cycle_freq)
+        update_tomb_assignments(out);
+    return CR_OK;
+}
+// </BOILERPLATE>
+
+
+
+
+// On unit death - check if we assigned them a tomb
+//
+//
+void onUnitDeath(color_ostream& out, void* ptr) {
+    // input is void* that contains the unit id
+    int32_t unit_id = reinterpret_cast<std::intptr_t>(ptr);
+
+    // check if unit was assigned a tomb in life
+    auto it = tomb_assignments.find(unit_id);
+    if (it == tomb_assignments.end()) return;
+
+    // assign that unit to their previously assigned tomb in life
+    int32_t building_id = it->second;
+    if (!assign_to_tomb(unit_id, building_id)) {
+        WARN(event, out).print("Unit %d died - but failed to assign them back to their tomb %d\n", unit_id, building_id);
+        return;
+    }
+    // success, print status update and remove assignment from our memo-list
+    INFO(event, out).print("Unit %d died - assigning them back to their tomb\n", unit_id);
+    tomb_assignments.erase(it);
+
+}
+
+
+// Update tomb assignments
+//
+//
+static void update_tomb_assignments(color_ostream &out) {
+    cycle_timestamp = world->frame_counter;
+    // check tomb civzones for assigned units
+    for (auto* bld : world->buildings.other.ZONE_TOMB) {
+
+        auto* tomb = virtual_cast<df::building_civzonest>(bld);
+        if (!tomb || !tomb->flags.bits.exists) continue;
+        if (!tomb->assigned_unit) continue;
+        if (Units::isDead(tomb->assigned_unit)) continue; // we only care about living units
+
+        auto it = tomb_assignments.find(tomb->assigned_unit_id);
+
+        if (it == tomb_assignments.end()) {
+            tomb_assignments.emplace(tomb->assigned_unit_id, tomb->id);
+            DEBUG(cycle, out).print("%s new tomb assignment, unit %d to tomb %d\n",
+                                    plugin_name, tomb->assigned_unit_id, tomb->id);
+        }
+
+        else if (it->second != tomb->id) {
+            DEBUG(cycle, out).print("%s tomb assignment to %d changed, (old: %d, new: %d)\n",
+                                    plugin_name, tomb->assigned_unit_id, it->second, tomb->id);
+            it->second = tomb->id;
+        }
+
+    }
+
+    // now check our civzones for unassignment / deleted zone
+    std::erase_if(tomb_assignments,[&](const auto& p){
+        auto &[unit_id, building_id] = p;
+
+        const int tomb_idx = binsearch_index(world->buildings.other.ZONE_TOMB, building_id);
+        if (tomb_idx == -1) {
+            DEBUG(cycle, out).print("%s tomb missing: %d - removing\n", plugin_name, building_id);
+            return true;
+        }
+        const auto tomb = virtual_cast<df::building_civzonest>(world->buildings.other.ZONE_TOMB[tomb_idx]);
+        if (!tomb || !tomb->flags.bits.exists) {
+            DEBUG(cycle, out).print("%s tomb missing: %d - removing\n", plugin_name, building_id);
+            return true;
+        }
+        if (tomb->assigned_unit_id != unit_id) {
+            DEBUG(cycle, out).print("%s unit %d unassigned from tomb %d - removing\n", plugin_name, unit_id, building_id);
+            return true;
+        }
+
+        return false;
+    });
+
+}
+
+
+// ASSIGN UNIT TO TOMB
+//
+//
+static bool assign_to_tomb(int32_t unit_id, int32_t building_id) {
+
+    df::unit* unit = df::unit::find(unit_id);
+
+    if (!unit || !Units::isDead(unit)) return false;
+
+    const int tomb_idx = binsearch_index(world->buildings.other.ZONE_TOMB, building_id);
+    if (tomb_idx == -1) return false;
+
+    df::building_civzonest* tomb = virtual_cast<df::building_civzonest>(world->buildings.other.ZONE_TOMB[tomb_idx]);
+    if (!tomb || tomb->assigned_unit) return false;
+
+    Buildings::setOwner(tomb, unit);
+    return true;
+}
diff --git a/plugins/probe.cpp b/plugins/probe.cpp
index 7781812b9..d55e4e135 100644
--- a/plugins/probe.cpp
+++ b/plugins/probe.cpp
@@ -477,8 +477,8 @@ command_result df_bprobe (color_ostream &out, vector <string> & parameters)
                 out.print(", subtype %i", building.subtype);
             break;
         }
-        if(building.origin->is_room)  //isRoom())
-            out << ", room";
+        if(building.origin->relations.size())  //Connected to rooms.
+            out << ", " << building.origin->relations.size() << " rooms";
         if(building.origin->getBuildStage()!=building.origin->getMaxBuildStage())
             out << ", in construction";
         out.print("\n");
diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp
index e75c967dc..3091f0703 100644
--- a/plugins/prospector.cpp
+++ b/plugins/prospector.cpp
@@ -168,9 +168,11 @@ static void printMatdata(color_ostream &con, const matdata &data, bool only_z =
         con << std::setw(9) << int(data.count);
 
     if(data.lower_z != data.upper_z)
-        con <<"   Z:" << std::setw(4) << data.lower_z << ".." <<  data.upper_z << std::endl;
+        con <<"   Elev:" << std::setw(4) << (data.lower_z) << ".." << (data.upper_z)
+            << std::endl;
     else
-        con <<"   Z:" << std::setw(4) << data.lower_z << std::endl;
+        con <<"   Elev:" << std::setw(4) << (data.lower_z)
+            << std::endl;
 }
 
 static int getValue(const df::inorganic_raw &info)
@@ -565,22 +567,11 @@ static command_result embark_prospector(color_ostream &out,
                                         df::viewscreen_choose_start_sitest *screen,
                                         const prospect_options &options)
 {
-    if (!world || !world->world_data)
-    {
+    if (!world->world_data) {
         out.printerr("World data is not available.\n");
         return CR_FAILURE;
     }
 
-    df::world_data *data = world->world_data;
-    coord2d cur_region = screen->location.region_pos;
-    auto cur_details = get_details(data, cur_region);
-
-    if (!cur_details)
-    {
-        out.printerr("Current region details are not available.\n");
-        return CR_FAILURE;
-    }
-
     // Compute material maps
     MatMap layerMats;
     MatMap veinMats;
@@ -589,12 +580,18 @@ static command_result embark_prospector(color_ostream &out,
     // Compute biomes
     std::map<coord2d, int> biomes;
 
-    for (int x = screen->location.embark_pos_min.x; x <= 15 && x <= screen->location.embark_pos_max.x; x++)
-    {
-        for (int y = screen->location.embark_pos_min.y; y <= 15 && y <= screen->location.embark_pos_max.y; y++)
-        {
+    int32_t max_x = (world->worldgen.worldgen_parms.dim_x * 16) - 1;
+    int32_t max_y = (world->worldgen.worldgen_parms.dim_y * 16) - 1;
+
+    for (int x = screen->location.embark_pos_min.x; x <= max_x && x <= screen->location.embark_pos_max.x; ++x) {
+        for (int y = screen->location.embark_pos_min.y; y <= max_y && y <= screen->location.embark_pos_max.y; ++y) {
+            auto cur_details = get_details(world->world_data, coord2d(x / 16, y / 16));
+
+            if (!cur_details)
+                continue;
+
             EmbarkTileLayout tile;
-            if (!estimate_underground(out, tile, cur_details, x, y) ||
+            if (!estimate_underground(out, tile, cur_details, x % 16, y % 16) ||
                 !estimate_materials(out, tile, layerMats, veinMats))
                 return CR_FAILURE;
 
@@ -655,6 +652,9 @@ static command_result map_prospector(color_ostream &con,
 
     for(uint32_t z = 0; z < z_max; z++)
     {
+        // the '- 100' is because DF v50 and later have a 100 offset in reported elevation
+        int global_z = world->map.region_z + z - 100;
+
         for(uint32_t b_y = 0; b_y < y_max; b_y++)
         {
             for(uint32_t b_x = 0; b_x < x_max; b_x++)
@@ -671,8 +671,6 @@ static command_result map_prospector(color_ostream &con,
                 b->GetGlobalFeature(&blockFeatureGlobal);
                 b->GetLocalFeature(&blockFeatureLocal);
 
-                int global_z = world->map.region_z + z;
-
                 // Iterate over all the tiles in the block
                 for(uint32_t y = 0; y < 16; y++)
                 {
diff --git a/plugins/proto/isoworldremote.proto b/plugins/proto/isoworldremote.proto
index f53aa6aea..ebe5ef545 100644
--- a/plugins/proto/isoworldremote.proto
+++ b/plugins/proto/isoworldremote.proto
@@ -5,7 +5,7 @@ package isoworldremote;
 
 option optimize_for = LITE_RUNTIME;
 
-// Plugin: isoworldremote
+// DISABLED Plugin: isoworldremote
 
 enum BasicMaterial {
     AIR = 0;
@@ -54,7 +54,7 @@ message EmbarkTile {
     optional bool is_valid = 7;
 }
 
-// RPC GetEmbarkTile : TileRequest -> EmbarkTile
+// DISABLED RPC GetEmbarkTile : TileRequest -> EmbarkTile
 message TileRequest {
     optional int32 want_x = 1;
     optional int32 want_y = 2;
@@ -64,7 +64,7 @@ message MapRequest {
     optional string save_folder = 1;
 }
 
-// RPC GetEmbarkInfo : MapRequest -> MapReply
+// DISABLED RPC GetEmbarkInfo : MapRequest -> MapReply
 message MapReply {
     required bool available = 1;
     optional int32 region_x = 2;
@@ -75,7 +75,7 @@ message MapReply {
     optional int32 current_season = 7;
 }
 
-// RPC GetRawNames : MapRequest -> RawNames
+// DISABLED RPC GetRawNames : MapRequest -> RawNames
 message RawNames {
     required bool available = 1;
     repeated string inorganic = 2;
diff --git a/plugins/proto/rename.proto b/plugins/proto/rename.proto
index 4391ecc10..ef3f57423 100644
--- a/plugins/proto/rename.proto
+++ b/plugins/proto/rename.proto
@@ -4,9 +4,9 @@ package dfproto;
 
 option optimize_for = LITE_RUNTIME;
 
-// Plugin: rename
+// DISABLED Plugin: rename
 
-// RPC RenameSquad : RenameSquadIn -> EmptyMessage
+// DISABLED RPC RenameSquad : RenameSquadIn -> EmptyMessage
 message RenameSquadIn {
     required int32 squad_id = 1;
 
@@ -14,7 +14,7 @@ message RenameSquadIn {
     optional string alias = 3;
 }
 
-// RPC RenameUnit : RenameUnitIn -> EmptyMessage
+// DISABLED RPC RenameUnit : RenameUnitIn -> EmptyMessage
 message RenameUnitIn {
     required int32 unit_id = 1;
 
@@ -22,7 +22,7 @@ message RenameUnitIn {
     optional string profession = 3;
 }
 
-// RPC RenameBuilding : RenameBuildingIn -> EmptyMessage
+// DISABLED RPC RenameBuilding : RenameBuildingIn -> EmptyMessage
 message RenameBuildingIn {
     required int32 building_id = 1;
 
diff --git a/plugins/remotefortressreader/CMakeLists.txt b/plugins/remotefortressreader/CMakeLists.txt
index 55525bc21..37aa64b23 100644
--- a/plugins/remotefortressreader/CMakeLists.txt
+++ b/plugins/remotefortressreader/CMakeLists.txt
@@ -24,23 +24,9 @@ set(PROJECT_PROTO
     ui_sidebar_mode
 )
 
-set(PLUGIN_PROTOS)
-foreach(pbuf ${PROJECT_PROTO})
-    list(APPEND PLUGIN_PROTOS ${CMAKE_CURRENT_SOURCE_DIR}/../proto/${pbuf}.proto)
-endforeach()
-
-string(REPLACE ".proto" ".pb.cc" PLUGIN_PROTO_SRCS "${PLUGIN_PROTOS}")
-string(REPLACE ".proto" ".pb.h" PLUGIN_PROTO_HDRS "${PLUGIN_PROTOS}")
-set_source_files_properties(${PLUGIN_PROTO_SRCS} ${PLUGIN_PROTO_HDRS} PROPERTIES GENERATED TRUE)
-
-set_source_files_properties( ${PROJECT_HDRS} ${PLUGIN_PROTO_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
-
-# mash them together (headers are marked as headers and nothing will try to compile them)
-list(APPEND PROJECT_SRCS ${PROJECT_HDRS} ${PLUGIN_PROTOS} ${PLUGIN_PROTO_SRCS} ${PLUGIN_PROTO_HDRS})
-
 if(UNIX AND NOT APPLE)
-    set(PROJECT_LIBS ${PROJECT_LIBS} SDL)
+    set(PROJECT_LIBS ${PROJECT_LIBS})
 endif()
 
 # this makes sure all the stuff is put in proper places and linked to dfhack
-dfhack_plugin(RemoteFortressReader ${PROJECT_SRCS} LINK_LIBRARIES protobuf-lite ${PROJECT_LIBS} COMPILE_FLAGS_MSVC "/FI\"Export.h\"" COMPILE_FLAGS_GCC "-include Export.h -Wno-misleading-indentation" )
+dfhack_plugin(RemoteFortressReader ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS} PROTOBUFS ${PROJECT_PROTO})
diff --git a/plugins/remotefortressreader/adventure_control.cpp b/plugins/remotefortressreader/adventure_control.cpp
index 6fb592d62..0d2e97f68 100644
--- a/plugins/remotefortressreader/adventure_control.cpp
+++ b/plugins/remotefortressreader/adventure_control.cpp
@@ -7,7 +7,7 @@
 #include "df/adventure_movement_hold_itemst.h"
 #include "df/adventure_movement_hold_tilest.h"
 #include "df/adventure_movement_optionst.h"
-#include "df/ui_advmode.h"
+#include "df/adventurest.h"
 #include "df/viewscreen.h"
 
 #include "modules/Gui.h"
@@ -39,10 +39,11 @@ void SetCoord(df::coord in, RemoteFortressReader::Coord *out)
 
 command_result MoveCommand(DFHack::color_ostream &stream, const MoveCommandParams *in)
 {
+/* Removed for v50 which has no adventure mode.
     auto viewScreen = getCurViewscreen();
     if (!in->has_direction())
         return CR_WRONG_USAGE;
-    if (!df::global::ui_advmode->menu == ui_advmode_menu::Default)
+    if (!df::global::adventure->menu == ui_advmode_menu::Default)
         return CR_OK;
     auto dir = in->direction();
     switch (dir.x())
@@ -186,14 +187,15 @@ command_result MoveCommand(DFHack::color_ostream &stream, const MoveCommandParam
         }
         break;
     }
-    return CR_OK;
+*/    return CR_OK;
 }
 
 command_result JumpCommand(DFHack::color_ostream &stream, const MoveCommandParams *in)
 {
-    if (!in->has_direction())
+/* Removed for v50 which has no adventure mode.
+        if (!in->has_direction())
         return CR_WRONG_USAGE;
-    if (!df::global::ui_advmode->menu == ui_advmode_menu::Default)
+    if (!df::global::adventure->menu == ui_advmode_menu::Default)
         return CR_OK;
     auto dir = in->direction();
     keyQueue.push(interface_key::A_JUMP);
@@ -228,12 +230,14 @@ command_result JumpCommand(DFHack::color_ostream &stream, const MoveCommandParam
         }
     }
     keyQueue.push(interface_key::SELECT);
+*/
     return CR_OK;
 }
 
 command_result MenuQuery(DFHack::color_ostream &stream, const EmptyMessage *in, MenuContents *out)
 {
-    auto advUi = df::global::ui_advmode;
+/* Removed for v50 which has no adventure mode.
+        auto advUi = df::global::adventure;
 
     if (advUi == NULL)
         return CR_FAILURE;
@@ -272,13 +276,14 @@ command_result MenuQuery(DFHack::color_ostream &stream, const EmptyMessage *in,
     default:
         break;
     }
-
+*/
     return CR_OK;
 }
 
 command_result MovementSelectCommand(DFHack::color_ostream &stream, const dfproto::IntMessage *in)
 {
-    if (!(df::global::ui_advmode->menu == ui_advmode_menu::MoveCarefully))
+    /* Removed for v50 which has no adventure mode.
+    if (!(df::global::adventure->menu == ui_advmode_menu::MoveCarefully))
         return CR_OK;
     int choice = in->value();
     int page = choice / 5;
@@ -288,12 +293,14 @@ command_result MovementSelectCommand(DFHack::color_ostream &stream, const dfprot
         keyQueue.push(interface_key::SECONDSCROLL_PAGEDOWN);
     }
     keyQueue.push((interface_key::interface_key)(interface_key::OPTION1 + select));
+*/
     return CR_OK;
 }
 
 command_result MiscMoveCommand(DFHack::color_ostream &stream, const MiscMoveParams *in)
 {
-    if (!df::global::ui_advmode->menu == ui_advmode_menu::Default)
+    /* Removed for v50 which has no adventure mode.
+        if (!df::global::adventure->menu == ui_advmode_menu::Default)
         return CR_OK;
 
     auto type = in->type();
@@ -312,6 +319,6 @@ command_result MiscMoveCommand(DFHack::color_ostream &stream, const MiscMovePara
     default:
         break;
     }
-
+*/
     return CR_OK;
 }
diff --git a/plugins/remotefortressreader/building_reader.cpp b/plugins/remotefortressreader/building_reader.cpp
index a4300159e..7cc715147 100644
--- a/plugins/remotefortressreader/building_reader.cpp
+++ b/plugins/remotefortressreader/building_reader.cpp
@@ -316,7 +316,6 @@ void CopyBuilding(int buildingIndex, RemoteFortressReader::BuildingInstance * re
     material->set_mat_index(local_build->mat_index);
 
     remote_build->set_building_flags(local_build->flags.whole);
-    remote_build->set_is_room(local_build->is_room);
     if (local_build->room.width > 0 && local_build->room.height > 0 && local_build->room.extents != nullptr)
     {
         auto room = remote_build->mutable_room();
@@ -607,25 +606,27 @@ void CopyBuilding(int buildingIndex, RemoteFortressReader::BuildingInstance * re
     }
     case df::enums::building_type::ArcheryTarget:
     {
+        //FIXME: Need to decode archery targets again.
         auto actual = strict_virtual_cast<df::building_archerytargetst>(local_build);
         if (actual)
         {
-            auto facing = actual->archery_direction;
-            switch (facing)
+            for (size_t i = 0; i < actual->relations.size(); i++)
             {
-            case df::building_archerytargetst::TopToBottom:
-                remote_build->set_direction(NORTH);
-                break;
-            case df::building_archerytargetst::BottomToTop:
-                remote_build->set_direction(SOUTH);
-                break;
-            case df::building_archerytargetst::LeftToRight:
-                remote_build->set_direction(WEST);
-                break;
-            case df::building_archerytargetst::RightToLeft:
-                remote_build->set_direction(EAST);
-                break;
-            default:
+                if (actual->relations[i]->getType() != df::enums::building_type::Civzone)
+                    continue;
+                auto zone = strict_virtual_cast<df::building_civzonest>(actual->relations[i]);
+                if (!zone)
+                    continue;
+                if (zone->type != df::civzone_type::ArcheryRange)
+                    continue;
+                if(zone->zone_settings.archery.dir_x < 0)
+                    remote_build->set_direction(EAST);
+                else if(zone->zone_settings.archery.dir_x > 0)
+                    remote_build->set_direction(WEST);
+                else if (zone->zone_settings.archery.dir_y < 0)
+                    remote_build->set_direction(SOUTH);
+                else if (zone->zone_settings.archery.dir_y > 0)
+                    remote_build->set_direction(NORTH);
                 break;
             }
         }
@@ -849,7 +850,6 @@ void CopyBuilding(int buildingIndex, RemoteFortressReader::BuildingInstance * re
         auto actual = strict_virtual_cast<df::building_windmillst>(local_build);
         if (actual)
         {
-#if DF_VERSION_INT > 34011
             if (actual->orient_x < 0)
                 remote_build->set_direction(WEST);
             else if (actual->orient_x > 0)
@@ -859,7 +859,6 @@ void CopyBuilding(int buildingIndex, RemoteFortressReader::BuildingInstance * re
             else if (actual->orient_y > 0)
                 remote_build->set_direction(SOUTH);
             else
-#endif
                 remote_build->set_direction(WEST);
             if (actual->machine.machine_id >= 0)
             {
diff --git a/plugins/remotefortressreader/dwarf_control.cpp b/plugins/remotefortressreader/dwarf_control.cpp
index 3a5933464..a96cbdc04 100644
--- a/plugins/remotefortressreader/dwarf_control.cpp
+++ b/plugins/remotefortressreader/dwarf_control.cpp
@@ -1,3 +1,4 @@
+
 #include "dwarf_control.h"
 #include "DataDefs.h"
 #include "df_version_int.h"
@@ -10,11 +11,9 @@
 #include "df/building_def_workshopst.h"
 #include "df/job.h"
 #include "df/job_list_link.h"
-#include "df/interface_button_construction_building_selectorst.h"
-#include "df/interface_button_construction_category_selectorst.h"
-#include "df/ui.h"
-#include "df/ui_build_selector.h"
-#include "df/ui_sidebar_menus.h"
+#include "df/plotinfost.h"
+#include "df/buildreq.h"
+#include "df/gamest.h"
 #include "df/viewscreen.h"
 #include "df/world.h"
 
@@ -233,7 +232,8 @@ command_result SetPauseState(color_ostream &stream, const SingleBool *in)
 
 void CopyBuildMenu(DwarfControl::SidebarState * out)
 {
-    auto menus = df::global::ui_sidebar_menus;
+    /* Removed in v50 because the new menu is completely changed and we may not even want to do it the same way anymore.
+    auto menus = df::global::game;
     auto build_selector = df::global::ui_build_selector;
     if (build_selector->building_type == -1)
         for (size_t i = 0; i < menus->building.choices_visible.size(); i++)
@@ -299,13 +299,15 @@ void CopyBuildMenu(DwarfControl::SidebarState * out)
                 send_selector->add_tiles(build_selector->tiles[x][y]);
             }
     }
+    */
 }
 
 command_result GetSideMenu(DFHack::color_ostream &stream, const dfproto::EmptyMessage *in, DwarfControl::SidebarState *out)
 {
-    auto ui = df::global::ui;
-    out->set_mode((proto::enums::ui_sidebar_mode::ui_sidebar_mode)ui->main.mode);
-    auto mode = ui->main.mode;
+    /* Removed in v50 because the new menu is completely changed and we may not even want to do it the same way anymore.
+    auto plotinfo = df::global::plotinfo;
+    out->set_mode((proto::enums::ui_sidebar_mode::ui_sidebar_mode)plotinfo->main.mode);
+    auto mode = plotinfo->main.mode;
     switch (mode)
     {
     case ui_sidebar_mode::Default:
@@ -422,30 +424,32 @@ command_result GetSideMenu(DFHack::color_ostream &stream, const dfproto::EmptyMe
     default:
         break;
     }
+    */
     return CR_OK;
 }
 
 command_result SetSideMenu(DFHack::color_ostream &stream, const DwarfControl::SidebarCommand *in)
 {
-    auto ui = df::global::ui;
+    /* Removed in v50 because the new menu is completely changed and we may not even want to do it the same way anymore.
+    auto plotinfo = df::global::plotinfo;
     if (in->has_mode())
     {
         ui_sidebar_mode::ui_sidebar_mode set_mode = (ui_sidebar_mode::ui_sidebar_mode)in->mode();
-        if (ui->main.mode != set_mode)
+        if (plotinfo->main.mode != set_mode)
         {
-            ui->main.mode = ui_sidebar_mode::Default;
+            plotinfo->main.mode = ui_sidebar_mode::Default;
             switch (set_mode)
             {
             case ui_sidebar_mode::Build:
                 keyQueue.push(interface_key::D_BUILDING);
                 break;
             default:
-                ui->main.mode = set_mode;
+                plotinfo->main.mode = set_mode;
                 break;
             }
         }
     }
-    switch (ui->main.mode)
+    switch (plotinfo->main.mode)
     {
     case ui_sidebar_mode::Build:
         if (in->has_action())
@@ -454,7 +458,7 @@ command_result SetSideMenu(DFHack::color_ostream &stream, const DwarfControl::Si
             if (in->has_menu_index())
                 index = in->menu_index();
             if(ui_build_selector->building_type == -1)
-                df::global::ui_sidebar_menus->building.cursor = index;
+                df::global::game->building.cursor = index;
             if (ui_build_selector->stage == 2)
             {
                 ui_build_selector->sel_index = index;
@@ -489,5 +493,6 @@ command_result SetSideMenu(DFHack::color_ostream &stream, const DwarfControl::Si
             break;
         }
     }
+    */
     return CR_OK;
 }
diff --git a/plugins/remotefortressreader/item_reader.cpp b/plugins/remotefortressreader/item_reader.cpp
index 56ec9019b..9bcfcb781 100644
--- a/plugins/remotefortressreader/item_reader.cpp
+++ b/plugins/remotefortressreader/item_reader.cpp
@@ -248,7 +248,7 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem)
                     chunk = world->art_image_chunks[i];
             }
         }
-        if (chunk)
+        if (chunk && chunk->images[statue->image.subid])
         {
             CopyImage(chunk->images[statue->image.subid], NetItem->mutable_image());
         }
@@ -271,7 +271,8 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem)
     case df::enums::item_type::GLOVES:
         break;
     case df::enums::item_type::BOX:
-        type->set_mat_index(DfItem->isBag());
+        //FIXME: Figure out how things change with this. Possibly make sure the item types are mutable.
+        //type->set_mat_index(DfItem->isBag());
         break;
     case df::enums::item_type::BIN:
         break;
@@ -461,7 +462,10 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem)
             case df::enums::improvement_type::ART_IMAGE:
             {
                 VIRTUAL_CAST_VAR(artImage, df::itemimprovement_art_imagest, improvement);
-                CopyImage(artImage->getImage(DfItem), netImp->mutable_image());
+                auto image = artImage->getImage(DfItem);
+                if (image) {
+                    CopyImage(image, netImp->mutable_image());
+                }
                 break;
             }
             case df::enums::improvement_type::COVERED:
diff --git a/plugins/remotefortressreader/proto/.gitignore b/plugins/remotefortressreader/proto/.gitignore
new file mode 100644
index 000000000..befabf79d
--- /dev/null
+++ b/plugins/remotefortressreader/proto/.gitignore
@@ -0,0 +1,3 @@
+*.pb.cc
+*.pb.cc.rule
+*.pb.h
diff --git a/plugins/proto/AdventureControl.proto b/plugins/remotefortressreader/proto/AdventureControl.proto
similarity index 100%
rename from plugins/proto/AdventureControl.proto
rename to plugins/remotefortressreader/proto/AdventureControl.proto
diff --git a/plugins/proto/DwarfControl.proto b/plugins/remotefortressreader/proto/DwarfControl.proto
similarity index 100%
rename from plugins/proto/DwarfControl.proto
rename to plugins/remotefortressreader/proto/DwarfControl.proto
diff --git a/plugins/proto/ItemdefInstrument.proto b/plugins/remotefortressreader/proto/ItemdefInstrument.proto
similarity index 100%
rename from plugins/proto/ItemdefInstrument.proto
rename to plugins/remotefortressreader/proto/ItemdefInstrument.proto
diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/remotefortressreader/proto/RemoteFortressReader.proto
similarity index 99%
rename from plugins/proto/RemoteFortressReader.proto
rename to plugins/remotefortressreader/proto/RemoteFortressReader.proto
index a64e64d0b..f341031dc 100644
--- a/plugins/proto/RemoteFortressReader.proto
+++ b/plugins/remotefortressreader/proto/RemoteFortressReader.proto
@@ -526,6 +526,7 @@ message BlockRequest
     optional int32 max_y = 5;
     optional int32 min_z = 6;
     optional int32 max_z = 7;
+    optional bool force_reload = 8;
 }
 
 message BlockList
diff --git a/plugins/proto/ui_sidebar_mode.proto b/plugins/remotefortressreader/proto/ui_sidebar_mode.proto
similarity index 100%
rename from plugins/proto/ui_sidebar_mode.proto
rename to plugins/remotefortressreader/proto/ui_sidebar_mode.proto
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index 643e92b21..1570a0e60 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -14,8 +14,6 @@
 #include "PluginManager.h"
 #include "RemoteFortressReader.pb.h"
 #include "RemoteServer.h"
-#include "SDL_events.h"
-#include "SDL_keyboard.h"
 #include "TileTypes.h"
 #include "VersionInfo.h"
 #if DF_VERSION_INT > 34011
@@ -27,6 +25,7 @@
 #include "modules/MapCache.h"
 #include "modules/Maps.h"
 #include "modules/Materials.h"
+#include "modules/DFSDL.h"
 #include "modules/Translation.h"
 #include "modules/Units.h"
 #include "modules/World.h"
@@ -75,7 +74,9 @@
 #include "df/ocean_wave.h"
 #include "df/physical_attribute_type.h"
 #include "df/plant.h"
+#include "df/plant_tree_tile.h"
 #include "df/plant_raw_flags.h"
+#include "df/plant_root_tile.h"
 #include "df/projectile.h"
 #include "df/proj_itemst.h"
 #include "df/proj_unitst.h"
@@ -89,7 +90,7 @@
 #endif
 #include "df/tissue.h"
 #include "df/tissue_style_raw.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/unit_inventory_item.h"
 #include "df/unit_wound.h"
@@ -123,10 +124,12 @@
 #include "dwarf_control.h"
 #include "item_reader.h"
 
+#include <SDL_events.h>
+#include <SDL_keyboard.h>
+
 using namespace DFHack;
 using namespace df::enums;
 using namespace RemoteFortressReader;
-using namespace std;
 
 DFHACK_PLUGIN("RemoteFortressReader");
 
@@ -135,9 +138,9 @@ using namespace df::global;
 #else
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(gamemode);
-REQUIRE_GLOBAL(ui_advmode);
+REQUIRE_GLOBAL(adventure);
 #endif
 
 // Here go all the command declarations...
@@ -189,7 +192,7 @@ const char* growth_locations[] = {
 #include "df/art_image.h"
 #include "df/art_image_chunk.h"
 #include "df/art_image_ref.h"
-command_result loadArtImageChunk(color_ostream &out, vector <string> & parameters)
+command_result loadArtImageChunk(color_ostream &out, std::vector<std::string> & parameters)
 {
     if (parameters.size() != 1)
         return CR_WRONG_USAGE;
@@ -210,7 +213,7 @@ command_result loadArtImageChunk(color_ostream &out, vector <string> & parameter
     return CR_OK;
 }
 
-command_result RemoteFortressReader_version(color_ostream &out, vector<string> &parameters)
+command_result RemoteFortressReader_version(color_ostream &out, std::vector<std::string> &parameters)
 {
     out.print(RFR_VERSION);
     return CR_OK;
@@ -319,14 +322,14 @@ uint16_t fletcher16(uint8_t const *data, size_t bytes)
 
 void ConvertDfColor(int16_t index, RemoteFortressReader::ColorDefinition * out)
 {
-    if (!df::global::enabler)
+    if (!df::global::gps)
         return;
 
-    auto enabler = df::global::enabler;
+    auto gps = df::global::gps;
 
-    out->set_red((int)(enabler->ccolor[index][0] * 255));
-    out->set_green((int)(enabler->ccolor[index][1] * 255));
-    out->set_blue((int)(enabler->ccolor[index][2] * 255));
+    out->set_red(gps->uccolor[index][0]);
+    out->set_green(gps->uccolor[index][1]);
+    out->set_blue(gps->uccolor[index][2]);
 }
 
 void ConvertDfColor(int16_t in[3], RemoteFortressReader::ColorDefinition * out)
@@ -641,7 +644,7 @@ void CopyMat(RemoteFortressReader::MatPair * mat, int type, int index)
 
 }
 
-map<DFCoord, uint16_t> hashes;
+std::map<DFCoord, uint16_t> hashes;
 
 bool IsTiletypeChanged(DFCoord pos)
 {
@@ -659,7 +662,7 @@ bool IsTiletypeChanged(DFCoord pos)
     return false;
 }
 
-map<DFCoord, uint16_t> waterHashes;
+std::map<DFCoord, uint16_t> waterHashes;
 
 bool IsDesignationChanged(DFCoord pos)
 {
@@ -677,7 +680,7 @@ bool IsDesignationChanged(DFCoord pos)
     return false;
 }
 
-map<DFCoord, uint8_t> buildingHashes;
+std::map<DFCoord, uint8_t> buildingHashes;
 
 bool IsBuildingChanged(DFCoord pos)
 {
@@ -696,7 +699,7 @@ bool IsBuildingChanged(DFCoord pos)
     return changed;
 }
 
-map<DFCoord, uint16_t> spatterHashes;
+std::map<DFCoord, uint16_t> spatterHashes;
 
 bool IsspatterChanged(DFCoord pos)
 {
@@ -733,7 +736,7 @@ bool IsspatterChanged(DFCoord pos)
     return false;
 }
 
-map<int, uint16_t> itemHashes;
+std::map<int, uint16_t> itemHashes;
 
 bool isItemChanged(int i)
 {
@@ -751,7 +754,7 @@ bool isItemChanged(int i)
     return false;
 }
 
-bool areItemsChanged(vector<int> * items)
+bool areItemsChanged(std::vector<int> * items)
 {
     bool result = false;
     for (size_t i = 0; i < items->size(); i++)
@@ -762,7 +765,7 @@ bool areItemsChanged(vector<int> * items)
     return result;
 }
 
-map<int, int> engravingHashes;
+std::map<int, int> engravingHashes;
 
 bool isEngravingNew(int index)
 {
@@ -805,8 +808,6 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
         return CR_OK;
     }
 
-
-
     df::world_raws *raws = &world->raws;
     // df::world_history *history = &world->history;
     MaterialInfo mat;
@@ -817,7 +818,7 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
         mat_def->mutable_mat_pair()->set_mat_type(0);
         mat_def->mutable_mat_pair()->set_mat_index(i);
         mat_def->set_id(mat.getToken());
-        mat_def->set_name(mat.toString()); //find the name at cave temperature;
+        mat_def->set_name(DF2UTF(mat.toString())); //find the name at cave temperature;
         if (size_t(raws->inorganics[i]->material.state_color[GetState(&raws->inorganics[i]->material)]) < raws->descriptors.colors.size())
         {
             ConvertDFColorDescriptor(raws->inorganics[i]->material.state_color[GetState(&raws->inorganics[i]->material)], mat_def->mutable_state_color());
@@ -835,7 +836,7 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
             mat_def->mutable_mat_pair()->set_mat_type(i);
             mat_def->mutable_mat_pair()->set_mat_index(j);
             mat_def->set_id(mat.getToken());
-            mat_def->set_name(mat.toString()); //find the name at cave temperature;
+            mat_def->set_name(DF2UTF(mat.toString())); //find the name at cave temperature;
             if (size_t(raws->mat_table.builtin[i]->state_color[GetState(raws->mat_table.builtin[i])]) < raws->descriptors.colors.size())
             {
                 ConvertDFColorDescriptor(raws->mat_table.builtin[i]->state_color[GetState(raws->mat_table.builtin[i])], mat_def->mutable_state_color());
@@ -852,38 +853,13 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
             mat_def->mutable_mat_pair()->set_mat_type(j + 19);
             mat_def->mutable_mat_pair()->set_mat_index(i);
             mat_def->set_id(mat.getToken());
-            mat_def->set_name(mat.toString()); //find the name at cave temperature;
+            mat_def->set_name(DF2UTF(mat.toString())); //find the name at cave temperature;
             if (size_t(creature->material[j]->state_color[GetState(creature->material[j])]) < raws->descriptors.colors.size())
             {
                 ConvertDFColorDescriptor(creature->material[j]->state_color[GetState(creature->material[j])], mat_def->mutable_state_color());
             }
         }
     }
-    //for (size_t i = 0; i < history->figures.size(); i++)
-    //{
-    //    df::historical_figure * figure = history->figures[i];
-    //    if (figure->race < 0)
-    //        continue;
-    //    df::creature_raw * creature = raws->creatures.all[figure->race];
-    //    for (int j = 0; j < creature->material.size(); j++)
-    //    {
-    //        mat.decode(j + MaterialInfo::FIGURE_BASE, i);
-    //        MaterialDefinition *mat_def = out->add_material_list();
-    //        mat_def->mutable_mat_pair()->set_mat_type(j + MaterialInfo::FIGURE_BASE);
-    //        mat_def->mutable_mat_pair()->set_mat_index(i);
-    //        stringstream id;
-    //        id << "HF" << i << mat.getToken();
-    //        mat_def->set_id(id.str());
-    //        mat_def->set_name(mat.toString()); //find the name at cave temperature;
-    //        if (creature->material[j]->state_color[GetState(creature->material[j])] < raws->descriptors.colors.size())
-    //        {
-    //            df::descriptor_color *color = raws->descriptors.colors[creature->material[j]->state_color[GetState(creature->material[j])]];
-    //            mat_def->mutable_state_color()->set_red(color->red * 255);
-    //            mat_def->mutable_state_color()->set_green(color->green * 255);
-    //            mat_def->mutable_state_color()->set_blue(color->blue * 255);
-    //        }
-    //    }
-    //}
     for (size_t i = 0; i < raws->plants.all.size(); i++)
     {
         df::plant_raw * plant = raws->plants.all[i];
@@ -894,7 +870,7 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
             mat_def->mutable_mat_pair()->set_mat_type(j + 419);
             mat_def->mutable_mat_pair()->set_mat_index(i);
             mat_def->set_id(mat.getToken());
-            mat_def->set_name(mat.toString()); //find the name at cave temperature;
+            mat_def->set_name(DF2UTF(mat.toString())); //find the name at cave temperature;
             if (size_t(plant->material[j]->state_color[GetState(plant->material[j])]) < raws->descriptors.colors.size())
             {
                 ConvertDFColorDescriptor(plant->material[j]->state_color[GetState(plant->material[j])], mat_def->mutable_state_color());
@@ -925,7 +901,7 @@ static command_result GetGrowthList(color_ostream &stream, const EmptyMessage *i
             continue;
         MaterialDefinition * basePlant = out->add_material_list();
         basePlant->set_id(pp->id + ":BASE");
-        basePlant->set_name(pp->name);
+        basePlant->set_name(DF2UTF(pp->name));
         basePlant->mutable_mat_pair()->set_mat_type(-1);
         basePlant->mutable_mat_pair()->set_mat_index(i);
 #if DF_VERSION_INT > 40001
@@ -938,7 +914,7 @@ static command_result GetGrowthList(color_ostream &stream, const EmptyMessage *i
             {
                 MaterialDefinition * out_growth = out->add_material_list();
                 out_growth->set_id(pp->id + ":" + growth->id + +":" + growth_locations[l]);
-                out_growth->set_name(growth->name);
+                out_growth->set_name(DF2UTF(growth->name));
                 out_growth->mutable_mat_pair()->set_mat_type(g * 10 + l);
                 out_growth->mutable_mat_pair()->set_mat_index(i);
             }
@@ -995,17 +971,18 @@ void CopyBlock(df::map_block * DfBlock, RemoteFortressReader::MapBlock * NetBloc
                     || yyy >= 16
                     )
                     continue;
-                df::plant_tree_tile tile;
                 if (-localPos.z < 0)
                 {
-                    tile = tree_info->roots[-1 + localPos.z][xx + (yy*tree_info->dim_x)];
+                    df::plant_root_tile tile = tree_info->roots[-1 + localPos.z][xx + (yy * tree_info->dim_x)];
+                    if (!tile.whole || tile.bits.blocked)
+                        continue;
                 }
                 else
                 {
-                    tile = tree_info->body[-localPos.z][xx + (yy*tree_info->dim_x)];
+                    df::plant_tree_tile tile = tree_info->body[-localPos.z][xx + (yy * tree_info->dim_x)];
+                    if (!tile.whole || tile.bits.blocked)
+                        continue;
                 }
-                if (!tile.whole || tile.bits.blocked)
-                    continue;
                 if (tree_info->body_height <= 1)
                     trunk_percent[xxx][yyy] = 0;
                 else
@@ -1415,6 +1392,7 @@ static command_result GetBlockList(color_ostream &stream, const BlockRequest *in
     int max_y = in->max_y();
     int min_z = in->min_z();
     int max_z = in->max_z();
+    bool forceReload = in->force_reload();
     bool firstBlock = true; //Always send all the buildings needed on the first block, and none on the rest.
                                 //stream.print("Got request for blocks from (%d, %d, %d) to (%d, %d, %d).\n", in->min_x(), in->min_y(), in->min_z(), in->max_x(), in->max_y(), in->max_z());
     for (int zz = max_z - 1; zz >= min_z; zz--)
@@ -1462,19 +1440,19 @@ static command_result GetBlockList(color_ostream &stream, const BlockRequest *in
                         bool itemsChanged = block->items.size() > 0;
                         bool flows = block->flows.size() > 0;
                         RemoteFortressReader::MapBlock *net_block = nullptr;
-                        if (tileChanged || desChanged || spatterChanged || firstBlock || itemsChanged || flows)
+                        if (tileChanged || desChanged || spatterChanged || firstBlock || itemsChanged || flows || forceReload)
                         {
                             net_block = out->add_map_blocks();
                             net_block->set_map_x(block->map_pos.x);
                             net_block->set_map_y(block->map_pos.y);
                             net_block->set_map_z(block->map_pos.z);
                         }
-                        if (tileChanged)
+                        if (tileChanged || forceReload)
                         {
                             CopyBlock(block, net_block, &MC, pos);
                             blocks_sent++;
                         }
-                        if (desChanged)
+                        if (desChanged || forceReload)
                             CopyDesignation(block, net_block, &MC, pos);
                         if (firstBlock)
                         {
@@ -1482,7 +1460,7 @@ static command_result GetBlockList(color_ostream &stream, const BlockRequest *in
                             CopyProjectiles(net_block);
                             firstBlock = false;
                         }
-                        if (spatterChanged)
+                        if (spatterChanged || forceReload)
                             Copyspatters(block, net_block, &MC, pos);
                         if (itemsChanged)
                             CopyItems(block, net_block, &MC, pos);
@@ -1553,7 +1531,9 @@ static command_result GetBlockList(color_ostream &stream, const BlockRequest *in
         ConvertDFCoord(engraving->pos, netEngraving->mutable_pos());
         netEngraving->set_quality(engraving->quality);
         netEngraving->set_tile(engraving->tile);
-        CopyImage(chunk->images[engraving->art_subid], netEngraving->mutable_image());
+        if (chunk->images[engraving->art_subid]) {
+            CopyImage(chunk->images[engraving->art_subid], netEngraving->mutable_image());
+        }
         netEngraving->set_floor(engraving->flags.bits.floor);
         netEngraving->set_west(engraving->flags.bits.west);
         netEngraving->set_east(engraving->flags.bits.east);
@@ -1854,18 +1834,19 @@ static command_result GetViewInfo(color_ostream &stream, const EmptyMessage *in,
     Gui::getViewCoords(x, y, z);
     Gui::getCursorCoords(cx, cy, cz);
 
-#if DF_VERSION_INT > 34011
-    auto embark = Gui::getViewscreenByType<df::viewscreen_choose_start_sitest>(0);
-    if (embark)
-    {
-        df::embark_location location = embark->location;
-        df::world_data * data = df::global::world->world_data;
-        if (data && data->region_map)
-        {
-            z = data->region_map[location.region_pos.x][location.region_pos.y].elevation;
-        }
-    }
-#endif
+    //FIXME: Get get this info from the new embark screen.
+//#if DF_VERSION_INT > 34011
+//    auto embark = Gui::getViewscreenByType<df::viewscreen_choose_start_sitest>(0);
+//    if (embark)
+//    {
+//        df::embark_location location = embark->location;
+//        df::world_data * data = df::global::world->world_data;
+//        if (data && data->region_map)
+//        {
+//            z = data->region_map[location.region_pos.x][location.region_pos.y].elevation;
+//        }
+//    }
+//#endif
 
     auto dims = Gui::getDwarfmodeViewDims();
 
@@ -1887,8 +1868,8 @@ static command_result GetViewInfo(color_ostream &stream, const EmptyMessage *in,
     if (gamemode && *gamemode == GameMode::ADVENTURE)
         out->set_follow_unit_id(world->units.active[0]->id);
     else
-        out->set_follow_unit_id(ui->follow_unit);
-    out->set_follow_item_id(ui->follow_item);
+        out->set_follow_unit_id(plotinfo->follow_unit);
+    out->set_follow_item_id(plotinfo->follow_item);
     return CR_OK;
 }
 
@@ -1915,22 +1896,23 @@ static command_result GetMapInfo(color_ostream &stream, const EmptyMessage *in,
 DFCoord GetMapCenter()
 {
     DFCoord output;
-#if DF_VERSION_INT > 34011
-    auto embark = Gui::getViewscreenByType<df::viewscreen_choose_start_sitest>(0);
-    if (embark)
-    {
-        df::embark_location location = embark->location;
-        output.x = (location.region_pos.x * 16) + 8;
-        output.y = (location.region_pos.y * 16) + 8;
-        output.z = 100;
-        df::world_data * data = df::global::world->world_data;
-        if (data && data->region_map)
-        {
-            output.z = data->region_map[location.region_pos.x][location.region_pos.y].elevation;
-        }
-    }
-    else
-#endif
+//FIXME: Does this even still exist?
+//#if DF_VERSION_INT > 34011
+//    auto embark = Gui::getViewscreenByType<df::viewscreen_choose_start_sitest>(0);
+//    if (embark)
+//    {
+//        df::embark_location location = embark->location;
+//        output.x = (location.region_pos.x * 16) + 8;
+//        output.y = (location.region_pos.y * 16) + 8;
+//        output.z = 100;
+//        df::world_data * data = df::global::world->world_data;
+//        if (data && data->region_map)
+//        {
+//            output.z = data->region_map[location.region_pos.x][location.region_pos.y].elevation;
+//        }
+//    }
+//    else
+//#endif
         if (Maps::IsValid())
         {
             int x, y, z;
@@ -1970,8 +1952,8 @@ static command_result GetWorldMapCenter(color_ostream &stream, const EmptyMessag
     out->set_center_x(pos.x);
     out->set_center_y(pos.y);
     out->set_center_z(pos.z);
-    out->set_name(Translation::TranslateName(&(data->name), false));
-    out->set_name_english(Translation::TranslateName(&(data->name), true));
+    out->set_name(DF2UTF(Translation::TranslateName(&(data->name), false)));
+    out->set_name_english(DF2UTF(Translation::TranslateName(&(data->name), true)));
     out->set_cur_year(World::ReadCurrentYear());
     out->set_cur_year_tick(World::ReadCurrentTick());
     return CR_OK;
@@ -1996,8 +1978,8 @@ static command_result GetWorldMap(color_ostream &stream, const EmptyMessage *in,
     int height = data->world_height;
     out->set_world_width(width);
     out->set_world_height(height);
-    out->set_name(Translation::TranslateName(&(data->name), false));
-    out->set_name_english(Translation::TranslateName(&(data->name), true));
+    out->set_name(DF2UTF(Translation::TranslateName(&(data->name), false)));
+    out->set_name_english(DF2UTF(Translation::TranslateName(&(data->name), true)));
     auto poles = data->flip_latitude;
 #if DF_VERSION_INT > 34011
     switch (poles)
@@ -2145,8 +2127,8 @@ static command_result GetWorldMapNew(color_ostream &stream, const EmptyMessage *
     int height = data->world_height;
     out->set_world_width(width);
     out->set_world_height(height);
-    out->set_name(Translation::TranslateName(&(data->name), false));
-    out->set_name_english(Translation::TranslateName(&(data->name), true));
+    out->set_name(DF2UTF(Translation::TranslateName(&(data->name), false)));
+    out->set_name_english(DF2UTF(Translation::TranslateName(&(data->name), true)));
 #if DF_VERSION_INT > 34011
     auto poles = data->flip_latitude;
     switch (poles)
@@ -2816,8 +2798,8 @@ static command_result GetPartialCreatureRaws(color_ostream &stream, const ListRe
             auto send_tissue = send_creature->add_tissues();
 
             send_tissue->set_id(orig_tissue->id);
-            send_tissue->set_name(orig_tissue->tissue_name_singular);
-            send_tissue->set_subordinate_to_tissue(orig_tissue->subordinate_to_tissue);
+            send_tissue->set_name(DF2UTF(orig_tissue->tissue_name_singular));
+            send_tissue->set_subordinate_to_tissue(DF2UTF(orig_tissue->subordinate_to_tissue));
 
             CopyMat(send_tissue->mutable_material(), orig_tissue->mat_type, orig_tissue->mat_index);
         }
@@ -2850,7 +2832,7 @@ static command_result GetPartialPlantRaws(color_ostream &stream, const ListReque
 
         plant_remote->set_index(i);
         plant_remote->set_id(plant_local->id);
-        plant_remote->set_name(plant_local->name);
+        plant_remote->set_name(DF2UTF(plant_local->name));
         if (!plant_local->flags.is_set(df::plant_raw_flags::TREE))
             plant_remote->set_tile(plant_local->tiles.shrub_tile);
         else
@@ -2862,7 +2844,7 @@ static command_result GetPartialPlantRaws(color_ostream &stream, const ListReque
             TreeGrowth * growth_remote = plant_remote->add_growths();
             growth_remote->set_index(j);
             growth_remote->set_id(growth_local->id);
-            growth_remote->set_name(growth_local->name);
+            growth_remote->set_name(DF2UTF(growth_local->name));
             for (size_t k = 0; k < growth_local->prints.size(); k++)
             {
                 df::plant_growth_print* print_local = growth_local->prints[k];
@@ -2913,14 +2895,13 @@ static command_result CopyScreen(color_ostream &stream, const EmptyMessage *in,
 static command_result PassKeyboardEvent(color_ostream &stream, const KeyboardEvent *in)
 {
 #if DF_VERSION_INT > 34011
-    SDL::Event e;
+    SDL_Event e;
     e.key.type = in->type();
     e.key.state = in->state();
-    e.key.ksym.mod = (SDL::Mod)in->mod();
-    e.key.ksym.scancode = in->scancode();
-    e.key.ksym.sym = (SDL::Key)in->sym();
-    e.key.ksym.unicode = in->unicode();
-    SDL_PushEvent(&e);
+    e.key.keysym.mod = in->mod();
+    e.key.keysym.scancode = (SDL_Scancode)in->scancode();
+    e.key.keysym.sym = in->sym();
+    DFHack::DFSDL::DFSDL_PushEvent(&e);
 #endif
     return CR_OK;
 }
diff --git a/plugins/rename.cpp b/plugins/rename.cpp
index 7c46fc908..68186cb74 100644
--- a/plugins/rename.cpp
+++ b/plugins/rename.cpp
@@ -13,8 +13,8 @@
 #include "modules/Screen.h"
 
 #include <VTableInterpose.h>
-#include "df/ui.h"
-#include "df/ui_sidebar_menus.h"
+#include "df/plotinfost.h"
+#include "df/gamest.h"
 #include "df/world.h"
 #include "df/squad.h"
 #include "df/unit.h"
@@ -49,8 +49,8 @@ using namespace dfproto;
 DFHACK_PLUGIN("rename");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(ui_sidebar_menus);
+REQUIRE_GLOBAL(plotinfo);
+REQUIRE_GLOBAL(game);
 REQUIRE_GLOBAL(world);
 
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event);
@@ -59,7 +59,7 @@ static command_result rename(color_ostream &out, vector <string> & parameters);
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    if (world && ui) {
+    if (world && plotinfo) {
         commands.push_back(PluginCommand(
             "rename",
             "Easily rename things.",
@@ -135,9 +135,9 @@ struct dwarf_render_zone_hook : df::viewscreen_dwarfmodest {
     {
         INTERPOSE_NEXT(render)();
 
-        if (ui->main.mode == ui_sidebar_mode::Zones &&
-            ui_sidebar_menus && ui_sidebar_menus->zone.selected &&
-            !ui_sidebar_menus->zone.selected->name.empty())
+        if (plotinfo->main.mode == ui_sidebar_mode::Zones &&
+            game && game->zone.selected &&
+            !game->zone.selected->name.empty())
         {
             auto dims = Gui::getDwarfmodeViewDims();
             int width = dims.menu_x2 - dims.menu_x1 - 1;
@@ -146,7 +146,7 @@ struct dwarf_render_zone_hook : df::viewscreen_dwarfmodest {
             Screen::fillRect(pen, dims.menu_x1, dims.y1+1, dims.menu_x2, dims.y1+1);
 
             std::string name;
-            ui_sidebar_menus->zone.selected->getName(&name);
+            game->zone.selected->getName(&name);
             Screen::paintString(pen, dims.menu_x1+1, dims.y1+1, name.substr(0, width));
         }
     }
@@ -258,7 +258,7 @@ static bool renameBuilding(df::building *bld, std::string name)
 
 static df::squad *getSquadByIndex(unsigned idx)
 {
-    auto entity = df::historical_entity::find(ui->group_id);
+    auto entity = df::historical_entity::find(plotinfo->group_id);
     if (!entity)
         return NULL;
 
@@ -361,7 +361,7 @@ static command_result rename(color_ostream &out, vector <string> &parameters)
             return CR_WRONG_USAGE;
         }
 
-        ui->main.hotkeys[id-1].name = parameters[2];
+        plotinfo->main.hotkeys[id-1].name = parameters[2];
     }
     else if (cmd == "unit")
     {
diff --git a/plugins/rendermax/renderer_light.cpp b/plugins/rendermax/renderer_light.cpp
index cc5d569c0..d806d0c3e 100644
--- a/plugins/rendermax/renderer_light.cpp
+++ b/plugins/rendermax/renderer_light.cpp
@@ -94,7 +94,7 @@ rect2d getMapViewport()
     {
         view_rb=area_x2;
     }
-    if (menu_pos<area_pos || df::global::ui->main.mode!=0)
+    if (menu_pos<area_pos || df::global::plotinfo->main.mode!=0)
     {
         if (menu_pos >= area_pos)
             menu_pos = area_pos-1;
@@ -1171,11 +1171,11 @@ void lightingEngineViewscreen::loadSettings()
     std::string rawFolder;
     if(df::global::world->cur_savegame.save_dir!="")
     {
-        rawFolder= "data/save/" + (df::global::world->cur_savegame.save_dir) + "/raw/";
+        rawFolder= "save/" + (df::global::world->cur_savegame.save_dir) + "/";
     }
     else
     {
-        rawFolder= "raw/";
+        rawFolder= "dfhack-config/";
     }
     const std::string settingsfile=rawFolder+"rendermax.lua";
 
diff --git a/plugins/rendermax/rendermax.cpp b/plugins/rendermax/rendermax.cpp
index b7c703e09..6ed22fe77 100644
--- a/plugins/rendermax/rendermax.cpp
+++ b/plugins/rendermax/rendermax.cpp
@@ -31,7 +31,7 @@ REQUIRE_GLOBAL(cursor);
 REQUIRE_GLOBAL(enabler);
 REQUIRE_GLOBAL(gametype);
 REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(window_x);
 REQUIRE_GLOBAL(window_y);
 REQUIRE_GLOBAL(window_z);
diff --git a/plugins/reveal.cpp b/plugins/reveal.cpp
index 8d76bd54b..b8a4ae902 100644
--- a/plugins/reveal.cpp
+++ b/plugins/reveal.cpp
@@ -12,6 +12,8 @@
 #include "modules/World.h"
 #include "modules/MapCache.h"
 #include "modules/Gui.h"
+#include "modules/Units.h"
+#include "modules/Screen.h"
 
 #include "df/block_square_event_frozen_liquidst.h"
 #include "df/construction.h"
@@ -184,16 +186,18 @@ command_result reveal(color_ostream &out, vector<string> & params)
         else if(params[i] == "help" || params[i] == "?")
             return CR_WRONG_USAGE;
     }
+    auto& con = out;
     if(params.size() && params[0] == "hell")
     {
         no_hell = false;
     }
     if(params.size() && params[0] == "demon")
     {
-        no_hell = false;
-        pause = false;
+        con.printerr("`reveal demon` is currently disabled to prevent a hang due to a bug in the base game\n");
+        return CR_FAILURE;
+        //no_hell = false;
+        //pause = false;
     }
-    auto & con = out;
     if(revealed != NOT_REVEALED)
     {
         con.printerr("Map is already revealed or this is a different map.\n");
@@ -256,9 +260,16 @@ command_result reveal(color_ostream &out, vector<string> & params)
             revealed = DEMON_REVEALED;
     }
     is_active = nopause_state || (revealed == REVEALED);
-    con.print("Map revealed.\n");
+    bool graphics_mode = Screen::inGraphicsMode();
+    con.print("Map revealed.\n\n");
+    if (graphics_mode) {
+        con.print("Note that in graphics mode, tiles that are not adjacent to open\n"
+                  "space will not render but can still be examined by hovering over\n"
+                  "them with the mouse. Switching to text mode (in the game settings)\n"
+                  "will allow the display of the revealed tiles.\n\n");
+    }
     if(!no_hell)
-        con.print("Unpausing can unleash the forces of hell, so it has been temporarily disabled.\n");
+        con.print("Unpausing can unleash the forces of hell, so it has been temporarily disabled.\n\n");
     con.print("Run 'unreveal' to revert to previous state.\n");
     return CR_OK;
 }
@@ -492,21 +503,32 @@ command_result revflood(color_ostream &out, vector<string> & params)
         out.printerr("Only in proper dwarf mode.\n");
         return CR_FAILURE;
     }
-    int32_t cx, cy, cz;
+    df::coord pos;
     Maps::getSize(x_max,y_max,z_max);
 
-    Gui::getCursorCoords(cx,cy,cz);
-    if(cx == -30000)
-    {
-        out.printerr("Cursor is not active. Point the cursor at some empty space you want to be unhidden.\n");
+    Gui::getCursorCoords(pos);
+    if (!pos.isValid()) {
+        df::unit *unit = Gui::getSelectedUnit(out, true);
+        if (unit)
+            pos = Units::getPosition(unit);
+    }
+
+    if (!pos.isValid()) {
+        vector<df::unit *> citizens;
+        Units::getCitizens(citizens);
+        if (citizens.size())
+            pos = Units::getPosition(citizens[0]);
+    }
+
+    if(!pos.isValid()) {
+        out.printerr("Please select a unit or place the keyboard cursor at some empty space you want to be unhidden.\n");
         return CR_FAILURE;
     }
-    DFCoord xy ((uint32_t)cx,(uint32_t)cy,cz);
     MapCache * MCache = new MapCache;
-    df::tiletype tt = MCache->tiletypeAt(xy);
+    df::tiletype tt = MCache->tiletypeAt(pos);
     if(isWallTerrain(tt))
     {
-        out.printerr("Point the cursor at some empty space you want to be unhidden.\n");
+        out.printerr("Please select a unit or place the keyboard cursor at some empty space you want to be unhidden.\n");
         delete MCache;
         return CR_FAILURE;
     }
@@ -524,7 +546,7 @@ command_result revflood(color_ostream &out, vector<string> & params)
     }
     MCache->trash();
 
-    unhideFlood_internal(MCache, xy);
+    unhideFlood_internal(MCache, pos);
     MCache->WriteAll();
     delete MCache;
 
diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt
deleted file mode 100644
index 704137621..000000000
--- a/plugins/ruby/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-# Allow build system to turn off downloading of libruby.so.
-option(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." ON)
-
-if(DOWNLOAD_RUBY)
-
-    if(APPLE)
-        set(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/osx${DFHACK_BUILD_ARCH}/libruby.dylib)
-        set(RUBYLIB_INSTALL_NAME "libruby.dylib")
-        if(${DFHACK_BUILD_ARCH} STREQUAL 64)
-            # message("No ruby lib for 64-bit OS X yet")
-        else()
-            download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/osx32-libruby187.dylib.gz"
-                "gz"
-                ${RUBYLIB}.gz
-                "e9bc4263557e652121b055a46abb4f97"
-                ${RUBYLIB}
-                "3ee5356759f764a440be5b5b44649826")
-        endif()
-    elseif(UNIX)
-        set(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/linux${DFHACK_BUILD_ARCH}/libruby.so)
-        set(RUBYLIB_INSTALL_NAME "libruby.so")
-        if(${DFHACK_BUILD_ARCH} STREQUAL 64)
-            download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/linux64-libruby187.so.gz"
-                "gz"
-                ${RUBYLIB}.gz
-                "8eb757bb9ada08608914d8ca8906c427"
-                ${RUBYLIB}
-                "e8c36a06f031cfbf02def28169bb5f1f")
-        else()
-            download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/linux32-libruby187.so.gz"
-                "gz"
-                ${RUBYLIB}.gz
-                "2d06f5069ff07ea934ecd40db55a4ac5"
-                ${RUBYLIB}
-                "b00d8d7086cb39f6fde793f9d89cb2d7")
-        endif()
-    else()
-        set(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/win${DFHACK_BUILD_ARCH}/libruby.dll)
-        set(RUBYLIB_INSTALL_NAME "libruby.dll")
-        if(${DFHACK_BUILD_ARCH} STREQUAL 64)
-            download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/win64-libruby200.dll.gz"
-                "gz"
-                ${RUBYLIB}.gz
-                "81db54a8b8b3090c94c6ae2147d30b8f"
-                ${RUBYLIB}
-                "8a8564418aebddef3dfee1e96690e713")
-        else()
-            download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/win32-libruby187.dll.gz"
-                "gz"
-                ${RUBYLIB}.gz
-                "ffc0f1b5b33748e2a36128e90c97f6b2"
-                ${RUBYLIB}
-                "482c1c418f4ee1a5f04203eee1cda0ef")
-        endif()
-    endif()
-
-endif()
-
-if(APPLE OR UNIX)
-    set(RUBYAUTOGEN ruby-autogen-gcc.rb)
-else(APPLE OR UNIX)
-    set(RUBYAUTOGEN ruby-autogen-win.rb)
-endif(APPLE OR UNIX)
-
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${RUBYAUTOGEN}
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codegen.pl ${dfhack_SOURCE_DIR}/library/include/df/codegen.out.xml ${CMAKE_CURRENT_BINARY_DIR}/${RUBYAUTOGEN} ${CMAKE_SYSTEM_NAME} ${DFHACK_BUILD_ARCH}
-    # cmake quirk: depending on codegen.out.xml or generate_headers only is not enough, needs both
-    # test by manually patching any library/xml/moo.xml, run make ruby-autogen-rb -j2, and check build/plugins/ruby/ruby-autogen.rb for patched xml data
-    DEPENDS generate_headers ${dfhack_SOURCE_DIR}/library/include/df/codegen.out.xml ${CMAKE_CURRENT_SOURCE_DIR}/codegen.pl
-    COMMENT ${RUBYAUTOGEN}
-)
-add_custom_target(ruby-autogen-rb DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${RUBYAUTOGEN})
-
-include_directories("${dfhack_SOURCE_DIR}/depends/tthread")
-
-dfhack_plugin(ruby ruby.cpp LINK_LIBRARIES dfhack-tinythread)
-add_dependencies(ruby ruby-autogen-rb)
-
-if(EXISTS ${RUBYLIB})
-    install(FILES ${RUBYLIB} DESTINATION ${DFHACK_LIBRARY_DESTINATION} RENAME ${RUBYLIB_INSTALL_NAME})
-else()
-    # Only fire this warning if DOWNLOAD_RUBY was set.
-    if(NOT(APPLE AND ${DFHACK_BUILD_ARCH} STREQUAL 64) AND DOWNLOAD_RUBY)
-        message(WARNING "Ruby library not found at ${RUBYLIB} - will not be installed")
-    endif()
-endif()
-
-install(DIRECTORY .
-    DESTINATION hack/ruby
-    FILES_MATCHING PATTERN "*.rb")
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RUBYAUTOGEN} DESTINATION hack/ruby)
diff --git a/plugins/ruby/README b/plugins/ruby/README
deleted file mode 100644
index 767844414..000000000
--- a/plugins/ruby/README
+++ /dev/null
@@ -1,279 +0,0 @@
-This plugins embeds a ruby interpreter inside DFHack (ie inside Dwarf Fortress).
-
-The plugin maps all the structures available in library/xml/ to ruby objects.
-
-These objects are described in ruby-autogen.rb, they are all in the DFHack
-module. The toplevel 'df' method is a shortcut to the DFHack module.
-
-The plugin does *not* map most of dfhack methods (MapCache, ...) ; only direct
-access to the raw DF data structures in memory is provided.
-
-Some library methods are stored in the various .rb file, e.g. shortcuts to read
-a map block, find an unit or an item, etc.
-
-Global dfhack objects are accessible through the 'df' accessor (eg 'df.world').
-
-DFHack structures are renamed in CamelCase in the ruby namespace.
-
-For a list of the structures and their methods, grep the ruby-autogen.rb file.
-
-All ruby code runs while the main DF process and other plugins are suspended.
-
-
-DFHack console
---------------
-
-The ruby plugin defines one new dfhack console command:
- rb_eval <ruby expression> ; evaluate a ruby expression and show the result in
-the console. Ex: rb_eval df.unit_find().name.first_name
-You can use single-quotes for strings ; avoid double-quotes that are parsed
-and removed by the dfhack console code.
-
-Text output from ruby code, through the standard 'puts', 'p' or 'raise' are
-redirected to the dfhack console window.
-
-If dfhack reports 'rb_eval is not a recognized command', check stderr.log. You
-need a valid 32-bit ruby library to work, and ruby1.8 is prefered (ruby1.9 may
-crash DF on startup for now). Install the library in the df root folder (or
-df/hack/ on linux), the library should be named 'libruby.dll' (.so on linux).
-You can download a tested version at http://github.com/jjyg/dfhack/downloads/
-
-
-Ruby scripts
-------------
-
-The ruby plugin allows the creation of '.rb' scripts in df/hack/scripts/.
-
-If you create such a script, e.g. 'test.rb', that will add a new dfhack console
-command 'test'.
-The script can access the console command arguments through the global variable
-'$script_args', which is an array of ruby Strings.
-To exit early from a script, use 'throw :script_finished'
-
-The help string displayed in dfhack 'ls' command is the first line of the
-script, if it is a comment (ie starts with '# ').
-
-
-Calling dfhack commands
------------------------
-
-The ruby plugin allows the calling of arbitrary dfhack commands, as if typed
-directly on the dfhack prompt.
-However due to locks and stuff, the dfhack command is delayed until the current
-ruby command is finished, so it is restricted to interactive uses.
-It is possible to call the method many times, this will queue dfhack commands
-to be run in order.
-
- df.dfhack_run "reveal"
-
-
-Ruby helper functions
----------------------
-
-This is an excerpt of the functions defined in dfhack/plugins/ruby/*.rb. Check
-the files and the comments for a complete list.
-
- df.same_pos?(obj1, obj2)
-Returns true if both objects are at the same game coordinates.
-obj1 and 2 should respond to #pos and #x #y #z.
-
- df.map_block_at(pos) / map_block_at(x, y, z)
-Returns the MapBlock for the coordinates or nil.
-
- df.map_tile_at(pos)
-Returns a MapTile, holding all informations wrt the map tile (read&write).
-This class is a ruby specific extention, to facilitate interaction with the
-DF map data. Check out hack/ruby/map.rb.
-
- df.each_map_block { |b|  }
- df.each_map_block_z(zlevel) { |b|  }
-Iterates over every map block (opt. on a single z-level).
-
- df.center_viewscreen(coords)
-Centers the DF view on the given coordinates. Accepts x/y/z arguments, or a
-single argument responding to pos/x/y/z, eg an Unit, Item, ...
-
- df.unit_find(arg)
-Returns an Unit.
-With no arg, returns the currently selected unit (through the (v) or (k) menus)
-With a number, returns the unit with this ID
-With something else, returns the first unit at the same game coordinates
-
- df.unit_workers
-Returns a list of worker citizen: units of your race & civilization, adults,
-not dead, crazy, ghosts or nobles exempted of work.
-
- df.unit_entitypositions(unit)
-Returns the list of EntityPosition occupied by the unit.
-Check the 'code' field for a readable name (MANAGER, CHIEF_MEDICAL_DWARF, ...)
-
- df.match_rawname(name, list)
-String fuzzy matching. Returns the list entry most similar to 'name'.
-First searches for an exact match, then for a case-insensitive match, and
-finally for a case-insensitive substring.
-Returns the element from list if there is only one match, or nil.
-Most useful to allow the user to specify a raw-defined name,
-eg 'gob' for 'GOBLIN' or 'coal' for 'COAL_BITUMINOUS', hence the name.
-
- df.building_alloc(type, subtype, customtype)
- df.building_position(bld, pos, w, h)
- df.building_construct(bld, item_list)
-Allocates a new building in DF memory, define its position / dimensions, and
-create a dwarf job to construct it from the given list of items.
-See buildings.rb/buildbed for an example.
-
- df.each_tree(material) { |t|  }
-Iterates over every tree of the given material (eg 'maple').
-
- df.translate_name(name, in_english=true, only_lastpart=false)
-Decode the LanguageName structure as a String as displayed in the game UI.
-A shortcut is available through name.to_s
-
- df.decode_mat(obj)
-Returns a MaterialInfo definition for the given object, using its mat_type
-and mat_index fields. Also works with a token string argument ('STONE:DOLOMITE')
-
-
-DFHack callbacks
-----------------
-
-The plugin interfaces with dfhack 'onupdate' hook.
-To register ruby code to be run every graphic frame, use:
- handle = df.onupdate_register('log') { puts 'i love flooding the console' }
-You can also rate-limit when your callback is called to a number of game ticks:
- handle = df.onupdate_register('myname', 10) { puts '10 more in-game ticks elapsed' }
-In this case, the callback is called immediately, and then every X in-game
-ticks (advances only when the game is unpaused).
-To stop being called, use:
- df.onupdate_unregister handle
-
-The same mechanism is available for 'onstatechange', but the
-SC_BEGIN_UNLOAD event is not propagated to the ruby handler.
-
-Available states:
- :WORLD_LOADED, :WORLD_UNLOADED, :MAP_LOADED, :MAP_UNLOADED,
- :VIEWSCREEN_CHANGED, :CORE_INITIALIZED, :PAUSED, :UNPAUSED
-
-
-C++ object manipulation
------------------------
-
-The ruby classes defined in ruby-autogen.rb are accessors to the underlying
-df C++ objects in-memory. To allocate a new C++ object for use in DF, use the
-RubyClass.cpp_new method (see buildings.rb for examples), works for Compounds
-only.
-A special Compound DFHack::StlString is available for allocating a single c++
-stl::string, so that you can call vmethods that take a string pointer argument
-(eg getName).
- ex: s = DFHack::StlString.cpp_new ; df.building_find.getName(s) ; p s.str
-
-Deallocation may work, using the compound method _cpp_delete. Use with caution,
-may crash your DF session. It may be simpler to just leak the memory.
-_cpp_delete will try to free all memory directly used by the compound, eg
-strings and vectors. It will *not* call the class destructor, and will not free
-stuff behind pointers.
-
-C++ std::string fields may be directly re-allocated using standard ruby strings,
-e.g. some_unit.name.nickname = 'moo'
-More subtle string manipulation, e.g. changing a single character, are not
-supported. Read the whole string, manipulate it in ruby, and re-assign it
-instead.
-
-C++ std::vector<> can be iterated as standard ruby Enumerable objects, using
-each/map/etc.
-To append data to a vector, use vector << newelement or vector.push(newelement)
-To insert at a given pos, vector.insert_at(index, value)
-To delete an element, vector.delete_at(index)
-
-You can binary search an element in a vector for a given numeric field value:
- df.world.unit.all.binsearch(42, :id)
-will find the entry whose 'id' field is 42 (needs the vector to be initially
-sorted by this field). The binsearch 2nd argument defaults to :id.
-
-Any numeric field defined as being an enum value will be converted to a ruby
-Symbol. This works for array indexes too.
- ex: df.unit_find(:selected).status.labors[:HAUL_FOOD] = true
-     df.map_tile_at(df.cursor).designation.liquid_type = :Water
-
-Virtual method calls are supported for C++ objects, with a maximum of 6
-arguments. Arguments / return value are interpreted as Compound/Enums as
-specified in the vmethod definition in the xmls.
-
-Pointer fields are automatically dereferenced ; so a vector of pointer to
-Units will yield Units directly. NULL pointers yield the 'nil' value.
-
-
-Examples
---------
-
-For more complex examples, check the dfhack/scripts/*.rb files.
-
-Show info on the currently selected unit ('v' or 'k' DF menu)
- p df.unit_find.flags1
-
-Set a custom nickname to unit with id '123'
- df.unit_find(123).name.nickname = 'moo'
-
-Show current unit profession
- p df.unit_find.profession
-
-Change current unit profession
- df.unit_find.profession = :MASON
-
-Center the screen on unit ID '123'
- df.center_viewscreen(df.unit_find(123))
-
-Find an item under the game cursor and show its C++ classname
- p df.item_find(df.cursor)._rtti_classname
-
-Find the raws name of the plant under cursor
- plant = df.world.plants.all.find { |plt| df.at_cursor?(plt) }
- p df.world.raws.plants.all[plant.mat_index].id
-
-Dig a channel under the cursor
- df.map_tile_at(df.cursor).dig(:Channel)
-
-Spawn 2/7 magma on the tile of the dwarf nicknamed 'hotfeet'
- hot = df.unit_citizens.find { |u| u.name.nickname == 'hotfeet' }
- df.map_tile_at(hot).spawn_magma(2)
-
-
-Plugin compilation
-------------------
-
-The plugin consists of the main ruby.cpp native plugin and the *.rb files.
-
-The native plugin handles only low-level ruby-to-df interaction (eg raw memory
-read/write, and dfhack integration), and the .rb files hold end-user helper
-functions.
-
-On dfhack start, the native plugin will initialize the ruby interpreter, and
-load hack/ruby/ruby.rb. This one then loads all other .rb files.
-
-The DF internal structures are described in ruby-autogen.rb .
-It is output by ruby/codegen.pl, from dfhack/library/include/df/codegen.out.xml
-It contains architecture-specific data (eg DF internal structures field offsets,
-which differ between Windows and Linux. Linux and Macosx are the same, as they
-both use gcc).
-It is stored inside the build directory (eg build/plugins/ruby/ruby-autogen.rb)
-
-For example,
- <ld:global-type ld:meta="struct-type" type-name="unit">
-   <ld:field type-name="language_name" name="name" ld:meta="global"/>
-   <ld:field name="custom_profession" ld:meta="primitive" ld:subtype="stl-string"/>
-   <ld:field ld:subtype="enum" base-type="int16_t" name="profession" type-name="profession" ld:meta="global"/>
-
-Will generate
- class Unit < MemHack::Compound
-  field(:name, 0) { global :LanguageName }
-  field(:custom_profession, 60) { stl_string }
-  field(:profession, 64) { number 16, true }
-
-The syntax for the 'field' method in ruby-autogen.rb is:
-1st argument = name of the method
-2nd argument = offset of this field from the beginning of the current struct.
- This field depends on the compiler used by Toady to generate DF.
-The block argument describes the type of the field: uint32, ptr to global...
-
-Primitive type access is done through native methods from ruby.cpp (vector length,
-raw memory access, etc)
diff --git a/plugins/ruby/building.rb b/plugins/ruby/building.rb
deleted file mode 100644
index dae1d455b..000000000
--- a/plugins/ruby/building.rb
+++ /dev/null
@@ -1,368 +0,0 @@
-module DFHack
-    class << self
-        def building_find(what=:selected, y=nil, z=nil)
-            if what == :selected
-                return world.buildings.all.binsearch(df.get_selected_building_id)
-            elsif what.kind_of?(Integer)
-                # search by building.id
-                return world.buildings.all.binsearch(what) if not z
-
-                # search by coordinates
-                x = what
-                world.buildings.all.find { |b|
-                    b.z == z and
-                    if b.room.extents
-                        dx = x - b.room.x
-                        dy = y - b.room.y
-                        dx >= 0 and dx < b.room.width and
-                        dy >= 0 and dy < b.room.height and
-                        b.room.extents[ dy*b.room.width + dx ] > 0
-                    else
-                        b.x1 <= x and b.x2 >= x and
-                        b.y1 <= y and b.y2 >= y
-                    end
-                }
-
-            elsif what.respond_to?(:x) or what.respond_to?(:pos)
-                # find the building at the same position
-                what = what.pos if what.respond_to?(:pos)
-                building_find(what.x, what.y, what.z)
-
-            else
-                raise "what what?"
-            end
-        end
-
-        # allocate a new building object
-        def building_alloc(type, subtype=-1, custom=-1)
-            cls = rtti_n2c[BuildingType::Classname[type].to_sym]
-            raise "invalid building type #{type.inspect}" if not cls
-            bld = cls.cpp_new
-            bld.race = ui.race_id
-            subtype = ConstructionType.int(subtype) if subtype.kind_of?(::Symbol) and type == :Construction
-            subtype = SiegeengineType.int(subtype) if subtype.kind_of?(::Symbol) and type == :SiegeEngine
-            subtype = WorkshopType.int(subtype) if subtype.kind_of?(::Symbol) and type == :Workshop
-            subtype = FurnaceType.int(subtype) if subtype.kind_of?(::Symbol) and type == :Furnace
-            subtype = CivzoneType.int(subtype) if subtype.kind_of?(::Symbol) and type == :Civzone
-            subtype = TrapType.int(subtype) if subtype.kind_of?(::Symbol) and type == :Trap
-            bld.setSubtype(subtype)
-            bld.setCustomType(custom)
-            case type
-            when :Well; bld.bucket_z = bld.z
-            when :Furnace; bld.melt_remainder[world.raws.inorganics.length] = 0
-            when :Coffin; bld.initBurialFlags
-            when :Trap; bld.ready_timeout = 500 if bld.trap_type == :PressurePlate
-            when :Floodgate; bld.gate_flags.closed = true
-            when :GrateWall; bld.gate_flags.closed = true
-            when :GrateFloor; bld.gate_flags.closed = true
-            when :BarsVertical; bld.gate_flags.closed = true
-            when :BarsFloor; bld.gate_flags.closed = true
-            end
-            bld
-        end
-
-        # used by building_setsize
-        def building_check_bridge_support(bld)
-            x1 = bld.x1-1
-            x2 = bld.x2+1
-            y1 = bld.y1-1
-            y2 = bld.y2+1
-            z = bld.z
-            (x1..x2).each { |x|
-                (y1..y2).each { |y|
-                    next if ((x == x1 or x == x2) and
-                             (y == y1 or y == y2))
-                    if mb = map_block_at(x, y, z) and tile = mb.tiletype[x%16][y%16] and TiletypeShape::BasicShape[Tiletype::Shape[tile]] != :Open
-                        bld.gate_flags.has_support = true
-                        return
-                    end
-                }
-            }
-            bld.gate_flags.has_support = false
-        end
-
-        # sets x2/centerx/y2/centery from x1/y1/bldtype
-        # x2/y2 preserved for :FarmPlot etc
-        def building_setsize(bld)
-            bld.x2 = bld.x1 if bld.x1 > bld.x2
-            bld.y2 = bld.y1 if bld.y1 > bld.y2
-            case bld.getType
-            when :Bridge
-                bld.centerx = bld.x1 + (bld.x2+1-bld.x1)/2
-                bld.centery = bld.y1 + (bld.y2+1-bld.y1)/2
-                building_check_bridge_support(bld)
-            when :FarmPlot, :RoadDirt, :RoadPaved, :Stockpile, :Civzone
-                bld.centerx = bld.x1 + (bld.x2+1-bld.x1)/2
-                bld.centery = bld.y1 + (bld.y2+1-bld.y1)/2
-            when :TradeDepot, :Shop
-                bld.x2 = bld.x1+4
-                bld.y2 = bld.y1+4
-                bld.centerx = bld.x1+2
-                bld.centery = bld.y1+2
-            when :SiegeEngine, :Windmill, :Wagon
-                bld.x2 = bld.x1+2
-                bld.y2 = bld.y1+2
-                bld.centerx = bld.x1+1
-                bld.centery = bld.y1+1
-            when :AxleHorizontal
-                if bld.is_vertical == 1
-                    bld.x2 = bld.centerx = bld.x1
-                    bld.centery = bld.y1 + (bld.y2+1-bld.y1)/2
-                else
-                    bld.centerx = bld.x1 + (bld.x2+1-bld.x1)/2
-                    bld.y2 = bld.centery = bld.y1
-                end
-            when :WaterWheel
-                if bld.is_vertical == 1
-                    bld.x2 = bld.centerx = bld.x1
-                    bld.y2 = bld.y1+2
-                    bld.centery = bld.y1+1
-                else
-                    bld.x2 = bld.x1+2
-                    bld.centerx = bld.x1+1
-                    bld.y2 = bld.centery = bld.y1
-                end
-            when :Workshop, :Furnace
-                # Furnace = Custom or default case only
-                case bld.type
-                when :Quern, :Millstone, :Tool
-                    bld.x2 = bld.centerx = bld.x1
-                    bld.y2 = bld.centery = bld.y1
-                when :Siege, :Kennels
-                    bld.x2 = bld.x1+4
-                    bld.y2 = bld.y1+4
-                    bld.centerx = bld.x1+2
-                    bld.centery = bld.y1+2
-                when :Custom
-                    if bdef = world.raws.buildings.all.binsearch(bld.getCustomType)
-                        bld.x2 = bld.x1 + bdef.dim_x - 1
-                        bld.y2 = bld.y1 + bdef.dim_y - 1
-                        bld.centerx = bld.x1 + bdef.workloc_x
-                        bld.centery = bld.y1 + bdef.workloc_y
-                    end
-                else
-                    bld.x2 = bld.x1+2
-                    bld.y2 = bld.y1+2
-                    bld.centerx = bld.x1+1
-                    bld.centery = bld.y1+1
-                end
-            when :ScrewPump
-                case bld.direction
-                when :FromEast
-                    bld.x2 = bld.centerx = bld.x1+1
-                    bld.y2 = bld.centery = bld.y1
-                when :FromSouth
-                    bld.x2 = bld.centerx = bld.x1
-                    bld.y2 = bld.centery = bld.y1+1
-                when :FromWest
-                    bld.x2 = bld.x1+1
-                    bld.y2 = bld.centery = bld.y1
-                    bld.centerx = bld.x1
-                else
-                    bld.x2 = bld.x1+1
-                    bld.y2 = bld.centery = bld.y1
-                    bld.centerx = bld.x1
-                end
-            when :Well
-                bld.bucket_z = bld.z
-                bld.x2 = bld.centerx = bld.x1
-                bld.y2 = bld.centery = bld.y1
-            when :Construction
-                bld.x2 = bld.centerx = bld.x1
-                bld.y2 = bld.centery = bld.y1
-                bld.setMaterialAmount(1)
-                return
-            else
-                bld.x2 = bld.centerx = bld.x1
-                bld.y2 = bld.centery = bld.y1
-            end
-            bld.setMaterialAmount((bld.x2-bld.x1+1)*(bld.y2-bld.y1+1)/4+1)
-        end
-
-        # set building at position, with optional width/height
-        def building_position(bld, pos, w=nil, h=nil)
-            if pos.respond_to?(:x1)
-                x, y, z = pos.x1, pos.y1, pos.z
-                w ||= pos.x2-pos.x1+1 if pos.respond_to?(:x2)
-                h ||= pos.y2-pos.y1+1 if pos.respond_to?(:y2)
-            elsif pos.respond_to?(:x)
-                x, y, z = pos.x, pos.y, pos.z
-            else
-                x, y, z = pos
-            end
-            w ||= pos.w if pos.respond_to?(:w)
-            h ||= pos.h if pos.respond_to?(:h)
-            bld.x1 = x
-            bld.y1 = y
-            bld.z  = z
-            bld.x2 = bld.x1+w-1 if w
-            bld.y2 = bld.y1+h-1 if h
-            building_setsize(bld)
-        end
-
-        # set map occupancy/stockpile/etc for a building
-        def building_setoccupancy(bld)
-            stockpile = (bld.getType == :Stockpile)
-            complete = (bld.getBuildStage >= bld.getMaxBuildStage)
-            extents = (bld.room.extents and bld.isExtentShaped)
-
-            z = bld.z
-            (bld.x1..bld.x2).each { |x|
-                (bld.y1..bld.y2).each { |y|
-                    next if extents and bld.room.extents[bld.room.width*(y-bld.room.y)+(x-bld.room.x)] == 0
-                    next if not mb = map_block_at(x, y, z)
-                    des = mb.designation[x%16][y%16]
-                    des.pile = stockpile
-                    des.dig = :No
-                    if complete
-                        bld.updateOccupancy(x, y)
-                    else
-                        mb.occupancy[x%16][y%16].building = :Planned
-                    end
-                }
-            }
-        end
-
-        # link bld into other rooms if it is inside their extents or vice versa
-        def building_linkrooms(bld)
-            world.buildings.other[:IN_PLAY].each { |ob|
-                next if ob.z != bld.z
-                if bld.is_room and bld.room.extents
-                    next if ob.is_room or ob.x1 < bld.room.x or ob.x1 >= bld.room.x+bld.room.width or ob.y1 < bld.room.y or ob.y1 >= bld.room.y+bld.room.height
-                    next if bld.room.extents[bld.room.width*(ob.y1-bld.room.y)+(ob.x1-bld.room.x)] == 0
-                    ui.equipment.update.buildings = true
-                    bld.children << ob
-                    ob.parents << bld
-                elsif ob.is_room and ob.room.extents
-                    next if bld.is_room or bld.x1 < ob.room.x or bld.x1 >= ob.room.x+ob.room.width or bld.y1 < ob.room.y or bld.y1 >= ob.room.y+ob.room.height
-                    next if ob.room.extents[ob.room.width*(bld.y1-ob.room.y)+(bld.x1-ob.room.x)].to_i == 0
-                    ui.equipment.update.buildings = true
-                    ob.children << bld
-                    bld.parents << ob
-                end
-            }
-        end
-
-        # link the building into the world, set map data, link rooms, bld.id
-        def building_link(bld)
-            bld.id = df.building_next_id
-            df.building_next_id += 1
-
-            world.buildings.all << bld
-            bld.categorize(true)
-            building_setoccupancy(bld) if bld.isSettingOccupancy
-            building_linkrooms(bld)
-        end
-
-        # set a design for the building
-        def building_createdesign(bld, rough=true)
-            job = bld.jobs[0]
-            job.mat_type = bld.mat_type
-            job.mat_index = bld.mat_index
-            if bld.needsDesign
-                bld.design = BuildingDesign.cpp_new
-                bld.design.flags.rough = rough
-            end
-        end
-
-        # creates a job to build bld, return it
-        def building_linkforconstruct(bld)
-            building_link bld
-            ref = GeneralRefBuildingHolderst.cpp_new
-            ref.building_id = bld.id
-            job = Job.cpp_new
-            job.job_type = :ConstructBuilding
-            job.pos = [bld.centerx, bld.centery, bld.z]
-            job.general_refs << ref
-            bld.jobs << job
-            job_link job
-            job
-        end
-
-        # construct a building with items or JobItems
-        def building_construct(bld, items)
-            job = building_linkforconstruct(bld)
-            rough = false
-            items.each { |item|
-                if items.kind_of?(JobItem)
-                    item.quantity = (bld.x2-bld.x1+1)*(bld.y2-bld.y1+1)/4+1 if item.quantity < 0
-                    job.job_items << item
-                else
-                    job_attachitem(job, item, :Hauled)
-                end
-                rough = true if item.getType == :BOULDER
-                bld.mat_type = item.getMaterial if bld.mat_type == -1
-                bld.mat_index = item.getMaterialIndex if bld.mat_index == -1
-            }
-            building_createdesign(bld, rough)
-        end
-
-        # construct an abstract building (stockpile, farmplot, ...)
-        def building_construct_abstract(bld)
-            case bld.getType
-            when :Stockpile
-                max = df.world.buildings.other[:STOCKPILE].map { |s| s.stockpile_number }.max
-                bld.stockpile_number = max.to_i + 1
-            when :Civzone
-                max = df.world.buildings.other[:ANY_ZONE].map { |z| z.zone_num }.max
-                bld.zone_num = max.to_i + 1
-            end
-            building_link bld
-            if !bld.flags.exists
-                bld.flags.exists = true
-                bld.initFarmSeasons
-            end
-        end
-
-        def building_setowner(bld, unit)
-            return unless bld.is_room
-            return if bld.owner == unit
-
-            if bld.owner
-                if idx = bld.owner.owned_buildings.index { |ob| ob.id == bld.id }
-                    bld.owner.owned_buildings.delete_at(idx)
-                end
-                if spouse = bld.owner.relations.spouse_tg and
-                        idx = spouse.owned_buildings.index { |ob| ob.id == bld.id }
-                    spouse.owned_buildings.delete_at(idx)
-                end
-            end
-            bld.owner = unit
-            if unit
-                unit.owned_buildings << bld
-                if spouse = bld.owner.relations.spouse_tg and
-                        !spouse.owned_buildings.index { |ob| ob.id == bld.id } and
-                        bld.canUseSpouseRoom
-                    spouse.owned_buildings << bld
-                end
-            end
-        end
-
-        # creates a job to deconstruct the building
-        def building_deconstruct(bld)
-            job = Job.cpp_new
-            refbuildingholder = GeneralRefBuildingHolderst.cpp_new
-            job.job_type = :DestroyBuilding
-            refbuildingholder.building_id = bld.id
-            job.general_refs << refbuildingholder
-            bld.jobs << job
-            job_link job
-            job
-        end
-
-        # exemple usage
-        def buildbed(pos=cursor)
-            raise 'where to ?' if pos.x < 0
-
-            item = world.items.all.find { |i|
-                i.kind_of?(ItemBedst) and
-                item_isfree(i)
-            }
-            raise 'no free bed, build more !' if not item
-
-            bld = building_alloc(:Bed)
-            building_position(bld, pos)
-            building_construct(bld, [item])
-        end
-    end
-end
diff --git a/plugins/ruby/codegen.pl b/plugins/ruby/codegen.pl
deleted file mode 100755
index 95d91c3ab..000000000
--- a/plugins/ruby/codegen.pl
+++ /dev/null
@@ -1,1166 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use XML::LibXML;
-
-our @lines_rb;
-
-my $os = $ARGV[2] or die('os not provided (argv[2])');
-if ($os =~ /linux/i or $os =~ /darwin/i) {
-    $os = 'linux';
-} elsif ($os =~ /windows/i) {
-    $os = 'windows';
-} else {
-    die "Unknown OS: " . $ARGV[2] . "\n";
-}
-
-my $arch = $ARGV[3] or die('arch not provided (argv[3])');
-if ($arch =~ /64/i) {
-    $arch = 64;
-} elsif ($arch =~ /32/i) {
-    $arch = 32;
-} else {
-    die "Unknown architecture: " . $ARGV[3] . "\n";
-}
-
-# 32 bits on Windows and 32-bit *nix, 64 bits on 64-bit *nix
-my $SIZEOF_LONG;
-if ($os eq 'windows' || $arch == 32) {
-    $SIZEOF_LONG = 4;
-} else {
-    $SIZEOF_LONG = 8;
-}
-
-my $SIZEOF_PTR = ($arch == 64) ? 8 : 4;
-
-sub indent_rb(&) {
-    my ($sub) = @_;
-    my @lines;
-    {
-        local @lines_rb;
-        $sub->();
-        @lines = map { "    " . $_ } @lines_rb;
-    }
-    push @lines_rb, @lines
-}
-
-sub rb_ucase {
-    my ($name) = @_;
-    return $name if ($name eq uc($name));
-    return join("", map { ucfirst $_ } (split('_', $name)));
-}
-
-
-my %item_renderer = (
-    'global' => \&render_item_global,
-    'number' => \&render_item_number,
-    'container' => \&render_item_container,
-    'compound' => \&render_item_compound,
-    'pointer' => \&render_item_pointer,
-    'static-array' => \&render_item_staticarray,
-    'primitive' => \&render_item_primitive,
-    'bytes' => \&render_item_bytes,
-);
-
-
-my %global_types;
-our $current_typename;
-
-sub render_global_enum {
-    my ($name, $type) = @_;
-
-    my $rbname = rb_ucase($name);
-    push @lines_rb, "class $rbname < MemHack::Enum";
-    indent_rb {
-        render_enum_fields($type);
-    };
-    push @lines_rb, "end\n";
-}
-
-sub render_enum_fields {
-    my ($type) = @_;
-
-    push @lines_rb, "ENUM = Hash.new";
-    push @lines_rb, "NUME = Hash.new";
-
-    my %attr_type;
-    my %attr_list;
-    render_enum_initattrs($type, \%attr_type, \%attr_list);
-
-    my $value = -1;
-    for my $item ($type->findnodes('child::enum-item'))
-    {
-        $value = $item->getAttribute('value') || ($value+1);
-        my $elemname = $item->getAttribute('name'); # || "unk_$value";
-
-        if ($elemname)
-        {
-            my $rbelemname = rb_ucase($elemname);
-            push @lines_rb, "ENUM[$value] = :$rbelemname ; NUME[:$rbelemname] = $value";
-            for my $iattr ($item->findnodes('child::item-attr'))
-            {
-                my $attr = render_enum_attr($rbelemname, $iattr, \%attr_type, \%attr_list);
-                $lines_rb[$#lines_rb] .= ' ; ' . $attr;
-            }
-        }
-    }
-}
-
-sub render_enum_initattrs {
-    my ($type, $attr_type, $attr_list) = @_;
-
-    for my $attr ($type->findnodes('child::enum-attr'))
-    {
-        my $rbattr = rb_ucase($attr->getAttribute('name'));
-        my $typeattr = $attr->getAttribute('type-name');
-        # find how we need to encode the attribute values: string, symbol (for enums), raw (number, bool)
-        if ($typeattr) {
-            if ($global_types{$typeattr}) {
-                $attr_type->{$rbattr} = 'symbol';
-            } else {
-                $attr_type->{$rbattr} = 'naked';
-            }
-        } else {
-            $attr_type->{$rbattr} = 'quote';
-        }
-
-        my $def = $attr->getAttribute('default-value');
-        if ($attr->getAttribute('is-list'))
-        {
-            push @lines_rb, "$rbattr = Hash.new { |h, k| h[k] = [] }";
-            $attr_list->{$rbattr} = 1;
-        }
-        elsif ($def)
-        {
-            $def = ":$def" if ($attr_type->{$rbattr} eq 'symbol');
-            $def =~ s/'/\\'/g if ($attr_type->{$rbattr} eq 'quote');
-            $def = "'$def'" if ($attr_type->{$rbattr} eq 'quote');
-            push @lines_rb, "$rbattr = Hash.new($def)";
-        }
-        else
-        {
-            push @lines_rb, "$rbattr = Hash.new";
-        }
-    }
-}
-
-sub render_enum_attr {
-    my ($rbelemname, $iattr, $attr_type, $attr_list) = @_;
-
-    my $ian = $iattr->getAttribute('name');
-    my $iav = $iattr->getAttribute('value');
-    my $rbattr = rb_ucase($ian);
-
-    my $op = ($attr_list->{$rbattr} ? '<<' : '=');
-
-    $iav = ":$iav" if ($attr_type->{$rbattr} eq 'symbol');
-    $iav =~ s/'/\\'/g if ($attr_type->{$rbattr} eq 'quote');
-    $iav = "'$iav'" if ($attr_type->{$rbattr} eq 'quote');
-
-    return "${rbattr}[:$rbelemname] $op $iav";
-}
-
-
-sub render_global_bitfield {
-    my ($name, $type) = @_;
-
-    my $rbname = rb_ucase($name);
-    push @lines_rb, "class $rbname < MemHack::Compound";
-    indent_rb {
-        render_bitfield_fields($type);
-    };
-    push @lines_rb, "end\n";
-}
-
-sub render_bitfield_fields {
-    my ($type) = @_;
-
-    push @lines_rb, "field(:_whole, 0) {";
-    indent_rb {
-        render_item_number($type);
-    };
-    push @lines_rb, "}";
-
-    my $shift = 0;
-    for my $field ($type->findnodes('child::ld:field'))
-    {
-        my $count = $field->getAttribute('count') || 1;
-        my $name = $field->getAttribute('name');
-        my $type = $field->getAttribute('type-name');
-        my $enum = rb_ucase($type) if ($type and $global_types{$type});
-        $name = $field->getAttribute('ld:anon-name') if (!$name);
-        print "bitfield $name !number\n" if (!($field->getAttribute('ld:meta') eq 'number'));
-
-        if ($name)
-        {
-            if ($enum) {
-                push @lines_rb, "field(:$name, 0) { bits $shift, $count, $enum }";
-            } elsif ($count == 1) {
-                push @lines_rb, "field(:$name, 0) { bit $shift }";
-            } else {
-                push @lines_rb, "field(:$name, 0) { bits $shift, $count }";
-            }
-        }
-
-        $shift += $count;
-    }
-}
-
-
-my %seen_class;
-our $compound_off;
-our $compound_pointer;
-
-sub render_global_class {
-    my ($name, $type) = @_;
-
-    my $meta = $type->getAttribute('ld:meta');
-    my $rbname = rb_ucase($name);
-
-    # ensure pre-definition of ancestors
-    my $parent = $type->getAttribute('inherits-from');
-    render_global_class($parent, $global_types{$parent}) if ($parent and !$seen_class{$parent});
-
-    return if $seen_class{$name};
-    $seen_class{$name}++;
-
-    local $compound_off = 0;
-    $compound_off = $SIZEOF_PTR if ($meta eq 'class-type');
-    $compound_off = sizeof($global_types{$parent}) if $parent;
-    local $current_typename = $rbname;
-
-    my $rtti_name;
-    if ($meta eq 'class-type')
-    {
-        $rtti_name = $type->getAttribute('original-name') ||
-        $type->getAttribute('type-name') ||
-        $name;
-    }
-
-    my $rbparent = ($parent ? rb_ucase($parent) : 'MemHack::Compound');
-    my $ienum;
-    if (($type->getAttribute('ld:subtype') or '') eq 'df-other-vectors-type')
-    {
-        $rbparent = 'MemHack::OtherVectors';
-        $ienum = rb_ucase($type->getAttribute('index-enum'));
-    }
-    push @lines_rb, "class $rbname < $rbparent";
-    indent_rb {
-        my $sz = sizeof($type);
-        # see comment is sub sizeof ; but gcc has sizeof(cls) aligned
-        $sz = align_field($sz, $SIZEOF_PTR) if $os eq 'linux' and $meta eq 'class-type';
-        push @lines_rb, "sizeof $sz\n";
-
-        push @lines_rb, "rtti_classname :$rtti_name\n" if $rtti_name;
-
-        push @lines_rb, "ienum $ienum\n" if $ienum;
-
-        render_struct_fields($type);
-
-        my $vms = $type->findnodes('child::virtual-methods')->[0];
-        if ($vms)
-        {
-            my $voff = render_class_vmethods_voff($parent);
-            render_class_vmethods($vms, $voff);
-        }
-    };
-    push @lines_rb, "end\n";
-}
-
-sub render_struct_fields {
-    my ($type) = @_;
-
-    my $isunion = $type->getAttribute('is-union');
-
-    for my $field ($type->findnodes('child::ld:field'))
-    {
-        my $name = $field->getAttribute('name');
-        $name = $field->getAttribute('ld:anon-name') if (!$name);
-
-        if (!$name and $field->getAttribute('ld:anon-compound'))
-        {
-            render_struct_fields($field);
-        }
-        else
-        {
-            $compound_off = align_field($compound_off, get_field_align($field));
-            if ($name)
-            {
-                push @lines_rb, "field(:$name, $compound_off) {";
-                indent_rb {
-                    render_item($field);
-                };
-                push @lines_rb, "}";
-
-                render_struct_field_refs($type, $field, $name);
-            }
-        }
-
-        $compound_off += sizeof($field) if (!$isunion);
-    }
-}
-
-# handle generating accessor for xml attributes ref-target, refers-to etc
-sub render_struct_field_refs {
-    my ($parent, $field, $name) = @_;
-
-    my $reftg = $field->getAttribute('ref-target');
-
-    my $refto = $field->getAttribute('refers-to');
-    render_field_refto($parent, $name, $refto) if ($refto);
-
-    my $meta = $field->getAttribute('ld:meta');
-    my $item = $field->findnodes('child::ld:item')->[0];
-    if ($meta and $meta eq 'container' and $item) {
-        my $itemreftg = $item->getAttribute('ref-target');
-        render_container_reftarget($parent, $item, $name, $itemreftg) if $itemreftg;
-    } elsif ($reftg) {
-        render_field_reftarget($parent, $field, $name, $reftg);
-    }
-}
-
-sub render_field_reftarget {
-    my ($parent, $field, $name, $reftg) = @_;
-
-    my $tg = $global_types{$reftg};
-    return if (!$tg);
-
-    my $tgname = "${name}_tg";
-    $tgname =~ s/_id(.?.?)_tg/_tg$1/;
-
-    my $aux = $field->getAttribute('aux-value');
-    if ($aux) {
-        # minimal support (aims is unit.caste_tg)
-        return if $aux !~ /^\$\$\.[^_][\w\.]+$/;
-        $aux =~ s/\$\$\.//;
-
-        for my $codehelper ($tg->findnodes('child::code-helper')) {
-            if ($codehelper->getAttribute('name') eq 'find-instance') {
-                my $helper = $codehelper->textContent;
-                $helper =~ s/\$global/df/;
-                $helper =~ s/\$\$/$aux/;
-                $helper =~ s/\$/$name/;
-                if ($helper =~ /^[\w\.\[\]]+$/) {
-                    push @lines_rb, "def $tgname ; $helper ; end";
-                }
-            }
-        }
-        return;
-    }
-
-    my $tgvec = $tg->getAttribute('instance-vector');
-    return if (!$tgvec);
-    my $idx = $tg->getAttribute('key-field');
-
-    $tgvec =~ s/^\$global/df/;
-    return if $tgvec !~ /^[\w\.]+$/;
-
-    for my $othername (map { $_->getAttribute('name') } $parent->findnodes('child::ld:field')) {
-        $tgname .= '_' if ($othername and $tgname eq $othername);
-    }
-
-    if ($idx) {
-        my $fidx = '';
-        $fidx = ', :' . $idx if ($idx ne 'id');
-        push @lines_rb, "def $tgname ; ${tgvec}.binsearch($name$fidx) ; end";
-    } else {
-        push @lines_rb, "def $tgname ; ${tgvec}[$name] ; end";
-    }
-
-}
-
-sub render_field_refto {
-    my ($parent, $name, $tgvec) = @_;
-
-    $tgvec =~ s/^\$global/df/;
-    $tgvec =~ s/\[\$\]$//;
-    return if $tgvec !~ /^[\w\.]+$/;
-
-    my $tgname = "${name}_tg";
-    $tgname =~ s/_id(.?.?)_tg/_tg$1/;
-
-    for my $othername (map { $_->getAttribute('name') } $parent->findnodes('child::ld:field')) {
-        $tgname .= '_' if ($othername and $tgname eq $othername);
-    }
-
-    push @lines_rb, "def $tgname ; ${tgvec}[$name] ; end";
-}
-
-sub render_container_reftarget {
-    my ($parent, $item, $name, $reftg) = @_;
-
-    my $aux = $item->getAttribute('aux-value');
-    return if ($aux); # TODO
-
-    my $tg = $global_types{$reftg};
-    return if (!$tg);
-    my $tgvec = $tg->getAttribute('instance-vector');
-    return if (!$tgvec);
-    my $idx = $tg->getAttribute('key-field');
-
-    $tgvec =~ s/^\$global/df/;
-    return if $tgvec !~ /^[\w\.]+$/;
-
-    my $tgname = "${name}_tg";
-    $tgname =~ s/_id(.?.?)_tg/_tg$1/;
-
-    for my $othername (map { $_->getAttribute('name') } $parent->findnodes('child::ld:field')) {
-        $tgname .= '_' if ($othername and $tgname eq $othername);
-    }
-
-    if ($idx) {
-        my $fidx = '';
-        $fidx = ', :' . $idx if ($idx ne 'id');
-        push @lines_rb, "def $tgname ; $name.map { |i| $tgvec.binsearch(i$fidx) } ; end";
-    } else {
-        push @lines_rb, "def $tgname ; $name.map { |i| ${tgvec}[i] } ; end";
-    }
-}
-
-# return the size of the parent's vtables
-sub render_class_vmethods_voff {
-    my ($name) = @_;
-
-    return 0 if !$name;
-
-    my $type = $global_types{$name};
-    my $parent = $type->getAttribute('inherits-from');
-
-    my $voff = render_class_vmethods_voff($parent);
-    my $vms = $type->findnodes('child::virtual-methods')->[0];
-
-    for my $meth ($vms->findnodes('child::vmethod'))
-    {
-        $voff += $SIZEOF_PTR if $meth->getAttribute('is-destructor') and $os eq 'linux';
-        $voff += $SIZEOF_PTR;
-    }
-
-    return $voff;
-}
-
-sub render_class_vmethods {
-    my ($vms, $voff) = @_;
-
-    for my $meth ($vms->findnodes('child::vmethod'))
-    {
-        my $name = $meth->getAttribute('name');
-
-        if ($name)
-        {
-            my @argnames;
-            my @argargs;
-
-            # check if arguments need special treatment (eg auto-convert from symbol to enum value)
-            for my $arg ($meth->findnodes('child::ld:field'))
-            {
-                my $nr = $#argnames + 1;
-                my $argname = lcfirst($arg->getAttribute('name') || "arg$nr");
-                push @argnames, $argname;
-
-                if ($arg->getAttribute('ld:meta') eq 'global' and $arg->getAttribute('ld:subtype') eq 'enum') {
-                    push @argargs, rb_ucase($arg->getAttribute('type-name')) . ".int($argname)";
-                } else {
-                    push @argargs, $argname;
-                }
-            }
-
-            # write vmethod ruby wrapper
-            push @lines_rb, "def $name(" . join(', ', @argnames) . ')';
-            indent_rb {
-                my $args = join('', map { ", $_" } @argargs);
-                my $ret = $meth->findnodes('child::ret-type')->[0];
-                my $call;
-                if (!$ret or $ret->getAttribute('ld:meta') ne 'primitive') {
-                    $call = "DFHack.vmethod_call(self, $voff$args)";
-                } else {
-                    $call = "DFHack.vmethod_call_mem_return(self, $voff, rv$args)";
-                }
-                render_class_vmethod_ret($call, $ret);
-            };
-            push @lines_rb, 'end';
-        }
-
-        # on linux, the destructor uses 2 entries
-        $voff += $SIZEOF_PTR if $meth->getAttribute('is-destructor') and $os eq 'linux';
-        $voff += $SIZEOF_PTR;
-    }
-}
-
-sub render_class_vmethod_ret {
-    my ($call, $ret) = @_;
-
-    if (!$ret)
-    {
-        # method returns void, hide return value
-        push @lines_rb, "$call ; nil";
-        return;
-    }
-
-    my $retmeta = $ret->getAttribute('ld:meta') || '';
-    if ($retmeta eq 'global')
-    {
-        # method returns an enum value: auto-convert to symbol
-        my $retname = $ret->getAttribute('type-name');
-        if ($retname and $global_types{$retname} and
-            $global_types{$retname}->getAttribute('ld:meta') eq 'enum-type')
-        {
-            push @lines_rb, rb_ucase($retname) . ".sym($call)";
-        }
-        else
-        {
-            print "vmethod global nonenum $call\n";
-            push @lines_rb, $call;
-        }
-
-    }
-    elsif ($retmeta eq 'number')
-    {
-        # raw method call returns an int32, mask according to actual return type
-        my $retsubtype = $ret->getAttribute('ld:subtype');
-        my $retbits = sizeof($ret) * 8;
-        push @lines_rb, "val = $call";
-        if ($retsubtype eq 'bool')
-        {
-            push @lines_rb, "(val & 1) != 0";
-        }
-        elsif ($ret->getAttribute('ld:unsigned'))
-        {
-            push @lines_rb, "val & ((1 << $retbits) - 1)";
-        }
-        elsif ($retbits != 32)
-        {
-            # manual sign extension
-            push @lines_rb, "val &= ((1 << $retbits) - 1)";
-            push @lines_rb, "((val >> ($retbits-1)) & 1) == 0 ? val : val - (1 << $retbits)";
-        }
-
-    }
-    elsif ($retmeta eq 'pointer')
-    {
-        # method returns a pointer to some struct, create the correct ruby wrapper
-        push @lines_rb, "ptr = $call";
-        push @lines_rb, "class << self";
-        indent_rb {
-            render_item($ret->findnodes('child::ld:item')->[0]);
-        };
-        push @lines_rb, "end._at(ptr) if ptr != 0";
-    }
-    elsif ($retmeta eq 'primitive')
-    {
-        my $subtype = $ret->getAttribute('ld:subtype');
-        if ($subtype eq 'stl-string') {
-            push @lines_rb, "rv = DFHack::StlString.cpp_new";
-            push @lines_rb, $call;
-            push @lines_rb, "rv";
-        } else {
-            print "Unknown return subtype for $call\n";
-            push @lines_rb, "nil";
-        }
-    }
-    else
-    {
-        print "vmethod unkret $call\n";
-        push @lines_rb, $call;
-    }
-}
-
-sub render_global_objects {
-    my (@objects) = @_;
-    my @global_objects;
-
-    local $compound_off = 0;
-    local $current_typename = 'Global';
-
-    # define all globals as 'fields' of a virtual globalobject wrapping the whole address space
-    push @lines_rb, 'class GlobalObjects < MemHack::Compound';
-    indent_rb {
-        for my $obj (@objects)
-        {
-            my $oname = $obj->getAttribute('name');
-
-            # check if the symbol is defined in xml to avoid NULL deref
-            my $addr = "DFHack.get_global_address('$oname')";
-            push @lines_rb, "addr = $addr";
-            push @lines_rb, "if addr != 0";
-            indent_rb {
-                push @lines_rb, "field(:$oname, addr) {";
-                my $item = $obj->findnodes('child::ld:item')->[0];
-                indent_rb {
-                    render_item($item);
-                };
-                push @lines_rb, "}";
-            };
-            push @lines_rb, "end";
-
-            push @global_objects, $oname;
-        }
-    };
-    push @lines_rb, "end";
-
-    # define friendlier accessors, eg df.world -> DFHack::GlobalObjects.new._at(0).world
-    indent_rb {
-        push @lines_rb, "Global = GlobalObjects.new._at(0)";
-        for my $oname (@global_objects)
-        {
-            push @lines_rb, "if DFHack.get_global_address('$oname') != 0";
-            indent_rb {
-                push @lines_rb, "def self.$oname ; Global.$oname ; end";
-                push @lines_rb, "def self.$oname=(v) ; Global.$oname = v ; end";
-            };
-            push @lines_rb, "end";
-        }
-    };
-}
-
-
-my %align_cache;
-my %sizeof_cache;
-
-sub align_field {
-    my ($off, $fldalign) = @_;
-    my $dt = $off % $fldalign;
-    $off += $fldalign - $dt if $dt > 0;
-    return $off;
-}
-
-sub get_field_align {
-    my ($field) = @_;
-    my $al = $SIZEOF_PTR;
-    my $meta = $field->getAttribute('ld:meta');
-
-    if ($meta eq 'number') {
-        $al = sizeof($field);
-        # linux aligns int64_t to $SIZEOF_PTR, windows to 8
-        # floats are 4 bytes so no pb
-        $al = 4 if ($al > 4 and (($os eq 'linux' and $arch == 32) or $al != 8));
-    } elsif ($meta eq 'global') {
-        $al = get_global_align($field);
-    } elsif ($meta eq 'compound') {
-        $al = get_compound_align($field);
-    } elsif ($meta eq 'static-array') {
-        my $tg = $field->findnodes('child::ld:item')->[0];
-        $al = get_field_align($tg);
-    } elsif ($meta eq 'bytes') {
-        $al = $field->getAttribute('alignment') || 1;
-    } elsif ($meta eq 'primitive') {
-        my $subtype = $field->getAttribute('ld:subtype');
-        if ($subtype eq 'stl-fstream' and $os eq 'windows') { $al = 8; }
-    }
-
-    return $al;
-}
-
-sub get_global_align {
-    my ($field) = @_;
-
-    my $typename = $field->getAttribute('type-name');
-    return $align_cache{$typename} if $align_cache{$typename};
-
-    my $g = $global_types{$typename};
-
-    my $st = $field->getAttribute('ld:subtype') || '';
-    if ($st eq 'bitfield' or $st eq 'enum' or $g->getAttribute('ld:meta') eq 'bitfield-type')
-    {
-        my $base = $field->getAttribute('base-type') || $g->getAttribute('base-type') || 'uint32_t';
-        print "$st type $base\n" if $base !~ /int(\d+)_t/;
-        # dont cache, field->base-type may differ
-        return $1/8;
-    }
-
-    my $al = 1;
-    for my $gf ($g->findnodes('child::ld:field')) {
-        my $fld_al = get_field_align($gf);
-        $al = $fld_al if $fld_al > $al;
-    }
-    $align_cache{$typename} = $al;
-
-    return $al;
-}
-
-sub get_compound_align {
-    my ($field) = @_;
-
-    my $st = $field->getAttribute('ld:subtype') || '';
-    if ($st eq 'bitfield' or $st eq 'enum')
-    {
-        my $base = $field->getAttribute('base-type') || 'uint32_t';
-        if ($base eq 'long') {
-            return $SIZEOF_LONG;
-        }
-        print "$st type $base\n" if $base !~ /int(\d+)_t/;
-        return $1/8;
-    }
-
-    my $al = 1;
-    for my $f ($field->findnodes('child::ld:field')) {
-        my $fal = get_field_align($f);
-        $al = $fal if $fal > $al;
-    }
-
-    return $al;
-}
-
-sub get_container_count {
-    my ($field) = @_;
-    my $count = $field->getAttribute('count');
-    if ($count) {
-        return $count;
-    }
-    my $enum = $field->getAttribute('index-enum');
-    if ($enum) {
-        my $tag = $global_types{$enum};
-        return $tag->getAttribute('last-value') + 1;
-    }
-
-    return 0;
-}
-
-sub sizeof {
-    my ($field) = @_;
-    my $meta = $field->getAttribute('ld:meta');
-
-    if ($meta eq 'number') {
-        if ($field->getAttribute('ld:subtype') eq 'long') {
-            return $SIZEOF_LONG;
-        }
-
-        return $field->getAttribute('ld:bits')/8;
-
-    } elsif ($meta eq 'pointer') {
-        return $SIZEOF_PTR;
-
-    } elsif ($meta eq 'static-array') {
-        my $count = get_container_count($field);
-        my $tg = $field->findnodes('child::ld:item')->[0];
-        return $count * sizeof($tg);
-
-    } elsif ($meta eq 'bitfield-type' or $meta eq 'enum-type') {
-        my $base = $field->getAttribute('base-type') || 'uint32_t';
-        print "$meta type $base\n" if $base !~ /int(\d+)_t/;
-        return $1/8;
-
-    } elsif ($meta eq 'global') {
-        my $typename = $field->getAttribute('type-name');
-        return $sizeof_cache{$typename} if $sizeof_cache{$typename};
-
-        my $g = $global_types{$typename};
-        my $st = $field->getAttribute('ld:subtype') || '';
-        if ($st eq 'bitfield' or $st eq 'enum' or $g->getAttribute('ld:meta') eq 'bitfield-type')
-        {
-            my $base = $field->getAttribute('base-type') || $g->getAttribute('base-type') || 'uint32_t';
-            print "$st type $base\n" if $base !~ /int(\d+)_t/;
-            return $1/8;
-        }
-
-        return sizeof($g);
-
-    } elsif ($meta eq 'class-type' or $meta eq 'struct-type' or $meta eq 'compound') {
-        return sizeof_compound($field);
-
-    } elsif ($meta eq 'container') {
-        my $subtype = $field->getAttribute('ld:subtype');
-
-        if ($subtype eq 'stl-vector') {
-            if ($os eq 'linux' or $os eq 'windows') {
-                return ($arch == 64) ? 24 : 12;
-            } else {
-                print "sizeof stl-vector on $os\n";
-            }
-        } elsif ($subtype eq 'stl-bit-vector') {
-            if ($os eq 'linux') {
-                return ($arch == 64) ? 40 : 20;
-            } elsif ($os eq 'windows') {
-                return ($arch == 64) ? 32 : 16;
-            } else {
-                print "sizeof stl-bit-vector on $os\n";
-            }
-        } elsif ($subtype eq 'stl-deque') {
-            if ($os eq 'linux') {
-                return ($arch == 64) ? 80 : 40;
-            } elsif ($os eq 'windows') {
-                return ($arch == 64) ? 40 : 20;
-            } else {
-                print "sizeof stl-deque on $os\n";
-            }
-        } elsif ($subtype eq 'df-linked-list') {
-            return 3 * $SIZEOF_PTR;
-        } elsif ($subtype eq 'df-flagarray') {
-            return 2 * $SIZEOF_PTR;    # XXX length may be 4 on windows?
-        } elsif ($subtype eq 'df-static-flagarray') {
-            return $field->getAttribute('count');
-        } elsif ($subtype eq 'df-array') {
-            return 4 + $SIZEOF_PTR;   # XXX 4->2 ?
-        } else {
-            print "sizeof container $subtype\n";
-        }
-
-    } elsif ($meta eq 'primitive') {
-        my $subtype = $field->getAttribute('ld:subtype');
-
-        if ($subtype eq 'stl-string') {
-            if ($os eq 'linux') {
-                return ($arch == 64) ? 8 : 4;
-            } elsif ($os eq 'windows') {
-                return ($arch == 64) ? 32 : 24;
-            } else {
-                print "sizeof stl-string on $os\n";
-            }
-            print "sizeof stl-string\n";
-        } elsif ($subtype eq 'stl-fstream') {
-            if ($os eq 'linux') {
-                return 284; # TODO: fix on x64
-            } elsif ($os eq 'windows') {
-                return ($arch == 64) ? 280 : 192;
-            } else {
-                print "sizeof stl-fstream on $os\n";
-            }
-            print "sizeof stl-fstream\n";
-        } else {
-            print "sizeof primitive $subtype\n";
-        }
-
-    } elsif ($meta eq 'bytes') {
-        return $field->getAttribute('size');
-    } else {
-        print "sizeof $meta\n";
-    }
-}
-
-sub sizeof_compound {
-    my ($field) = @_;
-
-    my $typename = $field->getAttribute('type-name');
-    return $sizeof_cache{$typename} if $typename and $sizeof_cache{$typename};
-
-    my $meta = $field->getAttribute('ld:meta');
-
-    my $st = $field->getAttribute('ld:subtype') || '';
-    if ($st eq 'bitfield' or $st eq 'enum')
-    {
-        my $base = $field->getAttribute('base-type') || 'uint32_t';
-        if ($base eq 'long') {
-            $sizeof_cache{$typename} = $SIZEOF_LONG if $typename;
-            return $SIZEOF_LONG;
-        }
-        print "$st type $base\n" if $base !~ /int(\d+)_t/;
-        $sizeof_cache{$typename} = $1/8 if $typename;
-        return $1/8;
-    }
-
-    if ($field->getAttribute('is-union'))
-    {
-        my $sz = 0;
-        for my $f ($field->findnodes('child::ld:field'))
-        {
-            my $fsz = sizeof($f);
-            $sz = $fsz if $fsz > $sz;
-        }
-        return $sz;
-    }
-
-    my $parent = $field->getAttribute('inherits-from');
-    my $off = 0;
-    $off = $SIZEOF_PTR if ($meta eq 'class-type');
-    $off = sizeof($global_types{$parent}) if ($parent);
-
-    my $al = 1;
-    $al = $SIZEOF_PTR if ($meta eq 'class-type');
-
-    for my $f ($field->findnodes('child::ld:field'))
-    {
-        my $fa = get_field_align($f);
-        $al = $fa if $fa > $al;
-        $off = align_field($off, $fa);
-        $off += sizeof($f);
-    }
-
-    # GCC: class a { vtable; char; } ; class b:a { char c2; } -> c2 has offset 5 (Windows MSVC: offset 8)
-    $al = 1 if ($meta eq 'class-type' and $os eq 'linux');
-    $off = align_field($off, $al);
-    $sizeof_cache{$typename} = $off if $typename;
-
-    return $off;
-}
-
-
-sub render_item {
-    my ($item) = @_;
-    return if (!$item);
-
-    my $meta = $item->getAttribute('ld:meta');
-
-    my $renderer = $item_renderer{$meta};
-    if ($renderer) {
-        $renderer->($item);
-    } else {
-        print "no render item $meta\n";
-    }
-}
-
-sub render_item_global {
-    my ($item) = @_;
-
-    my $typename = $item->getAttribute('type-name');
-    my $subtype = $item->getAttribute('ld:subtype');
-
-    if ($subtype and $subtype eq 'enum') {
-        render_item_number($item);
-    } else {
-        my $rbname = rb_ucase($typename);
-        push @lines_rb, "global :$rbname";
-    }
-}
-
-sub render_item_number {
-    my ($item, $classname) = @_;
-
-    my $subtype = $item->getAttribute('ld:subtype');
-    my $meta = $item->getAttribute('ld:meta');
-    my $initvalue = $item->getAttribute('init-value');
-    $initvalue ||= -1 if $item->getAttribute('refers-to') or $item->getAttribute('ref-target');
-    my $typename = $item->getAttribute('type-name');
-    undef $typename if ($meta and $meta eq 'bitfield-type');
-    my $g = $global_types{$typename} if ($typename);
-    $typename = rb_ucase($typename) if $typename;
-    $typename = $classname if (!$typename and $subtype and $subtype eq 'enum');      # compound enum
-
-    $initvalue = 1 if ($initvalue and $initvalue eq 'true');
-    $initvalue = ":$initvalue" if ($initvalue and $typename and $initvalue =~ /[a-zA-Z]/);
-    $initvalue ||= 'nil' if $typename;
-
-    $subtype = $item->getAttribute('base-type') if (!$subtype or $subtype eq 'bitfield' or $subtype eq 'enum');
-    $subtype ||= $g->getAttribute('base-type') if ($g);
-    $subtype = 'int32_t' if (!$subtype);
-
-    if ($subtype eq 'uint64_t') {
-        push @lines_rb, 'number 64, false';
-    } elsif ($subtype eq 'int64_t') {
-        push @lines_rb, 'number 64, true';
-    } elsif ($subtype eq 'uint32_t') {
-        push @lines_rb, 'number 32, false';
-    } elsif ($subtype eq 'int32_t') {
-        push @lines_rb, 'number 32, true';
-    } elsif ($subtype eq 'uint16_t') {
-        push @lines_rb, 'number 16, false';
-    } elsif ($subtype eq 'int16_t') {
-        push @lines_rb, 'number 16, true';
-    } elsif ($subtype eq 'uint8_t') {
-        push @lines_rb, 'number 8, false';
-    } elsif ($subtype eq 'int8_t') {
-        push @lines_rb, 'number 8, true';
-    } elsif ($subtype eq 'bool') {
-        push @lines_rb, 'number 8, true';
-        $initvalue ||= 'nil';
-        $typename ||= 'BooleanEnum';
-    } elsif ($subtype eq 'long') {
-        push @lines_rb, 'number ' . $SIZEOF_LONG . ', true';
-    } elsif ($subtype eq 's-float') {
-        push @lines_rb, 'float';
-        return;
-    } elsif ($subtype eq 'd-float') {
-        push @lines_rb, 'double';
-        return;
-    } else {
-        print "no render number $subtype\n";
-        return;
-    }
-
-    $lines_rb[$#lines_rb] .= ", $initvalue" if ($initvalue);
-    $lines_rb[$#lines_rb] .= ", $typename" if ($typename);
-}
-
-sub render_item_compound {
-    my ($item) = @_;
-
-    my $subtype = $item->getAttribute('ld:subtype');
-
-    local $compound_off = 0;
-    my $classname = $current_typename . '_' . rb_ucase($item->getAttribute('ld:typedef-name'));
-    local $current_typename = $classname;
-
-    if (!$subtype || $subtype eq 'bitfield')
-    {
-        push @lines_rb, "compound(:$classname) {";
-        indent_rb {
-            # declare sizeof() only for useful compound, eg the one behind pointers
-            # that the user may want to allocate
-            my $sz = sizeof($item);
-            push @lines_rb, "sizeof $sz\n" if $compound_pointer;
-
-            if (!$subtype) {
-                local $compound_pointer = 0;
-                render_struct_fields($item);
-            } else {
-                render_bitfield_fields($item);
-            }
-        };
-        push @lines_rb, "}"
-    }
-    elsif ($subtype eq 'enum')
-    {
-        push @lines_rb, "class ::DFHack::$classname < MemHack::Enum";
-        indent_rb {
-            # declare constants
-            render_enum_fields($item);
-        };
-        push @lines_rb, "end\n";
-
-        # actual field
-        render_item_number($item, $classname);
-    }
-    else
-    {
-        print "no render compound $subtype\n";
-    }
-}
-
-sub render_item_container {
-    my ($item) = @_;
-
-    my $subtype = $item->getAttribute('ld:subtype');
-    my $rbmethod = join('_', split('-', $subtype));
-    my $tg = $item->findnodes('child::ld:item')->[0];
-    my $indexenum = $item->getAttribute('index-enum');
-    my $count = $item->getAttribute('count');
-    if ($tg)
-    {
-        if ($rbmethod eq 'df_linked_list') {
-            push @lines_rb, "$rbmethod {";
-        } else {
-            my $tglen = sizeof($tg) if $tg;
-            push @lines_rb, "$rbmethod($tglen) {";
-        }
-        indent_rb {
-            render_item($tg);
-        };
-        push @lines_rb, "}";
-    }
-    elsif ($indexenum)
-    {
-        $indexenum = rb_ucase($indexenum);
-        if ($count) {
-            push @lines_rb, "$rbmethod($count, $indexenum)";
-        } else {
-            push @lines_rb, "$rbmethod($indexenum)";
-        }
-    }
-    else
-    {
-        if ($count) {
-            push @lines_rb, "$rbmethod($count)";
-        } else {
-            push @lines_rb, "$rbmethod";
-        }
-    }
-}
-
-sub render_item_pointer {
-    my ($item) = @_;
-
-    my $tg = $item->findnodes('child::ld:item')->[0];
-    my $ary = $item->getAttribute('is-array') || '';
-
-    if ($ary eq 'true') {
-        my $tglen = sizeof($tg) if $tg;
-        push @lines_rb, "pointer_ary($tglen) {";
-    } else {
-        push @lines_rb, "pointer {";
-    }
-    indent_rb {
-        local $compound_pointer = 1;
-        render_item($tg);
-    };
-    push @lines_rb, "}";
-}
-
-sub render_item_staticarray {
-    my ($item) = @_;
-
-    my $count = get_container_count($item);
-    my $tg = $item->findnodes('child::ld:item')->[0];
-    my $tglen = sizeof($tg) if $tg;
-    my $indexenum = $item->getAttribute('index-enum');
-
-    if ($indexenum) {
-        $indexenum = rb_ucase($indexenum);
-        push @lines_rb, "static_array($count, $tglen, $indexenum) {";
-    } else {
-        push @lines_rb, "static_array($count, $tglen) {";
-    }
-    indent_rb {
-        render_item($tg);
-    };
-    push @lines_rb, "}";
-}
-
-sub render_item_primitive {
-    my ($item) = @_;
-
-    my $subtype = $item->getAttribute('ld:subtype');
-    if ($subtype eq 'stl-string') {
-        push @lines_rb, "stl_string";
-    } elsif ($subtype eq 'stl-fstream') {
-    } else {
-        print "no render primitive $subtype\n";
-    }
-}
-
-sub render_item_bytes {
-    my ($item) = @_;
-
-    my $subtype = $item->getAttribute('ld:subtype');
-    if ($subtype eq 'padding') {
-    } elsif ($subtype eq 'static-string') {
-        my $size = $item->getAttribute('size') || -1;
-        push @lines_rb, "static_string($size)";
-    } else {
-        print "no render bytes $subtype\n";
-    }
-}
-
-
-
-my $input = $ARGV[0] or die "need input xml";
-my $output = $ARGV[1] or die "need output file";
-
-my $doc = XML::LibXML->new()->parse_file($input);
-$global_types{$_->getAttribute('type-name')} = $_ foreach $doc->findnodes('/ld:data-definition/ld:global-type');
-
-# render enums first, this allows later code to refer to them directly
-my @nonenums;
-for my $name (sort { $a cmp $b } keys %global_types)
-{
-    my $type = $global_types{$name};
-    my $meta = $type->getAttribute('ld:meta');
-    if ($meta eq 'enum-type') {
-        render_global_enum($name, $type);
-    } else {
-        push @nonenums, $name;
-    }
-}
-
-# render other structs/bitfields/classes
-for my $name (@nonenums)
-{
-    my $type = $global_types{$name};
-    my $meta = $type->getAttribute('ld:meta');
-    if ($meta eq 'struct-type' or $meta eq 'class-type') {
-        render_global_class($name, $type);
-    } elsif ($meta eq 'bitfield-type') {
-        render_global_bitfield($name, $type);
-    } else {
-        print "no render global type $meta\n";
-    }
-}
-
-# render globals
-render_global_objects($doc->findnodes('/ld:data-definition/ld:global-object'));
-
-
-open FH, ">$output";
-print FH "module DFHack\n";
-print FH "$_\n" for @lines_rb;
-print FH "end\n";
-close FH;
diff --git a/plugins/ruby/item.rb b/plugins/ruby/item.rb
deleted file mode 100644
index 59477c382..000000000
--- a/plugins/ruby/item.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-module DFHack
-    class << self
-        # return an Item
-        # arg similar to unit.rb/unit_find; no arg = 'k' menu
-        def item_find(what=:selected, y=nil, z=nil)
-            if what == :selected
-                return world.items.all.binsearch(df.get_selected_item_id)
-            elsif what.kind_of?(Integer)
-                # search by id
-                return world.items.all.binsearch(what) if not z
-                # search by position
-                x = what
-                world.items.all.find { |i| i.pos.x == x and i.pos.y == y and i.pos.z == z }
-            elsif what.respond_to?(:x) or what.respond_to?(:pos)
-                world.items.all.find { |i| same_pos?(what, i) }
-            else
-                raise "what what?"
-            end
-        end
-
-        # check item flags to see if it is suitable for use as a job input material
-        def item_isfree(i, check_empty=true)
-            !i.flags.trader and
-            !i.flags.in_job and
-            !i.flags.construction and
-            !i.flags.removed and
-            !i.flags.forbid and
-            !i.flags.dump and
-            !i.flags.owned and
-            !i.flags.in_chest and   # used as hospital supply ?
-            (!i.flags.container or not check_empty or
-                !i.general_refs.find { |ir| ir.kind_of?(DFHack::GeneralRefContainsItemst) }) and
-            (!i.flags.in_inventory or
-                (!i.general_refs.find { |ir| ir.kind_of?(DFHack::GeneralRefUnitHolderst) and   # allow hauled items TODO check if holder is a thief
-                    ir.unit_tg.inventory.find { |ii| ii.item == i and ii.mode != :Hauled } } and
-                !i.general_refs.find { |ir| ir.kind_of?(DFHack::GeneralRefContainedInItemst) and
-                    !item_isfree(ir.item_tg, false) })) and
-            (!i.flags.in_building or
-                !i.general_refs.find { |ir| ir.kind_of?(DFHack::GeneralRefBuildingHolderst) and
-                    ir.building_tg.contained_items.find { |bi| bi.use_mode == 2 and bi.item == i } }) and
-            (!i.flags.on_ground or !df.map_tile_at(i).designation.hidden)      # i.flags.unk11?
-        end
-    end
-end
diff --git a/plugins/ruby/job.rb b/plugins/ruby/job.rb
deleted file mode 100644
index bf033fbb3..000000000
--- a/plugins/ruby/job.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-module DFHack
-    class << self
-        # link a job to the world
-        # allocate & set job.id, allocate a JobListLink, link to job & world.jobs.list
-        def job_link(job)
-            lastjob = world.jobs.list
-            lastjob = lastjob.next while lastjob.next
-            joblink = JobListLink.cpp_new
-            joblink.prev = lastjob
-            joblink.item = job
-            job.list_link = joblink
-            job.id = df.job_next_id
-            df.job_next_id += 1
-            lastjob.next = joblink
-        end
-
-        # attach an item to a job, flag item in_job
-        def job_attachitem(job, item, role=:Hauled, filter_idx=-1)
-            if role != :TargetContainer
-                item.flags.in_job = true
-            end
-
-            itemlink = SpecificRef.cpp_new
-            itemlink.type = :JOB
-            itemlink.job = job
-            item.specific_refs << itemlink
-
-            joblink = JobItemRef.cpp_new
-            joblink.item = item
-            joblink.role = role
-            joblink.job_item_idx = filter_idx
-            job.items << joblink
-        end
-    end
-end
diff --git a/plugins/ruby/linux32/.gitignore b/plugins/ruby/linux32/.gitignore
deleted file mode 100644
index ef44e3942..000000000
--- a/plugins/ruby/linux32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libruby*
diff --git a/plugins/ruby/linux64/.gitignore b/plugins/ruby/linux64/.gitignore
deleted file mode 100644
index ef44e3942..000000000
--- a/plugins/ruby/linux64/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libruby*
diff --git a/plugins/ruby/map.rb b/plugins/ruby/map.rb
deleted file mode 100644
index 5c6295946..000000000
--- a/plugins/ruby/map.rb
+++ /dev/null
@@ -1,344 +0,0 @@
-module DFHack
-    class << self
-        # return a map block by tile coordinates
-        # you can also use find_map_block(cursor) or anything that respond to x/y/z
-        def map_block_at(x, y=nil, z=nil)
-            x = x.pos if x.respond_to?(:pos)
-            x, y, z = x.x, x.y, x.z if x.respond_to?(:x)
-            if x >= 0 and x < world.map.x_count and y >= 0 and y < world.map.y_count and z >= 0 and z < world.map.z_count
-                world.map.block_index[x/16][y/16][z]
-            end
-        end
-
-        def map_designation_at(x, y=nil, z=nil)
-            x = x.pos if x.respond_to?(:pos)
-            x, y, z = x.x, x.y, x.z if x.respond_to?(:x)
-            if b = map_block_at(x, y, z)
-                b.designation[x%16][y%16]
-            end
-        end
-
-        def map_occupancy_at(x, y=nil, z=nil)
-            x = x.pos if x.respond_to?(:pos)
-            x, y, z = x.x, x.y, x.z if x.respond_to?(:x)
-            if b = map_block_at(x, y, z)
-                b.occupancy[x%16][y%16]
-            end
-        end
-
-        def map_tile_at(x=df.cursor, y=nil, z=nil)
-            x = x.pos if x.respond_to?(:pos)
-            x, y, z = x.x, x.y, x.z if x.respond_to?(:x)
-            b = map_block_at(x, y, z)
-            MapTile.new(b, x, y, z) if b
-        end
-
-        # yields every map block
-        def each_map_block
-            (0...world.map.x_count_block).each { |xb|
-                xl = world.map.block_index[xb]
-                (0...world.map.y_count_block).each { |yb|
-                    yl = xl[yb]
-                    (0...world.map.z_count_block).each { |z|
-                        p = yl[z]
-                        yield p if p
-                    }
-                }
-            }
-        end
-
-        # yields every map block for a given z level
-        def each_map_block_z(z)
-            (0...world.map.x_count_block).each { |xb|
-                xl = world.map.block_index[xb]
-                (0...world.map.y_count_block).each { |yb|
-                    p = xl[yb][z]
-                    yield p if p
-                }
-            }
-        end
-    end
-
-    class MapTile
-        attr_accessor :x, :y, :z, :dx, :dy, :mapblock
-        def initialize(b, x, y, z)
-            @x, @y, @z = x, y, z
-            @dx, @dy = @x&15, @y&15
-            @mapblock = b
-        end
-
-        def offset(dx, dy=nil, dz=0)
-            if dx.respond_to?(:x)
-                dz = dx.z if dx.respond_to?(:z)
-                dx, dy = dx.x, dx.y
-            end
-            df.map_tile_at(@x+dx, @y+dy, @z+dz)
-        end
-
-        def designation
-            @mapblock.designation[@dx][@dy]
-        end
-
-        def occupancy
-            @mapblock.occupancy[@dx][@dy]
-        end
-
-        def tiletype
-            @mapblock.tiletype[@dx][@dy]
-        end
-
-        def tiletype=(t)
-            @mapblock.tiletype[@dx][@dy] = t
-        end
-
-        def caption
-            Tiletype::Caption[tiletype]
-        end
-
-        def shape
-            Tiletype::Shape[tiletype]
-        end
-
-        def tilemat
-            Tiletype::Material[tiletype]
-        end
-
-        def variant
-            Tiletype::Variant[tiletype]
-        end
-
-        def special
-            Tiletype::Special[tiletype]
-        end
-
-        def direction
-            Tiletype::Direction[tiletype]
-        end
-
-        def shape_caption
-            TiletypeShape::Caption[shape]
-        end
-
-        def shape_basic
-            TiletypeShape::BasicShape[shape]
-        end
-
-        def shape_passablelow
-            TiletypeShape::PassableLow[shape]
-        end
-
-        def shape_passablehigh
-            TiletypeShape::PassableHigh[shape]
-        end
-
-        def shape_passableflow
-            TiletypeShape::PassableFlow[shape]
-        end
-
-        def shape_walkable
-            TiletypeShape::Walkable[shape]
-        end
-
-
-        # return all veins for current mapblock
-        def all_veins
-            mapblock.block_events.grep(BlockSquareEventMineralst)
-        end
-
-        # return the vein applicable to current tile
-        def vein
-            # last vein wins
-            all_veins.reverse.find { |v|
-                v.tile_bitmask.bits[@dy][@dx] > 0
-            }
-        end
-
-        # return the first BlockBurrow this tile is in (nil if none)
-        def burrow
-            mapblock.block_burrows.find { |b|
-                b.tile_bitmask.bits[@dy][@dx] > 0
-            }
-        end
-
-        # return the array of BlockBurrow this tile is in
-        def all_burrows
-            mapblock.block_burrows.find_all { |b|
-                b.tile_bitmask.bits[@dy][@dx] > 0
-            }
-        end
-
-        # return the mat_index for the current tile (if in vein)
-        def mat_index_vein
-            v = vein
-            v.inorganic_mat if v
-        end
-
-        # return the RegionMapEntry (from designation.biome)
-        def region_map_entry
-            b = mapblock.region_offset[designation.biome]
-            wd = df.world.world_data
-
-            # region coords + [[-1, -1], [0, -1], ..., [1, 1]][b]
-            # clipped to world dimensions
-            rx = df.world.map.region_x/16
-            rx -= 1 if b % 3 == 0 and rx > 0
-            rx += 1 if b % 3 == 2 and rx < wd.world_width-1
-
-            ry = df.world.map.region_y/16
-            ry -= 1 if b < 3 and ry > 0
-            ry += 1 if b > 5 and ry < wd.world_height-1
-
-            wd.region_map[rx][ry]
-        end
-
-        # return the world_data.geo_biome for current tile
-        def geo_biome
-            df.world.world_data.geo_biomes[ region_map_entry.geo_index ]
-        end
-
-        # return the world_data.geo_biome.layer for current tile
-        def stone_layer
-            geo_biome.layers[designation.geolayer_index]
-        end
-
-        # MaterialInfo: token for current tile, based on tilemat (vein, soil, plant, lava_stone...)
-        def mat_info
-            case tilemat
-            when :SOIL
-                base = stone_layer
-                if !df.world.raws.inorganics[base.mat_index].flags[:SOIL_ANY]
-                    base = geo_biome.layers.find_all { |l| df.world.raws.inorganics[l.mat_index].flags[:SOIL_ANY] }.last
-                end
-                mat_index = (base ? base.mat_index : rand(df.world.raws.inorganics.length))
-                MaterialInfo.new(0, mat_index)
-
-            when :STONE
-                base = stone_layer
-                if df.world.raws.inorganics[base.mat_index].flags[:SOIL_ANY]
-                    base = geo_biome.layers.find { |l| !df.world.raws.inorganics[l.mat_index].flags[:SOIL_ANY] }
-                end
-                mat_index = (base ? base.mat_index : rand(df.world.raws.inorganics.length))
-                MaterialInfo.new(0, mat_index)
-
-            when :MINERAL
-                mat_index = (mat_index_vein || stone_layer.mat_index)
-                MaterialInfo.new(0, mat_index)
-
-            when :LAVA_STONE
-                # XXX this is wrong
-                # maybe should search world.region_details.pos == biome_region_pos ?
-                idx = mapblock.region_offset[designation.biome]
-                mat_index = df.world.world_data.region_details[idx].lava_stone
-                MaterialInfo.new(0, mat_index)
-
-            when :FEATURE
-                if designation.feature_local
-                    mx = mapblock.region_pos.x
-                    my = mapblock.region_pos.y
-                    df.decode_mat(df.world.world_data.feature_map[mx/16][my/16].features.feature_init[mx%16][my%16][mapblock.local_feature])
-                elsif designation.feature_global
-                    df.decode_mat(df.world.world_data.underground_regions[mapblock.global_feature].feature_init)
-                else
-                    MaterialInfo.new(-1, -1)
-                end
-
-            when :FROZEN_LIQUID
-                MaterialInfo.new('WATER')
-
-            # TODO
-            #when :PLANT
-            #when :GRASS_DARK, :GRASS_DEAD, :GRASS_DRY, :GRASS_LIGHT
-            #when :CONSTRUCTION
-            else    # AIR ASHES BROOK CAMPFIRE DRIFTWOOD FIRE HFS MAGMA POOL RIVER
-                MaterialInfo.new(-1, -1)
-            end
-        end
-
-        def mat_type
-            mat_info.mat_type
-        end
-
-        def mat_index
-            mat_info.mat_index
-        end
-
-        def inspect
-            "#<MapTile pos=[#@x, #@y, #@z] shape=#{shape} tilemat=#{tilemat} material=#{mat_info.token}>"
-        end
-
-        def dig(mode=:Default)
-            if mode == :Smooth
-                if (tilemat == :STONE or tilemat == :MINERAL) and caption !~ /smooth|pillar|fortification/i and   # XXX caption..
-                    designation.smooth == 0 and (designation.hidden or not df.world.jobs.list.find { |j|
-                        # the game removes 'smooth' designation as soon as it assigns a job, if we
-                        # re-set it the game may queue another :DetailWall that will carve a fortification
-                        (j.job_type == :DetailWall or j.job_type == :DetailFloor) and df.same_pos?(j, self)
-                    })
-                    designation.dig = :No
-                    designation.smooth = 1
-                    mapblock.flags.designated = true
-                end
-            else
-                return if mode != :No and designation.dig == :No and not designation.hidden and df.world.jobs.list.find { |j|
-                    # someone already enroute to dig here, avoid 'Inappropriate dig square' spam
-                    JobType::Type[j.job_type] == :Digging and df.same_pos?(j, self)
-                }
-                designation.dig = mode
-                mapblock.flags.designated = true if mode != :No
-            end
-        end
-
-        def spawn_liquid(quantity, is_magma=false, flowing=true)
-            designation.flow_size = quantity
-            designation.liquid_type = (is_magma ? :Magma : :Water)
-            designation.flow_forbid = true if is_magma or quantity >= 4
-
-            if flowing
-                mapblock.flags.update_liquid = true
-                mapblock.flags.update_liquid_twice = true
-
-                zf = df.world.map_extras.z_level_flags[z]
-                zf.update = true
-                zf.update_twice = true
-            end
-        end
-
-        def spawn_water(quantity=7)
-            spawn_liquid(quantity)
-        end
-
-        def spawn_magma(quantity=7)
-            spawn_liquid(quantity, true)
-        end
-
-        # yield a serie of tiles until the block returns true, returns the matching tile
-        # the yielded tiles form a (squared) spiral centered here in the current zlevel
-        # eg for radius 4, yields (-4, -4), (-4, -3), .., (-4, 3),
-        #   (-4, 4), (-3, 4), .., (4, 4), .., (4, -4), .., (-3, -4)
-        # then move on to radius 5
-        def spiral_search(maxradius=100, minradius=0, step=1)
-            if minradius == 0
-                    return self if yield self
-                    minradius += step
-            end
-
-            sides = [[0, 1], [1, 0], [0, -1], [-1, 0]]
-            (minradius..maxradius).step(step) { |r|
-                sides.length.times { |s|
-                    dxr, dyr = sides[(s-1) % sides.length]
-                    dx, dy = sides[s]
-                    (-r...r).step(step) { |v|
-                        t = offset(dxr*r + dx*v, dyr*r + dy*v)
-                        return t if t and yield t
-                    }
-                }
-            }
-            nil
-        end
-
-        # returns dx^2+dy^2+dz^2
-        def distance_to(ot)
-            (x-ot.x)**2 + (y-ot.y)**2 + (z-ot.z)**2
-        end
-    end
-end
diff --git a/plugins/ruby/material.rb b/plugins/ruby/material.rb
deleted file mode 100644
index ca0a64779..000000000
--- a/plugins/ruby/material.rb
+++ /dev/null
@@ -1,203 +0,0 @@
-module DFHack
-    class MaterialInfo
-        attr_accessor :mat_type, :mat_index
-        attr_accessor :mode, :material, :creature, :figure, :plant, :inorganic
-        def initialize(what, idx=nil)
-            case what
-            when Integer
-                @mat_type, @mat_index = what, idx
-                decode_type_index
-            when String
-                decode_string(what)
-            else
-                @mat_type, @mat_index = what.mat_type, what.mat_index
-                decode_type_index
-            end
-        end
-
-        CREATURE_BASE = 19
-        FIGURE_BASE = CREATURE_BASE+200
-        PLANT_BASE = FIGURE_BASE+200
-        END_BASE = PLANT_BASE+200
-
-        # interpret the mat_type and mat_index fields
-        def decode_type_index
-            if @mat_index < 0 or @mat_type >= END_BASE
-                @mode = :Builtin
-                @material = df.world.raws.mat_table.builtin[@mat_type]
-
-            elsif @mat_type >= PLANT_BASE
-                @mode = :Plant
-                @plant = df.world.raws.plants.all[@mat_index]
-                @material = @plant.material[@mat_type-PLANT_BASE] if @plant
-
-            elsif @mat_type >= FIGURE_BASE
-                @mode = :Figure
-                @figure = df.world.history.figures.binsearch(@mat_index)
-                @creature = df.world.raws.creatures.all[@figure.race] if @figure
-                @material = @creature.material[@mat_type-FIGURE_BASE] if @creature
-
-            elsif @mat_type >= CREATURE_BASE
-                @mode = :Creature
-                @creature = df.world.raws.creatures.all[@mat_index]
-                @material = @creature.material[@mat_type-CREATURE_BASE] if @creature
-
-            elsif @mat_type > 0
-                @mode = :Builtin
-                @material = df.world.raws.mat_table.builtin[@mat_type]
-
-            elsif @mat_type == 0
-                @mode = :Inorganic
-                @inorganic = df.world.raws.inorganics[@mat_index]
-                @material = @inorganic.material if @inorganic
-            end
-        end
-
-        def decode_string(str)
-            parts = str.split(':')
-            case parts[0].chomp('_MAT')
-            when 'INORGANIC', 'STONE', 'METAL'
-                decode_string_inorganic(parts)
-            when 'PLANT'
-                decode_string_plant(parts)
-            when 'CREATURE'
-                if parts[3] and parts[3] != 'NONE'
-                    decode_string_figure(parts)
-                else
-                    decode_string_creature(parts)
-                end
-            when 'INVALID'
-                @mat_type = parts[1].to_i
-                @mat_index = parts[2].to_i
-            else
-                decode_string_builtin(parts)
-            end
-        end
-
-        def decode_string_inorganic(parts)
-            @@inorganics_index ||= (0...df.world.raws.inorganics.length).inject({}) { |h, i| h.update df.world.raws.inorganics[i].id => i }
-
-            @mode = :Inorganic
-            @mat_type = 0
-
-            if parts[1] and parts[1] != 'NONE'
-                @mat_index = @@inorganics_index[parts[1]]
-                raise "invalid inorganic token #{parts.join(':').inspect}" if not @mat_index
-                @inorganic = df.world.raws.inorganics[@mat_index]
-                @material = @inorganic.material
-            end
-        end
-
-        def decode_string_builtin(parts)
-            @@builtins_index ||= (1...df.world.raws.mat_table.builtin.length).inject({}) { |h, i| b = df.world.raws.mat_table.builtin[i] ; b ? h.update(b.id => i) : h }
-
-            @mode = :Builtin
-            @mat_index = -1
-            @mat_type = @@builtins_index[parts[0]]
-            raise "invalid builtin token #{parts.join(':').inspect}" if not @mat_type
-            @material = df.world.raws.mat_table.builtin[@mat_type]
-
-            if parts[0] == 'COAL' and parts[1]
-                @mat_index = ['COKE', 'CHARCOAL'].index(parts[1]) || -1
-            end
-        end
-
-        def decode_string_creature(parts)
-            @@creatures_index ||= (0...df.world.raws.creatures.all.length).inject({}) { |h, i| h.update df.world.raws.creatures.all[i].creature_id => i }
-
-            @mode = :Creature
-
-            if parts[1] and parts[1] != 'NONE'
-                @mat_index = @@creatures_index[parts[1]]
-                raise "invalid creature token #{parts.join(':').inspect}" if not @mat_index
-                @creature = df.world.raws.creatures.all[@mat_index]
-            end
-
-            if @creature and parts[2] and parts[2] != 'NONE'
-                @mat_type = @creature.material.index { |m| m.id == parts[2] }
-                @material = @creature.material[@mat_type]
-                @mat_type += CREATURE_BASE
-            end
-        end
-
-        def decode_string_figure(parts)
-            @mode = :Figure
-            @mat_index = parts[3].to_i
-            @figure = df.world.history.figures.binsearch(@mat_index)
-            raise "invalid creature histfig #{parts.join(':').inspect}" if not @figure
-
-            @creature = df.world.raws.creatures.all[@figure.race]
-            if parts[1] and parts[1] != 'NONE'
-                raise "invalid histfig race #{parts.join(':').inspect}" if @creature.creature_id != parts[1]
-            end
-
-            if @creature and parts[2] and parts[2] != 'NONE'
-                @mat_type = @creature.material.index { |m| m.id == parts[2] }
-                @material = @creature.material[@mat_type]
-                @mat_type += FIGURE_BASE
-            end
-        end
-
-        def decode_string_plant(parts)
-            @@plants_index ||= (0...df.world.raws.plants.all.length).inject({}) { |h, i| h.update df.world.raws.plants.all[i].id => i }
-
-            @mode = :Plant
-
-            if parts[1] and parts[1] != 'NONE'
-                @mat_index = @@plants_index[parts[1]]
-                raise "invalid plant token #{parts.join(':').inspect}" if not @mat_index
-                @plant = df.world.raws.plants.all[@mat_index]
-            end
-
-            if @plant and parts[2] and parts[2] != 'NONE'
-                @mat_type = @plant.material.index { |m| m.id == parts[2] }
-                raise "invalid plant type #{parts.join(':').inspect}" if not @mat_type
-                @material = @plant.material[@mat_type]
-                @mat_type += PLANT_BASE
-            end
-        end
-
-        # delete the caches of raws id => index used in decode_string
-        def self.flush_raws_cache
-            @@inorganics_index = @@plants_index = @@creatures_index = @@builtins_index = nil
-        end
-
-        def token
-            out = []
-            case @mode
-            when :Builtin
-                out << (@material ? @material.id : 'NONE')
-                out << (['COKE', 'CHARCOAL'][@mat_index] || 'NONE') if @material and @material.id == 'COAL' and @mat_index >= 0
-            when :Inorganic
-                out << 'INORGANIC'
-                out << @inorganic.id if @inorganic
-            when :Plant
-                out << 'PLANT_MAT'
-                out << @plant.id if @plant
-                out << @material.id if @plant and @material
-            when :Creature, :Figure
-                out << 'CREATURE_MAT'
-                out << @creature.creature_id if @creature
-                out << @material.id if @creature and @material
-                out << @figure.id.to_s if @creature and @material and @figure
-            else
-                out << 'INVALID'
-                out << @mat_type.to_s
-                out << @mat_index.to_s
-            end
-            out.join(':')
-        end
-
-        def to_s ; token ; end
-
-        def ===(other)
-            other.mat_index == mat_index and other.mat_type == mat_type
-        end
-    end
-
-    class << self
-        def decode_mat(what, idx=nil)
-            MaterialInfo.new(what, idx)
-        end
-    end
-end
diff --git a/plugins/ruby/osx32/.gitignore b/plugins/ruby/osx32/.gitignore
deleted file mode 100644
index ef44e3942..000000000
--- a/plugins/ruby/osx32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libruby*
diff --git a/plugins/ruby/osx64/.gitignore b/plugins/ruby/osx64/.gitignore
deleted file mode 100644
index ef44e3942..000000000
--- a/plugins/ruby/osx64/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libruby*
diff --git a/plugins/ruby/plant.rb b/plugins/ruby/plant.rb
deleted file mode 100644
index 2f5a1c7c4..000000000
--- a/plugins/ruby/plant.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-module DFHack
-    class << self
-        # return a Plant
-        # arg similar to unit.rb/unit_find, no menu
-        def plant_find(what=cursor)
-            if what.kind_of?(Integer)
-                world.items.all.binsearch(what)
-            elsif what.respond_to?(:x) or what.respond_to?(:pos)
-                world.plants.all.find { |p| same_pos?(what, p) }
-            else
-                raise "what what?"
-            end
-        end
-
-        def each_tree(material=:any)
-            @raws_tree_name ||= {}
-            if @raws_tree_name.empty?
-                df.world.raws.plants.all.each_with_index { |p, idx|
-                    @raws_tree_name[idx] = p.id if p.flags[:TREE]
-                }
-            end
-
-            if material != :any
-                mat = match_rawname(material, @raws_tree_name.values)
-                unless wantmat = @raws_tree_name.index(mat)
-                    raise "invalid tree material #{material}"
-                end
-            end
-
-            world.plants.all.each { |plant|
-                next if not @raws_tree_name[plant.material]
-                next if wantmat and plant.material != wantmat
-                yield plant
-            }
-        end
-
-        def each_shrub(material=:any)
-            @raws_shrub_name ||= {}
-            if @raws_tree_name.empty?
-                df.world.raws.plants.all.each_with_index { |p, idx|
-                    @raws_shrub_name[idx] = p.id if not p.flags[:GRASS] and not p.flags[:TREE]
-                }
-            end
-
-            if material != :any
-                mat = match_rawname(material, @raws_shrub_name.values)
-                unless wantmat = @raws_shrub_name.index(mat)
-                    raise "invalid shrub material #{material}"
-                end
-            end
-        end
-
-        SaplingToTreeAge = 120960
-        def cuttrees(material=nil, count_max=100, quiet=false)
-            if !material
-                # list trees
-                cnt = Hash.new(0)
-                each_tree { |plant|
-                    next if plant.grow_counter < SaplingToTreeAge
-                    next if map_designation_at(plant).hidden
-                    cnt[plant.material] += 1
-                }
-                cnt.sort_by { |mat, c| c }.each { |mat, c|
-                    name = @raws_tree_name[mat]
-                    puts " #{name} #{c}" unless quiet
-                }
-            else
-                cnt = 0
-                each_tree(material) { |plant|
-                    next if plant.grow_counter < SaplingToTreeAge
-                    b = map_block_at(plant)
-                    d = b.designation[plant.pos.x%16][plant.pos.y%16]
-                    next if d.hidden
-                    if d.dig == :No
-                        d.dig = :Default
-                        b.flags.designated = true
-                        cnt += 1
-                        break if cnt == count_max
-                    end
-                }
-                puts "Updated #{cnt} plant designations" unless quiet
-            end
-        end
-
-        def growtrees(material=nil, count_max=100, quiet=false)
-            if !material
-                # list plants
-                cnt = Hash.new(0)
-                each_tree { |plant|
-                    next if plant.grow_counter >= SaplingToTreeAge
-                    next if map_designation_at(plant).hidden
-                    cnt[plant.material] += 1
-                }
-                cnt.sort_by { |mat, c| c }.each { |mat, c|
-                    name = @raws_tree_name[mat]
-                    puts " #{name} #{c}" unless quiet
-                }
-            else
-                cnt = 0
-                each_tree(material) { |plant|
-                    next if plant.grow_counter >= SaplingToTreeAge
-                    next if map_designation_at(plant).hidden
-                    plant.grow_counter = SaplingToTreeAge
-                    cnt += 1
-                    break if cnt == count_max
-                }
-                puts "Grown #{cnt} saplings" unless quiet
-            end
-        end
-    end
-end
diff --git a/plugins/ruby/ruby-autogen-defs.rb b/plugins/ruby/ruby-autogen-defs.rb
deleted file mode 100644
index 162914e32..000000000
--- a/plugins/ruby/ruby-autogen-defs.rb
+++ /dev/null
@@ -1,1034 +0,0 @@
-# definition of classes used by ruby-autogen
-$sizeof_ptr = case RUBY_PLATFORM
-              when /x86_64|x64/i; 64
-              else 32
-              end
-
-module DFHack
-    def self.memory_read_int64(addr)
-        (memory_read_int32(addr) & 0xffffffff) + (memory_read_int32(addr+4) << 32)
-    end
-    def self.memory_write_int64(addr, v)
-        memory_write_int32(addr, v & 0xffffffff) ; memory_write_int32(addr+4, v>>32)
-    end
-    if $sizeof_ptr == 64
-        def self.memory_read_ptr(addr)
-            memory_read_int64(addr) & 0xffffffff_ffffffff
-        end
-        def self.memory_write_ptr(addr, v)
-            memory_write_int64(addr, v)
-        end
-    else
-        def self.memory_read_ptr(addr)
-            memory_read_int32(addr) & 0xffffffff
-        end
-        def self.memory_write_ptr(addr, v)
-            memory_write_int32(addr, v)
-        end
-    end
-
-    module MemHack
-        INSPECT_SIZE_LIMIT=16384
-        class MemStruct
-            attr_accessor :_memaddr
-            def _at(addr) ; d = dup ; d._memaddr = addr ; d ; end
-            def _get ; self ; end
-            def _cpp_init ; end
-            def _cpp_delete ; end
-        end
-
-        class Compound < MemStruct
-            class << self
-                attr_accessor :_fields, :_rtti_classname, :_sizeof
-                def field(name, offset)
-                    struct = yield
-                    return if not struct
-                    @_fields ||= []
-                    @_fields << [name, offset, struct]
-                    define_method(name) { struct._at(@_memaddr+offset)._get }
-                    define_method("#{name}=") { |v| struct._at(@_memaddr+offset)._set(v) }
-                end
-                def _fields_ancestors
-                    if superclass.respond_to?(:_fields_ancestors)
-                        superclass._fields_ancestors + _fields.to_a
-                    else
-                        _fields.to_a
-                    end
-                end
-
-                def number(bits, signed, initvalue=nil, enum=nil)
-                    Number.new(bits, signed, initvalue, enum)
-                end
-                def float
-                    Float.new
-                end
-                def double
-                    Double.new
-                end
-                def bit(shift, enum=nil)
-                    BitField.new(shift, 1, enum)
-                end
-                def bits(shift, len, enum=nil)
-                    BitField.new(shift, len, enum)
-                end
-                def pointer
-                    Pointer.new((yield if block_given?))
-                end
-                def pointer_ary(tglen)
-                    PointerAry.new(tglen, yield)
-                end
-                def static_array(len, tglen, indexenum=nil)
-                    StaticArray.new(tglen, len, indexenum, yield)
-                end
-                def static_string(len)
-                    StaticString.new(len)
-                end
-
-                def stl_vector(tglen=nil)
-                    tg = yield if tglen
-                    case tglen
-                    when 1; StlVector8.new(tg)
-                    when 2; StlVector16.new(tg)
-                    when 4; StlVector32.new(tg)
-                    when 8; StlVector64.new(tg)
-                    else StlVector32.new(tg)
-                    end
-                end
-                def stl_string
-                    StlString.new
-                end
-                def stl_bit_vector
-                    StlBitVector.new
-                end
-                def stl_deque(tglen)
-                    StlDeque.new(tglen, yield)
-                end
-
-                def df_flagarray(indexenum=nil)
-                    DfFlagarray.new(indexenum)
-                end
-                def df_static_flagarray(len, indexenum=nil)
-                    DfStaticFlagarray.new(len, indexenum)
-                end
-                def df_array(tglen)
-                    DfArray.new(tglen, yield)
-                end
-                def df_linked_list
-                    DfLinkedList.new(yield)
-                end
-
-                def global(glob)
-                    Global.new(glob)
-                end
-                def compound(name=nil, &b)
-                    m = Class.new(Compound)
-                    DFHack.const_set(name, m) if name
-                    m.class_eval(&b)
-                    m.new
-                end
-                def rtti_classname(n)
-                    DFHack.rtti_register(n, self)
-                    @_rtti_classname = n
-                end
-                def sizeof(n)
-                    @_sizeof = n
-                end
-
-                # allocate a new c++ object, return its ruby wrapper
-                def cpp_new(init=nil)
-                    ptr = DFHack.malloc(_sizeof)
-                    if _rtti_classname and vt = DFHack.rtti_getvtable(_rtti_classname)
-                        DFHack.memory_write_ptr(ptr, vt)
-                        # TODO call constructor
-                    end
-                    o = new._at(ptr)
-                    o._cpp_init
-                    o._set(init) if init
-                    o
-                end
-            end
-            def _cpp_init
-                _fields_ancestors.each { |n, o, s| s._at(@_memaddr+o)._cpp_init }
-            end
-            def _cpp_delete
-                # cannot call delete on compound members (would call free on member address)
-                #_fields_ancestors.each { |n, o, s| s._at(@_memaddr+o)._cpp_delete }
-                DFHack.free(@_memaddr)
-                @_memaddr = nil     # turn future segfaults in harmless ruby exceptions
-            end
-            def _set(h)
-                case h
-                when Hash; h.each { |k, v| send("#{k}=", v) }
-                when Array; names = _field_names ; raise 'bad size' if names.length != h.length ; names.zip(h).each { |n, a| send("#{n}=", a) }
-                else _field_names.each { |n| send("#{n}=", h.send(n)) }
-                end
-            end
-            def _fields ; self.class._fields.to_a ; end
-            def _fields_ancestors ; self.class._fields_ancestors.to_a ; end
-            def _field_names ; _fields_ancestors.map { |n, o, s| n } ; end
-            def _rtti_classname ; self.class._rtti_classname ; end
-            def _raw_rtti_classname ; df.get_rtti_classname(df.get_vtable_ptr(@_memaddr)) if self.class._rtti_classname ; end
-            def _sizeof ; self.class._sizeof ; end
-            def ==(o) ; o.kind_of?(Compound) and o._memaddr == _memaddr ; end
-
-            @@inspecting = {} # avoid infinite recursion on mutually-referenced objects
-            def inspect
-                cn = self.class.name.sub(/^DFHack::/, '')
-                out = "#<#{cn}"
-                return out << ' ...>' if @@inspecting[_memaddr]
-                @@inspecting[_memaddr] = true
-                _fields_ancestors.each { |n, o, s|
-                    out << ' ' if out.length != 0 and out[-1, 1] != ' '
-                    if out.length > INSPECT_SIZE_LIMIT
-                        out << '...'
-                        break
-                    end
-                    out << inspect_field(n, o, s)
-                }
-                out.chomp!(' ')
-                @@inspecting.delete _memaddr
-                out << '>'
-            end
-            def inspect_field(n, o, s)
-                if s.kind_of?(BitField) and s._len == 1 and not s._enum
-                    send(n) ? n.to_s : ''
-                elsif s.kind_of?(Pointer)
-                    "#{n}=#{s._at(@_memaddr+o).inspect}"
-                elsif n == :_whole
-                    "_whole=0x#{_whole.to_s(16)}"
-                else
-                    v = send(n).inspect
-                    "#{n}=#{v}"
-                end
-            rescue
-                "#{n}=ERR(#{$!})"
-            end
-        end
-
-        class OtherVectors < Compound
-            class << self
-                attr_accessor :_enum
-                def ienum(enum)
-                    @_enum = enum
-                end
-            end
-
-            def _indexenum
-                self.class._enum
-            end
-            def [](i)
-                self.send(self.class._enum.sym(i))
-            end
-            def []=(i, v)
-                self.send((self.class._enum.sym(i).to_s + "=").to_sym, v)
-            end
-        end
-
-        class Enum
-            # number -> symbol
-            def self.enum
-                # ruby weirdness, needed to make the constants 'virtual'
-                @enum ||= const_get(:ENUM)
-            end
-            # symbol -> number
-            def self.nume
-                @nume ||= const_get(:NUME)
-            end
-
-            def self.int(i, allow_bad_sym=false)
-                raise ArgumentError, "invalid enum member #{i} of #{self}" if i.kind_of?(::Symbol) and not allow_bad_sym and not nume.has_key?(i)
-                nume[i] || i
-            end
-            def self.sym(i)
-                enum[i] || i
-            end
-        end
-
-        class Number < MemStruct
-            attr_accessor :_bits, :_signed, :_initvalue, :_enum
-            def initialize(bits, signed, initvalue, enum)
-                @_bits = bits
-                @_signed = signed
-                @_initvalue = initvalue
-                @_enum = enum
-            end
-
-            def _get
-                v = case @_bits
-                    when 64; DFHack.memory_read_int64(@_memaddr)
-                    when 32; DFHack.memory_read_int32(@_memaddr)
-                    when 16; DFHack.memory_read_int16(@_memaddr)
-                    when 8;  DFHack.memory_read_int8( @_memaddr)
-                    end
-                v &= (1 << @_bits) - 1 if not @_signed
-                v = @_enum.sym(v) if @_enum
-                v
-            end
-
-            def _set(v)
-                v = @_enum.int(v) if @_enum
-                case @_bits
-                when 64; DFHack.memory_write_int64(@_memaddr, v)
-                when 32; DFHack.memory_write_int32(@_memaddr, v)
-                when 16; DFHack.memory_write_int16(@_memaddr, v)
-                when 8;  DFHack.memory_write_int8( @_memaddr, v)
-                end
-            end
-
-            def _cpp_init
-                _set(@_initvalue) if @_initvalue
-            end
-        end
-        class Float < MemStruct
-            def _get
-                DFHack.memory_read_float(@_memaddr)
-            end
-
-            def _set(v)
-                DFHack.memory_write_float(@_memaddr, v)
-            end
-
-            def _cpp_init
-                _set(0.0)
-            end
-        end
-        class Double < MemStruct
-            def _get
-                DFHack.memory_read_double(@_memaddr)
-            end
-
-            def _set(v)
-                DFHack.memory_write_double(@_memaddr, v)
-            end
-
-            def _cpp_init
-                _set(0.0)
-            end
-        end
-        class BitField < MemStruct
-            attr_accessor :_shift, :_len, :_enum
-            def initialize(shift, len, enum=nil)
-                @_shift = shift
-                @_len = len
-                @_enum = enum
-            end
-            def _mask
-                (1 << @_len) - 1
-            end
-
-            def _get
-                v = DFHack.memory_read_int32(@_memaddr) >> @_shift
-                if @_len == 1 and not @_enum
-                    ((v & 1) == 0) ? false : true
-                else
-                    v &= _mask
-                    v = @_enum.sym(v) if @_enum
-                    v
-                end
-            end
-
-            def _set(v)
-                if @_len == 1 and (not @_enum or v == false or v == true)
-                    # allow 'bit = 0'
-                    v = (v && v != 0 ? 1 : 0)
-                end
-                v = @_enum.int(v) if @_enum
-                v = (v & _mask) << @_shift
-
-                ori = DFHack.memory_read_int32(@_memaddr) & 0xffffffff
-                DFHack.memory_write_int32(@_memaddr, ori - (ori & ((-1 & _mask) << @_shift)) + v)
-            end
-        end
-
-        class Pointer < MemStruct
-            attr_accessor :_tg
-            def initialize(tg)
-                @_tg = tg
-            end
-
-            def _getp
-                DFHack.memory_read_ptr(@_memaddr)
-            end
-
-            def _setp(v)
-                DFHack.memory_write_ptr(@_memaddr, v)
-            end
-
-            def _get
-                addr = _getp
-                return if addr == 0
-                return addr if not @_tg
-                @_tg._at(addr)._get
-            end
-
-            # XXX shaky...
-            def _set(v)
-                case v
-                when Pointer;   DFHack.memory_write_ptr(@_memaddr, v._getp)
-                when MemStruct; DFHack.memory_write_ptr(@_memaddr, v._memaddr)
-                when Integer
-                    if @_tg and @_tg.kind_of?(MemHack::Number)
-                        if _getp == 0
-                            _setp(DFHack.malloc(@_tg._bits/8))
-                        end
-                        @_tg._at(_getp)._set(v)
-                    else
-                        DFHack.memory_write_ptr(@_memaddr, v)
-                    end
-                when nil;       DFHack.memory_write_ptr(@_memaddr, 0)
-                else @_tg._at(_getp)._set(v)
-                end
-            end
-
-            def inspect
-                ptr = _getp
-                if ptr == 0
-                    'NULL'
-                else
-                    cn = ''
-                    cn = @_tg.class.name.sub(/^DFHack::/, '').sub(/^MemHack::/, '') if @_tg
-                    cn = @_tg._glob if cn == 'Global'
-                    "#<Pointer #{cn} #{'0x%X' % _getp}>"
-                end
-            end
-        end
-        class PointerAry < MemStruct
-            attr_accessor :_tglen, :_tg
-            def initialize(tglen, tg)
-                @_tglen = tglen
-                @_tg = tg
-            end
-
-            def _getp(i=0)
-                delta = (i != 0 ? i*@_tglen : 0)
-                DFHack.memory_read_ptr(@_memaddr) + delta
-            end
-
-            def _get
-                addr = _getp
-                return if addr == 0
-                self
-            end
-
-            def _set(v)
-                case v
-                when Pointer;   DFHack.memory_write_ptr(@_memaddr, v._getp)
-                when MemStruct; DFHack.memory_write_ptr(@_memaddr, v._memaddr)
-                when Integer;   DFHack.memory_write_ptr(@_memaddr, v)
-                when nil;       DFHack.memory_write_ptr(@_memaddr, 0)
-                else raise "cannot PointerAry._set(#{v.inspect})"
-                end
-            end
-
-            def [](i)
-                addr = _getp(i)
-                return if addr == 0
-                @_tg._at(addr)._get
-            end
-            def []=(i, v)
-                addr = _getp(i)
-                raise 'null pointer' if addr == 0
-                @_tg._at(addr)._set(v)
-            end
-
-            def inspect ; ptr = _getp ; (ptr == 0) ? 'NULL' : "#<PointerAry #{'0x%X' % ptr}>" ; end
-        end
-        module Enumerable
-            include ::Enumerable
-            attr_accessor :_indexenum
-            def each ; (0...length).each { |i| yield self[i] } ; end
-            def inspect
-                out = '['
-                each_with_index { |e, idx|
-                    out << ', ' if out.length > 1
-                    if out.length > INSPECT_SIZE_LIMIT
-                        out << '...'
-                        break
-                    end
-                    out << "#{_indexenum.sym(idx)}=" if _indexenum
-                    out << e.inspect
-                }
-                out << ']'
-            end
-            def empty? ; length == 0 ; end
-            def flatten ; map { |e| e.respond_to?(:flatten) ? e.flatten : e }.flatten ; end
-            def index(e=nil, &b) ; (0...length).find { |i| b ? b[self[i]] : self[i] == e } ; end
-            def map! ; (0...length).each { |i| self[i] = yield(self[i]) } ; end
-            def first ; self[0] ; end
-            def last ; self[length-1] ; end
-        end
-        class StaticArray < MemStruct
-            attr_accessor :_tglen, :_length, :_indexenum, :_tg
-            def initialize(tglen, length, indexenum, tg)
-                @_tglen = tglen
-                @_length = length
-                @_indexenum = indexenum
-                @_tg = tg
-            end
-            def _set(a)
-                a.each_with_index { |v, i| self[i] = v }
-            end
-            def _cpp_init
-                _length.times { |i| _tgat(i)._cpp_init }
-            end
-            def _cpp_delete
-                _length.times { |i| _tgat(i)._cpp_delete }
-            end
-            alias length _length
-            alias size _length
-            def _tgat(i)
-                @_tg._at(@_memaddr + i*@_tglen) if i >= 0 and i < @_length
-            end
-            def [](i)
-                i = _indexenum.int(i) if _indexenum
-                i += @_length if i < 0
-                if t = _tgat(i)
-                    t._get
-                end
-            end
-            def []=(i, v)
-                i = _indexenum.int(i) if _indexenum
-                i += @_length if i < 0
-                if t = _tgat(i)
-                    t._set(v)
-                else
-                    raise 'index out of bounds'
-                end
-            end
-
-            include Enumerable
-        end
-        class StaticString < MemStruct
-            attr_accessor :_length
-            def initialize(length)
-                @_length = length
-            end
-            def length
-                if @_length == -1
-                    maxlen = 4096 - (@_memaddr & 0xfff)
-                    maxlen += 4096 until len = DFHack.memory_read(@_memaddr, maxlen).index("\0")
-                    len
-                else
-                    @_length
-                end
-            end
-            def _get
-                DFHack.memory_read(@_memaddr, length)
-            end
-            def _set(v)
-                DFHack.memory_write(@_memaddr, v[0, length])
-            end
-        end
-
-        class StlVector32 < MemStruct
-            attr_accessor :_tg
-            def initialize(tg)
-                @_tg = tg || Number.new(32, false, 0, nil)
-            end
-
-            def length
-                DFHack.memory_vector32_length(@_memaddr)
-            end
-            def size ; length ; end # alias wouldnt work for subclasses
-            def valueptr_at(idx)
-                DFHack.memory_vector32_ptrat(@_memaddr, idx)
-            end
-            def insert_at(idx, val)
-                DFHack.memory_vector32_insertat(@_memaddr, idx, val)
-            end
-            def delete_at(idx)
-                DFHack.memory_vector32_deleteat(@_memaddr, idx)
-            end
-
-            def _set(v)
-                delete_at(length-1) while length > v.length # match lengthes
-                v.each_with_index { |e, i| self[i] = e }    # patch entries
-            end
-
-            def self._cpp_new
-                new._at DFHack.memory_vector_new
-            end
-            def _cpp_delete
-                DFHack.memory_vector_delete(@_memaddr)
-            end
-            def _cpp_init
-                DFHack.memory_vector_init(@_memaddr)
-            end
-
-            def clear
-                delete_at(length-1) while length > 0
-            end
-            def [](idx)
-                idx += length if idx < 0
-                @_tg._at(valueptr_at(idx))._get if idx >= 0 and idx < length
-            end
-            def []=(idx, v)
-                idx += length if idx < 0
-                if idx >= length
-                    insert_at(length, 0) while idx >= length
-                elsif idx < 0
-                    raise 'index out of bounds'
-                end
-                @_tg._at(valueptr_at(idx))._set(v)
-            end
-            def push(v)
-                self[length] = v
-                self
-            end
-            def <<(v) ; push(v) ; end
-            def pop
-                l = length
-                if l > 0
-                    v = self[l-1]
-                    delete_at(l-1)
-                end
-                v
-            end
-
-            include Enumerable
-            # do a binary search in an ordered vector for a specific target attribute
-            # ex: world.history.figures.binsearch(unit.hist_figure_id)
-            def binsearch(target, field=:id)
-                o_start = 0
-                o_end = length - 1
-                while o_end >= o_start
-                    o_half = o_start + (o_end-o_start)/2
-                    obj = self[o_half]
-                    oval = obj.send(field)
-                    if oval == target
-                        return obj
-                    elsif oval < target
-                        o_start = o_half+1
-                    else
-                        o_end = o_half-1
-                    end
-                end
-            end
-        end
-        class StlVector64 < StlVector32
-            def length
-                DFHack.memory_vector64_length(@_memaddr)
-            end
-            def valueptr_at(idx)
-                DFHack.memory_vector64_ptrat(@_memaddr, idx)
-            end
-            def insert_at(idx, val)
-                DFHack.memory_vector64_insertat(@_memaddr, idx, val)
-            end
-            def delete_at(idx)
-                DFHack.memory_vector64_deleteat(@_memaddr, idx)
-            end
-        end
-        class StlVector16 < StlVector32
-            def length
-                DFHack.memory_vector16_length(@_memaddr)
-            end
-            def valueptr_at(idx)
-                DFHack.memory_vector16_ptrat(@_memaddr, idx)
-            end
-            def insert_at(idx, val)
-                DFHack.memory_vector16_insertat(@_memaddr, idx, val)
-            end
-            def delete_at(idx)
-                DFHack.memory_vector16_deleteat(@_memaddr, idx)
-            end
-        end
-        class StlVector8 < StlVector32
-            def length
-                DFHack.memory_vector8_length(@_memaddr)
-            end
-            def valueptr_at(idx)
-                DFHack.memory_vector8_ptrat(@_memaddr, idx)
-            end
-            def insert_at(idx, val)
-                DFHack.memory_vector8_insertat(@_memaddr, idx, val)
-            end
-            def delete_at(idx)
-                DFHack.memory_vector8_deleteat(@_memaddr, idx)
-            end
-        end
-        class StlBitVector < StlVector32
-            def initialize ; end
-            def length
-                DFHack.memory_vectorbool_length(@_memaddr)
-            end
-            def insert_at(idx, val)
-                DFHack.memory_vectorbool_insertat(@_memaddr, idx, val)
-            end
-            def delete_at(idx)
-                DFHack.memory_vectorbool_deleteat(@_memaddr, idx)
-            end
-            def [](idx)
-                idx += length if idx < 0
-                DFHack.memory_vectorbool_at(@_memaddr, idx) if idx >= 0 and idx < length
-            end
-            def []=(idx, v)
-                idx += length if idx < 0
-                if idx >= length
-                    insert_at(idx, v)
-                elsif idx < 0
-                    raise 'index out of bounds'
-                else
-                    DFHack.memory_vectorbool_setat(@_memaddr, idx, v)
-                end
-            end
-            def self._cpp_new
-                new._at DFHack.memory_vectorbool_new
-            end
-            def _cpp_delete
-                DFHack.memory_vectorbool_delete(@_memaddr)
-            end
-        end
-        class StlString < MemStruct
-            def _get
-                DFHack.memory_read_stlstring(@_memaddr)
-            end
-
-            def _set(v)
-                DFHack.memory_write_stlstring(@_memaddr, v)
-            end
-
-            def self._cpp_new
-                new._at DFHack.memory_stlstring_new
-            end
-            def _cpp_delete
-                DFHack.memory_stlstring_delete(@_memaddr)
-            end
-            def _cpp_init
-                DFHack.memory_stlstring_init(@_memaddr)
-            end
-        end
-        class StlDeque < MemStruct
-            attr_accessor :_tglen, :_tg
-            def initialize(tglen, tg)
-                @_tglen = tglen
-                @_tg = tg
-            end
-            # XXX DF uses stl::deque<some_struct>, so to have a C binding we'd need to single-case every
-            # possible struct size, like for StlVector. Just ignore it for now, deques are rare enough.
-            def inspect ; "#<StlDeque>" ; end
-        end
-
-        class DfFlagarray < MemStruct
-            attr_accessor :_indexenum
-            def initialize(indexenum)
-                @_indexenum = indexenum
-            end
-            def length
-                DFHack.memory_bitarray_length(@_memaddr)
-            end
-            # TODO _cpp_init, _cpp_delete
-            def size ; length ; end
-            def resize(len)
-                DFHack.memory_bitarray_resize(@_memaddr, len)
-            end
-            def [](idx)
-                idx = _indexenum.int(idx) if _indexenum
-                idx += length if idx < 0
-                DFHack.memory_bitarray_isset(@_memaddr, idx) if idx >= 0 and idx < length
-            end
-            def []=(idx, v)
-                idx = _indexenum.int(idx) if _indexenum
-                idx += length if idx < 0
-                if idx >= length or idx < 0
-                    raise 'index out of bounds'
-                else
-                    DFHack.memory_bitarray_set(@_memaddr, idx, v)
-                end
-            end
-            def inspect
-                out = "#<DfFlagarray"
-                each_with_index { |e, idx|
-                    out << " #{_indexenum ? _indexenum.sym(idx) : idx}" if e
-                }
-                out << '>'
-            end
-
-            include Enumerable
-        end
-        class DfStaticFlagarray < MemStruct
-            attr_accessor :_indexenum
-            def initialize(len, indexenum)
-                @len = len*8
-                @_indexenum = indexenum
-            end
-            def length
-                @len
-            end
-            def size ; length ; end
-            def [](idx)
-                idx = _indexenum.int(idx) if _indexenum
-                idx += length if idx < 0
-                return if idx < 0 or idx >= length
-                byte = DFHack.memory_read_int8(@_memaddr + idx/8)
-                (byte & (1 << (idx%8))) > 0
-            end
-            def []=(idx, v)
-                idx = _indexenum.int(idx) if _indexenum
-                idx += length if idx < 0
-                if idx >= length or idx < 0
-                    raise 'index out of bounds'
-                else
-                    byte = DFHack.memory_read_int8(@_memaddr + idx/8)
-                    if (v == nil or v == false or v == 0)
-                        byte &= 0xff ^ (1 << (idx%8))
-                    else
-                        byte |= (1 << (idx%8))
-                    end
-                    DFHack.memory_write_int8(@_memaddr + idx/8, byte)
-                end
-            end
-            def inspect
-                out = "#<DfStaticFlagarray"
-                each_with_index { |e, idx|
-                    out << " #{_indexenum.sym(idx)}" if e
-                }
-                out << '>'
-            end
-
-            include Enumerable
-        end
-        class DfArray < Compound
-            attr_accessor :_tglen, :_tg
-            def initialize(tglen, tg)
-                @_tglen = tglen
-                @_tg = tg
-            end
-
-            field(:_ptr, 0) { number $sizeof_ptr, false }
-            field(:_length, $sizeof_ptr/8) { number 16, false }
-
-            def length ; _length ; end
-            def size ; _length ; end
-            # TODO _cpp_init, _cpp_delete
-            def _tgat(i)
-                @_tg._at(_ptr + i*@_tglen) if i >= 0 and i < _length
-            end
-            def [](i)
-                i += _length if i < 0
-                if t = _tgat(i)
-                    t._get
-                end
-            end
-            def []=(i, v)
-                i += _length if i < 0
-                if t = _tgat(i)
-                    t._set(v)
-                else
-                    raise 'index out of bounds'
-                end
-            end
-            def _set(a)
-                a.each_with_index { |v, i| self[i] = v }
-            end
-
-            include Enumerable
-        end
-        class DfLinkedList < Compound
-            attr_accessor :_tg
-            def initialize(tg)
-                @_tg = tg
-            end
-
-            field(:_ptr, 0) { pointer }
-            field(:_prev, $sizeof_ptr/8) { pointer }
-            field(:_next, 2*$sizeof_ptr/8) { pointer }
-
-            def item
-                # With the current xml structure, currently _tg designate
-                # the type of the 'next' and 'prev' fields, not 'item'.
-                # List head has item == NULL, so we can safely return nil.
-
-                #addr = _ptr
-                #return if addr == 0
-                #@_tg._at(addr)._get
-            end
-
-            def item=(v)
-                #addr = _ptr
-                #raise 'null pointer' if not addr
-                #@_tg.at(addr)._set(v)
-                raise 'null pointer'
-            end
-
-            def prev
-                addr = _prev
-                return if not addr
-                @_tg._at(addr)._get
-            end
-
-            def next
-                addr = _next
-                return if not addr
-                @_tg._at(addr)._get
-            end
-            alias next= _next=
-            alias prev= _prev=
-
-            include Enumerable
-            def each
-                o = self
-                while o
-                    yield o.item if o.item
-                    o = o.next
-                end
-            end
-            def inspect ; "#<DfLinkedList #{item.inspect} prev=#{'0x%X' % _prev} next=#{'0x%X' % _next}>" ; end
-        end
-
-        class Global < MemStruct
-            attr_accessor :_glob
-            def initialize(glob)
-                @_glob = glob
-            end
-            def _at(addr)
-                g = DFHack.const_get(@_glob)
-                g = DFHack.rtti_getclassat(g, addr)
-                g.new._at(addr)
-            end
-            def inspect ; "#<#{@_glob}>" ; end
-        end
-
-    end
-
-    class BooleanEnum
-        def self.int(v) ; ((v == true) || (v == 1)) ? 1 : 0 ; end
-        def self.sym(v) ; (!v || (v == 0)) ? false : true ; end
-    end
-
-    class StlString < MemHack::Compound
-        field(:str, 0) { stl_string }
-
-        def self.cpp_new(init=nil)
-            s = MemHack::StlString._cpp_new
-            s._set(init) if init
-            new._at(s._memaddr)
-        end
-
-        def _cpp_delete
-            MemHack::StlString.new._at(@_memaddr+0)._cpp_delete
-            @_memaddr = nil
-        end
-    end
-
-    class StlSet
-        attr_accessor :_memaddr, :_enum
-        def self.cpp_new(init=nil, enum=nil)
-            ret = new DFHack.memory_stlset_new, enum
-            init.each { |k| ret.set(k) } if init
-            ret
-        end
-
-        def initialize(addr, enum=nil)
-            addr = nil if addr == 0
-            @_memaddr = addr
-            @_enum = enum
-        end
-
-        def isset(key)
-            raise unless @_memaddr
-            key = @_enum.int(key) if _enum
-            DFHack.memory_stlset_isset(@_memaddr, key)
-        end
-        alias is_set? isset
-
-        def set(key)
-            raise unless @_memaddr
-            key = @_enum.int(key) if _enum
-            DFHack.memory_stlset_set(@_memaddr, key)
-        end
-
-        def delete(key)
-            raise unless @_memaddr
-            key = @_enum.int(key) if _enum
-            DFHack.memory_stlset_deletekey(@_memaddr, key)
-        end
-
-        def clear
-            raise unless @_memaddr
-            DFHack.memory_stlset_clear(@_memaddr)
-        end
-
-        def _cpp_delete
-            raise unless @_memaddr
-            DFHack.memory_stlset_delete(@_memaddr)
-            @_memaddr = nil
-        end
-    end
-
-
-    # cpp rtti name -> rb class
-    @rtti_n2c = {}
-    @rtti_c2n = {}
-
-    # cpp rtti name -> vtable ptr
-    @rtti_n2v = {}
-    @rtti_v2n = {}
-
-    def self.rtti_n2c ; @rtti_n2c ; end
-    def self.rtti_c2n ; @rtti_c2n ; end
-    def self.rtti_n2v ; @rtti_n2v ; end
-    def self.rtti_v2n ; @rtti_v2n ; end
-
-    # register a ruby class with a cpp rtti class name
-    def self.rtti_register(cppname, cls)
-        @rtti_n2c[cppname] = cls
-        @rtti_c2n[cls] = cppname
-    end
-
-    # return the ruby class to use for the cpp object at address if rtti info is available
-    def self.rtti_getclassat(cls, addr)
-        if addr != 0 and @rtti_c2n[cls]
-            # rtti info exist for class => cpp object has a vtable
-            @rtti_n2c[rtti_readclassname(get_vtable_ptr(addr))] || cls
-        else
-            cls
-        end
-    end
-
-    # try to read the rtti classname from an object vtable pointer
-    def self.rtti_readclassname(vptr)
-        unless n = @rtti_v2n[vptr]
-            n = @rtti_v2n[vptr] = get_rtti_classname(vptr).to_sym
-            @rtti_n2v[n] = vptr
-        end
-        n
-    end
-
-    # return the vtable pointer from the cpp rtti name
-    def self.rtti_getvtable(cppname)
-        unless v = @rtti_n2v[cppname]
-            v = get_vtable(cppname.to_s)
-            @rtti_n2v[cppname] = v
-            @rtti_v2n[v] = cppname if v != 0
-        end
-        v if v != 0
-    end
-
-    def self.vmethod_call(obj, voff, a0=0, a1=0, a2=0, a3=0, a4=0, a5=0)
-        this = obj._memaddr
-        vt = df.get_vtable_ptr(this)
-        fptr = df.memory_read_ptr(vt + voff)
-        vmethod_do_call(this, fptr, vmethod_arg(a0), vmethod_arg(a1), vmethod_arg(a2),
-                        vmethod_arg(a3), vmethod_arg(a4), vmethod_arg(a5))
-    end
-
-    def self.vmethod_call_mem_return(obj, voff, r0=0, a0=0, a1=0, a2=0, a3=0, a4=0)
-        this = obj._memaddr
-        vt = df.get_vtable_ptr(this)
-        fptr = df.memory_read_ptr(vt + voff)
-        vmethod_do_call(vmethod_arg(r0), fptr, this, vmethod_arg(a0), vmethod_arg(a1), vmethod_arg(a2),
-                        vmethod_arg(a3), vmethod_arg(a4))
-    end
-
-    def self.vmethod_arg(arg)
-        case arg
-        when nil, false; 0
-        when true; 1
-        when Integer; arg
-        #when String; [arg].pack('p').unpack('L')[0] # raw pointer to buffer
-        when MemHack::Compound, StlSet; arg._memaddr
-        else raise "bad vmethod arg #{arg.class}"
-        end
-    end
-end
diff --git a/plugins/ruby/ruby.cpp b/plugins/ruby/ruby.cpp
deleted file mode 100644
index 0209806d1..000000000
--- a/plugins/ruby/ruby.cpp
+++ /dev/null
@@ -1,1237 +0,0 @@
-// blindly copied imports from fastdwarf
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
-#include "PluginManager.h"
-#include "VersionInfo.h"
-#include "MemAccess.h"
-#include "DataDefs.h"
-
-#include "modules/Gui.h"
-#include "df/global_objects.h"
-#include "df/building.h"
-#include "df/item.h"
-#include "df/unit.h"
-
-#include "tinythread.h"
-
-using namespace DFHack;
-
-
-
-// DFHack stuff
-
-
-static int df_loadruby(void);
-static void df_unloadruby(void);
-static void df_rubythread(void*);
-static command_result df_rubyeval(color_ostream &out, std::vector <std::string> & parameters);
-static void ruby_bind_dfhack(void);
-
-// inter-thread communication stuff
-enum RB_command {
-    RB_IDLE,
-    RB_INIT,
-    RB_DIE,
-    RB_EVAL,
-};
-tthread::mutex *m_irun;
-tthread::mutex *m_mutex;
-static volatile RB_command r_type;
-static volatile command_result r_result;
-static color_ostream *r_console;       // color_ostream given as argument, if NULL resort to console_proxy
-static const char *r_command;
-static tthread::thread *r_thread;
-static int onupdate_active;
-static int onupdate_minyear, onupdate_minyeartick=-1, onupdate_minyeartickadv=-1;
-static color_ostream_proxy *console_proxy;
-static std::vector<std::string> *dfhack_run_queue;
-
-
-DFHACK_PLUGIN("ruby")
-
-
-DFhackDataExport bool plugin_is_enabled = true;
-
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    plugin_is_enabled = enable;
-    return CR_OK;
-}
-
-
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    onupdate_active = 0;
-
-    // fail silently instead of spamming the console with 'failed to initialize'
-    // if libruby is not present, the error is still logged in stderr.log
-    if (!df_loadruby())
-        return CR_OK;
-
-    // the ruby thread sleeps trying to lock this
-    // when it gets it, it runs according to r_type
-    // when finished, it sets r_type to IDLE and unlocks
-    m_irun = new tthread::mutex();
-
-    // when any thread is going to request something to the ruby thread,
-    // lock this before anything, and release when everything is done
-    m_mutex = new tthread::mutex();
-
-    // list of dfhack commands to run when the current ruby run is done (once locks are released)
-    dfhack_run_queue = new std::vector<std::string>;
-
-    r_type = RB_INIT;
-
-    // create the dedicated ruby thread
-    // df_rubythread starts the ruby interpreter and goes to type=IDLE when done
-    r_thread = new tthread::thread(df_rubythread, 0);
-
-    // wait until init phase 1 is done
-    while (r_type != RB_IDLE)
-        tthread::this_thread::yield();
-
-    // ensure the ruby thread sleeps until we have a command to handle
-    m_irun->lock();
-
-    // check return value from rbinit
-    if (r_result == CR_FAILURE)
-        return CR_FAILURE;
-
-    commands.push_back(PluginCommand("rb_eval",
-                "Ruby interpreter. Eval() a ruby string.",
-                df_rubyeval));
-
-    commands.push_back(PluginCommand("rb",
-                "Ruby interpreter. Eval() a ruby string.",
-                df_rubyeval));
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    // if dlopen failed
-    if (!r_thread)
-        return CR_OK;
-
-    // ensure ruby thread is idle
-    m_mutex->lock();
-
-    r_type = RB_DIE;
-    r_command = NULL;
-    // start ruby thread
-    m_irun->unlock();
-
-    // wait until ruby thread ends after RB_DIE
-    r_thread->join();
-
-    // cleanup everything
-    delete r_thread;
-    r_thread = 0;
-    delete m_irun;
-    // we can release m_mutex, other users will check r_thread
-    m_mutex->unlock();
-    delete m_mutex;
-    delete dfhack_run_queue;
-
-    // dlclose libruby
-    df_unloadruby();
-
-    return CR_OK;
-}
-
-static command_result do_plugin_eval_ruby(color_ostream &out, const char *command)
-{
-    command_result ret;
-
-    // ensure ruby thread is idle
-    m_mutex->lock();
-    if (!r_thread)
-        // raced with plugin_shutdown
-        return CR_OK;
-
-    r_type = RB_EVAL;
-    r_command = command;
-    r_console = &out;
-    // wake ruby thread up
-    m_irun->unlock();
-
-    // semi-active loop until ruby thread is done
-    while (r_type != RB_IDLE)
-        tthread::this_thread::yield();
-
-    ret = r_result;
-    r_console = NULL;
-
-    // block ruby thread
-    m_irun->lock();
-    // let other plugin_eval_ruby run
-    m_mutex->unlock();
-
-    return ret;
-}
-
-// send a single ruby line to be evaluated by the ruby thread
-DFhackCExport command_result plugin_eval_ruby( color_ostream &out, const char *command)
-{
-    command_result ret;
-
-    // if dlopen failed
-    if (!r_thread)
-    {
-        out.printerr("Failed to load ruby library.\n");
-        return CR_FAILURE;
-    }
-
-    if (!strncmp(command, "nolock ", 7)) {
-        // debug only!
-        // run ruby commands without locking the main thread
-        // useful when the game is frozen after a segfault
-        ret = do_plugin_eval_ruby(out, command+7);
-    } else {
-        // wrap all ruby code inside a suspend block
-        // if we dont do that and rely on ruby code doing it, we'll deadlock in
-        // onupdate
-        CoreSuspender suspend;
-        ret = do_plugin_eval_ruby(out, command);
-    }
-
-    // if any dfhack command is queued for run, do it now
-    while (!dfhack_run_queue->empty()) {
-        std::string cmd = dfhack_run_queue->at(0);
-        // delete before running the command, which may be ruby and cause infinite loops
-        dfhack_run_queue->erase(dfhack_run_queue->begin());
-        Core::getInstance().runCommand(out, cmd);
-    }
-
-    return ret;
-}
-
-DFhackCExport command_result plugin_onupdate ( color_ostream &out )
-{
-    if (!r_thread)
-        return CR_OK;
-
-    // ruby sets this flag when needed, to avoid lag running ruby code every
-    // frame if not necessary
-    if (!onupdate_active)
-        return CR_OK;
-
-    if (df::global::cur_year && *df::global::cur_year < onupdate_minyear)
-        return CR_OK;
-    if (df::global::cur_year_tick && onupdate_minyeartick >= 0 &&
-            *df::global::cur_year_tick < onupdate_minyeartick)
-        return CR_OK;
-    if (df::global::cur_year_tick_advmode && onupdate_minyeartickadv >= 0 &&
-            *df::global::cur_year_tick_advmode < onupdate_minyeartickadv)
-        return CR_OK;
-
-    return plugin_eval_ruby(out, "DFHack.onupdate");
-}
-
-DFhackCExport command_result plugin_onstatechange ( color_ostream &out, state_change_event e)
-{
-    if (!r_thread)
-        return CR_OK;
-
-    std::string cmd = "DFHack.onstatechange ";
-    switch (e) {
-#define SCASE(s) case SC_ ## s : cmd += ":" # s ; break
-        case SC_UNKNOWN : return CR_OK;
-        SCASE(WORLD_LOADED);
-        SCASE(WORLD_UNLOADED);
-        SCASE(MAP_LOADED);
-        SCASE(MAP_UNLOADED);
-        SCASE(VIEWSCREEN_CHANGED);
-        SCASE(CORE_INITIALIZED);
-        // if we go through plugin_eval at BEGIN_UNLOAD, it'll
-        // try to get the suspend lock and deadlock at df exit
-        case SC_BEGIN_UNLOAD : return CR_OK;
-        SCASE(PAUSED);
-        SCASE(UNPAUSED);
-#undef SCASE
-    }
-
-    return plugin_eval_ruby(out, cmd.c_str());
-}
-
-static command_result df_rubyeval(color_ostream &out, std::vector <std::string> & parameters)
-{
-    if (parameters.size() == 1 && (parameters[0] == "help" || parameters[0] == "?"))
-    {
-        out.print("This command executes an arbitrary ruby statement.\n");
-        return CR_OK;
-    }
-
-    // reconstruct the text from dfhack console line
-    std::string full = "";
-
-    for (unsigned i=0 ; i<parameters.size() ; ++i) {
-        full += parameters[i];
-        if (i != parameters.size()-1)
-            full += " ";
-    }
-
-    return plugin_eval_ruby(out, full.c_str());
-}
-
-
-
-// ruby stuff
-
-// - ruby-dev on windows is messy
-// - ruby.h with gcc -m32 on linux 64 is broken
-// so we dynamically load libruby with dlopen/LoadLibrary
-// lib path is hardcoded here, and by default downloaded by cmake
-
-typedef uintptr_t VALUE;
-typedef uintptr_t ID;
-
-static VALUE Qfalse = 0;
-static VALUE Qtrue = 2;
-static VALUE Qnil = 4;
-
-#define INT2FIX(i) ((VALUE)((((intptr_t)i) << 1) | 1))
-#define FIX2INT(i) (((intptr_t)i) >> 1)
-#define RUBY_METHOD_FUNC(func) ((VALUE(*)(...))func)
-
-void (*ruby_init_stack)(VALUE*);
-void (*ruby_sysinit)(int *, const char ***);
-void (*ruby_init)(void);
-void (*ruby_init_loadpath)(void);
-void (*ruby_script)(const char*);
-int (*ruby_cleanup)(int);
-ID (*rb_intern)(const char*);
-VALUE (*rb_funcall)(VALUE, ID, int, ...);
-VALUE (*rb_define_module)(const char*);
-void (*rb_define_singleton_method)(VALUE, const char*, VALUE(*)(...), int);
-VALUE (*rb_gv_get)(const char*);
-VALUE (*rb_str_new)(const char*, long);
-char* (*rb_string_value_ptr)(VALUE*);
-VALUE (*rb_eval_string_protect)(const char*, int*);
-VALUE (*rb_ary_shift)(VALUE);
-VALUE (*rb_float_new)(double);
-double (*rb_num2dbl)(VALUE);
-VALUE (*rb_int2inum)(intptr_t);        // XXX check on win64 long vs intptr_t
-VALUE (*rb_uint2inum)(uintptr_t);
-uintptr_t (*rb_num2ulong)(VALUE);
-// end of rip(ruby.h)
-
-DFHack::DFLibrary *libruby_handle;
-
-// load the ruby library, initialize function pointers
-static int df_loadruby(void)
-{
-    const char *libpaths[] = {
-#if defined(WIN32)
-        "./libruby.dll",
-#elif defined(__APPLE__)
-        "hack/libruby.dylib",
-        "/System/Library/Frameworks/Ruby.framework/Ruby",
-#else
-        "hack/libruby.so",
-        "libruby.so",
-#endif
-        NULL
-    };
-
-    for (const char **path = libpaths; *path; path++) {
-        if ((libruby_handle = OpenPlugin(*path)))
-            break;
-        else
-            fprintf(stderr, "ruby: warning: Failed to load %s\n", *path);
-    }
-
-    if (!libruby_handle) {
-        Core::printerr("Cannot initialize ruby plugin: failed to load ruby library\n");
-        return 0;
-    }
-
-    // ruby_sysinit is optional (ruby1.9 only)
-    ruby_sysinit = (decltype(ruby_sysinit))LookupPlugin(libruby_handle, "ruby_sysinit");
-#define rbloadsyma(s,a) if (!(s = (decltype(s))LookupPlugin(libruby_handle, #a))) return 0
-#define rbloadsym(s) rbloadsyma(s,s)
-    rbloadsym(ruby_init_stack);
-    rbloadsym(ruby_init);
-    rbloadsym(ruby_init_loadpath);
-    rbloadsym(ruby_script);
-    rbloadsym(ruby_cleanup);
-    rbloadsym(rb_intern);
-    rbloadsym(rb_funcall);
-    rbloadsym(rb_define_module);
-    rbloadsym(rb_define_singleton_method);
-    rbloadsym(rb_gv_get);
-    rbloadsym(rb_str_new);
-    rbloadsym(rb_string_value_ptr);
-    rbloadsym(rb_eval_string_protect);
-    rbloadsym(rb_ary_shift);
-    rbloadsym(rb_num2dbl);
-    rbloadsym(rb_int2inum);
-#if defined(_WIN64)
-    rbloadsyma(rb_uint2inum, rb_ull2inum);
-    rbloadsyma(rb_num2ulong, rb_num2ull);
-#else
-    rbloadsym(rb_uint2inum);
-    rbloadsym(rb_num2ulong);
-#endif
-
-#undef rbloadsym
-    // rb_float_new_in_heap in ruby 2
-    if (!((rb_float_new = (decltype(rb_float_new))(LookupPlugin(libruby_handle, "rb_float_new"))) ||
-          (rb_float_new = (decltype(rb_float_new))(LookupPlugin(libruby_handle, "rb_float_new_in_heap")))))
-        return 0;
-
-    return 1;
-}
-
-static void df_unloadruby(void)
-{
-    if (libruby_handle) {
-        ClosePlugin(libruby_handle);
-        libruby_handle = 0;
-    }
-}
-
-static void printerr(const char* fmt, const char *arg)
-{
-    if (r_console)
-        r_console->printerr(fmt, arg);
-    else
-        Core::printerr(fmt, arg);
-}
-
-// ruby thread code
-static void dump_rb_error(void)
-{
-    VALUE s, err;
-
-    err = rb_gv_get("$!");
-
-    s = rb_funcall(err, rb_intern("class"), 0);
-    s = rb_funcall(s, rb_intern("name"), 0);
-    printerr("E: %s: ", rb_string_value_ptr(&s));
-
-    s = rb_funcall(err, rb_intern("message"), 0);
-    printerr("%s\n", rb_string_value_ptr(&s));
-
-    err = rb_funcall(err, rb_intern("backtrace"), 0);
-    for (int i=0 ; i<8 ; ++i)
-        if ((s = rb_ary_shift(err)) != Qnil)
-            printerr(" %s\n", rb_string_value_ptr(&s));
-}
-
-// ruby thread main loop
-static void df_rubythread(void *p)
-{
-    int state, running;
-
-    // may need to be run from df main thread?
-    VALUE foo;
-    ruby_init_stack(&foo);
-
-    if (ruby_sysinit) {
-        // ruby1.9 specific API
-        static int argc;
-        static const char *argv[] = { "dfhack", 0 };
-        ruby_sysinit(&argc, (const char ***)&argv);
-    }
-
-    // initialize the ruby interpreter
-    ruby_init();
-    ruby_init_loadpath();
-    // default value for the $0 "current script name"
-    ruby_script("dfhack");
-
-    // create the ruby objects to map DFHack to ruby methods
-    ruby_bind_dfhack();
-
-    console_proxy = new color_ostream_proxy(Core::getInstance().getConsole());
-
-    // ensure noone bothers us while we load data defs in the background
-    m_mutex->lock();
-
-    // tell the main thread our initialization is finished
-    r_result = CR_OK;
-    r_type = RB_IDLE;
-
-    // initialize ruby constants (may depend on libruby compilation flags/version)
-    Qnil = rb_eval_string_protect("nil", &state);
-    Qtrue = rb_eval_string_protect("true", &state);
-    Qfalse = rb_eval_string_protect("false", &state);
-
-    // load the default ruby-level definitions in the background
-    state=0;
-    rb_eval_string_protect("require './hack/ruby/ruby'", &state);
-    if (state)
-        dump_rb_error();
-
-    // ready to go
-    m_mutex->unlock();
-
-    running = 1;
-    while (running) {
-        // sleep waiting for new command
-        m_irun->lock();
-
-        switch (r_type) {
-        case RB_IDLE:
-        case RB_INIT:
-            break;
-
-        case RB_DIE:
-            running = 0;
-            ruby_cleanup(0);
-            break;
-
-        case RB_EVAL:
-            state = 0;
-            rb_eval_string_protect(r_command, &state);
-            if (state)
-                dump_rb_error();
-            break;
-        }
-
-        r_result = CR_OK;
-        r_type = RB_IDLE;
-        m_irun->unlock();
-        tthread::this_thread::yield();
-    }
-}
-
-
-#define BOOL_ISFALSE(v) ((v) == Qfalse || (v) == Qnil || (v) == INT2FIX(0))
-
-// main DFHack ruby module
-static VALUE rb_cDFHack;
-
-
-// DFHack module ruby methods, binds specific dfhack methods
-
-// df-dfhack version (eg "0.34.11-r2")
-static VALUE rb_dfversion(VALUE self)
-{
-    const char *dfhack_version = Version::dfhack_version();
-    return rb_str_new(dfhack_version, strlen(dfhack_version));
-}
-
-// enable/disable calls to DFHack.onupdate()
-static VALUE rb_dfonupdate_active(VALUE self)
-{
-    if (onupdate_active)
-        return Qtrue;
-    else
-        return Qfalse;
-}
-
-static VALUE rb_dfonupdate_active_set(VALUE self, VALUE val)
-{
-    onupdate_active = (BOOL_ISFALSE(val) ? 0 : 1);
-    return Qtrue;
-}
-
-static VALUE rb_dfonupdate_minyear(VALUE self)
-{
-    return rb_uint2inum(onupdate_minyear);
-}
-
-static VALUE rb_dfonupdate_minyear_set(VALUE self, VALUE val)
-{
-    onupdate_minyear = rb_num2ulong(val);
-    return Qtrue;
-}
-
-static VALUE rb_dfonupdate_minyeartick(VALUE self)
-{
-    return rb_uint2inum(onupdate_minyeartick);
-}
-
-static VALUE rb_dfonupdate_minyeartick_set(VALUE self, VALUE val)
-{
-    onupdate_minyeartick = rb_num2ulong(val);
-    return Qtrue;
-}
-
-static VALUE rb_dfonupdate_minyeartickadv(VALUE self)
-{
-    return rb_uint2inum(onupdate_minyeartickadv);
-}
-
-static VALUE rb_dfonupdate_minyeartickadv_set(VALUE self, VALUE val)
-{
-    onupdate_minyeartickadv = rb_num2ulong(val);
-    return Qtrue;
-}
-
-static VALUE rb_dfprint_str(VALUE self, VALUE s)
-{
-    if (r_console)
-        r_console->print("%s", rb_string_value_ptr(&s));
-    else
-        console_proxy->print("%s", rb_string_value_ptr(&s));
-    return Qnil;
-}
-
-static VALUE rb_dfprint_color(VALUE self, VALUE c, VALUE s)
-{
-    if (r_console) {
-        color_value old_col = r_console->color();
-        r_console->color(color_value(rb_num2ulong(c)));
-        r_console->print("%s", rb_string_value_ptr(&s));
-        r_console->color(old_col);
-    } else
-        console_proxy->print("%s", rb_string_value_ptr(&s));
-    return Qnil;
-}
-
-static VALUE rb_dfprint_err(VALUE self, VALUE s)
-{
-    printerr("%s", rb_string_value_ptr(&s));
-    return Qnil;
-}
-
-static VALUE rb_dfget_global_address(VALUE self, VALUE name)
-{
-    return rb_uint2inum(Core::getInstance().vinfo->getAddress(rb_string_value_ptr(&name)));
-}
-
-static VALUE rb_dfget_vtable(VALUE self, VALUE name)
-{
-    return rb_uint2inum((uintptr_t)Core::getInstance().vinfo->getVTable(rb_string_value_ptr(&name)));
-}
-
-// read the c++ class name from a vtable pointer, inspired from doReadClassName
-// XXX virtual classes only! dark pointer arithmetic, use with caution !
-static VALUE rb_dfget_rtti_classname(VALUE self, VALUE vptr)
-{
-    char *ptr = (char*)rb_num2ulong(vptr);
-#if defined(_WIN64)
-    // win64
-    char *rtti = *(char**)(ptr - 0x8);
-    char *typeinfo = (char*)Core::getInstance().p->getBase() + *(uint32_t*)(rtti + 0xC);
-    // skip the .?AV, trim @@ from end
-    return rb_str_new(typeinfo+0x14, strlen(typeinfo+0x14)-2);
-#elif defined(WIN32)
-    // win32
-    char *rtti = *(char**)(ptr - 0x4);
-    char *typeinfo = *(char**)(rtti + 0xC);
-    // skip the .?AV, trim @@ from end
-    return rb_str_new(typeinfo+0xc, strlen(typeinfo+0xc)-2);
-#else
-    // linux/osx 32/64
-    char *typeinfo = *(char**)(ptr - sizeof(void*));
-    char *typestring = *(char**)(typeinfo + sizeof(void*));
-    while (*typestring >= '0' && *typestring <= '9')
-        typestring++;
-    return rb_str_new(typestring, strlen(typestring));
-#endif
-}
-
-static VALUE rb_dfget_vtable_ptr(VALUE self, VALUE objptr)
-{
-    return rb_uint2inum(*(uintptr_t*)rb_num2ulong(objptr));
-}
-
-static VALUE rb_dfget_selected_building_id(VALUE self)
-{
-    df::building *b = Gui::getAnyBuilding(Core::getTopViewscreen());
-    return rb_int2inum(b ? b->id : -1);
-}
-
-static VALUE rb_dfget_selected_item_id(VALUE self)
-{
-    df::item *i = Gui::getAnyItem(Core::getTopViewscreen());
-    return rb_int2inum(i ? i->id : -1);
-}
-
-static VALUE rb_dfget_selected_unit_id(VALUE self)
-{
-    df::unit *u = Gui::getAnyUnit(Core::getTopViewscreen());
-    return rb_int2inum(u ? u->id : -1);
-}
-
-// run a dfhack command, as if typed from the dfhack console
-static VALUE rb_dfhack_run(VALUE self, VALUE cmd)
-{
-    std::string s;
-    int strlen = FIX2INT(rb_funcall(cmd, rb_intern("bytesize"), 0));
-    s.assign(rb_string_value_ptr(&cmd), strlen);
-    dfhack_run_queue->push_back(s);
-    return Qtrue;
-}
-
-
-
-// raw memory access
-// used by the ruby class definitions
-// XXX may cause game crash ! double-check your addresses !
-
-static VALUE rb_dfmalloc(VALUE self, VALUE len)
-{
-    char *ptr = (char*)malloc(FIX2INT(len));
-    if (!ptr)
-        return Qnil;
-    memset(ptr, 0, FIX2INT(len));
-    return rb_uint2inum((uintptr_t)ptr);
-}
-
-static VALUE rb_dffree(VALUE self, VALUE ptr)
-{
-    free((void*)rb_num2ulong(ptr));
-    return Qtrue;
-}
-
-// memory reading (buffer)
-static VALUE rb_dfmemory_read(VALUE self, VALUE addr, VALUE len)
-{
-    return rb_str_new((char*)rb_num2ulong(addr), rb_num2ulong(len));
-}
-
-// memory reading (integers/floats)
-static VALUE rb_dfmemory_read_int8(VALUE self, VALUE addr)
-{
-    return rb_int2inum(*(char*)rb_num2ulong(addr));
-}
-static VALUE rb_dfmemory_read_int16(VALUE self, VALUE addr)
-{
-    return rb_int2inum(*(short*)rb_num2ulong(addr));
-}
-static VALUE rb_dfmemory_read_int32(VALUE self, VALUE addr)
-{
-    return rb_int2inum(*(int*)rb_num2ulong(addr));
-}
-
-static VALUE rb_dfmemory_read_float(VALUE self, VALUE addr)
-{
-    return rb_float_new(*(float*)rb_num2ulong(addr));
-}
-
-static VALUE rb_dfmemory_read_double(VALUE self, VALUE addr)
-{
-    return rb_float_new(*(double*)rb_num2ulong(addr));
-}
-
-
-// memory writing (buffer)
-static VALUE rb_dfmemory_write(VALUE self, VALUE addr, VALUE raw)
-{
-    // no stable api for raw.length between rb1.8/rb1.9 ...
-    int strlen = FIX2INT(rb_funcall(raw, rb_intern("bytesize"), 0));
-
-    memcpy((void*)rb_num2ulong(addr), rb_string_value_ptr(&raw), strlen);
-
-    return Qtrue;
-}
-
-// memory writing (integers/floats)
-static VALUE rb_dfmemory_write_int8(VALUE self, VALUE addr, VALUE val)
-{
-    *(char*)rb_num2ulong(addr) = rb_num2ulong(val);
-    return Qtrue;
-}
-static VALUE rb_dfmemory_write_int16(VALUE self, VALUE addr, VALUE val)
-{
-    *(short*)rb_num2ulong(addr) = rb_num2ulong(val);
-    return Qtrue;
-}
-static VALUE rb_dfmemory_write_int32(VALUE self, VALUE addr, VALUE val)
-{
-    *(int*)rb_num2ulong(addr) = rb_num2ulong(val);
-    return Qtrue;
-}
-
-static VALUE rb_dfmemory_write_float(VALUE self, VALUE addr, VALUE val)
-{
-    *(float*)rb_num2ulong(addr) = rb_num2dbl(val);
-    return Qtrue;
-}
-
-static VALUE rb_dfmemory_write_double(VALUE self, VALUE addr, VALUE val)
-{
-    *(double*)rb_num2ulong(addr) = rb_num2dbl(val);
-    return Qtrue;
-}
-
-// return memory permissions at address (eg "rx", nil if unmapped)
-static VALUE rb_dfmemory_check(VALUE self, VALUE addr)
-{
-    void *ptr = (void*)rb_num2ulong(addr);
-    std::vector<t_memrange> ranges;
-    Core::getInstance().p->getMemRanges(ranges);
-
-    unsigned i = 0;
-    while (i < ranges.size() && ranges[i].end <= ptr)
-        i++;
-
-    if (i >= ranges.size() || ranges[i].start > ptr || !ranges[i].valid)
-        return Qnil;
-
-    std::string perm = "";
-    if (ranges[i].read)
-        perm += "r";
-    if (ranges[i].write)
-        perm += "w";
-    if (ranges[i].execute)
-        perm += "x";
-    if (ranges[i].shared)
-        perm += "s";
-
-    return rb_str_new(perm.c_str(), perm.length());
-}
-
-// memory write (tmp override page permissions, eg patch code)
-static VALUE rb_dfmemory_patch(VALUE self, VALUE addr, VALUE raw)
-{
-    int strlen = FIX2INT(rb_funcall(raw, rb_intern("bytesize"), 0));
-    bool ret;
-
-    ret = Core::getInstance().p->patchMemory((void*)rb_num2ulong(addr),
-            rb_string_value_ptr(&raw), strlen);
-
-    return ret ? Qtrue : Qfalse;
-}
-
-// allocate memory pages
-static VALUE rb_dfmemory_pagealloc(VALUE self, VALUE len)
-{
-    void *ret = Core::getInstance().p->memAlloc(rb_num2ulong(len));
-
-    return (ret == (void*)-1) ? Qnil : rb_uint2inum((uintptr_t)ret);
-}
-
-// free memory from pagealloc
-static VALUE rb_dfmemory_pagedealloc(VALUE self, VALUE ptr, VALUE len)
-{
-    int ret = Core::getInstance().p->memDealloc((void*)rb_num2ulong(ptr), rb_num2ulong(len));
-
-    return ret ? Qfalse : Qtrue;
-}
-
-// change memory page permissions
-// ptr must be page-aligned
-// prot is a String, eg 'rwx', 'r', 'x'
-static VALUE rb_dfmemory_pageprotect(VALUE self, VALUE ptr, VALUE len, VALUE prot_str)
-{
-    int ret, prot=0;
-    char *prot_p = rb_string_value_ptr(&prot_str);
-
-    if (*prot_p == 'r') {
-        prot |= Process::MemProt::READ;
-        ++prot_p;
-    }
-    if (*prot_p == 'w') {
-        prot |= Process::MemProt::WRITE;
-        ++prot_p;
-    }
-    if (*prot_p == 'x') {
-        prot |= Process::MemProt::EXEC;
-        ++prot_p;
-    }
-
-    Core::printerr("pageprot %zx %zx %x\n", rb_num2ulong(ptr), rb_num2ulong(len), prot);
-    ret = Core::getInstance().p->memProtect((void*)rb_num2ulong(ptr), rb_num2ulong(len), prot);
-
-    return ret ? Qfalse : Qtrue;
-}
-
-
-// stl::string
-static VALUE rb_dfmemory_stlstring_new(VALUE self)
-{
-    std::string *ptr = new std::string;
-    return rb_uint2inum((uintptr_t)ptr);
-}
-static VALUE rb_dfmemory_stlstring_delete(VALUE self, VALUE addr)
-{
-    std::string *ptr = (std::string*)rb_num2ulong(addr);
-    if (ptr)
-        delete ptr;
-    return Qtrue;
-}
-static VALUE rb_dfmemory_stlstring_init(VALUE self, VALUE addr)
-{
-    new((void*)rb_num2ulong(addr)) std::string();
-    return Qtrue;
-}
-static VALUE rb_dfmemory_read_stlstring(VALUE self, VALUE addr)
-{
-    std::string *s = (std::string*)rb_num2ulong(addr);
-    return rb_str_new(s->c_str(), s->length());
-}
-static VALUE rb_dfmemory_write_stlstring(VALUE self, VALUE addr, VALUE val)
-{
-    std::string *s = (std::string*)rb_num2ulong(addr);
-    int strlen = FIX2INT(rb_funcall(val, rb_intern("bytesize"), 0));
-    s->assign(rb_string_value_ptr(&val), strlen);
-    return Qtrue;
-}
-
-
-// vector access
-static VALUE rb_dfmemory_vec_new(VALUE self)
-{
-    std::vector<uint8_t> *ptr = new std::vector<uint8_t>;
-    return rb_uint2inum((uintptr_t)ptr);
-}
-static VALUE rb_dfmemory_vec_delete(VALUE self, VALUE addr)
-{
-    std::vector<uint8_t> *ptr = (std::vector<uint8_t>*)rb_num2ulong(addr);
-    if (ptr)
-        delete ptr;
-    return Qtrue;
-}
-static VALUE rb_dfmemory_vec_init(VALUE self, VALUE addr)
-{
-    new((void*)rb_num2ulong(addr)) std::vector<uint8_t>();
-    return Qtrue;
-}
-// vector<uint8>
-static VALUE rb_dfmemory_vec8_length(VALUE self, VALUE addr)
-{
-    std::vector<uint8_t> *v = (std::vector<uint8_t>*)rb_num2ulong(addr);
-    return rb_uint2inum(v->size());
-}
-static VALUE rb_dfmemory_vec8_ptrat(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<uint8_t> *v = (std::vector<uint8_t>*)rb_num2ulong(addr);
-    return rb_uint2inum((uintptr_t)&v->at(FIX2INT(idx)));
-}
-static VALUE rb_dfmemory_vec8_insertat(VALUE self, VALUE addr, VALUE idx, VALUE val)
-{
-    std::vector<uint8_t> *v = (std::vector<uint8_t>*)rb_num2ulong(addr);
-    v->insert(v->begin()+FIX2INT(idx), rb_num2ulong(val));
-    return Qtrue;
-}
-static VALUE rb_dfmemory_vec8_deleteat(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<uint8_t> *v = (std::vector<uint8_t>*)rb_num2ulong(addr);
-    v->erase(v->begin()+FIX2INT(idx));
-    return Qtrue;
-}
-
-// vector<uint16>
-static VALUE rb_dfmemory_vec16_length(VALUE self, VALUE addr)
-{
-    std::vector<uint16_t> *v = (std::vector<uint16_t>*)rb_num2ulong(addr);
-    return rb_uint2inum(v->size());
-}
-static VALUE rb_dfmemory_vec16_ptrat(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<uint16_t> *v = (std::vector<uint16_t>*)rb_num2ulong(addr);
-    return rb_uint2inum((uintptr_t)&v->at(FIX2INT(idx)));
-}
-static VALUE rb_dfmemory_vec16_insertat(VALUE self, VALUE addr, VALUE idx, VALUE val)
-{
-    std::vector<uint16_t> *v = (std::vector<uint16_t>*)rb_num2ulong(addr);
-    v->insert(v->begin()+FIX2INT(idx), rb_num2ulong(val));
-    return Qtrue;
-}
-static VALUE rb_dfmemory_vec16_deleteat(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<uint16_t> *v = (std::vector<uint16_t>*)rb_num2ulong(addr);
-    v->erase(v->begin()+FIX2INT(idx));
-    return Qtrue;
-}
-
-// vector<uint32>
-static VALUE rb_dfmemory_vec32_length(VALUE self, VALUE addr)
-{
-    std::vector<uint32_t> *v = (std::vector<uint32_t>*)rb_num2ulong(addr);
-    return rb_uint2inum(v->size());
-}
-static VALUE rb_dfmemory_vec32_ptrat(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<uint32_t> *v = (std::vector<uint32_t>*)rb_num2ulong(addr);
-    return rb_uint2inum((uintptr_t)&v->at(FIX2INT(idx)));
-}
-static VALUE rb_dfmemory_vec32_insertat(VALUE self, VALUE addr, VALUE idx, VALUE val)
-{
-    std::vector<uint32_t> *v = (std::vector<uint32_t>*)rb_num2ulong(addr);
-    v->insert(v->begin()+FIX2INT(idx), rb_num2ulong(val));
-    return Qtrue;
-}
-static VALUE rb_dfmemory_vec32_deleteat(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<uint32_t> *v = (std::vector<uint32_t>*)rb_num2ulong(addr);
-    v->erase(v->begin()+FIX2INT(idx));
-    return Qtrue;
-}
-
-// vector<uint64>
-static VALUE rb_dfmemory_vec64_length(VALUE self, VALUE addr)
-{
-    std::vector<uint64_t> *v = (std::vector<uint64_t>*)rb_num2ulong(addr);
-    return rb_uint2inum(v->size());
-}
-static VALUE rb_dfmemory_vec64_ptrat(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<uint64_t> *v = (std::vector<uint64_t>*)rb_num2ulong(addr);
-    return rb_uint2inum((uintptr_t)&v->at(FIX2INT(idx)));
-}
-static VALUE rb_dfmemory_vec64_insertat(VALUE self, VALUE addr, VALUE idx, VALUE val)
-{
-    std::vector<uint64_t> *v = (std::vector<uint64_t>*)rb_num2ulong(addr);
-    v->insert(v->begin()+FIX2INT(idx), rb_num2ulong(val));
-    return Qtrue;
-}
-static VALUE rb_dfmemory_vec64_deleteat(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<uint64_t> *v = (std::vector<uint64_t>*)rb_num2ulong(addr);
-    v->erase(v->begin()+FIX2INT(idx));
-    return Qtrue;
-}
-
-// vector<bool>
-static VALUE rb_dfmemory_vecbool_new(VALUE self)
-{
-    std::vector<bool> *ptr = new std::vector<bool>;
-    return rb_uint2inum((uintptr_t)ptr);
-}
-static VALUE rb_dfmemory_vecbool_delete(VALUE self, VALUE addr)
-{
-    std::vector<bool> *ptr = (std::vector<bool>*)rb_num2ulong(addr);
-    if (ptr)
-        delete ptr;
-    return Qtrue;
-}
-static VALUE rb_dfmemory_vecbool_init(VALUE self, VALUE addr)
-{
-    new((void*)rb_num2ulong(addr)) std::vector<bool>();
-    return Qtrue;
-}
-static VALUE rb_dfmemory_vecbool_length(VALUE self, VALUE addr)
-{
-    std::vector<bool> *v = (std::vector<bool>*)rb_num2ulong(addr);
-    return rb_uint2inum(v->size());
-}
-static VALUE rb_dfmemory_vecbool_at(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<bool> *v = (std::vector<bool>*)rb_num2ulong(addr);
-    return v->at(FIX2INT(idx)) ? Qtrue : Qfalse;
-}
-static VALUE rb_dfmemory_vecbool_setat(VALUE self, VALUE addr, VALUE idx, VALUE val)
-{
-    std::vector<bool> *v = (std::vector<bool>*)rb_num2ulong(addr);
-    v->at(FIX2INT(idx)) = (BOOL_ISFALSE(val) ? 0 : 1);
-    return Qtrue;
-}
-static VALUE rb_dfmemory_vecbool_insertat(VALUE self, VALUE addr, VALUE idx, VALUE val)
-{
-    std::vector<bool> *v = (std::vector<bool>*)rb_num2ulong(addr);
-    v->insert(v->begin()+FIX2INT(idx), (BOOL_ISFALSE(val) ? 0 : 1));
-    return Qtrue;
-}
-static VALUE rb_dfmemory_vecbool_deleteat(VALUE self, VALUE addr, VALUE idx)
-{
-    std::vector<bool> *v = (std::vector<bool>*)rb_num2ulong(addr);
-    v->erase(v->begin()+FIX2INT(idx));
-    return Qtrue;
-}
-
-// BitArray
-static VALUE rb_dfmemory_bitarray_length(VALUE self, VALUE addr)
-{
-    DFHack::BitArray<int> *b = (DFHack::BitArray<int>*)rb_num2ulong(addr);
-    return rb_uint2inum(b->size*8);     // b->size is in bytes
-}
-static VALUE rb_dfmemory_bitarray_resize(VALUE self, VALUE addr, VALUE sz)
-{
-    DFHack::BitArray<int> *b = (DFHack::BitArray<int>*)rb_num2ulong(addr);
-    b->resize(rb_num2ulong(sz));
-    return Qtrue;
-}
-static VALUE rb_dfmemory_bitarray_isset(VALUE self, VALUE addr, VALUE idx)
-{
-    DFHack::BitArray<int> *b = (DFHack::BitArray<int>*)rb_num2ulong(addr);
-    return b->is_set(rb_num2ulong(idx)) ? Qtrue : Qfalse;
-}
-static VALUE rb_dfmemory_bitarray_set(VALUE self, VALUE addr, VALUE idx, VALUE val)
-{
-    DFHack::BitArray<int> *b = (DFHack::BitArray<int>*)rb_num2ulong(addr);
-    b->set(rb_num2ulong(idx), (BOOL_ISFALSE(val) ? 0 : 1));
-    return Qtrue;
-}
-
-// add basic support for std::set<uint32> used for passing keyboard keys to viewscreens
-#include <set>
-static VALUE rb_dfmemory_set_new(VALUE self)
-{
-    std::set<unsigned long> *ptr = new std::set<unsigned long>;
-    return rb_uint2inum((uintptr_t)ptr);
-}
-
-static VALUE rb_dfmemory_set_delete(VALUE self, VALUE set)
-{
-    std::set<unsigned long> *ptr = (std::set<unsigned long>*)rb_num2ulong(set);
-    if (ptr)
-        delete ptr;
-    return Qtrue;
-}
-
-static VALUE rb_dfmemory_set_set(VALUE self, VALUE set, VALUE key)
-{
-    std::set<unsigned long> *ptr = (std::set<unsigned long>*)rb_num2ulong(set);
-    ptr->insert(rb_num2ulong(key));
-    return Qtrue;
-}
-
-static VALUE rb_dfmemory_set_isset(VALUE self, VALUE set, VALUE key)
-{
-    std::set<unsigned long> *ptr = (std::set<unsigned long>*)rb_num2ulong(set);
-    return ptr->count(rb_num2ulong(key)) ? Qtrue : Qfalse;
-}
-
-static VALUE rb_dfmemory_set_deletekey(VALUE self, VALUE set, VALUE key)
-{
-    std::set<unsigned long> *ptr = (std::set<unsigned long>*)rb_num2ulong(set);
-    ptr->erase(rb_num2ulong(key));
-    return Qtrue;
-}
-
-static VALUE rb_dfmemory_set_clear(VALUE self, VALUE set)
-{
-    std::set<unsigned long> *ptr = (std::set<unsigned long>*)rb_num2ulong(set);
-    ptr->clear();
-    return Qtrue;
-}
-
-
-/* call an arbitrary object virtual method */
-#if defined(_WIN32) && !defined(_WIN64)
-__declspec(naked) static intptr_t raw_vcall(void *that, void *fptr, uintptr_t a0,
-        uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5)
-{
-    // __thiscall requires that the callee cleans up the stack
-    // here we dont know how many arguments it will take, so
-    // we simply fix esp across the funcall
-    __asm {
-        push ebp
-        mov ebp, esp
-
-        push a5
-        push a4
-        push a3
-        push a2
-        push a1
-        push a0
-
-        mov ecx, that
-
-        call fptr
-
-        mov esp, ebp
-        pop ebp
-        ret
-    }
-}
-#else
-static intptr_t raw_vcall(void *that, void *fptr, uintptr_t a0,
-        uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5)
-{
-    intptr_t (*t_fptr)(void *me, uintptr_t, uintptr_t, uintptr_t,
-                            uintptr_t, uintptr_t, uintptr_t);
-    t_fptr = (decltype(t_fptr))fptr;
-    return t_fptr(that, a0, a1, a2, a3, a4, a5);
-}
-#endif
-
-// call an arbitrary vmethod, convert args/ret to native values for raw_vcall
-static VALUE rb_dfvcall(VALUE self, VALUE cppobj, VALUE fptr, VALUE a0, VALUE a1, VALUE a2, VALUE a3, VALUE a4, VALUE a5)
-{
-    return rb_int2inum(raw_vcall((void*)rb_num2ulong(cppobj), (void*)rb_num2ulong(fptr),
-                rb_num2ulong(a0), rb_num2ulong(a1),
-                rb_num2ulong(a2), rb_num2ulong(a3),
-                rb_num2ulong(a4), rb_num2ulong(a5)));
-}
-
-
-// define module DFHack and its methods
-static void ruby_bind_dfhack(void) {
-    rb_cDFHack = rb_define_module("DFHack");
-
-    rb_define_singleton_method(rb_cDFHack, "onupdate_active", RUBY_METHOD_FUNC(rb_dfonupdate_active), 0);
-    rb_define_singleton_method(rb_cDFHack, "onupdate_active=", RUBY_METHOD_FUNC(rb_dfonupdate_active_set), 1);
-    rb_define_singleton_method(rb_cDFHack, "onupdate_minyear", RUBY_METHOD_FUNC(rb_dfonupdate_minyear), 0);
-    rb_define_singleton_method(rb_cDFHack, "onupdate_minyear=", RUBY_METHOD_FUNC(rb_dfonupdate_minyear_set), 1);
-    rb_define_singleton_method(rb_cDFHack, "onupdate_minyeartick", RUBY_METHOD_FUNC(rb_dfonupdate_minyeartick), 0);
-    rb_define_singleton_method(rb_cDFHack, "onupdate_minyeartick=", RUBY_METHOD_FUNC(rb_dfonupdate_minyeartick_set), 1);
-    rb_define_singleton_method(rb_cDFHack, "onupdate_minyeartickadv", RUBY_METHOD_FUNC(rb_dfonupdate_minyeartickadv), 0);
-    rb_define_singleton_method(rb_cDFHack, "onupdate_minyeartickadv=", RUBY_METHOD_FUNC(rb_dfonupdate_minyeartickadv_set), 1);
-    rb_define_singleton_method(rb_cDFHack, "get_global_address", RUBY_METHOD_FUNC(rb_dfget_global_address), 1);
-    rb_define_singleton_method(rb_cDFHack, "get_vtable", RUBY_METHOD_FUNC(rb_dfget_vtable), 1);
-    rb_define_singleton_method(rb_cDFHack, "get_rtti_classname", RUBY_METHOD_FUNC(rb_dfget_rtti_classname), 1);
-    rb_define_singleton_method(rb_cDFHack, "get_vtable_ptr", RUBY_METHOD_FUNC(rb_dfget_vtable_ptr), 1);
-    rb_define_singleton_method(rb_cDFHack, "get_selected_building_id", RUBY_METHOD_FUNC(rb_dfget_selected_building_id), 0);
-    rb_define_singleton_method(rb_cDFHack, "get_selected_item_id", RUBY_METHOD_FUNC(rb_dfget_selected_item_id), 0);
-    rb_define_singleton_method(rb_cDFHack, "get_selected_unit_id", RUBY_METHOD_FUNC(rb_dfget_selected_unit_id), 0);
-    rb_define_singleton_method(rb_cDFHack, "dfhack_run", RUBY_METHOD_FUNC(rb_dfhack_run), 1);
-    rb_define_singleton_method(rb_cDFHack, "print_str", RUBY_METHOD_FUNC(rb_dfprint_str), 1);
-    rb_define_singleton_method(rb_cDFHack, "print_color", RUBY_METHOD_FUNC(rb_dfprint_color), 2);
-    rb_define_singleton_method(rb_cDFHack, "print_err", RUBY_METHOD_FUNC(rb_dfprint_err), 1);
-    rb_define_singleton_method(rb_cDFHack, "malloc", RUBY_METHOD_FUNC(rb_dfmalloc), 1);
-    rb_define_singleton_method(rb_cDFHack, "free", RUBY_METHOD_FUNC(rb_dffree), 1);
-    rb_define_singleton_method(rb_cDFHack, "pagealloc", RUBY_METHOD_FUNC(rb_dfmemory_pagealloc), 1);
-    rb_define_singleton_method(rb_cDFHack, "pagedealloc", RUBY_METHOD_FUNC(rb_dfmemory_pagedealloc), 2);
-    rb_define_singleton_method(rb_cDFHack, "pageprotect", RUBY_METHOD_FUNC(rb_dfmemory_pageprotect), 3);
-    rb_define_singleton_method(rb_cDFHack, "vmethod_do_call", RUBY_METHOD_FUNC(rb_dfvcall), 8);
-    rb_define_singleton_method(rb_cDFHack, "version", RUBY_METHOD_FUNC(rb_dfversion), 0);
-
-    rb_define_singleton_method(rb_cDFHack, "memory_read", RUBY_METHOD_FUNC(rb_dfmemory_read), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_read_int8",  RUBY_METHOD_FUNC(rb_dfmemory_read_int8),  1);
-    rb_define_singleton_method(rb_cDFHack, "memory_read_int16", RUBY_METHOD_FUNC(rb_dfmemory_read_int16), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_read_int32", RUBY_METHOD_FUNC(rb_dfmemory_read_int32), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_read_float", RUBY_METHOD_FUNC(rb_dfmemory_read_float), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_read_double", RUBY_METHOD_FUNC(rb_dfmemory_read_double), 1);
-
-    rb_define_singleton_method(rb_cDFHack, "memory_write", RUBY_METHOD_FUNC(rb_dfmemory_write), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_write_int8",  RUBY_METHOD_FUNC(rb_dfmemory_write_int8),  2);
-    rb_define_singleton_method(rb_cDFHack, "memory_write_int16", RUBY_METHOD_FUNC(rb_dfmemory_write_int16), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_write_int32", RUBY_METHOD_FUNC(rb_dfmemory_write_int32), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_write_float", RUBY_METHOD_FUNC(rb_dfmemory_write_float), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_write_double", RUBY_METHOD_FUNC(rb_dfmemory_write_double), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_check", RUBY_METHOD_FUNC(rb_dfmemory_check), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_patch", RUBY_METHOD_FUNC(rb_dfmemory_patch), 2);
-
-    rb_define_singleton_method(rb_cDFHack, "memory_stlstring_new",  RUBY_METHOD_FUNC(rb_dfmemory_stlstring_new), 0);
-    rb_define_singleton_method(rb_cDFHack, "memory_stlstring_delete",  RUBY_METHOD_FUNC(rb_dfmemory_stlstring_delete), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_stlstring_init",  RUBY_METHOD_FUNC(rb_dfmemory_stlstring_init), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_read_stlstring", RUBY_METHOD_FUNC(rb_dfmemory_read_stlstring), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_write_stlstring", RUBY_METHOD_FUNC(rb_dfmemory_write_stlstring), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector_new",  RUBY_METHOD_FUNC(rb_dfmemory_vec_new), 0);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector_delete",  RUBY_METHOD_FUNC(rb_dfmemory_vec_delete), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector_init",  RUBY_METHOD_FUNC(rb_dfmemory_vec_init), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector8_length",  RUBY_METHOD_FUNC(rb_dfmemory_vec8_length), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector8_ptrat",   RUBY_METHOD_FUNC(rb_dfmemory_vec8_ptrat), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector8_insertat",  RUBY_METHOD_FUNC(rb_dfmemory_vec8_insertat), 3);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector8_deleteat",  RUBY_METHOD_FUNC(rb_dfmemory_vec8_deleteat), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector16_length", RUBY_METHOD_FUNC(rb_dfmemory_vec16_length), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector16_ptrat",  RUBY_METHOD_FUNC(rb_dfmemory_vec16_ptrat), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector16_insertat", RUBY_METHOD_FUNC(rb_dfmemory_vec16_insertat), 3);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector16_deleteat", RUBY_METHOD_FUNC(rb_dfmemory_vec16_deleteat), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector32_length", RUBY_METHOD_FUNC(rb_dfmemory_vec32_length), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector32_ptrat",  RUBY_METHOD_FUNC(rb_dfmemory_vec32_ptrat), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector32_insertat", RUBY_METHOD_FUNC(rb_dfmemory_vec32_insertat), 3);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector32_deleteat", RUBY_METHOD_FUNC(rb_dfmemory_vec32_deleteat), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector64_length", RUBY_METHOD_FUNC(rb_dfmemory_vec64_length), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector64_ptrat",  RUBY_METHOD_FUNC(rb_dfmemory_vec64_ptrat), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector64_insertat", RUBY_METHOD_FUNC(rb_dfmemory_vec64_insertat), 3);
-    rb_define_singleton_method(rb_cDFHack, "memory_vector64_deleteat", RUBY_METHOD_FUNC(rb_dfmemory_vec64_deleteat), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vectorbool_new",  RUBY_METHOD_FUNC(rb_dfmemory_vecbool_new), 0);
-    rb_define_singleton_method(rb_cDFHack, "memory_vectorbool_delete",  RUBY_METHOD_FUNC(rb_dfmemory_vecbool_delete), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_vectorbool_init",  RUBY_METHOD_FUNC(rb_dfmemory_vecbool_init), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_vectorbool_length", RUBY_METHOD_FUNC(rb_dfmemory_vecbool_length), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_vectorbool_at",     RUBY_METHOD_FUNC(rb_dfmemory_vecbool_at), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_vectorbool_setat",  RUBY_METHOD_FUNC(rb_dfmemory_vecbool_setat), 3);
-    rb_define_singleton_method(rb_cDFHack, "memory_vectorbool_insertat", RUBY_METHOD_FUNC(rb_dfmemory_vecbool_insertat), 3);
-    rb_define_singleton_method(rb_cDFHack, "memory_vectorbool_deleteat", RUBY_METHOD_FUNC(rb_dfmemory_vecbool_deleteat), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_bitarray_length", RUBY_METHOD_FUNC(rb_dfmemory_bitarray_length), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_bitarray_resize", RUBY_METHOD_FUNC(rb_dfmemory_bitarray_resize), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_bitarray_isset",  RUBY_METHOD_FUNC(rb_dfmemory_bitarray_isset), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_bitarray_set",    RUBY_METHOD_FUNC(rb_dfmemory_bitarray_set), 3);
-    rb_define_singleton_method(rb_cDFHack, "memory_stlset_new",       RUBY_METHOD_FUNC(rb_dfmemory_set_new), 0);
-    rb_define_singleton_method(rb_cDFHack, "memory_stlset_delete",    RUBY_METHOD_FUNC(rb_dfmemory_set_delete), 1);
-    rb_define_singleton_method(rb_cDFHack, "memory_stlset_set",       RUBY_METHOD_FUNC(rb_dfmemory_set_set), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_stlset_isset",     RUBY_METHOD_FUNC(rb_dfmemory_set_isset), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_stlset_deletekey", RUBY_METHOD_FUNC(rb_dfmemory_set_deletekey), 2);
-    rb_define_singleton_method(rb_cDFHack, "memory_stlset_clear",     RUBY_METHOD_FUNC(rb_dfmemory_set_clear), 1);
-}
diff --git a/plugins/ruby/ruby.rb b/plugins/ruby/ruby.rb
deleted file mode 100644
index 663f85111..000000000
--- a/plugins/ruby/ruby.rb
+++ /dev/null
@@ -1,258 +0,0 @@
-# redefine standard i/o methods to use the dfhack console
-module Kernel
-    def puts(*a)
-        a.flatten.each { |l|
-            # XXX looks like print_str crashes with strings longer than 4096... maybe not nullterminated ?
-            # this workaround fixes it
-            s = l.to_s.chomp + "\n"
-            while s.length > 0
-                DFHack.print_str(s[0, 4000])
-                s[0, 4000] = ''
-            end
-        }
-        nil
-    end
-
-    def puts_err(*a)
-        a.flatten.each { |l|
-            s = l.to_s.chomp + "\n"
-            while s.length > 0
-                DFHack.print_err(s[0, 4000])
-                s[0, 4000] = ''
-            end
-        }
-        nil
-    end
-
-    def p(*a)
-        a.each { |e|
-            puts_err e.inspect
-        }
-        nil
-    end
-end
-
-module DFHack
-    VERSION = version
-
-    class OnupdateCallback
-        attr_accessor :callback, :timelimit, :minyear, :minyeartick, :description
-        def initialize(descr, cb, tl, initdelay=0)
-            @description = descr
-            @callback = cb
-            @ticklimit = tl
-            @minyear = (tl ? df.cur_year : 0)
-            @minyeartick = (tl ? df.cur_year_tick+initdelay : 0)
-        end
-
-        # run callback if timedout
-        def check_run(year, yeartick, yearlen)
-            if @ticklimit
-                return unless year > @minyear or (year == @minyear and yeartick >= @minyeartick)
-                @minyear = year
-                @minyeartick = yeartick + @ticklimit
-                if @minyeartick > yearlen
-                    @minyear += 1
-                    @minyeartick -= yearlen
-                end
-            end
-            # t0 = Time.now
-            @callback.call
-            # dt = Time.now - t0 ; puts "rb cb #@description took #{'%.02f' % dt}s" if dt > 0.1
-        rescue Exception
-            df.onupdate_unregister self
-            puts_err "onupdate #@description unregistered: #$!", $!.backtrace
-        end
-
-        def <=>(o)
-            [@minyear, @minyeartick] <=> [o.minyear, o.minyeartick]
-        end
-    end
-
-    class << self
-        attr_accessor :onupdate_list, :onstatechange_list
-
-        # register a callback to be called every gframe or more
-        # ex: DFHack.onupdate_register('fastdwarf') { DFHack.world.units[0].counters.job_counter = 0 }
-        # if ticklimit is given, do not call unless this much game ticks have passed. Handles advmode time stretching.
-        def onupdate_register(descr, ticklimit=nil, initialtickdelay=0, &b)
-            raise ArgumentError, 'need a description as 1st arg' unless descr.kind_of?(::String)
-            @onupdate_list ||= []
-            @onupdate_list << OnupdateCallback.new(descr, b, ticklimit, initialtickdelay)
-            DFHack.onupdate_active = true
-            if onext = @onupdate_list.min
-                DFHack.onupdate_minyear = onext.minyear
-                DFHack.onupdate_minyeartick = onext.minyeartick
-            end
-            @onupdate_list.last
-        end
-
-        # delete the callback for onupdate ; use the value returned by onupdate_register or the description
-        def onupdate_unregister(b)
-            b = @onupdate_list.find { |bb| bb.description == b } if b.kind_of?(String)
-            @onupdate_list.delete b
-            if @onupdate_list.empty?
-                DFHack.onupdate_active = false
-                DFHack.onupdate_minyear = DFHack.onupdate_minyeartick = DFHack.onupdate_minyeartickadv = -1
-            end
-        end
-
-        # same as onupdate_register, but remove the callback once it returns true
-        def onupdate_register_once(*a)
-            handle = onupdate_register(*a) {
-                onupdate_unregister(handle) if yield
-            }
-        end
-
-        TICKS_PER_YEAR = 1200*28*12
-        # this method is called by ruby.cpp if df.onupdate_active is true
-        def onupdate
-            @onupdate_list ||= []
-
-            y = yt = 0
-            y = cur_year rescue 0
-            ytmax = TICKS_PER_YEAR
-            if df.gamemode == :ADVENTURE and df.respond_to?(:cur_year_tick_advmode)
-                yt = cur_year_tick_advmode
-                ytmax *= 144
-            else
-                yt = cur_year_tick rescue 0
-            end
-
-            @onupdate_list.each { |o|
-                o.check_run(y, yt, ytmax)
-            }
-
-            if onext = @onupdate_list.min
-                DFHack.onupdate_minyear = onext.minyear
-                if ytmax > TICKS_PER_YEAR
-                    DFHack.onupdate_minyeartick = -1
-                    DFHack.onupdate_minyeartickadv = onext.minyeartick
-                else
-                    DFHack.onupdate_minyeartick = onext.minyeartick
-                    DFHack.onupdate_minyeartickadv = -1
-                end
-            end
-        end
-
-        # register a callback to be called every gframe or more
-        # ex: DFHack.onstatechange_register { |newstate| puts "state changed to #{newstate}" }
-        def onstatechange_register(&b)
-            @onstatechange_list ||= []
-            @onstatechange_list << b
-            @onstatechange_list.last
-        end
-
-        # delete the callback for onstatechange ; use the value returned by onstatechange_register
-        def onstatechange_unregister(b)
-            @onstatechange_list.delete b
-        end
-
-        # same as onstatechange_register, but auto-unregisters if the block returns true
-        def onstatechange_register_once
-            handle = onstatechange_register { |st|
-                onstatechange_unregister(handle) if yield(st)
-            }
-        end
-
-
-        # this method is called by dfhack every 'onstatechange'
-        def onstatechange(newstate)
-            @onstatechange_list ||= []
-            @onstatechange_list.each { |cb| cb.call(newstate) }
-        end
-
-        # return true if the argument is under the cursor
-        def at_cursor?(obj)
-            same_pos?(obj, cursor)
-        end
-
-        # returns true if both arguments are at the same x/y/z
-        def same_pos?(pos1, pos2)
-            pos1 = pos1.pos if pos1.respond_to?(:pos)
-            pos2 = pos2.pos if pos2.respond_to?(:pos)
-            pos1.x == pos2.x and pos1.y == pos2.y and pos1.z == pos2.z
-        end
-
-        # try to match a user-specified name to one from the raws
-        # uses case-switching and substring matching
-        # eg match_rawname('coal', ['COAL_BITUMINOUS', 'BAUXITE']) => 'COAL_BITUMINOUS'
-        def match_rawname(name, rawlist)
-            rawlist.each { |r| return r if name == r }
-            rawlist.each { |r| return r if name.downcase == r.downcase }
-            may = rawlist.find_all { |r| r.downcase.index(name.downcase) }
-            may.first if may.length == 1
-        end
-
-        def translate_name(name, english=true, onlylastpart=false)
-            out = []
-
-            if not onlylastpart
-                out << name.first_name if name.first_name != ''
-                if name.nickname != ''
-                    case respond_to?(:d_init) && d_init.nickname[gametype]
-                    when :REPLACE_ALL; return "`#{name.nickname}'"
-                    when :REPLACE_FIRST; out.pop
-                    end
-                    out << "`#{name.nickname}'"
-                end
-            end
-            return out.join(' ') unless name.words.find { |w| w >= 0 }
-
-            if not english
-                tsl = world.raws.language.translations[name.language]
-                if name.words[0] >= 0 or name.words[1] >= 0
-                    out << ''
-                    out.last << tsl.words[name.words[0]] if name.words[0] >= 0
-                    out.last << tsl.words[name.words[1]] if name.words[1] >= 0
-                end
-                if name.words[5] >= 0
-                    out << ''
-                    (2..5).each { |i| out.last << tsl.words[name.words[i]] if name.words[i] >= 0 }
-                end
-                if name.words[6] >= 0
-                    out << tsl.words[name.words[6]]
-                end
-            else
-                wl = world.raws.language
-                if name.words[0] >= 0 or name.words[1] >= 0
-                    out << ''
-                    out.last << wl.words[name.words[0]].forms[name.parts_of_speech[0]] if name.words[0] >= 0
-                    out.last << wl.words[name.words[1]].forms[name.parts_of_speech[1]] if name.words[1] >= 0
-                end
-                if name.words[5] >= 0
-                    out << 'the'
-                    out.last.capitalize! if out.length == 1
-                    out << wl.words[name.words[2]].forms[name.parts_of_speech[2]] if name.words[2] >= 0
-                    out << wl.words[name.words[3]].forms[name.parts_of_speech[3]] if name.words[3] >= 0
-                    if name.words[4] >= 0
-                        out << wl.words[name.words[4]].forms[name.parts_of_speech[4]]
-                        out.last << '-'
-                    else
-                        out << ''
-                    end
-                    out.last << wl.words[name.words[5]].forms[name.parts_of_speech[5]]
-                end
-                if name.words[6] >= 0
-                    out << 'of'
-                    out.last.capitalize! if out.length == 1
-                    out << wl.words[name.words[6]].forms[name.parts_of_speech[6]]
-                end
-            end
-
-            out.join(' ')
-        end
-    end
-end
-
-# global alias so we can write 'df.world.units.all[0]'
-def df
-    DFHack
-end
-
-# load autogenned file
-require './hack/ruby/ruby-autogen-defs'
-require(RUBY_PLATFORM =~ /mswin|mingw|cygwin/i ? './hack/ruby/ruby-autogen-win' : './hack/ruby/ruby-autogen-gcc')
-
-# load all modules
-Dir['./hack/ruby/*.rb'].each { |m| require m.chomp('.rb') if m !~ /ruby-autogen/ }
diff --git a/plugins/ruby/ui.rb b/plugins/ruby/ui.rb
deleted file mode 100644
index 9268dcb9e..000000000
--- a/plugins/ruby/ui.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# df user-interface related methods
-module DFHack
-    class << self
-        # returns the current active viewscreen
-        def curview
-            ret = gview.view
-            ret = ret.child while ret.child
-            ret
-        end
-
-        # center the DF screen on something
-        # updates the cursor position if visible
-        def center_viewscreen(x, y=nil, z=nil)
-            x = x.pos if x.respond_to?(:pos)
-            x, y, z = x.x, x.y, x.z if x.respond_to?(:x)
-
-            # compute screen 'map' size (tiles)
-            menuwidth = ui_menu_width[0]
-            # ui_menu_width shows only the 'tab' status
-            menuwidth = 1 if menuwidth == 2 and ui_menu_width[1] == 2 and cursor.x != -30000
-            menuwidth = 2 if menuwidth == 3 and cursor.x != -30000
-            w_w = gps.dimx - 2
-            w_h = gps.dimy - 2
-            case menuwidth
-            when 1; w_w -= 55
-            when 2; w_w -= (ui_menu_width[1] == 2 ? 24 : 31)
-            end
-
-            # center view
-            w_x = x - w_w/2
-            w_y = y - w_h/2
-            w_z = z
-            # round view coordinates (optional)
-            #w_x -= w_x % 10
-            #w_y -= w_y % 10
-            # crop to map limits
-            w_x = [[w_x, world.map.x_count - w_w].min, 0].max
-            w_y = [[w_y, world.map.y_count - w_h].min, 0].max
-
-            self.window_x = w_x
-            self.window_y = w_y
-            self.window_z = w_z
-
-            if cursor.x != -30000
-                cursor.x, cursor.y, cursor.z = x, y, z
-            end
-        end
-
-        # add an announcement
-        # color = integer, bright = bool
-        def add_announcement(str, color=nil, bright=nil)
-            cont = false
-            while str.length > 0
-                rep = Report.cpp_new
-                rep.color = color if color
-                rep.bright = ((bright && bright != 0) ? 1 : 0) if bright != nil
-                rep.year = cur_year
-                rep.time = cur_year_tick
-                rep.flags.continuation = cont
-                cont = true
-                rep.flags.announcement = true
-                rep.text = str[0, 73]
-                str = str[73..-1].to_s
-                rep.id = world.status.next_report_id
-                world.status.next_report_id += 1
-                world.status.reports << rep
-                world.status.announcements << rep
-                world.status.display_timer = 2000
-                yield rep if block_given?
-            end
-        end
-
-        # add an announcement to display in a game popup message
-        # (eg "the megabeast foobar arrived")
-        def popup_announcement(str, color=nil, bright=nil)
-            pop = PopupMessage.cpp_new(:text => str)
-            pop.color = color if color
-            pop.bright = bright if bright
-            world.status.popups << pop
-        end
-    end
-
-    class Viewscreen
-        def feed_keys(*keys)
-            keyset = StlSet.cpp_new(keys, InterfaceKey)
-            ret = feed(keyset)
-            keyset._cpp_delete
-            ret
-        end
-    end
-end
diff --git a/plugins/ruby/unit.rb b/plugins/ruby/unit.rb
deleted file mode 100644
index b27f2f0c3..000000000
--- a/plugins/ruby/unit.rb
+++ /dev/null
@@ -1,280 +0,0 @@
-module DFHack
-    class << self
-        # return an Unit
-        # with no arg, return currently selected unit in df UI ('v' or 'k' menu)
-        # with numeric arg, search unit by unit.id
-        # with an argument that respond to x/y/z (eg cursor), find first unit at this position
-        def unit_find(what=:selected, y=nil, z=nil)
-            if what == :selected
-                return world.units.all.binsearch(df.get_selected_unit_id)
-            elsif what.kind_of?(Integer)
-                # search by id
-                return world.units.all.binsearch(what) if not z
-                # search by coords
-                x = what
-                world.units.all.find { |u| u.pos.x == x and u.pos.y == y and u.pos.z == z }
-            elsif what.respond_to?(:x) or what.respond_to?(:pos)
-                world.units.all.find { |u| same_pos?(what, u) }
-            else
-                raise "what what?"
-            end
-        end
-
-        # returns an Array of all units that are current fort citizen (dwarves, on map, not hostile)
-        def unit_citizens
-            world.units.active.find_all { |u|
-                unit_iscitizen(u)
-            }
-        end
-
-        def unit_testflagcurse(u, flag)
-            return false if u.curse.rem_tags1.send(flag)
-            return true if u.curse.add_tags1.send(flag)
-            return false if u.caste < 0
-            u.race_tg.caste[u.caste].flags[flag]
-        end
-
-        def unit_isfortmember(u)
-            # RE from viewscreen_unitlistst ctor
-            return false if df.gamemode != :DWARF or
-                    u.mood == :Berserk or
-                    unit_testflagcurse(u, :CRAZED) or
-                    unit_testflagcurse(u, :OPPOSED_TO_LIFE) or
-                    u.enemy.undead or
-                    u.flags3.ghostly or
-                    u.flags1.marauder or u.flags1.active_invader or u.flags1.invader_origin or
-                    u.flags1.forest or
-                    u.flags1.merchant or u.flags1.diplomat
-            return true if u.flags1.tame
-            return false if u.flags2.underworld or u.flags2.resident or
-                    u.flags2.visitor_uninvited or u.flags2.visitor or
-                    u.civ_id == -1 or
-                    u.civ_id != df.ui.civ_id
-            true
-        end
-
-        # return the page in viewscreen_unitlist where the unit would appear
-        def unit_category(u)
-            return if u.flags1.left or u.flags1.incoming
-            # return if hostile & unit_invisible(u) (hidden_in_ambush or caged+mapblock.hidden or caged+holder.ambush
-            return :Dead if u.flags2.killed
-            return :Dead if u.flags3.ghostly # hostile ?
-            return if u.flags1.inactive
-            return :Others if !unit_isfortmember(u)
-            casteflags = u.race_tg.caste[u.caste].flags if u.caste >= 0
-            return :Livestock if casteflags and (casteflags[:PET] or casteflags[:PET_EXOTIC])
-            return :Citizens if unit_testflagcurse(u, :CAN_SPEAK)
-            :Livestock
-            # some other stuff with ui.race_id ? (jobs only?)
-        end
-
-        # merchant: df.ui.caravans.find { |cv| cv.entity == u.civ_id }
-        # diplomat: df.ui.dip_meeting_info.find { |m| m.diplomat_id == u.hist_figure_id or m.diplomat_id2 == u.hist_figure_id }
-
-
-        def unit_nemesis(u)
-            if ref = u.general_refs.find { |r| r.kind_of?(DFHack::GeneralRefIsNemesisst) }
-                ref.nemesis_tg
-            end
-        end
-
-        # return the subcategory for :Others (from vs_unitlist)
-        def unit_other_category(u)
-            # comment is actual code returned by the df function
-            return :Berserk if u.mood == :Berserk  # 5
-            return :Berserk if unit_testflagcurse(u, :CRAZED)    # 14
-            return :Undead if unit_testflagcurse(u, :OPPOSED_TO_LIFE)   # 1
-            return :Undead if u.flags3.ghostly  # 15
-
-            if df.gamemode == :ADVENTURE
-                return :Hostile if u.civ_id == -1   # 2
-                if u.animal.population.region_x == -1
-                    return :Wild if u.flags2.roaming_wilderness_population_source_not_a_map_feature # 0
-                else
-                    return :Hostile if u.flags2.important_historical_figure and n = unit_nemesis(u) and n.flags[:ACTIVE_ADVENTURER] # 2
-                end
-                return :Hostile if u.flags2.resident    # 3
-                return :Hostile # 4
-            end
-
-            return :Invader if u.flags1.active_invader or u.flags1.invader_origin   # 6
-            return :Friendly if u.flags1.forest or u.flags1.merchant or u.flags1.diplomat   # 8
-            return :Hostile if u.flags1.tame    # 7
-
-            if u.civ_id != -1
-                return :Unsure if u.civ_id != df.ui.civ_id or u.flags1.resident or u.flags1.visitor or u.flags1.visitor_uninvited   # 10
-                return :Hostile # 7
-
-            elsif u.animal.population.region_x == -1
-                return :Friendly if u.flags2.visitor    # 8
-                return :Uninvited if u.flags2.visitor_uninvited # 12
-                return :Underworld if r = u.race_tg and r.underground_layer_min == 5    # 9
-                return :Resident if u.flags2.resident   # 13
-                return :Friendly    # 8
-
-            else
-                return :Friendly if u.flags2.visitor    # 8
-                return :Underworld if r = u.race_tg and r.underground_layer_min == 5    # 9
-                return :Wild if u.animal.population.feature_idx == -1 and u.animal.population.cave_id == -1 # 0
-                return :Wild    # 11
-            end
-        end
-
-        def unit_iscitizen(u)
-            unit_category(u) == :Citizens
-        end
-
-        def unit_hostiles
-            world.units.active.find_all { |u|
-                unit_ishostile(u)
-            }
-        end
-
-        # returns if an unit is openly hostile
-        # does not include ghosts / wildlife
-        def unit_ishostile(u)
-            # return true if u.flags3.ghostly and not u.flags1.inactive
-            return false unless unit_category(u) == :Others
-
-            case unit_other_category(u)
-            when :Berserk, :Undead, :Hostile, :Invader, :Underworld
-                # XXX :Resident, :Uninvited?
-                true
-
-            when :Unsure
-                # from df code, with removed duplicate checks already in other_category
-                return true if u.enemy.undead or u.flags3.ghostly or u.flags1.marauder
-                return false if u.flags1.forest or u.flags1.merchant or u.flags1.diplomat or u.flags2.visitor
-                return true if u.flags1.tame or u.flags2.underworld
-
-                if histfig = u.hist_figure_tg
-                    group = df.ui.group_tg
-                    case unit_checkdiplomacy_hf_ent(histfig, group)
-                    when 4, 5
-                        true
-                    else
-                        false
-                    end
-
-                elsif diplo = u.civ_tg.unknown1b.diplomacy.binsearch(df.ui.group_id, :group_id)
-                    diplo.relation != 1 and diplo.relation != 5
-
-                else
-                    u.animal.population.region_x != -1 or u.flags2.resident or u.flags2.visitor_uninvited
-                end
-            end
-        end
-
-        def unit_checkdiplomacy_hf_ent(histfig, group)
-            var_3d = var_3e = var_45 = var_46 = var_47 = var_48 = var_49 = nil
-
-            var_3d = 1 if group.type == :Outcast or group.type == :NomadicGroup or
-            (group.type == :Civilization and group.entity_raw.flags[:LOCAL_BANDITRY])
-
-            histfig.entity_links.each { |link|
-                if link.entity_id == group.id
-                    case link.getType
-                    when :MEMBER, :MERCENARY, :SLAVE, :PRISONER, :POSITION, :HERO
-                        var_47 = 1
-                    when :FORMER_MEMBER, :FORMER_MERCENARY, :FORMER_SLAVE, :FORMER_PRISONER
-                        var_48 = 1
-                    when :ENEMY
-                        var_49 = 1
-                    when :CRIMINAL
-                        var_45 = 1
-                    end
-                else
-                    case link.getType
-                    when :MEMBER, :MERCENARY, :SLAVE
-                        if link_entity = link.entity_tg
-                            diplo = group.unknown1b.diplomacy.binsearch(link.entity_id, :group_id)
-                            case diplo.relation
-                            when 0, 3, 4
-                                var_48 = 1
-                            when 1, 5
-                                var_46 = 1
-                            end
-
-                            var_3e = 1 if link_entity.type == :Outcast or link_entity.type == :NomadicGroup or
-                            (link_entity.type == :Civilization and link_entity.entity_raw.flags[:LOCAL_BANDITRY])
-                        end
-                    end
-                end
-            }
-
-            if var_49
-                4
-            elsif var_46
-                5
-            elsif !var_47 and group.resources.ethic[:KILL_NEUTRAL] == 16
-                4
-            elsif df.gamemode == :ADVENTURE and !var_47 and (var_3e or !var_3d)
-                4
-            elsif var_45
-                3
-            elsif var_47
-                2
-            elsif var_48
-                1
-            else
-                0
-            end
-        end
-
-
-        # list workers (citizen, not crazy / child / inmood / noble)
-        def unit_workers
-            world.units.active.find_all { |u|
-                unit_isworker(u)
-            }
-        end
-
-        def unit_isworker(u)
-            unit_iscitizen(u) and
-            u.race == df.ui.race_id and
-            u.mood == :None and
-            u.profession != :CHILD and
-            u.profession != :BABY and
-            # TODO MENIAL_WORK_EXEMPTION_SPOUSE
-            !unit_entitypositions(u).find { |pos| pos.flags[:MENIAL_WORK_EXEMPTION] }
-        end
-
-        # list currently idle workers
-        def unit_idlers
-            world.units.active.find_all { |u|
-                unit_isidler(u)
-            }
-        end
-
-        def unit_isidler(u)
-            unit_isworker(u) and
-            # current_job includes eat/drink/sleep/pickupequip
-            !u.job.current_job and
-            # filter 'attend meeting'
-            not u.specific_refs.find { |s| s.type == :ACTIVITY } and
-            # filter soldiers (TODO check schedule)
-            u.military.squad_id == -1 and
-            # filter incoming migrants
-            not u.status.misc_traits.find { |t| t.id == :Migrant }
-        end
-
-        def unit_entitypositions(unit)
-            list = []
-            return list if not histfig = unit.hist_figure_tg
-            histfig.entity_links.each { |el|
-                next if el._rtti_classname != :histfig_entity_link_positionst
-                next if not ent = el.entity_tg
-                next if not pa = ent.positions.assignments.binsearch(el.assignment_id)
-                next if not pos = ent.positions.own.binsearch(pa.position_id)
-                list << pos
-            }
-            list
-        end
-    end
-
-    class LanguageName
-        def to_s(english=false)
-            df.translate_name(self, english)
-        end
-    end
-end
diff --git a/plugins/ruby/win32/.gitignore b/plugins/ruby/win32/.gitignore
deleted file mode 100644
index ef44e3942..000000000
--- a/plugins/ruby/win32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libruby*
diff --git a/plugins/ruby/win64/.gitignore b/plugins/ruby/win64/.gitignore
deleted file mode 100644
index ef44e3942..000000000
--- a/plugins/ruby/win64/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libruby*
diff --git a/plugins/search.cpp b/plugins/search.cpp
deleted file mode 100644
index 9ecae6460..000000000
--- a/plugins/search.cpp
+++ /dev/null
@@ -1,2568 +0,0 @@
-#include "MiscUtils.h"
-#include "VTableInterpose.h"
-#include "uicommon.h"
-
-#include "modules/Buildings.h"
-#include "modules/Gui.h"
-#include "modules/Job.h"
-#include "modules/Screen.h"
-#include "modules/Translation.h"
-#include "modules/Units.h"
-
-#include "df/creature_raw.h"
-#include "df/global_objects.h"
-#include "df/historical_figure.h"
-#include "df/interface_key.h"
-#include "df/interfacest.h"
-#include "df/job.h"
-#include "df/layer_object_listst.h"
-#include "df/misc_trait_type.h"
-#include "df/report.h"
-#include "df/ui_look_list.h"
-#include "df/unit.h"
-#include "df/unit_misc_trait.h"
-#include "df/viewscreen_announcelistst.h"
-#include "df/viewscreen_buildinglistst.h"
-#include "df/viewscreen_dwarfmodest.h"
-#include "df/viewscreen_joblistst.h"
-#include "df/viewscreen_justicest.h"
-#include "df/viewscreen_kitchenprefst.h"
-#include "df/viewscreen_layer_militaryst.h"
-#include "df/viewscreen_layer_noblelistst.h"
-#include "df/viewscreen_layer_stockpilest.h"
-#include "df/viewscreen_layer_stone_restrictionst.h"
-#include "df/viewscreen_locationsst.h"
-#include "df/viewscreen_petst.h"
-#include "df/viewscreen_storesst.h"
-#include "df/viewscreen_topicmeeting_fill_land_holder_positionsst.h"
-#include "df/viewscreen_tradegoodsst.h"
-#include "df/viewscreen_unitlistst.h"
-#include "df/viewscreen_workshop_profilest.h"
-
-using namespace std;
-using std::set;
-using std::vector;
-using std::string;
-
-using namespace DFHack;
-using namespace df::enums;
-
-DFHACK_PLUGIN("search");
-DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-
-REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(gview);
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(ui_building_assign_units);
-REQUIRE_GLOBAL(ui_building_in_assign);
-REQUIRE_GLOBAL(ui_building_item_cursor);
-REQUIRE_GLOBAL(ui_look_cursor);
-REQUIRE_GLOBAL(ui_look_list);
-REQUIRE_GLOBAL(world);
-
-/*
-Search Plugin
-
-A plugin that adds a "Search" hotkey to some screens (Units, Trade and Stocks)
-that allows filtering of the list items by a typed query.
-
-Works by manipulating the vector(s) that the list based viewscreens use to store
-their items. When a search is started the plugin saves the original vectors and
-with each keystroke creates a new filtered vector off the saves for the screen
-to use.
-*/
-
-
-void make_text_dim(int x1, int x2, int y)
-{
-    for (int x = x1; x <= x2; x++)
-    {
-        Screen::Pen pen = Screen::readTile(x,y);
-
-        if (pen.valid())
-        {
-            if (pen.fg != 0)
-            {
-                if (pen.fg == 7)
-                    pen.adjust(0,true);
-                else
-                    pen.bold = 0;
-            }
-
-            Screen::paintTile(pen,x,y);
-        }
-    }
-}
-
-static bool is_live_screen(const df::viewscreen *screen)
-{
-    for (df::viewscreen *cur = &gview->view; cur; cur = cur->child)
-        if (cur == screen && cur->breakdown_level == interface_breakdown_types::NONE)
-            return true;
-    return false;
-}
-
-static string get_unit_description(df::unit *unit)
-{
-    if (!unit)
-        return "";
-    string desc;
-    auto name = Units::getVisibleName(unit);
-    if (name->has_name)
-        desc = Translation::TranslateName(name, false);
-    desc += ", " + Units::getProfessionName(unit); // Check animal type too
-
-    return desc;
-}
-
-static bool cursor_key_pressed (std::set<df::interface_key> *input, bool in_entry_mode)
-{
-    if (in_entry_mode)
-    {
-        // give text input (e.g. "2") priority over cursor keys
-        for (auto it = input->begin(); it != input->end(); ++it)
-        {
-            if (Screen::keyToChar(*it) != -1)
-                return false;
-        }
-    }
-    return
-    input->count(df::interface_key::CURSOR_UP) ||
-    input->count(df::interface_key::CURSOR_DOWN) ||
-    input->count(df::interface_key::CURSOR_LEFT) ||
-    input->count(df::interface_key::CURSOR_RIGHT) ||
-    input->count(df::interface_key::CURSOR_UPLEFT) ||
-    input->count(df::interface_key::CURSOR_UPRIGHT) ||
-    input->count(df::interface_key::CURSOR_DOWNLEFT) ||
-    input->count(df::interface_key::CURSOR_DOWNRIGHT) ||
-    input->count(df::interface_key::CURSOR_UP_FAST) ||
-    input->count(df::interface_key::CURSOR_DOWN_FAST) ||
-    input->count(df::interface_key::CURSOR_LEFT_FAST) ||
-    input->count(df::interface_key::CURSOR_RIGHT_FAST) ||
-    input->count(df::interface_key::CURSOR_UPLEFT_FAST) ||
-    input->count(df::interface_key::CURSOR_UPRIGHT_FAST) ||
-    input->count(df::interface_key::CURSOR_DOWNLEFT_FAST) ||
-    input->count(df::interface_key::CURSOR_DOWNRIGHT_FAST) ||
-    input->count(df::interface_key::CURSOR_UP_Z) ||
-    input->count(df::interface_key::CURSOR_DOWN_Z) ||
-    input->count(df::interface_key::CURSOR_UP_Z_AUX) ||
-    input->count(df::interface_key::CURSOR_DOWN_Z_AUX);
-}
-
-//
-// START: Generic Search functionality
-//
-
-template <class S, class T>
-class search_generic
-{
-public:
-    bool init(S *screen)
-    {
-        if (screen != viewscreen && !reset_on_change())
-            return false;
-
-        if (!can_init(screen))
-        {
-            if (is_valid())
-            {
-                clear_search();
-                reset_all();
-            }
-
-            return false;
-        }
-
-        if (!is_valid())
-        {
-            this->viewscreen = screen;
-            this->cursor_pos = get_viewscreen_cursor();
-            this->primary_list = get_primary_list();
-            this->select_key = get_search_select_key();
-            select_token = Screen::charToKey(select_key);
-            shift_select_token = Screen::charToKey(select_key + 'A' - 'a');
-            valid = true;
-            do_post_init();
-        }
-
-        return true;
-    }
-
-    // Called each time you enter or leave a searchable screen. Resets everything.
-    virtual void reset_all()
-    {
-        reset_search();
-        valid = false;
-        primary_list = NULL;
-        viewscreen = NULL;
-        select_key = 's';
-    }
-
-    bool reset_on_change()
-    {
-        if (valid && is_live_screen(viewscreen))
-            return false;
-
-        reset_all();
-        return true;
-    }
-
-    bool is_valid()
-    {
-        return valid;
-    }
-
-    // A new keystroke is received in a searchable screen
-    virtual bool process_input(set<df::interface_key> *input)
-    {
-        // If the page has two search options (Trade screen), only allow one to operate
-        // at a time
-        if (lock != NULL && lock != this)
-            return false;
-
-        // Allows custom preprocessing for each screen
-        if (!should_check_input(input))
-            return false;
-
-        bool key_processed = true;
-
-        if (entry_mode)
-        {
-            // Query typing mode
-
-            df::interface_key last_token = get_string_key(input);
-            int charcode = Screen::keyToChar(last_token);
-            if (charcode >= 32 && charcode <= 126)
-            {
-                // Standard character
-                search_string += char(charcode);
-                do_search();
-            }
-            else if (last_token == interface_key::STRING_A000)
-            {
-                // Backspace
-                if (search_string.length() > 0)
-                {
-                    search_string.erase(search_string.length()-1);
-                    do_search();
-                }
-            }
-            else if (input->count(interface_key::SELECT) || input->count(interface_key::LEAVESCREEN))
-            {
-                // ENTER or ESC: leave typing mode
-                end_entry_mode();
-            }
-            else if (cursor_key_pressed(input, entry_mode))
-            {
-                // Arrow key pressed. Leave entry mode and allow screen to process key
-                end_entry_mode();
-                key_processed = false;
-            }
-        }
-        // Not in query typing mode
-        else if (input->count(select_token))
-        {
-            // Hotkey pressed, enter typing mode
-            start_entry_mode();
-        }
-        else if (input->count(shift_select_token))
-        {
-            // Shift + Hotkey pressed, clear query
-            clear_search();
-        }
-        else
-        {
-            // Not a key for us, pass it on to the screen
-            key_processed = false;
-        }
-
-        return key_processed || entry_mode; // Only pass unrecognized keys down if not in typing mode
-    }
-
-    // Called after a keystroke has been processed
-    virtual void do_post_input_feed()
-    {
-    }
-
-    static search_generic<S, T> *lock;
-
-    bool in_entry_mode()
-    {
-        return entry_mode;
-    }
-
-protected:
-    virtual string get_element_description(T element) const = 0;
-    virtual void render() const = 0;
-    virtual int32_t *get_viewscreen_cursor() = 0;
-    virtual vector<T> *get_primary_list() = 0;
-
-    search_generic()
-    {
-        reset_all();
-    }
-
-    virtual bool can_init(S *screen)
-    {
-        return true;
-    }
-
-    virtual void do_post_init()
-    {
-
-    }
-
-    void start_entry_mode()
-    {
-        entry_mode = true;
-        lock = this;
-    }
-
-    void end_entry_mode()
-    {
-        entry_mode = false;
-        lock = NULL;
-    }
-
-    virtual char get_search_select_key()
-    {
-        return 's';
-    }
-
-    virtual void reset_search()
-    {
-        end_entry_mode();
-        search_string = "";
-        saved_list1.clear();
-    }
-
-    // Shortcut to clear the search immediately
-    virtual void clear_search()
-    {
-        if (saved_list1.size() > 0)
-        {
-            *primary_list = saved_list1;
-            saved_list1.clear();
-        }
-        search_string = "";
-    }
-
-    virtual void save_original_values()
-    {
-        saved_list1 = *primary_list;
-    }
-
-    virtual void do_pre_incremental_search()
-    {
-
-    }
-
-    virtual void clear_viewscreen_vectors()
-    {
-        primary_list->clear();
-    }
-
-    virtual void add_to_filtered_list(size_t i)
-    {
-        primary_list->push_back(saved_list1[i]);
-    }
-
-    virtual void do_post_search()
-    {
-
-    }
-
-    virtual bool is_valid_for_search(size_t index)
-    {
-        return true;
-    }
-
-    virtual bool force_in_search(size_t index)
-    {
-        return false;
-    }
-
-    // The actual sort
-    virtual void do_search()
-    {
-        if (search_string.length() == 0)
-        {
-            clear_search();
-            return;
-        }
-
-        if (saved_list1.size() == 0)
-            // On first run, save the original list
-            save_original_values();
-        else
-            do_pre_incremental_search();
-
-        clear_viewscreen_vectors();
-
-        string search_string_l = to_search_normalized(search_string);
-        for (size_t i = 0; i < saved_list1.size(); i++ )
-        {
-            if (force_in_search(i))
-            {
-                add_to_filtered_list(i);
-                continue;
-            }
-
-            if (!is_valid_for_search(i))
-                continue;
-
-            T element = saved_list1[i];
-            string desc = to_search_normalized(get_element_description(element));
-            if (desc.find(search_string_l) != string::npos)
-            {
-                add_to_filtered_list(i);
-            }
-        }
-
-        do_post_search();
-
-        if (cursor_pos)
-            *cursor_pos = 0;
-    }
-
-    virtual bool should_check_input(set<df::interface_key> *input)
-    {
-        return true;
-    }
-
-    // Display hotkey message
-    void print_search_option(int x, int y = -1) const
-    {
-        auto dim = Screen::getWindowSize();
-        if (y == -1)
-            y = dim.y - 2;
-
-        OutputString((entry_mode) ? 4 : 12, x, y, string(1, select_key));
-        OutputString((entry_mode) ? 10 : 15, x, y, ": Search");
-        if (search_string.length() > 0 || entry_mode)
-            OutputString(15, x, y, ": " + search_string);
-        if (entry_mode)
-            OutputString(10, x, y, "_");
-    }
-
-    S *viewscreen;
-    vector <T> saved_list1, reference_list, *primary_list;
-
-    //bool redo_search;
-    string search_string;
-
-protected:
-    int *cursor_pos;
-    char select_key;
-    bool valid;
-    bool entry_mode;
-
-    df::interface_key select_token;
-    df::interface_key shift_select_token;
-};
-
-template <class S, class T> search_generic<S, T> *search_generic<S, T> ::lock = NULL;
-
-
-// Search class helper for layered screens
-template <class S, class T, int LIST_ID>
-class layered_search : public search_generic<S, T>
-{
-protected:
-    virtual bool can_init(S *screen)
-    {
-        auto list = getLayerList(screen);
-        if (!is_list_valid(screen) || !list || !list->active)
-            return false;
-
-        return true;
-    }
-
-    virtual bool is_list_valid(S*)
-    {
-        return true;
-    }
-
-    virtual void do_search()
-    {
-        search_generic<S,T>::do_search();
-        auto list = getLayerList(this->viewscreen);
-        list->num_entries = this->get_primary_list()->size();
-    }
-
-    int32_t *get_viewscreen_cursor()
-    {
-        auto list = getLayerList(this->viewscreen);
-        return &list->cursor;
-    }
-
-    virtual void clear_search()
-    {
-        search_generic<S,T>::clear_search();
-
-        if (is_list_valid(this->viewscreen))
-        {
-            auto list = getLayerList(this->viewscreen);
-            list->num_entries = this->get_primary_list()->size();
-        }
-    }
-
-private:
-    static df::layer_object_listst *getLayerList(const df::viewscreen_layer *layer)
-    {
-        return virtual_cast<df::layer_object_listst>(vector_get(layer->layer_objects, LIST_ID));
-    }
-};
-
-
-
-// Parent class for screens that have more than one primary list to synchronise
-template < class S, class T, class PARENT = search_generic<S,T> >
-class search_multicolumn_modifiable_generic : public PARENT
-{
-protected:
-    vector <T> reference_list;
-    vector <int> saved_indexes;
-    bool read_only;
-
-    virtual void update_saved_secondary_list_item(size_t i, size_t j) = 0;
-    virtual void save_secondary_values() = 0;
-    virtual void clear_secondary_viewscreen_vectors() = 0;
-    virtual void add_to_filtered_secondary_lists(size_t i) = 0;
-    virtual void clear_secondary_saved_lists() = 0;
-    virtual void reset_secondary_viewscreen_vectors() = 0;
-    virtual void restore_secondary_values() = 0;
-
-    virtual void do_post_init()
-    {
-        // If true, secondary list isn't modifiable so don't bother synchronising values
-        read_only = false;
-    }
-
-    void reset_all()
-    {
-        PARENT::reset_all();
-        reference_list.clear();
-        saved_indexes.clear();
-        reset_secondary_viewscreen_vectors();
-    }
-
-    void reset_search()
-    {
-        PARENT::reset_search();
-        reference_list.clear();
-        saved_indexes.clear();
-        clear_secondary_saved_lists();
-    }
-
-    virtual void clear_search()
-    {
-        if (this->saved_list1.size() > 0)
-        {
-            do_pre_incremental_search();
-            restore_secondary_values();
-        }
-        clear_secondary_saved_lists();
-        PARENT::clear_search();
-        do_post_search();
-    }
-
-    virtual bool is_match(T &a, T &b) = 0;
-
-    virtual bool is_match(vector<T> &a, vector<T> &b) = 0;
-
-    void do_pre_incremental_search()
-    {
-        PARENT::do_pre_incremental_search();
-        if (read_only)
-            return;
-
-        bool list_has_been_sorted = (this->primary_list->size() == reference_list.size()
-            && !is_match(*this->primary_list, reference_list));
-
-        for (size_t i = 0; i < saved_indexes.size(); i++)
-        {
-            int adjusted_item_index = i;
-            if (list_has_been_sorted)
-            {
-                for (size_t j = 0; j < this->primary_list->size(); j++)
-                {
-                    if (is_match((*this->primary_list)[j], reference_list[i]))
-                    {
-                        adjusted_item_index = j;
-                        break;
-                    }
-                }
-            }
-
-            update_saved_secondary_list_item(saved_indexes[i], adjusted_item_index);
-        }
-        saved_indexes.clear();
-    }
-
-    void clear_viewscreen_vectors()
-    {
-        search_generic<S,T>::clear_viewscreen_vectors();
-        saved_indexes.clear();
-        clear_secondary_viewscreen_vectors();
-    }
-
-    void add_to_filtered_list(size_t i)
-    {
-        search_generic<S,T>::add_to_filtered_list(i);
-        add_to_filtered_secondary_lists(i);
-        if (!read_only)
-            saved_indexes.push_back(i); // Used to map filtered indexes back to original, if needed
-    }
-
-    virtual void do_post_search()
-    {
-        if (!read_only)
-            reference_list = *this->primary_list;
-    }
-
-    void save_original_values()
-    {
-        search_generic<S,T>::save_original_values();
-        save_secondary_values();
-    }
-};
-
-// This basic match function is separated out from the generic multi column class, because the
-// pets screen, which uses a union in its primary list, will cause a compile failure if this
-// match function exists in the generic class
-template < class S, class T, class PARENT = search_generic<S,T> >
-class search_multicolumn_modifiable : public search_multicolumn_modifiable_generic<S, T, PARENT>
-{
-    bool is_match(T &a, T &b)
-    {
-        return a == b;
-    }
-
-    bool is_match(vector<T> &a, vector<T> &b)
-    {
-        return a == b;
-    }
-};
-
-// General class for screens that have only one secondary list to keep in sync
-template < class S, class T, class V, class PARENT = search_generic<S,T> >
-class search_twocolumn_modifiable : public search_multicolumn_modifiable<S, T, PARENT>
-{
-public:
-protected:
-    virtual vector<V> * get_secondary_list() = 0;
-
-    virtual void do_post_init()
-    {
-        search_multicolumn_modifiable<S, T, PARENT>::do_post_init();
-        secondary_list = get_secondary_list();
-    }
-
-    void save_secondary_values()
-    {
-        saved_secondary_list = *secondary_list;
-    }
-
-    void reset_secondary_viewscreen_vectors()
-    {
-        secondary_list = NULL;
-    }
-
-    virtual void update_saved_secondary_list_item(size_t i, size_t j)
-    {
-        saved_secondary_list[i] = (*secondary_list)[j];
-    }
-
-    void clear_secondary_viewscreen_vectors()
-    {
-        secondary_list->clear();
-    }
-
-    void add_to_filtered_secondary_lists(size_t i)
-    {
-        secondary_list->push_back(saved_secondary_list[i]);
-    }
-
-    void clear_secondary_saved_lists()
-    {
-        saved_secondary_list.clear();
-    }
-
-    void restore_secondary_values()
-    {
-        *secondary_list = saved_secondary_list;
-    }
-
-    vector<V> *secondary_list, saved_secondary_list;
-};
-
-
-// Parent struct for the hooks, use optional param D to generate multiple search classes in the same
-// viewscreen but different static modules
-template <class T, class V, int D = 0>
-struct generic_search_hook : T
-{
-    typedef T interpose_base;
-
-    static V module;
-
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
-    {
-        if (!module.init(this))
-        {
-            INTERPOSE_NEXT(feed)(input);
-            return;
-        }
-
-        if (!module.process_input(input))
-        {
-            INTERPOSE_NEXT(feed)(input);
-            module.do_post_input_feed();
-        }
-
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        bool ok = module.init(this);
-        INTERPOSE_NEXT(render)();
-        if (ok)
-            module.render();
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(bool, key_conflict, (df::interface_key key))
-    {
-        if (module.in_entry_mode() && (key == interface_key::MOVIES || key == interface_key::HELP))
-            return true;
-        return INTERPOSE_NEXT(key_conflict)(key);
-    }
-};
-
-template <class T, class V, int D> V generic_search_hook<T, V, D> ::module;
-
-
-// Hook definition helpers
-#define IMPLEMENT_HOOKS_WITH_ID(screen, module, id, prio) \
-    typedef generic_search_hook<screen, module, id> module##_hook; \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(module##_hook, feed, prio); \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(module##_hook, render, prio); \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(module##_hook, key_conflict, prio)
-
-#define IMPLEMENT_HOOKS(screen, module) \
-    typedef generic_search_hook<screen, module> module##_hook; \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE(module##_hook, feed); \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE(module##_hook, render); \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE(module##_hook, key_conflict)
-
-#define IMPLEMENT_HOOKS_PRIO(screen, module, prio) \
-    typedef generic_search_hook<screen, module> module##_hook; \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(module##_hook, feed, prio); \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(module##_hook, render, prio); \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(module##_hook, key_conflict, prio);
-
-//
-// END: Generic Search functionality
-//
-
-
-//
-// START: Animal screen search
-//
-
-typedef search_multicolumn_modifiable_generic<df::viewscreen_petst, df::viewscreen_petst::T_animal> pets_search_base;
-class pets_search : public pets_search_base
-{
-    typedef df::viewscreen_petst::T_animal T_animal;
-    typedef df::viewscreen_petst::T_mode T_mode;
-public:
-    void render() const
-    {
-        print_search_option(25, 4);
-    }
-
-private:
-    bool can_init(df::viewscreen_petst *screen)
-    {
-        return pets_search_base::can_init(screen) && screen->mode == T_mode::List;
-    }
-
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->cursor;
-    }
-
-    vector<T_animal> *get_primary_list()
-    {
-        return &viewscreen->animal;
-    }
-
-    virtual void do_post_init()
-    {
-        is_vermin = &viewscreen->is_vermin;
-        is_tame = &viewscreen->is_tame;
-        is_adopting = &viewscreen->is_adopting;
-    }
-
-    string get_element_description(df::viewscreen_petst::T_animal element) const
-    {
-        return get_unit_description(element.unit);
-    }
-
-    bool should_check_input()
-    {
-        return viewscreen->mode == T_mode::List;
-    }
-
-    bool is_valid_for_search(size_t i)
-    {
-        return is_vermin_s[i] == 0;
-    }
-
-    void save_secondary_values()
-    {
-        is_vermin_s = *is_vermin;
-        is_tame_s = *is_tame;
-        is_adopting_s = *is_adopting;
-    }
-
-    void reset_secondary_viewscreen_vectors()
-    {
-        is_vermin = NULL;
-        is_tame = NULL;
-        is_adopting = NULL;
-    }
-
-    void update_saved_secondary_list_item(size_t i, size_t j)
-    {
-        is_vermin_s[i] = (*is_vermin)[j];
-        is_tame_s[i] = (*is_tame)[j];
-        is_adopting_s[i] = (*is_adopting)[j];
-    }
-
-    void clear_secondary_viewscreen_vectors()
-    {
-        is_vermin->clear();
-        is_tame->clear();
-        is_adopting->clear();
-    }
-
-    void add_to_filtered_secondary_lists(size_t i)
-    {
-        is_vermin->push_back(is_vermin_s[i]);
-        is_tame->push_back(is_tame_s[i]);
-        is_adopting->push_back(is_adopting_s[i]);
-    }
-
-    void clear_secondary_saved_lists()
-    {
-        is_vermin_s.clear();
-        is_tame_s.clear();
-        is_adopting_s.clear();
-    }
-
-    void restore_secondary_values()
-    {
-        *is_vermin = is_vermin_s;
-        *is_tame = is_tame_s;
-        *is_adopting = is_adopting_s;
-    }
-
-    bool is_match(T_animal &a, T_animal &b)
-    {
-        return a.unit == b.unit;
-    }
-
-    bool is_match(vector<T_animal> &a, vector<T_animal> &b)
-    {
-        for (size_t i = 0; i < a.size(); i++)
-        {
-            if (!is_match(a[i], b[i]))
-                return false;
-        }
-
-        return true;
-    }
-
-    std::vector<char > *is_vermin, is_vermin_s;
-    std::vector<char > *is_tame, is_tame_s;
-    std::vector<char > *is_adopting, is_adopting_s;
-};
-
-IMPLEMENT_HOOKS_WITH_ID(df::viewscreen_petst, pets_search, 1, 0);
-
-//
-// END: Animal screen search
-//
-
-
-//
-// START: Animal knowledge screen search
-//
-
-typedef search_generic<df::viewscreen_petst, int32_t> animal_knowledge_search_base;
-class animal_knowledge_search : public animal_knowledge_search_base
-{
-    typedef df::viewscreen_petst::T_mode T_mode;
-    bool can_init(df::viewscreen_petst *screen)
-    {
-        return animal_knowledge_search_base::can_init(screen) && screen->mode == T_mode::TrainingKnowledge;
-    }
-
-public:
-    void render() const
-    {
-        print_search_option(2, 4);
-    }
-
-private:
-    int32_t *get_viewscreen_cursor()
-    {
-        return NULL;
-    }
-
-    vector<int32_t> *get_primary_list()
-    {
-        return &viewscreen->known;
-    }
-
-    string get_element_description(int32_t id) const
-    {
-        auto craw = df::creature_raw::find(id);
-        string out;
-        if (craw)
-        {
-            for (size_t i = 0; i < 3; ++i)
-                out += craw->name[i] + " ";
-        }
-        return out;
-    }
-};
-
-IMPLEMENT_HOOKS_WITH_ID(df::viewscreen_petst, animal_knowledge_search, 2, 0);
-
-//
-// END: Animal knowledge screen search
-//
-
-
-//
-// START: Animal trainer search
-//
-
-typedef search_twocolumn_modifiable<df::viewscreen_petst, df::unit*, df::viewscreen_petst::T_trainer_mode> animal_trainer_search_base;
-class animal_trainer_search : public animal_trainer_search_base
-{
-    typedef df::viewscreen_petst::T_mode T_mode;
-    typedef df::viewscreen_petst::T_trainer_mode T_trainer_mode;
-
-    bool can_init(df::viewscreen_petst *screen)
-    {
-        return animal_trainer_search_base::can_init(screen) && screen->mode == T_mode::SelectTrainer;
-    }
-
-public:
-    void render() const
-    {
-        Screen::paintTile(Screen::Pen('\xBA', 8, 0), 14, 2);
-        Screen::paintTile(Screen::Pen('\xBA', 8, 0), gps->dimx - 14, 2);
-        Screen::paintTile(Screen::Pen('\xC9', 8, 0), 14, 1);
-        Screen::paintTile(Screen::Pen('\xBB', 8, 0), gps->dimx - 14, 1);
-        for (int x = 15; x <= gps->dimx - 15; ++x)
-        {
-            Screen::paintTile(Screen::Pen('\xCD', 8, 0), x, 1);
-            Screen::paintTile(Screen::Pen('\x00', 0, 0), x, 2);
-        }
-        print_search_option(16, 2);
-    }
-
-private:
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->trainer_cursor;
-    }
-
-    vector<df::unit*> *get_primary_list()
-    {
-        return &viewscreen->trainer_unit;
-    }
-
-    string get_element_description(df::unit *u) const
-    {
-        return get_unit_description(u);
-    }
-
-    std::vector<T_trainer_mode> *get_secondary_list()
-    {
-        return &viewscreen->trainer_mode;
-    }
-
-public:
-    bool process_input(set<df::interface_key> *input)
-    {
-        if (input->count(interface_key::SELECT) && viewscreen->trainer_unit.empty() && !in_entry_mode())
-            return true;
-        return animal_trainer_search_base::process_input(input);
-    }
-
-};
-
-IMPLEMENT_HOOKS_WITH_ID(df::viewscreen_petst, animal_trainer_search, 3, 0);
-
-//
-// END: Animal trainer search
-//
-
-
-//
-// START: Stocks screen search
-//
-typedef search_generic<df::viewscreen_storesst, df::item*> stocks_search_base;
-class stocks_search : public stocks_search_base
-{
-public:
-
-    void render() const
-    {
-        if (!viewscreen->in_group_mode)
-            print_search_option(2);
-        else
-        {
-            auto dim = Screen::getWindowSize();
-            int x = 2, y = dim.y - 2;
-            OutputString(15, x, y, "Tab to enable Search");
-        }
-    }
-
-    bool process_input(set<df::interface_key> *input)
-    {
-        if (viewscreen->in_group_mode)
-            return false;
-
-        redo_search = false;
-
-        if ((input->count(interface_key::CURSOR_UP) || input->count(interface_key::CURSOR_DOWN)) && !viewscreen->in_right_list)
-        {
-            // Redo search if category changes
-            saved_list1.clear();
-            end_entry_mode();
-            if (search_string.length() > 0)
-                redo_search = true;
-
-            return false;
-        }
-
-        return stocks_search_base::process_input(input);
-    }
-
-    virtual void do_post_input_feed()
-    {
-        if (viewscreen->in_group_mode)
-        {
-            // Disable search if item lists are grouped
-            clear_search();
-            reset_search();
-        }
-        else if (redo_search)
-        {
-            do_search();
-            redo_search = false;
-        }
-    }
-
-private:
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->item_cursor;
-    }
-
-    virtual vector<df::item*> *get_primary_list()
-    {
-        return &viewscreen->items;
-    }
-
-
-private:
-    string get_element_description(df::item *element) const
-    {
-        if (!element)
-            return "";
-        return Items::getDescription(element, 0, true);
-    }
-
-    bool redo_search;
-};
-
-
-IMPLEMENT_HOOKS_PRIO(df::viewscreen_storesst, stocks_search, 100);
-
-//
-// END: Stocks screen search
-//
-
-
-//
-// START: Unit screen search
-//
-typedef search_twocolumn_modifiable<df::viewscreen_unitlistst, df::unit*, df::job*> unitlist_search_base;
-class unitlist_search : public unitlist_search_base
-{
-public:
-    void render() const
-    {
-        print_search_option(28);
-    }
-
-private:
-    void do_post_init()
-    {
-        unitlist_search_base::do_post_init();
-        read_only = true;
-    }
-
-    static string get_non_work_description(df::unit *unit)
-    {
-        if (!unit)
-            return "";
-        for (auto p = unit->status.misc_traits.begin(); p < unit->status.misc_traits.end(); p++)
-        {
-            if ((*p)->id == misc_trait_type::Migrant)
-            {
-                return ".new arrival.migrant";
-            }
-        }
-
-        if (Units::isBaby(unit) ||
-            Units::isChild(unit) ||
-            unit->profession == profession::DRUNK)
-        {
-            return "";
-        }
-
-        if (ENUM_ATTR(profession, military, unit->profession))
-            return ".military";
-
-        return ".idle.no job";
-    }
-
-    string get_element_description(df::unit *unit) const
-    {
-        if (!unit)
-            return "Inactive";
-        string desc = get_unit_description(unit);
-        if (!unit->job.current_job)
-        {
-            desc += get_non_work_description(unit);
-        }
-
-        return desc;
-    }
-
-    bool should_check_input(set<df::interface_key> *input)
-    {
-        if (input->count(interface_key::STANDARDSCROLL_LEFT) ||
-            input->count(interface_key::STANDARDSCROLL_RIGHT) ||
-            (!in_entry_mode() && input->count(interface_key::UNITVIEW_PRF_PROF)))
-        {
-            if (!in_entry_mode())
-            {
-                // Changing screens, reset search
-                int32_t *cursor_pos = get_viewscreen_cursor();
-                if (cursor_pos && *cursor_pos < 0)
-                    *cursor_pos = 0;
-                clear_search();
-                reset_all();
-                return false;
-            }
-            else
-            {
-                // Ignore cursor keys when typing
-                input->erase(interface_key::STANDARDSCROLL_LEFT);
-                input->erase(interface_key::STANDARDSCROLL_RIGHT);
-            }
-        }
-
-        return true;
-    }
-
-    char get_search_select_key()
-    {
-        return 'q';
-    }
-
-    vector<df::job*> *get_secondary_list()
-    {
-        return &viewscreen->jobs[viewscreen->page];
-    }
-
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->cursor_pos[viewscreen->page];
-    }
-
-    vector<df::unit*> *get_primary_list()
-    {
-        return &viewscreen->units[viewscreen->page];
-    }
-};
-
-typedef generic_search_hook<df::viewscreen_unitlistst, unitlist_search> unitlist_search_hook;
-IMPLEMENT_HOOKS_PRIO(df::viewscreen_unitlistst, unitlist_search, 100);
-
-//
-// END: Unit screen search
-//
-
-
-//
-// START: Trade screen search
-//
-class trade_search_base : public search_multicolumn_modifiable<df::viewscreen_tradegoodsst, df::item*>
-{
-protected:
-    virtual vector<char> *get_selected_list() = 0;
-    virtual vector<int32_t> *get_count_list() = 0;
-
-private:
-    string get_element_description(df::item *element) const
-    {
-        if (!element)
-            return "";
-        return Items::getDescription(element, 0, true);
-    }
-
-    bool should_check_input(set<df::interface_key> *input)
-    {
-        if (in_entry_mode())
-            return true;
-
-        if (input->count(interface_key::TRADE_TRADE) ||
-            input->count(interface_key::TRADE_OFFER) ||
-            input->count(interface_key::TRADE_SEIZE))
-        {
-            // Block the keys if were searching
-            if (!search_string.empty())
-            {
-                input->clear();
-            }
-
-            return false;
-        }
-        else if (input->count(interface_key::CUSTOM_ALT_C))
-        {
-            clear_search_for_trade();
-            return true;
-        }
-
-        return true;
-    }
-
-    void clear_search_for_trade()
-    {
-        // Trying to trade, reset search
-        clear_search();
-        reset_all();
-    }
-
-    void do_post_init()
-    {
-        search_multicolumn_modifiable::do_post_init();
-
-        selected = get_selected_list();
-        count = get_count_list();
-    }
-
-    void save_secondary_values()
-    {
-        selected_s = *selected;
-        count_s = *count;
-    }
-
-    void reset_secondary_viewscreen_vectors()
-    {
-        selected = NULL;
-        count = NULL;
-    }
-
-    void update_saved_secondary_list_item(size_t i, size_t j)
-    {
-        selected_s[i] = (*selected)[j];
-        count_s[i] = (*count)[j];
-    }
-
-    void clear_secondary_viewscreen_vectors()
-    {
-        selected->clear();
-        count->clear();
-    }
-
-    void add_to_filtered_secondary_lists(size_t i)
-    {
-        selected->push_back(selected_s[i]);
-        count->push_back(count_s[i]);
-    }
-
-    void clear_secondary_saved_lists()
-    {
-        selected_s.clear();
-        count_s.clear();
-    }
-
-    void restore_secondary_values()
-    {
-        *selected = selected_s;
-        *count = count_s;
-    }
-
-    std::vector<char> *selected, selected_s;
-    std::vector<int32_t> *count, count_s;
-};
-
-
-class trade_search_merc : public trade_search_base
-{
-public:
-    virtual void render() const
-    {
-        if (viewscreen->counteroffer.size() > 0)
-        {
-            // The merchant is proposing a counteroffer.
-            // Not only is there nothing to search,
-            // but the native hotkeys are where we normally write.
-            return;
-        }
-
-        print_search_option(2, -1);
-
-        if (!search_string.empty())
-        {
-            int32_t x = 2;
-            int32_t y = gps->dimy - 3;
-            make_text_dim(2, gps->dimx-2, y);
-            OutputString(COLOR_LIGHTRED, x, y, string(1, select_key + 'A' - 'a'));
-            OutputString(COLOR_WHITE, x, y, ": Clear search to trade           ");
-        }
-    }
-
-private:
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->trader_cursor;
-    }
-
-    vector<df::item*> *get_primary_list()
-    {
-        return &viewscreen->trader_items;
-    }
-
-    vector<char> *get_selected_list()
-    {
-        return &viewscreen->trader_selected;
-    }
-
-    vector<int32_t> *get_count_list()
-    {
-        return &viewscreen->trader_count;
-    }
-
-    char get_search_select_key()
-    {
-        return 'q';
-    }
-};
-
-IMPLEMENT_HOOKS_WITH_ID(df::viewscreen_tradegoodsst, trade_search_merc, 1, 100);
-
-
-class trade_search_fort : public trade_search_base
-{
-public:
-    virtual void render() const
-    {
-        if (viewscreen->counteroffer.size() > 0)
-        {
-            // The merchant is proposing a counteroffer.
-            // Not only is there nothing to search,
-            // but the native hotkeys are where we normally write.
-            return;
-        }
-
-        int32_t x = gps->dimx / 2 + 2;
-        print_search_option(x, -1);
-
-        if (!search_string.empty())
-        {
-            int32_t y = gps->dimy - 3;
-            make_text_dim(2, gps->dimx-2, y);
-            OutputString(COLOR_LIGHTRED, x, y, string(1, select_key + 'A' - 'a'));
-            OutputString(COLOR_WHITE, x, y, ": Clear search to trade           ");
-        }
-    }
-
-private:
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->broker_cursor;
-    }
-
-    vector<df::item*> *get_primary_list()
-    {
-        return &viewscreen->broker_items;
-    }
-
-    vector<char> *get_selected_list()
-    {
-        return &viewscreen->broker_selected;
-    }
-
-    vector<int32_t> *get_count_list()
-    {
-        return &viewscreen->broker_count;
-    }
-
-    char get_search_select_key()
-    {
-        return 'w';
-    }
-};
-
-IMPLEMENT_HOOKS_WITH_ID(df::viewscreen_tradegoodsst, trade_search_fort, 2, 100);
-
-//
-// END: Trade screen search
-//
-
-
-//
-// START: Stockpile screen search
-//
-typedef layered_search<df::viewscreen_layer_stockpilest, string *, 2> stocks_layer;
-class stockpile_search : public search_twocolumn_modifiable<df::viewscreen_layer_stockpilest, string *, bool *, stocks_layer>
-{
-public:
-    void update_saved_secondary_list_item(size_t i, size_t j)
-    {
-        *saved_secondary_list[i] = *(*secondary_list)[j];
-    }
-
-    string get_element_description(string *element) const
-    {
-        return *element;
-    }
-
-    void render() const
-    {
-        print_search_option(51, 23);
-    }
-
-    vector<string *> *get_primary_list()
-    {
-        return &viewscreen->item_names;
-    }
-
-    vector<bool *> *get_secondary_list()
-    {
-        return &viewscreen->item_status;
-    }
-
-    bool should_check_input(set<df::interface_key> *input)
-    {
-        if (input->count(interface_key::STOCKPILE_SETTINGS_DISABLE) && !in_entry_mode() && !search_string.empty())
-        {
-            // Restore original list
-            clear_search();
-            reset_all();
-        }
-
-        return true;
-    }
-
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_layer_stockpilest, stockpile_search);
-
-//
-// END: Stockpile screen search
-//
-
-
-//
-// START: Military screen search
-//
-typedef layered_search<df::viewscreen_layer_militaryst, df::unit *, 2> military_search_base;
-class military_search : public military_search_base
-{
-public:
-
-    string get_element_description(df::unit *element) const
-    {
-        return get_unit_description(element);
-    }
-
-    void render() const
-    {
-        print_search_option(52, 22);
-    }
-
-    char get_search_select_key()
-    {
-        return 'q';
-    }
-
-    // When not on the positions page, this list is used for something
-    // else entirely, so screwing with it seriously breaks stuff.
-    bool is_list_valid(df::viewscreen_layer_militaryst *screen)
-    {
-        if (screen->page != df::viewscreen_layer_militaryst::Positions)
-            return false;
-
-        return true;
-    }
-
-    vector<df::unit *> *get_primary_list()
-    {
-        return &viewscreen->positions.candidates;
-    }
-
-    bool should_check_input(set<df::interface_key> *input)
-    {
-        if (input->count(interface_key::SELECT) && !in_entry_mode() && !search_string.empty())
-        {
-            // About to make an assignment, so restore original list (it will be changed by the game)
-            int32_t *cursor = get_viewscreen_cursor();
-            auto list = get_primary_list();
-            if (size_t(*cursor) >= list->size())
-                return false;
-            df::unit *selected_unit = list->at(*cursor);
-            clear_search();
-
-            for (*cursor = 0; size_t(*cursor) < list->size(); (*cursor)++)
-            {
-                if (list->at(*cursor) == selected_unit)
-                    break;
-            }
-
-            reset_all();
-        }
-
-        return true;
-    }
-};
-
-IMPLEMENT_HOOKS_PRIO(df::viewscreen_layer_militaryst, military_search, 100);
-
-//
-// END: Military screen search
-//
-
-
-//
-// START: Room list search
-//
-typedef search_twocolumn_modifiable<df::viewscreen_buildinglistst, df::building*, int32_t> roomlist_search_base;
-class roomlist_search : public roomlist_search_base
-{
-public:
-    void render() const
-    {
-        print_search_option(2, 23);
-    }
-
-private:
-    void do_post_init()
-    {
-        roomlist_search_base::do_post_init();
-        read_only = true;
-    }
-
-    string get_element_description(df::building *bld) const
-    {
-        if (!bld)
-            return "";
-
-        string desc;
-        desc.reserve(100);
-        if (bld->owner)
-            desc += get_unit_description(bld->owner);
-
-        desc += ".";
-
-        string room_desc = Buildings::getRoomDescription(bld, nullptr);
-        desc += room_desc;
-        if (room_desc.empty())
-        {
-            if (!bld->owner)
-                desc += "no owner";
-
-            string name;
-            bld->getName(&name);
-            if (!name.empty())
-            {
-                desc += name;
-            }
-        }
-
-        return desc;
-    }
-
-    vector<int32_t> *get_secondary_list()
-    {
-        return &viewscreen->room_value;
-    }
-
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->cursor;
-    }
-
-    vector<df::building*> *get_primary_list()
-    {
-        return &viewscreen->buildings;
-    }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_buildinglistst, roomlist_search);
-
-//
-// END: Room list search
-//
-
-
-
-//
-// START: Announcement list search
-//
-class announcement_search : public search_generic<df::viewscreen_announcelistst, df::report*>
-{
-public:
-    void render() const
-    {
-        print_search_option(2, gps->dimy - 3);
-    }
-
-private:
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->sel_idx;
-    }
-
-    virtual vector<df::report *> *get_primary_list()
-    {
-        return &viewscreen->reports;
-    }
-
-
-private:
-    string get_element_description(df::report *element) const
-    {
-        if (!element)
-            return "";
-        return element->text;
-    }
-};
-
-
-IMPLEMENT_HOOKS(df::viewscreen_announcelistst, announcement_search);
-
-//
-// END: Announcement list search
-//
-
-
-//
-// START: Nobles search list
-//
-typedef df::viewscreen_layer_noblelistst::T_candidates T_candidates;
-typedef layered_search<df::viewscreen_layer_noblelistst, T_candidates *, 1> nobles_search_base;
-class nobles_search : public nobles_search_base
-{
-public:
-
-    string get_element_description(T_candidates *element) const
-    {
-        if (!element->unit)
-            return "";
-
-        return get_unit_description(element->unit);
-    }
-
-    void render() const
-    {
-        print_search_option(2, 23);
-    }
-
-    bool force_in_search(size_t index)
-    {
-        return index == 0; // Leave Vacant
-    }
-
-    bool can_init(df::viewscreen_layer_noblelistst *screen)
-    {
-        if (screen->mode != df::viewscreen_layer_noblelistst::Appoint)
-            return false;
-
-        return nobles_search_base::can_init(screen);
-    }
-
-    vector<T_candidates *> *get_primary_list()
-    {
-        return &viewscreen->candidates;
-    }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_layer_noblelistst, nobles_search);
-
-//
-// END: Nobles search list
-//
-
-//
-// START: Workshop profiles search list
-//
-typedef search_generic<df::viewscreen_workshop_profilest, df::unit*> profiles_search_base;
-class profiles_search : public profiles_search_base
-{
-public:
-
-    bool can_init (df::viewscreen_workshop_profilest *screen)
-    {
-        return screen->tab == df::viewscreen_workshop_profilest::T_tab::Workers;
-    }
-
-    string get_element_description(df::unit *element) const
-    {
-        return get_unit_description(element);
-    }
-
-    void render() const
-    {
-        print_search_option(2, gps->dimy - 5);
-    }
-
-    vector<df::unit *> *get_primary_list()
-    {
-        return &viewscreen->workers;
-    }
-
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->worker_idx;
-    }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_workshop_profilest, profiles_search);
-
-//
-// END: Workshop profiles search list
-//
-
-
-//
-// START: Job list search
-//
-void get_job_details(string &desc, df::job *job)
-{
-    string job_name = ENUM_KEY_STR(job_type,job->job_type);
-    for (size_t i = 0; i < job_name.length(); i++)
-    {
-        char c = job_name[i];
-        if (c >= 'A' && c <= 'Z')
-            desc += " ";
-        desc += c;
-    }
-    desc += ".";
-
-    df::item_type itype = ENUM_ATTR(job_type, item, job->job_type);
-
-    MaterialInfo mat(job);
-    if (itype == item_type::FOOD)
-        mat.decode(-1);
-
-    if (mat.isValid() || job->material_category.whole)
-    {
-        desc += mat.toString();
-        desc += ".";
-        if (job->material_category.whole)
-        {
-            desc += bitfield_to_string(job->material_category);
-            desc += ".";
-        }
-    }
-
-    if (!job->reaction_name.empty())
-    {
-        for (size_t i = 0; i < job->reaction_name.length(); i++)
-        {
-            if (job->reaction_name[i] == '_')
-                desc += " ";
-            else
-                desc += job->reaction_name[i];
-        }
-
-        desc += ".";
-    }
-
-    if (job->flags.bits.suspend)
-        desc += "suspended.";
-}
-
-typedef search_twocolumn_modifiable<df::viewscreen_joblistst, df::job*, df::unit*> joblist_search_base;
-class joblist_search : public joblist_search_base
-{
-public:
-    void render() const
-    {
-        print_search_option(2);
-    }
-
-private:
-    void do_post_init()
-    {
-        joblist_search_base::do_post_init();
-        read_only = true;
-    }
-
-    string get_element_description(df::job *element) const
-    {
-        if (!element)
-            return "no job.idle";
-
-        string desc;
-        desc.reserve(100);
-        get_job_details(desc, element);
-        df::unit *worker = DFHack::Job::getWorker(element);
-        if (worker)
-            desc += get_unit_description(worker);
-        else
-            desc += "Inactive";
-
-        return desc;
-    }
-
-    char get_search_select_key()
-    {
-        return 'q';
-    }
-
-    vector<df::unit*> *get_secondary_list()
-    {
-        return &viewscreen->units;
-    }
-
-    int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->cursor_pos;
-    }
-
-    vector<df::job*> *get_primary_list()
-    {
-        return &viewscreen->jobs;
-    }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_joblistst, joblist_search);
-
-//
-// END: Job list search
-//
-
-
-//
-// START: Look menu search
-//
-
-typedef search_generic<df::viewscreen_dwarfmodest, df::ui_look_list::T_items*> look_menu_search_base;
-class look_menu_search : public look_menu_search_base
-{
-    typedef df::ui_look_list::T_items::T_type elt_type;
-public:
-    bool can_init(df::viewscreen_dwarfmodest *screen)
-    {
-        if (ui->main.mode == df::ui_sidebar_mode::LookAround)
-        {
-            return look_menu_search_base::can_init(screen);
-        }
-
-        return false;
-    }
-
-    string get_element_description(df::ui_look_list::T_items *element) const
-    {
-        std::string desc = "";
-        switch (element->type)
-        {
-        case elt_type::Item:
-            if (element->data.Item)
-                desc = Items::getDescription(element->data.Item, 0, true);
-            break;
-        case elt_type::Unit:
-            if (element->data.Unit)
-                desc = get_unit_description(element->data.Unit);
-            break;
-        case elt_type::Building:
-            if (element->data.Building)
-                element->data.Building->getName(&desc);
-            break;
-        default:
-            break;
-        }
-        return desc;
-    }
-
-    bool force_in_search (size_t i)
-    {
-        df::ui_look_list::T_items *element = saved_list1[i];
-        switch (element->type)
-        {
-        case elt_type::Item:
-        case elt_type::Unit:
-        case elt_type::Building:
-            return false;
-            break;
-        default:
-            return true;
-            break;
-        }
-    }
-
-    void render() const
-    {
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = 1;
-
-        print_search_option(x, y);
-    }
-
-    vector<df::ui_look_list::T_items*> *get_primary_list()
-    {
-        return &ui_look_list->items;
-    }
-
-    virtual int32_t * get_viewscreen_cursor()
-    {
-        return ui_look_cursor;
-    }
-
-
-    bool should_check_input(set<df::interface_key> *input)
-    {
-        if (input->count(interface_key::SECONDSCROLL_UP)
-            || input->count(interface_key::SECONDSCROLL_DOWN)
-            || input->count(interface_key::SECONDSCROLL_PAGEUP)
-            || input->count(interface_key::SECONDSCROLL_PAGEDOWN))
-        {
-            end_entry_mode();
-            return false;
-        }
-        bool hotkey_pressed =
-            input->lower_bound(interface_key::D_HOTKEY1) != input->upper_bound(interface_key::D_HOTKEY16);
-        if (cursor_key_pressed(input, in_entry_mode()) || hotkey_pressed)
-        {
-            end_entry_mode();
-            clear_search();
-            return false;
-        }
-
-        return true;
-    }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_dwarfmodest, look_menu_search);
-
-//
-// END: Look menu search
-//
-
-
-//
-// START: Burrow assignment search
-//
-
-typedef search_twocolumn_modifiable<df::viewscreen_dwarfmodest, df::unit*, bool> burrow_search_base;
-class burrow_search : public burrow_search_base
-{
-public:
-    bool can_init(df::viewscreen_dwarfmodest *screen)
-    {
-        if (ui->main.mode == df::ui_sidebar_mode::Burrows && ui->burrows.in_add_units_mode)
-        {
-            return burrow_search_base::can_init(screen);
-        }
-
-        return false;
-    }
-
-    string get_element_description(df::unit *element) const
-    {
-        return get_unit_description(element);
-    }
-
-    void render() const
-    {
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = 23;
-
-        print_search_option(x, y);
-    }
-
-    vector<df::unit *> *get_primary_list()
-    {
-        return &ui->burrows.list_units;
-    }
-
-    vector<bool> *get_secondary_list()
-    {
-        return &ui->burrows.sel_units;
-    }
-
-    virtual int32_t * get_viewscreen_cursor()
-    {
-        return &ui->burrows.unit_cursor_pos;
-    }
-
-
-    bool should_check_input(set<df::interface_key> *input)
-    {
-        if  (input->count(interface_key::SECONDSCROLL_UP) || input->count(interface_key::SECONDSCROLL_DOWN)
-            || input->count(interface_key::SECONDSCROLL_PAGEUP) || input->count(interface_key::SECONDSCROLL_PAGEDOWN))
-        {
-            end_entry_mode();
-            return false;
-        }
-
-        return true;
-    }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_dwarfmodest, burrow_search);
-
-//
-// END: Burrow assignment search
-//
-
-
-//
-// START: Room assignment search
-//
-
-typedef search_generic<df::viewscreen_dwarfmodest, df::unit*> room_assign_search_base;
-class room_assign_search : public room_assign_search_base
-{
-public:
-    bool can_init(df::viewscreen_dwarfmodest *screen)
-    {
-        if (ui->main.mode == df::ui_sidebar_mode::QueryBuilding && *ui_building_in_assign)
-        {
-            return room_assign_search_base::can_init(screen);
-        }
-
-        return false;
-    }
-
-    string get_element_description(df::unit *element) const
-    {
-        return element ? get_unit_description(element) : "Nobody";
-    }
-
-    void render() const
-    {
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = 19;
-
-        print_search_option(x, y);
-    }
-
-    vector<df::unit *> *get_primary_list()
-    {
-        return ui_building_assign_units;
-    }
-
-    virtual int32_t * get_viewscreen_cursor()
-    {
-        return ui_building_item_cursor;
-    }
-
-    bool should_check_input(set<df::interface_key> *input)
-    {
-        if  (input->count(interface_key::SECONDSCROLL_UP) || input->count(interface_key::SECONDSCROLL_DOWN)
-            || input->count(interface_key::SECONDSCROLL_PAGEUP) || input->count(interface_key::SECONDSCROLL_PAGEDOWN))
-        {
-            end_entry_mode();
-            return false;
-        }
-
-        return true;
-    }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_dwarfmodest, room_assign_search);
-
-//
-// END: Room assignment search
-//
-
-//
-// START: Noble suggestion search
-//
-
-typedef search_generic<df::viewscreen_topicmeeting_fill_land_holder_positionsst, int32_t> noble_suggest_search_base;
-class noble_suggest_search : public noble_suggest_search_base
-{
-public:
-    string get_element_description (int32_t hf_id) const
-    {
-        df::historical_figure *histfig = df::historical_figure::find(hf_id);
-        if (!histfig)
-            return "";
-        df::unit *unit = df::unit::find(histfig->unit_id);
-        if (!unit)
-            return "";
-        return get_unit_description(unit);
-    }
-
-    void render() const
-    {
-        print_search_option(2, gps->dimy - 4);
-    }
-
-    vector<int32_t> *get_primary_list()
-    {
-        return &viewscreen->candidate_histfig_ids;
-    }
-
-    virtual int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->cursor;
-    }
-
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_topicmeeting_fill_land_holder_positionsst, noble_suggest_search);
-
-//
-// END: Noble suggestion search
-//
-
-//
-// START: Location occupation assignment search
-//
-
-typedef search_generic<df::viewscreen_locationsst, df::unit*> location_assign_occupation_search_base;
-class location_assign_occupation_search : public location_assign_occupation_search_base
-{
-public:
-    bool can_init (df::viewscreen_locationsst *screen)
-    {
-        return screen->menu == df::viewscreen_locationsst::AssignOccupation;
-    }
-
-    string get_element_description (df::unit *unit) const
-    {
-        return unit ? get_unit_description(unit) : "Nobody";
-    }
-
-    void render() const
-    {
-        print_search_option(37, gps->dimy - 3);
-    }
-
-    vector<df::unit*> *get_primary_list()
-    {
-        return &viewscreen->units;
-    }
-
-    virtual int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->unit_idx;
-    }
-
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_locationsst, location_assign_occupation_search);
-
-//
-// END: Location occupation assignment search
-//
-
-//
-// START: Kitchen preferences search
-//
-
-typedef search_multicolumn_modifiable<df::viewscreen_kitchenprefst, std::string*> kitchen_pref_search_base;
-class kitchen_pref_search : public kitchen_pref_search_base
-{
-public:
-
-    string get_element_description(string *s) const override
-    {
-        return s ? *s : "";
-    }
-
-    void render() const override
-    {
-        print_search_option(40, gps->dimy - 2);
-    }
-
-    int32_t *get_viewscreen_cursor() override
-    {
-        return &viewscreen->cursor;
-    }
-
-    vector<string*> *get_primary_list() override
-    {
-        return &viewscreen->item_str[viewscreen->page];
-    }
-
-    bool should_check_input(set<df::interface_key> *input) override
-    {
-        if (input->count(interface_key::CHANGETAB) || input->count(interface_key::SEC_CHANGETAB))
-        {
-            // Restore original list
-            clear_search();
-            reset_all();
-        }
-
-        return true;
-    }
-
-
-#define KITCHEN_VECTORS \
-    KVEC(df::item_type, item_type); \
-    KVEC(int16_t, item_subtype); \
-    KVEC(int16_t, mat_type); \
-    KVEC(int32_t, mat_index); \
-    KVEC(int32_t, count); \
-    KVEC(df::kitchen_pref_flag, forbidden); \
-    KVEC(df::kitchen_pref_flag, possible)
-
-
-    virtual void do_post_init()
-    {
-        kitchen_pref_search_base::do_post_init();
-        #define KVEC(type, name) name = &viewscreen->name[viewscreen->page]
-        KITCHEN_VECTORS;
-        #undef KVEC
-    }
-
-    void save_secondary_values()
-    {
-        #define KVEC(type, name) name##_s = *name
-        KITCHEN_VECTORS;
-        #undef KVEC
-    }
-
-    void reset_secondary_viewscreen_vectors()
-    {
-        #define KVEC(type, name) name = nullptr
-        KITCHEN_VECTORS;
-        #undef KVEC
-    }
-
-    virtual void update_saved_secondary_list_item(size_t i, size_t j)
-    {
-        #define KVEC(type, name) name##_s[i] = (*name)[j];
-        KITCHEN_VECTORS;
-        #undef KVEC
-    }
-
-    void clear_secondary_viewscreen_vectors()
-    {
-        #define KVEC(type, name) name->clear()
-        KITCHEN_VECTORS;
-        #undef KVEC
-    }
-
-    void add_to_filtered_secondary_lists(size_t i)
-    {
-        #define KVEC(type, name) name->push_back(name##_s[i])
-        KITCHEN_VECTORS;
-        #undef KVEC
-    }
-
-    void clear_secondary_saved_lists()
-    {
-        #define KVEC(type, name) name##_s.clear()
-        KITCHEN_VECTORS;
-        #undef KVEC
-    }
-
-    void restore_secondary_values()
-    {
-        #define KVEC(type, name) *name = name##_s
-        KITCHEN_VECTORS;
-        #undef KVEC
-    }
-
-    #define KVEC(type, name) vector<type> *name, name##_s
-    KITCHEN_VECTORS;
-    #undef KVEC
-#undef KITCHEN_VECTORS
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_kitchenprefst, kitchen_pref_search);
-
-//
-// END: Kitchen preferences search
-//
-
-
-//
-// START: Stone status screen search
-//
-typedef layered_search<df::viewscreen_layer_stone_restrictionst, int32_t, 0> stone_search_layer;
-class stone_search : public search_twocolumn_modifiable<df::viewscreen_layer_stone_restrictionst, int32_t, bool*, stone_search_layer>
-{
-    // bool in_update = false;
-public:
-    void render() const override
-    {
-        print_search_option(21, 23);
-    }
-
-    vector<int32_t> *get_primary_list() override
-    {
-        return &viewscreen->stone_type[viewscreen->type_tab];
-    }
-
-    vector<bool*> *get_secondary_list() override
-    {
-        return &viewscreen->stone_economic[viewscreen->type_tab];
-    }
-
-    string get_element_description(int32_t stone_type) const override
-    {
-        auto iraw = vector_get(world->raws.inorganics, stone_type);
-        if (!iraw)
-            return "";
-        return iraw->material.stone_name + " " + iraw->material.state_name[0];
-    }
-
-    bool should_check_input(set<df::interface_key> *input) override
-    {
-        // if (in_update)
-        //     return false;
-
-        if (input->count(interface_key::CHANGETAB))
-        {
-            // Restore original list
-            clear_search();
-            reset_all();
-        }
-
-        return true;
-    }
-
-    // virtual void do_post_input_feed() override
-    // {
-    //     auto *list1 = get_primary_list();
-    //     auto *list2 = get_secondary_list();
-    //     bool appended = false;
-    //     if (list1->empty())
-    //     {
-    //         // Clear uses
-    //         auto *use_list = virtual_cast<df::layer_object_listst>(viewscreen->layer_objects[4]);
-    //         if (use_list)
-    //             use_list->num_entries = 0;
-    //         return;
-    //     }
-    //     else if (list1->size() == 1)
-    //     {
-    //         list1->push_back(list1->back());
-    //         list2->push_back(list2->back());
-    //         appended = true;
-    //     }
-
-    //     in_update = true;
-    //     Core::printerr("updating\n");
-    //     viewscreen->feed_key(interface_key::STANDARDSCROLL_DOWN);
-    //     viewscreen->feed_key(interface_key::STANDARDSCROLL_UP);
-    //     Core::printerr("updating done\n");
-    //     in_update = false;
-
-    //     if (appended)
-    //     {
-    //         list1->pop_back();
-    //         list2->pop_back();
-    //     }
-    // }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_layer_stone_restrictionst, stone_search);
-
-//
-// END: Stone status screen search
-//
-
-//
-// START: Justice screen conviction search
-//
-
-typedef search_generic<df::viewscreen_justicest, df::unit*> justice_conviction_search_base;
-class justice_conviction_search : public justice_conviction_search_base
-{
-public:
-    bool can_init (df::viewscreen_justicest *screen)
-    {
-        return screen->cur_column == df::viewscreen_justicest::ConvictChoices;
-    }
-
-    string get_element_description (df::unit *unit) const
-    {
-        return get_unit_description(unit);
-    }
-
-    void render() const
-    {
-        print_search_option(37);
-    }
-
-    vector<df::unit*> *get_primary_list()
-    {
-        return &viewscreen->convict_choices;
-    }
-
-    virtual int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->cursor_right;
-    }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_justicest, justice_conviction_search);
-
-//
-// END: Justice screen conviction search
-//
-
-//
-// START: Justice screen interrogation search
-//
-
-typedef search_generic<df::viewscreen_justicest, df::unit*> justice_interrogation_search_base;
-class justice_interrogation_search : public justice_interrogation_search_base
-{
-public:
-    bool can_init (df::viewscreen_justicest *screen)
-    {
-        return screen->cur_column == df::viewscreen_justicest::InterrogateChoices;
-    }
-
-    string get_element_description (df::unit *unit) const
-    {
-        return get_unit_description(unit);
-    }
-
-    void render() const
-    {
-        print_search_option(37);
-    }
-
-    vector<df::unit*> *get_primary_list()
-    {
-        return &viewscreen->interrogate_choices;
-    }
-
-    virtual int32_t *get_viewscreen_cursor()
-    {
-        return &viewscreen->cursor_right;
-    }
-};
-
-IMPLEMENT_HOOKS(df::viewscreen_justicest, justice_interrogation_search);
-
-//
-// END: Justice screen conviction search
-//
-
-#define SEARCH_HOOKS \
-    HOOK_ACTION(unitlist_search_hook) \
-    HOOK_ACTION(roomlist_search_hook) \
-    HOOK_ACTION(trade_search_merc_hook) \
-    HOOK_ACTION(trade_search_fort_hook) \
-    HOOK_ACTION(stocks_search_hook) \
-    HOOK_ACTION(pets_search_hook) \
-    HOOK_ACTION(animal_knowledge_search_hook) \
-    HOOK_ACTION(animal_trainer_search_hook) \
-    HOOK_ACTION(military_search_hook) \
-    HOOK_ACTION(nobles_search_hook) \
-    HOOK_ACTION(profiles_search_hook) \
-    HOOK_ACTION(announcement_search_hook) \
-    HOOK_ACTION(joblist_search_hook) \
-    HOOK_ACTION(look_menu_search_hook) \
-    HOOK_ACTION(burrow_search_hook) \
-    HOOK_ACTION(stockpile_search_hook) \
-    HOOK_ACTION(room_assign_search_hook) \
-    HOOK_ACTION(noble_suggest_search_hook) \
-    HOOK_ACTION(location_assign_occupation_search_hook) \
-    HOOK_ACTION(kitchen_pref_search_hook) \
-    HOOK_ACTION(stone_search_hook) \
-    HOOK_ACTION(justice_conviction_search_hook) \
-    HOOK_ACTION(justice_interrogation_search_hook) \
-
-
-DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable)
-{
-    if (!gps || !gview)
-        return CR_FAILURE;
-
-    if (is_enabled != enable)
-    {
-#define HOOK_ACTION(hook) \
-    !INTERPOSE_HOOK(hook, feed).apply(enable) || \
-    !INTERPOSE_HOOK(hook, render).apply(enable) || \
-    !INTERPOSE_HOOK(hook, key_conflict).apply(enable) ||
-
-        if (SEARCH_HOOKS 0)
-            return CR_FAILURE;
-
-        is_enabled = enable;
-    }
-#undef HOOK_ACTION
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
-{
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-#define HOOK_ACTION(hook) \
-    INTERPOSE_HOOK(hook, feed).remove(); \
-    INTERPOSE_HOOK(hook, render).remove(); \
-    INTERPOSE_HOOK(hook, key_conflict).remove();
-
-    SEARCH_HOOKS
-
-#undef HOOK_ACTION
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_onstatechange ( color_ostream &out, state_change_event event )
-{
-#define HOOK_ACTION(hook) hook::module.reset_on_change();
-
-    switch (event) {
-    case SC_VIEWSCREEN_CHANGED:
-        SEARCH_HOOKS
-        break;
-
-    default:
-        break;
-    }
-
-    return CR_OK;
-
-#undef HOOK_ACTION
-}
-
-#undef IMPLEMENT_HOOKS
-#undef SEARCH_HOOKS
diff --git a/plugins/seedwatch.cpp b/plugins/seedwatch.cpp
index 13ed8e66e..f56470c66 100644
--- a/plugins/seedwatch.cpp
+++ b/plugins/seedwatch.cpp
@@ -4,218 +4,133 @@
 // With thanks to peterix for DFHack and Quietust for information
 // http://www.bay12forums.com/smf/index.php?topic=91166.msg2605147#msg2605147
 
-#include <map>
-#include <string>
-#include <vector>
-#include "Console.h"
-#include "Core.h"
-#include "Export.h"
+#include "Debug.h"
+#include "LuaTools.h"
 #include "PluginManager.h"
-#include "modules/World.h"
-#include "modules/Materials.h"
+#include "TileTypes.h"
+
+#include "modules/Items.h"
 #include "modules/Kitchen.h"
-#include "VersionInfo.h"
-#include "df/world.h"
-#include "df/plant_raw.h"
+#include "modules/Maps.h"
+#include "modules/Persistence.h"
+#include "modules/Units.h"
+#include "modules/World.h"
+
 #include "df/item_flags.h"
 #include "df/items_other_id.h"
+#include "df/plant_raw.h"
+#include "df/world.h"
+
+#include <unordered_map>
 
-using namespace std;
 using namespace DFHack;
 using namespace df::enums;
 
+using std::map;
+using std::string;
+using std::unordered_map;
+using std::vector;
+
 DFHACK_PLUGIN("seedwatch");
-DFHACK_PLUGIN_IS_ENABLED(running); // whether seedwatch is counting the seeds or not
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
 REQUIRE_GLOBAL(world);
 
-const int buffer = 20; // seed number buffer - 20 is reasonable
+namespace DFHack {
+    // for configuration-related logging
+    DBG_DECLARE(seedwatch, config, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(seedwatch, cycle, DebugCategory::LINFO);
+}
 
 // abbreviations for the standard plants
-map<string, string> abbreviations;
+static unordered_map<string, const char *> abbreviations;
+static map<string, int32_t> world_plant_ids;
+static const int DEFAULT_TARGET = 30;
+static const int TARGET_BUFFER = 20; // seed number buffer; 20 is reasonable
 
-bool ignoreSeeds(df::item_flags& f) // seeds with the following flags should not be counted
-{
-    return
-        f.bits.dump ||
-        f.bits.forbid ||
-        f.bits.garbage_collect ||
-        f.bits.hidden ||
-        f.bits.hostile ||
-        f.bits.on_fire ||
-        f.bits.rotten ||
-        f.bits.trader ||
-        f.bits.in_building ||
-        f.bits.in_job;
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+static const string SEED_CONFIG_KEY_PREFIX = string(plugin_name) + "/seed/";
+static PersistentDataItem config;
+static unordered_map<int, PersistentDataItem> watched_seeds;
+
+enum ConfigValues {
+    CONFIG_IS_ENABLED = 0,
 };
 
-// searches abbreviations, returns expansion if so, returns original if not
-string searchAbbreviations(string in)
-{
-    if(abbreviations.count(in) > 0)
-    {
-        return abbreviations[in];
-    }
-    else
-    {
-        return in;
-    }
+enum SeedConfigValues {
+    SEED_CONFIG_ID = 0,
+    SEED_CONFIG_TARGET = 1,
 };
 
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    if(enable == true)
-    {
-        if(Core::getInstance().isWorldLoaded())
-        {
-            running = true;
-            out.print("seedwatch supervision started.\n");
-        } else {
-            out.printerr(
-                "This plugin needs a fortress to be loaded and will deactivate automatically otherwise.\n"
-                "Activate with 'seedwatch start' after you load the game.\n"
-                );
-        }
-    } else {
-        running = false;
-        out.print("seedwatch supervision stopped.\n");
-    }
+static int get_config_val(PersistentDataItem &c, int index) {
+    if (!c.isValid())
+        return -1;
+    return c.ival(index);
+}
+static bool get_config_bool(PersistentDataItem &c, int index) {
+    return get_config_val(c, index) == 1;
+}
+static void set_config_val(PersistentDataItem &c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
+}
+static void set_config_bool(PersistentDataItem &c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
+}
 
-    return CR_OK;
+static PersistentDataItem & ensure_seed_config(color_ostream &out, int id) {
+    if (watched_seeds.count(id))
+        return watched_seeds[id];
+    string keyname = SEED_CONFIG_KEY_PREFIX + int_to_string(id);
+    DEBUG(config,out).print("creating new persistent key for seed type %d\n", id);
+    watched_seeds.emplace(id, World::GetPersistentData(keyname, NULL));
+    set_config_val(watched_seeds[id], SEED_CONFIG_ID, id);
+    return watched_seeds[id];
+}
+static void remove_seed_config(color_ostream &out, int id) {
+    if (!watched_seeds.count(id))
+        return;
+    DEBUG(config,out).print("removing persistent key for seed type %d\n", id);
+    World::DeletePersistentData(watched_seeds[id]);
+    watched_seeds.erase(id);
 }
 
-command_result df_seedwatch(color_ostream &out, vector<string>& parameters)
-{
-    CoreSuspender suspend;
+// this validation removes configuration data from versions prior to 50.09-r3
+// it can be removed once saves from 50.09 are no longer loadable
 
-    map<string, int32_t> plantIDs;
-    for(size_t i = 0; i < world->raws.plants.all.size(); ++i)
-    {
-        auto & plant = world->raws.plants.all[i];
-        if (plant->material_defs.type[plant_material_def::seed] != -1)
-            plantIDs[plant->id] = i;
+static bool validate_seed_config(color_ostream& out, PersistentDataItem c)
+{
+    int seed_id = get_config_val(c, SEED_CONFIG_ID);
+    auto plant = df::plant_raw::find(seed_id);
+    if (!plant) {
+        WARN(config, out).print("discarded invalid seed id: %d\n", seed_id);
+        return false;
     }
-
-    t_gamemodes gm;
-    World::ReadGameMode(gm);// FIXME: check return value
-
-    // if game mode isn't fortress mode
-    if(gm.g_mode != game_mode::DWARF || !World::isFortressMode(gm.g_type))
-    {
-        // just print the help
-        return CR_WRONG_USAGE;
+    bool valid = (!plant->flags.is_set(df::enums::plant_raw_flags::TREE));
+    if (!valid) {
+        DEBUG(config, out).print("invalid configuration for %s discarded\n", plant->id.c_str());
     }
+    return valid;
+}
 
-    string par;
-    int limit;
-    switch(parameters.size())
-    {
-    case 0:
-        return CR_WRONG_USAGE;
-
-    case 1:
-        par = parameters[0];
-        if ((par == "help") || (par == "?"))
-        {
-            return CR_WRONG_USAGE;
-        }
-        else if(par == "start")
-        {
-            plugin_enable(out, true);
+static const int32_t CYCLE_TICKS = 1200;
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
 
-        }
-        else if(par == "stop")
-        {
-            plugin_enable(out, false);
-        }
-        else if(par == "clear")
-        {
-            Kitchen::clearLimits();
-            out.print("seedwatch watchlist cleared\n");
-        }
-        else if(par == "info")
-        {
-            out.print("seedwatch Info:\n");
-            if(running)
-            {
-                out.print("seedwatch is supervising.  Use 'disable seedwatch' to stop supervision.\n");
-            }
-            else
-            {
-                out.print("seedwatch is not supervising.  Use 'enable seedwatch' to start supervision.\n");
-            }
-            map<int32_t, int16_t> watchMap;
-            Kitchen::fillWatchMap(watchMap);
-            if(watchMap.empty())
-            {
-                out.print("The watch list is empty.\n");
-            }
-            else
-            {
-                out.print("The watch list is:\n");
-                for(auto i = watchMap.begin(); i != watchMap.end(); ++i)
-                {
-                    out.print("%s : %u\n", world->raws.plants.all[i->first]->id.c_str(), i->second);
-                }
-            }
-        }
-        else if(par == "debug")
-        {
-            map<int32_t, int16_t> watchMap;
-            Kitchen::fillWatchMap(watchMap);
-            Kitchen::debug_print(out);
-        }
-        else
-        {
-            string token = searchAbbreviations(par);
-            if(plantIDs.count(token) > 0)
-            {
-                Kitchen::removeLimit(plantIDs[token]);
-                out.print("%s is not being watched\n", token.c_str());
-            }
-            else
-            {
-                out.print("%s has not been found as a material.\n", token.c_str());
-            }
-        }
-        break;
-    case 2:
-        limit = atoi(parameters[1].c_str());
-        if(limit < 0) limit = 0;
-        if(parameters[0] == "all")
-        {
-            for(auto & entry : plantIDs)
-                Kitchen::setLimit(entry.second, limit);
-        }
-        else
-        {
-            string token = searchAbbreviations(parameters[0]);
-            if(plantIDs.count(token) > 0)
-            {
-                Kitchen::setLimit(plantIDs[token], limit);
-                out.print("%s is being watched.\n", token.c_str());
-            }
-            else
-            {
-                out.print("%s has not been found as a material.\n", token.c_str());
-            }
-        }
-        break;
-    default:
-        return CR_WRONG_USAGE;
-        break;
-    }
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+static void do_cycle(color_ostream &out, int32_t *num_enabled_seeds = NULL, int32_t *num_disabled_seeds = NULL);
+static void seedwatch_setTarget(color_ostream &out, string name, int32_t num);
 
-    return CR_OK;
-}
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    DEBUG(config,out).print("initializing %s\n", plugin_name);
 
-DFhackCExport command_result plugin_init(color_ostream &out, vector<PluginCommand>& commands)
-{
+    // provide a configuration interface for the plugin
     commands.push_back(PluginCommand(
-        "seedwatch",
-        "Toggles seed cooking based on quantity available.",
-        df_seedwatch));
-    // fill in the abbreviations map, with abbreviations for the standard plants
+        plugin_name,
+        "Automatically toggle seed cooking based on quantity available.",
+        do_command));
+
+    // fill in the abbreviations map
     abbreviations["bs"] = "SLIVER_BARB";
     abbreviations["bt"] = "TUBER_BLOATED";
     abbreviations["bw"] = "WEED_BLADE";
@@ -237,72 +152,299 @@ DFhackCExport command_result plugin_init(color_ostream &out, vector<PluginComman
     abbreviations["vh"] = "HERB_VALLEY";
     abbreviations["ws"] = "BERRIES_STRAW";
     abbreviations["wv"] = "VINE_WHIP";
+
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    if (event == SC_MAP_UNLOADED) {
-        if (running)
-            out.print("seedwatch deactivated due to game unload\n");
-        running = false;
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
     }
 
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(config,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        if (enable)
+            do_cycle(out);
+    } else {
+        DEBUG(config,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
+    }
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_onupdate(color_ostream &out)
-{
-    if (running)
-    {
-        // reduce processing rate
-        static int counter = 0;
-        if (++counter < 500)
-            return CR_OK;
-        counter = 0;
-
-        t_gamemodes gm;
-        World::ReadGameMode(gm);// FIXME: check return value
-        // if game mode isn't fortress mode
-        if(gm.g_mode != game_mode::DWARF || !World::isFortressMode(gm.g_type))
-        {
-            // stop running.
-            running = false;
-            out.printerr("seedwatch deactivated due to game mode switch\n");
-            return CR_OK;
-        }
-        // this is dwarf mode, continue
-        map<int32_t, int16_t> seedCount; // the number of seeds
-
-        // count all seeds and plants by RAW material
-        for(size_t i = 0; i < world->items.other[items_other_id::SEEDS].size(); ++i)
-        {
-            df::item *item = world->items.other[items_other_id::SEEDS][i];
-            MaterialInfo mat(item);
-            if (!mat.isPlant())
-                continue;
-            if (!ignoreSeeds(item->flags))
-                ++seedCount[mat.plant->index];
-        }
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(config,out).print("shutting down %s\n", plugin_name);
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
+
+    world_plant_ids.clear();
+    for (size_t i = 0; i < world->raws.plants.all.size(); ++i) {
+        auto & plant = world->raws.plants.all[i];
+        if (plant->material_defs.type[plant_material_def::seed] != -1 &&
+            !plant->flags.is_set(df::enums::plant_raw_flags::TREE))
+            world_plant_ids[plant->id] = i;
+    }
+
+    watched_seeds.clear();
+    vector<PersistentDataItem> seed_configs;
+    World::GetPersistentData(&seed_configs, SEED_CONFIG_KEY_PREFIX, true);
+    const size_t num_seed_configs = seed_configs.size();
+    for (size_t idx = 0; idx < num_seed_configs; ++idx) {
+        auto& c = seed_configs[idx];
+        if (validate_seed_config(out, c))
+            watched_seeds.emplace(get_config_val(c, SEED_CONFIG_ID), c);
+    }
+
+    config = World::GetPersistentData(CONFIG_KEY);
+
+    if (!config.isValid()) {
+        DEBUG(config,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        seedwatch_setTarget(out, "all", DEFAULT_TARGET);
+    }
 
-        map<int32_t, int16_t> watchMap;
-        Kitchen::fillWatchMap(watchMap);
-        for(auto i = watchMap.begin(); i != watchMap.end(); ++i)
-        {
-            if(seedCount[i->first] <= i->second)
-            {
-                Kitchen::denyPlantSeedCookery(i->first);
-            }
-            else if(i->second + buffer < seedCount[i->first])
-            {
-                Kitchen::allowPlantSeedCookery(i->first);
-            }
+    is_enabled = get_config_bool(config, CONFIG_IS_ENABLED);
+    DEBUG(config,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        if (is_enabled) {
+            DEBUG(config,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
         }
     }
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_shutdown(Core* pCore)
-{
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && world->frame_counter - cycle_timestamp >= CYCLE_TICKS) {
+        int32_t num_enabled_seeds, num_disabled_seeds;
+        do_cycle(out, &num_enabled_seeds, &num_disabled_seeds);
+        if (0 < num_enabled_seeds)
+            out.print("%s: enabled %d seed types for cooking\n",
+                    plugin_name, num_enabled_seeds);
+        if (0 < num_disabled_seeds)
+            out.print("%s: protected %d seed types from cooking\n",
+                    plugin_name, num_disabled_seeds);
+    }
     return CR_OK;
 }
+
+static bool call_seedwatch_lua(color_ostream *out, const char *fn_name,
+        int nargs = 0, int nres = 0,
+        Lua::LuaLambda && args_lambda = Lua::DEFAULT_LUA_LAMBDA,
+        Lua::LuaLambda && res_lambda = Lua::DEFAULT_LUA_LAMBDA) {
+    CoreSuspender guard;
+
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!out)
+        out = &Core::getInstance().getConsole();
+
+    DEBUG(config,*out).print("calling %s lua function: '%s'\n", plugin_name, fn_name);
+
+    return Lua::CallLuaModuleFunction(*out, L, "plugins.seedwatch", fn_name,
+            nargs, nres,
+            std::forward<Lua::LuaLambda&&>(args_lambda),
+            std::forward<Lua::LuaLambda&&>(res_lambda));
+}
+
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
+
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+
+    bool show_help = false;
+    if (!call_seedwatch_lua(&out, "parse_commandline", parameters.size(), 1,
+            [&](lua_State *L) {
+                for (const string &param : parameters)
+                    Lua::Push(L, param);
+            },
+            [&](lua_State *L) {
+                show_help = !lua_toboolean(L, -1);
+            })) {
+        return CR_FAILURE;
+    }
+
+    return show_help ? CR_WRONG_USAGE : CR_OK;
+}
+
+/////////////////////////////////////////////////////
+// cycle logic
+//
+
+struct BadFlags {
+    uint32_t whole;
+
+    BadFlags() {
+        df::item_flags flags;
+        #define F(x) flags.bits.x = true;
+        F(dump); F(forbid); F(garbage_collect);
+        F(hostile); F(on_fire); F(rotten); F(trader);
+        F(in_building); F(construction); F(artifact);
+        F(in_job); F(owned); F(in_chest); F(removed);
+        F(encased); F(spider_web);
+        #undef F
+        whole = flags.whole;
+    }
+};
+
+static bool is_accessible_item(df::item *item, const vector<df::unit *> &citizens) {
+    const df::coord pos = Items::getPosition(item);
+    for (auto &unit : citizens) {
+        if (Maps::canWalkBetween(Units::getPosition(unit), pos))
+            return true;
+    }
+    return false;
+}
+
+static void scan_seeds(color_ostream &out, unordered_map<int32_t, int32_t> *accessible_counts,
+        unordered_map<int32_t, int32_t> *inaccessible_counts = NULL) {
+    static const BadFlags bad_flags;
+
+    vector<df::unit *> citizens;
+    Units::getCitizens(citizens);
+
+    for (auto &item : world->items.other[items_other_id::SEEDS]) {
+        MaterialInfo mat(item);
+        if (mat.plant->index < 0 || !mat.isPlant())
+            continue;
+        if ((bad_flags.whole & item->flags.whole) || !is_accessible_item(item, citizens)) {
+            if (inaccessible_counts)
+                ++(*inaccessible_counts)[mat.plant->index];
+        } else {
+            if (accessible_counts)
+                ++(*accessible_counts)[mat.plant->index];
+        }
+    }
+}
+
+static void do_cycle(color_ostream &out, int32_t *num_enabled_seed_types, int32_t *num_disabled_seed_types) {
+    DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
+
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
+
+    if (num_enabled_seed_types)
+        *num_enabled_seed_types = 0;
+    if (num_disabled_seed_types)
+        *num_disabled_seed_types = 0;
+
+    unordered_map<int32_t, int32_t> accessible_counts;
+    scan_seeds(out, &accessible_counts);
+
+    for (auto &entry : watched_seeds) {
+        int32_t id = entry.first;
+        if (id < 0 || (size_t)id >= world->raws.plants.all.size())
+            continue;
+        int32_t target = get_config_val(entry.second, SEED_CONFIG_TARGET);
+        if (accessible_counts[id] <= target &&
+                (Kitchen::isPlantCookeryAllowed(id) ||
+                 Kitchen::isSeedCookeryAllowed(id))) {
+            DEBUG(cycle,out).print("disabling seed mat: %d\n", id);
+            if (num_disabled_seed_types)
+                ++*num_disabled_seed_types;
+            Kitchen::denyPlantSeedCookery(id);
+        } else if (target + TARGET_BUFFER < accessible_counts[id] &&
+                (!Kitchen::isPlantCookeryAllowed(id) ||
+                 !Kitchen::isSeedCookeryAllowed(id))) {
+            DEBUG(cycle,out).print("enabling seed mat: %d\n", id);
+            if (num_enabled_seed_types)
+                ++*num_enabled_seed_types;
+            Kitchen::allowPlantSeedCookery(id);
+        }
+    }
+}
+
+/////////////////////////////////////////////////////
+// Lua API
+// core will already be suspended when coming in through here
+//
+
+static void set_target(color_ostream &out, int32_t id, int32_t target) {
+    if (target == 0)
+        remove_seed_config(out, id);
+    else {
+        if (id < 0 || (size_t)id >= world->raws.plants.all.size()) {
+            WARN(config,out).print(
+                    "cannot set target for unknown plant id: %d\n", id);
+            return;
+        }
+        PersistentDataItem &c = ensure_seed_config(out, id);
+        set_config_val(c, SEED_CONFIG_TARGET, target);
+    }
+}
+
+// searches abbreviations, returns expansion if so, returns original if not
+static string searchAbbreviations(string in) {
+    if(abbreviations.count(in) > 0)
+        return abbreviations[in];
+    return in;
+};
+
+static void seedwatch_setTarget(color_ostream &out, string name, int32_t num) {
+    DEBUG(config,out).print("entering seedwatch_setTarget\n");
+
+    if (num < 0) {
+        out.printerr("target must be at least 0\n");
+        return;
+    }
+
+    if (name == "all") {
+        for (auto &entry : world_plant_ids) {
+            set_target(out, entry.second, num);
+        }
+        return;
+    }
+
+    string token = searchAbbreviations(name);
+    if (!world_plant_ids.count(token)) {
+        out.printerr("%s has not been found as a material.\n", token.c_str());
+        return;
+    }
+
+    set_target(out, world_plant_ids[token], num);
+}
+
+static int seedwatch_getData(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(config,*out).print("entering seedwatch_getData\n");
+    unordered_map<int32_t, int32_t> watch_map, accessible_counts;
+    scan_seeds(*out, &accessible_counts);
+    for (auto &entry : watched_seeds) {
+        watch_map.emplace(entry.first, get_config_val(entry.second, SEED_CONFIG_TARGET));
+    }
+    Lua::Push(L, watch_map);
+    Lua::Push(L, accessible_counts);
+    return 2;
+}
+
+DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(seedwatch_setTarget),
+    DFHACK_LUA_END
+};
+
+DFHACK_PLUGIN_LUA_COMMANDS {
+    DFHACK_LUA_COMMAND(seedwatch_getData),
+    DFHACK_LUA_END
+};
diff --git a/plugins/showmood.cpp b/plugins/showmood.cpp
index abeb2e98e..3ef6a6fb2 100644
--- a/plugins/showmood.cpp
+++ b/plugins/showmood.cpp
@@ -275,17 +275,17 @@ command_result df_showmood (color_ostream &out, vector <string> & parameters)
             // count how many items of this type the crafter already collected
             {
                 int count_got = 0;
-                for (size_t j = 0; j < job->items.size(); j++)
-                {
-                    if(job->items[j]->job_item_idx == int32_t(i))
-                    {
-                        if (item->item_type == item_type::BAR || item->item_type == item_type::CLOTH)
-                            count_got += job->items[j]->item->getTotalDimension();
-                        else
-                            count_got += 1;
-                    }
+                int divisor = 1;
+                if (item->item_type == item_type::BAR)
+                    divisor = 150;
+                else if (item->item_type == item_type::CLOTH)
+                    divisor = 10000;
+                for (size_t j = 0; j < job->items.size(); j++) {
+                    if (job->items[j]->job_item_idx == int32_t(i))
+                        count_got += 1;
                 }
-                out.print(", quantity %i (got %i)\n", item->quantity, count_got);
+                out.print(", got %i of %i\n", count_got,
+                    item->quantity < divisor ? item->quantity : item->quantity/divisor);
             }
         }
     }
diff --git a/plugins/siege-engine.cpp b/plugins/siege-engine.cpp
index 55ea4eeab..2fbb1e8c8 100644
--- a/plugins/siege-engine.cpp
+++ b/plugins/siege-engine.cpp
@@ -47,8 +47,8 @@
 #include "df/report.h"
 #include "df/stockpile_links.h"
 #include "df/strain_type.h"
-#include "df/ui.h"
-#include "df/ui_build_selector.h"
+#include "df/plotinfost.h"
+#include "df/buildreq.h"
 #include "df/unit.h"
 #include "df/unit_misc_trait.h"
 #include "df/unit_relationship_type.h"
@@ -72,7 +72,7 @@ DFHACK_PLUGIN("siege-engine");
 REQUIRE_GLOBAL(gamemode);
 REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(ui_build_selector);
 REQUIRE_GLOBAL(process_jobs);
 
@@ -1477,7 +1477,7 @@ static bool isTired(df::unit *worker)
 static void releaseTiredWorker(EngineInfo *engine, df::job *job, df::unit *worker)
 {
     // If not in siege
-    auto &sieges = ui->invasions.list;
+    auto &sieges = plotinfo->invasions.list;
 
     for (size_t i = 0; i < sieges.size(); i++)
         if (sieges[i]->flags.bits.active)
diff --git a/plugins/sort.cpp b/plugins/sort.cpp
index 630ac9e53..453914f5a 100644
--- a/plugins/sort.cpp
+++ b/plugins/sort.cpp
@@ -1,44 +1,14 @@
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
 #include "PluginManager.h"
 
-#include "modules/Gui.h"
-#include "modules/Translation.h"
-#include "modules/Units.h"
-#include "modules/Job.h"
-
-#include "LuaTools.h"
-
-#include "DataDefs.h"
-#include "df/ui.h"
-#include "df/world.h"
-#include "df/viewscreen_joblistst.h"
-#include "df/viewscreen_unitlistst.h"
-#include "df/viewscreen_layer_militaryst.h"
-#include "df/viewscreen_layer_noblelistst.h"
-#include "df/viewscreen_layer_overall_healthst.h"
-#include "df/viewscreen_layer_assigntradest.h"
-#include "df/viewscreen_tradegoodsst.h"
-#include "df/viewscreen_dwarfmodest.h"
-#include "df/viewscreen_petst.h"
-#include "df/viewscreen_storesst.h"
-#include "df/viewscreen_workshop_profilest.h"
-#include "df/layer_object_listst.h"
-#include "df/assign_trade_status.h"
-
-#include "MiscUtils.h"
-
-#include <stdlib.h>
-
 using std::vector;
 using std::string;
-using std::endl;
+
 using namespace DFHack;
-using namespace df::enums;
 
 DFHACK_PLUGIN("sort");
-REQUIRE_GLOBAL(ui);
+
+/*
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(ui_building_in_assign);
 REQUIRE_GLOBAL(ui_building_item_cursor);
@@ -52,16 +22,18 @@ static bool item_list_hotkey(df::viewscreen *top);
 
 static command_result sort_units(color_ostream &out, vector <string> & parameters);
 static command_result sort_items(color_ostream &out, vector <string> & parameters);
+*/
 
-DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
+DFhackCExport command_result plugin_init (color_ostream &out, vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand(
-        "sort-units", "Sort the visible unit list.", sort_units, unit_list_hotkey));
-    commands.push_back(PluginCommand(
-        "sort-items", "Sort the visible item list.", sort_items, item_list_hotkey));
+    // commands.push_back(PluginCommand(
+    //     "sort-units", "Sort the visible unit list.", sort_units, unit_list_hotkey));
+    // commands.push_back(PluginCommand(
+    //     "sort-items", "Sort the visible item list.", sort_items, item_list_hotkey));
     return CR_OK;
 }
 
+/*
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
     return CR_OK;
@@ -232,10 +204,7 @@ typedef void (*SortHandler)(color_ostream *pout, lua_State *L, int top,
 
 static std::map<std::string, SortHandler> unit_sorters;
 
-/*
- * Sort units in the 'u'nit list screen.
- */
-
+// Sort units in the 'u'nit list screen.
 DEFINE_SORT_HANDLER(unit_sorters, unitlist, "", units)
 {
     PARSE_SPEC("units", parameters);
@@ -250,10 +219,7 @@ DEFINE_SORT_HANDLER(unit_sorters, unitlist, "", units)
     }
 }
 
-/*
- * Sort units in the 'j'ob list screen.
- */
-
+//Sort units in the 'j'ob list screen.
 DEFINE_SORT_HANDLER(unit_sorters, joblist, "", jobs)
 {
     PARSE_SPEC("units", parameters);
@@ -275,10 +241,7 @@ DEFINE_SORT_HANDLER(unit_sorters, joblist, "", jobs)
     }
 }
 
-/*
- * Sort candidate units in the 'p'osition page of the 'm'ilitary screen.
- */
-
+// Sort candidate units in the 'p'osition page of the 'm'ilitary screen.
 DEFINE_SORT_HANDLER(unit_sorters, layer_military, "/Positions/Candidates", military)
 {
     auto &candidates = military->positions.candidates;
@@ -293,7 +256,6 @@ DEFINE_SORT_HANDLER(unit_sorters, layer_military, "/Positions/Candidates", milit
     }
 }
 
-
 DEFINE_SORT_HANDLER(unit_sorters, layer_noblelist, "/Appoint", nobles)
 {
     auto list2 = getLayerList(nobles, 1);
@@ -312,10 +274,7 @@ DEFINE_SORT_HANDLER(unit_sorters, layer_noblelist, "/Appoint", nobles)
     }
 }
 
-/*
- * Sort animal units in the Animal page of the 'z' status screen.
- */
-
+//Sort animal units in the Animal page of the 'z' status screen.
 DEFINE_SORT_HANDLER(unit_sorters, pet, "/List", animals)
 {
     PARSE_SPEC("units", parameters);
@@ -334,10 +293,7 @@ DEFINE_SORT_HANDLER(unit_sorters, pet, "/List", animals)
     }
 }
 
-/*
- * Sort candidate trainers in the Animal page of the 'z' status screen.
- */
-
+// Sort candidate trainers in the Animal page of the 'z' status screen.
 DEFINE_SORT_HANDLER(unit_sorters, pet, "/SelectTrainer", animals)
 {
     sort_null_first(parameters);
@@ -351,10 +307,7 @@ DEFINE_SORT_HANDLER(unit_sorters, pet, "/SelectTrainer", animals)
     }
 }
 
-/*
- * Sort units in the Health page of the 'z' status screen.
- */
-
+// Sort units in the Health page of the 'z' status screen.
 DEFINE_SORT_HANDLER(unit_sorters, layer_overall_health, "/Units", health)
 {
     auto list1 = getLayerList(health, 0);
@@ -371,26 +324,20 @@ DEFINE_SORT_HANDLER(unit_sorters, layer_overall_health, "/Units", health)
     }
 }
 
-/*
- * Sort burrow member candidate units in the 'w' sidebar mode.
- */
-
+// Sort burrow member candidate units in the 'w' sidebar mode.
 DEFINE_SORT_HANDLER(unit_sorters, dwarfmode, "/Burrows/AddUnits", screen)
 {
     PARSE_SPEC("units", parameters);
 
-    if (compute_order(*pout, L, top, &order, ui->burrows.list_units))
+    if (compute_order(*pout, L, top, &order, plotinfo->burrows.list_units))
     {
-        reorder_cursor(&ui->burrows.unit_cursor_pos, order);
-        reorder_vector(&ui->burrows.list_units, order);
-        reorder_vector(&ui->burrows.sel_units, order);
+        reorder_cursor(&plotinfo->burrows.unit_cursor_pos, order);
+        reorder_vector(&plotinfo->burrows.list_units, order);
+        reorder_vector(&plotinfo->burrows.sel_units, order);
     }
 }
 
-/*
- * Sort building owner candidate units in the 'q' sidebar mode, or cage assignment.
- */
-
+// Sort building owner candidate units in the 'q' sidebar mode, or cage assignment.
 DEFINE_SORT_HANDLER(unit_sorters, dwarfmode, "/QueryBuilding/Some/Assign", screen)
 {
     sort_null_first(parameters);
@@ -410,10 +357,7 @@ DEFINE_SORT_HANDLER(unit_sorters, dwarfmode, "/QueryBuilding/Some/Assign", scree
     }
 }
 
-/*
- * Sort units in the workshop 'q'uery 'P'rofile modification screen.
- */
-
+// Sort units in the workshop 'q'uery 'P'rofile modification screen.
 DEFINE_SORT_HANDLER(unit_sorters, workshop_profile, "/Unit", profile)
 {
     PARSE_SPEC("units", parameters);
@@ -425,10 +369,7 @@ DEFINE_SORT_HANDLER(unit_sorters, workshop_profile, "/Unit", profile)
     }
 }
 
-/*
- * Sort pen assignment candidate units in 'z'->'N'.
- */
-
+// Sort pen assignment candidate units in 'z'->'N'.
 DEFINE_SORT_HANDLER(unit_sorters, dwarfmode, "/ZonesPenInfo/Assign", screen)
 {
     PARSE_SPEC("units", parameters);
@@ -562,3 +503,4 @@ static command_result sort_items(color_ostream &out, vector <string> &parameters
 
     return CR_OK;
 }
+*/
diff --git a/plugins/spectate/pause.cpp b/plugins/spectate/pause.cpp
index 5c60e2194..0e4f1707d 100644
--- a/plugins/spectate/pause.cpp
+++ b/plugins/spectate/pause.cpp
@@ -4,7 +4,7 @@
 #include <df/viewscreen_dwarfmodest.h>
 #include <df/announcements.h>
 #include <df/d_init.h>
-#include <df/ui.h>
+#include <df/plotinfost.h>
 
 #include <algorithm>
 
@@ -25,12 +25,12 @@ namespace pausing {
     bool locked_states[announcement_flag_arr_size]; // locked state (re-applied each frame)
     bool allow_player_pause = true; // toggles player pause ability
 
-    using df::global::ui;
+    using df::global::plotinfo;
     using namespace df::enums;
     struct player_pause_hook : df::viewscreen_dwarfmodest {
         typedef df::viewscreen_dwarfmodest interpose_base;
         DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key>* input)) {
-            if ((ui->main.mode == ui_sidebar_mode::Default) && !allow_player_pause) {
+            if ((plotinfo->main.mode == ui_sidebar_mode::Default) && !allow_player_pause) {
                 input->erase(interface_key::D_PAUSE);
             }
             INTERPOSE_NEXT(feed)(input);
diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index 73574c136..7bf3e1ec2 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -37,7 +37,7 @@ namespace DFHack {
 DFHACK_PLUGIN("spectate");
 DFHACK_PLUGIN_IS_ENABLED(enabled);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(pause_state);
 REQUIRE_GLOBAL(d_init);
 
@@ -106,7 +106,7 @@ namespace SP {
         out.print(" SETTINGS:\n");
         out.print("  %-20s\t%" PRIi32 "\n", "tick-threshold: ", config.tick_threshold);
         if (following_dwarf)
-            out.print(" %-21s\t%s[id: %d]\n","FOLLOWING:", our_dorf ? our_dorf->name.first_name.c_str() : "nullptr", df::global::ui->follow_unit);
+            out.print(" %-21s\t%s[id: %d]\n","FOLLOWING:", our_dorf ? our_dorf->name.first_name.c_str() : "nullptr", df::global::plotinfo->follow_unit);
     }
 
     void SetUnpauseState(bool state) {
@@ -311,7 +311,7 @@ namespace SP {
                 // if you're looking at a warning about a local address escaping, it means the unit* from units (which aren't local)
                 size_t idx = follow_any(RNG);
                 our_dorf = units[idx];
-                df::global::ui->follow_unit = our_dorf->id;
+                df::global::plotinfo->follow_unit = our_dorf->id;
                 timestamp = df::global::world->frame_counter;
                 return true;
             } else {
@@ -362,7 +362,7 @@ namespace SP {
         if (!World::ReadPauseState() && tick - last_tick >= 1) {
             last_tick = tick;
             // validate follow state
-            if (!following_dwarf || !our_dorf || df::global::ui->follow_unit < 0 || tick - timestamp >= config.tick_threshold) {
+            if (!following_dwarf || !our_dorf || df::global::plotinfo->follow_unit < 0 || tick - timestamp >= config.tick_threshold) {
                 // we're not following anyone
                 following_dwarf = false;
                 if (!config.disengage) {
diff --git a/plugins/steam-engine.cpp b/plugins/steam-engine.cpp
index 6e3c317d3..ac7803b95 100644
--- a/plugins/steam-engine.cpp
+++ b/plugins/steam-engine.cpp
@@ -31,8 +31,8 @@
 #include "df/power_info.h"
 #include "df/report.h"
 #include "df/tile_designation.h"
-#include "df/ui.h"
-#include "df/ui_build_selector.h"
+#include "df/plotinfost.h"
+#include "df/buildreq.h"
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/workshop_type.h"
 #include "df/world.h"
@@ -48,7 +48,7 @@ DFHACK_PLUGIN("steam-engine");
 
 REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(ui_build_selector);
 REQUIRE_GLOBAL(cursor);
 
@@ -748,7 +748,7 @@ struct dwarfmode_hook : df::viewscreen_dwarfmodest
 
     steam_engine_workshop *get_steam_engine()
     {
-        if (ui->main.mode == ui_sidebar_mode::Build &&
+        if (plotinfo->main.mode == ui_sidebar_mode::Build &&
             ui_build_selector->stage == 1 &&
             ui_build_selector->building_type == building_type::Workshop &&
             ui_build_selector->building_subtype == workshop_type::Custom)
diff --git a/plugins/stockflow.cpp b/plugins/stockflow.cpp
index 65223f603..49d56816b 100644
--- a/plugins/stockflow.cpp
+++ b/plugins/stockflow.cpp
@@ -26,7 +26,7 @@ DFHACK_PLUGIN_IS_ENABLED(enabled);
 
 REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 
 bool fast = false;
 
@@ -56,15 +56,15 @@ public:
 
         if (found) {
             // Entice the bookkeeper to spend less time update records.
-            ui->nobles.bookkeeper_precision += ui->nobles.bookkeeper_precision >> 3;
+            plotinfo->nobles.bookkeeper_precision += plotinfo->nobles.bookkeeper_precision >> 3;
             if (!bookkeeping) {
                 command_method("start_bookkeeping", out);
                 bookkeeping = true;
             }
         } else {
             // Entice the bookkeeper to update records more often.
-            ui->nobles.bookkeeper_precision -= ui->nobles.bookkeeper_precision >> 5;
-            ui->nobles.bookkeeper_cooldown -= ui->nobles.bookkeeper_cooldown >> 2;
+            plotinfo->nobles.bookkeeper_precision -= plotinfo->nobles.bookkeeper_precision >> 5;
+            plotinfo->nobles.bookkeeper_cooldown -= plotinfo->nobles.bookkeeper_cooldown >> 2;
             if (bookkeeping) {
                 command_method("finish_bookkeeping", out);
                 bookkeeping = false;
diff --git a/plugins/stockpiles/OrganicMatLookup.cpp b/plugins/stockpiles/OrganicMatLookup.cpp
index 5167ece4a..1efdd4df6 100644
--- a/plugins/stockpiles/OrganicMatLookup.cpp
+++ b/plugins/stockpiles/OrganicMatLookup.cpp
@@ -1,154 +1,127 @@
 #include "OrganicMatLookup.h"
-
 #include "StockpileUtils.h"
 
-#include "modules/Materials.h"
-#include "MiscUtils.h"
-
-#include "df/world.h"
-#include "df/world_data.h"
+#include "Debug.h"
 
 #include "df/creature_raw.h"
 #include "df/caste_raw.h"
-#include "df/material.h"
+#include "df/world.h"
 
 using namespace DFHack;
 using namespace df::enums;
 using df::global::world;
 
-using std::endl;
+namespace DFHack
+{
+DBG_EXTERN(stockpiles, log);
+}
 
 /**
  * Helper class for mapping the various organic mats between their material indices
  * and their index in the stockpile_settings structures.
  */
 
-void OrganicMatLookup::food_mat_by_idx ( std::ostream &out, organic_mat_category::organic_mat_category mat_category, std::vector<int16_t>::size_type food_idx, FoodMat & food_mat )
-{
-    out << "food_lookup: food_idx(" << food_idx << ") ";
-    df::world_raws &raws = world->raws;
+void OrganicMatLookup::food_mat_by_idx(color_ostream& out, organic_mat_category::organic_mat_category mat_category, std::vector<int16_t>::size_type food_idx, FoodMat& food_mat) {
+    DEBUG(log, out).print("food_lookup: food_idx(%zd)\n", food_idx);
+    df::world_raws& raws = world->raws;
     df::special_mat_table table = raws.mat_table;
     int32_t main_idx = table.organic_indexes[mat_category][food_idx];
     int16_t type = table.organic_types[mat_category][food_idx];
-    if ( mat_category == organic_mat_category::Fish ||
-            mat_category == organic_mat_category::UnpreparedFish ||
-            mat_category == organic_mat_category::Eggs )
-    {
+    if (mat_category == organic_mat_category::Fish ||
+        mat_category == organic_mat_category::UnpreparedFish ||
+        mat_category == organic_mat_category::Eggs) {
         food_mat.creature = raws.creatures.all[type];
         food_mat.caste = food_mat.creature->caste[main_idx];
-        out << " special creature type(" << type << ") caste("<< main_idx <<")" <<endl;
+        DEBUG(log, out).print("special creature type(%d) caste(%d)\n", type, main_idx);
     }
-    else
-    {
-        food_mat.material.decode ( type, main_idx );
-        out << " type(" << type << ") index("<< main_idx <<") token(" << food_mat.material.getToken() <<  ")" << endl;
+    else {
+        food_mat.material.decode(type, main_idx);
+        DEBUG(log, out).print("type(%d) index(%d) token(%s)\n", type, main_idx, food_mat.material.getToken().c_str());
     }
 }
-std::string OrganicMatLookup::food_token_by_idx ( std::ostream &out, organic_mat_category::organic_mat_category mat_category, std::vector<int16_t>::size_type idx )
-{
+std::string OrganicMatLookup::food_token_by_idx(color_ostream& out, organic_mat_category::organic_mat_category mat_category, std::vector<int16_t>::size_type idx) {
     FoodMat food_mat;
-    food_mat_by_idx ( out, mat_category, idx, food_mat );
-    if ( food_mat.material.isValid() )
-    {
+    food_mat_by_idx(out, mat_category, idx, food_mat);
+    if (food_mat.material.isValid()) {
         return food_mat.material.getToken();
     }
-    else if ( food_mat.creature )
-    {
+    else if (food_mat.creature) {
         return food_mat.creature->creature_id + ":" + food_mat.caste->caste_id;
     }
     return std::string();
 }
 
-size_t OrganicMatLookup::food_max_size ( organic_mat_category::organic_mat_category mat_category )
-{
+size_t OrganicMatLookup::food_max_size(organic_mat_category::organic_mat_category mat_category) {
     return world->raws.mat_table.organic_types[mat_category].size();
 }
 
-void OrganicMatLookup::food_build_map ( std::ostream &out )
-{
-    if ( index_built )
+void OrganicMatLookup::food_build_map() {
+    if (index_built)
         return;
-    df::world_raws &raws = world->raws;
+    df::world_raws& raws = world->raws;
     df::special_mat_table table = raws.mat_table;
     using df::enums::organic_mat_category::organic_mat_category;
     using traits = df::enum_traits<organic_mat_category>;
-    for ( int32_t mat_category = traits::first_item_value; mat_category <= traits::last_item_value; ++mat_category )
-    {
-        for ( size_t i = 0; i < table.organic_indexes[mat_category].size(); ++i )
-        {
-            int16_t type = table.organic_types[mat_category].at ( i );
-            int32_t index = table.organic_indexes[mat_category].at ( i );
-            food_index[mat_category].insert ( std::make_pair ( std::make_pair ( type,index ), i ) ); // wtf.. only in c++
+    for (int32_t mat_category = traits::first_item_value; mat_category <= traits::last_item_value; ++mat_category) {
+        for (size_t i = 0; i < table.organic_indexes[mat_category].size(); ++i) {
+            int16_t type = table.organic_types[mat_category].at(i);
+            int32_t index = table.organic_indexes[mat_category].at(i);
+            food_index[mat_category].insert(std::make_pair(std::make_pair(type, index), i)); // wtf.. only in c++
         }
     }
     index_built = true;
 }
 
-int16_t OrganicMatLookup::food_idx_by_token ( std::ostream &out, organic_mat_category::organic_mat_category mat_category, const std::string & token )
-{
-    int16_t food_idx = -1;
-    df::world_raws &raws = world->raws;
+int16_t OrganicMatLookup::food_idx_by_token(color_ostream& out, organic_mat_category::organic_mat_category mat_category, const std::string& token) {
+    df::world_raws& raws = world->raws;
     df::special_mat_table table = raws.mat_table;
-    out << "food_idx_by_token: ";
-    if ( mat_category == organic_mat_category::Fish ||
-            mat_category == organic_mat_category::UnpreparedFish ||
-            mat_category == organic_mat_category::Eggs )
-    {
+    DEBUG(log, out).print("food_idx_by_token:\n");
+    if (mat_category == organic_mat_category::Fish ||
+        mat_category == organic_mat_category::UnpreparedFish ||
+        mat_category == organic_mat_category::Eggs) {
         std::vector<std::string> tokens;
-        split_string ( &tokens, token, ":" );
-        if ( tokens.size() != 2 )
-        {
-            out << "creature " << "invalid CREATURE:CASTE token: " << token << endl;
+        split_string(&tokens, token, ":");
+        if (tokens.size() != 2) {
+            WARN(log, out).print("creature invalid CREATURE:CASTE token: %s\n", token.c_str());
+            return -1;
         }
-        else
-        {
-            int16_t creature_idx = find_creature ( tokens[0] );
-            if ( creature_idx < 0 )
-            {
-                out << " creature invalid token " << tokens[0];
-            }
-            else
-            {
-                food_idx = linear_index ( table.organic_types[mat_category], creature_idx );
-                if ( tokens[1] ==  "MALE" )
-                    food_idx +=  1;
-                if ( table.organic_types[mat_category][food_idx] ==  creature_idx )
-                    out << "creature " << token << " caste " <<  tokens[1] <<  " creature_idx(" << creature_idx << ") food_idx("<< food_idx << ")" << endl;
-                else
-                {
-                    out << "ERROR creature caste not found: " << token << " caste " <<  tokens[1] <<  " creature_idx(" << creature_idx << ") food_idx("<< food_idx << ")" << endl;
-                    food_idx = -1;
-                }
-            }
+        int16_t creature_idx = find_creature(tokens[0]);
+        if (creature_idx < 0) {
+            WARN(log, out).print("creature invalid token %s\n", tokens[0].c_str());
+            return -1;
         }
-    }
-    else
-    {
-        if ( !index_built )
-            food_build_map ( out );
-        MaterialInfo mat_info = food_mat_by_token ( out, token );
-        int16_t type = mat_info.type;
-        int32_t index = mat_info.index;
-        auto it = food_index[mat_category].find ( std::make_pair ( type, index ) );
-        if ( it != food_index[mat_category].end() )
-        {
-            out << "matinfo: " << token << " type(" << mat_info.type << ") idx("  << mat_info.index << ") food_idx(" << it->second << ")" << endl;
-            food_idx = it->second;
-        }
-        else
-        {
-            out << "matinfo: " << token << " type(" << mat_info.type << ") idx("  << mat_info.index << ") food_idx not found :(" <<  endl;
+        int16_t food_idx = linear_index(table.organic_types[mat_category], creature_idx);
+        if (tokens[1] == "MALE")
+            food_idx += 1;
+        if (table.organic_types[mat_category][food_idx] == creature_idx) {
+            DEBUG(log, out).print("creature %s caste %s creature_idx(%d) food_idx(%d)\n", token.c_str(), tokens[1].c_str(), creature_idx, food_idx);
+            return food_idx;
         }
+        WARN(log, out).print("creature caste not found: %s caste %s creature_idx(%d) food_idx(%d)\n", token.c_str(), tokens[1].c_str(), creature_idx, food_idx);
+        return -1;
     }
-    return food_idx;
+
+    if (!index_built)
+        food_build_map();
+    MaterialInfo mat_info = food_mat_by_token(token);
+    int16_t type = mat_info.type;
+    int32_t index = mat_info.index;
+    auto it = food_index[mat_category].find(std::make_pair(type, index));
+    if (it != food_index[mat_category].end()) {
+        DEBUG(log, out).print("matinfo: %s type(%d) idx(%d) food_idx(%zd)\n", token.c_str(), mat_info.type, mat_info.index, it->second);
+        return it->second;
+
+    }
+
+    WARN(log, out).print("matinfo: %s type(%d) idx(%d) food_idx not found :(\n", token.c_str(), mat_info.type, mat_info.index);
+    return -1;
 }
 
-MaterialInfo OrganicMatLookup::food_mat_by_token ( std::ostream &out, const std::string & token )
-{
+MaterialInfo OrganicMatLookup::food_mat_by_token(const std::string& token) {
     MaterialInfo mat_info;
-    mat_info.find ( token );
+    mat_info.find(token);
     return mat_info;
 }
 
 bool OrganicMatLookup::index_built = false;
-std::vector<OrganicMatLookup::FoodMatMap> OrganicMatLookup::food_index = std::vector<OrganicMatLookup::FoodMatMap> ( df::enum_traits< df::organic_mat_category >::last_item_value + 1 );
+std::vector<OrganicMatLookup::FoodMatMap> OrganicMatLookup::food_index = std::vector<OrganicMatLookup::FoodMatMap>(df::enum_traits< df::organic_mat_category >::last_item_value + 1);
diff --git a/plugins/stockpiles/OrganicMatLookup.h b/plugins/stockpiles/OrganicMatLookup.h
index ef49f3f3c..37e019b58 100644
--- a/plugins/stockpiles/OrganicMatLookup.h
+++ b/plugins/stockpiles/OrganicMatLookup.h
@@ -5,42 +5,42 @@
 #include "df/organic_mat_category.h"
 
 namespace df {
-struct creature_raw;
-struct caste_raw;
+    struct creature_raw;
+    struct caste_raw;
 }
 
 /**
  * Helper class for mapping the various organic mats between their material indices
  * and their index in the stockpile_settings structures.
  */
-class OrganicMatLookup
-{
+class OrganicMatLookup {
 
-//  pair of material type and index
+    //  pair of material type and index
     typedef std::pair<int16_t, int32_t> FoodMatPair;
-//  map for using type,index pairs to find the food index
+    //  map for using type,index pairs to find the food index
     typedef std::map<FoodMatPair, size_t> FoodMatMap;
 
 public:
-    struct FoodMat
-    {
+    struct FoodMat {
         DFHack::MaterialInfo material;
-        df::creature_raw *creature;
-        df::caste_raw * caste;
-        FoodMat() : material ( -1 ), creature ( 0 ), caste ( 0 ) {}
+        df::creature_raw* creature;
+        df::caste_raw* caste;
+        FoodMat(): material(-1), creature(0), caste(0) { }
     };
-    static void food_mat_by_idx ( std::ostream &out, df::enums::organic_mat_category::organic_mat_category mat_category, std::vector<int16_t>::size_type food_idx, FoodMat & food_mat );
-    static std::string food_token_by_idx ( std::ostream &out, df::enums::organic_mat_category::organic_mat_category mat_category, std::vector<int16_t>::size_type idx );
 
-    static size_t food_max_size ( df::enums::organic_mat_category::organic_mat_category mat_category );
-    static void food_build_map ( std::ostream &out );
+    static void food_mat_by_idx(DFHack::color_ostream& out, df::enums::organic_mat_category::organic_mat_category mat_category, std::vector<int16_t>::size_type food_idx, FoodMat& food_mat);
+    static std::string food_token_by_idx(DFHack::color_ostream& out, df::enums::organic_mat_category::organic_mat_category mat_category, std::vector<int16_t>::size_type idx);
 
-    static int16_t food_idx_by_token ( std::ostream &out, df::enums::organic_mat_category::organic_mat_category mat_category, const std::string & token );
+    static size_t food_max_size(df::enums::organic_mat_category::organic_mat_category mat_category);
+    static void food_build_map();
 
-    static DFHack::MaterialInfo food_mat_by_token ( std::ostream &out, const std::string & token );
+    static int16_t food_idx_by_token(DFHack::color_ostream& out, df::enums::organic_mat_category::organic_mat_category mat_category, const std::string& token);
+
+    static DFHack::MaterialInfo food_mat_by_token(const std::string& token);
 
     static bool index_built;
     static std::vector<FoodMatMap> food_index;
+
 private:
     OrganicMatLookup();
 };
diff --git a/plugins/stockpiles/StockpileSerializer.cpp b/plugins/stockpiles/StockpileSerializer.cpp
index cf3bfa349..536ad3e4e 100644
--- a/plugins/stockpiles/StockpileSerializer.cpp
+++ b/plugins/stockpiles/StockpileSerializer.cpp
@@ -1,38 +1,36 @@
-#include "StockpileSerializer.h"
-
 //  stockpiles plugin
 #include "OrganicMatLookup.h"
+#include "StockpileSerializer.h"
 #include "StockpileUtils.h"
 
 //  dfhack
+#include "Debug.h"
 #include "MiscUtils.h"
+#include "modules/Items.h"
 
 //  df
 #include "df/building_stockpilest.h"
-#include "df/inorganic_raw.h"
 #include "df/creature_raw.h"
 #include "df/caste_raw.h"
-#include "df/material.h"
 #include "df/inorganic_raw.h"
-#include "df/plant_raw.h"
-#include "df/stockpile_group_set.h"
-#include <df/itemdef_ammost.h>
-#include <df/itemdef_weaponst.h>
+#include "df/item_quality.h"
 #include <df/itemdef_ammost.h>
-#include <df/itemdef_trapcompst.h>
 #include <df/itemdef_armorst.h>
-#include <df/itemdef_helmst.h>
-#include <df/itemdef_shoesst.h>
 #include <df/itemdef_glovesst.h>
+#include <df/itemdef_helmst.h>
 #include <df/itemdef_pantsst.h>
 #include <df/itemdef_shieldst.h>
+#include <df/itemdef_shoesst.h>
+#include <df/itemdef_trapcompst.h>
+#include <df/itemdef_weaponst.h>
+#include "df/furniture_type.h"
+#include "df/material.h"
+#include "df/plant_raw.h"
+#include "df/stockpile_group_set.h"
 
 // protobuf
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 
-#include <fstream>
-
-using std::endl;
 using std::string;
 using std::vector;
 
@@ -43,1521 +41,1342 @@ using namespace dfstockpiles;
 using df::global::world;
 
 using std::placeholders::_1;
-
-
-
-int NullBuffer::overflow ( int c )
-{
-    return c;
-}
-
-NullStream::NullStream() : std::ostream ( &m_sb ) {}
-
-StockpileSerializer::StockpileSerializer ( df::building_stockpilest * stockpile )
-    : mDebug ( false )
-    , mOut ( 0 )
-    , mNull()
-    , mPile ( stockpile )
-{
-
-    // build other_mats indices
-    furniture_setup_other_mats();
-    bars_blocks_setup_other_mats();
-    finished_goods_setup_other_mats();
-    weapons_armor_setup_other_mats();
-}
-
-StockpileSerializer::~StockpileSerializer() {}
-
-void StockpileSerializer::enable_debug ( std::ostream&out )
-{
-    mDebug = true;
-    mOut = &out;
-}
-
-bool StockpileSerializer::serialize_to_ostream ( std::ostream* output )
-{
-    if ( output->fail( ) ) return false;
+using std::placeholders::_2;
+
+namespace DFHack
+{
+DBG_EXTERN(stockpiles, log);
+}
+
+static struct OtherMatsFurniture {
+    const std::map<int, string> mats;
+
+    OtherMatsFurniture() : mats(getMats()) {}
+
+    std::map<int, string> getMats() {
+        std::map<int, string> ret;
+        ret.emplace(0, "WOOD");
+        ret.emplace(1, "PLANT_CLOTH");
+        ret.emplace(2, "BONE");
+        ret.emplace(3, "TOOTH");
+        ret.emplace(4, "HORN");
+        ret.emplace(5, "PEARL");
+        ret.emplace(6, "SHELL");
+        ret.emplace(7, "LEATHER");
+        ret.emplace(8, "SILK");
+        ret.emplace(9, "AMBER");
+        ret.emplace(10, "CORAL");
+        ret.emplace(11, "GREEN_GLASS");
+        ret.emplace(12, "CLEAR_GLASS");
+        ret.emplace(13, "CRYSTAL_GLASS");
+        ret.emplace(14, "YARN");
+        return ret;
+    }
+} mOtherMatsFurniture;
+
+static struct OtherMatsBars {
+    const std::map<int, string> mats;
+
+    OtherMatsBars() : mats(getMats()) {}
+
+    std::map<int, string> getMats() {
+        std::map<int, string> ret;
+        ret.emplace(0, "COAL");
+        ret.emplace(1, "POTASH");
+        ret.emplace(2, "ASH");
+        ret.emplace(3, "PEARLASH");
+        ret.emplace(4, "SOAP");
+        return ret;
+    }
+} mOtherMatsBars;
+
+static struct OtherMatsBlocks {
+    const std::map<int, string> mats;
+
+    OtherMatsBlocks() : mats(getMats()) {}
+
+    std::map<int, string> getMats() {
+        std::map<int, string> ret;
+        ret.emplace(0, "GREEN_GLASS");
+        ret.emplace(1, "CLEAR_GLASS");
+        ret.emplace(2, "CRYSTAL_GLASS");
+        ret.emplace(3, "WOOD");
+        return ret;
+    }
+} mOtherMatsBlocks;
+
+static struct OtherMatsFinishedGoods {
+    const std::map<int, string> mats;
+
+    OtherMatsFinishedGoods() : mats(getMats()) {}
+
+    std::map<int, string> getMats() {
+        std::map<int, string> ret;
+        ret.emplace(0, "WOOD");
+        ret.emplace(1, "PLANT_CLOTH");
+        ret.emplace(2, "BONE");
+        ret.emplace(3, "TOOTH");
+        ret.emplace(4, "HORN");
+        ret.emplace(5, "PEARL");
+        ret.emplace(6, "SHELL");
+        ret.emplace(7, "LEATHER");
+        ret.emplace(8, "SILK");
+        ret.emplace(9, "AMBER");
+        ret.emplace(10, "CORAL");
+        ret.emplace(11, "GREEN_GLASS");
+        ret.emplace(12, "CLEAR_GLASS");
+        ret.emplace(13, "CRYSTAL_GLASS");
+        ret.emplace(14, "YARN");
+        ret.emplace(15, "WAX");
+        return ret;
+    }
+} mOtherMatsFinishedGoods;
+
+static struct OtherMatsWeaponsArmor {
+    const std::map<int, string> mats;
+
+    OtherMatsWeaponsArmor() : mats(getMats()) {}
+
+    std::map<int, string> getMats() {
+        std::map<int, string> ret;
+        ret.emplace(0, "WOOD");
+        ret.emplace(1, "PLANT_CLOTH");
+        ret.emplace(2, "BONE");
+        ret.emplace(3, "SHELL");
+        ret.emplace(4, "LEATHER");
+        ret.emplace(5, "SILK");
+        ret.emplace(6, "GREEN_GLASS");
+        ret.emplace(7, "CLEAR_GLASS");
+        ret.emplace(8, "CRYSTAL_GLASS");
+        ret.emplace(9, "YARN");
+        return ret;
+    }
+} mOtherMatsWeaponsArmor;
+
+StockpileSettingsSerializer::StockpileSettingsSerializer(df::stockpile_settings *settings)
+    : mSettings(settings) { }
+
+StockpileSettingsSerializer::~StockpileSettingsSerializer() { }
+
+StockpileSerializer::StockpileSerializer(df::building_stockpilest* stockpile)
+    : StockpileSettingsSerializer(&stockpile->settings), mPile(stockpile) { }
+
+StockpileSerializer::~StockpileSerializer() { }
+
+bool StockpileSettingsSerializer::serialize_to_ostream(color_ostream& out, std::ostream* output, uint32_t includedElements) {
+    if (output->fail())
+        return false;
     mBuffer.Clear();
-    write();
+    write(out, includedElements);
     {
-        io::OstreamOutputStream zero_copy_output ( output );
-        if ( !mBuffer.SerializeToZeroCopyStream ( &zero_copy_output ) ) return false;
+        io::OstreamOutputStream zero_copy_output(output);
+        if (!mBuffer.SerializeToZeroCopyStream(&zero_copy_output))
+            return false;
     }
     return output->good();
 }
 
-bool StockpileSerializer::serialize_to_file ( const std::string & file )
-{
-    std::fstream output ( file, std::ios::out | std::ios::binary |  std::ios::trunc );
-    if ( output.fail()  )
-    {
-        debug() <<  "ERROR: failed to open file for writing: " <<  file <<  endl;
+bool StockpileSettingsSerializer::serialize_to_file(color_ostream& out, const string& file, uint32_t includedElements) {
+    std::fstream output(file, std::ios::out | std::ios::binary | std::ios::trunc);
+    if (output.fail()) {
+        WARN(log, out).print("ERROR: failed to open file for writing: '%s'\n",
+                file.c_str());
         return false;
     }
-    return serialize_to_ostream ( &output );
+    return serialize_to_ostream(out, &output, includedElements);
 }
 
-bool StockpileSerializer::parse_from_istream ( std::istream* input )
-{
-    if ( input->fail( ) ) return false;
+bool StockpileSettingsSerializer::parse_from_istream(color_ostream &out, std::istream* input, DeserializeMode mode, const vector<string>& filters) {
+    if (input->fail())
+        return false;
     mBuffer.Clear();
-    io::IstreamInputStream zero_copy_input ( input );
-    const bool res = mBuffer.ParseFromZeroCopyStream ( &zero_copy_input ) && input->eof();
-    if ( res ) read();
+    io::IstreamInputStream zero_copy_input(input);
+    const bool res = mBuffer.ParseFromZeroCopyStream(&zero_copy_input)
+            && input->eof();
+    if (res)
+        read(out, mode, filters);
     return res;
 }
 
-
-bool StockpileSerializer::unserialize_from_file ( const std::string & file )
-{
-    std::fstream input ( file, std::ios::in | std::ios::binary );
-    if ( input.fail()  )
-    {
-        debug() <<  "ERROR: failed to open file for reading: " <<  file <<  endl;
+bool StockpileSettingsSerializer::unserialize_from_file(color_ostream &out, const string& file, DeserializeMode mode, const vector<string>& filters) {
+    std::fstream input(file, std::ios::in | std::ios::binary);
+    if (input.fail()) {
+        WARN(log, out).print("failed to open file for reading: '%s'\n",
+                file.c_str());
         return false;
     }
-    return parse_from_istream ( &input );
+    return parse_from_istream(out, &input, mode, filters);
 }
 
-std::ostream & StockpileSerializer::debug()
-{
-    if ( mDebug )
-        return *mOut;
-    return mNull;
+/**
+ * Find an enum's value based off the string label.
+ * @param traits the enum's trait struct
+ * @param token the string value in key_table
+ * @return the enum's value,  -1 if not found
+ */
+template <typename E>
+static typename df::enum_traits<E>::base_type linear_index(df::enum_traits<E> traits, const string& token) {
+    auto j = traits.first_item_value;
+    auto limit = traits.last_item_value;
+    // sometimes enums start at -1, which is bad news for array indexing
+    if (j < 0) {
+        j += abs(traits.first_item_value);
+        limit += abs(traits.first_item_value);
+    }
+    for (; j <= limit; ++j) {
+        if (token.compare(traits.key_table[j]) == 0)
+            return j;
+    }
+    return -1;
 }
 
+static bool matches_filter(color_ostream& out, const vector<string>& filters, const string& name) {
+    for (auto & filter : filters) {
+        DEBUG(log, out).print("searching for '%s' in '%s'\n", filter.c_str(), name.c_str());
+        if (std::search(name.begin(), name.end(), filter.begin(), filter.end(),
+            [](unsigned char ch1, unsigned char ch2) { return std::toupper(ch1) == std::toupper(ch2); }
+        ) != name.end())
+            return true;
+    }
+    return !filters.size();
+}
 
-void StockpileSerializer::write()
-{
-    //      debug() << "GROUP SET " << bitfield_to_string(mPile->settings.flags) << endl;
-    write_general();
-    if ( mPile->settings.flags.bits.animals )
-        write_animals();
-    if ( mPile->settings.flags.bits.food )
-        write_food();
-    if ( mPile->settings.flags.bits.furniture )
-        write_furniture();
-    if ( mPile->settings.flags.bits.refuse )
-        write_refuse();
-    if ( mPile->settings.flags.bits.stone )
-        write_stone();
-    if ( mPile->settings.flags.bits.ammo )
-        write_ammo();
-    if ( mPile->settings.flags.bits.coins )
-        write_coins();
-    if ( mPile->settings.flags.bits.bars_blocks )
-        write_bars_blocks();
-    if ( mPile->settings.flags.bits.gems )
-        write_gems();
-    if ( mPile->settings.flags.bits.finished_goods )
-        write_finished_goods();
-    if ( mPile->settings.flags.bits.leather )
-        write_leather();
-    if ( mPile->settings.flags.bits.cloth )
-        write_cloth();
-    if ( mPile->settings.flags.bits.wood )
-        write_wood();
-    if ( mPile->settings.flags.bits.weapons )
-        write_weapons();
-    if ( mPile->settings.flags.bits.armor )
-        write_armor();
-}
-
-void StockpileSerializer::read ()
-{
-    debug() << endl << "==READ==" << endl;
-    read_general();
-    read_animals();
-    read_food();
-    read_furniture();
-    read_refuse();
-    read_stone();
-    read_ammo();
-    read_coins();
-    read_bars_blocks();
-    read_gems();
-    read_finished_goods();
-    read_leather();
-    read_cloth();
-    read_wood();
-    read_weapons();
-    read_armor();
-}
-
-
-void StockpileSerializer::serialize_list_organic_mat ( FuncWriteExport add_value, const std::vector<char> * list, organic_mat_category::organic_mat_category cat )
-{
-    if ( !list )
-    {
-        debug()  << "serialize_list_organic_mat: list null" << endl;
+static void set_flag(color_ostream& out, const char* name, const vector<string>& filters, bool all, char val, bool enabled, bool& elem) {
+    if ((all || enabled) && matches_filter(out, filters, name)) {
+        DEBUG(log, out).print("setting %s to %d\n", name, val);
+        elem = val;
     }
-    for ( size_t i = 0; i < list->size(); ++i )
-    {
-        if ( list->at ( i ) )
-        {
-            std::string token = OrganicMatLookup::food_token_by_idx ( debug(), cat, i );
-            if ( !token.empty() )
-            {
-                add_value ( token );
-                debug() <<  " organic_material " << i << " is " <<  token <<  endl;
-            }
-            else
-            {
-                debug() << "food mat invalid :(" << endl;
-            }
-        }
+}
+
+static void set_filter_elem(color_ostream& out, const char* subcat, const vector<string>& filters, char val,
+        const string& name, const string& id, char& elem) {
+    if (matches_filter(out, filters, subcat + ((*subcat ? "/" : "") + name))) {
+        DEBUG(log, out).print("setting %s (%s) to %d\n", name.c_str(), id.c_str(), val);
+        elem = val;
     }
 }
 
-void StockpileSerializer::unserialize_list_organic_mat ( FuncReadImport get_value, size_t list_size, std::vector<char> *pile_list,  organic_mat_category::organic_mat_category cat )
-{
-    pile_list->clear();
-    pile_list->resize ( OrganicMatLookup::food_max_size ( cat ),  '\0' );
-    for ( size_t i = 0; i < list_size; ++i )
-    {
-        std::string token = get_value ( i );
-        int16_t idx = OrganicMatLookup::food_idx_by_token ( debug(), cat, token );
-        debug() << "   organic_material " << idx << " is " << token << endl;
-        if ( size_t(idx) >=  pile_list->size() )
-        {
-            debug() <<  "error organic mat index too large!   idx[" << idx <<  "] max_size[" << pile_list->size() <<  "]" <<   endl;
+template<typename T_val, typename T_id>
+static void set_filter_elem(color_ostream& out, const char* subcat, const vector<string>& filters, T_val val,
+        const string& name, T_id id, T_val& elem) {
+    if (matches_filter(out, filters, subcat + ((*subcat ? "/" : "") + name))) {
+        DEBUG(log, out).print("setting %s (%d) to %d\n", name.c_str(), (int32_t)id, val);
+        elem = val;
+    }
+}
+
+/**
+ * There are many repeated (un)serialization cases throughout the stockpile_settings structure,
+ * so the most common cases have been generalized into generic functions using lambdas.
+ *
+ * The basic process to serialize a stockpile_settings structure is:
+ * 1. loop through the list
+ * 2. for every element that is TRUE:
+ * 3.   map the specific stockpile_settings index into a general material, creature, etc index
+ * 4.   verify that type is allowed in the list (e.g.,  no stone in gems stockpiles)
+ * 5.   add it to the protobuf using FuncWriteExport
+ *
+ * The unserialization process is the same in reverse.
+ */
+static bool serialize_list_itemdef(color_ostream& out, FuncWriteExport add_value,
+        vector<char> list,
+        vector<df::itemdef*> items,
+        item_type::item_type type) {
+    bool all = true;
+    for (size_t i = 0; i < list.size(); ++i) {
+        if (!list.at(i)) {
+            all = false;
             continue;
         }
-        pile_list->at ( idx ) = 1;
+        const df::itemdef* a = items.at(i);
+        // skip procedurally generated items
+        if (a->base_flags.is_set(df::itemdef_flags::GENERATED))
+            continue;
+        ItemTypeInfo ii;
+        if (!ii.decode(type, i))
+            continue;
+        DEBUG(log, out).print("adding itemdef type %s\n", ii.getToken().c_str());
+        add_value(ii.getToken());
     }
+    return all;
 }
 
+static void unserialize_list_itemdef(color_ostream& out, const char* subcat, bool all, char val, const vector<string>& filters,
+        FuncReadImport read_value, int32_t list_size, vector<char>& pile_list, item_type::item_type type) {
+    int num_elems = Items::getSubtypeCount(type);
+    pile_list.resize(num_elems, '\0');
+    if (all) {
+        for (auto idx = 0; idx < num_elems; ++idx) {
+            ItemTypeInfo ii;
+            ii.decode(type, idx);
+            set_filter_elem(out, subcat, filters, val, ii.toString(), idx, pile_list.at(idx));
+        }
+        return;
+    }
 
-void StockpileSerializer::serialize_list_item_type ( FuncItemAllowed is_allowed,  FuncWriteExport add_value,  const std::vector<char> &list )
-{
-    using df::enums::item_type::item_type;
-    using type_traits = df::enum_traits<item_type>;
-    debug() <<  "item_type size = " <<  list.size() <<  " size limit = " <<  type_traits::last_item_value <<  " typecasted:  " << ( size_t ) type_traits::last_item_value <<  endl;
-    for ( size_t i = 0; i <= ( size_t ) type_traits::last_item_value; ++i )
-    {
-        if ( list.at ( i ) )
-        {
-            const item_type type = ( item_type ) ( ( df::enum_traits<item_type>::base_type ) i );
-            std::string r_type ( type_traits::key_table[i+1] );
-            if ( !is_allowed ( type ) ) continue;
-            add_value ( r_type );
-            debug() << "item_type key_table[" << i+1 << "] type[" << ( int16_t ) type <<  "] is " << r_type <<endl;
+    for (auto i = 0; i < list_size; ++i) {
+        string id = read_value(i);
+        ItemTypeInfo ii;
+        if (!ii.find(id))
+            continue;
+        if (ii.subtype < 0 || size_t(ii.subtype) >= pile_list.size()) {
+            WARN(log, out).print("item type index invalid: %d\n", ii.subtype);
+            continue;
         }
+        set_filter_elem(out, subcat, filters, val, id, ii.subtype, pile_list.at(ii.subtype));
     }
 }
 
+static bool serialize_list_quality(color_ostream& out, FuncWriteExport add_value,
+        const bool(&quality_list)[7]) {
+    using df::enums::item_quality::item_quality;
+    using quality_traits = df::enum_traits<item_quality>;
 
-void StockpileSerializer::unserialize_list_item_type ( FuncItemAllowed is_allowed, FuncReadImport read_value,  int32_t list_size,  std::vector<char> *pile_list )
-{
-    pile_list->clear();
-    pile_list->resize ( 112,  '\0' );                   // TODO remove hardcoded list size value
-    for ( size_t i = 0; i < pile_list->size(); ++i )
-    {
-        pile_list->at ( i ) = is_allowed ( ( item_type::item_type ) i )  ? 0 : 1;
-    }
-    using df::enums::item_type::item_type;
-    df::enum_traits<item_type> type_traits;
-    for ( int32_t i = 0; i < list_size; ++i )
-    {
-        const std::string token = read_value ( i );
-        // subtract one because item_type starts at -1
-        const df::enum_traits<item_type>::base_type idx = linear_index ( debug(), type_traits, token ) - 1;
-        const item_type type = ( item_type ) idx;
-        if ( !is_allowed ( type ) ) continue;
-        debug() << "   item_type " << idx << " is " << token << endl;
-        if ( size_t(idx) >=  pile_list->size() )
-        {
-            debug() <<  "error item_type index too large!   idx[" << idx <<  "] max_size[" << pile_list->size() <<  "]" <<   endl;
+    bool all = true;
+    for (size_t i = 0; i < 7; ++i) {
+        if (!quality_list[i]) {
+            all = false;
             continue;
         }
-        pile_list->at ( idx ) =  1;
+        const string f_type(quality_traits::key_table[i]);
+        add_value(f_type);
+        DEBUG(log, out).print("adding quality %s\n", f_type.c_str());
     }
+    return all;
+}
+
+static void quality_clear(bool(&pile_list)[7]) {
+    std::fill(pile_list, pile_list + 7, false);
 }
 
+static void unserialize_list_quality(color_ostream& out, const char* subcat, bool all, bool val, const vector<string>& filters,
+        FuncReadImport read_value, int32_t list_size, bool(&pile_list)[7]) {
+    if (all) {
+        for (auto idx = 0; idx < 7; ++idx) {
+            string id = ENUM_KEY_STR(item_quality, (df::item_quality)idx);
+            set_filter_elem(out, subcat, filters, val, id, idx, pile_list[idx]);
+        }
+        return;
+    }
 
-void StockpileSerializer::serialize_list_material ( FuncMaterialAllowed is_allowed,  FuncWriteExport add_value,  const std::vector<char> &list )
-{
-    MaterialInfo mi;
-    for ( size_t i = 0; i < list.size(); ++i )
-    {
-        if ( list.at ( i ) )
-        {
-            mi.decode ( 0, i );
-            if ( !is_allowed ( mi ) ) continue;
-            debug() << "   material " << i << " is " << mi.getToken() << endl;
-            add_value ( mi.getToken() );
+    using df::enums::item_quality::item_quality;
+    df::enum_traits<item_quality> quality_traits;
+    for (int i = 0; i < list_size; ++i) {
+        const string quality = read_value(i);
+        df::enum_traits<item_quality>::base_type idx = linear_index(quality_traits, quality);
+        if (idx < 0) {
+            WARN(log, out).print("invalid quality token: %s\n", quality.c_str());
+            continue;
         }
+        set_filter_elem(out, subcat, filters, val, quality, idx, pile_list[idx]);
     }
 }
 
+static string other_mats_index(const std::map<int, string> other_mats,
+        int idx) {
+    auto it = other_mats.find(idx);
+    if (it == other_mats.end())
+        return string();
+    return it->second;
+}
 
-void StockpileSerializer::unserialize_list_material ( FuncMaterialAllowed is_allowed, FuncReadImport read_value,  int32_t list_size,  std::vector<char> *pile_list )
-{
-    //  we initialize all possible (allowed) values to 0,
-    //  then all other not-allowed values to 1
-    //  why? because that's how the memory is in DF before
-    //  we muck with it.
-    std::set<int32_t> idx_set;
-    pile_list->clear();
-    pile_list->resize ( world->raws.inorganics.size(),  0 );
-    for ( size_t i = 0; i < pile_list->size(); ++i )
-    {
-        MaterialInfo mi ( 0,  i );
-        pile_list->at ( i ) = is_allowed ( mi )  ? 0 : 1;
+static int other_mats_token(const std::map<int, string> other_mats,
+        const string& token) {
+    for (auto it = other_mats.begin(); it != other_mats.end(); ++it) {
+        if (it->second == token)
+            return it->first;
     }
-    for ( int i = 0; i < list_size; ++i )
-    {
-        const std::string token = read_value ( i );
-        MaterialInfo mi;
-        mi.find ( token );
-        if ( !is_allowed ( mi ) ) continue;
-        debug() << "   material " << mi.index << " is " << token << endl;
-        if ( size_t(mi.index) >=  pile_list->size() )
-        {
-            debug() <<  "error material index too large!   idx[" << mi.index <<  "] max_size[" << pile_list->size() <<  "]" <<   endl;
+    return -1;
+}
+
+static bool serialize_list_other_mats(color_ostream& out,
+            const std::map<int, string> other_mats,
+            FuncWriteExport add_value,
+            vector<char> list) {
+    bool all = true;
+    for (size_t i = 0; i < list.size(); ++i) {
+        if (!list.at(i)) {
+            all = false;
+            continue;
+        }
+        const string token = other_mats_index(other_mats, i);
+        if (token.empty()) {
+            WARN(log, out).print("invalid other material with index %zd\n", i);
             continue;
         }
-        pile_list->at ( mi.index ) = 1;
+        add_value(token);
+        DEBUG(log, out).print("other mats %zd is %s\n", i, token.c_str());
     }
+    return all;
 }
 
+static void unserialize_list_other_mats(color_ostream& out, const char* subcat, bool all, char val, const vector<string>& filters,
+            const std::map<int, string> other_mats, FuncReadImport read_value, int32_t list_size, vector<char>& pile_list) {
+    size_t num_elems = other_mats.size();
+    pile_list.resize(num_elems, '\0');
 
-void StockpileSerializer::serialize_list_quality ( FuncWriteExport add_value, const bool ( &quality_list ) [7] )
-{
-    using df::enums::item_quality::item_quality;
-    using quality_traits = df::enum_traits<item_quality>;
-    for ( size_t i = 0; i < 7; ++i )
-    {
-        if ( quality_list[i] )
-        {
-            const std::string f_type ( quality_traits::key_table[i] );
-            add_value ( f_type );
-            debug() << "  quality: " << i << " is " << f_type <<endl;
+    if (all) {
+        for (auto & entry : other_mats)
+            set_filter_elem(out, subcat, filters, val, entry.second, entry.first, pile_list.at(entry.first));
+        return;
+    }
+
+    for (int i = 0; i < list_size; ++i) {
+        const string token = read_value(i);
+        size_t idx = other_mats_token(other_mats, token);
+        if (idx < 0) {
+            WARN(log, out).print("invalid other mat with token %s\n", token.c_str());
+            continue;
+        }
+        if (idx >= num_elems) {
+            WARN(log, out).print("other_mats index too large! idx[%zd] max_size[%zd]\n", idx, num_elems);
+            continue;
         }
+        set_filter_elem(out, subcat, filters, val, token, idx, pile_list.at(idx));
     }
 }
 
-
-void StockpileSerializer::quality_clear ( bool ( &pile_list ) [7] )
-{
-    std::fill ( pile_list,  pile_list+7,  false );
+static bool serialize_list_organic_mat(color_ostream& out, FuncWriteExport add_value,
+        const vector<char>* list,
+        organic_mat_category::organic_mat_category cat) {
+    bool all = true;
+    if (!list) {
+        DEBUG(log, out).print("serialize_list_organic_mat: list null\n");
+        return all;
+    }
+    for (size_t i = 0; i < list->size(); ++i) {
+        if (!list->at(i)) {
+            all = false;
+            continue;
+        }
+        string token = OrganicMatLookup::food_token_by_idx(out, cat, i);
+        if (token.empty()) {
+            DEBUG(log, out).print("food mat invalid :(\n");
+            continue;
+        }
+        DEBUG(log, out).print("organic_material %zd is %s\n", i, token.c_str());
+        add_value(token);
+    }
+    return all;
 }
 
+static void unserialize_list_organic_mat(color_ostream& out, const char* subcat, bool all, char val, const vector<string>& filters,
+        FuncReadImport read_value, size_t list_size, vector<char>& pile_list,
+        organic_mat_category::organic_mat_category cat) {
+    size_t num_elems = OrganicMatLookup::food_max_size(cat);
+    pile_list.resize(num_elems, '\0');
+    if (all) {
+        for (size_t idx = 0; idx < num_elems; ++idx) {
+            string token = OrganicMatLookup::food_token_by_idx(out, cat, idx);
+            set_filter_elem(out, subcat, filters, val, token, idx, pile_list.at(idx));
+        }
+        return;
+    }
 
-void StockpileSerializer::unserialize_list_quality ( FuncReadImport read_value,  int32_t list_size, bool ( &pile_list ) [7] )
-{
-    quality_clear ( pile_list );
-    if ( list_size > 0 && list_size <= 7 )
-    {
-        using df::enums::item_quality::item_quality;
-        df::enum_traits<item_quality> quality_traits;
-        for ( int i = 0; i < list_size; ++i )
-        {
-            const std::string quality = read_value ( i );
-            df::enum_traits<item_quality>::base_type idx = linear_index ( debug(), quality_traits, quality );
-            if ( idx < 0 )
-            {
-                debug() << " invalid quality token " << quality << endl;
-                continue;
-            }
-            debug() << "   quality: " << idx << " is " << quality << endl;
-            pile_list[idx] = true;
+    for (size_t i = 0; i < list_size; ++i) {
+        const string token = read_value(i);
+        int16_t idx = OrganicMatLookup::food_idx_by_token(out, cat, token);
+        if (idx < 0 || size_t(idx) >= num_elems) {
+            WARN(log, out).print("organic mat index too large! idx[%d] max_size[%zd]\n", idx, num_elems);
+            continue;
         }
+        set_filter_elem(out, subcat, filters, val, token, idx, pile_list.at(idx));
     }
 }
 
+static bool serialize_list_item_type(color_ostream& out, FuncItemAllowed is_allowed,
+        FuncWriteExport add_value, const vector<char>& list) {
+    using df::enums::item_type::item_type;
+    using type_traits = df::enum_traits<item_type>;
 
-void StockpileSerializer::serialize_list_other_mats ( const std::map<int, std::string> other_mats, FuncWriteExport add_value,  std::vector<char> list )
-{
-    for ( size_t i = 0; i < list.size(); ++i )
-    {
-        if ( list.at ( i ) )
-        {
-            const std::string token = other_mats_index ( other_mats,  i );
-            if ( token.empty() )
-            {
-                debug() << " invalid other material with index " << i << endl;
-                continue;
-            }
-            add_value ( token );
-            debug() << "  other mats " << i << " is " << token << endl;
+    bool all = true;
+    size_t num_item_types = list.size();
+    DEBUG(log, out).print("item_type size = %zd size limit = %d typecasted: %zd\n",
+            num_item_types, type_traits::last_item_value,
+            (size_t)type_traits::last_item_value);
+    for (size_t i = 0; i <= (size_t)type_traits::last_item_value; ++i) {
+        if (i < num_item_types && !list.at(i)) {
+            all = false;
+            continue;
         }
+        const item_type type = (item_type)((df::enum_traits<item_type>::base_type)i);
+        string r_type(type_traits::key_table[i + 1]);
+        if (!is_allowed(type))
+            continue;
+        add_value(r_type);
+        DEBUG(log, out).print("item_type key_table[%zd] type[%d] is %s\n", i + 1, (int16_t)type, r_type.c_str());
     }
+    return all;
 }
 
+static void unserialize_list_item_type(color_ostream& out, const char* subcat, bool all, char val, const vector<string>& filters,
+        FuncItemAllowed is_allowed, FuncReadImport read_value, int32_t list_size, vector<char>& pile_list) {
+    // TODO can we remove the hardcoded list size?
+    size_t num_elems = 112;
+    pile_list.resize(num_elems, '\0');
+    for (size_t i = 0; i < num_elems; ++i) {
+        if (!is_allowed((df::item_type)i))
+            pile_list.at(i) = 1;
+    }
 
-void StockpileSerializer::unserialize_list_other_mats ( const std::map<int, std::string> other_mats, FuncReadImport read_value,  int32_t list_size, std::vector<char> *pile_list )
-{
-    pile_list->clear();
-    pile_list->resize ( other_mats.size(),  '\0' );
-    for ( int i = 0; i < list_size; ++i )
-    {
-        const std::string token = read_value ( i );
-        size_t idx = other_mats_token ( other_mats, token );
-        if ( idx < 0 )
-        {
-            debug() << "invalid other mat with token " << token;
+    if (all) {
+        for (size_t idx = 0; idx < num_elems; ++idx) {
+            string id = ENUM_KEY_STR(item_type, (df::item_type)idx);
+            set_filter_elem(out, subcat, filters, val, id, idx, pile_list.at(idx));
+        }
+        return;
+    }
+
+    using df::enums::item_type::item_type;
+    df::enum_traits<item_type> type_traits;
+    for (int i = 0; i < list_size; ++i) {
+        const string token = read_value(i);
+        // subtract one because item_type starts at -1
+        const df::enum_traits<item_type>::base_type idx = linear_index(type_traits, token) - 1;
+        if (!is_allowed((item_type)idx))
+            continue;
+        if (idx < 0 || size_t(idx) >= num_elems) {
+            WARN(log, out).print("error item_type index too large! idx[%d] max_size[%zd]\n", idx, num_elems);
             continue;
         }
-        debug() << "  other_mats " << idx << " is " << token << endl;
-        if ( idx >=  pile_list->size() )
-        {
-            debug() <<  "error other_mats index too large!   idx[" << idx <<  "] max_size[" << pile_list->size() <<  "]" <<   endl;
+        set_filter_elem(out, subcat, filters, val, token, idx, pile_list.at(idx));
+    }
+}
+
+static bool serialize_list_material(color_ostream& out, FuncMaterialAllowed is_allowed,
+        FuncWriteExport add_value, const vector<char>& list) {
+    bool all = true;
+    MaterialInfo mi;
+    for (size_t i = 0; i < list.size(); ++i) {
+        if (!list.at(i)) {
+            all = false;
             continue;
         }
-        pile_list->at ( idx ) = 1;
+        mi.decode(0, i);
+        if (!is_allowed(mi))
+            continue;
+        DEBUG(log, out).print("adding material %s\n", mi.getToken().c_str());
+        add_value(mi.getToken());
     }
+    return all;
 }
 
+static void unserialize_list_material(color_ostream& out, const char* subcat, bool all, char val, const vector<string>& filters,
+        FuncMaterialAllowed is_allowed, FuncReadImport read_value, int32_t list_size,
+        vector<char>& pile_list) {
+    // we initialize all disallowed values to 1
+    // why? because that's how the memory is in DF before we muck with it.
+    size_t num_elems = world->raws.inorganics.size();
+    pile_list.resize(num_elems, 0);
+    for (size_t i = 0; i < pile_list.size(); ++i) {
+        MaterialInfo mi(0, i);
+        if (!is_allowed(mi))
+            pile_list.at(i) = 1;
+    }
 
+    if (all) {
+        for (size_t idx = 0; idx < num_elems; ++idx) {
+            MaterialInfo mi;
+            mi.decode(0, idx);
+            set_filter_elem(out, subcat, filters, val, mi.toString(), idx, pile_list.at(idx));
+        }
+        return;
+    }
 
-void StockpileSerializer::serialize_list_itemdef ( FuncWriteExport add_value,  std::vector<char> list,  std::vector<df::itemdef *> items,  item_type::item_type type )
-{
-    for ( size_t i = 0; i < list.size(); ++i )
-    {
-        if ( list.at ( i ) )
-        {
-            const df::itemdef *a = items.at ( i );
-            // skip procedurally generated items
-            if ( a->base_flags.is_set ( df::itemdef_flags::GENERATED ) ) continue;
-            ItemTypeInfo ii;
-            if ( !ii.decode ( type,  i ) ) continue;
-            add_value ( ii.getToken() );
-            debug() <<  "  itemdef type" <<  i <<  " is " <<  ii.getToken() << endl;
+    for (auto i = 0; i < list_size; ++i) {
+        string id = read_value(i);
+        MaterialInfo mi;
+        if (!mi.find(id) || !is_allowed(mi))
+            continue;
+        if (mi.index < 0 || size_t(mi.index) >= pile_list.size()) {
+            WARN(log, out).print("material type index invalid: %d\n", mi.index);
+            continue;
         }
+        set_filter_elem(out, subcat, filters, val, id, mi.index, pile_list.at(mi.index));
     }
 }
 
+static bool serialize_list_creature(color_ostream& out, FuncWriteExport add_value, const vector<char>& list) {
+    bool all = true;
 
-void StockpileSerializer::unserialize_list_itemdef ( FuncReadImport read_value,  int32_t list_size, std::vector<char> *pile_list, item_type::item_type type )
-{
-    pile_list->clear();
-    pile_list->resize ( Items::getSubtypeCount ( type ),  '\0' );
-    for ( int i = 0; i < list_size; ++i )
-    {
-        std::string token = read_value ( i );
-        ItemTypeInfo ii;
-        if ( !ii.find ( token ) ) continue;
-        debug() <<  "  itemdef " <<  ii.subtype <<  " is " <<  token << endl;
-        if ( size_t(ii.subtype) >=  pile_list->size() )
-        {
-            debug() <<  "error itemdef index too large!   idx[" << ii.subtype <<  "] max_size[" << pile_list->size() <<  "]" <<   endl;
+    for (size_t i = 0; i < list.size(); ++i) {
+        if (!list.at(i)) {
+            all = false;
             continue;
         }
-        pile_list->at ( ii.subtype ) = 1;
+        df::creature_raw* r = find_creature(i);
+        if (r->flags.is_set(creature_raw_flags::GENERATED)
+                || r->creature_id == "EQUIPMENT_WAGON")
+            continue;
+        DEBUG(log, out).print("adding creature %s\n", r->creature_id.c_str());
+        add_value(r->creature_id);
     }
+    return all;
+}
+
+static string get_filter_string(df::creature_raw *r) {
+    if (!r->caste.size() ||
+            (!r->caste[0]->flags.is_set(df::enums::caste_raw_flags::PET) &&
+             !r->caste[0]->flags.is_set(df::enums::caste_raw_flags::PET_EXOTIC)))
+        return r->name[0];
+    return r->name[0] + "/tameable";
 }
 
+static void unserialize_list_creature(color_ostream& out, const char* subcat, bool all, char val, const vector<string>& filters,
+        FuncReadImport read_value, int32_t list_size, vector<char>& pile_list) {
+    size_t num_elems = world->raws.creatures.all.size();
+    pile_list.resize(num_elems, '\0');
+    if (all) {
+        for (size_t idx = 0; idx < num_elems; ++idx) {
+            auto r = find_creature(idx);
+            set_filter_elem(out, subcat, filters, val, get_filter_string(r), r->creature_id, pile_list.at(idx));
+        }
+        return;
+    }
 
-std::string StockpileSerializer::other_mats_index ( const std::map<int, std::string> other_mats,  int idx )
-{
-    auto it = other_mats.find ( idx );
-    if ( it == other_mats.end() )
-        return std::string();
-    return it->second;
+    for (auto i = 0; i < list_size; ++i) {
+        string id = read_value(i);
+        int idx = find_creature(id);
+        if (idx < 0 || size_t(idx) >= num_elems) {
+            WARN(log, out).print("animal index invalid: %d\n", idx);
+            continue;
+        }
+        auto r = find_creature(idx);
+        set_filter_elem(out, subcat, filters, val, get_filter_string(r), r->creature_id, pile_list.at(idx));
+    }
+}
+
+template<typename T_cat_set>
+static void write_cat(color_ostream& out, const char* name, bool include_types, uint32_t cat_flags,
+    enum df::stockpile_group_set::Mask cat_mask,
+    std::function<T_cat_set* ()> mutable_cat_fn,
+    std::function<bool(color_ostream&, T_cat_set*)> write_cat_fn) {
+
+    if (!(cat_flags & cat_mask))
+        return;
+
+    T_cat_set* cat_set = mutable_cat_fn();
+
+    if (!include_types) {
+        DEBUG(log, out).print("including all for %s since only category is being recorded\n", name);
+        cat_set->set_all(true);
+        return;
+    }
+
+    if (write_cat_fn(out, cat_set)) {
+        // all fields were set. clear them and use the "all" flag instead so "all" can be applied
+        // to other worlds with other generated types
+        DEBUG(log, out).print("including all for %s since all fields were enabled\n", name);
+        cat_set->Clear();
+        cat_set->set_all(true);
+    }
+}
+
+void StockpileSettingsSerializer::write(color_ostream& out, uint32_t includedElements) {
+    if (includedElements & INCLUDED_ELEMENTS_GENERAL)
+        write_general(out);
+
+    if (!(includedElements & INCLUDED_ELEMENTS_CATEGORIES))
+        return;
+
+    DEBUG(log, out).print("GROUP SET %s\n",
+            bitfield_to_string(mSettings->flags).c_str());
+
+    bool include_types = 0 != (includedElements & INCLUDED_ELEMENTS_TYPES);
+
+    write_cat<StockpileSettings_AmmoSet>(out, "ammo", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_ammo,
+        std::bind(&StockpileSettings::mutable_ammo, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_ammo, this, _1, _2));
+    write_cat<StockpileSettings_AnimalsSet>(out, "animals", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_animals,
+        std::bind(&StockpileSettings::mutable_animals, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_animals, this, _1, _2));
+    write_cat<StockpileSettings_ArmorSet>(out, "armor", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_armor,
+        std::bind(&StockpileSettings::mutable_armor, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_armor, this, _1, _2));
+    write_cat<StockpileSettings_BarsBlocksSet>(out, "bars_blocks", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_bars_blocks,
+        std::bind(&StockpileSettings::mutable_barsblocks, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_bars_blocks, this, _1, _2));
+    write_cat<StockpileSettings_ClothSet>(out, "cloth", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_cloth,
+        std::bind(&StockpileSettings::mutable_cloth, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_cloth, this, _1, _2));
+    write_cat<StockpileSettings_CoinSet>(out, "coin", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_coins,
+        std::bind(&StockpileSettings::mutable_coin, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_coins, this, _1, _2));
+    write_cat<StockpileSettings_FinishedGoodsSet>(out, "finished_goods", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_finished_goods,
+        std::bind(&StockpileSettings::mutable_finished_goods, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_finished_goods, this, _1, _2));
+    write_cat<StockpileSettings_FoodSet>(out, "food", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_food,
+        std::bind(&StockpileSettings::mutable_food, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_food, this, _1, _2));
+    write_cat<StockpileSettings_FurnitureSet>(out, "furniture", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_furniture,
+        std::bind(&StockpileSettings::mutable_furniture, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_furniture, this, _1, _2));
+    write_cat<StockpileSettings_GemsSet>(out, "gems", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_gems,
+        std::bind(&StockpileSettings::mutable_gems, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_gems, this, _1, _2));
+    write_cat<StockpileSettings_LeatherSet>(out, "leather", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_leather,
+        std::bind(&StockpileSettings::mutable_leather, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_leather, this, _1, _2));
+    write_cat<StockpileSettings_CorpsesSet>(out, "corpses", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_corpses,
+        std::bind(&StockpileSettings::mutable_corpses_v50, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_corpses, this, _1, _2));
+    write_cat<StockpileSettings_RefuseSet>(out, "refuse", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_refuse,
+        std::bind(&StockpileSettings::mutable_refuse, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_refuse, this, _1, _2));
+    write_cat<StockpileSettings_SheetSet>(out, "sheet", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_sheet,
+        std::bind(&StockpileSettings::mutable_sheet, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_sheet, this, _1, _2));
+    write_cat<StockpileSettings_StoneSet>(out, "stone", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_stone,
+        std::bind(&StockpileSettings::mutable_stone, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_stone, this, _1, _2));
+    write_cat<StockpileSettings_WeaponsSet>(out, "weapons", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_weapons,
+        std::bind(&StockpileSettings::mutable_weapons, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_weapons, this, _1, _2));
+    write_cat<StockpileSettings_WoodSet>(out, "wood", include_types,
+        mSettings->flags.whole,
+        mSettings->flags.mask_wood,
+        std::bind(&StockpileSettings::mutable_wood, &mBuffer),
+        std::bind(&StockpileSettingsSerializer::write_wood, this, _1, _2));
+}
+
+void StockpileSerializer::write(color_ostream& out, uint32_t includedElements) {
+    if (includedElements & INCLUDED_ELEMENTS_CONTAINERS)
+        write_containers(out);
+
+    StockpileSettingsSerializer::write(out, includedElements);
+}
+
+void StockpileSettingsSerializer::read(color_ostream &out, DeserializeMode mode, const vector<string>& filters) {
+    DEBUG(log).print("==READ==\n");
+    read_general(out, mode);
+    read_ammo(out, mode, filters);
+    read_animals(out, mode, filters);
+    read_armor(out, mode, filters);
+    read_bars_blocks(out, mode, filters);
+    read_cloth(out, mode, filters);
+    read_coins(out, mode, filters);
+    read_finished_goods(out, mode, filters);
+    read_food(out, mode, filters);
+    read_furniture(out, mode, filters);
+    read_gems(out, mode, filters);
+    read_leather(out, mode, filters);
+
+    // support for old versions before corpses had a set
+    if (mBuffer.has_corpses()) {
+        StockpileSettings::CorpsesSet* corpses = mBuffer.mutable_corpses_v50();
+        corpses->set_all(true);
+    }
+    read_corpses(out, mode, filters);
+
+    read_refuse(out, mode, filters);
+    read_sheet(out, mode, filters);
+    read_stone(out, mode, filters);
+    read_weapons(out, mode, filters);
+    read_wood(out, mode, filters);
+}
+
+void StockpileSerializer::read(color_ostream &out, DeserializeMode mode, const vector<string>& filters) {
+    read_containers(out, mode);
+    StockpileSettingsSerializer::read(out, mode, filters);
+}
+
+void StockpileSerializer::write_containers(color_ostream& out) {
+    DEBUG(log, out).print("writing container settings\n");
+    mBuffer.set_max_bins(mPile->max_bins);
+    mBuffer.set_max_barrels(mPile->max_barrels);
+    mBuffer.set_max_wheelbarrows(mPile->max_wheelbarrows);
+}
+
+template<typename T_elem, typename T_elem_ret>
+static void read_elem(color_ostream& out, const char* name, DeserializeMode mode,
+        std::function<bool()> has_elem_fn,
+        std::function<T_elem_ret()> elem_fn,
+        T_elem &setting) {
+    if (!has_elem_fn())
+        return;
+
+    bool is_set = elem_fn() != 0;
+    if (mode == DESERIALIZE_MODE_SET || is_set) {
+        T_elem val = (mode == DESERIALIZE_MODE_DISABLE) ? 0 : elem_fn();
+        DEBUG(log, out).print("setting %s to %d\n", name, val);
+        setting = val;
+    }
+}
+
+template<typename T_cat>
+static void read_category(color_ostream& out, const char* name, DeserializeMode mode,
+        std::function<bool()> has_cat_fn,
+        std::function<const T_cat &()> cat_fn,
+        uint32_t & cat_flags,
+        enum df::stockpile_group_set::Mask cat_mask,
+        std::function<void()> clear_fn,
+        std::function<void(bool, char)> set_fn) {
+    if (mode == DESERIALIZE_MODE_SET) {
+        DEBUG(log, out).print("clearing %s\n", name);
+        cat_flags &= ~cat_mask;
+        clear_fn();
+    }
+
+    if (!has_cat_fn())
+        return;
+
+    if (mode == DESERIALIZE_MODE_DISABLE && !(cat_flags & cat_mask))
+        return;
+
+    if (mode == DESERIALIZE_MODE_SET || mode == DESERIALIZE_MODE_ENABLE)
+        cat_flags |= cat_mask;
+
+    bool all = cat_fn().all();
+    char val = (mode == DESERIALIZE_MODE_DISABLE) ? (char)0 : (char)1;
+    DEBUG(log, out).print("setting %s %s elements to %d\n",
+            all ? "all" : "marked", name, val);
+    set_fn(all, val);
+}
+
+void StockpileSerializer::read_containers(color_ostream& out, DeserializeMode mode) {
+    read_elem<int16_t, int32_t>(out, "max_bins", mode,
+            std::bind(&StockpileSettings::has_max_bins, mBuffer),
+            std::bind(&StockpileSettings::max_bins, mBuffer),
+            mPile->max_bins);
+    read_elem<int16_t, int32_t>(out, "max_barrels", mode,
+            std::bind(&StockpileSettings::has_max_barrels, mBuffer),
+            std::bind(&StockpileSettings::max_barrels, mBuffer),
+            mPile->max_barrels);
+    read_elem<int16_t, int32_t>(out, "max_wheelbarrows", mode,
+            std::bind(&StockpileSettings::has_max_wheelbarrows, mBuffer),
+            std::bind(&StockpileSettings::max_wheelbarrows, mBuffer),
+            mPile->max_wheelbarrows);
+}
+
+void StockpileSettingsSerializer::write_general(color_ostream& out) {
+    DEBUG(log, out).print("writing general settings\n");
+    mBuffer.set_allow_inorganic(mSettings->allow_inorganic);
+    mBuffer.set_allow_organic(mSettings->allow_organic);
+}
+
+void StockpileSerializer::write_general(color_ostream& out) {
+    StockpileSettingsSerializer::write_general(out);
+    mBuffer.set_use_links_only(mPile->use_links_only);
 }
 
-int StockpileSerializer::other_mats_token ( const std::map<int, std::string> other_mats,  const std::string & token )
-{
-    for ( auto it = other_mats.begin(); it != other_mats.end(); ++it )
-    {
-        if ( it->second == token )
-            return it->first;
+void StockpileSettingsSerializer::read_general(color_ostream& out, DeserializeMode mode) {
+    read_elem<bool, bool>(out, "allow_inorganic", mode,
+            std::bind(&StockpileSettings::has_allow_inorganic, mBuffer),
+            std::bind(&StockpileSettings::allow_inorganic, mBuffer),
+            mSettings->allow_inorganic);
+    read_elem<bool, bool>(out, "allow_organic", mode,
+            std::bind(&StockpileSettings::has_allow_organic, mBuffer),
+            std::bind(&StockpileSettings::allow_organic, mBuffer),
+            mSettings->allow_organic);
+}
+
+void StockpileSerializer::read_general(color_ostream& out, DeserializeMode mode) {
+    StockpileSettingsSerializer::read_general(out, mode);
+    read_elem<int32_t, bool>(out, "use_links_only", mode,
+            std::bind(&StockpileSettings::has_use_links_only, mBuffer),
+            std::bind(&StockpileSettings::use_links_only, mBuffer),
+            mPile->use_links_only);
+}
+
+static bool ammo_mat_is_allowed(const MaterialInfo& mi) {
+    return mi.isValid() && mi.material && mi.material->flags.is_set(material_flags::IS_METAL);
+}
+
+bool StockpileSettingsSerializer::write_ammo(color_ostream& out, StockpileSettings::AmmoSet* ammo) {
+    bool all = serialize_list_itemdef(out,
+        [&](const string& token) { ammo->add_type(token); },
+        mSettings->ammo.type,
+        vector<df::itemdef*>(world->raws.itemdefs.ammo.begin(), world->raws.itemdefs.ammo.end()),
+        item_type::AMMO);
+
+    all = serialize_list_material(out,
+        ammo_mat_is_allowed,
+        [&](const string& token) { ammo->add_mats(token); },
+        mSettings->ammo.mats) && all;
+
+    if (mSettings->ammo.other_mats.size() > 2) {
+        WARN(log, out).print("ammo other materials > 2: %zd\n",
+            mSettings->ammo.other_mats.size());
     }
-    return -1;
+
+    size_t num_other_mats = std::min(size_t(2),
+            mSettings->ammo.other_mats.size());
+    for (size_t i = 0; i < num_other_mats; ++i) {
+        if (!mSettings->ammo.other_mats.at(i)) {
+            all = false;
+            continue;
+        }
+        const string token = i == 0 ? "WOOD" : "BONE";
+        ammo->add_other_mats(token);
+        DEBUG(log, out).print("other mats %zd is %s\n", i, token.c_str());
+    }
+
+    all = serialize_list_quality(out,
+        [&](const string& token) { ammo->add_quality_core(token); },
+        mSettings->ammo.quality_core) && all;
+
+    all = serialize_list_quality(out,
+        [&](const string& token) { ammo->add_quality_total(token); },
+        mSettings->ammo.quality_total) && all;
+
+    return all;
+}
+
+void StockpileSettingsSerializer::read_ammo(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pammo = mSettings->ammo;
+    read_category<StockpileSettings_AmmoSet>(out, "ammo", mode,
+        std::bind(&StockpileSettings::has_ammo, mBuffer),
+        std::bind(&StockpileSettings::ammo, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_ammo,
+        [&]() {
+            pammo.type.clear();
+            pammo.mats.clear();
+            pammo.other_mats.clear();
+            quality_clear(pammo.quality_core);
+            quality_clear(pammo.quality_total);
+        },
+        [&](bool all, char val) {
+            auto & bammo = mBuffer.ammo();
+
+            unserialize_list_itemdef(out, "type", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bammo.type(idx); },
+                bammo.type_size(), pammo.type, item_type::AMMO);
+
+            unserialize_list_material(out, "mats", all, val, filters, ammo_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return bammo.mats(idx); },
+                bammo.mats_size(), pammo.mats);
+
+            pammo.other_mats.resize(2, '\0');
+            if (all) {
+                set_filter_elem(out, "other", filters, val, "WOOD", 0, pammo.other_mats.at(0));
+                set_filter_elem(out, "other", filters, val, "BONE", 1, pammo.other_mats.at(1));
+            } else {
+                // TODO can we un-hardcode the values?
+                for (int i = 0; i < bammo.other_mats_size(); ++i) {
+                    const string id = bammo.other_mats(i);
+                    const int32_t idx = id == "WOOD" ? 0 : id == "BONE" ? 1 : -1;
+                    if (idx == -1)
+                        continue;
+                    set_filter_elem(out, "other", filters, val, id, idx, pammo.other_mats.at(idx));
+                }
+            }
+
+            unserialize_list_quality(out, "core", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bammo.quality_core(idx); },
+                bammo.quality_core_size(), pammo.quality_core);
+
+            unserialize_list_quality(out, "total", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bammo.quality_total(idx); },
+                bammo.quality_total_size(), pammo.quality_total);
+        });
 }
 
-void StockpileSerializer::write_general()
-{
-    mBuffer.set_max_bins ( mPile->max_bins );
-    mBuffer.set_max_wheelbarrows ( mPile->max_wheelbarrows );
-    mBuffer.set_max_barrels ( mPile->max_barrels );
-    mBuffer.set_use_links_only ( mPile->use_links_only );
-    mBuffer.set_unknown1 ( mPile->settings.unk1 );
-    mBuffer.set_allow_inorganic ( mPile->settings.allow_inorganic );
-    mBuffer.set_allow_organic ( mPile->settings.allow_organic );
-    mBuffer.set_corpses ( mPile->settings.flags.bits.corpses );
+bool StockpileSettingsSerializer::write_animals(color_ostream& out, StockpileSettings::AnimalsSet* animals) {
+    auto & panimals = mSettings->animals;
+    bool all = panimals.empty_cages && panimals.empty_traps;
+
+    animals->set_empty_cages(panimals.empty_cages);
+    animals->set_empty_traps(panimals.empty_traps);
+
+    return serialize_list_creature(out,
+        [&](const string& token) { animals->add_enabled(token); },
+        panimals.enabled) && all;
 }
 
-void StockpileSerializer::read_general()
-{
-    if ( mBuffer.has_max_bins() )
-        mPile->max_bins = mBuffer.max_bins();
-    if ( mBuffer.has_max_wheelbarrows() )
-        mPile->max_wheelbarrows = mBuffer.max_wheelbarrows();
-    if ( mBuffer.has_max_barrels() )
-        mPile->max_barrels = mBuffer.max_barrels();
-    if ( mBuffer.has_use_links_only() )
-        mPile->use_links_only = mBuffer.use_links_only();
-    if ( mBuffer.has_unknown1() )
-        mPile->settings.unk1 = mBuffer.unknown1();
-    if ( mBuffer.has_allow_inorganic() )
-        mPile->settings.allow_inorganic = mBuffer.allow_inorganic();
-    if ( mBuffer.has_allow_organic() )
-        mPile->settings.allow_organic = mBuffer.allow_organic();
-    if ( mBuffer.has_corpses() )
-        mPile->settings.flags.bits.corpses = mBuffer.corpses();
-}
-
-void StockpileSerializer::write_animals()
-{
-    StockpileSettings::AnimalsSet *animals= mBuffer.mutable_animals();
-    animals->set_empty_cages ( mPile->settings.animals.empty_cages );
-    animals->set_empty_traps ( mPile->settings.animals.empty_traps );
-    for ( size_t i = 0; i < mPile->settings.animals.enabled.size(); ++i )
-    {
-        if ( mPile->settings.animals.enabled.at ( i ) == 1 )
-        {
-            df::creature_raw* r = find_creature ( i );
-            debug() << "creature "<< r->creature_id << " " << i << endl;
-            animals->add_enabled ( r->creature_id );
-        }
-    }
+void StockpileSettingsSerializer::read_animals(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & panimals = mSettings->animals;
+    read_category<StockpileSettings_AnimalsSet>(out, "animals", mode,
+        std::bind(&StockpileSettings::has_animals, mBuffer),
+        std::bind(&StockpileSettings::animals, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_animals,
+        [&]() {
+            panimals.empty_cages = false;
+            panimals.empty_traps = false;
+            panimals.enabled.clear();
+        },
+        [&](bool all, char val) {
+            auto & banimals = mBuffer.animals();
+
+            set_flag(out, "cages", filters, all, val, banimals.empty_cages(), panimals.empty_cages);
+            set_flag(out, "traps", filters, all, val, banimals.empty_traps(), panimals.empty_traps);
+
+            unserialize_list_creature(out, "", all, val, filters,
+                [&](const size_t& idx) -> const string& { return banimals.enabled(idx); },
+                banimals.enabled_size(), panimals.enabled);
+        });
 }
 
-void StockpileSerializer::read_animals()
-{
-    if ( mBuffer.has_animals() )
-    {
-        mPile->settings.flags.bits.animals = 1;
-        debug() << "animals:" << endl;
-        mPile->settings.animals.empty_cages = mBuffer.animals().empty_cages();
-        mPile->settings.animals.empty_traps = mBuffer.animals().empty_traps();
-
-        mPile->settings.animals.enabled.clear();
-        mPile->settings.animals.enabled.resize ( world->raws.creatures.all.size(), '\0' );
-        debug() <<  " pile has " <<  mPile->settings.animals.enabled.size() <<  endl;
-        for ( auto i = 0; i < mBuffer.animals().enabled_size(); ++i )
-        {
-            std::string id = mBuffer.animals().enabled ( i );
-            int idx = find_creature ( id );
-            debug() << id << " " << idx << endl;
-            if ( idx < 0 ||  size_t(idx) >= mPile->settings.animals.enabled.size() )
-            {
-                debug() <<  "WARNING: animal index invalid: " <<  idx << endl;
-                continue;
-            }
-            mPile->settings.animals.enabled.at ( idx ) = ( char ) 1;
-        }
-    }
-    else
-    {
-        mPile->settings.animals.enabled.clear();
-        mPile->settings.flags.bits.animals = 0;
-        mPile->settings.animals.empty_cages = false;
-        mPile->settings.animals.empty_traps = false;
-    }
-}
-
-StockpileSerializer::food_pair StockpileSerializer::food_map ( organic_mat_category::organic_mat_category cat )
-{
-    using df::enums::organic_mat_category::organic_mat_category;
-    using namespace std::placeholders;
-    switch ( cat )
-    {
-    case organic_mat_category::Meat:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_meat ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().meat ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.meat, getter, mBuffer.food().meat_size() );
-    }
-    case organic_mat_category::Fish:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_fish ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().fish ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.fish, getter, mBuffer.food().fish_size() );
-    }
-    case organic_mat_category::UnpreparedFish:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_unprepared_fish ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().unprepared_fish ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.unprepared_fish, getter, mBuffer.food().unprepared_fish_size() );
-    }
-    case organic_mat_category::Eggs:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_egg ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().egg ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.egg, getter, mBuffer.food().egg_size() );
-    }
-    case organic_mat_category::Plants:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_plants ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().plants ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.plants, getter, mBuffer.food().plants_size() );
-    }
-    case organic_mat_category::PlantDrink:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_drink_plant ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().drink_plant ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.drink_plant, getter, mBuffer.food().drink_plant_size() );
-    }
-    case organic_mat_category::CreatureDrink:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_drink_animal ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().drink_animal ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.drink_animal, getter, mBuffer.food().drink_animal_size() );
-    }
-    case organic_mat_category::PlantCheese:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_cheese_plant ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().cheese_plant ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.cheese_plant, getter, mBuffer.food().cheese_plant_size() );
-    }
-    case organic_mat_category::CreatureCheese:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_cheese_animal ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().cheese_animal ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.cheese_animal, getter, mBuffer.food().cheese_animal_size() );
-    }
-    case organic_mat_category::Seed:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_seeds ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().seeds ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.seeds, getter, mBuffer.food().seeds_size() );
-    }
-    case organic_mat_category::Leaf:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_leaves ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().leaves ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.leaves, getter, mBuffer.food().leaves_size() );
-    }
-    case organic_mat_category::PlantPowder:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_powder_plant ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().powder_plant ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.powder_plant, getter, mBuffer.food().powder_plant_size() );
-    }
-    case organic_mat_category::CreaturePowder:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_powder_creature ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().powder_creature ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.powder_creature, getter, mBuffer.food().powder_creature_size() );
-    }
-    case organic_mat_category::Glob:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_glob ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().glob ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.glob, getter, mBuffer.food().glob_size() );
-    }
-    case organic_mat_category::PlantLiquid:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_liquid_plant ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().liquid_plant ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.liquid_plant, getter, mBuffer.food().liquid_plant_size() );
-    }
-    case organic_mat_category::CreatureLiquid:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_liquid_animal ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().liquid_animal ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.liquid_animal, getter, mBuffer.food().liquid_animal_size() );
-    }
-    case organic_mat_category::MiscLiquid:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_liquid_misc ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().liquid_misc ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.liquid_misc, getter, mBuffer.food().liquid_misc_size() );
-    }
-
-    case organic_mat_category::Paste:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_glob_paste ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().glob_paste ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.glob_paste, getter, mBuffer.food().glob_paste_size() );
-    }
-    case organic_mat_category::Pressed:
-    {
-        FuncWriteExport setter = [=] ( const std::string &id )
-        {
-            mBuffer.mutable_food()->add_glob_pressed ( id );
-        };
-        FuncReadImport getter = [=] ( size_t idx ) -> std::string { return mBuffer.food().glob_pressed ( idx ); };
-        return food_pair ( setter, &mPile->settings.food.glob_pressed, getter, mBuffer.food().glob_pressed_size() );
-    }
-    case organic_mat_category::Leather:
-    case organic_mat_category::Silk:
-    case organic_mat_category::PlantFiber:
-    case organic_mat_category::Bone:
-    case organic_mat_category::Shell:
-    case organic_mat_category::Wood:
-    case organic_mat_category::Horn:
-    case organic_mat_category::Pearl:
-    case organic_mat_category::Tooth:
-    case organic_mat_category::EdibleCheese:
-    case organic_mat_category::AnyDrink:
-    case organic_mat_category::EdiblePlant:
-    case organic_mat_category::CookableLiquid:
-    case organic_mat_category::CookablePowder:
-    case organic_mat_category::CookableSeed:
-    case organic_mat_category::CookableLeaf:
-    case organic_mat_category::Yarn:
-    case organic_mat_category::MetalThread:
-    default:
-        // not used in stockpile food menu
-        break;
-    }
-    return food_pair();
-}
-
-
-void StockpileSerializer::write_food()
-{
-    StockpileSettings::FoodSet *food = mBuffer.mutable_food();
-    debug() <<  " food: " <<  endl;
-    food->set_prepared_meals ( mPile->settings.food.prepared_meals );
-
-    using df::enums::organic_mat_category::organic_mat_category;
-    using traits = df::enum_traits<organic_mat_category>;
-    for ( int32_t mat_category = traits::first_item_value; mat_category <traits::last_item_value; ++mat_category )
-    {
-        food_pair p = food_map ( ( organic_mat_category ) mat_category );
-        if ( !p.valid ) continue;
-        debug() <<  " food: " <<  traits::key_table[mat_category] <<  endl;
-        serialize_list_organic_mat ( p.set_value, p.stockpile_values, ( organic_mat_category ) mat_category );
-    }
-}
-
-
-void StockpileSerializer::read_food()
-{
-    using df::enums::organic_mat_category::organic_mat_category;
-    using traits = df::enum_traits<organic_mat_category>;
-    if ( mBuffer.has_food() )
-    {
-        mPile->settings.flags.bits.food = 1;
-        const StockpileSettings::FoodSet food = mBuffer.food();
-        debug() << "food:" <<endl;
-
-        if ( food.has_prepared_meals() )
-            mPile->settings.food.prepared_meals = food.prepared_meals();
-        else
-            mPile->settings.food.prepared_meals = true;
-
-        debug() <<  "  prepared_meals: " <<  mPile->settings.food.prepared_meals << endl;
-
-        for ( int32_t mat_category = traits::first_item_value; mat_category <traits::last_item_value; ++mat_category )
-        {
-            food_pair p = food_map ( ( organic_mat_category ) mat_category );
-            if ( !p.valid ) continue;
-            unserialize_list_organic_mat ( p.get_value, p.serialized_count, p.stockpile_values, ( organic_mat_category ) mat_category );
-        }
-    }
-    else
-    {
-        for ( int32_t mat_category = traits::first_item_value; mat_category <traits::last_item_value; ++mat_category )
-        {
-            food_pair p = food_map ( ( organic_mat_category ) mat_category );
-            if ( !p.valid ) continue;
-            p.stockpile_values->clear();
-        }
-        mPile->settings.flags.bits.food = 0;
-        mPile->settings.food.prepared_meals = false;
-    }
-}
-
-void StockpileSerializer::furniture_setup_other_mats()
-{
-    mOtherMatsFurniture.insert ( std::make_pair ( 0,"WOOD" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 1,"PLANT_CLOTH" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 2,"BONE" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 3,"TOOTH" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 4,"HORN" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 5,"PEARL" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 6,"SHELL" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 7,"LEATHER" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 8,"SILK" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 9,"AMBER" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 10,"CORAL" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 11,"GREEN_GLASS" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 12,"CLEAR_GLASS" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 13,"CRYSTAL_GLASS" ) );
-    mOtherMatsFurniture.insert ( std::make_pair ( 14,"YARN" ) );
-}
-
-void StockpileSerializer::write_furniture()
-{
-    StockpileSettings::FurnitureSet *furniture= mBuffer.mutable_furniture();
-
-    // FURNITURE type
-    using df::enums::furniture_type::furniture_type;
-    using type_traits = df::enum_traits<furniture_type>;
-    for ( size_t i = 0; i < mPile->settings.furniture.type.size(); ++i )
-    {
-        if ( mPile->settings.furniture.type.at ( i ) )
-        {
-            std::string f_type ( type_traits::key_table[i] );
-            furniture->add_type ( f_type );
-            debug() << "furniture_type " << i << " is " << f_type <<endl;
-        }
-    }
-    // metal, stone/clay materials
-    FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::furniture_mat_is_allowed, this,  _1 );
-    serialize_list_material ( filter, [=] ( const std::string &token )
-    {
-        furniture->add_mats ( token );
-    },  mPile->settings.furniture.mats );
-
-    // other mats
-    serialize_list_other_mats ( mOtherMatsFurniture, [=] ( const std::string &token )
-    {
-        furniture->add_other_mats ( token );
-    }, mPile->settings.furniture.other_mats );
-
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        furniture->add_quality_core ( token );
-    },  mPile->settings.furniture.quality_core );
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        furniture->add_quality_total ( token );
-    },  mPile->settings.furniture.quality_total );
-}
-
-bool StockpileSerializer::furniture_mat_is_allowed ( const MaterialInfo &mi )
-{
-    return mi.isValid() && mi.material
-           && ( mi.material->flags.is_set ( material_flags::IS_METAL )
-                ||  mi.material->flags.is_set ( material_flags::IS_STONE ) );
-}
-
-void StockpileSerializer::read_furniture()
-{
-    if ( mBuffer.has_furniture() )
-    {
-        mPile->settings.flags.bits.furniture = 1;
-        const StockpileSettings::FurnitureSet furniture = mBuffer.furniture();
-        debug() << "furniture:" <<endl;
-
-        // type
-        using df::enums::furniture_type::furniture_type;
-        df::enum_traits<furniture_type> type_traits;
-        mPile->settings.furniture.type.clear();
-        mPile->settings.furniture.type.resize ( type_traits.last_item_value+1,  '\0' );
-        if ( furniture.type_size() > 0 )
-        {
-            for ( int i = 0; i < furniture.type_size(); ++i )
-            {
-                const std::string type = furniture.type ( i );
-                df::enum_traits<furniture_type>::base_type idx = linear_index ( debug(), type_traits, type );
-                debug() << "   type " << idx << " is " << type << endl;
-                if ( idx < 0 ||  size_t(idx) >=  mPile->settings.furniture.type.size() )
-                {
-                    debug() <<  "WARNING: furniture type index invalid " << type <<  ", idx=" << idx <<  endl;
-                    continue;
-                }
-                mPile->settings.furniture.type.at ( idx ) = 1;
-            }
-        }
-
-        FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::furniture_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return furniture.mats ( idx );
-        },  furniture.mats_size(),  &mPile->settings.furniture.mats );
-
-        // other materials
-        unserialize_list_other_mats ( mOtherMatsFurniture,  [=] ( const size_t & idx ) -> const std::string&
-        {
-            return furniture.other_mats ( idx );
-        },  furniture.other_mats_size(),  &mPile->settings.furniture.other_mats );
-
-        // core quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return furniture.quality_core ( idx );
-        },  furniture.quality_core_size(),  mPile->settings.furniture.quality_core );
-
-        // total quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return furniture.quality_total ( idx );
-        },  furniture.quality_total_size(),  mPile->settings.furniture.quality_total );
-
-    }
-    else
-    {
-        mPile->settings.flags.bits.furniture = 0;
-        mPile->settings.furniture.type.clear();
-        mPile->settings.furniture.other_mats.clear();
-        mPile->settings.furniture.mats.clear();
-        quality_clear ( mPile->settings.furniture.quality_core );
-        quality_clear ( mPile->settings.furniture.quality_total );
-    }
-}
-
-bool StockpileSerializer::refuse_creature_is_allowed ( const df::creature_raw *raw )
-{
-    if ( !raw ) return false;
-    // wagon and generated creatures not allowed,  except angels
-    const bool is_wagon = raw->creature_id == "EQUIPMENT_WAGON";
-    const bool is_generated = raw->flags.is_set ( creature_raw_flags::GENERATED );
-    const bool is_angel = is_generated && raw->creature_id.find ( "DIVINE_" ) != std::string::npos;
-    return !is_wagon && ! ( is_generated && !is_angel );
-}
-
-void StockpileSerializer::refuse_write_helper ( std::function<void ( const string & ) > add_value, const vector<char> & list )
-{
-    for ( size_t i = 0; i < list.size(); ++i )
-    {
-        if ( list.at ( i ) == 1 )
-        {
-            df::creature_raw* r = find_creature ( i );
-            // skip forgotten beasts, titans, demons, and night creatures
-            if ( !refuse_creature_is_allowed ( r ) ) continue;
-            debug() << "creature "<< r->creature_id << " " << i << endl;
-            add_value ( r->creature_id );
-        }
-    }
-}
-
-bool StockpileSerializer::refuse_type_is_allowed ( item_type::item_type type )
-{
-    if ( type ==  item_type::NONE
-            || type ==  item_type::BAR
-            || type ==  item_type::SMALLGEM
-            || type ==  item_type::BLOCKS
-            || type ==  item_type::ROUGH
-            || type ==  item_type::BOULDER
-            || type ==  item_type::CORPSE
-            || type ==  item_type::CORPSEPIECE
-            || type ==  item_type::ROCK
-            || type ==  item_type::ORTHOPEDIC_CAST
-       ) return false;
-    return true;
+static bool armor_mat_is_allowed(const MaterialInfo& mi) {
+    return mi.isValid() && mi.material && mi.material->flags.is_set(material_flags::IS_METAL);
 }
 
+bool StockpileSettingsSerializer::write_armor(color_ostream& out, StockpileSettings::ArmorSet* armor) {
 
-void StockpileSerializer::write_refuse()
-{
-    StockpileSettings::RefuseSet *refuse = mBuffer.mutable_refuse();
-    refuse->set_fresh_raw_hide ( mPile->settings.refuse.fresh_raw_hide );
-    refuse->set_rotten_raw_hide ( mPile->settings.refuse.rotten_raw_hide );
-
-    // type
-    FuncItemAllowed filter = std::bind ( &StockpileSerializer::refuse_type_is_allowed, this,  _1 );
-    serialize_list_item_type ( filter, [=] ( const std::string &token )
-    {
-        refuse->add_type ( token );
-    },  mPile->settings.refuse.type );
+    auto & parmor = mSettings->armor;
+    bool all = parmor.unusable && parmor.usable;
 
-    // corpses
-    refuse_write_helper ( [=] ( const std::string &id )
-    {
-        refuse->add_corpses ( id );
-    }, mPile->settings.refuse.corpses );
-    // body_parts
-    refuse_write_helper ( [=] ( const std::string &id )
-    {
-        refuse->add_body_parts ( id );
-    }, mPile->settings.refuse.body_parts );
-    // skulls
-    refuse_write_helper ( [=] ( const std::string &id )
-    {
-        refuse->add_skulls ( id );
-    }, mPile->settings.refuse.skulls );
-    // bones
-    refuse_write_helper ( [=] ( const std::string &id )
-    {
-        refuse->add_bones ( id );
-    }, mPile->settings.refuse.bones );
-    // hair
-    refuse_write_helper ( [=] ( const std::string &id )
-    {
-        refuse->add_hair ( id );
-    }, mPile->settings.refuse.hair );
-    // shells
-    refuse_write_helper ( [=] ( const std::string &id )
-    {
-        refuse->add_shells ( id );
-    }, mPile->settings.refuse.shells );
-    // teeth
-    refuse_write_helper ( [=] ( const std::string &id )
-    {
-        refuse->add_teeth ( id );
-    }, mPile->settings.refuse.teeth );
-    // horns
-    refuse_write_helper ( [=] ( const std::string &id )
-    {
-        refuse->add_horns ( id );
-    }, mPile->settings.refuse.horns );
-}
-
-void StockpileSerializer::refuse_read_helper ( std::function<std::string ( const size_t& ) > get_value, size_t list_size, std::vector<char>* pile_list )
-{
-    pile_list->clear();
-    pile_list->resize ( world->raws.creatures.all.size(),  '\0' );
-    if ( list_size > 0 )
-    {
-        for ( size_t i = 0; i < list_size; ++i )
-        {
-            const std::string creature_id = get_value ( i );
-            const int idx = find_creature ( creature_id );
-            const df::creature_raw* creature = find_creature ( idx );
-            if ( idx < 0 ||  !refuse_creature_is_allowed ( creature ) ||  size_t(idx) >=  pile_list->size() )
-            {
-                debug() << "WARNING invalid refuse creature " << creature_id << ",  idx=" <<  idx <<  endl;
-                continue;
-            }
-            debug() << "      creature " << idx << " is " << creature_id << endl;
-            pile_list->at ( idx ) = 1;
-        }
-    }
-}
-
-
-
-void StockpileSerializer::read_refuse()
-{
-    if ( mBuffer.has_refuse() )
-    {
-        mPile->settings.flags.bits.refuse = 1;
-        const StockpileSettings::RefuseSet refuse = mBuffer.refuse();
-        debug() << "refuse: " <<endl;
-        debug() <<  "  fresh hide " <<  refuse.fresh_raw_hide() << endl;
-        debug() <<  "  rotten hide " << refuse.rotten_raw_hide() << endl;
-        mPile->settings.refuse.fresh_raw_hide =  refuse.fresh_raw_hide();
-        mPile->settings.refuse.rotten_raw_hide =  refuse.rotten_raw_hide();
-
-        // type
-        FuncItemAllowed filter = std::bind ( &StockpileSerializer::refuse_type_is_allowed, this,  _1 );
-        unserialize_list_item_type ( filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return refuse.type ( idx );
-        },  refuse.type_size(),  &mPile->settings.refuse.type );
-
-        // corpses
-        debug() << "  corpses" << endl;
-        refuse_read_helper ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return refuse.corpses ( idx );
-        }, refuse.corpses_size(), &mPile->settings.refuse.corpses );
-        // body_parts
-        debug() << "  body_parts" << endl;
-        refuse_read_helper ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return refuse.body_parts ( idx );
-        }, refuse.body_parts_size(),  &mPile->settings.refuse.body_parts );
-        // skulls
-        debug() << "  skulls" << endl;
-        refuse_read_helper ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return refuse.skulls ( idx );
-        }, refuse.skulls_size(),  &mPile->settings.refuse.skulls );
-        // bones
-        debug() << "  bones" << endl;
-        refuse_read_helper ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return refuse.bones ( idx );
-        }, refuse.bones_size(),  &mPile->settings.refuse.bones );
-        // hair
-        debug() << "  hair" << endl;
-        refuse_read_helper ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return refuse.hair ( idx );
-        }, refuse.hair_size(),  &mPile->settings.refuse.hair );
-        // shells
-        debug() << "  shells" << endl;
-        refuse_read_helper ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return refuse.shells ( idx );
-        }, refuse.shells_size(),  &mPile->settings.refuse.shells );
-        // teeth
-        debug() << "  teeth" << endl;
-        refuse_read_helper ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return refuse.teeth ( idx );
-        }, refuse.teeth_size(),  &mPile->settings.refuse.teeth );
-        // horns
-        debug() << "  horns" << endl;
-        refuse_read_helper ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return refuse.horns ( idx );
-        }, refuse.horns_size(),  &mPile->settings.refuse.horns );
-    }
-    else
-    {
-        mPile->settings.flags.bits.refuse = 0;
-        mPile->settings.refuse.type.clear();
-        mPile->settings.refuse.corpses.clear();
-        mPile->settings.refuse.body_parts.clear();
-        mPile->settings.refuse.skulls.clear();
-        mPile->settings.refuse.bones.clear();
-        mPile->settings.refuse.hair.clear();
-        mPile->settings.refuse.shells.clear();
-        mPile->settings.refuse.teeth.clear();
-        mPile->settings.refuse.horns.clear();
-        mPile->settings.refuse.fresh_raw_hide = false;
-        mPile->settings.refuse.rotten_raw_hide = false;
-    }
-}
-
-bool StockpileSerializer::stone_is_allowed ( const MaterialInfo &mi )
-{
-    if ( !mi.isValid() ) return false;
-    const bool is_allowed_soil = mi.inorganic->flags.is_set ( inorganic_flags::SOIL ) && !mi.inorganic->flags.is_set ( inorganic_flags::AQUIFER );
-    const bool is_allowed_stone = mi.material->flags.is_set ( material_flags::IS_STONE ) && !mi.material->flags.is_set ( material_flags::NO_STONE_STOCKPILE );
-    return is_allowed_soil ||  is_allowed_stone;
-}
+    armor->set_unusable(parmor.unusable);
+    armor->set_usable(parmor.usable);
 
-void StockpileSerializer::write_stone()
-{
-    StockpileSettings::StoneSet *stone= mBuffer.mutable_stone();
-
-    FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::stone_is_allowed, this,  _1 );
-    serialize_list_material ( filter, [=] ( const std::string &token )
-    {
-        stone->add_mats ( token );
-    },  mPile->settings.stone.mats );
-}
+    // armor type
+    all = serialize_list_itemdef(out,
+        [&](const string& token) { armor->add_body(token); },
+        parmor.body,
+        vector<df::itemdef*>(world->raws.itemdefs.armor.begin(), world->raws.itemdefs.armor.end()),
+        item_type::ARMOR) && all;
 
-void StockpileSerializer::read_stone()
-{
-    if ( mBuffer.has_stone() )
-    {
-        mPile->settings.flags.bits.stone = 1;
-        const StockpileSettings::StoneSet stone = mBuffer.stone();
-        debug() << "stone: " <<endl;
+    // helm type
+    all = serialize_list_itemdef(out,
+        [&](const string& token) { armor->add_head(token); },
+        parmor.head,
+        vector<df::itemdef*>(world->raws.itemdefs.helms.begin(), world->raws.itemdefs.helms.end()),
+        item_type::HELM) && all;
 
-        FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::stone_is_allowed, this,  _1 );
-        unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return stone.mats ( idx );
-        },  stone.mats_size(),  &mPile->settings.stone.mats );
-    }
-    else
-    {
-        mPile->settings.flags.bits.stone = 0;
-        mPile->settings.stone.mats.clear();
-    }
-}
+    // shoes type
+    all = serialize_list_itemdef(out,
+        [&](const string& token) { armor->add_feet(token); },
+        parmor.feet,
+        vector<df::itemdef*>(world->raws.itemdefs.shoes.begin(), world->raws.itemdefs.shoes.end()),
+        item_type::SHOES) && all;
 
-bool StockpileSerializer::ammo_mat_is_allowed ( const MaterialInfo &mi )
-{
-    return mi.isValid() && mi.material && mi.material->flags.is_set ( material_flags::IS_METAL );
-}
+    // gloves type
+    all = serialize_list_itemdef(out,
+        [&](const string& token) { armor->add_hands(token); },
+        parmor.hands,
+        vector<df::itemdef*>(world->raws.itemdefs.gloves.begin(), world->raws.itemdefs.gloves.end()),
+        item_type::GLOVES) && all;
 
-void StockpileSerializer::write_ammo()
-{
-    StockpileSettings::AmmoSet *ammo = mBuffer.mutable_ammo();
+    // pant type
+    all = serialize_list_itemdef(out,
+        [&](const string& token) { armor->add_legs(token); },
+        parmor.legs,
+        vector<df::itemdef*>(world->raws.itemdefs.pants.begin(), world->raws.itemdefs.pants.end()),
+        item_type::PANTS) && all;
 
-    //  ammo type
-    serialize_list_itemdef ( [=] ( const std::string &token )
-    {
-        ammo->add_type ( token );
-    },  mPile->settings.ammo.type,
-    std::vector<df::itemdef*> ( world->raws.itemdefs.ammo.begin(),world->raws.itemdefs.ammo.end() ),
-    item_type::AMMO );
-
-    // metal
-    FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::ammo_mat_is_allowed, this,  _1 );
-    serialize_list_material ( filter, [=] ( const std::string &token )
-    {
-        ammo->add_mats ( token );
-    },  mPile->settings.ammo.mats );
+    // shield type
+    all = serialize_list_itemdef(out,
+        [&](const string& token) { armor->add_shield(token); },
+        parmor.shield,
+        vector<df::itemdef*>(world->raws.itemdefs.shields.begin(), world->raws.itemdefs.shields.end()),
+        item_type::SHIELD) && all;
 
-    // other mats - only wood and bone
-    if ( mPile->settings.ammo.other_mats.size() > 2 )
-    {
-        debug() << "WARNING: ammo other materials > 2! " <<  mPile->settings.ammo.other_mats.size() <<  endl;
-    }
+    // materials
+    all = serialize_list_material(out,
+        armor_mat_is_allowed,
+        [&](const string& token) { armor->add_mats(token); },
+        parmor.mats) && all;
 
-    for ( size_t i = 0; i < std::min ( size_t ( 2 ), mPile->settings.ammo.other_mats.size() ); ++i )
-    {
-        if ( !mPile->settings.ammo.other_mats.at ( i ) )
-            continue;
-        const std::string token = i ==  0  ?  "WOOD"  :  "BONE";
-        ammo->add_other_mats ( token );
-        debug() << "  other mats " << i << " is " << token << endl;
-    }
+    // other mats
+    all = serialize_list_other_mats(out,
+        mOtherMatsWeaponsArmor.mats, [&](const string& token) { armor->add_other_mats(token); },
+        parmor.other_mats) && all;
 
     // quality core
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        ammo->add_quality_core ( token );
-    },  mPile->settings.ammo.quality_core );
+    all = serialize_list_quality(out, [&](const string& token) { armor->add_quality_core(token); },
+        parmor.quality_core) && all;
 
     // quality total
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        ammo->add_quality_total ( token );
-    },  mPile->settings.ammo.quality_total );
-}
-
-void StockpileSerializer::read_ammo()
-{
-    if ( mBuffer.has_ammo() )
-    {
-        mPile->settings.flags.bits.ammo = 1;
-        const StockpileSettings::AmmoSet ammo = mBuffer.ammo();
-        debug() << "ammo: " <<endl;
-
-        //  ammo type
-        unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return ammo.type ( idx );
-        },  ammo.type_size(),  &mPile->settings.ammo.type,  item_type::AMMO );
-
-        //  materials metals
-        FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::ammo_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return ammo.mats ( idx );
-        },  ammo.mats_size(),  &mPile->settings.ammo.mats );
-
-        //  others
-        mPile->settings.ammo.other_mats.clear();
-        mPile->settings.ammo.other_mats.resize ( 2,  '\0' );
-        if ( ammo.other_mats_size() > 0 )
-        {
-            // TODO remove hardcoded value
-            for ( int i = 0; i < ammo.other_mats_size(); ++i )
-            {
-                const std::string token = ammo.other_mats ( i );
-                const int32_t idx = token ==  "WOOD"  ?  0 :  token ==  "BONE"  ? 1 : -1;
-                debug() << "   other mats " << idx << " is " << token << endl;
-                if ( idx !=  -1 )
-                    mPile->settings.ammo.other_mats.at ( idx ) = 1;
-            }
-        }
+    all = serialize_list_quality(out, [&](const string& token) { armor->add_quality_total(token); },
+        parmor.quality_total) && all;
+
+    return all;
+}
 
-        // core quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return ammo.quality_core ( idx );
-        },  ammo.quality_core_size(),  mPile->settings.ammo.quality_core );
-
-        // total quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return ammo.quality_total ( idx );
-        },  ammo.quality_total_size(),  mPile->settings.ammo.quality_total );
-    }
-    else
-    {
-        mPile->settings.flags.bits.ammo = 0;
-        mPile->settings.ammo.type.clear();
-        mPile->settings.ammo.mats.clear();
-        mPile->settings.ammo.other_mats.clear();
-        quality_clear ( mPile->settings.ammo.quality_core );
-        quality_clear ( mPile->settings.ammo.quality_total );
-    }
-}
-
-bool StockpileSerializer::coins_mat_is_allowed ( const MaterialInfo &mi )
-{
+void StockpileSettingsSerializer::read_armor(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & parmor = mSettings->armor;
+    read_category<StockpileSettings_ArmorSet>(out, "armor", mode,
+        std::bind(&StockpileSettings::has_armor, mBuffer),
+        std::bind(&StockpileSettings::armor, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_armor,
+        [&]() {
+            parmor.unusable = false;
+            parmor.usable = false;
+            parmor.body.clear();
+            parmor.head.clear();
+            parmor.feet.clear();
+            parmor.hands.clear();
+            parmor.legs.clear();
+            parmor.shield.clear();
+            parmor.other_mats.clear();
+            parmor.mats.clear();
+            quality_clear(parmor.quality_core);
+            quality_clear(parmor.quality_total);
+        },
+        [&](bool all, char val) {
+            auto & barmor = mBuffer.armor();
+
+            set_flag(out, "nouse", filters, all, val, barmor.unusable(), parmor.unusable);
+            set_flag(out, "canuse", filters, all, val, barmor.usable(), parmor.usable);
+
+            unserialize_list_itemdef(out, "body", all, val, filters,
+                [&](const size_t& idx) -> const string& { return barmor.body(idx); },
+                barmor.body_size(), parmor.body, item_type::ARMOR);
+
+            unserialize_list_itemdef(out, "head", all, val, filters,
+                [&](const size_t& idx) -> const string& { return barmor.head(idx); },
+                barmor.head_size(), parmor.head, item_type::HELM);
+
+            unserialize_list_itemdef(out, "feet", all, val, filters,
+                [&](const size_t& idx) -> const string& { return barmor.feet(idx); },
+                barmor.feet_size(), parmor.feet, item_type::SHOES);
+
+            unserialize_list_itemdef(out, "hands", all, val, filters,
+                [&](const size_t& idx) -> const string& { return barmor.hands(idx); },
+                barmor.hands_size(), parmor.hands, item_type::GLOVES);
+
+            unserialize_list_itemdef(out, "legs", all, val, filters,
+                [&](const size_t& idx) -> const string& { return barmor.legs(idx); },
+                barmor.legs_size(), parmor.legs, item_type::PANTS);
+
+            unserialize_list_itemdef(out, "shield", all, val, filters,
+                [&](const size_t& idx) -> const string& { return barmor.shield(idx); },
+                barmor.shield_size(), parmor.shield, item_type::SHIELD);
+
+            unserialize_list_material(out, "mats", all, val, filters,
+                armor_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return barmor.mats(idx); },
+                barmor.mats_size(), parmor.mats);
+
+            unserialize_list_other_mats(out, "other", all, val, filters,
+                mOtherMatsWeaponsArmor.mats, [&](const size_t& idx) -> const string& { return barmor.other_mats(idx); },
+                barmor.other_mats_size(), parmor.other_mats);
+
+            unserialize_list_quality(out, "core", all, val, filters,
+                [&](const size_t& idx) -> const string& { return barmor.quality_core(idx); },
+                barmor.quality_core_size(), parmor.quality_core);
+
+            unserialize_list_quality(out, "total", all, val, filters,
+                [&](const size_t& idx) -> const string& { return barmor.quality_total(idx); },
+                barmor.quality_total_size(), parmor.quality_total);
+        });
+}
+
+static bool bars_mat_is_allowed(const MaterialInfo& mi) {
+    return mi.isValid() && mi.material && mi.material->flags.is_set(material_flags::IS_METAL);
+}
+
+static bool blocks_mat_is_allowed(const MaterialInfo& mi) {
+    return mi.isValid() && mi.material && (mi.material->flags.is_set(material_flags::IS_METAL) || mi.material->flags.is_set(material_flags::IS_STONE));
+}
+
+bool StockpileSettingsSerializer::write_bars_blocks(color_ostream& out, StockpileSettings::BarsBlocksSet* bars_blocks) {
+    bool all = serialize_list_material(out,
+        bars_mat_is_allowed,
+        [&](const string& token) { bars_blocks->add_bars_mats(token); },
+        mSettings->bars_blocks.bars_mats);
+
+    all = serialize_list_material(out,
+        blocks_mat_is_allowed,
+        [&](const string& token) { bars_blocks->add_blocks_mats(token); },
+        mSettings->bars_blocks.blocks_mats) && all;
+
+    all = serialize_list_other_mats(out,
+        mOtherMatsBars.mats, [&](const string& token) { bars_blocks->add_bars_other_mats(token); },
+        mSettings->bars_blocks.bars_other_mats) && all;
+
+    all = serialize_list_other_mats(out,
+        mOtherMatsBlocks.mats, [&](const string& token) { bars_blocks->add_blocks_other_mats(token); },
+        mSettings->bars_blocks.blocks_other_mats) && all;
+
+    return all;
+}
+
+void StockpileSettingsSerializer::read_bars_blocks(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pbarsblocks = mSettings->bars_blocks;
+    read_category<StockpileSettings_BarsBlocksSet>(out, "bars_blocks", mode,
+        std::bind(&StockpileSettings::has_barsblocks, mBuffer),
+        std::bind(&StockpileSettings::barsblocks, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_bars_blocks,
+        [&]() {
+            pbarsblocks.bars_mats.clear();
+            pbarsblocks.bars_other_mats.clear();
+            pbarsblocks.blocks_mats.clear();
+            pbarsblocks.blocks_other_mats.clear();
+        },
+        [&](bool all, char val) {
+            auto & bbarsblocks = mBuffer.barsblocks();
+
+            unserialize_list_material(out, "mats/bars", all, val, filters, bars_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return bbarsblocks.bars_mats(idx); },
+                bbarsblocks.bars_mats_size(), pbarsblocks.bars_mats);
+
+            unserialize_list_other_mats(out, "other/bars", all, val, filters,
+                mOtherMatsBars.mats,
+                [&](const size_t& idx) -> const string& { return bbarsblocks.bars_other_mats(idx); },
+                bbarsblocks.bars_other_mats_size(), pbarsblocks.bars_other_mats);
+
+            unserialize_list_material(out, "mats/blocks", all, val, filters,
+                blocks_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return bbarsblocks.blocks_mats(idx); },
+                bbarsblocks.blocks_mats_size(), pbarsblocks.blocks_mats);
+
+            unserialize_list_other_mats(out, "other/blocks", all, val, filters,
+                mOtherMatsBlocks.mats,
+                [&](const size_t& idx) -> const string& { return bbarsblocks.blocks_other_mats(idx); },
+                bbarsblocks.blocks_other_mats_size(), pbarsblocks.blocks_other_mats);
+        });
+}
+
+bool StockpileSettingsSerializer::write_cloth(color_ostream& out, StockpileSettings::ClothSet* cloth) {
+    bool all = true;
+
+    all = serialize_list_organic_mat(out,
+        [&](const string& token) { cloth->add_thread_silk(token); },
+        &mSettings->cloth.thread_silk, organic_mat_category::Silk) && all;
+
+    all = serialize_list_organic_mat(out,
+        [&](const string& token) { cloth->add_thread_plant(token); },
+        &mSettings->cloth.thread_plant, organic_mat_category::PlantFiber) && all;
+
+    all = serialize_list_organic_mat(out,
+        [&](const string& token) { cloth->add_thread_yarn(token); },
+        &mSettings->cloth.thread_yarn, organic_mat_category::Yarn) && all;
+
+    all = serialize_list_organic_mat(out,
+        [&](const string& token) { cloth->add_thread_metal(token); },
+        &mSettings->cloth.thread_metal, organic_mat_category::MetalThread) && all;
+
+    all = serialize_list_organic_mat(out,
+        [&](const string& token) { cloth->add_cloth_silk(token); },
+        &mSettings->cloth.cloth_silk, organic_mat_category::Silk) && all;
+
+    all = serialize_list_organic_mat(out,
+        [&](const string& token) { cloth->add_cloth_plant(token); },
+        &mSettings->cloth.cloth_plant, organic_mat_category::PlantFiber) && all;
+
+    all = serialize_list_organic_mat(out,
+        [&](const string& token) { cloth->add_cloth_yarn(token); },
+        &mSettings->cloth.cloth_yarn, organic_mat_category::Yarn) && all;
+
+    all = serialize_list_organic_mat(out,
+        [&](const string& token) { cloth->add_cloth_metal(token); },
+        &mSettings->cloth.cloth_metal, organic_mat_category::MetalThread) && all;
+
+    return all;
+}
+
+void StockpileSettingsSerializer::read_cloth(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pcloth = mSettings->cloth;
+    read_category<StockpileSettings_ClothSet>(out, "cloth", mode,
+        std::bind(&StockpileSettings::has_cloth, mBuffer),
+        std::bind(&StockpileSettings::cloth, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_cloth,
+        [&]() {
+            pcloth.thread_silk.clear();
+            pcloth.thread_yarn.clear();
+            pcloth.thread_plant.clear();
+            pcloth.thread_metal.clear();
+            pcloth.cloth_silk.clear();
+            pcloth.cloth_plant.clear();
+            pcloth.cloth_yarn.clear();
+            pcloth.cloth_metal.clear();
+        },
+        [&](bool all, char val) {
+            auto & bcloth = mBuffer.cloth();
+
+            unserialize_list_organic_mat(out, "thread/silk", all, val, filters,
+                [&](size_t idx) -> string { return bcloth.thread_silk(idx); },
+                bcloth.thread_silk_size(), pcloth.thread_silk, organic_mat_category::Silk);
+
+            unserialize_list_organic_mat(out, "thread/plant", all, val, filters,
+                [&](size_t idx) -> string { return bcloth.thread_plant(idx); },
+                bcloth.thread_plant_size(), pcloth.thread_plant, organic_mat_category::PlantFiber);
+
+            unserialize_list_organic_mat(out, "thread/yarn", all, val, filters,
+                [&](size_t idx) -> string { return bcloth.thread_yarn(idx); },
+                bcloth.thread_yarn_size(), pcloth.thread_yarn, organic_mat_category::Yarn);
+
+            unserialize_list_organic_mat(out, "thread/metal", all, val, filters,
+                [&](size_t idx) -> string { return bcloth.thread_metal(idx); },
+                bcloth.thread_metal_size(), pcloth.thread_metal, organic_mat_category::MetalThread);
+
+            unserialize_list_organic_mat(out, "cloth/silk", all, val, filters,
+                [&](size_t idx) -> string { return bcloth.cloth_silk(idx); },
+                bcloth.cloth_silk_size(), pcloth.cloth_silk, organic_mat_category::Silk);
+
+            unserialize_list_organic_mat(out, "cloth/plant", all, val, filters,
+                [&](size_t idx) -> string { return bcloth.cloth_plant(idx); },
+                bcloth.cloth_plant_size(), pcloth.cloth_plant, organic_mat_category::PlantFiber);
+
+            unserialize_list_organic_mat(out, "cloth/yarn", all, val, filters,
+                [&](size_t idx) -> string { return bcloth.cloth_yarn(idx); },
+                bcloth.cloth_yarn_size(), pcloth.cloth_yarn, organic_mat_category::Yarn);
+
+            unserialize_list_organic_mat(out, "cloth/metal", all, val, filters,
+                [&](size_t idx) -> string { return bcloth.cloth_metal(idx); },
+                bcloth.cloth_metal_size(), pcloth.cloth_metal, organic_mat_category::MetalThread);
+        });
+}
+
+static bool coins_mat_is_allowed(const MaterialInfo& mi) {
     return mi.isValid();
 }
 
-void StockpileSerializer::write_coins()
-{
-    StockpileSettings::CoinSet *coins = mBuffer.mutable_coin();
-    FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::coins_mat_is_allowed, this,  _1 );
-    serialize_list_material ( filter, [=] ( const std::string &token )
-    {
-        coins->add_mats ( token );
-    },  mPile->settings.coins.mats );
-}
-
-void StockpileSerializer::read_coins()
-{
-    if ( mBuffer.has_coin() )
-    {
-        mPile->settings.flags.bits.coins = 1;
-        const StockpileSettings::CoinSet coins = mBuffer.coin();
-        debug() << "coins: " <<endl;
-
-        FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::coins_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return coins.mats ( idx );
-        },  coins.mats_size(),  &mPile->settings.coins.mats );
-    }
-    else
-    {
-        mPile->settings.flags.bits.coins = 0;
-        mPile->settings.coins.mats.clear();
-    }
-}
-
-void StockpileSerializer::bars_blocks_setup_other_mats()
-{
-    mOtherMatsBars.insert ( std::make_pair ( 0,"COAL" ) );
-    mOtherMatsBars.insert ( std::make_pair ( 1,"POTASH" ) );
-    mOtherMatsBars.insert ( std::make_pair ( 2,"ASH" ) );
-    mOtherMatsBars.insert ( std::make_pair ( 3,"PEARLASH" ) );
-    mOtherMatsBars.insert ( std::make_pair ( 4,"SOAP" ) );
-
-    mOtherMatsBlocks.insert ( std::make_pair ( 0,"GREEN_GLASS" ) );
-    mOtherMatsBlocks.insert ( std::make_pair ( 1,"CLEAR_GLASS" ) );
-    mOtherMatsBlocks.insert ( std::make_pair ( 2,"CRYSTAL_GLASS" ) );
-    mOtherMatsBlocks.insert ( std::make_pair ( 3,"WOOD" ) );
-}
-
-bool StockpileSerializer::bars_mat_is_allowed ( const MaterialInfo &mi )
-{
-    return mi.isValid() && mi.material && mi.material->flags.is_set ( material_flags::IS_METAL );
-}
-
-bool StockpileSerializer::blocks_mat_is_allowed ( const MaterialInfo &mi )
-{
-    return mi.isValid() && mi.material
-           && ( mi.material->flags.is_set ( material_flags::IS_METAL )
-                ||  mi.material->flags.is_set ( material_flags::IS_STONE ) );
-}
-
-
-void StockpileSerializer::write_bars_blocks()
-{
-    StockpileSettings::BarsBlocksSet *bars_blocks = mBuffer.mutable_barsblocks();
-    MaterialInfo mi;
-    FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::bars_mat_is_allowed, this,  _1 );
-    serialize_list_material ( filter, [=] ( const std::string &token )
-    {
-        bars_blocks->add_bars_mats ( token );
-    },  mPile->settings.bars_blocks.bars_mats );
-
-    //  blocks mats
-    filter = std::bind ( &StockpileSerializer::blocks_mat_is_allowed, this,  _1 );
-    serialize_list_material ( filter, [=] ( const std::string &token )
-    {
-        bars_blocks->add_blocks_mats ( token );
-    },  mPile->settings.bars_blocks.blocks_mats );
-
-    //  bars other mats
-    serialize_list_other_mats ( mOtherMatsBars, [=] ( const std::string &token )
-    {
-        bars_blocks->add_bars_other_mats ( token );
-    }, mPile->settings.bars_blocks.bars_other_mats );
-
-    //  blocks other mats
-    serialize_list_other_mats ( mOtherMatsBlocks, [=] ( const std::string &token )
-    {
-        bars_blocks->add_blocks_other_mats ( token );
-    }, mPile->settings.bars_blocks.blocks_other_mats );
-}
-
-void StockpileSerializer::read_bars_blocks()
-{
-    if ( mBuffer.has_barsblocks() )
-    {
-        mPile->settings.flags.bits.bars_blocks = 1;
-        const StockpileSettings::BarsBlocksSet bars_blocks = mBuffer.barsblocks();
-        debug() << "bars_blocks: " <<endl;
-        // bars
-        FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::bars_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return bars_blocks.bars_mats ( idx );
-        },  bars_blocks.bars_mats_size(),  &mPile->settings.bars_blocks.bars_mats );
-
-        //  blocks
-        filter = std::bind ( &StockpileSerializer::blocks_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return bars_blocks.blocks_mats ( idx );
-        },  bars_blocks.blocks_mats_size(),  &mPile->settings.bars_blocks.blocks_mats );
-        //  bars other mats
-        unserialize_list_other_mats ( mOtherMatsBars,  [=] ( const size_t & idx ) -> const std::string&
-        {
-            return bars_blocks.bars_other_mats ( idx );
-        },  bars_blocks.bars_other_mats_size(),  &mPile->settings.bars_blocks.bars_other_mats );
-
-
-        //  blocks other mats
-        unserialize_list_other_mats ( mOtherMatsBlocks,  [=] ( const size_t & idx ) -> const std::string&
-        {
-            return bars_blocks.blocks_other_mats ( idx );
-        },  bars_blocks.blocks_other_mats_size(),  &mPile->settings.bars_blocks.blocks_other_mats );
-
-    }
-    else
-    {
-        mPile->settings.flags.bits.bars_blocks = 0;
-        mPile->settings.bars_blocks.bars_other_mats.clear();
-        mPile->settings.bars_blocks.bars_mats.clear();
-        mPile->settings.bars_blocks.blocks_other_mats.clear();
-        mPile->settings.bars_blocks.blocks_mats.clear();
-    }
-}
-
-bool StockpileSerializer::gem_mat_is_allowed ( const MaterialInfo &mi )
-{
-    return mi.isValid() && mi.material && mi.material->flags.is_set ( material_flags::IS_GEM );
-}
-bool StockpileSerializer::gem_cut_mat_is_allowed ( const MaterialInfo &mi )
-{
-    return mi.isValid() && mi.material && ( mi.material->flags.is_set ( material_flags::IS_GEM ) || mi.material->flags.is_set ( material_flags::IS_STONE ) ) ;
-}
-bool StockpileSerializer::gem_other_mat_is_allowed ( MaterialInfo &mi )
-{
-    return mi.isValid() && ( mi.getToken() ==  "GLASS_GREEN" ||  mi.getToken() == "GLASS_CLEAR" || mi.getToken() ==  "GLASS_CRYSTAL" );
-}
-
-void StockpileSerializer::write_gems()
-{
-    StockpileSettings::GemsSet *gems = mBuffer.mutable_gems();
-    MaterialInfo mi;
-    // rough mats
-    FuncMaterialAllowed filter_rough = std::bind ( &StockpileSerializer::gem_mat_is_allowed, this,  _1 );
-    serialize_list_material ( filter_rough, [=] ( const std::string &token )
-    {
-        gems->add_rough_mats ( token );
-    },  mPile->settings.gems.rough_mats );
-    // cut mats
-    FuncMaterialAllowed filter_cut = std::bind ( &StockpileSerializer::gem_cut_mat_is_allowed, this,  _1 );
-    serialize_list_material ( filter_cut, [=] ( const std::string &token )
-    {
-        gems->add_cut_mats ( token );
-    },  mPile->settings.gems.cut_mats );
-    //  rough other
-    for ( size_t i = 0; i < mPile->settings.gems.rough_other_mats.size(); ++i )
-    {
-        if ( mPile->settings.gems.rough_other_mats.at ( i ) )
-        {
-            mi.decode ( i, -1 );
-            if ( !gem_other_mat_is_allowed ( mi ) ) continue;
-            debug() << "   gem rough_other mat" << i << " is " << mi.getToken() << endl;
-            gems->add_rough_other_mats ( mi.getToken() );
-        }
-    }
-    //  cut other
-    for ( size_t i = 0; i < mPile->settings.gems.cut_other_mats.size(); ++i )
-    {
-        if ( mPile->settings.gems.cut_other_mats.at ( i ) )
-        {
-            mi.decode ( i, -1 );
-            if ( !mi.isValid() ) mi.decode ( 0, i );
-            if ( !gem_other_mat_is_allowed ( mi ) ) continue;
-            debug() << "   gem cut_other mat" << i << " is " << mi.getToken() << endl;
-            gems->add_cut_other_mats ( mi.getToken() );
-        }
-    }
+bool StockpileSettingsSerializer::write_coins(color_ostream& out, StockpileSettings::CoinSet* coins) {
+    return serialize_list_material(out,
+        coins_mat_is_allowed,
+        [&](const string& token) { coins->add_mats(token); },
+        mSettings->coins.mats);
 }
 
-void StockpileSerializer::read_gems()
-{
-    if ( mBuffer.has_gems() )
-    {
-        mPile->settings.flags.bits.gems = 1;
-        const StockpileSettings::GemsSet gems = mBuffer.gems();
-        debug() << "gems: " <<endl;
-        // rough
-        FuncMaterialAllowed filter_rough = std::bind ( &StockpileSerializer::gem_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( filter_rough, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return gems.rough_mats ( idx );
-        },  gems.rough_mats_size(),  &mPile->settings.gems.rough_mats );
-
-        // cut
-        FuncMaterialAllowed filter_cut = std::bind ( &StockpileSerializer::gem_cut_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( filter_cut, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return gems.cut_mats ( idx );
-        },  gems.cut_mats_size(), &mPile->settings.gems.cut_mats );
-
-        const size_t builtin_size = std::extent<decltype ( world->raws.mat_table.builtin ) >::value;
-        // rough other
-        mPile->settings.gems.rough_other_mats.clear();
-        mPile->settings.gems.rough_other_mats.resize ( builtin_size, '\0' );
-        for ( int i = 0; i < gems.rough_other_mats_size(); ++i )
-        {
-            const std::string token = gems.rough_other_mats ( i );
-            MaterialInfo mi;
-            mi.find ( token );
-            if ( !mi.isValid() ||  size_t(mi.type) >=  builtin_size )
-            {
-                debug() <<  "WARNING: invalid gem mat " <<  token <<  ". idx=" <<  mi.type << endl;
-                continue;
-            }
-            debug() << "   rough_other mats " << mi.type << " is " << token << endl;
-            mPile->settings.gems.rough_other_mats.at ( mi.type ) = 1;
-        }
+void StockpileSettingsSerializer::read_coins(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pcoins = mSettings->coins;
+    read_category<StockpileSettings_CoinSet>(out, "coin", mode,
+        std::bind(&StockpileSettings::has_coin, mBuffer),
+        std::bind(&StockpileSettings::coin, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_coins,
+        [&]() {
+            pcoins.mats.clear();
+        },
+        [&](bool all, char val) {
+            auto & bcoin = mBuffer.coin();
 
-        // cut other
-        mPile->settings.gems.cut_other_mats.clear();
-        mPile->settings.gems.cut_other_mats.resize ( builtin_size, '\0' );
-        for ( int i = 0; i < gems.cut_other_mats_size(); ++i )
-        {
-            const std::string token = gems.cut_other_mats ( i );
-            MaterialInfo mi;
-            mi.find ( token );
-            if ( !mi.isValid() ||  size_t(mi.type) >=  builtin_size )
-            {
-                debug() <<  "WARNING: invalid gem mat " <<  token <<  ". idx=" <<  mi.type << endl;
-                continue;
-            }
-            debug() << "   cut_other mats " << mi.type << " is " << token << endl;
-            mPile->settings.gems.cut_other_mats.at ( mi.type ) = 1;
-        }
-    }
-    else
-    {
-        mPile->settings.flags.bits.gems = 0;
-        mPile->settings.gems.cut_other_mats.clear();
-        mPile->settings.gems.cut_mats.clear();
-        mPile->settings.gems.rough_other_mats.clear();
-        mPile->settings.gems.rough_mats.clear();
-    }
+            unserialize_list_material(out, "", all, val, filters, coins_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return bcoin.mats(idx); },
+                bcoin.mats_size(), pcoins.mats);
+        });
 }
 
-bool StockpileSerializer::finished_goods_type_is_allowed ( item_type::item_type type )
-{
-    switch ( type )
-    {
+static bool finished_goods_type_is_allowed(item_type::item_type type) {
+    switch (type) {
     case item_type::CHAIN:
     case item_type::FLASK:
     case item_type::GOBLET:
@@ -1587,622 +1406,891 @@ bool StockpileSerializer::finished_goods_type_is_allowed ( item_type::item_type
     default:
         return false;
     }
+}
 
+static bool finished_goods_mat_is_allowed(const MaterialInfo& mi) {
+    return mi.isValid() && mi.material && (mi.material->flags.is_set(material_flags::IS_GEM) || mi.material->flags.is_set(material_flags::IS_METAL) || mi.material->flags.is_set(material_flags::IS_STONE));
 }
 
-void StockpileSerializer::finished_goods_setup_other_mats()
-{
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 0,"WOOD" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 1,"PLANT_CLOTH" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 2,"BONE" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 3,"TOOTH" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 4,"HORN" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 5,"PEARL" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 6,"SHELL" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 7,"LEATHER" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 8,"SILK" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 9,"AMBER" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 10,"CORAL" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 11,"GREEN_GLASS" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 12,"CLEAR_GLASS" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 13,"CRYSTAL_GLASS" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 14,"YARN" ) );
-    mOtherMatsFinishedGoods.insert ( std::make_pair ( 15,"WAX" ) );
-}
-
-bool StockpileSerializer::finished_goods_mat_is_allowed ( const MaterialInfo &mi )
-{
-    return mi.isValid()
-           && mi.material
-           && ( mi.material->flags.is_set ( material_flags::IS_GEM )
-                || mi.material->flags.is_set ( material_flags::IS_METAL )
-                || mi.material->flags.is_set ( material_flags::IS_STONE ) ) ;
+bool StockpileSettingsSerializer::write_finished_goods(color_ostream& out, StockpileSettings::FinishedGoodsSet* finished_goods) {
+    bool all = serialize_list_item_type(out,
+        finished_goods_type_is_allowed,
+        [&](const string& token) { finished_goods->add_type(token); },
+        mSettings->finished_goods.type);
+
+    all = serialize_list_material(out,
+        finished_goods_mat_is_allowed,
+        [&](const string& token) { finished_goods->add_mats(token); },
+        mSettings->finished_goods.mats) && all;
+
+    all = serialize_list_other_mats(out,
+        mOtherMatsFinishedGoods.mats, [&](const string& token) { finished_goods->add_other_mats(token); },
+        mSettings->finished_goods.other_mats) && all;
+
+    all = serialize_list_quality(out,
+        [&](const string& token) { finished_goods->add_quality_core(token); },
+        mSettings->finished_goods.quality_core) && all;
+
+    all = serialize_list_quality(out,
+        [&](const string& token) { finished_goods->add_quality_total(token); },
+        mSettings->finished_goods.quality_total) && all;
+
+    return all;
 }
 
-void StockpileSerializer::write_finished_goods()
-{
-    StockpileSettings::FinishedGoodsSet *finished_goods = mBuffer.mutable_finished_goods();
+void StockpileSettingsSerializer::read_finished_goods(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pfinished_goods = mSettings->finished_goods;
+    read_category<StockpileSettings_FinishedGoodsSet>(out, "finished_goods", mode,
+        std::bind(&StockpileSettings::has_finished_goods, mBuffer),
+        std::bind(&StockpileSettings::finished_goods, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_finished_goods,
+        [&]() {
+            pfinished_goods.type.clear();
+            pfinished_goods.other_mats.clear();
+            pfinished_goods.mats.clear();
+            quality_clear(pfinished_goods.quality_core);
+            quality_clear(pfinished_goods.quality_total);
+        },
+        [&](bool all, char val) {
+            auto & bfinished_goods = mBuffer.finished_goods();
 
-    // type
-    FuncItemAllowed filter = std::bind ( &StockpileSerializer::finished_goods_type_is_allowed, this,  _1 );
-    serialize_list_item_type ( filter, [=] ( const std::string &token )
-    {
-        finished_goods->add_type ( token );
-    },  mPile->settings.finished_goods.type );
+            unserialize_list_item_type(out, "type", all, val, filters, finished_goods_type_is_allowed,
+                [&](const size_t& idx) -> const string& { return bfinished_goods.type(idx); },
+                bfinished_goods.type_size(), pfinished_goods.type);
 
-    // materials
-    FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::finished_goods_mat_is_allowed, this,  _1 );
-    serialize_list_material ( mat_filter, [=] ( const std::string &token )
-    {
-        finished_goods->add_mats ( token );
-    },  mPile->settings.finished_goods.mats );
+            unserialize_list_material(out, "mats", all, val, filters, finished_goods_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return bfinished_goods.mats(idx); },
+                bfinished_goods.mats_size(), pfinished_goods.mats);
 
-    // other mats
-    serialize_list_other_mats ( mOtherMatsFinishedGoods, [=] ( const std::string &token )
-    {
-        finished_goods->add_other_mats ( token );
-    }, mPile->settings.finished_goods.other_mats );
+            unserialize_list_other_mats(out, "other", all, val, filters, mOtherMatsFinishedGoods.mats,
+                [&](const size_t& idx) -> const string& { return bfinished_goods.other_mats(idx); },
+                bfinished_goods.other_mats_size(), pfinished_goods.other_mats);
 
-    // quality core
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        finished_goods->add_quality_core ( token );
-    },  mPile->settings.finished_goods.quality_core );
+            unserialize_list_quality(out, "core", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bfinished_goods.quality_core(idx); },
+                bfinished_goods.quality_core_size(), pfinished_goods.quality_core);
 
-    // quality total
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        finished_goods->add_quality_total ( token );
-    },  mPile->settings.finished_goods.quality_total );
+            unserialize_list_quality(out, "total", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bfinished_goods.quality_total(idx); },
+                bfinished_goods.quality_total_size(), pfinished_goods.quality_total);
+        });
 }
 
-void StockpileSerializer::read_finished_goods()
-{
-    if ( mBuffer.has_finished_goods() )
+food_pair StockpileSettingsSerializer::food_map(organic_mat_category::organic_mat_category cat) {
+    using df::enums::organic_mat_category::organic_mat_category;
+
+    switch (cat) {
+    case organic_mat_category::Meat:
     {
-        mPile->settings.flags.bits.finished_goods = 1;
-        const StockpileSettings::FinishedGoodsSet finished_goods = mBuffer.finished_goods();
-        debug() << "finished_goods: " <<endl;
-
-        // type
-        FuncItemAllowed filter = std::bind ( &StockpileSerializer::finished_goods_type_is_allowed, this,  _1 );
-        unserialize_list_item_type ( filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return finished_goods.type ( idx );
-        },  finished_goods.type_size(),  &mPile->settings.finished_goods.type );
-
-        // materials
-        FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::finished_goods_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( mat_filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return finished_goods.mats ( idx );
-        },  finished_goods.mats_size(),  &mPile->settings.finished_goods.mats );
-
-        // other mats
-        unserialize_list_other_mats ( mOtherMatsFinishedGoods,  [=] ( const size_t & idx ) -> const std::string&
-        {
-            return finished_goods.other_mats ( idx );
-        },  finished_goods.other_mats_size(),  &mPile->settings.finished_goods.other_mats );
-
-        // core quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return finished_goods.quality_core ( idx );
-        },  finished_goods.quality_core_size(),  mPile->settings.finished_goods.quality_core );
-
-        // total quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return finished_goods.quality_total ( idx );
-        },  finished_goods.quality_total_size(),  mPile->settings.finished_goods.quality_total );
-
-    }
-    else
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_meat(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().meat(idx); };
+        return food_pair("meat", setter, &mSettings->food.meat, getter, mBuffer.food().meat_size());
+    }
+    case organic_mat_category::Fish:
     {
-        mPile->settings.flags.bits.finished_goods = 0;
-        mPile->settings.finished_goods.type.clear();
-        mPile->settings.finished_goods.other_mats.clear();
-        mPile->settings.finished_goods.mats.clear();
-        quality_clear ( mPile->settings.finished_goods.quality_core );
-        quality_clear ( mPile->settings.finished_goods.quality_total );
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_fish(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().fish(idx); };
+        return food_pair("fish/prepared", setter, &mSettings->food.fish, getter, mBuffer.food().fish_size());
     }
-}
-
-void StockpileSerializer::write_leather()
-{
-    StockpileSettings::LeatherSet *leather = mBuffer.mutable_leather();
-
-    FuncWriteExport setter = [=] ( const std::string &id )
+    case organic_mat_category::UnpreparedFish:
     {
-        leather->add_mats ( id );
-    };
-    serialize_list_organic_mat ( setter, &mPile->settings.leather.mats, organic_mat_category::Leather );
-}
-void StockpileSerializer::read_leather()
-{
-    if ( mBuffer.has_leather() )
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_unprepared_fish(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().unprepared_fish(idx); };
+        return food_pair("fish/unprepared", setter, &mSettings->food.unprepared_fish, getter, mBuffer.food().unprepared_fish_size());
+    }
+    case organic_mat_category::Eggs:
     {
-        mPile->settings.flags.bits.leather = 1;
-        const StockpileSettings::LeatherSet leather = mBuffer.leather();
-        debug() << "leather: " <<endl;
-
-        unserialize_list_organic_mat ( [=] ( size_t idx ) -> std::string
-        {
-            return leather.mats ( idx );
-        }, leather.mats_size(), &mPile->settings.leather.mats, organic_mat_category::Leather );
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_egg(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().egg(idx); };
+        return food_pair("egg", setter, &mSettings->food.egg, getter, mBuffer.food().egg_size());
     }
-    else
+    case organic_mat_category::Plants:
     {
-        mPile->settings.flags.bits.leather = 0;
-        mPile->settings.leather.mats.clear();
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_plants(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().plants(idx); };
+        return food_pair("plants", setter, &mSettings->food.plants, getter, mBuffer.food().plants_size());
     }
-}
-
-void StockpileSerializer::write_cloth()
-{
-    StockpileSettings::ClothSet * cloth = mBuffer.mutable_cloth();
-
-    serialize_list_organic_mat ( [=] ( const std::string &token )
+    case organic_mat_category::PlantDrink:
     {
-        cloth->add_thread_silk ( token );
-    }, &mPile->settings.cloth.thread_silk, organic_mat_category::Silk );
-
-    serialize_list_organic_mat ( [=] ( const std::string &token )
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_drink_plant(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().drink_plant(idx); };
+        return food_pair("drink/plant", setter, &mSettings->food.drink_plant, getter, mBuffer.food().drink_plant_size());
+    }
+    case organic_mat_category::CreatureDrink:
     {
-        cloth->add_thread_plant ( token );
-    }, &mPile->settings.cloth.thread_plant,  organic_mat_category::PlantFiber );
-
-    serialize_list_organic_mat ( [=] ( const std::string &token )
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_drink_animal(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().drink_animal(idx); };
+        return food_pair("drink/animal", setter, &mSettings->food.drink_animal, getter, mBuffer.food().drink_animal_size());
+    }
+    case organic_mat_category::PlantCheese:
     {
-        cloth->add_thread_yarn ( token );
-    }, &mPile->settings.cloth.thread_yarn, organic_mat_category::Yarn );
-
-    serialize_list_organic_mat ( [=] ( const std::string &token )
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_cheese_plant(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().cheese_plant(idx); };
+        return food_pair("cheese/plant", setter, &mSettings->food.cheese_plant, getter, mBuffer.food().cheese_plant_size());
+    }
+    case organic_mat_category::CreatureCheese:
     {
-        cloth->add_thread_metal ( token );
-    }, &mPile->settings.cloth.thread_metal, organic_mat_category::MetalThread );
-
-    serialize_list_organic_mat ( [=] ( const std::string &token )
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_cheese_animal(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().cheese_animal(idx); };
+        return food_pair("cheese/animal", setter, &mSettings->food.cheese_animal, getter, mBuffer.food().cheese_animal_size());
+    }
+    case organic_mat_category::Seed:
     {
-        cloth->add_cloth_silk ( token );
-    }, &mPile->settings.cloth.cloth_silk, organic_mat_category::Silk );
-
-    serialize_list_organic_mat ( [=] ( const std::string &token )
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_seeds(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().seeds(idx); };
+        return food_pair("seeds", setter, &mSettings->food.seeds, getter, mBuffer.food().seeds_size());
+    }
+    case organic_mat_category::Leaf:
     {
-        cloth->add_cloth_plant ( token );
-    }, &mPile->settings.cloth.cloth_plant,  organic_mat_category::PlantFiber );
-
-    serialize_list_organic_mat ( [=] ( const std::string &token )
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_leaves(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().leaves(idx); };
+        return food_pair("leaves", setter, &mSettings->food.leaves, getter, mBuffer.food().leaves_size());
+    }
+    case organic_mat_category::PlantPowder:
     {
-        cloth->add_cloth_yarn ( token );
-    }, &mPile->settings.cloth.cloth_yarn, organic_mat_category::Yarn );
-
-    serialize_list_organic_mat ( [=] ( const std::string &token )
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_powder_plant(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().powder_plant(idx); };
+        return food_pair("powder/plant", setter, &mSettings->food.powder_plant, getter, mBuffer.food().powder_plant_size());
+    }
+    case organic_mat_category::CreaturePowder:
     {
-        cloth->add_cloth_metal ( token );
-    }, &mPile->settings.cloth.cloth_metal, organic_mat_category::MetalThread );
-
-}
-void StockpileSerializer::read_cloth()
-{
-    if ( mBuffer.has_cloth() )
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_powder_creature(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().powder_creature(idx); };
+        return food_pair("powder/animal", setter, &mSettings->food.powder_creature, getter, mBuffer.food().powder_creature_size());
+    }
+    case organic_mat_category::Glob:
     {
-        mPile->settings.flags.bits.cloth = 1;
-        const StockpileSettings::ClothSet cloth = mBuffer.cloth();
-        debug() << "cloth: " <<endl;
-
-        unserialize_list_organic_mat ( [=] ( size_t idx ) -> std::string
-        {
-            return cloth.thread_silk ( idx );
-        }, cloth.thread_silk_size(), &mPile->settings.cloth.thread_silk, organic_mat_category::Silk );
-
-        unserialize_list_organic_mat ( [=] ( size_t idx ) -> std::string
-        {
-            return cloth.thread_plant ( idx );
-        }, cloth.thread_plant_size(), &mPile->settings.cloth.thread_plant, organic_mat_category::PlantFiber );
-
-        unserialize_list_organic_mat ( [=] ( size_t idx ) -> std::string
-        {
-            return cloth.thread_yarn ( idx );
-        }, cloth.thread_yarn_size(),  &mPile->settings.cloth.thread_yarn, organic_mat_category::Yarn );
-
-        unserialize_list_organic_mat ( [=] ( size_t idx ) -> std::string
-        {
-            return cloth.thread_metal ( idx );
-        }, cloth.thread_metal_size(),  &mPile->settings.cloth.thread_metal, organic_mat_category::MetalThread );
-
-        unserialize_list_organic_mat ( [=] ( size_t idx ) -> std::string
-        {
-            return cloth.cloth_silk ( idx );
-        }, cloth.cloth_silk_size(),  &mPile->settings.cloth.cloth_silk, organic_mat_category::Silk );
-
-        unserialize_list_organic_mat ( [=] ( size_t idx ) -> std::string
-        {
-            return cloth.cloth_plant ( idx );
-        }, cloth.cloth_plant_size(),  &mPile->settings.cloth.cloth_plant, organic_mat_category::PlantFiber );
-
-        unserialize_list_organic_mat ( [=] ( size_t idx ) -> std::string
-        {
-            return cloth.cloth_yarn ( idx );
-        }, cloth.cloth_yarn_size(),  &mPile->settings.cloth.cloth_yarn, organic_mat_category::Yarn );
-
-        unserialize_list_organic_mat ( [=] ( size_t idx ) -> std::string
-        {
-            return cloth.cloth_metal ( idx );
-        }, cloth.cloth_metal_size(),  &mPile->settings.cloth.cloth_metal, organic_mat_category::MetalThread );
-    }
-    else
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_glob(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().glob(idx); };
+        return food_pair("glob", setter, &mSettings->food.glob, getter, mBuffer.food().glob_size());
+    }
+    case organic_mat_category::PlantLiquid:
     {
-        mPile->settings.cloth.thread_metal.clear();
-        mPile->settings.cloth.thread_plant.clear();
-        mPile->settings.cloth.thread_silk.clear();
-        mPile->settings.cloth.thread_yarn.clear();
-        mPile->settings.cloth.cloth_metal.clear();
-        mPile->settings.cloth.cloth_plant.clear();
-        mPile->settings.cloth.cloth_silk.clear();
-        mPile->settings.cloth.cloth_yarn.clear();
-        mPile->settings.flags.bits.cloth = 0;
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_liquid_plant(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().liquid_plant(idx); };
+        return food_pair("liquid/plant", setter, &mSettings->food.liquid_plant, getter, mBuffer.food().liquid_plant_size());
     }
-}
-
-bool StockpileSerializer::wood_mat_is_allowed ( const df::plant_raw * plant )
-{
-    return plant && plant->flags.is_set ( plant_raw_flags::TREE );
-}
-
-void StockpileSerializer::write_wood()
-{
-    StockpileSettings::WoodSet * wood = mBuffer.mutable_wood();
-    for ( size_t i = 0; i < mPile->settings.wood.mats.size(); ++i )
+    case organic_mat_category::CreatureLiquid:
     {
-        if ( mPile->settings.wood.mats.at ( i ) )
-        {
-            const df::plant_raw * plant = find_plant ( i );
-            if ( !wood_mat_is_allowed ( plant ) ) continue;
-            wood->add_mats ( plant->id );
-            debug() <<  "  plant " <<  i <<  " is " <<  plant->id <<  endl;
-        }
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_liquid_animal(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().liquid_animal(idx); };
+        return food_pair("liquid/animal", setter, &mSettings->food.liquid_animal, getter, mBuffer.food().liquid_animal_size());
     }
-}
-void StockpileSerializer::read_wood()
-{
-    if ( mBuffer.has_wood() )
+    case organic_mat_category::MiscLiquid:
     {
-        mPile->settings.flags.bits.wood = 1;
-        const StockpileSettings::WoodSet wood = mBuffer.wood();
-        debug() << "wood: " <<endl;
-
-        mPile->settings.wood.mats.clear();
-        mPile->settings.wood.mats.resize ( world->raws.plants.all.size(), '\0' );
-        for ( int i = 0; i <  wood.mats_size(); ++i )
-        {
-            const std::string token = wood.mats ( i );
-            const size_t idx = find_plant ( token );
-            if ( idx < 0 ||  idx >= mPile->settings.wood.mats.size() )
-            {
-                debug() <<  "WARNING wood mat index invalid " <<  token <<  ",  idx=" << idx <<  endl;
-                continue;
-            }
-            debug() <<  "   plant " <<  idx <<  " is " <<  token <<  endl;
-            mPile->settings.wood.mats.at ( idx ) = 1;
-        }
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_liquid_misc(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().liquid_misc(idx); };
+        return food_pair("liquid/misc", setter, &mSettings->food.liquid_misc, getter, mBuffer.food().liquid_misc_size());
     }
-    else
+
+    case organic_mat_category::Paste:
+    {
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_glob_paste(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().glob_paste(idx); };
+        return food_pair("paste", setter, &mSettings->food.glob_paste, getter, mBuffer.food().glob_paste_size());
+    }
+    case organic_mat_category::Pressed:
     {
-        mPile->settings.flags.bits.wood = 0;
-        mPile->settings.wood.mats.clear();
+        FuncWriteExport setter = [&](const string& id) {
+            mBuffer.mutable_food()->add_glob_pressed(id);
+        };
+        FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().glob_pressed(idx); };
+        return food_pair("pressed", setter, &mSettings->food.glob_pressed, getter, mBuffer.food().glob_pressed_size());
     }
+    case organic_mat_category::Leather:
+    case organic_mat_category::Silk:
+    case organic_mat_category::PlantFiber:
+    case organic_mat_category::Bone:
+    case organic_mat_category::Shell:
+    case organic_mat_category::Wood:
+    case organic_mat_category::Horn:
+    case organic_mat_category::Pearl:
+    case organic_mat_category::Tooth:
+    case organic_mat_category::EdibleCheese:
+    case organic_mat_category::AnyDrink:
+    case organic_mat_category::EdiblePlant:
+    case organic_mat_category::CookableLiquid:
+    case organic_mat_category::CookablePowder:
+    case organic_mat_category::CookableSeed:
+    case organic_mat_category::CookableLeaf:
+    case organic_mat_category::Yarn:
+    case organic_mat_category::MetalThread:
+    default:
+        // not used in stockpile food menu
+        break;
+    }
+    return food_pair();
 }
 
-bool StockpileSerializer::weapons_mat_is_allowed ( const MaterialInfo &mi )
-{
-    return mi.isValid() && mi.material && (
-               mi.material->flags.is_set ( material_flags::IS_METAL ) ||
-               mi.material->flags.is_set ( material_flags::IS_STONE ) );
+bool StockpileSettingsSerializer::write_food(color_ostream& out, StockpileSettings::FoodSet* food) {
+    auto & pfood = mSettings->food;
+    bool all = pfood.prepared_meals;
 
-}
-
-void StockpileSerializer::write_weapons()
-{
-    StockpileSettings::WeaponsSet * weapons = mBuffer.mutable_weapons();
+    food->set_prepared_meals(pfood.prepared_meals);
 
-    weapons->set_unusable ( mPile->settings.weapons.unusable );
-    weapons->set_usable ( mPile->settings.weapons.usable );
+    using df::enums::organic_mat_category::organic_mat_category;
+    using traits = df::enum_traits<organic_mat_category>;
+    for (int32_t mat_category = traits::first_item_value; mat_category < traits::last_item_value; ++mat_category) {
+        food_pair p = food_map((organic_mat_category)mat_category);
+        if (!p.valid)
+            continue;
+        all = serialize_list_organic_mat(out, p.set_value, p.stockpile_values,
+                (organic_mat_category)mat_category) && all;
+    }
 
-    // weapon type
-    serialize_list_itemdef ( [=] ( const std::string &token )
-    {
-        weapons->add_weapon_type ( token );
-    },  mPile->settings.weapons.weapon_type,
-    std::vector<df::itemdef*> ( world->raws.itemdefs.weapons.begin(),world->raws.itemdefs.weapons.end() ),
-    item_type::WEAPON );
+    return all;
+}
 
-    // trapcomp type
-    serialize_list_itemdef ( [=] ( const std::string &token )
-    {
-        weapons->add_trapcomp_type ( token );
-    },  mPile->settings.weapons.trapcomp_type,
-    std::vector<df::itemdef*> ( world->raws.itemdefs.trapcomps.begin(),world->raws.itemdefs.trapcomps.end() ),
-    item_type::TRAPCOMP );
+void StockpileSettingsSerializer::read_food(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    using df::enums::organic_mat_category::organic_mat_category;
+    using traits = df::enum_traits<organic_mat_category>;
 
-    // materials
-    FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::weapons_mat_is_allowed, this,  _1 );
-    serialize_list_material ( mat_filter, [=] ( const std::string &token )
-    {
-        weapons->add_mats ( token );
-    },  mPile->settings.weapons.mats );
+    auto & pfood = mSettings->food;
+    read_category<StockpileSettings_FoodSet>(out, "food", mode,
+        std::bind(&StockpileSettings::has_food, mBuffer),
+        std::bind(&StockpileSettings::food, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_food,
+        [&]() {
+            pfood.prepared_meals = false;
+            for (int32_t mat_category = traits::first_item_value; mat_category < traits::last_item_value; ++mat_category) {
+                food_pair p = food_map((organic_mat_category)mat_category);
+                if (!p.valid)
+                    continue;
+                p.stockpile_values->clear();
+            }
+        },
+        [&](bool all, char val) {
+            auto & bfood = mBuffer.food();
 
-    // other mats
-    serialize_list_other_mats ( mOtherMatsWeaponsArmor, [=] ( const std::string &token )
-    {
-        weapons->add_other_mats ( token );
-    }, mPile->settings.weapons.other_mats );
+            set_flag(out, "preparedmeals", filters, all, val, bfood.prepared_meals(), pfood.prepared_meals);
 
-    // quality core
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        weapons->add_quality_core ( token );
-    },  mPile->settings.weapons.quality_core );
+            for (int32_t mat_category = traits::first_item_value; mat_category < traits::last_item_value; ++mat_category) {
+                food_pair p = food_map((organic_mat_category)mat_category);
+                if (!p.valid)
+                    continue;
+                unserialize_list_organic_mat(out, p.name, all, val, filters,
+                    p.get_value, p.serialized_count, *p.stockpile_values,
+                    (organic_mat_category)mat_category);
+            }
+        });
+}
 
-    // quality total
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        weapons->add_quality_total ( token );
-    },  mPile->settings.weapons.quality_total );
+static bool furniture_mat_is_allowed(const MaterialInfo& mi) {
+    return mi.isValid() && mi.material && (mi.material->flags.is_set(material_flags::IS_METAL) || mi.material->flags.is_set(material_flags::IS_STONE));
 }
 
-void StockpileSerializer::read_weapons()
-{
-    if ( mBuffer.has_weapons() )
-    {
-        mPile->settings.flags.bits.weapons = 1;
-        const StockpileSettings::WeaponsSet weapons = mBuffer.weapons();
-        debug() << "weapons: " <<endl;
-
-        bool unusable = weapons.unusable();
-        bool usable = weapons.usable();
-        debug() <<  "unusable " <<  unusable <<  endl;
-        debug() <<  "usable " <<  usable <<  endl;
-        mPile->settings.weapons.unusable = unusable;
-        mPile->settings.weapons.usable = usable;
-
-        // weapon type
-        unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return weapons.weapon_type ( idx );
-        },  weapons.weapon_type_size(),  &mPile->settings.weapons.weapon_type, item_type::WEAPON );
-
-        // trapcomp type
-        unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return weapons.trapcomp_type ( idx );
-        },  weapons.trapcomp_type_size(),  &mPile->settings.weapons.trapcomp_type, item_type::TRAPCOMP );
-
-        // materials
-        FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::weapons_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( mat_filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return weapons.mats ( idx );
-        },  weapons.mats_size(),  &mPile->settings.weapons.mats );
-
-        // other mats
-        unserialize_list_other_mats ( mOtherMatsWeaponsArmor,  [=] ( const size_t & idx ) -> const std::string&
-        {
-            return weapons.other_mats ( idx );
-        },  weapons.other_mats_size(),  &mPile->settings.weapons.other_mats );
-
-
-        // core quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return weapons.quality_core ( idx );
-        },  weapons.quality_core_size(), mPile->settings.weapons.quality_core );
-        // total quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return weapons.quality_total ( idx );
-        },  weapons.quality_total_size(), mPile->settings.weapons.quality_total );
-    }
-    else
-    {
-        mPile->settings.flags.bits.weapons = 0;
-        mPile->settings.weapons.weapon_type.clear();
-        mPile->settings.weapons.trapcomp_type.clear();
-        mPile->settings.weapons.other_mats.clear();
-        mPile->settings.weapons.mats.clear();
-        quality_clear ( mPile->settings.weapons.quality_core );
-        quality_clear ( mPile->settings.weapons.quality_total );
-    }
+bool StockpileSettingsSerializer::write_furniture(color_ostream& out, StockpileSettings::FurnitureSet* furniture) {
+    using df::enums::furniture_type::furniture_type;
+    using type_traits = df::enum_traits<furniture_type>;
 
-}
+    auto & pfurniture = mSettings->furniture;
+    bool all = true;
 
-void StockpileSerializer::weapons_armor_setup_other_mats()
-{
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 0,"WOOD" ) );
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 1,"PLANT_CLOTH" ) );
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 2,"BONE" ) );
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 3,"SHELL" ) );
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 4,"LEATHER" ) );
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 5,"SILK" ) );
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 6,"GREEN_GLASS" ) );
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 7,"CLEAR_GLASS" ) );
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 8,"CRYSTAL_GLASS" ) );
-    mOtherMatsWeaponsArmor.insert ( std::make_pair ( 9,"YARN" ) );
-}
-
-bool StockpileSerializer::armor_mat_is_allowed ( const MaterialInfo &mi )
-{
-    return mi.isValid() && mi.material && mi.material->flags.is_set ( material_flags::IS_METAL );
-}
+    for (size_t i = 0; i < pfurniture.type.size(); ++i) {
+        if (!pfurniture.type.at(i)) {
+            all = false;
+            continue;
+        }
+        string f_type(type_traits::key_table[i]);
+        furniture->add_type(f_type);
+        DEBUG(log, out).print("furniture_type %zd is %s\n", i, f_type.c_str());
+    }
+
+    all = serialize_list_material(out,
+        furniture_mat_is_allowed,
+        [&](const string& token) { furniture->add_mats(token); },
+        pfurniture.mats) && all;
+    all = serialize_list_other_mats(out,
+        mOtherMatsFurniture.mats,
+        [&](const string& token) { furniture->add_other_mats(token); },
+        pfurniture.other_mats) && all;
+    all = serialize_list_quality(out,
+        [&](const string& token) { furniture->add_quality_core(token); },
+        pfurniture.quality_core) && all;
+    all = serialize_list_quality(out,
+        [&](const string& token) { furniture->add_quality_total(token); },
+        pfurniture.quality_total) && all;
+
+    return all;
+}
+
+void StockpileSettingsSerializer::read_furniture(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pfurniture = mSettings->furniture;
+    read_category<StockpileSettings_FurnitureSet>(out, "furniture", mode,
+        std::bind(&StockpileSettings::has_furniture, mBuffer),
+        std::bind(&StockpileSettings::furniture, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_furniture,
+        [&]() {
+            pfurniture.type.clear();
+            pfurniture.other_mats.clear();
+            pfurniture.mats.clear();
+            quality_clear(pfurniture.quality_core);
+            quality_clear(pfurniture.quality_total);
+        },
+        [&](bool all, char val) {
+            auto & bfurniture = mBuffer.furniture();
+
+            using df::enums::furniture_type::furniture_type;
+            df::enum_traits<furniture_type> type_traits;
+            size_t num_elems = type_traits.last_item_value + 1;
+            pfurniture.type.resize(num_elems, '\0');
+
+            if (all) {
+                for (size_t idx = 0; idx < num_elems; ++idx) {
+                    string id = ENUM_KEY_STR(furniture_type, (df::furniture_type)idx);
+                    set_filter_elem(out, "type", filters, val, id, idx, pfurniture.type.at(idx));
+                }
+            } else {
+                for (int i = 0; i < bfurniture.type_size(); ++i) {
+                    const string token = bfurniture.type(i);
+                    df::enum_traits<furniture_type>::base_type idx = linear_index(type_traits, token);
+                    if (idx < 0 || size_t(idx) >= pfurniture.type.size()) {
+                        WARN(log, out).print("furniture type index invalid %s, idx=%d\n", token.c_str(), idx);
+                        continue;
+                    }
+                    set_filter_elem(out, "type", filters, val, token, idx, pfurniture.type.at(idx));
+                }
+            }
 
-void StockpileSerializer::write_armor()
-{
-    StockpileSettings::ArmorSet * armor = mBuffer.mutable_armor();
+            unserialize_list_material(out, "mats", all, val, filters, furniture_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return bfurniture.mats(idx); },
+                bfurniture.mats_size(), pfurniture.mats);
 
-    armor->set_unusable ( mPile->settings.armor.unusable );
-    armor->set_usable ( mPile->settings.armor.usable );
+            unserialize_list_other_mats(out, "other", all, val, filters,
+                mOtherMatsFurniture.mats, [&](const size_t& idx) -> const string& { return bfurniture.other_mats(idx); },
+                bfurniture.other_mats_size(), pfurniture.other_mats);
 
-    // armor type
-    serialize_list_itemdef ( [=] ( const std::string &token )
-    {
-        armor->add_body ( token );
-    },  mPile->settings.armor.body,
-    std::vector<df::itemdef*> ( world->raws.itemdefs.armor.begin(),world->raws.itemdefs.armor.end() ),
-    item_type::ARMOR );
+            unserialize_list_quality(out, "core", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bfurniture.quality_core(idx); },
+                bfurniture.quality_core_size(), pfurniture.quality_core);
 
-    // helm type
-    serialize_list_itemdef ( [=] ( const std::string &token )
-    {
-        armor->add_head ( token );
-    },  mPile->settings.armor.head,
-    std::vector<df::itemdef*> ( world->raws.itemdefs.helms.begin(),world->raws.itemdefs.helms.end() ),
-    item_type::HELM );
+            unserialize_list_quality(out, "total", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bfurniture.quality_total(idx); },
+                bfurniture.quality_total_size(), pfurniture.quality_total);
+        });
+}
 
-    // shoes type
-    serialize_list_itemdef ( [=] ( const std::string &token )
-    {
-        armor->add_feet ( token );
-    },  mPile->settings.armor.feet,
-    std::vector<df::itemdef*> ( world->raws.itemdefs.shoes.begin(),world->raws.itemdefs.shoes.end() ),
-    item_type::SHOES );
+static bool gem_mat_is_allowed(const MaterialInfo& mi) {
+    return mi.isValid() && mi.material && mi.material->flags.is_set(material_flags::IS_GEM);
+}
 
-    // gloves type
-    serialize_list_itemdef ( [=] ( const std::string &token )
-    {
-        armor->add_hands ( token );
-    },  mPile->settings.armor.hands,
-    std::vector<df::itemdef*> ( world->raws.itemdefs.gloves.begin(),world->raws.itemdefs.gloves.end() ),
-    item_type::GLOVES );
+static bool gem_cut_mat_is_allowed(const MaterialInfo& mi) {
+    return mi.isValid() && mi.material && (mi.material->flags.is_set(material_flags::IS_GEM) || mi.material->flags.is_set(material_flags::IS_STONE));
+}
 
-    // pant type
-    serialize_list_itemdef ( [=] ( const std::string &token )
-    {
-        armor->add_legs ( token );
-    },  mPile->settings.armor.legs,
-    std::vector<df::itemdef*> ( world->raws.itemdefs.pants.begin(),world->raws.itemdefs.pants.end() ),
-    item_type::PANTS );
+static bool gem_other_mat_is_allowed(MaterialInfo& mi) {
+    return mi.isValid() && (mi.getToken() == "GLASS_GREEN" || mi.getToken() == "GLASS_CLEAR" || mi.getToken() == "GLASS_CRYSTAL");
+}
 
-    // shield type
-    serialize_list_itemdef ( [=] ( const std::string &token )
-    {
-        armor->add_shield ( token );
-    },  mPile->settings.armor.shield,
-    std::vector<df::itemdef*> ( world->raws.itemdefs.shields.begin(),world->raws.itemdefs.shields.end() ),
-    item_type::SHIELD );
+bool StockpileSettingsSerializer::write_gems(color_ostream& out, StockpileSettings::GemsSet* gems) {
+    MaterialInfo mi;
 
-    // materials
-    FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::armor_mat_is_allowed, this,  _1 );
-    serialize_list_material ( mat_filter, [=] ( const std::string &token )
-    {
-        armor->add_mats ( token );
-    },  mPile->settings.armor.mats );
+    auto & pgems = mSettings->gems;
 
-    // other mats
-    serialize_list_other_mats ( mOtherMatsWeaponsArmor, [=] ( const std::string &token )
-    {
-        armor->add_other_mats ( token );
-    }, mPile->settings.armor.other_mats );
+    bool all = serialize_list_material(out,
+        gem_mat_is_allowed,
+        [&](const string& token) { gems->add_rough_mats(token); },
+        pgems.rough_mats);
 
-    // quality core
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        armor->add_quality_core ( token );
-    },  mPile->settings.armor.quality_core );
+    all = serialize_list_material(out,
+        gem_cut_mat_is_allowed,
+        [&](const string& token) { gems->add_cut_mats(token); },
+        pgems.cut_mats) && all;
 
-    // quality total
-    serialize_list_quality ( [=] ( const std::string &token )
-    {
-        armor->add_quality_total ( token );
-    },  mPile->settings.armor.quality_total );
+    for (size_t i = 0; i < pgems.rough_other_mats.size(); ++i) {
+        if (!pgems.rough_other_mats.at(i)) {
+            all = false;
+            continue;
+        }
+        mi.decode(i, -1);
+        if (!gem_other_mat_is_allowed(mi))
+            continue;
+        DEBUG(log, out).print("gem rough_other mat %zd is %s\n", i, mi.getToken().c_str());
+        gems->add_rough_other_mats(mi.getToken());
+    }
+
+    for (size_t i = 0; i < pgems.cut_other_mats.size(); ++i) {
+        if (!pgems.cut_other_mats.at(i)) {
+            all = false;
+            continue;
+        }
+        mi.decode(i, -1);
+        if (!mi.isValid())
+            mi.decode(0, i);
+        if (!gem_other_mat_is_allowed(mi))
+            continue;
+        DEBUG(log, out).print("gem cut_other mat %zd is %s\n", i, mi.getToken().c_str());
+        gems->add_cut_other_mats(mi.getToken());
+    }
+
+    return all;
+}
+
+void StockpileSettingsSerializer::read_gems(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pgems = mSettings->gems;
+    read_category<StockpileSettings_GemsSet>(out, "gems", mode,
+        std::bind(&StockpileSettings::has_gems, mBuffer),
+        std::bind(&StockpileSettings::gems, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_gems,
+        [&]() {
+            pgems.cut_other_mats.clear();
+            pgems.cut_mats.clear();
+            pgems.rough_other_mats.clear();
+            pgems.rough_mats.clear();
+        },
+        [&](bool all, char val) {
+            auto & bgems = mBuffer.gems();
+
+            unserialize_list_material(out, "mats/rough", all, val, filters, gem_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return bgems.rough_mats(idx); },
+                bgems.rough_mats_size(), pgems.rough_mats);
+
+            unserialize_list_material(out, "mats/cut", all, val, filters, gem_cut_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return bgems.cut_mats(idx); },
+                bgems.cut_mats_size(), pgems.cut_mats);
+
+            const size_t builtin_size = std::extent<decltype(world->raws.mat_table.builtin)>::value;
+            pgems.rough_other_mats.resize(builtin_size, '\0');
+            pgems.cut_other_mats.resize(builtin_size, '\0');
+            if (all) {
+                for (size_t idx = 0; idx < builtin_size; ++idx) {
+                    MaterialInfo mi;
+                    mi.decode(idx, -1);
+                    if (gem_other_mat_is_allowed(mi))
+                        set_filter_elem(out, "other/rough", filters, val, mi.getToken(), idx, pgems.rough_other_mats.at(idx));
+                    if (!mi.isValid())
+                        mi.decode(0, idx);
+                    if (gem_other_mat_is_allowed(mi))
+                        set_filter_elem(out, "other/cut", filters, val, mi.getToken(), idx, pgems.cut_other_mats.at(idx));
+                }
+                return;
+            } else {
+                MaterialInfo mi;
+                for (int i = 0; i < (int)builtin_size; ++i) {
+                    if (i < bgems.rough_other_mats_size()) {
+                        string id = bgems.rough_other_mats(i);
+                        if (mi.find(id) && mi.isValid() && size_t(mi.type) < builtin_size)
+                            set_filter_elem(out, "other/rough", filters, val, id, mi.type, pgems.rough_other_mats.at(mi.type));
+                    }
+                    if (i < bgems.cut_other_mats_size()) {
+                        string id = bgems.cut_other_mats(i);
+                        if (mi.find(id) && mi.isValid() && size_t(mi.type) < builtin_size)
+                            set_filter_elem(out, "other/cut", filters, val, id, mi.type, pgems.cut_other_mats.at(mi.type));
+                    }
+                }
+            }
+        });
+}
+
+bool StockpileSettingsSerializer::write_leather(color_ostream& out, StockpileSettings::LeatherSet* leather) {
+    return serialize_list_organic_mat(out,
+        [&](const string& id) { leather->add_mats(id); },
+        &mSettings->leather.mats, organic_mat_category::Leather);
+}
+
+void StockpileSettingsSerializer::read_leather(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pleather = mSettings->leather;
+    read_category<StockpileSettings_LeatherSet>(out, "leather", mode,
+        std::bind(&StockpileSettings::has_leather, mBuffer),
+        std::bind(&StockpileSettings::leather, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_leather,
+        [&]() {
+            pleather.mats.clear();
+        },
+        [&](bool all, char val) {
+            auto & bleather = mBuffer.leather();
+
+            unserialize_list_organic_mat(out, "", all, val, filters,
+                [&](size_t idx) -> string { return bleather.mats(idx); },
+                bleather.mats_size(), pleather.mats, organic_mat_category::Leather);
+        });
+}
+
+bool StockpileSettingsSerializer::write_corpses(color_ostream& out, StockpileSettings::CorpsesSet* corpses) {
+    return serialize_list_creature(out,
+        [&](const string& token) { corpses->add_corpses(token); },
+        mSettings->corpses.corpses);
+}
+
+void StockpileSettingsSerializer::read_corpses(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pcorpses = mSettings->corpses;
+    read_category<StockpileSettings_CorpsesSet>(out, "corpses", mode,
+        std::bind(&StockpileSettings::has_corpses_v50, mBuffer),
+        std::bind(&StockpileSettings::corpses_v50, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_corpses,
+        [&]() {
+            pcorpses.corpses.clear();
+        },
+        [&](bool all, char val) {
+            auto & bcorpses = mBuffer.corpses_v50();
+            unserialize_list_creature(out, "", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bcorpses.corpses(idx); },
+                bcorpses.corpses_size(), pcorpses.corpses);
+        });
+}
+
+static bool refuse_type_is_allowed(item_type::item_type type) {
+    if (type == item_type::NONE || type == item_type::BAR || type == item_type::SMALLGEM
+            || type == item_type::BLOCKS || type == item_type::ROUGH || type == item_type::BOULDER
+            || type == item_type::CORPSE || type == item_type::CORPSEPIECE || type == item_type::ROCK
+            || type == item_type::ORTHOPEDIC_CAST)
+        return false;
+    return true;
 }
 
-void StockpileSerializer::read_armor()
-{
-    if ( mBuffer.has_armor() )
-    {
-        mPile->settings.flags.bits.armor = 1;
-        const StockpileSettings::ArmorSet armor = mBuffer.armor();
-        debug() << "armor: " <<endl;
-
-        bool unusable = armor.unusable();
-        bool usable = armor.usable();
-        debug() <<  "unusable " <<  unusable <<  endl;
-        debug() <<  "usable " <<  usable <<  endl;
-        mPile->settings.armor.unusable = unusable;
-        mPile->settings.armor.usable = usable;
-
-        // body type
-        unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.body ( idx );
-        },  armor.body_size(),  &mPile->settings.armor.body,  item_type::ARMOR );
-
-        // head type
-        unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.head ( idx );
-        },  armor.head_size(), &mPile->settings.armor.head, item_type::HELM );
-
-        // feet type
-        unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.feet ( idx );
-        },  armor.feet_size(), &mPile->settings.armor.feet, item_type::SHOES );
-
-        // hands type
-        unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.hands ( idx );
-        },  armor.hands_size(),  &mPile->settings.armor.hands,  item_type::GLOVES );
-
-        // legs type
-        unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.legs ( idx );
-        },  armor.legs_size(),  &mPile->settings.armor.legs,  item_type::PANTS );
-
-        // shield type
-        unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.shield ( idx );
-        },  armor.shield_size(),  &mPile->settings.armor.shield, item_type::SHIELD );
-
-        // materials
-        FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::armor_mat_is_allowed, this,  _1 );
-        unserialize_list_material ( mat_filter, [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.mats ( idx );
-        },  armor.mats_size(),  &mPile->settings.armor.mats );
-
-        // other mats
-        unserialize_list_other_mats ( mOtherMatsWeaponsArmor,  [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.other_mats ( idx );
-        },  armor.other_mats_size(),  &mPile->settings.armor.other_mats );
-
-        // core quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.quality_core ( idx );
-        },  armor.quality_core_size(), mPile->settings.armor.quality_core );
-        // total quality
-        unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string&
-        {
-            return armor.quality_total ( idx );
-        },  armor.quality_total_size(),  mPile->settings.armor.quality_total );
-    }
-    else
-    {
-        mPile->settings.flags.bits.armor = 0;
-        mPile->settings.armor.body.clear();
-        mPile->settings.armor.head.clear();
-        mPile->settings.armor.feet.clear();
-        mPile->settings.armor.hands.clear();
-        mPile->settings.armor.legs.clear();
-        mPile->settings.armor.shield.clear();
-        mPile->settings.armor.other_mats.clear();
-        mPile->settings.armor.mats.clear();
-        quality_clear ( mPile->settings.armor.quality_core );
-        quality_clear ( mPile->settings.armor.quality_total );
-    }
+bool StockpileSettingsSerializer::write_refuse(color_ostream& out, StockpileSettings::RefuseSet* refuse) {
+    auto & prefuse = mSettings->refuse;
+    bool all = prefuse.fresh_raw_hide && prefuse.rotten_raw_hide;
+
+    refuse->set_fresh_raw_hide(prefuse.fresh_raw_hide);
+    refuse->set_rotten_raw_hide(prefuse.rotten_raw_hide);
+
+    all = serialize_list_item_type(out, refuse_type_is_allowed,
+        [&](const string& token) { refuse->add_type(token); },
+        prefuse.type) && all;
+
+    all = serialize_list_creature(out,
+        [&](const string& token) { refuse->add_corpses(token); },
+        prefuse.corpses) && all;
+    all = serialize_list_creature(out,
+        [&](const string& token) { refuse->add_body_parts(token); },
+        prefuse.body_parts) && all;
+    all = serialize_list_creature(out,
+        [&](const string& token) { refuse->add_skulls(token); },
+        prefuse.skulls) && all;
+    all = serialize_list_creature(out,
+        [&](const string& token) { refuse->add_bones(token); },
+        prefuse.bones) && all;
+    all = serialize_list_creature(out,
+        [&](const string& token) { refuse->add_hair(token); },
+        prefuse.hair) && all;
+    all = serialize_list_creature(out,
+        [&](const string& token) { refuse->add_shells(token); },
+        prefuse.shells) && all;
+    all = serialize_list_creature(out,
+        [&](const string& token) { refuse->add_teeth(token); },
+        prefuse.teeth) && all;
+    all = serialize_list_creature(out,
+        [&](const string& token) { refuse->add_horns(token); },
+        prefuse.horns) && all;
+
+    return all;
+}
+
+void StockpileSettingsSerializer::read_refuse(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & prefuse = mSettings->refuse;
+    read_category<StockpileSettings_RefuseSet>(out, "refuse", mode,
+        std::bind(&StockpileSettings::has_refuse, mBuffer),
+        std::bind(&StockpileSettings::refuse, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_refuse,
+        [&]() {
+            prefuse.fresh_raw_hide = false;
+            prefuse.rotten_raw_hide = false;
+            prefuse.type.clear();
+            prefuse.corpses.clear();
+            prefuse.body_parts.clear();
+            prefuse.skulls.clear();
+            prefuse.bones.clear();
+            prefuse.hair.clear();
+            prefuse.shells.clear();
+            prefuse.teeth.clear();
+            prefuse.horns.clear();
+        },
+        [&](bool all, char val) {
+            auto & brefuse = mBuffer.refuse();
+
+            set_flag(out, "rawhide/fresh", filters, all, val, brefuse.fresh_raw_hide(), prefuse.fresh_raw_hide);
+            set_flag(out, "rawhide/rotten", filters, all, val, brefuse.rotten_raw_hide(), prefuse.rotten_raw_hide);
+
+            unserialize_list_item_type(out, "type", all, val, filters, refuse_type_is_allowed,
+                [&](const size_t& idx) -> const string& { return brefuse.type(idx); },
+                brefuse.type_size(), prefuse.type);
+
+            unserialize_list_creature(out, "corpses", all, val, filters,
+                [&](const size_t& idx) -> const string& { return brefuse.corpses(idx); },
+                brefuse.corpses_size(), prefuse.corpses);
+            unserialize_list_creature(out, "bodyparts", all, val, filters,
+                [&](const size_t& idx) -> const string& { return brefuse.body_parts(idx); },
+                brefuse.body_parts_size(), prefuse.body_parts);
+            unserialize_list_creature(out, "skulls", all, val, filters,
+                [&](const size_t& idx) -> const string& { return brefuse.skulls(idx); },
+                brefuse.skulls_size(), prefuse.skulls);
+            unserialize_list_creature(out, "bones", all, val, filters,
+                [&](const size_t& idx) -> const string& { return brefuse.bones(idx); },
+                brefuse.bones_size(), prefuse.bones);
+            unserialize_list_creature(out, "hair", all, val, filters,
+                [&](const size_t& idx) -> const string& { return brefuse.hair(idx); },
+                brefuse.hair_size(), prefuse.hair);
+            unserialize_list_creature(out, "shells", all, val, filters,
+                [&](const size_t& idx) -> const string& { return brefuse.shells(idx); },
+                brefuse.shells_size(), prefuse.shells);
+            unserialize_list_creature(out, "teeth", all, val, filters,
+                [&](const size_t& idx) -> const string& { return brefuse.teeth(idx); },
+                brefuse.teeth_size(), prefuse.teeth);
+            unserialize_list_creature(out, "horns", all, val, filters,
+                [&](const size_t& idx) -> const string& { return brefuse.horns(idx); },
+                brefuse.horns_size(), prefuse.horns);
+        });
+
+}
+
+bool StockpileSettingsSerializer::write_sheet(color_ostream& out, StockpileSettings::SheetSet* sheet) {
+    bool all = serialize_list_organic_mat(out,
+        [&](const string& token) { sheet->add_paper(token); },
+        &mSettings->sheet.paper, organic_mat_category::Paper);
+
+    all = serialize_list_organic_mat(out,
+        [&](const string& token) { sheet->add_parchment(token); },
+        &mSettings->sheet.parchment, organic_mat_category::Parchment) && all;
+
+    return all;
+}
+
+void StockpileSettingsSerializer::read_sheet(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & psheet = mSettings->sheet;
+    read_category<StockpileSettings_SheetSet>(out, "sheet", mode,
+        std::bind(&StockpileSettings::has_sheet, mBuffer),
+        std::bind(&StockpileSettings::sheet, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_sheet,
+        [&]() {
+            psheet.paper.clear();
+            psheet.parchment.clear();
+        },
+        [&](bool all, char val) {
+            auto & bsheet = mBuffer.sheet();
+
+            unserialize_list_organic_mat(out, "paper", all, val, filters,
+                [&](size_t idx) -> string { return bsheet.paper(idx); },
+                bsheet.paper_size(), psheet.paper, organic_mat_category::Paper);
+
+            unserialize_list_organic_mat(out, "parchment", all, val, filters,
+                [&](size_t idx) -> string { return bsheet.parchment(idx); },
+                bsheet.parchment_size(), psheet.parchment, organic_mat_category::Parchment);
+        });
+}
+
+static bool stone_is_allowed(const MaterialInfo& mi) {
+    if (!mi.isValid())
+        return false;
+    const bool is_allowed_soil = mi.inorganic->flags.is_set(inorganic_flags::SOIL) && !mi.inorganic->flags.is_set(inorganic_flags::AQUIFER);
+    const bool is_allowed_stone = mi.material->flags.is_set(material_flags::IS_STONE) && !mi.material->flags.is_set(material_flags::NO_STONE_STOCKPILE);
+    return is_allowed_soil || is_allowed_stone;
+}
+
+bool StockpileSettingsSerializer::write_stone(color_ostream& out, StockpileSettings::StoneSet* stone) {
+    return serialize_list_material(out,
+        stone_is_allowed,
+        [&](const string& token) { stone->add_mats(token); },
+        mSettings->stone.mats);
+}
+
+void StockpileSettingsSerializer::read_stone(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pstone = mSettings->stone;
+    read_category<StockpileSettings_StoneSet>(out, "stone", mode,
+        std::bind(&StockpileSettings::has_stone, mBuffer),
+        std::bind(&StockpileSettings::stone, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_stone,
+        [&]() {
+            pstone.mats.clear();
+        },
+        [&](bool all, char val) {
+            auto & bstone = mBuffer.stone();
+
+            unserialize_list_material(out, "", all, val, filters, stone_is_allowed,
+                [&](const size_t& idx) -> const string& { return bstone.mats(idx); },
+                bstone.mats_size(), pstone.mats);
+        });
+}
+
+static bool weapons_mat_is_allowed(const MaterialInfo& mi) {
+    return mi.isValid() && mi.material && (mi.material->flags.is_set(material_flags::IS_METAL) || mi.material->flags.is_set(material_flags::IS_STONE));
+}
+
+bool StockpileSettingsSerializer::write_weapons(color_ostream& out, StockpileSettings::WeaponsSet* weapons) {
+    auto & pweapons = mSettings->weapons;
+    bool all = pweapons.unusable && pweapons.usable;
+
+    weapons->set_unusable(pweapons.unusable);
+    weapons->set_usable(pweapons.usable);
+
+    all = serialize_list_itemdef(out,
+        [&](const string& token) { weapons->add_weapon_type(token); },
+        pweapons.weapon_type,
+        vector<df::itemdef*>(world->raws.itemdefs.weapons.begin(), world->raws.itemdefs.weapons.end()),
+        item_type::WEAPON) && all;
+
+    all = serialize_list_itemdef(out,
+        [&](const string& token) { weapons->add_trapcomp_type(token); },
+        pweapons.trapcomp_type,
+        vector<df::itemdef*>(world->raws.itemdefs.trapcomps.begin(), world->raws.itemdefs.trapcomps.end()),
+        item_type::TRAPCOMP) && all;
+
+    all = serialize_list_material(out,
+        weapons_mat_is_allowed,
+        [&](const string& token) { weapons->add_mats(token); },
+        pweapons.mats) && all;
+
+    all = serialize_list_other_mats(out,
+        mOtherMatsWeaponsArmor.mats,
+        [&](const string& token) { weapons->add_other_mats(token); },
+        pweapons.other_mats) && all;
+
+    all = serialize_list_quality(out,
+        [&](const string& token) { weapons->add_quality_core(token); },
+        pweapons.quality_core) && all;
+
+    all = serialize_list_quality(out,
+        [&](const string& token) { weapons->add_quality_total(token); },
+        pweapons.quality_total) && all;
+
+    return all;
+}
+
+void StockpileSettingsSerializer::read_weapons(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pweapons = mSettings->weapons;
+    read_category<StockpileSettings_WeaponsSet>(out, "weapons", mode,
+        std::bind(&StockpileSettings::has_weapons, mBuffer),
+        std::bind(&StockpileSettings::weapons, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_weapons,
+        [&]() {
+            pweapons.unusable = false;
+            pweapons.usable = false;
+            pweapons.weapon_type.clear();
+            pweapons.trapcomp_type.clear();
+            pweapons.other_mats.clear();
+            pweapons.mats.clear();
+            quality_clear(pweapons.quality_core);
+            quality_clear(pweapons.quality_total);
+        },
+        [&](bool all, char val) {
+            auto & bweapons = mBuffer.weapons();
+
+            set_flag(out, "nouse", filters, all, val, bweapons.unusable(), pweapons.unusable);
+            set_flag(out, "canuse", filters, all, val, bweapons.usable(), pweapons.usable);
+
+            unserialize_list_itemdef(out, "type/weapon", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bweapons.weapon_type(idx); },
+                bweapons.weapon_type_size(), pweapons.weapon_type, item_type::WEAPON);
+
+            unserialize_list_itemdef(out, "type/trapcomp", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bweapons.trapcomp_type(idx); },
+                bweapons.trapcomp_type_size(), pweapons.trapcomp_type, item_type::TRAPCOMP);
+
+            unserialize_list_material(out, "mats", all, val, filters, weapons_mat_is_allowed,
+                [&](const size_t& idx) -> const string& { return bweapons.mats(idx); },
+                bweapons.mats_size(), pweapons.mats);
+
+            unserialize_list_other_mats(out, "other", all, val, filters, mOtherMatsWeaponsArmor.mats,
+                [&](const size_t& idx) -> const string& { return bweapons.other_mats(idx); },
+                bweapons.other_mats_size(), pweapons.other_mats);
+
+            unserialize_list_quality(out, "core", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bweapons.quality_core(idx); },
+                bweapons.quality_core_size(), pweapons.quality_core);
+
+            unserialize_list_quality(out, "total", all, val, filters,
+                [&](const size_t& idx) -> const string& { return bweapons.quality_total(idx); },
+                bweapons.quality_total_size(), pweapons.quality_total);
+        });
+}
+
+static bool wood_mat_is_allowed(const df::plant_raw* plant) {
+    return plant && plant->flags.is_set(plant_raw_flags::TREE);
+}
+
+bool StockpileSettingsSerializer::write_wood(color_ostream& out, StockpileSettings::WoodSet* wood) {
+    bool all = true;
+    for (size_t i = 0; i < mSettings->wood.mats.size(); ++i) {
+        if (!mSettings->wood.mats.at(i)) {
+            all = false;
+            continue;
+        }
+        const df::plant_raw* plant = find_plant(i);
+        if (!wood_mat_is_allowed(plant))
+            continue;
+        wood->add_mats(plant->id);
+        DEBUG(log, out).print("plant %zd is %s\n", i, plant->id.c_str());
+    }
+    return all;
+}
+
+void StockpileSettingsSerializer::read_wood(color_ostream& out, DeserializeMode mode, const vector<string>& filters) {
+    auto & pwood = mSettings->wood;
+    read_category<StockpileSettings_WoodSet>(out, "wood", mode,
+        std::bind(&StockpileSettings::has_wood, mBuffer),
+        std::bind(&StockpileSettings::wood, mBuffer),
+        mSettings->flags.whole,
+        mSettings->flags.mask_wood,
+        [&]() {
+            pwood.mats.clear();
+        },
+        [&](bool all, char val) {
+            auto & bwood = mBuffer.wood();
+
+            size_t num_elems = world->raws.plants.all.size();
+            pwood.mats.resize(num_elems, '\0');
+
+            if (all) {
+                for (size_t idx = 0; idx < num_elems; ++idx) {
+                    string id = world->raws.plants.all[idx]->id;
+                    set_filter_elem(out, "", filters, val, id, idx, pwood.mats.at(idx));
+                }
+            } else {
+                for (int i = 0; i < bwood.mats_size(); ++i) {
+                    const string token = bwood.mats(i);
+                    const size_t idx = find_plant(token);
+                    if (idx < 0 || (size_t)idx >= num_elems) {
+                        WARN(log, out).print("wood mat index invalid %s idx=%zd\n", token.c_str(), idx);
+                        continue;
+                    }
+                    set_filter_elem(out, "", filters, val, token, idx, pwood.mats.at(idx));
+                }
+            }
+        });
 }
diff --git a/plugins/stockpiles/StockpileSerializer.h b/plugins/stockpiles/StockpileSerializer.h
index ff0a38241..a29fe3906 100644
--- a/plugins/stockpiles/StockpileSerializer.h
+++ b/plugins/stockpiles/StockpileSerializer.h
@@ -1,349 +1,171 @@
 #pragma once
 
-//  stockpiles plugin
-#include "proto/stockpiles.pb.h"
-
-//  dfhack
 #include "modules/Materials.h"
-#include "modules/Items.h"
 
-//  df
-#include "df/world.h"
-#include "df/world_data.h"
+#include "df/itemdef.h"
 #include "df/organic_mat_category.h"
-#include "df/furniture_type.h"
-#include "df/item_quality.h"
-#include "df/item_type.h"
+#include "df/stockpile_settings.h"
+
+#include "proto/stockpiles.pb.h"
 
-//  stl
 #include <functional>
-#include <vector>
-#include <ostream>
-#include <istream>
 
-namespace df {
-struct building_stockpilest;
+namespace df
+{
+    struct building_stockpilest;
 }
 
-
-/**
- * Null buffer that acts like /dev/null for when debug is disabled
- */
-class NullBuffer : public std::streambuf
-{
-public:
-    int overflow ( int c );
+enum IncludedElements {
+    INCLUDED_ELEMENTS_NONE = 0x00,
+    INCLUDED_ELEMENTS_CONTAINERS = 0x01,
+    INCLUDED_ELEMENTS_GENERAL = 0x02,
+    INCLUDED_ELEMENTS_CATEGORIES = 0x04,
+    INCLUDED_ELEMENTS_TYPES = 0x08,
 };
 
-class NullStream : public std::ostream
-{
-public:
-    NullStream();
-private:
-    NullBuffer m_sb;
+enum DeserializeMode {
+    DESERIALIZE_MODE_SET = 0,
+    DESERIALIZE_MODE_ENABLE = 1,
+    DESERIALIZE_MODE_DISABLE = 2,
 };
 
+//  read the token from the serialized list during import
+typedef std::function<std::string(const size_t&)> FuncReadImport;
+//  add the token to the serialized list during export
+typedef std::function<void(const std::string&)> FuncWriteExport;
+//  are item's of item_type allowed?
+typedef std::function<bool(df::enums::item_type::item_type)> FuncItemAllowed;
+//  is this material allowed?
+typedef std::function<bool(const DFHack::MaterialInfo&)> FuncMaterialAllowed;
+
+// convenient struct for parsing food stockpile items
+struct food_pair {
+    const char * name;
+    // exporting
+    FuncWriteExport set_value;
+    std::vector<char>* stockpile_values;
+    // importing
+    FuncReadImport get_value;
+    size_t serialized_count;
+    bool valid;
+
+    food_pair(const char * n, FuncWriteExport s, std::vector<char>* sp_v, FuncReadImport g, size_t count)
+        : name(n), set_value(s), stockpile_values(sp_v), get_value(g), serialized_count(count),
+          valid(true) { }
+    food_pair(): valid(false) { }
+};
 
 /**
  * Class for serializing the stockpile_settings structure into a Google protobuf
  */
-class StockpileSerializer
-{
+class StockpileSettingsSerializer {
 public:
- /**
-  * @param out for debugging
-  * @param stockpile stockpile to read or write settings to
-  */
-
-    StockpileSerializer ( df::building_stockpilest * stockpile );
-
- ~StockpileSerializer();
-
- void enable_debug ( std::ostream &out );
-
- /**
-  * Since we depend on protobuf-lite, not the full lib, we copy this function from
-  * protobuf message.cc
-  */
- bool serialize_to_ostream(std::ostream* output);
-
- /**
-  * Will serialize stockpile settings to a file (overwrites existing files)
-  * @return success/failure
-  */
- bool serialize_to_file ( const std::string & file );
-
- /**
-  * Again, copied from message.cc
-  */
- bool parse_from_istream(std::istream* input);
-
-
- /**
-  * Read stockpile settings from file
-  */
- bool unserialize_from_file ( const std::string & file );
-
-private:
-
- bool mDebug;
- std::ostream * mOut;
- NullStream mNull;
- df::building_stockpilest * mPile;
- dfstockpiles::StockpileSettings mBuffer;
- std::map<int, std::string> mOtherMatsFurniture;
- std::map<int, std::string> mOtherMatsFinishedGoods;
- std::map<int, std::string> mOtherMatsBars;
- std::map<int, std::string> mOtherMatsBlocks;
- std::map<int, std::string> mOtherMatsWeaponsArmor;
-
-
- std::ostream & debug();
-
- /**
- read memory structures and serialize to protobuf
-  */
- void write();
-
- //  parse serialized data into ui indices
- void read ();
-
- /**
-  * Find an enum's value based off the string label.
-  * @param traits the enum's trait struct
-  * @param token the string value in key_table
-  * @return the enum's value,  -1 if not found
-  */
- template<typename E>
- static typename df::enum_traits<E>::base_type linear_index ( std::ostream & out, df::enum_traits<E> traits, const std::string &token )
- {
-  auto j = traits.first_item_value;
-  auto limit = traits.last_item_value;
-  // sometimes enums start at -1, which is bad news for array indexing
-  if ( j < 0 )
-  {
-   j += abs ( traits.first_item_value );
-   limit += abs ( traits.first_item_value );
-  }
-  for ( ; j <= limit; ++j )
-  {
-   //             out << " linear_index("<< token <<") = table["<<j<<"/"<<limit<<"]: " <<traits.key_table[j] << endl;
-   if ( token.compare ( traits.key_table[j] ) == 0 )
-   return j;
-  }
-  return -1;
- }
-
- //  read the token from the serailized list during import
- typedef std::function<std::string ( const size_t& ) > FuncReadImport;
- //  add the token to the serialized list during export
- typedef std::function<void ( const std::string & ) > FuncWriteExport;
- //  are item's of item_type allowed?
- typedef std::function<bool ( df::enums::item_type::item_type ) > FuncItemAllowed;
- //  is this material allowed?
- typedef std::function<bool ( const DFHack::MaterialInfo & ) > FuncMaterialAllowed;
-
- // convenient struct for parsing food stockpile items
- struct food_pair
- {
-  // exporting
-  FuncWriteExport set_value;
-  std::vector<char> * stockpile_values;
-  // importing
-  FuncReadImport get_value;
-  size_t serialized_count;
-  bool valid;
-
-  food_pair ( FuncWriteExport s, std::vector<char>* sp_v, FuncReadImport g, size_t count )
- : set_value ( s )
- , stockpile_values ( sp_v )
- , get_value ( g )
- , serialized_count ( count )
- , valid ( true )
-  {}
-  food_pair(): valid( false ) {}
- };
-
- /**
-  * There are many repeated (un)serialization cases throughout the stockpile_settings structure,
-  * so the most common cases have been generalized into generic functions using lambdas.
-  *
-  * The basic process to serialize a stockpile_settings structure is:
-  * 1. loop through the list
-  * 2. for every element that is TRUE:
-  * 3.   map the specific stockpile_settings index into a general material, creature, etc index
-  * 4.   verify that type is allowed in the list (e.g.,  no stone in gems stockpiles)
-  * 5.   add it to the protobuf using FuncWriteExport
-  *
-  * The unserialization process is the same in reverse.
-  */
- void serialize_list_organic_mat ( FuncWriteExport add_value, const std::vector<char> * list, df::enums::organic_mat_category::organic_mat_category cat );
-
- /**
-  * @see serialize_list_organic_mat
-  */
- void unserialize_list_organic_mat ( FuncReadImport get_value, size_t list_size, std::vector<char> *pile_list,  df::enums::organic_mat_category::organic_mat_category cat );
-
-
- /**
-  * @see serialize_list_organic_mat
-  */
- void serialize_list_item_type ( FuncItemAllowed is_allowed,  FuncWriteExport add_value,  const std::vector<char> &list );
-
+    /**
+     * @param settings settings to read or write to
+     */
+    StockpileSettingsSerializer(df::stockpile_settings *settings);
 
- /**
-  * @see serialize_list_organic_mat
-  */
- void unserialize_list_item_type ( FuncItemAllowed is_allowed, FuncReadImport read_value,  int32_t list_size,  std::vector<char> *pile_list );
+    ~StockpileSettingsSerializer();
 
+    /**
+     * Since we depend on protobuf-lite, not the full lib, we copy this function from
+     * protobuf message.cc
+     */
+    bool serialize_to_ostream(DFHack::color_ostream& out, std::ostream* output, uint32_t includedElements);
 
- /**
-  * @see serialize_list_organic_mat
-  */
- void serialize_list_material ( FuncMaterialAllowed is_allowed,  FuncWriteExport add_value,  const std::vector<char> &list );
+    /**
+     * Will serialize stockpile settings to a file (overwrites existing files)
+     * @return success/failure
+     */
+    bool serialize_to_file(DFHack::color_ostream& out, const std::string& file, uint32_t includedElements);
 
- /**
-  * @see serialize_list_organic_mat
-  */
- void unserialize_list_material ( FuncMaterialAllowed is_allowed, FuncReadImport read_value,  int32_t list_size,  std::vector<char> *pile_list );
+    /**
+     * Again, copied from message.cc
+     */
+    bool parse_from_istream(DFHack::color_ostream &out, std::istream* input, DeserializeMode mode, const std::vector<std::string>& filters);
 
- /**
-  * @see serialize_list_organic_mat
-  */
- void serialize_list_quality ( FuncWriteExport add_value, const bool ( &quality_list ) [7] );
+    /**
+     * Read stockpile settings from file
+     */
+    bool unserialize_from_file(DFHack::color_ostream &out, const std::string& file, DeserializeMode mode, const std::vector<std::string>& filters);
 
- /**
-  * Set all values in a bool[7] to false
-  */
- void quality_clear ( bool ( &pile_list ) [7] );
+protected:
+    dfstockpiles::StockpileSettings mBuffer;
 
+    // read memory structures and serialize to protobuf
+    virtual void write(DFHack::color_ostream& out, uint32_t includedElements);
 
- /**
-  * @see serialize_list_organic_mat
-  */
- void unserialize_list_quality ( FuncReadImport read_value,  int32_t list_size, bool ( &pile_list ) [7] );
+    // parse serialized data into ui indices
+    virtual void read(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
 
+    virtual void write_general(DFHack::color_ostream& out);
+    virtual void read_general(DFHack::color_ostream& out, DeserializeMode mode);
 
- /**
-  * @see serialize_list_organic_mat
-  */
- void serialize_list_other_mats ( const std::map<int, std::string> other_mats, FuncWriteExport add_value,  std::vector<char> list );
-
- /**
-  * @see serialize_list_organic_mat
-  */
- void unserialize_list_other_mats ( const std::map<int, std::string> other_mats, FuncReadImport read_value,  int32_t list_size, std::vector<char> *pile_list );
-
-
- /**
-  * @see serialize_list_organic_mat
-  */
- void serialize_list_itemdef ( FuncWriteExport add_value,  std::vector<char> list,  std::vector<df::itemdef *> items,  df::enums::item_type::item_type type );
-
-
- /**
-  * @see serialize_list_organic_mat
-  */
- void unserialize_list_itemdef ( FuncReadImport read_value,  int32_t list_size, std::vector<char> *pile_list, df::enums::item_type::item_type type );
-
-
- /**
-  * Given a list of other_materials and an index,  return its corresponding token
-  * @return empty string if not found
-  * @see other_mats_token
-  */
- std::string other_mats_index ( const std::map<int, std::string> other_mats,  int idx );
-
- /**
-  * Given a list of other_materials and a token,  return its corresponding index
-  * @return -1 if not found
-  * @see other_mats_index
-  */
- int other_mats_token ( const std::map<int, std::string> other_mats,  const std::string & token );
-
- void write_general();
- void read_general();
-
-
- void write_animals();
- void read_animals();
-
-
- food_pair food_map ( df::enums::organic_mat_category::organic_mat_category cat );
-
-
- void write_food();
- void read_food();
-
- void furniture_setup_other_mats();
- void write_furniture();
- bool furniture_mat_is_allowed ( const DFHack::MaterialInfo &mi );
- void read_furniture();
-
- bool refuse_creature_is_allowed ( const df::creature_raw *raw );
-
-
- void refuse_write_helper ( std::function<void ( const std::string & ) > add_value, const std::vector<char> & list );
-
-
- bool refuse_type_is_allowed ( df::enums::item_type::item_type type );
-
-
- void write_refuse();
- void refuse_read_helper ( std::function<std::string ( const size_t& ) > get_value, size_t list_size, std::vector<char>* pile_list );
-
- void read_refuse();
-
- bool stone_is_allowed ( const DFHack::MaterialInfo &mi );
-
- void write_stone();
-
- void read_stone();
-
- bool ammo_mat_is_allowed ( const DFHack::MaterialInfo &mi );
-
- void write_ammo();
- void read_ammo();
- bool coins_mat_is_allowed ( const DFHack::MaterialInfo &mi );
-
- void write_coins();
-
- void read_coins();
-
- void bars_blocks_setup_other_mats();
+private:
+    df::stockpile_settings *mSettings;
+
+    bool write_ammo(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::AmmoSet* ammo);
+    void read_ammo(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_animals(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::AnimalsSet* animals);
+    void read_animals(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_armor(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::ArmorSet* armor);
+    void read_armor(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_bars_blocks(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::BarsBlocksSet* bars_blocks);
+    void read_bars_blocks(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_cloth(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::ClothSet* cloth);
+    void read_cloth(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_coins(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::CoinSet* coins);
+    void read_coins(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_finished_goods(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::FinishedGoodsSet* finished_goods);
+    void read_finished_goods(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    food_pair food_map(df::enums::organic_mat_category::organic_mat_category cat);
+    bool write_food(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::FoodSet* food);
+    void read_food(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_furniture(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::FurnitureSet* furniture);
+    void read_furniture(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_gems(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::GemsSet* gems);
+    void read_gems(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_leather(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::LeatherSet* leather);
+    void read_leather(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_corpses(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::CorpsesSet* corpses);
+    void read_corpses(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_refuse(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::RefuseSet* refuse);
+    void read_refuse(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_sheet(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::SheetSet* sheet);
+    void read_sheet(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_stone(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::StoneSet* stone);
+    void read_stone(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_weapons(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::WeaponsSet* weapons);
+    void read_weapons(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+    bool write_wood(DFHack::color_ostream& out, dfstockpiles::StockpileSettings::WoodSet* wood);
+    void read_wood(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
+};
 
- bool bars_mat_is_allowed ( const DFHack::MaterialInfo &mi );
+/**
+ * Class for serializing a stockpile into a Google protobuf
+ */
+class StockpileSerializer : public StockpileSettingsSerializer {
+public:
+    /**
+     * @param stockpile stockpile to read or write settings to
+     */
+    StockpileSerializer(df::building_stockpilest* stockpile);
 
- bool blocks_mat_is_allowed ( const DFHack::MaterialInfo &mi );
+    ~StockpileSerializer();
 
- void write_bars_blocks();
- void read_bars_blocks();
- bool gem_mat_is_allowed ( const DFHack::MaterialInfo &mi );
- bool gem_cut_mat_is_allowed ( const DFHack::MaterialInfo &mi );
- bool gem_other_mat_is_allowed(DFHack::MaterialInfo &mi );
+protected:
+    // read memory structures and serialize to protobuf
+    virtual void write(DFHack::color_ostream& out, uint32_t includedElements);
 
- void write_gems();
+    // parse serialized data into ui indices
+    virtual void read(DFHack::color_ostream& out, DeserializeMode mode, const std::vector<std::string>& filters);
 
- void read_gems();
+    virtual void write_general(DFHack::color_ostream& out);
+    virtual void read_general(DFHack::color_ostream& out, DeserializeMode mode);
 
- bool finished_goods_type_is_allowed ( df::enums::item_type::item_type type );
- void finished_goods_setup_other_mats();
- bool finished_goods_mat_is_allowed ( const DFHack::MaterialInfo &mi );
- void write_finished_goods();
- void read_finished_goods();
- void write_leather();
- void read_leather();
- void write_cloth();
-    void read_cloth();
-    bool wood_mat_is_allowed ( const df::plant_raw * plant );
-    void write_wood();
-    void read_wood();
-    bool weapons_mat_is_allowed ( const DFHack::MaterialInfo &mi );
-    void write_weapons();
-    void read_weapons();
-    void weapons_armor_setup_other_mats();
-    bool armor_mat_is_allowed ( const DFHack::MaterialInfo &mi );
-    void write_armor();
-    void read_armor();
+private:
+    df::building_stockpilest* mPile;
 
+    void write_containers(DFHack::color_ostream& out);
+    void read_containers(DFHack::color_ostream& out, DeserializeMode mode);
 };
diff --git a/plugins/stockpiles/StockpileUtils.h b/plugins/stockpiles/StockpileUtils.h
index f5570be92..e78ffccd8 100644
--- a/plugins/stockpiles/StockpileUtils.h
+++ b/plugins/stockpiles/StockpileUtils.h
@@ -1,28 +1,24 @@
 #pragma once
 
+#include "LuaTools.h"
 #include "MiscUtils.h"
 
 #include "df/world.h"
-#include "df/world_data.h"
 #include "df/creature_raw.h"
 #include "df/plant_raw.h"
 
-#include <string>
-#include <algorithm>
-#include <functional>
-
-//  os
-#include <sys/stat.h>
-
 // Utility Functions {{{
 // A set of convenience functions for doing common lookups
 
+bool call_stockpiles_lua(DFHack::color_ostream* out, const char* fn_name,
+    int nargs = 0, int nres = 0,
+    DFHack::Lua::LuaLambda&& args_lambda = DFHack::Lua::DEFAULT_LUA_LAMBDA,
+    DFHack::Lua::LuaLambda&& res_lambda = DFHack::Lua::DEFAULT_LUA_LAMBDA);
 
 /**
  * Retrieve creature raw from index
  */
-static inline df::creature_raw* find_creature ( int32_t idx )
-{
+static inline df::creature_raw* find_creature(int32_t idx) {
     return df::global::world->raws.creatures.all[idx];
 }
 
@@ -30,16 +26,14 @@ static inline df::creature_raw* find_creature ( int32_t idx )
  * Retrieve creature index from id string
  * @return -1 if not found
  */
-static inline int16_t find_creature ( const std::string &creature_id )
-{
-    return linear_index ( df::global::world->raws.creatures.all, &df::creature_raw::creature_id, creature_id );
+static inline int16_t find_creature(const std::string& creature_id) {
+    return linear_index(df::global::world->raws.creatures.all, &df::creature_raw::creature_id, creature_id);
 }
 
 /**
  * Retrieve plant raw from index
 */
-static inline df::plant_raw* find_plant ( size_t idx )
-{
+static inline df::plant_raw* find_plant(size_t idx) {
     return df::global::world->raws.plants.all[idx];
 }
 
@@ -47,32 +41,26 @@ static inline df::plant_raw* find_plant ( size_t idx )
  * Retrieve plant index from id string
  * @return -1 if not found
  */
-static inline size_t find_plant ( const std::string &plant_id )
-{
-    return linear_index ( df::global::world->raws.plants.all, &df::plant_raw::id, plant_id );
+static inline size_t find_plant(const std::string& plant_id) {
+    return linear_index(df::global::world->raws.plants.all, &df::plant_raw::id, plant_id);
 }
 
-struct less_than_no_case
-{
-   bool operator () (char x, char y) const
-   {
-       return toupper( static_cast< unsigned char >(x)) < toupper( static_cast< unsigned char >(y));
-   }
+struct less_than_no_case {
+    bool operator () (char x, char y) const {
+        return toupper(static_cast<unsigned char>(x)) < toupper(static_cast<unsigned char>(y));
+    }
 };
 
-static inline bool CompareNoCase(const std::string &a, const std::string &b)
-{
-    return std::lexicographical_compare( a.begin(),a.end(), b.begin(),b.end(), less_than_no_case() );
+static inline bool CompareNoCase(const std::string& a, const std::string& b) {
+    return std::lexicographical_compare(a.begin(), a.end(), b.begin(), b.end(), less_than_no_case());
 }
 
-
 /**
  * Checks if the parameter has the dfstock extension.
  * Doesn't check if the file exists or not.
  */
-static inline bool is_dfstockfile ( const std::string& filename )
-{
-    return filename.rfind ( ".dfstock" ) !=  std::string::npos;
+static inline bool is_dfstockfile(const std::string& filename) {
+    return filename.rfind(".dfstock") != std::string::npos;
 }
 
 // }}} utility Functions
diff --git a/plugins/stockpiles/proto/stockpiles.proto b/plugins/stockpiles/proto/stockpiles.proto
index 992989efd..681e7d927 100644
--- a/plugins/stockpiles/proto/stockpiles.proto
+++ b/plugins/stockpiles/proto/stockpiles.proto
@@ -7,12 +7,14 @@ option optimize_for = LITE_RUNTIME;
 message StockpileSettings {
 
   message AnimalsSet {
+    optional bool all = 4;
     optional bool empty_cages = 1;
     optional bool empty_traps = 2;
     repeated string enabled = 3;
   }
 
   message FoodSet {
+    optional bool all = 21;
     repeated string meat = 1;
     repeated string fish = 2;
     repeated string unprepared_fish = 20;
@@ -36,6 +38,7 @@ message StockpileSettings {
   }
 
   message FurnitureSet {
+      optional bool all = 7;
       repeated string type = 1;
       repeated string other_mats = 2;
       repeated string mats = 3;
@@ -44,6 +47,7 @@ message StockpileSettings {
       // UNUSED: optional bool sand_bags = 6;
   }
   message RefuseSet {
+      optional bool all = 12;
       repeated string type = 1;
       repeated string corpses = 2;
       repeated string body_parts = 3;
@@ -57,12 +61,14 @@ message StockpileSettings {
       optional bool rotten_raw_hide = 11;
   }
   message StoneSet {
-    repeated string mats = 1;
+      optional bool all = 2;
+      repeated string mats = 1;
   }
   message OreSet {
-    repeated string mats = 1;
+      repeated string mats = 1;
   }
   message AmmoSet {
+      optional bool all = 6;
       repeated string type = 1;
       repeated string other_mats = 2;
       repeated string mats = 3;
@@ -70,21 +76,25 @@ message StockpileSettings {
       repeated string quality_total = 5;
   }
   message CoinSet {
+      optional bool all = 2;
       repeated string mats = 1;
   }
   message BarsBlocksSet {
+      optional bool all = 5;
       repeated string bars_other_mats = 1;
       repeated string blocks_other_mats = 2;
       repeated string bars_mats = 3;
       repeated string blocks_mats = 4;
   }
   message GemsSet {
+      optional bool all = 5;
       repeated string rough_other_mats = 1;
       repeated string cut_other_mats = 2;
       repeated string rough_mats = 3;
       repeated string cut_mats = 4;
   }
   message FinishedGoodsSet {
+      optional bool all = 6;
       repeated string type = 1;
       repeated string other_mats = 2;
       repeated string mats = 3;
@@ -92,9 +102,11 @@ message StockpileSettings {
       repeated string quality_total = 5;
   }
   message LeatherSet {
+      optional bool all = 2;
       repeated string mats = 1;
   }
   message ClothSet {
+      optional bool all = 9;
       repeated string thread_silk = 1;
       repeated string thread_plant = 2;
       repeated string thread_yarn = 3;
@@ -105,9 +117,11 @@ message StockpileSettings {
       repeated string cloth_metal = 8;
   }
   message WoodSet {
+      optional bool all = 2;
       repeated string mats = 1;
   }
   message WeaponsSet {
+      optional bool all = 9;
       repeated string weapon_type = 1;
       repeated string trapcomp_type = 2;
       repeated string other_mats = 3;
@@ -117,8 +131,8 @@ message StockpileSettings {
       optional bool usable = 7;
       optional bool unusable = 8;
   }
-
   message ArmorSet {
+      optional bool all = 13;
       repeated string body = 1;
       repeated string head = 2;
       repeated string feet = 3;
@@ -129,33 +143,48 @@ message StockpileSettings {
       repeated string mats = 8;
       repeated string quality_core = 9;
       repeated string quality_total = 10;
-      optional bool usable =11;
+      optional bool usable = 11;
       optional bool unusable = 12;
   }
+  message CorpsesSet {
+      optional bool all = 1;
+      repeated string corpses = 2;
+  }
+  message SheetSet {
+      optional bool all = 1;
+      repeated string paper = 2;
+      repeated string parchment = 3;
+  }
 
+  // general settings
+  optional int32 max_barrels = 20;
+  optional int32 max_bins = 21;
+  optional int32 max_wheelbarrows = 22;
+  optional bool use_links_only = 23;
+  optional bool allow_organic = 18;
+  optional bool allow_inorganic = 19;
+
+  // categories
+  optional AmmoSet ammo = 8;
   optional AnimalsSet animals = 1;
+  optional ArmorSet  armor = 17;
+  optional BarsBlocksSet barsblocks = 10;
+  optional ClothSet cloth = 14;
+  optional CoinSet coin = 9;
+  optional FinishedGoodsSet finished_goods = 12;
   optional FoodSet food = 2;
   optional FurnitureSet furniture = 3;
-  optional int32 unknown1 = 4;
-  optional RefuseSet refuse = 5;
-  optional StoneSet stone = 6;
-  optional OreSet ore = 7;
-  optional AmmoSet ammo = 8;
-  optional CoinSet coin = 9;
-  optional BarsBlocksSet barsblocks = 10;
   optional GemsSet gems = 11;
-  optional FinishedGoodsSet finished_goods = 12;
   optional LeatherSet leather = 13;
-  optional ClothSet cloth = 14;
-  optional WoodSet wood = 15;
+  optional CorpsesSet corpses_v50 = 25;
+  optional RefuseSet refuse = 5;
+  optional SheetSet sheet = 26;
+  optional StoneSet stone = 6;
   optional WeaponsSet weapons = 16;
-  optional ArmorSet  armor = 17;
-  optional bool allow_organic = 18;
-  optional bool allow_inorganic = 19;
-  optional bool corpses = 24;
-  // extras
-  optional int32 max_barrels = 20;
-  optional int32 max_bins = 21;
-  optional int32 max_wheelbarrows = 22;
-  optional bool use_links_only = 23;
+  optional WoodSet wood = 15;
+
+  // deprecated
+  optional bool corpses = 24; // not marked as deprecated since we still read it
+  optional OreSet ore = 7 [deprecated=true];
+  optional int32 unknown1 = 4 [deprecated=true];
 }
diff --git a/plugins/stockpiles/stockpiles.cpp b/plugins/stockpiles/stockpiles.cpp
index aa36e20bd..840e4adc7 100644
--- a/plugins/stockpiles/stockpiles.cpp
+++ b/plugins/stockpiles/stockpiles.cpp
@@ -1,528 +1,199 @@
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
-#include "PluginManager.h"
-
-#include "DataFuncs.h"
+#include "Debug.h"
 #include "LuaTools.h"
-#include "modules/Filesystem.h"
-
-#include "../uicommon.h"
-
+#include "PluginManager.h"
 #include "StockpileUtils.h"
 #include "StockpileSerializer.h"
 
-
 #include "modules/Filesystem.h"
-#include "modules/Gui.h"
-#include "modules/Filesystem.h"
-
-#include "df/world.h"
-#include "df/world_data.h"
 
-#include "DataDefs.h"
-#include "df/ui.h"
+#include "df/building.h"
 #include "df/building_stockpilest.h"
-#include "df/stockpile_settings.h"
-#include "df/global_objects.h"
-#include "df/viewscreen_dwarfmodest.h"
+#include "df/hauling_route.h"
+#include "df/hauling_stop.h"
 
-//  stl
-#include <functional>
-#include <vector>
-
-using std::vector;
 using std::string;
-using std::endl;
-using namespace DFHack;
-using namespace df::enums;
-using namespace google::protobuf;
-using namespace dfstockpiles;
-
-DFHACK_PLUGIN ( "stockpiles" );
-REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(selection_rect);
-
-using df::building_stockpilest;
-using std::placeholders::_1;
-
-static command_result copystock ( color_ostream &out, vector <string> & parameters );
-static bool copystock_guard ( df::viewscreen *top );
-
-static command_result savestock ( color_ostream &out, vector <string> & parameters );
-static bool savestock_guard ( df::viewscreen *top );
-
-static command_result loadstock ( color_ostream &out, vector <string> & parameters );
-static bool loadstock_guard ( df::viewscreen *top );
-
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands )
-{
-    if ( world && ui )
-    {
-        commands.push_back(PluginCommand(
-            "copystock",
-            "Copy stockpile under cursor.",
-            copystock,
-            copystock_guard));
-        commands.push_back(PluginCommand(
-            "savestock",
-            "Save the active stockpile's settings to a file.",
-            savestock,
-            savestock_guard));
-        commands.push_back(PluginCommand(
-            "loadstock",
-            "Load and apply stockpile settings from a file.",
-            loadstock,
-            loadstock_guard));
-    }
-
-    return CR_OK;
-}
+using std::vector;
 
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    return CR_OK;
-}
+using namespace DFHack;
 
-DFhackCExport command_result plugin_onstatechange ( color_ostream &out, state_change_event event )
-{
-    switch ( event )
-    {
-    case SC_MAP_LOADED:
-        break;
-    default:
-        break;
-    }
+DFHACK_PLUGIN("stockpiles");
 
-    return CR_OK;
-}
+REQUIRE_GLOBAL(world);
 
-static bool copystock_guard ( df::viewscreen *top )
+namespace DFHack
 {
-    using namespace ui_sidebar_mode;
-
-    if ( !Gui::dwarfmode_hotkey ( top ) )
-        return false;
-
-    switch ( ui->main.mode )
-    {
-    case Stockpiles:
-        return true;
-    case BuildingItems:
-    case QueryBuilding:
-        return !!virtual_cast<building_stockpilest> ( world->selected_building );
-    default:
-        return false;
-    }
+DBG_DECLARE(stockpiles, log, DebugCategory::LINFO);
 }
 
-static command_result copystock ( color_ostream &out, vector <string> & parameters )
-{
-    // HOTKEY COMMAND: CORE ALREADY SUSPENDED
+static command_result do_command(color_ostream& out, vector<string>& parameters);
 
-    // For convenience: when used in the stockpiles mode, switch to 'q'
-    if ( ui->main.mode == ui_sidebar_mode::Stockpiles )
-    {
-        world->selected_building = NULL; // just in case it contains some kind of garbage
-        ui->main.mode = ui_sidebar_mode::QueryBuilding;
-        selection_rect->start_x = -30000;
+DFhackCExport command_result plugin_init(color_ostream &out, vector<PluginCommand> &commands) {
+    DEBUG(log, out).print("initializing %s\n", plugin_name);
 
-        out << "Switched back to query building." << endl;
-        return CR_OK;
-    }
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Import, export, or modify stockpile settings.",
+        do_command));
 
-    building_stockpilest *sp = virtual_cast<building_stockpilest> ( world->selected_building );
-    if ( !sp )
-    {
-        out.printerr ( "Selected building isn't a stockpile.\n" );
-        return CR_WRONG_USAGE;
-    }
-
-    ui->stockpile.custom_settings = sp->settings;
-    ui->main.mode = ui_sidebar_mode::Stockpiles;
-    world->selected_stockpile_type = stockpile_category::Custom;
-
-    out << "Stockpile options copied." << endl;
     return CR_OK;
 }
 
+bool call_stockpiles_lua(color_ostream* out, const char* fn_name,
+    int nargs, int nres, Lua::LuaLambda&& args_lambda, Lua::LuaLambda&& res_lambda) {
 
-static bool savestock_guard ( df::viewscreen *top )
-{
-    using namespace ui_sidebar_mode;
-
-    if ( !Gui::dwarfmode_hotkey ( top ) )
-        return false;
+    DEBUG(log).print("calling stockpiles lua function: '%s'\n", fn_name);
 
-    switch ( ui->main.mode )
-    {
-    case Stockpiles:
-        return true;
-    case BuildingItems:
-    case QueryBuilding:
-        return !!virtual_cast<building_stockpilest> ( world->selected_building );
-    default:
-        return false;
-    }
-}
+    CoreSuspender guard;
 
-static bool loadstock_guard ( df::viewscreen *top )
-{
-    using namespace ui_sidebar_mode;
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
 
-    if ( !Gui::dwarfmode_hotkey ( top ) )
-        return false;
+    if (!out)
+        out = &Core::getInstance().getConsole();
 
-    switch ( ui->main.mode )
-    {
-    case Stockpiles:
-        return true;
-    case BuildingItems:
-    case QueryBuilding:
-        return !!virtual_cast<building_stockpilest> ( world->selected_building );
-    default:
-        return false;
-    }
+    return Lua::CallLuaModuleFunction(*out, L, "plugins.stockpiles", fn_name,
+            nargs, nres,
+            std::forward<Lua::LuaLambda&&>(args_lambda),
+            std::forward<Lua::LuaLambda&&>(res_lambda));
 }
 
-//  exporting
-static command_result savestock ( color_ostream &out, vector <string> & parameters )
-{
-    building_stockpilest *sp = virtual_cast<building_stockpilest> ( world->selected_building );
-    if ( !sp )
-    {
-        out.printerr ( "Selected building isn't a stockpile.\n" );
-        return CR_WRONG_USAGE;
-    }
-
-    if ( parameters.size() > 2 )
-    {
-        out.printerr ( "Invalid parameters\n" );
-        return CR_WRONG_USAGE;
-    }
-
-    bool debug = false;
-    std::string file;
-    for ( size_t i = 0; i < parameters.size(); ++i )
-    {
-        const std::string o = parameters.at ( i );
-        if ( o == "--debug"  ||  o ==  "-d" )
-            debug =  true;
-        else  if ( !o.empty() && o[0] !=  '-' )
-        {
-            file = o;
-        }
-    }
-    if ( file.empty() )
-    {
-        out.printerr ( "You must supply a valid filename.\n" );
-        return CR_WRONG_USAGE;
-    }
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
 
-    StockpileSerializer cereal ( sp );
-    if ( debug )
-        cereal.enable_debug ( out );
-
-    if ( !is_dfstockfile ( file ) ) file += ".dfstock";
-    try
-    {
-        if ( !cereal.serialize_to_file ( file ) )
-        {
-            out.printerr ( "could not save to %s\n", file.c_str() );
-            return CR_FAILURE;
-        }
-    }
-    catch ( std::exception &e )
-    {
-        out.printerr ( "serialization failed: protobuf exception: %s\n", e.what() );
+    bool show_help = false;
+    if (!call_stockpiles_lua(&out, "parse_commandline", 1, 1,
+            [&](lua_State *L) {
+                Lua::PushVector(L, parameters);
+            },
+            [&](lua_State *L) {
+                show_help = !lua_toboolean(L, -1);
+            })) {
         return CR_FAILURE;
     }
 
-    return CR_OK;
+    return show_help ? CR_WRONG_USAGE : CR_OK;
 }
 
+/////////////////////////////////////////////////////
+// Lua API
+//
 
-// importing
-static command_result loadstock ( color_ostream &out, vector <string> & parameters )
-{
-    building_stockpilest *sp = virtual_cast<building_stockpilest> ( world->selected_building );
-    if ( !sp )
-    {
-        out.printerr ( "Selected building isn't a stockpile.\n" );
-        return CR_WRONG_USAGE;
-    }
+static df::building_stockpilest* get_stockpile(int id) {
+    return virtual_cast<df::building_stockpilest>(df::building::find(id));
+}
 
-    if ( parameters.size() < 1 ||  parameters.size() > 2 )
-    {
-        out.printerr ( "Invalid parameters\n" );
-        return CR_WRONG_USAGE;
+static bool stockpiles_export(color_ostream& out, string fname, int id, uint32_t includedElements) {
+    df::building_stockpilest* sp = get_stockpile(id);
+    if (!sp) {
+        out.printerr("Specified building isn't a stockpile: %d.\n", id);
+        return false;
     }
 
-    bool debug = false;
-    std::string file;
-    for ( size_t i = 0; i < parameters.size(); ++i )
-    {
-        const std::string o = parameters.at ( i );
-        if ( o == "--debug"  ||  o ==  "-d" )
-            debug =  true;
-        else  if ( !o.empty() && o[0] !=  '-' )
-        {
-            file = o;
-        }
-    }
-    if ( file.empty() ) {
-        out.printerr ( "ERROR: missing .dfstock file parameter\n");
-        return DFHack::CR_WRONG_USAGE;
-    }
-    if ( !is_dfstockfile ( file ) )
-        file += ".dfstock";
-    if ( !Filesystem::exists ( file ) )
-    {
-        out.printerr ( "ERROR: the .dfstock file doesn't exist: %s\n",  file.c_str());
-        return CR_WRONG_USAGE;
-    }
+    if (!is_dfstockfile(fname))
+        fname += ".dfstock";
 
-    StockpileSerializer cereal ( sp );
-    if ( debug )
-        cereal.enable_debug ( out );
-    try
-    {
-        if ( !cereal.unserialize_from_file ( file ) )
-        {
-            out.printerr ( "unserialization failed: %s\n", file.c_str() );
-            return CR_FAILURE;
+    try {
+        StockpileSerializer cereal(sp);
+        if (!cereal.serialize_to_file(out, fname, includedElements)) {
+            out.printerr("could not save to '%s'\n", fname.c_str());
+            return false;
         }
     }
-    catch ( std::exception &e )
-    {
-        out.printerr ( "unserialization failed: protobuf exception: %s\n", e.what() );
-        return CR_FAILURE;
-    }
-    return CR_OK;
-}
-
-/**
- * calls the lua function manage_settings() to kickoff the GUI
- */
-bool manage_settings ( building_stockpilest *sp )
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out ( Core::getInstance().getConsole() );
-
-    CoreSuspendClaimer suspend;
-    Lua::StackUnwinder top ( L );
-
-    if ( !lua_checkstack ( L, 2 ) )
-        return false;
-
-    if ( !Lua::PushModulePublic ( out, L, "plugins.stockpiles", "manage_settings" ) )
-        return false;
-
-    Lua::Push ( L, sp );
-
-    if ( !Lua::SafeCall ( out, L, 1, 2 ) )
+    catch (std::exception& e) {
+        out.printerr("serialization failed: protobuf exception: %s\n", e.what());
         return false;
+    }
 
     return true;
 }
 
-bool show_message_box ( const std::string & title,  const std::string & msg,  bool is_error = false )
-{
-    auto L = Lua::Core::State;
-    color_ostream_proxy out ( Core::getInstance().getConsole() );
+static bool stockpiles_import(color_ostream& out, string fname, int id, string mode_str, string filter) {
+    df::building_stockpilest* sp = get_stockpile(id);
+    if (!sp) {
+        out.printerr("Specified building isn't a stockpile: %d.\n", id);
+        return false;
+    }
 
-    CoreSuspendClaimer suspend;
-    Lua::StackUnwinder top ( L );
+    if (!is_dfstockfile(fname))
+        fname += ".dfstock";
 
-    if ( !lua_checkstack ( L, 4 ) )
+    if (!Filesystem::exists(fname)) {
+        out.printerr("ERROR: file doesn't exist: '%s'\n", fname.c_str());
         return false;
+    }
 
-    if ( !Lua::PushModulePublic ( out, L, "plugins.stockpiles", "show_message_box" ) )
-        return false;
+    DeserializeMode mode = DESERIALIZE_MODE_SET;
+    if (mode_str == "enable")
+        mode = DESERIALIZE_MODE_ENABLE;
+    else if (mode_str == "disable")
+        mode = DESERIALIZE_MODE_DISABLE;
 
-    Lua::Push ( L, title );
-    Lua::Push ( L, msg );
-    Lua::Push ( L, is_error );
+    vector<string> filters;
+    split_string(&filters, filter, ",", true);
 
-    if ( !Lua::SafeCall ( out, L, 3, 0 ) )
+    try {
+        StockpileSerializer cereal(sp);
+        if (!cereal.unserialize_from_file(out, fname, mode, filters)) {
+            out.printerr("deserialization failed: '%s'\n", fname.c_str());
+            return false;
+        }
+    }
+    catch (std::exception& e) {
+        out.printerr("deserialization failed: protobuf exception: %s\n", e.what());
         return false;
+    }
 
     return true;
 }
 
-struct stockpiles_import_hook : public df::viewscreen_dwarfmodest
-{
-    typedef df::viewscreen_dwarfmodest interpose_base;
-
-    bool handleInput ( set<df::interface_key> *input )
-    {
-        if ( Gui::inRenameBuilding() )
-            return false;
-
-        df::building_stockpilest *sp = get_selected_stockpile();
-        if ( !sp )
-            return false;
-
-        if ( input->count ( interface_key::CUSTOM_L ) )
-        {
-            manage_settings ( sp );
-            return true;
-        }
-
+static bool stockpiles_route_import(color_ostream& out, string fname, int route_id, int stop_id, string mode_str, string filter) {
+    auto route = df::hauling_route::find(route_id);
+    if (!route) {
+        out.printerr("Specified hauling route not found: %d.\n", route_id);
         return false;
     }
 
-    DEFINE_VMETHOD_INTERPOSE ( void, feed, ( set<df::interface_key> *input ) )
-    {
-        if ( !handleInput ( input ) )
-            INTERPOSE_NEXT ( feed ) ( input );
+    df::hauling_stop *stop = binsearch_in_vector(route->stops, &df::hauling_stop::id, stop_id);
+    if (!stop) {
+        out.printerr("Specified hauling stop not found in route %d: %d.\n", route_id, stop_id);
+        return false;
     }
 
-    DEFINE_VMETHOD_INTERPOSE ( void, render, () )
-    {
-        INTERPOSE_NEXT ( render ) ();
-
-        df::building_stockpilest *sp = get_selected_stockpile();
-        if ( !sp )
-            return;
+    if (!is_dfstockfile(fname))
+        fname += ".dfstock";
 
-        auto dims = Gui::getDwarfmodeViewDims();
-        int left_margin = dims.menu_x1 + 1;
-        int x = left_margin;
-        int y = dims.y2 - 3; // below autodump, automelt, autotrade, stocks; above stockflow
-        OutputHotkeyString ( x, y, "Load/Save Settings", "l", true, left_margin, COLOR_WHITE, COLOR_LIGHTRED );
+    if (!Filesystem::exists(fname)) {
+        out.printerr("ERROR: file doesn't exist: '%s'\n", fname.c_str());
+        return false;
     }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE ( stockpiles_import_hook, feed );
-IMPLEMENT_VMETHOD_INTERPOSE ( stockpiles_import_hook, render );
-
-DFHACK_PLUGIN_IS_ENABLED ( is_enabled );
-
-DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable )
-{
-    if ( !gps )
-        return CR_FAILURE;
 
-    if ( enable != is_enabled )
-    {
-        if (
-            !INTERPOSE_HOOK ( stockpiles_import_hook, feed ).apply ( enable ) ||
-            !INTERPOSE_HOOK ( stockpiles_import_hook, render ).apply ( enable )
-        )
-            return CR_FAILURE;
+    DeserializeMode mode = DESERIALIZE_MODE_SET;
+    if (mode_str == "enable")
+        mode = DESERIALIZE_MODE_ENABLE;
+    else if (mode_str == "disable")
+        mode = DESERIALIZE_MODE_DISABLE;
 
-        is_enabled = enable;
-    }
+    vector<string> filters;
+    split_string(&filters, filter, ",", true);
 
-    return CR_OK;
-}
-
-static std::vector<std::string> list_dir ( const std::string &path, bool recursive = false )
-{
-//     color_ostream_proxy out ( Core::getInstance().getConsole() );
-    std::vector<std::string> files;
-    std::stack<std::string> dirs;
-    dirs.push(path);
-//     out <<  "list_dir start" <<  endl;
-    while (!dirs.empty() ) {
-        const std::string current = dirs.top();
-//         out <<  "\t walking " <<  current << endl;
-        dirs.pop();
-        std::vector<std::string> entries;
-        const int res = DFHack::getdir(current,  entries);
-        if ( res !=  0 )
-            continue;
-        for ( std::vector<std::string>::iterator it = entries.begin() ; it != entries.end(); ++it )
-        {
-            if ( (*it).empty() ||  (*it)[0] ==  '.' ) continue;
-            //  shitty cross platform c++ we've got to construct the actual path manually
-            std::ostringstream child_path_s;
-            child_path_s <<  current <<  "/" <<  *it;
-            const std::string child = child_path_s.str();
-            if ( recursive && Filesystem::isdir ( child ) )
-            {
-//                 out <<  "\t\tgot child dir: " <<  child <<  endl;
-                dirs.push ( child );
-            }
-            else if ( Filesystem::isfile ( child ) )
-            {
-                const std::string  rel_path ( child.substr ( std::string ( "./"+path).length()-1 ) );
-//                 out <<  "\t\t adding file: " <<  child << "  as   " <<  rel_path  <<  endl;
-                files.push_back ( rel_path );
-            }
+    try {
+        StockpileSettingsSerializer cereal(&stop->settings);
+        if (!cereal.unserialize_from_file(out, fname, mode, filters)) {
+            out.printerr("deserialization failed: '%s'\n", fname.c_str());
+            return false;
         }
     }
-//     out <<  "listdir_stop" <<  endl;
-    return files;
-}
-
-static std::vector<std::string> clean_dfstock_list ( const std::string &path )
-{
-    if ( !Filesystem::exists ( path ) )
-    {
-        return std::vector<std::string>();
-    }
-    std::vector<std::string> files ( list_dir ( path,  true) );
-    files.erase ( std::remove_if ( files.begin(), files.end(), [] ( const std::string &f )
-    {
-        return !is_dfstockfile ( f );
-    } ),  files.end() );
-    std::transform ( files.begin(), files.end(), files.begin(), [] ( const std::string &f )
-    {
-        return f.substr ( 0, f.find_last_of ( "." ) );
-    } );
-    std::sort ( files.begin(),files.end(), CompareNoCase );
-    return files;
-}
-
-static int stockpiles_list_settings ( lua_State *L )
-{
-    auto path = luaL_checkstring ( L, 1 );
-    if ( Filesystem::exists ( path ) && !Filesystem::isdir ( path ) )
-    {
-        lua_pushfstring ( L,  "stocksettings path invalid: %s",  path );
-        lua_error ( L );
-        return 0;
+    catch (std::exception& e) {
+        out.printerr("deserialization failed: protobuf exception: %s\n", e.what());
+        return false;
     }
-    std::vector<std::string> files = clean_dfstock_list ( path );
-    Lua::PushVector ( L, files, true );
-    return 1;
-}
-
-const std::string err_title = "Stockpile Settings Error";
-const std::string err_help = "Does the folder exist?\nCheck the console for more information.";
-
-static void stockpiles_load ( color_ostream &out, std::string filename )
-{
-    std::vector<std::string> params;
-    params.push_back ( filename );
-    command_result r = loadstock ( out, params );
-    if ( r !=  CR_OK )
-        show_message_box ( err_title, "Couldn't load. " + err_help,  true );
-}
-
 
-static void stockpiles_save ( color_ostream &out, std::string filename )
-{
-    std::vector<std::string> params;
-    params.push_back ( filename );
-    command_result r = savestock ( out, params );
-    if ( r !=  CR_OK )
-        show_message_box ( err_title, "Couldn't save. " + err_help,  true );
+    return true;
 }
 
-DFHACK_PLUGIN_LUA_FUNCTIONS
-{
-    DFHACK_LUA_FUNCTION ( stockpiles_load ),
-    DFHACK_LUA_FUNCTION ( stockpiles_save ),
-    DFHACK_LUA_END
-};
-
-DFHACK_PLUGIN_LUA_COMMANDS
-{
-    DFHACK_LUA_COMMAND ( stockpiles_list_settings ),
+DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(stockpiles_export),
+    DFHACK_LUA_FUNCTION(stockpiles_import),
+    DFHACK_LUA_FUNCTION(stockpiles_route_import),
     DFHACK_LUA_END
 };
diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp
index 62c13dcd5..771160b4a 100644
--- a/plugins/stocks.cpp
+++ b/plugins/stocks.cpp
@@ -1,3 +1,13 @@
+#include "PluginManager.h"
+
+using std::vector;
+using std::string;
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("stocks");
+
+/*
 #include "uicommon.h"
 #include "listcolumn.h"
 
@@ -27,7 +37,7 @@
 #include "modules/Maps.h"
 #include "modules/Units.h"
 #include "df/building_cagest.h"
-#include "df/ui_advmode.h"
+#include "df/adventurest.h"
 
 DFHACK_PLUGIN("stocks");
 #define PLUGIN_VERSION 0.13
@@ -41,12 +51,12 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 
 #define MAX_NAME 30
 #define SIDEBAR_WIDTH 30
-
+*/
 
 /*
  * Utility
  */
-
+/*
 static string get_quality_name(const df::item_quality quality)
 {
     if (gps->dimx - SIDEBAR_WIDTH < 60)
@@ -66,12 +76,12 @@ static df::item *get_container_of(df::unit *unit)
     auto ref = Units::getGeneralRef(unit, general_ref_type::CONTAINED_IN_ITEM);
     return (ref) ? ref->getItem() : nullptr;
 }
-
+*/
 
 /*
  * Trade Info
  */
-
+/*
 class TradeDepotInfo
 {
 public:
@@ -168,12 +178,12 @@ private:
 };
 
 static TradeDepotInfo depot_info;
-
+*/
 
 /*
  * Item manipulation
  */
-
+/*
 static map<df::item *, bool> items_in_cages;
 
 static df::job *get_item_job(df::item *item)
@@ -685,7 +695,7 @@ public:
         }
         else if (input->count(interface_key::HELP))
         {
-            Screen::show(dts::make_unique<search_help>(), plugin_self);
+            Screen::show(std::make_unique<search_help>(), plugin_self);
         }
 
         bool key_processed = false;
@@ -950,7 +960,7 @@ public:
 
         OutputHotkeyString(x, y, "Min Qual: ", "-+");
         OutputString(COLOR_BROWN, x, y, get_quality_name(min_quality), true, left_margin);
-        OutputHotkeyString(x, y, "Max Qual: ", "/*");
+        OutputHotkeyString(x, y, "Max Qual: ", "/ *");
         OutputString(COLOR_BROWN, x, y, get_quality_name(max_quality), true, left_margin);
         OutputHotkeyString(x, y, "Min Wear: ", "Shift-W");
         OutputString(COLOR_BROWN, x, y, int_to_string(min_wear), true, left_margin);
@@ -1350,7 +1360,7 @@ struct stocks_hook : public df::viewscreen_storesst
         if (input->count(interface_key::CUSTOM_E))
         {
             Screen::dismiss(this);
-            Screen::show(dts::make_unique<ViewscreenStocks>(), plugin_self);
+            Screen::show(std::make_unique<ViewscreenStocks>(), plugin_self);
             return;
         }
         INTERPOSE_NEXT(feed)(input);
@@ -1385,7 +1395,7 @@ struct stocks_stockpile_hook : public df::viewscreen_dwarfmodest
 
         if (input->count(interface_key::CUSTOM_I))
         {
-            Screen::show(dts::make_unique<ViewscreenStocks>(sp), plugin_self);
+            Screen::show(std::make_unique<ViewscreenStocks>(sp), plugin_self);
             return true;
         }
 
@@ -1459,26 +1469,29 @@ static command_result stocks_cmd(color_ostream &out, vector <string> & parameter
         }
         else if (toLower(parameters[0])[0] == 's')
         {
-            Screen::show(dts::make_unique<ViewscreenStocks>(), plugin_self);
+            Screen::show(std::make_unique<ViewscreenStocks>(), plugin_self);
             return CR_OK;
         }
     }
 
     return CR_WRONG_USAGE;
 }
+*/
 
-DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
+DFhackCExport command_result plugin_init (color_ostream &out, vector <PluginCommand> &commands)
 {
+    /*
     commands.push_back(PluginCommand(
         "stocks",
         "An improved stocks management screen.",
         stocks_cmd));
 
     ViewscreenStocks::reset();
-
+    */
     return CR_OK;
 }
 
+/*
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
 {
     switch (event) {
@@ -1491,3 +1504,4 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 
     return CR_OK;
 }
+*/
diff --git a/plugins/stonesense b/plugins/stonesense
index 25e7452f0..2f87534ce 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit 25e7452f01b49b0a479d2c77a922cabbb7fd1e4c
+Subproject commit 2f87534cebdeee4ce7281333c8f71ae5b93790b9
diff --git a/plugins/strangemood.cpp b/plugins/strangemood.cpp
index a5b8e74a4..88d1df071 100644
--- a/plugins/strangemood.cpp
+++ b/plugins/strangemood.cpp
@@ -23,7 +23,7 @@
 #include "df/job.h"
 #include "df/job_item.h"
 #include "df/map_block.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/unit_preference.h"
 #include "df/unit_relationship_type.h"
@@ -39,7 +39,7 @@ using namespace df::enums;
 DFHACK_PLUGIN("strangemood");
 
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(d_init);
 REQUIRE_GLOBAL(created_item_count);
 REQUIRE_GLOBAL(created_item_type);
@@ -80,7 +80,7 @@ df::job_skill getMoodSkill (df::unit *unit)
         {
         case job_skill::MINING:
         case job_skill::CARPENTRY:
-        case job_skill::DETAILSTONE:
+        case job_skill::ENGRAVE_STONE:
         case job_skill::MASONRY:
         case job_skill::TANNER:
         case job_skill::WEAVING:
@@ -288,15 +288,15 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
     {
         if(parameters[i] == "help" || parameters[i] == "?")
             return CR_WRONG_USAGE;
-        else if(parameters[i] == "-force")
+        else if(parameters[i] == "--force")
             force = true;
-        else if(parameters[i] == "-unit")
+        else if(parameters[i] == "--unit")
         {
             unit = DFHack::Gui::getSelectedUnit(out);
             if (!unit)
                 return CR_FAILURE;
         }
-        else if (parameters[i] == "-type")
+        else if (parameters[i] == "--type")
         {
             i++;
             if (i == parameters.size())
@@ -320,7 +320,7 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
                 return CR_WRONG_USAGE;
             }
         }
-        else if (parameters[i] == "-skill")
+        else if (parameters[i] == "--skill")
         {
             i++;
             if (i == parameters.size())
@@ -333,7 +333,7 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
             else if (parameters[i] == "carpenter")
                 skill = job_skill::CARPENTRY;
             else if (parameters[i] == "engraver")
-                skill = job_skill::DETAILSTONE;
+                skill = job_skill::ENGRAVE_STONE;
             else if (parameters[i] == "mason")
                 skill = job_skill::MASONRY;
             else if (parameters[i] == "tanner")
@@ -394,7 +394,7 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
         out.printerr("Strange moods disabled via debug flag!\n");
         return CR_FAILURE;
     }
-    if (ui->mood_cooldown && !force)
+    if (plotinfo->mood_cooldown && !force)
     {
         out.printerr("Last strange mood happened too recently!\n");
         return CR_FAILURE;
@@ -406,7 +406,7 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
         df::unit *cur = world->units.active[i];
         if (Units::isCitizen(cur) && cur->flags1.bits.has_mood)
         {
-            ui->mood_cooldown = 1000;
+            plotinfo->mood_cooldown = 1000;
             out.printerr("A strange mood is already in progress!\n");
             return CR_FAILURE;
         }
@@ -466,12 +466,12 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
                     if (blk->designation[x][y].bits.subterranean && !blk->designation[x][y].bits.hidden)
                         num_revealed_tiles++;
         }
-        if (num_revealed_tiles / 2304 < ui->tasks.num_artifacts)
+        if (num_revealed_tiles / 2304 < plotinfo->tasks.num_artifacts)
         {
             out.printerr("Fortress is not eligible for a strange mood at this time - not enough subterranean tiles revealed.\n");
             return CR_FAILURE;
         }
-        if (num_items / 200 < ui->tasks.num_artifacts)
+        if (num_items / 200 < plotinfo->tasks.num_artifacts)
         {
             out.printerr("Fortress is not eligible for a strange mood at this time - not enough items created\n");
             return CR_FAILURE;
@@ -544,14 +544,14 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
         return CR_FAILURE;
     }
 
-    ui->mood_cooldown = 1000;
+    plotinfo->mood_cooldown = 1000;
     // If no mood type was specified, pick one randomly
     if (type == mood_type::None)
     {
         if (soul && (
-            (soul->personality.stress_level >= 500000) ||
-            (soul->personality.stress_level >= 250000 && !rng.df_trandom(2)) ||
-            (soul->personality.stress_level >= 100000 && !rng.df_trandom(10))
+            (soul->personality.stress >= 500000) ||
+            (soul->personality.stress >= 250000 && !rng.df_trandom(2)) ||
+            (soul->personality.stress >= 100000 && !rng.df_trandom(10))
             ))
         {
             switch (rng.df_trandom(2))
@@ -639,7 +639,7 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
         case job_skill::CARPENTRY:
             job->job_type = job_type::StrangeMoodCarpenter;
             break;
-        case job_skill::DETAILSTONE:
+        case job_skill::ENGRAVE_STONE:
         case job_skill::WOODCRAFT:
         case job_skill::STONECRAFT:
         case job_skill::BONECARVE:
@@ -749,7 +749,7 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
         switch (skill)
         {
         case job_skill::MINING:
-        case job_skill::DETAILSTONE:
+        case job_skill::ENGRAVE_STONE:
         case job_skill::MASONRY:
         case job_skill::STONECRAFT:
         case job_skill::MECHANICS:
@@ -1034,13 +1034,13 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
          (job->job_type == job_type::StrangeMoodFell)
        ))
     {
-        int extra_items = std::min(rng.df_trandom((ui->tasks.num_artifacts * 20 + moodable_units.size()) / 20 + 1), 7);
+        int extra_items = std::min(rng.df_trandom((plotinfo->tasks.num_artifacts * 20 + moodable_units.size()) / 20 + 1), 7);
         df::item_type avoid_type = item_type::NONE;
         int avoid_glass = 0;
         switch (skill)
         {
         case job_skill::MINING:
-        case job_skill::DETAILSTONE:
+        case job_skill::ENGRAVE_STONE:
         case job_skill::MASONRY:
         case job_skill::STONECRAFT:
             avoid_type = item_type::BLOCKS;
@@ -1217,7 +1217,6 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
     ref->setID(unit->id);
     job->general_refs.push_back(ref);
     unit->job.current_job = job;
-    job->wait_timer = 0;
 
     // Generate the artifact's name
     if (type == mood_type::Fell || type == mood_type::Macabre)
diff --git a/plugins/tailor.cpp b/plugins/tailor.cpp
index bd11988d0..ac71749ee 100644
--- a/plugins/tailor.cpp
+++ b/plugins/tailor.cpp
@@ -1,164 +1,230 @@
 /*
  * Tailor plugin. Automatically manages keeping your dorfs clothed.
- * For best effect, place "tailor enable" in your dfhack.init configuration,
- * or set AUTOENABLE to true.
  */
 
-#include "Core.h"
-#include "DataDefs.h"
-#include "PluginManager.h"
+#include <string>
+#include <vector>
 
 #include "df/creature_raw.h"
-#include "df/global_objects.h"
 #include "df/historical_entity.h"
+#include "df/item.h"
+#include "df/item_flags.h"
 #include "df/itemdef_armorst.h"
 #include "df/itemdef_glovesst.h"
 #include "df/itemdef_helmst.h"
 #include "df/itemdef_pantsst.h"
 #include "df/itemdef_shoesst.h"
 #include "df/items_other_id.h"
-#include "df/job.h"
-#include "df/job_type.h"
 #include "df/manager_order.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/world.h"
 
-#include "modules/Maps.h"
-#include "modules/Units.h"
+#include "Core.h"
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+
+#include "modules/Materials.h"
+#include "modules/Persistence.h"
 #include "modules/Translation.h"
+#include "modules/Units.h"
 #include "modules/World.h"
 
-using namespace DFHack;
-using namespace std;
+using std::string;
+using std::vector;
 
-using df::global::world;
-using df::global::ui;
+using namespace DFHack;
 
 DFHACK_PLUGIN("tailor");
-#define AUTOENABLE false
-DFHACK_PLUGIN_IS_ENABLED(enabled);
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
+REQUIRE_GLOBAL(plotinfo);
+REQUIRE_GLOBAL(standing_orders_use_dyed_cloth);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
 
-class Tailor {
-    // ARMOR, SHOES, HELM, GLOVES, PANTS
+namespace DFHack {
+    DBG_DECLARE(tailor, cycle, DebugCategory::LINFO);
+    DBG_DECLARE(tailor, config, DebugCategory::LINFO);
+}
 
-    // ah, if only STL had a bimap
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+static PersistentDataItem config;
 
-private:
+enum ConfigValues {
+    CONFIG_IS_ENABLED = 0,
+    CONFIG_SILK_IDX = 1,
+    CONFIG_CLOTH_IDX = 2,
+    CONFIG_YARN_IDX = 3,
+    CONFIG_LEATHER_IDX = 4,
+    CONFIG_ADAMANTINE_IDX = 5,
+};
 
-    const map<df::job_type, df::item_type> jobTypeMap = {
-        { df::job_type::MakeArmor, df::item_type::ARMOR },
-        { df::job_type::MakePants, df::item_type::PANTS },
-        { df::job_type::MakeHelm, df::item_type::HELM },
-        { df::job_type::MakeGloves, df::item_type::GLOVES },
-        { df::job_type::MakeShoes, df::item_type::SHOES }
-    };
-
-    const map<df::item_type, df::job_type> itemTypeMap = {
-        { df::item_type::ARMOR, df::job_type::MakeArmor },
-        { df::item_type::PANTS, df::job_type::MakePants },
-        { df::item_type::HELM, df::job_type::MakeHelm },
-        { df::item_type::GLOVES, df::job_type::MakeGloves },
-        { df::item_type::SHOES, df::job_type::MakeShoes }
-    };
-
-#define F(x) df::item_flags::mask_##x
-    const df::item_flags bad_flags = {
-        (
-        F(dump) | F(forbid) | F(garbage_collect) |
-        F(hostile) | F(on_fire) | F(rotten) | F(trader) |
-        F(in_building) | F(construction) | F(owned)
-        )
-    #undef F
-    };
-
-    class MatType {
-
-    public:
-        std::string name;
-        df::job_material_category job_material;
-        df::armor_general_flags armor_flag;
-
-        bool operator==(const MatType& m) const
-        {
-            return name == m.name;
-        }
+static int get_config_val(PersistentDataItem &c, int index) {
+    if (!c.isValid())
+        return -1;
+    return c.ival(index);
+}
+static bool get_config_bool(PersistentDataItem &c, int index) {
+    return get_config_val(c, index) == 1;
+}
+static void set_config_val(PersistentDataItem &c, int index, int value) {
+    if (c.isValid())
+        c.ival(index) = value;
+}
+static void set_config_bool(PersistentDataItem &c, int index, bool value) {
+    set_config_val(c, index, value ? 1 : 0);
+}
 
-        // operator< is required to use this as a std::map key
-        bool operator<(const MatType& m) const
-        {
-            return name < m.name;
-        }
+static const int32_t CYCLE_TICKS = 1200; // one day
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
+
+// ah, if only STL had a bimap
+static const std::map<df::job_type, df::item_type> jobTypeMap = {
+    { df::job_type::MakeArmor, df::item_type::ARMOR },
+    { df::job_type::MakePants, df::item_type::PANTS },
+    { df::job_type::MakeHelm, df::item_type::HELM },
+    { df::job_type::MakeGloves, df::item_type::GLOVES },
+    { df::job_type::MakeShoes, df::item_type::SHOES }
+};
+
+static const std::map<df::item_type, df::job_type> itemTypeMap = {
+    { df::item_type::ARMOR, df::job_type::MakeArmor },
+    { df::item_type::PANTS, df::job_type::MakePants },
+    { df::item_type::HELM, df::job_type::MakeHelm },
+    { df::item_type::GLOVES, df::job_type::MakeGloves },
+    { df::item_type::SHOES, df::job_type::MakeShoes }
+};
+
+class MatType {
+public:
+    const std::string name;
+    const df::job_material_category job_material;
+    const df::armor_general_flags armor_flag;
 
-        MatType(std::string& n, df::job_material_category jm, df::armor_general_flags af)
-            : name(n), job_material(jm), armor_flag(af) {};
-        MatType(const char* n, df::job_material_category jm, df::armor_general_flags af)
-            : name(std::string(n)), job_material(jm), armor_flag(af) {};
+    bool operator==(const MatType& m) const {
+        return name == m.name;
+    }
 
-    };
+    // operator< is required to use this as a std::map key
+    bool operator<(const MatType& m) const {
+        return name < m.name;
+    }
 
-    const MatType
-        M_SILK = MatType("silk", df::job_material_category::mask_silk, df::armor_general_flags::SOFT),
-        M_CLOTH = MatType("cloth", df::job_material_category::mask_cloth, df::armor_general_flags::SOFT),
-        M_YARN = MatType("yarn", df::job_material_category::mask_yarn, df::armor_general_flags::SOFT),
-        M_LEATHER = MatType("leather", df::job_material_category::mask_leather, df::armor_general_flags::LEATHER);
+    MatType(std::string& n, df::job_material_category jm, df::armor_general_flags af)
+        : name(n), job_material(jm), armor_flag(af) {};
+    MatType(const char* n, df::job_material_category jm, df::armor_general_flags af)
+        : name(std::string(n)), job_material(jm), armor_flag(af) {};
+};
 
-    std::list<MatType> all_materials = { M_SILK, M_CLOTH, M_YARN, M_LEATHER };
+static const MatType
+    M_SILK = MatType("silk", df::job_material_category::mask_silk, df::armor_general_flags::SOFT),
+    M_CLOTH = MatType("cloth", df::job_material_category::mask_cloth, df::armor_general_flags::SOFT),
+    M_YARN = MatType("yarn", df::job_material_category::mask_yarn, df::armor_general_flags::SOFT),
+    M_LEATHER = MatType("leather", df::job_material_category::mask_leather, df::armor_general_flags::LEATHER),
+    M_ADAMANTINE = MatType("adamantine", df::job_material_category::mask_strand, df::armor_general_flags::SOFT);
+
+static const std::list<MatType> all_materials = { M_SILK, M_CLOTH, M_YARN, M_LEATHER, M_ADAMANTINE };
+static const std::list<MatType> default_materials = { M_SILK, M_CLOTH, M_YARN, M_LEATHER }; // adamantine not included by default
+static std::list<MatType> material_order = default_materials;
+
+static struct BadFlags {
+    uint32_t whole;
+
+    BadFlags() {
+        df::item_flags flags;
+        #define F(x) flags.bits.x = true;
+        F(dump); F(forbid); F(garbage_collect);
+        F(hostile); F(on_fire); F(rotten); F(trader);
+        F(in_building); F(construction); F(owned);
+        F(in_chest); F(removed); F(encased);
+        F(spider_web);
+        #undef F
+        whole = flags.whole;
+    }
+} badFlags;
 
-    map<pair<df::item_type, int>, int> available; // key is item type & size
-    map<pair<df::item_type, int>, int> needed;    // same
-    map<pair<df::item_type, int>, int> queued;    // same
+class Tailor {
 
-    map<int, int> sizes; // this maps body size to races
+private:
+    std::map<int, int> sizes; // this maps body size to races
 
-    map<tuple<df::job_type, int, int>, int> orders;  // key is item type, item subtype, size
+    std::map<std::pair<df::item_type, int>, int> available;
 
-    std::map<MatType, int> supply;
+    std::map<std::pair<df::item_type, int>, int> needed;
 
-    color_ostream* out;
+    std::map<std::tuple<df::job_type, int, int>, int> orders;
 
-    std::list<MatType> material_order = { M_SILK, M_CLOTH, M_YARN, M_LEATHER };
+    std::map<MatType, int> supply;
     std::map<MatType, int> reserves;
 
     int default_reserve = 10;
 
+    bool inventory_sanity_checking = false;
+
+public:
+    void set_debug_flag(bool f)
+    {
+        inventory_sanity_checking = f;
+    }
+
     void reset()
     {
         available.clear();
         needed.clear();
-        queued.clear();
         sizes.clear();
-        orders.clear();
         supply.clear();
+        orders.clear();
     }
 
     void scan_clothing()
     {
-        for (auto i : world->items.other[df::items_other_id::ANY_GENERIC37]) // GENERIC37 is "clothing"
+        for (auto i : world->items.other[df::items_other_id::ANY_GENERIC37]) // GENERIC37 is "nontattered clothing"
         {
-            if (i->flags.whole & bad_flags.whole)
-                continue;
-            if (i->flags.bits.owned)
+            if (i->flags.whole & badFlags.whole)
+            {
                 continue;
+            }
             if (i->getWear() >= 1)
                 continue;
+            if (i->getMakerRace() < 0) // sometimes we get borked items with no valid maker race
+                continue;
+
             df::item_type t = i->getType();
             int size = world->raws.creatures.all[i->getMakerRace()]->adultsize;
 
-            available[make_pair(t, size)] += 1;
+            available[std::make_pair(t, size)] += 1;
+        }
+
+        if (DBG_NAME(cycle).isEnabled(DebugCategory::LDEBUG))
+        {
+            for (auto& i : available)
+            {
+                df::item_type t;
+                int size;
+                std::tie(t, size) = i.first;
+                DEBUG(cycle).print("tailor: %d %s of size %d found\n",
+                    i.second, ENUM_KEY_STR(item_type, t).c_str(), size);
+            }
         }
     }
 
     void scan_materials()
     {
+        bool require_dyed = df::global::standing_orders_use_dyed_cloth ? (*df::global::standing_orders_use_dyed_cloth) : false;
+
         for (auto i : world->items.other[df::items_other_id::CLOTH])
         {
-            if (i->flags.whole & bad_flags.whole)
+            if (i->flags.whole & badFlags.whole)
                 continue;
-            if (!i->hasImprovements()) // only count dyed
+
+            if (require_dyed && (!i->isDyed()))
+            {
+                // only count dyed
+                std::string d;
+                i->getItemDescription(&d, 0);
+                TRACE(cycle).print("tailor: skipping undyed %s\n", DF2CONSOLE(d).c_str());
                 continue;
+            }
             MaterialInfo mat(i);
             int ss = i->getStackSize();
 
@@ -170,17 +236,26 @@ private:
                     supply[M_CLOTH] += ss;
                 else if (mat.material->flags.is_set(df::material_flags::YARN))
                     supply[M_YARN] += ss;
+                else if (mat.material->flags.is_set(df::material_flags::STOCKPILE_THREAD_METAL))
+                    supply[M_ADAMANTINE] += ss;
+                else
+                {
+                    std::string d;
+                    i->getItemDescription(&d, 0);
+                    DEBUG(cycle).print("tailor: weird cloth item found: %s (%d)\n", DF2CONSOLE(d).c_str(), i->id);
+                }
             }
         }
 
         for (auto i : world->items.other[df::items_other_id::SKIN_TANNED])
         {
-            if (i->flags.whole & bad_flags.whole)
+            if (i->flags.whole & badFlags.whole)
                 continue;
             supply[M_LEATHER] += i->getStackSize();
         }
 
-        out->print("tailor: available silk %d yarn %d cloth %d leather %d\n", supply[M_SILK], supply[M_YARN], supply[M_CLOTH], supply[M_LEATHER]);
+        DEBUG(cycle).print("tailor: available silk %d yarn %d cloth %d leather %d adamantine %d\n",
+            supply[M_SILK], supply[M_YARN], supply[M_CLOTH], supply[M_LEATHER], supply[M_ADAMANTINE]);
     }
 
     void scan_replacements()
@@ -190,14 +265,13 @@ private:
             if (!Units::isOwnCiv(u) ||
                 !Units::isOwnGroup(u) ||
                 !Units::isActive(u) ||
-                Units::isBaby(u))
-                continue; // skip units we don't control
+                Units::isBaby(u) ||
+                !Units::casteFlagSet(u->race, u->caste, df::enums::caste_raw_flags::EQUIPS))
+                continue; // skip units we don't control or that can't wear clothes
 
-            set <df::item_type> wearing;
-            wearing.clear();
-
-            deque<df::item*> worn;
-            worn.clear();
+            std::set <df::item_type> wearing;
+            std::set <df::item_type> ordered;
+            std::deque<df::item*> worn;
 
             for (auto inv : u->inventory)
             {
@@ -209,51 +283,66 @@ private:
                     wearing.insert(inv->item->getType());
             }
 
-            int size = world->raws.creatures.all[u->race]->adultsize;
-            sizes[size] = u->race;
-
-            for (auto ty : set<df::item_type>{ df::item_type::ARMOR, df::item_type::PANTS, df::item_type::SHOES })
-            {
-                if (wearing.count(ty) == 0)
-                    needed[make_pair(ty, size)] += 1;
-            }
+            int usize = world->raws.creatures.all[u->race]->adultsize;
+            sizes[usize] = u->race;
 
             for (auto w : worn)
             {
                 auto ty = w->getType();
-                auto o = itemTypeMap.at(ty);
 
-                int size = world->raws.creatures.all[w->getMakerRace()]->adultsize;
+                int isize = world->raws.creatures.all[w->getMakerRace()]->adultsize;
                 std::string description;
                 w->getItemDescription(&description, 0);
 
-                if (available[make_pair(ty, size)] > 0)
+                if (wearing.count(ty) == 0)
+                {
+                    if (available[std::make_pair(ty, usize)] > 0)
+                    {
+                        available[std::make_pair(ty, usize)] -= 1;
+                        DEBUG(cycle).print("tailor: allocating a %s (size %d) to %s\n",
+                            ENUM_KEY_STR(item_type, ty).c_str(), usize,
+                            DF2CONSOLE(Translation::TranslateName(&u->name, false)).c_str());
+                        wearing.insert(ty);
+                    }
+                    else if (ordered.count(ty) == 0)
+                    {
+                        DEBUG(cycle).print ("tailor: %s (size %d) worn by %s (size %d) needs replacement, but none available\n",
+                                            DF2CONSOLE(description).c_str(), isize,
+                                            DF2CONSOLE(Translation::TranslateName(&u->name, false)).c_str(), usize);
+                        needed[std::make_pair(ty, usize)] += 1;
+                        ordered.insert(ty);
+                    }
+                }
+
+                if (wearing.count(ty) > 0)
                 {
                     if (w->flags.bits.owned)
                     {
                         bool confiscated = Items::setOwner(w, NULL);
 
-                        out->print(
+                        INFO(cycle).print(
                             "tailor: %s %s from %s.\n",
                             (confiscated ? "confiscated" : "could not confiscate"),
-                            description.c_str(),
-                            Translation::TranslateName(&u->name, false).c_str()
+                            DF2CONSOLE(description).c_str(),
+                            DF2CONSOLE(Translation::TranslateName(&u->name, false)).c_str()
                         );
                     }
 
-                    if (wearing.count(ty) == 0)
-                        available[make_pair(ty, size)] -= 1;
-
                     if (w->getWear() > 1)
                         w->flags.bits.dump = true;
                 }
-                else
+
+            }
+
+            for (auto ty : std::set<df::item_type>{ df::item_type::ARMOR, df::item_type::PANTS, df::item_type::SHOES })
+            {
+                if (wearing.count(ty) == 0 && ordered.count(ty) == 0)
                 {
-                    //                out->print("%s worn by %s needs replacement\n",
-                    //                    description.c_str(),
-                    //                    Translation::TranslateName(&u->name, false).c_str()
-                    //                );
-                    orders[make_tuple(o, w->getSubtype(), size)] += 1;
+                    TRACE(cycle).print("tailor: one %s of size %d needed to cover %s\n",
+                        ENUM_KEY_STR(item_type, ty).c_str(),
+                        usize,
+                        DF2CONSOLE(Translation::TranslateName(&u->name, false)).c_str());
+                    needed[std::make_pair(ty, usize)] += 1;
                 }
             }
         }
@@ -261,7 +350,7 @@ private:
 
     void create_orders()
     {
-        auto entity = world->entities.all[ui->civ_id];
+        auto entity = world->entities.all[plotinfo->civ_id];
 
         for (auto& a : needed)
         {
@@ -269,8 +358,11 @@ private:
             int size = a.first.second;
             int count = a.second;
 
+            if (count <= 0)
+                continue;
+
             int sub = 0;
-            vector<int16_t> v;
+            std::vector<int16_t> v;
 
             switch (ty) {
             case df::item_type::ARMOR:  v = entity->resources.armor_type; break;
@@ -298,8 +390,13 @@ private:
                 }
             }
 
-            const df::job_type j = itemTypeMap.at(ty);
-            orders[make_tuple(j, sub, size)] += count;
+            auto jj = itemTypeMap.find(ty);
+            if (jj != itemTypeMap.end())
+            {
+                const df::job_type j = jj->second;
+                orders[std::make_tuple(j, sub, size)] += count;
+                DEBUG(cycle).print("tailor: %s times %d of size %d ordered\n", ENUM_KEY_STR(job_type, j).c_str(), count, size);
+            }
         }
     }
 
@@ -311,21 +408,57 @@ private:
             if (f == jobTypeMap.end())
                 continue;
 
-            auto sub = o->item_subtype;
             int race = o->hist_figure_id;
+
+            for (auto& m : all_materials)
+            {
+                if (o->material_category.whole == m.job_material.whole)
+                {
+                    supply[m] -= o->amount_left;
+                    TRACE(cycle).print("tailor: supply of %s reduced by %d due to being required for an existing order\n",
+                        DF2CONSOLE(m.name).c_str(), o->amount_left);
+                }
+            }
+
             if (race == -1)
                 continue; // -1 means that the race of the worker will determine the size made; we must ignore these jobs
 
             int size = world->raws.creatures.all[race]->adultsize;
 
-            orders[make_tuple(o->job_type, sub, size)] -= o->amount_left;
+            auto tt = jobTypeMap.find(o->job_type);
+            if (tt == jobTypeMap.end())
+            {
+                continue;
+            }
+
+            needed[std::make_pair(tt->second, size)] -= o->amount_left;
+            TRACE(cycle).print("tailor: existing order for %d %s of size %d detected\n",
+                o->amount_left,
+                ENUM_KEY_STR(job_type, o->job_type).c_str(),
+                size);
         }
 
     }
 
-    void place_orders()
+    static df::manager_order * get_existing_order(df::job_type ty, int16_t sub, int32_t hfid, df::job_material_category mcat) {
+        for (auto order : world->manager_orders) {
+            if (order->job_type == ty &&
+                    order->item_type == df::item_type::NONE &&
+                    order->item_subtype == sub &&
+                    order->mat_type == -1 &&
+                    order->mat_index == -1 &&
+                    order->hist_figure_id == hfid &&
+                    order->material_category.whole == mcat.whole &&
+                    order->frequency == df::manager_order::T_frequency::OneTime)
+                return order;
+        }
+        return NULL;
+    }
+
+    int place_orders()
     {
-        auto entity = world->entities.all[ui->civ_id];
+        int ordered = 0;
+        auto entity = world->entities.all[plotinfo->civ_id];
 
         for (auto& o : orders)
         {
@@ -333,14 +466,21 @@ private:
             int sub;
             int size;
 
-            tie(ty, sub, size) = o.first;
+            std::tie(ty, sub, size) = o.first;
             int count = o.second;
 
+            if (sizes.count(size) == 0)
+            {
+                WARN(cycle).print("tailor: cannot determine race for clothing of size %d, skipped\n",
+                    size);
+                continue;
+            }
+
             if (count > 0)
             {
-                vector<int16_t> v;
+                std::vector<int16_t> v;
                 BitArray<df::armor_general_flags>* fl;
-                string name_s, name_p;
+                std::string name_s, name_p;
 
                 switch (ty) {
 
@@ -382,10 +522,12 @@ private:
 
                 if (!can_make)
                 {
-                    out->print("tailor: civilization cannot make %s, skipped\n", name_p.c_str());
+                    INFO(cycle).print("tailor: civilization cannot make %s, skipped\n", DF2CONSOLE(name_p).c_str());
                     continue;
                 }
 
+                DEBUG(cycle).print("tailor: ordering %d %s\n", count, DF2CONSOLE(name_p).c_str());
+
                 for (auto& m : material_order)
                 {
                     if (count <= 0)
@@ -397,247 +539,286 @@ private:
                     if (supply[m] > res && fl->is_set(m.armor_flag)) {
                         int c = count;
                         if (supply[m] < count + res)
+                        {
                             c = supply[m] - res;
+                            TRACE(cycle).print("tailor: order reduced from %d to %d to protect reserves of %s\n",
+                                count, c, DF2CONSOLE(m.name).c_str());
+                        }
                         supply[m] -= c;
 
-                        auto order = new df::manager_order;
-                        order->job_type = ty;
-                        order->item_type = df::item_type::NONE;
-                        order->item_subtype = sub;
-                        order->mat_type = -1;
-                        order->mat_index = -1;
-                        order->amount_left = c;
-                        order->amount_total = c;
-                        order->status.bits.validated = false;
-                        order->status.bits.active = false;
-                        order->id = world->manager_order_next_id++;
-                        order->hist_figure_id = sizes[size];
-                        order->material_category = m.job_material;
-
-                        world->manager_orders.push_back(order);
-
-                        out->print("tailor: added order #%d for %d %s %s, sized for %s\n",
+                        auto order = get_existing_order(ty, sub, sizes[size], m.job_material);
+                        if (order) {
+                            if (order->amount_total > 0) {
+                                order->amount_left += c;
+                                order->amount_total += c;
+                            }
+                        } else {
+                            order = new df::manager_order;
+                            order->job_type = ty;
+                            order->item_type = df::item_type::NONE;
+                            order->item_subtype = sub;
+                            order->mat_type = -1;
+                            order->mat_index = -1;
+                            order->amount_left = c;
+                            order->amount_total = c;
+                            order->status.bits.validated = false;
+                            order->status.bits.active = false;
+                            order->id = world->manager_order_next_id++;
+                            order->hist_figure_id = sizes[size];
+                            order->material_category = m.job_material;
+
+                            world->manager_orders.push_back(order);
+                        }
+
+                        INFO(cycle).print("tailor: added order #%d for %d %s %s, sized for %s\n",
                             order->id,
                             c,
                             bitfield_to_string(order->material_category).c_str(),
-                            (c > 1) ? name_p.c_str() : name_s.c_str(),
-                            world->raws.creatures.all[order->hist_figure_id]->name[1].c_str()
+                            DF2CONSOLE((c > 1) ? name_p : name_s).c_str(),
+                            DF2CONSOLE(world->raws.creatures.all[order->hist_figure_id]->name[1]).c_str()
                         );
 
                         count -= c;
+                        ordered += c;
+                    }
+                    else
+                    {
+                        TRACE(cycle).print("tailor: material %s skipped due to lack of reserves, %d available\n", DF2CONSOLE(m.name).c_str(), supply[m]);
                     }
+
                 }
             }
         }
+        return ordered;
     }
 
-public:
-    void do_scan(color_ostream& o)
+    int do_cycle()
     {
-        out = &o;
-
         reset();
-
-        // scan for useable clothing
-
         scan_clothing();
-
-        // scan for clothing raw materials
-
         scan_materials();
+        scan_replacements();
+        scan_existing_orders();
+        create_orders();
+        return place_orders();
+    }
 
-        // scan for units who need replacement clothing
+};
 
-        scan_replacements();
+static std::unique_ptr<Tailor> tailor_instance;
 
-        // create new orders
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+static int do_cycle(color_ostream &out);
 
-        create_orders();
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    DEBUG(config,out).print("initializing %s\n", plugin_name);
 
-        // scan existing orders and subtract
+    tailor_instance = std::make_unique<Tailor>();
 
-        scan_existing_orders();
+    // provide a configuration interface for the plugin
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Automatically keep your dwarves in fresh clothing.",
+        do_command));
 
-        // place orders
+    return CR_OK;
+}
 
-        place_orders();
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
     }
 
-public:
-    command_result set_materials(color_ostream& out, vector<string>& parameters)
-    {
-        list<MatType> newmat;
-        newmat.clear();
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(config,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
+        if (enable)
+            do_cycle(out);
+    } else {
+        DEBUG(config,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
+    }
+    return CR_OK;
+}
 
-        for (auto m = parameters.begin() + 1; m != parameters.end(); m++)
-        {
-            auto nameMatch = [m](MatType& m1) { return *m == m1.name; };
-            auto mm = std::find_if(all_materials.begin(), all_materials.end(), nameMatch);
-            if (mm == all_materials.end())
-            {
-                out.print("tailor: material %s not recognized\n", m->c_str());
-                return CR_WRONG_USAGE;
-            }
-            else {
-                newmat.push_back(*mm);
-            }
-        }
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(config,out).print("shutting down %s\n", plugin_name);
 
-        material_order = newmat;
-        out.print("tailor: material list set to %s\n", get_material_list().c_str());
+    tailor_instance.release();
+
+    return CR_OK;
+}
 
-        return CR_OK;
+static void set_material_order() {
+    material_order.clear();
+    for (size_t i = 0; i < all_materials.size(); ++i) {
+        if (i == (size_t)get_config_val(config, CONFIG_SILK_IDX))
+            material_order.push_back(M_SILK);
+        else if (i == (size_t)get_config_val(config, CONFIG_CLOTH_IDX))
+            material_order.push_back(M_CLOTH);
+        else if (i == (size_t)get_config_val(config, CONFIG_YARN_IDX))
+            material_order.push_back(M_YARN);
+        else if (i == (size_t)get_config_val(config, CONFIG_LEATHER_IDX))
+            material_order.push_back(M_LEATHER);
+        else if (i == (size_t)get_config_val(config, CONFIG_ADAMANTINE_IDX))
+            material_order.push_back(M_ADAMANTINE);
     }
+    if (!material_order.size())
+        std::copy(default_materials.begin(), default_materials.end(), std::back_inserter(material_order));
+}
 
-public:
-    std::string get_material_list()
-    {
-        std::string s;
-        for (const auto& m : material_order)
-        {
-            if (!s.empty()) s += ", ";
-            s += m.name;
-        }
-        return s;
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    cycle_timestamp = 0;
+    config = World::GetPersistentData(CONFIG_KEY);
+
+    if (!config.isValid()) {
+        DEBUG(config,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(config, CONFIG_IS_ENABLED, is_enabled);
     }
 
-public:
-    void process(color_ostream& out)
-    {
-        bool found = false;
+    is_enabled = get_config_bool(config, CONFIG_IS_ENABLED);
+    DEBUG(config,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
+    set_material_order();
 
-        for (df::job_list_link* link = &world->jobs.list; link != NULL; link = link->next)
-        {
-            if (link->item == NULL) continue;
-            if (link->item->job_type == df::enums::job_type::UpdateStockpileRecords)
-            {
-                found = true;
-                break;
-            }
-        }
+    return CR_OK;
+}
 
-        if (found)
-        {
-            do_scan(out);
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        if (is_enabled) {
+            DEBUG(config,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
         }
     }
-};
+    return CR_OK;
+}
 
-static std::unique_ptr<Tailor> tailor_instance;
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && world->frame_counter - cycle_timestamp >= CYCLE_TICKS) {
+        int ordered = do_cycle(out);
+        if (0 < ordered)
+            out.print("tailor: ordered %d items of clothing\n", ordered);
+    }
+    return CR_OK;
+}
 
-#define DELTA_TICKS 600
+static bool call_tailor_lua(color_ostream *out, const char *fn_name,
+        int nargs = 0, int nres = 0,
+        Lua::LuaLambda && args_lambda = Lua::DEFAULT_LUA_LAMBDA,
+        Lua::LuaLambda && res_lambda = Lua::DEFAULT_LUA_LAMBDA) {
+    DEBUG(config).print("calling tailor lua function: '%s'\n", fn_name);
 
-DFhackCExport command_result plugin_onupdate(color_ostream& out)
-{
-    if (!enabled || !tailor_instance)
-        return CR_OK;
+    CoreSuspender guard;
 
-    if (!Maps::IsValid())
-        return CR_OK;
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
 
-    if (DFHack::World::ReadPauseState())
-        return CR_OK;
+    if (!out)
+        out = &Core::getInstance().getConsole();
 
-    if (world->frame_counter % DELTA_TICKS != 0)
-        return CR_OK;
+    return Lua::CallLuaModuleFunction(*out, L, "plugins.tailor", fn_name,
+            nargs, nres,
+            std::forward<Lua::LuaLambda&&>(args_lambda),
+            std::forward<Lua::LuaLambda&&>(res_lambda));
+}
 
-    {
-        CoreSuspender suspend;
-        tailor_instance->process(out);
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
+
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
     }
 
-    return CR_OK;
+    bool show_help = false;
+    if (!call_tailor_lua(&out, "parse_commandline", parameters.size(), 1,
+            [&](lua_State *L) {
+                for (const string &param : parameters)
+                    Lua::Push(L, param);
+            },
+            [&](lua_State *L) {
+                show_help = !lua_toboolean(L, -1);
+            })) {
+        return CR_FAILURE;
+    }
+
+    return show_help ? CR_WRONG_USAGE : CR_OK;
 }
 
-static command_result tailor_cmd(color_ostream& out, vector <string>& parameters) {
-    bool desired = enabled;
-    if (parameters.size() == 1 && (parameters[0] == "enable" || parameters[0] == "on" || parameters[0] == "1"))
-    {
-        desired = true;
-    }
-    else if (parameters.size() == 1 && (parameters[0] == "disable" || parameters[0] == "off" || parameters[0] == "0"))
-    {
-        desired = false;
-    }
-    else if (parameters.size() == 1 && (parameters[0] == "usage" || parameters[0] == "help" || parameters[0] == "?"))
-    {
-        return CR_WRONG_USAGE;
-    }
-    else if (parameters.size() == 1 && parameters[0] == "test")
-    {
-        if (tailor_instance)
-        {
-            tailor_instance->do_scan(out);
-            return CR_OK;
-        }
-        else
-        {
-            out.print("%s: not instantiated\n", plugin_name);
-            return CR_FAILURE;
-        }
-    }
-    else if (parameters.size() > 1 && parameters[0] == "materials")
-    {
-        if (tailor_instance)
-        {
-            return tailor_instance->set_materials(out, parameters);
-        }
-        else
-        {
-            out.print("%s: not instantiated\n", plugin_name);
-            return CR_FAILURE;
-        }
-    }
-    else if (parameters.size() == 1 && parameters[0] != "status")
-    {
-        return CR_WRONG_USAGE;
-    }
+/////////////////////////////////////////////////////
+// cycle logic
+//
 
-    out.print("Tailor is %s %s.\n", (desired == enabled) ? "currently" : "now", desired ? "enabled" : "disabled");
-    if (tailor_instance)
-    {
-        out.print("Material list is: %s\n", tailor_instance->get_material_list().c_str());
-    }
-    else
-    {
-        out.print("%s: not instantiated\n", plugin_name);
-    }
+static int do_cycle(color_ostream &out) {
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
 
-    enabled = desired;
+    DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
 
-    return CR_OK;
+    return tailor_instance->do_cycle();
 }
 
+/////////////////////////////////////////////////////
+// Lua API
+//
 
-DFhackCExport command_result plugin_onstatechange(color_ostream& out, state_change_event event)
-{
-    return CR_OK;
+static void tailor_doCycle(color_ostream &out) {
+    DEBUG(config,out).print("entering tailor_doCycle\n");
+    out.print("ordered %d items of clothing\n", do_cycle(out));
 }
 
-DFhackCExport command_result plugin_enable(color_ostream& out, bool enable)
-{
-    enabled = enable;
-    return CR_OK;
+// remember, these are ONE-based indices from Lua
+static void tailor_setMaterialPreferences(color_ostream &out, int32_t silkIdx,
+                        int32_t clothIdx, int32_t yarnIdx, int32_t leatherIdx,
+                        int32_t adamantineIdx) {
+    DEBUG(config,out).print("entering tailor_setMaterialPreferences\n");
+
+    // it doesn't really matter if these are invalid. set_material_order will do
+    // the right thing.
+    set_config_val(config, CONFIG_SILK_IDX, silkIdx - 1);
+    set_config_val(config, CONFIG_CLOTH_IDX, clothIdx - 1);
+    set_config_val(config, CONFIG_YARN_IDX, yarnIdx - 1);
+    set_config_val(config, CONFIG_LEATHER_IDX, leatherIdx - 1);
+    set_config_val(config, CONFIG_ADAMANTINE_IDX, adamantineIdx - 1);
+
+    set_material_order();
 }
 
-DFhackCExport command_result plugin_init(color_ostream& out, std::vector <PluginCommand>& commands)
+static int tailor_getMaterialPreferences(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+    DEBUG(config,*out).print("entering tailor_getMaterialPreferences\n");
+    vector<string> names;
+    for (const auto& m : material_order)
+        names.emplace_back(m.name);
+    Lua::PushVector(L, names);
+    return 1;
+}
+
+static void tailor_setDebugFlag(color_ostream& out, bool enable)
 {
-    tailor_instance = std::move(dts::make_unique<Tailor>());
+    DEBUG(config, out).print("entering tailor_setDebugFlag\n");
 
-    if (AUTOENABLE) {
-        enabled = true;
-    }
+    tailor_instance->set_debug_flag(enable);
 
-    commands.push_back(PluginCommand(
-        plugin_name,
-        "Automatically keep your dwarves in fresh clothing.",
-        tailor_cmd));
-    return CR_OK;
 }
 
-DFhackCExport command_result plugin_shutdown(color_ostream& out)
-{
-    tailor_instance.release();
+DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(tailor_doCycle),
+    DFHACK_LUA_FUNCTION(tailor_setMaterialPreferences),
+    DFHACK_LUA_FUNCTION(tailor_setDebugFlag),
+    DFHACK_LUA_END
+};
 
-    return plugin_enable(out, false);
-}
+DFHACK_PLUGIN_LUA_COMMANDS {
+    DFHACK_LUA_COMMAND(tailor_getMaterialPreferences),
+    DFHACK_LUA_END
+};
diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
index f3773b0fe..e0738e7fa 100644
--- a/plugins/tiletypes.cpp
+++ b/plugins/tiletypes.cpp
@@ -259,7 +259,7 @@ struct TileType
 
     inline bool matches(const df::tiletype source,
                         const df::tile_designation des,
-                        const t_matpair mat)
+                        const t_matpair mat) const
     {
         bool rv = true;
         rv &= (shape == -1 || shape == tileShape(source));
@@ -735,6 +735,111 @@ bool processTileType(color_ostream & out, TileType &paint, std::vector<std::stri
     return found;
 }
 
+static bool paintTile(MapExtras::MapCache &map, const df::coord &pos,
+                      const TileType &target, const TileType &match = TileType()) {
+    MapExtras::Block *blk = map.BlockAtTile(pos);
+    if (!blk)
+        return false;
+
+    df::tiletype source = map.tiletypeAt(pos);
+    df::tile_designation des = map.designationAt(pos);
+
+    // Stone painting operates on the base layer
+    if (target.stone_material >= 0)
+        source = blk->baseTiletypeAt(pos);
+
+    t_matpair basemat = blk->baseMaterialAt(pos);
+
+    if (!match.matches(source, des, basemat))
+        return true;
+
+    df::tiletype_shape shape = target.shape;
+    if (shape == tiletype_shape::NONE)
+        shape = tileShape(source);
+
+    df::tiletype_material material = target.material;
+    if (material == tiletype_material::NONE)
+        material = tileMaterial(source);
+
+    df::tiletype_special special = target.special;
+    if (special == tiletype_special::NONE)
+        special = tileSpecial(source);
+
+    df::tiletype_variant variant = target.variant;
+    /*
+        * FIXME: variant should be:
+        * 1. If user variant:
+        * 2.   If user variant \belongs target variants
+        * 3.     use user variant
+        * 4.   Else
+        * 5.     use variant 0
+        * 6. If the source variant \belongs target variants
+        * 7    use source variant
+        * 8  ElseIf num target shape/material variants > 1
+        * 9.   pick one randomly
+        * 10.Else
+        * 11.  use variant 0
+        *
+        * The following variant check has been disabled because it's severely limiting
+        * the usefullness of the tool.
+        */
+    /*
+    if (variant == tiletype_variant::NONE)
+    {
+        variant = tileVariant(source);
+    }
+    */
+    // Remove direction from directionless tiles
+    DFHack::TileDirection direction = tileDirection(source);
+    if (!(material == tiletype_material::RIVER || shape == tiletype_shape::BROOK_BED || special == tiletype_special::TRACK || (shape == tiletype_shape::WALL && (material == tiletype_material::CONSTRUCTION || special == tiletype_special::SMOOTH))))
+        direction.whole = 0;
+
+    df::tiletype type = DFHack::findTileType(shape, material, variant, special, direction);
+    // hack for empty space
+    if (shape == tiletype_shape::EMPTY && material == tiletype_material::AIR && variant == tiletype_variant::VAR_1 && special == tiletype_special::NORMAL && direction.whole == 0)
+        type = tiletype::OpenSpace;
+
+    // make sure it's not invalid
+    if (type != tiletype::Void) {
+        if (target.stone_material >= 0) {
+            if (!blk->setStoneAt(pos, type, target.stone_material, target.vein_type, true, true))
+                return false;
+        }
+        else
+            map.setTiletypeAt(pos, type);
+    }
+
+    if (target.hidden > -1)
+        des.bits.hidden = target.hidden;
+
+    if (target.light > -1)
+        des.bits.light = target.light;
+
+    if (target.subterranean > -1)
+        des.bits.subterranean = target.subterranean;
+
+    if (target.skyview > -1)
+        des.bits.outside = target.skyview;
+
+    if (target.aquifer > -1)
+        des.bits.water_table = target.aquifer;
+
+    // Remove liquid from walls, etc
+    if (type != (df::tiletype)-1 && !DFHack::FlowPassable(type))
+    {
+        des.bits.flow_size = 0;
+        //des.bits.liquid_type = DFHack::liquid_water;
+        //des.bits.water_table = 0;
+        des.bits.flow_forbid = 0;
+        //des.bits.liquid_static = 0;
+        //des.bits.water_stagnant = 0;
+        //des.bits.water_salt = 0;
+    }
+
+    map.setDesignationAt(pos, des);
+    return true;
+}
+
 command_result executePaintJob(color_ostream &out,
                                const tiletypes_options &opts)
 {
@@ -786,128 +891,8 @@ command_result executePaintJob(color_ostream &out,
 
     for (coord_vec::iterator iter = all_tiles.begin(); iter != all_tiles.end(); ++iter)
     {
-        MapExtras::Block *blk = map.BlockAtTile(*iter);
-        if (!blk)
-            continue;
-
-        df::tiletype source = map.tiletypeAt(*iter);
-        df::tile_designation des = map.designationAt(*iter);
-
-        // Stone painting operates on the base layer
-        if (paint.stone_material >= 0)
-            source = blk->baseTiletypeAt(*iter);
-
-        t_matpair basemat = blk->baseMaterialAt(*iter);
-
-        if (!filter.matches(source, des, basemat))
-        {
-            continue;
-        }
-
-        df::tiletype_shape shape = paint.shape;
-        if (shape == tiletype_shape::NONE)
-        {
-            shape = tileShape(source);
-        }
-
-        df::tiletype_material material = paint.material;
-        if (material == tiletype_material::NONE)
-        {
-            material = tileMaterial(source);
-        }
-
-        df::tiletype_special special = paint.special;
-        if (special == tiletype_special::NONE)
-        {
-            special = tileSpecial(source);
-        }
-        df::tiletype_variant variant = paint.variant;
-        /*
-         * FIXME: variant should be:
-         * 1. If user variant:
-         * 2.   If user variant \belongs target variants
-         * 3.     use user variant
-         * 4.   Else
-         * 5.     use variant 0
-         * 6. If the source variant \belongs target variants
-         * 7    use source variant
-         * 8  ElseIf num target shape/material variants > 1
-         * 9.   pick one randomly
-         * 10.Else
-         * 11.  use variant 0
-         *
-         * The following variant check has been disabled because it's severely limiting
-         * the usefullness of the tool.
-         */
-        /*
-        if (variant == tiletype_variant::NONE)
-        {
-            variant = tileVariant(source);
-        }
-        */
-        // Remove direction from directionless tiles
-        DFHack::TileDirection direction = tileDirection(source);
-        if (!(material == tiletype_material::RIVER || shape == tiletype_shape::BROOK_BED || special == tiletype_special::TRACK || (shape == tiletype_shape::WALL && (material == tiletype_material::CONSTRUCTION || special == tiletype_special::SMOOTH))))
-        {
-            direction.whole = 0;
-        }
-
-        df::tiletype type = DFHack::findTileType(shape, material, variant, special, direction);
-        // hack for empty space
-        if (shape == tiletype_shape::EMPTY && material == tiletype_material::AIR && variant == tiletype_variant::VAR_1 && special == tiletype_special::NORMAL && direction.whole == 0)
-        {
-            type = tiletype::OpenSpace;
-        }
-        // make sure it's not invalid
-        if(type != tiletype::Void)
-        {
-            if (paint.stone_material >= 0)
-            {
-                if (!blk->setStoneAt(*iter, type, paint.stone_material, paint.vein_type, true, true))
-                    failures++;
-            }
-            else
-                map.setTiletypeAt(*iter, type);
-        }
-
-        if (paint.hidden > -1)
-        {
-            des.bits.hidden = paint.hidden;
-        }
-
-        if (paint.light > -1)
-        {
-            des.bits.light = paint.light;
-        }
-
-        if (paint.subterranean > -1)
-        {
-            des.bits.subterranean = paint.subterranean;
-        }
-
-        if (paint.skyview > -1)
-        {
-            des.bits.outside = paint.skyview;
-        }
-
-        if (paint.aquifer > -1)
-        {
-            des.bits.water_table = paint.aquifer;
-        }
-
-        // Remove liquid from walls, etc
-        if (type != (df::tiletype)-1 && !DFHack::FlowPassable(type))
-        {
-            des.bits.flow_size = 0;
-            //des.bits.liquid_type = DFHack::liquid_water;
-            //des.bits.water_table = 0;
-            des.bits.flow_forbid = 0;
-            //des.bits.liquid_static = 0;
-            //des.bits.water_stagnant = 0;
-            //des.bits.water_salt = 0;
-        }
-
-        map.setDesignationAt(*iter, des);
+        if (!paintTile(map, *iter, paint, filter))
+            ++failures;
     }
 
     if (failures > 0)
@@ -1135,3 +1120,59 @@ command_result df_tiletypes_here_point (color_ostream &out, vector <string> & pa
     brush = old;
     return rv;
 }
+
+static bool setTile(color_ostream &out, df::coord pos, df::tiletype_shape shape,
+                    df::tiletype_material material, df::tiletype_special special,
+                    df::tiletype_variant variant) {
+    if (!Maps::isValidTilePos(pos)) {
+        out.printerr("Invalid map position: %d, %d, %d\n", pos.x, pos.y, pos.z);
+        return false;
+    }
+
+    if (!is_valid_enum_item(shape)) {
+        out.printerr("Invalid shape type: %d\n", shape);
+        return false;
+    }
+    if (!is_valid_enum_item(material)) {
+        out.printerr("Invalid material type: %d\n", material);
+        return false;
+    }
+    if (!is_valid_enum_item(special)) {
+        out.printerr("Invalid special type: %d\n", special);
+        return false;
+    }
+    if (!is_valid_enum_item(variant)) {
+        out.printerr("Invalid variant type: %d\n", variant);
+        return false;
+    }
+
+    TileType target;
+    target.shape = shape;
+    target.material = material;
+    target.special = special;
+    target.variant = variant;
+
+    MapExtras::MapCache map;
+    return paintTile(map, pos, target) && map.WriteAll();
+}
+
+static int tiletypes_setTile(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+
+    df::coord pos;
+    Lua::CheckDFAssign(L, &pos, 1);
+    df::tiletype_shape shape = (df::tiletype_shape)lua_tointeger(L, 2);
+    df::tiletype_material material = (df::tiletype_material)lua_tointeger(L, 3);
+    df::tiletype_special special = (df::tiletype_special)lua_tointeger(L, 4);
+    df::tiletype_variant variant = (df::tiletype_variant)lua_tointeger(L, 5);
+
+    Lua::Push(L, setTile(*out, pos, shape, material, special, variant));
+    return 1;
+}
+
+DFHACK_PLUGIN_LUA_COMMANDS {
+    DFHACK_LUA_COMMAND(tiletypes_setTile),
+    DFHACK_LUA_END
+};
diff --git a/plugins/title-folder.cpp b/plugins/title-folder.cpp
index 4f93a6c7f..2659a094f 100644
--- a/plugins/title-folder.cpp
+++ b/plugins/title-folder.cpp
@@ -20,7 +20,7 @@ static std::string original_title;
 
 static DFLibrary *sdl_handle = NULL;
 static const std::vector<std::string> sdl_libs {
-    "SDLreal.dll",
+    "SDL.dll",
     "SDL.framework/Versions/A/SDL",
     "SDL.framework/SDL",
     "libSDL-1.2.so.0"
diff --git a/plugins/title-version.cpp b/plugins/title-version.cpp
deleted file mode 100644
index 66bb159ad..000000000
--- a/plugins/title-version.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <cmath>
-#include <cstdio>
-#include <cstring>
-#include <stack>
-#include <string>
-#include <vector>
-
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
-#include "PluginManager.h"
-#include "modules/Gui.h"
-#include "modules/Screen.h"
-#include "VTableInterpose.h"
-#include "DFHackVersion.h"
-
-#include "df/graphic.h"
-#include "df/viewscreen_optionst.h"
-#include "df/viewscreen_titlest.h"
-#include "uicommon.h"
-
-using std::vector;
-using std::string;
-using namespace DFHack;
-
-DFHACK_PLUGIN("title-version");
-DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-REQUIRE_GLOBAL(gps);
-
-void draw_version(int start_x, int start_y) {
-    int x = start_x,
-        y = start_y;
-
-    OutputString(COLOR_WHITE, x, y, string("DFHack ") + DFHACK_VERSION);
-    if (!DFHACK_IS_RELEASE)
-    {
-        OutputString(COLOR_WHITE, x, y, " (dev)");
-        x = start_x; y++;
-        OutputString(COLOR_WHITE, x, y, "Git: ");
-        OutputString(COLOR_WHITE, x, y, DFHACK_GIT_DESCRIPTION);
-    }
-    if (strlen(DFHACK_BUILD_ID))
-    {
-        x = start_x; y++;
-        OutputString(COLOR_WHITE, x, y, "Build ID: ");
-        OutputString(COLOR_WHITE, x, y, DFHACK_BUILD_ID);
-    }
-    if (DFHACK_IS_PRERELEASE)
-    {
-        x = start_x; y++;
-        OutputString(COLOR_LIGHTRED, x, y, "Pre-release build");
-    }
-}
-
-struct title_version_hook : df::viewscreen_titlest {
-    typedef df::viewscreen_titlest interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        INTERPOSE_NEXT(render)();
-        if (!loading)
-            draw_version(0, 0);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(title_version_hook, render);
-
-struct options_version_hook : df::viewscreen_optionst {
-    typedef df::viewscreen_optionst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(void, render, ())
-    {
-        INTERPOSE_NEXT(render)();
-        if (!msg_quit && !in_retire_adv && !msg_peasant &&
-            !in_retire_dwf_abandon_adv && !in_abandon_dwf && !ending_game)
-            draw_version(2, gps->dimy - 6);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(options_version_hook, render);
-
-DFhackCExport command_result plugin_enable (color_ostream &out, bool enable)
-{
-    if (!gps)
-        return CR_FAILURE;
-
-    if (enable != is_enabled)
-    {
-        if (!INTERPOSE_HOOK(title_version_hook, render).apply(enable) ||
-            !INTERPOSE_HOOK(options_version_hook, render).apply(enable))
-            return CR_FAILURE;
-
-        is_enabled = enable;
-    }
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_init (color_ostream &out, vector<PluginCommand> &commands)
-{
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown (color_ostream &out)
-{
-    INTERPOSE_HOOK(title_version_hook, render).remove();
-    INTERPOSE_HOOK(options_version_hook, render).remove();
-    return CR_OK;
-}
diff --git a/plugins/trackstop.cpp b/plugins/trackstop.cpp
deleted file mode 100644
index d21df0e36..000000000
--- a/plugins/trackstop.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Trackstop plugin.
- * Shows track stop friction and direction in its 'q' menu.
- */
-
-#include "uicommon.h"
-#include "LuaTools.h"
-
-#include "df/building_rollersst.h"
-#include "df/building_trapst.h"
-#include "df/job.h"
-#include "df/viewscreen_dwarfmodest.h"
-
-#include "modules/Gui.h"
-
-using namespace DFHack;
-using namespace std;
-
-using df::building_rollersst;
-using df::building_trapst;
-using df::enums::trap_type::trap_type;
-using df::enums::screw_pump_direction::screw_pump_direction;
-
-DFHACK_PLUGIN("trackstop");
-#define AUTOENABLE false
-DFHACK_PLUGIN_IS_ENABLED(enabled);
-
-REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(world);
-
-/*
- * Interface hooks
- */
-struct trackstop_hook : public df::viewscreen_dwarfmodest {
-    typedef df::viewscreen_dwarfmodest interpose_base;
-
-    enum Friction {
-        Lowest = 10,
-        Low = 50,
-        Medium = 500,
-        High = 10000,
-        Highest = 50000
-    };
-
-    building_trapst *get_selected_trackstop() {
-        if (ui->main.mode != ui_sidebar_mode::QueryBuilding) {
-            // Not in a building's 'q' menu.
-            return nullptr;
-        }
-
-        building_trapst *ts = virtual_cast<building_trapst>(world->selected_building);
-        if (!ts) {
-            // Not a trap type of building.
-            return nullptr;
-        }
-
-        if (ts->trap_type != df::trap_type::TrackStop) {
-            // Not a trackstop.
-            return nullptr;
-        }
-
-        if (ts->construction_stage < ts->getMaxBuildStage()) {
-            // Not yet fully constructed.
-            return nullptr;
-        }
-
-        for (auto it = ts->jobs.begin(); it != ts->jobs.end(); it++) {
-            auto job = *it;
-            if (job->job_type == df::job_type::DestroyBuilding) {
-                // Slated for removal.
-                return nullptr;
-            }
-        }
-
-        return ts;
-    }
-
-    bool handleInput(set<df::interface_key> *input) {
-        building_trapst *ts = get_selected_trackstop();
-        if (!ts) {
-            return false;
-        }
-
-        if (input->count(interface_key::BUILDING_TRACK_STOP_DUMP)) {
-            // Change track stop dump direction.
-            // There might be a more elegant way to do this.
-
-            if (!ts->use_dump) {
-                // No -> North
-                ts->use_dump = 1;
-                ts->dump_x_shift = 0;
-                ts->dump_y_shift = -1;
-            } else if (ts->dump_x_shift == 0 && ts->dump_y_shift == -1) {
-                // North -> South
-                ts->dump_x_shift = 0;
-                ts->dump_y_shift = 1;
-            } else if (ts->dump_x_shift == 0 && ts->dump_y_shift == 1) {
-                // South -> East
-                ts->dump_x_shift = 1;
-                ts->dump_y_shift = 0;
-            } else if (ts->dump_x_shift == 1 && ts->dump_y_shift == 0) {
-                // East -> West
-                ts->dump_x_shift = -1;
-                ts->dump_y_shift = 0;
-            } else {
-                // West (or Elsewhere) -> No
-                ts->use_dump = 0;
-                ts->dump_x_shift = 0;
-                ts->dump_y_shift = 0;
-            }
-
-            return true;
-        } else if (input->count(interface_key::BUILDING_TRACK_STOP_FRICTION_UP)) {
-            ts->friction = (
-                (ts->friction < Friction::Lowest)?  Friction::Lowest:
-                (ts->friction < Friction::Low)?     Friction::Low:
-                (ts->friction < Friction::Medium)?  Friction::Medium:
-                (ts->friction < Friction::High)?    Friction::High:
-                (ts->friction < Friction::Highest)? Friction::Highest:
-                ts->friction
-            );
-
-            return true;
-        } else if (input->count(interface_key::BUILDING_TRACK_STOP_FRICTION_DOWN)) {
-            ts->friction = (
-                (ts->friction > Friction::Highest)? Friction::Highest:
-                (ts->friction > Friction::High)?    Friction::High:
-                (ts->friction > Friction::Medium)?  Friction::Medium:
-                (ts->friction > Friction::Low)?     Friction::Low:
-                (ts->friction > Friction::Lowest)?  Friction::Lowest:
-                ts->friction
-            );
-
-            return true;
-        }
-
-        return false;
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input)) {
-        if (!handleInput(input)) {
-            INTERPOSE_NEXT(feed)(input);
-        }
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, render, ()) {
-        INTERPOSE_NEXT(render)();
-
-        building_trapst *ts = get_selected_trackstop();
-        if (ts) {
-            auto dims = Gui::getDwarfmodeViewDims();
-            int left_margin = dims.menu_x1 + 1;
-            int x = left_margin;
-            int y = dims.y1 + 1;
-
-            OutputString(COLOR_WHITE, x, y, "Track Stop", true, left_margin);
-
-            y += 3;
-            OutputString(COLOR_WHITE, x, y, "Friction: ", false);
-            OutputString(COLOR_WHITE, x, y, (
-                (ts->friction <= Friction::Lowest)? "Lowest":
-                (ts->friction <= Friction::Low)?    "Low":
-                (ts->friction <= Friction::Medium)? "Medium":
-                (ts->friction <= Friction::High)?   "High":
-                "Highest"
-            ), true, left_margin);
-            OutputString(COLOR_LIGHTRED, x, y, Screen::getKeyDisplay(interface_key::BUILDING_TRACK_STOP_FRICTION_DOWN));
-            OutputString(COLOR_LIGHTRED, x, y, Screen::getKeyDisplay(interface_key::BUILDING_TRACK_STOP_FRICTION_UP));
-            OutputString(COLOR_WHITE, x, y, ": Change Friction", true, left_margin);
-
-            y += 1;
-
-            OutputString(COLOR_WHITE, x, y, "Dump on arrival: ", false);
-            OutputString(COLOR_WHITE, x, y, (
-                (!ts->use_dump)? "No":
-                (ts->dump_x_shift ==  0 && ts->dump_y_shift == -1)? "North":
-                (ts->dump_x_shift ==  0 && ts->dump_y_shift ==  1)? "South":
-                (ts->dump_x_shift ==  1 && ts->dump_y_shift ==  0)? "East":
-                (ts->dump_x_shift == -1 && ts->dump_y_shift ==  0)? "West":
-                "Elsewhere"
-            ), true, left_margin);
-            OutputString(COLOR_LIGHTRED, x, y, Screen::getKeyDisplay(interface_key::BUILDING_TRACK_STOP_DUMP));
-            OutputString(COLOR_WHITE, x, y, ": Activate/change direction", true, left_margin);
-            y += 1;
-            OutputString(COLOR_GREY, x, y, "DFHack");
-        }
-    }
-};
-
-struct roller_hook : public df::viewscreen_dwarfmodest {
-    typedef df::viewscreen_dwarfmodest interpose_base;
-
-    enum Speed {
-        Lowest  = 10000,
-        Low     = 20000,
-        Medium  = 30000,
-        High    = 40000,
-        Highest = 50000
-    };
-
-    building_rollersst *get_selected_roller() {
-        if (ui->main.mode != ui_sidebar_mode::QueryBuilding) {
-            // Not in a building's 'q' menu.
-            return nullptr;
-        }
-
-        building_rollersst *roller = virtual_cast<building_rollersst>(world->selected_building);
-        if (!roller) {
-            // Not a roller.
-            return nullptr;
-        }
-
-        if (roller->construction_stage < roller->getMaxBuildStage()) {
-            // Not yet fully constructed.
-            return nullptr;
-        }
-
-        for (auto it = roller->jobs.begin(); it != roller->jobs.end(); it++) {
-            auto job = *it;
-            if (job->job_type == df::job_type::DestroyBuilding) {
-                // Slated for removal.
-                return nullptr;
-            }
-        }
-
-        return roller;
-    }
-
-    bool handleInput(set<df::interface_key> *input) {
-        building_rollersst *roller = get_selected_roller();
-        if (!roller) {
-            return false;
-        }
-
-        if (input->count(interface_key::BUILDING_ORIENT_NONE)) {
-            // Flip roller orientation.
-            // Long rollers can only be oriented along their length.
-            // Todo: Only add 1 to 1x1 rollers: x ^= ((x&1)<<1)|1
-            // Todo: This could have been elegant without all the casting,
-            // but as an enum it might be better off listing each case.
-            roller->direction = (df::enums::screw_pump_direction::screw_pump_direction)(((int8_t)roller->direction) ^ 2);
-            return true;
-        } else if (input->count(interface_key::BUILDING_ROLLERS_SPEED_UP)) {
-            if (roller->speed < Speed::Highest) {
-                roller->speed += Speed::Lowest;
-            }
-
-            return true;
-        } else if (input->count(interface_key::BUILDING_ROLLERS_SPEED_DOWN)) {
-            if (roller->speed > Speed::Lowest) {
-                roller->speed -= Speed::Lowest;
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input)) {
-        if (!handleInput(input)) {
-            INTERPOSE_NEXT(feed)(input);
-        }
-    }
-
-    DEFINE_VMETHOD_INTERPOSE(void, render, ()) {
-        INTERPOSE_NEXT(render)();
-
-        building_rollersst *roller = get_selected_roller();
-        if (roller) {
-            auto dims = Gui::getDwarfmodeViewDims();
-            int left_margin = dims.menu_x1 + 1;
-            int x = left_margin;
-            int y = dims.y1 + 6;
-
-            OutputString(COLOR_LIGHTRED, x, y, Screen::getKeyDisplay(interface_key::BUILDING_ORIENT_NONE));
-            OutputString(COLOR_WHITE, x, y, ": Rolls ", false);
-            OutputString(COLOR_WHITE, x, y, (
-                (roller->direction == df::screw_pump_direction::FromNorth)? "Southward":
-                (roller->direction == df::screw_pump_direction::FromEast)?  "Westward":
-                (roller->direction == df::screw_pump_direction::FromSouth)? "Northward":
-                (roller->direction == df::screw_pump_direction::FromWest)?  "Eastward":
-                ""
-            ), true, left_margin);
-
-            OutputString(COLOR_LIGHTRED, x, y, Screen::getKeyDisplay(interface_key::BUILDING_ROLLERS_SPEED_DOWN));
-            OutputString(COLOR_LIGHTRED, x, y, Screen::getKeyDisplay(interface_key::BUILDING_ROLLERS_SPEED_UP));
-            OutputString(COLOR_WHITE, x, y, ": ");
-            OutputString(COLOR_WHITE, x, y, (
-                (roller->speed <= Speed::Lowest)? "Lowest":
-                (roller->speed <= Speed::Low)?    "Low":
-                (roller->speed <= Speed::Medium)? "Medium":
-                (roller->speed <= Speed::High)?   "High":
-                "Highest"
-            ));
-            OutputString(COLOR_WHITE, x, y, " Speed", true, left_margin);
-            y += 1;
-            OutputString(COLOR_GREY, x, y, "DFHack");
-        }
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(trackstop_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(trackstop_hook, render);
-IMPLEMENT_VMETHOD_INTERPOSE(roller_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(roller_hook, render);
-
-
-DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {
-    // Accept the "enable trackstop" / "disable trackstop" commands.
-    if (enable != enabled) {
-        if (!INTERPOSE_HOOK(trackstop_hook, feed).apply(enable) ||
-                !INTERPOSE_HOOK(trackstop_hook, render).apply(enable) ||
-                !INTERPOSE_HOOK(roller_hook, feed).apply(enable) ||
-                !INTERPOSE_HOOK(roller_hook, render).apply(enable)) {
-            out.printerr("Could not %s trackstop hooks!\n", enable? "insert": "remove");
-            return CR_FAILURE;
-        }
-
-        enabled = enable;
-    }
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
-    return plugin_enable(out, AUTOENABLE);
-}
-
-DFhackCExport command_result plugin_shutdown(color_ostream &out) {
-    return plugin_enable(out, false);
-}
diff --git a/plugins/tweak/tweak.cpp b/plugins/tweak/tweak.cpp
index 6d2a46fa8..323f5f932 100644
--- a/plugins/tweak/tweak.cpp
+++ b/plugins/tweak/tweak.cpp
@@ -21,7 +21,7 @@
 #include "DataDefs.h"
 #include <VTableInterpose.h>
 #include "../uicommon.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/world.h"
 #include "df/unit.h"
 #include "df/unit_soul.h"
@@ -36,8 +36,8 @@
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/viewscreen_kitchenprefst.h"
 #include "df/viewscreen_layer_unit_actionst.h"
-#include "df/ui_build_selector.h"
-#include "df/ui_sidebar_menus.h"
+#include "df/buildreq.h"
+#include "df/gamest.h"
 #include "df/building_trapst.h"
 #include "df/building_workshopst.h"
 #include "df/item_actual.h"
@@ -78,7 +78,7 @@
 #include "tweaks/block-labors.h"
 #include "tweaks/burrow-name-cancel.h"
 #include "tweaks/cage-butcher.h"
-#include "tweaks/civ-agreement-ui.h"
+#include "tweaks/civ-agreement-plotinfo.h"
 #include "tweaks/condition-material.h"
 #include "tweaks/craft-age-wear.h"
 #include "tweaks/do-job-now.h"
@@ -117,14 +117,14 @@ DFHACK_PLUGIN("tweak");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
 REQUIRE_GLOBAL(enabler);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(ui_build_selector);
 REQUIRE_GLOBAL(ui_building_in_assign);
 REQUIRE_GLOBAL(ui_building_in_resize);
 REQUIRE_GLOBAL(ui_building_item_cursor);
 REQUIRE_GLOBAL(ui_look_cursor);
 REQUIRE_GLOBAL(ui_menu_width);
-REQUIRE_GLOBAL(ui_sidebar_menus);
+REQUIRE_GLOBAL(game);
 REQUIRE_GLOBAL(ui_unit_view_mode);
 REQUIRE_GLOBAL(ui_workshop_in_add);
 REQUIRE_GLOBAL(world);
@@ -449,7 +449,7 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
         // if it happens that the player has 'foreign' units of the same race
         // (vanilla df: dwarves not from mountainhome) on his map, just grab them
         if(!Units::isOwnCiv(unit))
-            unit->civ_id = ui->civ_id;
+            unit->civ_id = plotinfo->civ_id;
 
         return fix_clothing_ownership(out, unit);
     }
@@ -468,7 +468,7 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
         if(Units::isForest(unit))
             unit->flags1.bits.forest = 0;
         if(!Units::isOwnCiv(unit))
-            unit->civ_id = ui->civ_id;
+            unit->civ_id = plotinfo->civ_id;
         if(unit->profession == df::profession::MERCHANT)
             unit->profession = df::profession::TRADER;
         if(unit->profession2 == df::profession::MERCHANT)
diff --git a/plugins/tweak/tweaks/block-labors.h b/plugins/tweak/tweaks/block-labors.h
index bc407ed19..df2474400 100644
--- a/plugins/tweak/tweaks/block-labors.h
+++ b/plugins/tweak/tweaks/block-labors.h
@@ -6,7 +6,7 @@
 #include "df/viewscreen_dwarfmodest.h"
 
 using namespace DFHack;
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::ui_look_cursor;
 using df::global::ui_unit_view_mode;
 
@@ -15,7 +15,7 @@ struct block_labors_hook : df::viewscreen_dwarfmodest {
 
     inline bool valid_mode()
     {
-        return ui->main.mode == df::ui_sidebar_mode::ViewUnits &&
+        return plotinfo->main.mode == df::ui_sidebar_mode::ViewUnits &&
             ui_unit_view_mode->value == df::ui_unit_view_mode::T_value::PrefLabor &&
             Gui::getAnyUnit(this);
     }
diff --git a/plugins/tweak/tweaks/burrow-name-cancel.h b/plugins/tweak/tweaks/burrow-name-cancel.h
index 2ee84508e..f49e7ae1b 100644
--- a/plugins/tweak/tweaks/burrow-name-cancel.h
+++ b/plugins/tweak/tweaks/burrow-name-cancel.h
@@ -1,6 +1,6 @@
 #include "df/burrow.h"
 
-using df::global::ui;
+using df::global::plotinfo;
 
 struct burrow_name_cancel_hook : df::viewscreen_dwarfmodest {
     typedef df::viewscreen_dwarfmodest interpose_base;
@@ -9,15 +9,15 @@ struct burrow_name_cancel_hook : df::viewscreen_dwarfmodest {
 
     DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key> *input))
     {
-        if (ui->main.mode == df::ui_sidebar_mode::Burrows)
+        if (plotinfo->main.mode == df::ui_sidebar_mode::Burrows)
         {
-            bool was_naming = ui->burrows.in_edit_name_mode;
+            bool was_naming = plotinfo->burrows.in_edit_name_mode;
             INTERPOSE_NEXT(feed)(input);
-            df::burrow *burrow = vector_get(ui->burrows.list, ui->burrows.sel_index);
+            df::burrow *burrow = vector_get(plotinfo->burrows.list, plotinfo->burrows.sel_index);
             if (!burrow)
                 return;
 
-            if (ui->burrows.in_edit_name_mode)
+            if (plotinfo->burrows.in_edit_name_mode)
             {
                 if (!was_naming)
                 {
@@ -27,7 +27,7 @@ struct burrow_name_cancel_hook : df::viewscreen_dwarfmodest {
                 if (input->count(df::interface_key::LEAVESCREEN))
                 {
                     // Cancel and restore the old name
-                    ui->burrows.in_edit_name_mode = false;
+                    plotinfo->burrows.in_edit_name_mode = false;
                     burrow->name = old_name;
                 }
             }
diff --git a/plugins/tweak/tweaks/cage-butcher.h b/plugins/tweak/tweaks/cage-butcher.h
index 61a989d50..7290746a9 100644
--- a/plugins/tweak/tweaks/cage-butcher.h
+++ b/plugins/tweak/tweaks/cage-butcher.h
@@ -6,7 +6,7 @@
 #include "df/unit.h"
 
 using namespace DFHack;
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::ui_building_in_assign;
 using df::global::ui_building_in_resize;
 using df::global::ui_building_item_cursor;
@@ -19,7 +19,7 @@ struct cage_butcher_hook : df::viewscreen_dwarfmodest {
         if (*ui_building_in_assign || *ui_building_in_resize)
             return nullptr;
 
-        if (ui->main.mode != df::ui_sidebar_mode::QueryBuilding)
+        if (plotinfo->main.mode != df::ui_sidebar_mode::QueryBuilding)
             return nullptr;
 
         auto cage = virtual_cast<df::building_cagest>(Gui::getAnyBuilding(this));
diff --git a/plugins/tweak/tweaks/eggs-fertile.h b/plugins/tweak/tweaks/eggs-fertile.h
index f4fe29569..b264b227f 100644
--- a/plugins/tweak/tweaks/eggs-fertile.h
+++ b/plugins/tweak/tweaks/eggs-fertile.h
@@ -6,15 +6,15 @@ using namespace DFHack;
 using namespace df::enums;
 
 using df::global::world;
-using df::global::ui;
+using df::global::plotinfo;
 
 struct egg_fertile_hook : df::viewscreen_dwarfmodest {
     typedef df::viewscreen_dwarfmodest interpose_base;
 
     df::building_nest_boxst* getNestBox()
     {
-        if (ui->main.mode != ui_sidebar_mode::QueryBuilding &&
-            ui->main.mode != ui_sidebar_mode::BuildingItems)
+        if (plotinfo->main.mode != ui_sidebar_mode::QueryBuilding &&
+            plotinfo->main.mode != ui_sidebar_mode::BuildingItems)
             return NULL;
         return virtual_cast<df::building_nest_boxst>(world->selected_building);
     }
@@ -38,7 +38,7 @@ struct egg_fertile_hook : df::viewscreen_dwarfmodest {
                     has_eggs = true;
                     if (egg->egg_flags.bits.fertile)
                         fertile = true;
-                    if (ui->main.mode == ui_sidebar_mode::BuildingItems)
+                    if (plotinfo->main.mode == ui_sidebar_mode::BuildingItems)
                     {
                         Screen::paintString(
                             Screen::Pen(' ', fertile ? COLOR_LIGHTGREEN : COLOR_LIGHTRED),
@@ -50,7 +50,7 @@ struct egg_fertile_hook : df::viewscreen_dwarfmodest {
                 }
                 ++idx;
             }
-            if (has_eggs && ui->main.mode == ui_sidebar_mode::QueryBuilding)
+            if (has_eggs && plotinfo->main.mode == ui_sidebar_mode::QueryBuilding)
             {
                 Screen::paintString(
                     Screen::Pen(' ', fertile ? COLOR_LIGHTGREEN : COLOR_LIGHTRED),
diff --git a/plugins/tweak/tweaks/farm-plot-select.h b/plugins/tweak/tweaks/farm-plot-select.h
index 696c7ca2e..7b2e440e1 100644
--- a/plugins/tweak/tweaks/farm-plot-select.h
+++ b/plugins/tweak/tweaks/farm-plot-select.h
@@ -4,7 +4,7 @@
 
 using namespace df::enums;
 
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::ui_building_item_cursor;
 using df::global::world;
 
@@ -13,7 +13,7 @@ struct farm_select_hook : df::viewscreen_dwarfmodest {
 
     df::building_farmplotst* getFarmPlot()
     {
-        if (ui->main.mode != ui_sidebar_mode::QueryBuilding)
+        if (plotinfo->main.mode != ui_sidebar_mode::QueryBuilding)
             return NULL;
         VIRTUAL_CAST_VAR(farm_plot, df::building_farmplotst, world->selected_building);
         return farm_plot;
@@ -44,12 +44,12 @@ struct farm_select_hook : df::viewscreen_dwarfmodest {
         return false;
     }
 
-    inline int32_t getSelectedCropId() { return ui->selected_farm_crops[*ui_building_item_cursor]; }
+    inline int32_t getSelectedCropId() { return plotinfo->selected_farm_crops[*ui_building_item_cursor]; }
 
     DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
     {
         df::building_farmplotst* farm_plot = getFarmPlot();
-        if (farm_plot && ui->selected_farm_crops.size() > 0)
+        if (farm_plot && plotinfo->selected_farm_crops.size() > 0)
         {
             if (input->count(interface_key::SELECT_ALL))
             {
@@ -77,7 +77,7 @@ struct farm_select_hook : df::viewscreen_dwarfmodest {
     {
         INTERPOSE_NEXT(render)();
         auto farm_plot = getFarmPlot();
-        if (!farm_plot || !ui->selected_farm_crops.size())
+        if (!farm_plot || !plotinfo->selected_farm_crops.size())
             return;
         if (farm_plot->getBuildStage() != farm_plot->getMaxBuildStage())
             return;
diff --git a/plugins/tweak/tweaks/hide-priority.h b/plugins/tweak/tweaks/hide-priority.h
index ef84a5831..6f096ee82 100644
--- a/plugins/tweak/tweaks/hide-priority.h
+++ b/plugins/tweak/tweaks/hide-priority.h
@@ -3,7 +3,7 @@
 
 using namespace DFHack;
 using df::global::gps;
-using df::global::ui_sidebar_menus;
+using df::global::game;
 
 struct hide_priority_hook : df::viewscreen_dwarfmodest {
     typedef df::viewscreen_dwarfmodest interpose_base;
@@ -14,7 +14,7 @@ struct hide_priority_hook : df::viewscreen_dwarfmodest {
 
     inline bool valid_mode ()
     {
-        switch (ui->main.mode)
+        switch (plotinfo->main.mode)
         {
         case df::ui_sidebar_mode::DesignateMine:
         case df::ui_sidebar_mode::DesignateRemoveRamps:
@@ -41,7 +41,7 @@ struct hide_priority_hook : df::viewscreen_dwarfmodest {
     DEFINE_VMETHOD_INTERPOSE(void, render, ())
     {
         if (!was_valid_mode && valid_mode() && toggled_manually) {
-            ui_sidebar_menus->designation.priority_set = last_show_priorities_setting;
+            game->designation.priority_set = last_show_priorities_setting;
         }
         INTERPOSE_NEXT(render)();
         if (valid_mode())
@@ -51,7 +51,7 @@ struct hide_priority_hook : df::viewscreen_dwarfmodest {
             {
                 int x = dims.menu_x1 + 1, y = gps->dimy - (gps->dimy > 26 ? 8 : 7);
                 OutputToggleString(x, y, "Show priorities", df::interface_key::CUSTOM_ALT_P,
-                    ui_sidebar_menus->designation.priority_set, true, 0,
+                    game->designation.priority_set, true, 0,
                     COLOR_WHITE, COLOR_LIGHTRED);
             }
         }
@@ -61,9 +61,9 @@ struct hide_priority_hook : df::viewscreen_dwarfmodest {
     {
         if (valid_mode() && input->count(df::interface_key::CUSTOM_ALT_P))
         {
-            ui_sidebar_menus->designation.priority_set = !ui_sidebar_menus->designation.priority_set;
+            game->designation.priority_set = !game->designation.priority_set;
             toggled_manually = true;
-            last_show_priorities_setting = ui_sidebar_menus->designation.priority_set;
+            last_show_priorities_setting = game->designation.priority_set;
         }
         else
             INTERPOSE_NEXT(feed)(input);
diff --git a/plugins/tweak/tweaks/hotkey-clear.h b/plugins/tweak/tweaks/hotkey-clear.h
index bc85c112e..8d683a1bd 100644
--- a/plugins/tweak/tweaks/hotkey-clear.h
+++ b/plugins/tweak/tweaks/hotkey-clear.h
@@ -1,6 +1,6 @@
 #include "df/viewscreen_dwarfmodest.h"
 
-using df::global::ui;
+using df::global::plotinfo;
 
 struct hotkey_clear_hook : df::viewscreen_dwarfmodest {
     typedef df::viewscreen_dwarfmodest interpose_base;
@@ -8,7 +8,7 @@ struct hotkey_clear_hook : df::viewscreen_dwarfmodest {
     DEFINE_VMETHOD_INTERPOSE(void, render, ())
     {
         INTERPOSE_NEXT(render)();
-        if (ui->main.mode == df::ui_sidebar_mode::Hotkeys)
+        if (plotinfo->main.mode == df::ui_sidebar_mode::Hotkeys)
         {
             auto dims = Gui::getDwarfmodeViewDims();
             int x = dims.menu_x1 + 1, y = 19;
@@ -18,11 +18,11 @@ struct hotkey_clear_hook : df::viewscreen_dwarfmodest {
 
     DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
     {
-        if (ui->main.mode == df::ui_sidebar_mode::Hotkeys &&
+        if (plotinfo->main.mode == df::ui_sidebar_mode::Hotkeys &&
             input->count(df::interface_key::CUSTOM_C) &&
-            !ui->main.in_rename_hotkey)
+            !plotinfo->main.in_rename_hotkey)
         {
-            auto &hotkey = ui->main.hotkeys[ui->main.selected_hotkey];
+            auto &hotkey = plotinfo->main.hotkeys[plotinfo->main.selected_hotkey];
             hotkey.name = "";
             hotkey.cmd = df::ui_hotkey::T_cmd::None;
             hotkey.x = 0;
diff --git a/plugins/tweak/tweaks/max-wheelbarrow.h b/plugins/tweak/tweaks/max-wheelbarrow.h
index a7af186ef..38d704b24 100644
--- a/plugins/tweak/tweaks/max-wheelbarrow.h
+++ b/plugins/tweak/tweaks/max-wheelbarrow.h
@@ -22,7 +22,7 @@ struct max_wheelbarrow_hook : df::viewscreen_dwarfmodest {
 
     df::building_stockpilest* getStockpile()
     {
-        if (ui->main.mode != ui_sidebar_mode::QueryBuilding)
+        if (plotinfo->main.mode != ui_sidebar_mode::QueryBuilding)
             return NULL;
         return virtual_cast<df::building_stockpilest>(world->selected_building);
     }
diff --git a/plugins/tweak/tweaks/shift-8-scroll.h b/plugins/tweak/tweaks/shift-8-scroll.h
index 86f7e9fc7..2c1eea23d 100644
--- a/plugins/tweak/tweaks/shift-8-scroll.h
+++ b/plugins/tweak/tweaks/shift-8-scroll.h
@@ -1,13 +1,13 @@
 #include "df/viewscreen_dwarfmodest.h"
 
 using namespace df::enums;
-using df::global::ui;
+using df::global::plotinfo;
 
 struct shift_8_scroll_hook : df::viewscreen_dwarfmodest {
     typedef df::viewscreen_dwarfmodest interpose_base;
     DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key>* input))
     {
-        if (ui->main.mode != ui_sidebar_mode::Default &&
+        if (plotinfo->main.mode != ui_sidebar_mode::Default &&
             input->count(interface_key::CURSOR_UP_FAST) &&
             input->count(interface_key::SECONDSCROLL_PAGEDOWN)
             )
diff --git a/plugins/tweak/tweaks/stable-cursor.h b/plugins/tweak/tweaks/stable-cursor.h
index b08346410..3b628ef04 100644
--- a/plugins/tweak/tweaks/stable-cursor.h
+++ b/plugins/tweak/tweaks/stable-cursor.h
@@ -6,7 +6,7 @@ using namespace std;
 using namespace DFHack;
 using namespace df::enums;
 
-using df::global::ui;
+using df::global::plotinfo;
 using df::global::ui_build_selector;
 using df::global::ui_menu_width;
 
@@ -18,7 +18,7 @@ struct stable_cursor_hook : df::viewscreen_dwarfmodest
 
     bool check_default()
     {
-        switch (ui->main.mode) {
+        switch (plotinfo->main.mode) {
             case ui_sidebar_mode::Default:
                 return true;
 
diff --git a/plugins/tweak/tweaks/title-start-rename.h b/plugins/tweak/tweaks/title-start-rename.h
index baa1552ab..289979be4 100644
--- a/plugins/tweak/tweaks/title-start-rename.h
+++ b/plugins/tweak/tweaks/title-start-rename.h
@@ -17,7 +17,7 @@ struct title_start_rename_hook : df::viewscreen_titlest {
 
     inline std::string full_save_dir(const std::string &region_name)
     {
-        return std::string("data/save/") + region_name;
+        return std::string("save/") + region_name;
     }
 
     bool do_rename()
diff --git a/plugins/uicommon.h b/plugins/uicommon.h
index e7a586585..07bb34f54 100644
--- a/plugins/uicommon.h
+++ b/plugins/uicommon.h
@@ -24,7 +24,7 @@
 #include "df/dfhack_material_category.h"
 #include "df/enabler.h"
 #include "df/item_quality.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/world.h"
 
 using namespace std;
@@ -65,24 +65,6 @@ struct coord32_t
     }
 };
 
-template <class T, typename Fn>
-static void for_each_(vector<T> &v, Fn func)
-{
-    for_each(v.begin(), v.end(), func);
-}
-
-template <class T, class V, typename Fn>
-static void for_each_(map<T, V> &v, Fn func)
-{
-    for_each(v.begin(), v.end(), func);
-}
-
-template <class T, class V, typename Fn>
-static void transform_(const vector<T> &src, vector<V> &dst, Fn func)
-{
-    transform(src.begin(), src.end(), back_inserter(dst), func);
-}
-
 typedef int8_t UIColor;
 
 static inline void OutputString(UIColor color, int &x, int &y, const std::string &text,
@@ -214,23 +196,12 @@ static inline char get_string_input(const std::set<df::interface_key> *input)
  * Utility Functions
  */
 
-static inline df::building_stockpilest *get_selected_stockpile()
-{
-    if (!Gui::dwarfmode_hotkey(Core::getTopViewscreen()) ||
-        df::global::ui->main.mode != ui_sidebar_mode::QueryBuilding)
-    {
-        return nullptr;
-    }
-
-    return virtual_cast<df::building_stockpilest>(df::global::world->selected_building);
-}
-
 static inline bool can_trade()
 {
-    if (df::global::ui->caravans.size() == 0)
+    if (df::global::plotinfo->caravans.size() == 0)
         return false;
 
-    for (auto it = df::global::ui->caravans.begin(); it != df::global::ui->caravans.end(); it++)
+    for (auto it = df::global::plotinfo->caravans.begin(); it != df::global::plotinfo->caravans.end(); it++)
     {
         typedef df::caravan_state::T_trade_state state;
         auto caravan = *it;
diff --git a/plugins/work-now.cpp b/plugins/work-now.cpp
new file mode 100644
index 000000000..bce2d9a73
--- /dev/null
+++ b/plugins/work-now.cpp
@@ -0,0 +1,74 @@
+#include "Debug.h"
+#include "PluginManager.h"
+
+#include "modules/EventManager.h"
+
+using std::string;
+using std::vector;
+using namespace DFHack;
+
+DFHACK_PLUGIN("work-now");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+REQUIRE_GLOBAL(process_jobs);
+REQUIRE_GLOBAL(process_dig);
+
+namespace DFHack {
+    DBG_DECLARE(worknow, log, DebugCategory::LINFO);
+}
+
+DFhackCExport command_result work_now(color_ostream& out, vector<string>& parameters);
+
+static void jobCompletedHandler(color_ostream& out, void* ptr);
+EventManager::EventHandler handler(jobCompletedHandler,1);
+
+DFhackCExport command_result plugin_init(color_ostream& out, std::vector<PluginCommand> &commands) {
+    commands.push_back(PluginCommand(
+        "work-now",
+        "Reduce the time that dwarves idle after completing a job.",
+        work_now));
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (enable != is_enabled)
+    {
+        if (enable)
+            EventManager::registerListener(EventManager::EventType::JOB_COMPLETED, handler, plugin_self);
+        else
+            EventManager::unregister(EventManager::EventType::JOB_COMPLETED, handler, plugin_self);
+
+        is_enabled = enable;
+    }
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown ( color_ostream &out ) {
+    return plugin_enable(out, false);
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event e) {
+    if (e == SC_PAUSED) {
+        DEBUG(log,out).print("game paused; poking idlers\n");
+        *process_jobs = true;
+        *process_dig  = true;
+    }
+
+    return CR_OK;
+}
+
+DFhackCExport command_result work_now(color_ostream& out, vector<string>& parameters) {
+    if (parameters.empty() || parameters[0] == "status") {
+        out.print("work_now is %sactively poking idle dwarves.\n", is_enabled ? "" : "not ");
+        return CR_OK;
+    }
+
+    return CR_WRONG_USAGE;
+}
+
+static void jobCompletedHandler(color_ostream& out, void* ptr) {
+    DEBUG(log,out).print("job completed; poking idlers\n");
+    *process_jobs = true;
+    *process_dig = true;
+}
diff --git a/plugins/workNow.cpp b/plugins/workNow.cpp
deleted file mode 100644
index 2286fee7e..000000000
--- a/plugins/workNow.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
-#include "PluginManager.h"
-#include "DataDefs.h"
-
-#include "modules/EventManager.h"
-#include "modules/World.h"
-
-#include "df/global_objects.h"
-
-#include <vector>
-
-using namespace std;
-using namespace DFHack;
-
-DFHACK_PLUGIN("workNow");
-REQUIRE_GLOBAL(process_jobs);
-REQUIRE_GLOBAL(process_dig);
-
-static int mode = 0;
-
-DFhackCExport command_result workNow(color_ostream& out, vector<string>& parameters);
-
-void jobCompletedHandler(color_ostream& out, void* ptr);
-EventManager::EventHandler handler(jobCompletedHandler,1);
-
-DFhackCExport command_result plugin_init(color_ostream& out, std::vector<PluginCommand> &commands) {
-    if (!process_jobs || !process_dig)
-        return CR_FAILURE;
-
-    commands.push_back(PluginCommand(
-        "workNow",
-        "Reduce the time that dwarves idle after completing a job.",
-        workNow));
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out ) {
-    mode = 0;
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event e) {
-    if ( !mode )
-        return CR_OK;
-    if ( e == DFHack::SC_WORLD_UNLOADED ) {
-        mode = 0;
-        return CR_OK;
-    }
-    if ( e != DFHack::SC_PAUSED )
-        return CR_OK;
-
-    *process_jobs = true;
-    *process_dig  = true;
-
-    return CR_OK;
-}
-
-DFhackCExport command_result workNow(color_ostream& out, vector<string>& parameters) {
-    if ( parameters.size() == 0 ) {
-        out.print("workNow status = %d\n", mode);
-        return CR_OK;
-    }
-    if ( parameters.size() > 1 ) {
-        return CR_WRONG_USAGE;
-    }
-    int32_t a = atoi(parameters[0].c_str());
-
-    if (a < 0 || a > 2)
-        return CR_WRONG_USAGE;
-
-    if ( a == 2 && mode != 2 ) {
-        EventManager::registerListener(EventManager::EventType::JOB_COMPLETED, handler, plugin_self);
-    } else if ( mode == 2 && a != 2 ) {
-        EventManager::unregister(EventManager::EventType::JOB_COMPLETED, handler, plugin_self);
-    }
-
-    mode = a;
-    out.print("workNow status = %d\n", mode);
-
-    return CR_OK;
-}
-
-void jobCompletedHandler(color_ostream& out, void* ptr) {
-    if ( mode < 2 )
-        return;
-
-    *process_jobs = true;
-    *process_dig = true;
-}
diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp
index 3f132616b..a8f11dec0 100644
--- a/plugins/workflow.cpp
+++ b/plugins/workflow.cpp
@@ -15,7 +15,7 @@
 
 #include "DataDefs.h"
 #include "df/world.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/building_workshopst.h"
 #include "df/building_furnacest.h"
 #include "df/job.h"
@@ -51,7 +51,7 @@ using namespace df::enums;
 DFHACK_PLUGIN("workflow");
 
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(ui_workshop_job_cursor);
 REQUIRE_GLOBAL(job_next_id);
 
@@ -64,7 +64,7 @@ static void cleanup_state(color_ostream &out);
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    if (!world || !ui)
+    if (!world || !plotinfo)
         return CR_FAILURE;
 
     if (ui_workshop_job_cursor && job_next_id) {
@@ -1684,7 +1684,7 @@ static command_result workflow_cmd(color_ostream &out, vector <string> & paramet
     //df::job *job = NULL;
 
     if (Gui::dwarfmode_hotkey(Core::getTopViewscreen()) &&
-        ui->main.mode == ui_sidebar_mode::QueryBuilding)
+        plotinfo->main.mode == ui_sidebar_mode::QueryBuilding)
     {
         workshop = world->selected_building;
         //job = Gui::getSelectedWorkshopJob(out, true);
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index a3a0f2431..5d162302a 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -15,6 +15,13 @@
 // - unassign single creature under cursor from current zone
 // - pitting own dwarves :)
 
+#include "PluginManager.h"
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("zone");
+
+/*
 #include <functional>
 #include <stdexcept>
 #include <unordered_map>
@@ -24,13 +31,11 @@
 #include "df/building_chainst.h"
 #include "df/building_civzonest.h"
 #include "df/general_ref_building_civzone_assignedst.h"
-#include "df/ui.h"
+#include "df/plotinfost.h"
 #include "df/unit.h"
 #include "df/unit_relationship_type.h"
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/world.h"
-
-#include "PluginManager.h"
 #include "uicommon.h"
 #include "VTableInterpose.h"
 
@@ -49,14 +54,11 @@ using std::unordered_map;
 using std::unordered_set;
 using std::vector;
 
-using namespace DFHack;
-
-DFHACK_PLUGIN("zone");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
 REQUIRE_GLOBAL(cursor);
 REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(ui_building_item_cursor);
 REQUIRE_GLOBAL(ui_building_assign_type);
 REQUIRE_GLOBAL(ui_building_assign_is_marked);
@@ -1565,7 +1567,7 @@ static command_result df_zone(color_ostream &out, vector <string> & parameters)
 
     if(!race_filter_set && (building_assign || cagezone_assign || unit_slaughter))
     {
-        string own_race_name = Units::getRaceNameById(ui->race_id);
+        string own_race_name = Units::getRaceNameById(plotinfo->race_id);
         out.color(COLOR_BROWN);
         out << "Default filter for " << parameters[0]
             << ": 'not (race " << own_race_name << " or own civilization)'; use 'race "
@@ -2128,14 +2130,14 @@ struct zone_hook : public df::viewscreen_dwarfmodest
 
     DEFINE_VMETHOD_INTERPOSE(void, render, ())
     {
-        if ( ( (ui->main.mode == ui_sidebar_mode::ZonesPenInfo || ui->main.mode == ui_sidebar_mode::ZonesPitInfo) &&
+        if ( ( (plotinfo->main.mode == ui_sidebar_mode::ZonesPenInfo || plotinfo->main.mode == ui_sidebar_mode::ZonesPitInfo) &&
             ui_building_assign_type && ui_building_assign_units &&
             ui_building_assign_is_marked && ui_building_assign_items &&
             ui_building_assign_type->size() == ui_building_assign_units->size() &&
             ui_building_item_cursor)
             // allow mode QueryBuilding, but only for cages (bedrooms will crash DF with this code, chains don't work either etc)
             ||
-            (   ui->main.mode == ui_sidebar_mode::QueryBuilding &&
+            (   plotinfo->main.mode == ui_sidebar_mode::QueryBuilding &&
                 ui_building_in_assign && *ui_building_in_assign &&
                 ui_building_assign_type && ui_building_assign_units &&
                 ui_building_assign_type->size() == ui_building_assign_units->size() &&
@@ -2146,7 +2148,7 @@ struct zone_hook : public df::viewscreen_dwarfmodest
             )
         {
             if (vector_get(*ui_building_assign_units, *ui_building_item_cursor))
-                filter.initialize(ui->main.mode);
+                filter.initialize(plotinfo->main.mode);
         }
         else
         {
@@ -2177,11 +2179,12 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 
     return CR_OK;
 }
+*/
 
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
-    commands.push_back(PluginCommand(
-        "zone",
-        "Manage activity zones.",
-        df_zone));
+    // commands.push_back(PluginCommand(
+    //     "zone",
+    //     "Manage activity zones.",
+    //     df_zone));
     return CR_OK;
 }
diff --git a/scripts b/scripts
index 5ec3a484e..87e6f1ae3 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 5ec3a484e243954151cf21fd288311667bf15b61
+Subproject commit 87e6f1ae310ab81545198542cb07fea7016529c9
diff --git a/test/core.lua b/test/core.lua
index ba104c90a..cc102984e 100644
--- a/test/core.lua
+++ b/test/core.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local function clean_path(p)
     -- todo: replace with dfhack.filesystem call?
     return p:gsub('\\', '/'):gsub('//', '/'):gsub('/$', '')
diff --git a/test/encoding.lua b/test/encoding.lua
index cb0a72664..7a81f0ec4 100644
--- a/test/encoding.lua
+++ b/test/encoding.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 function test.toSearchNormalized()
     expect.eq(dfhack.toSearchNormalized(''), '')
     expect.eq(dfhack.toSearchNormalized('abcd'), 'abcd')
diff --git a/test/gui.lua b/test/gui.lua
index 1550fc1de..6bbb34117 100644
--- a/test/gui.lua
+++ b/test/gui.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 function test.getCurViewscreen()
     local scr = dfhack.gui.getCurViewscreen()
     local scr2 = df.global.gview.view
@@ -18,7 +20,7 @@ function test.getViewscreenByType()
 
     local bad_type = df.viewscreen_titlest
     if scr._type == bad_type then
-        bad_type = df.viewscreen_optionst
+        bad_type = df.viewscreen_dwarfmodest
     end
     local scr_bad = dfhack.gui.getViewscreenByType(bad_type)
     expect.eq(scr_bad, nil)
diff --git a/test/library/argparse.lua b/test/library/argparse.lua
index 5e85e6465..437f1ea2b 100644
--- a/test/library/argparse.lua
+++ b/test/library/argparse.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local argparse = require('argparse')
 local guidm = require('gui.dwarfmode')
 
diff --git a/test/library/gui.lua b/test/library/gui.lua
index fe04614d6..3fc8b889d 100644
--- a/test/library/gui.lua
+++ b/test/library/gui.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local gui = require('gui')
 
 function test.getKeyDisplay()
@@ -10,11 +12,13 @@ end
 
 function test.clear_pen()
     expect.table_eq(gui.CLEAR_PEN, {
+        tile = df.global.init.texpos_border_interior,
         ch = string.byte(' '),
         fg = COLOR_BLACK,
         bg = COLOR_BLACK,
         bold = false,
         tile_color = false,
+        write_to_lower = true,
     })
 end
 
diff --git a/test/library/gui/dialogs.lua b/test/library/gui/dialogs.lua
index 0d3724c2e..524a8b144 100644
--- a/test/library/gui/dialogs.lua
+++ b/test/library/gui/dialogs.lua
@@ -1,3 +1,5 @@
+--config.target = 'core'
+
 local gui = require('gui')
 local function send_keys(...)
     local keys = {...}
diff --git a/test/library/gui/dwarfmode.lua b/test/library/gui/dwarfmode.lua
deleted file mode 100644
index 1f3ab6a87..000000000
--- a/test/library/gui/dwarfmode.lua
+++ /dev/null
@@ -1,75 +0,0 @@
-config = {
-    mode = 'fortress',
-}
-
-local gui = require('gui')
-local guidm = require('gui.dwarfmode')
-
-function test.enterSidebarMode()
-    expect.error_match('Invalid or unsupported sidebar mode',
-                       function() guidm.enterSidebarMode('badmode') end)
-    expect.error_match('Invalid or unsupported sidebar mode',
-                       function() guidm.enterSidebarMode(
-                                        df.ui_sidebar_mode.OrdersRefuse) end)
-
-    expect.error_match('must be a positive number',
-                       function() guidm.enterSidebarMode(0, 'gg') end)
-    expect.error_match('must be a positive number',
-                       function() guidm.enterSidebarMode(0, 0) end)
-    expect.error_match('must be a positive number',
-                       function() guidm.enterSidebarMode(0, '0') end)
-    expect.error_match('must be a positive number',
-                       function() guidm.enterSidebarMode(0, -1) end)
-    expect.error_match('must be a positive number',
-                       function() guidm.enterSidebarMode(0, '-1') end)
-
-    -- Simulate not being able to get to default from a screen via mocks. This
-    -- failure can actually happen in-game in some situations, such as when
-    -- naming a building with ctrl-N (no way to cancel changes).
-    mock.patch({{dfhack.gui, 'getFocusString', mock.func()},
-                {gui, 'simulateInput', mock.func()}},
-               function()
-                   expect.error_match('Unable to get into target sidebar mode',
-                    function()
-                        guidm.enterSidebarMode(df.ui_sidebar_mode.Default)
-                    end)
-               end)
-
-    -- verify expected starting state
-    expect.eq(df.ui_sidebar_mode.Default, df.global.ui.main.mode)
-    expect.eq('dwarfmode/Default', dfhack.gui.getCurFocus(true))
-
-    -- get into the orders screen
-    gui.simulateInput(dfhack.gui.getCurViewscreen(true), 'D_JOBLIST')
-    gui.simulateInput(dfhack.gui.getCurViewscreen(true), 'UNITJOB_MANAGER')
-    expect.eq(df.ui_sidebar_mode.Default, df.global.ui.main.mode)
-    expect.eq('jobmanagement/Main', dfhack.gui.getCurFocus(true))
-
-    -- get back into default from some deep screen
-    guidm.enterSidebarMode(df.ui_sidebar_mode.Default)
-    expect.eq(df.ui_sidebar_mode.Default, df.global.ui.main.mode)
-    expect.eq('dwarfmode/Default', dfhack.gui.getCurFocus(true))
-
-    -- move from default to some other mode
-    guidm.enterSidebarMode(df.ui_sidebar_mode.QueryBuilding)
-    expect.eq(df.ui_sidebar_mode.QueryBuilding, df.global.ui.main.mode)
-    expect.str_find('^dwarfmode/QueryBuilding', dfhack.gui.getCurFocus(true))
-
-    -- move between non-default modes
-    guidm.enterSidebarMode(df.ui_sidebar_mode.LookAround)
-    expect.eq(df.ui_sidebar_mode.LookAround, df.global.ui.main.mode)
-    expect.str_find('^dwarfmode/LookAround', dfhack.gui.getCurFocus(true))
-
-    -- get back into default from a supported mode
-    guidm.enterSidebarMode(df.ui_sidebar_mode.Default)
-    expect.eq(df.ui_sidebar_mode.Default, df.global.ui.main.mode)
-    expect.eq('dwarfmode/Default', dfhack.gui.getCurFocus(true))
-
-    -- verify that all supported modes lead where we say they'll go
-    for k,v in pairs(guidm.SIDEBAR_MODE_KEYS) do
-        guidm.enterSidebarMode(k)
-        expect.eq(k, df.global.ui.main.mode, df.ui_sidebar_mode[k])
-    end
-    -- end test back in default so the test harness doesn't have to autocorrect
-    guidm.enterSidebarMode(df.ui_sidebar_mode.Default)
-end
diff --git a/test/library/gui/widgets.EditField.lua b/test/library/gui/widgets.EditField.lua
index 23558987b..8418b67d4 100644
--- a/test/library/gui/widgets.EditField.lua
+++ b/test/library/gui/widgets.EditField.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local widgets = require('gui.widgets')
 
 function test.editfield_cursor()
@@ -20,18 +22,18 @@ function test.editfield_cursor()
     expect.eq('ones two threes', e.text)
     expect.eq(5, e.cursor)
 
-    e:onInput{CURSOR_LEFT=true}
+    e:onInput{KEYBOARD_CURSOR_LEFT=true}
     expect.eq(4, e.cursor)
-    e:onInput{CURSOR_RIGHT=true}
+    e:onInput{KEYBOARD_CURSOR_RIGHT=true}
     expect.eq(5, e.cursor)
-    e:onInput{A_CARE_MOVE_W=true}
-    expect.eq(1, e.cursor, 'interpret alt-left as home')
-    e:onInput{A_MOVE_E_DOWN=true}
-    expect.eq(6, e.cursor, 'interpret ctrl-right as goto beginning of next word')
-    e:onInput{A_CARE_MOVE_E=true}
-    expect.eq(16, e.cursor, 'interpret alt-right as end')
-    e:onInput{A_MOVE_W_DOWN=true}
-    expect.eq(9, e.cursor, 'interpret ctrl-left as goto end of previous word')
+    -- e:onInput{A_CARE_MOVE_W=true}
+    -- expect.eq(1, e.cursor, 'interpret alt-left as home') -- uncomment when we have a home key
+    e:onInput{CUSTOM_CTRL_F=true}
+    expect.eq(6, e.cursor, 'interpret Ctrl-f as goto beginning of next word')
+    e:onInput{CUSTOM_CTRL_E=true}
+    expect.eq(16, e.cursor, 'interpret Ctrl-e as end')
+    e:onInput{CUSTOM_CTRL_B=true}
+    expect.eq(9, e.cursor, 'interpret Ctrl-b as goto end of previous word')
 end
 
 function test.editfield_click()
@@ -40,17 +42,17 @@ function test.editfield_click()
     expect.eq(5, e.cursor)
 
     mock.patch(e, 'getMousePos', mock.func(0), function()
-            e:onInput{_MOUSE_L=true}
+            e:onInput{_MOUSE_L_DOWN=true}
             expect.eq(1, e.cursor)
         end)
 
     mock.patch(e, 'getMousePos', mock.func(20), function()
-            e:onInput{_MOUSE_L=true}
+            e:onInput{_MOUSE_L_DOWN=true}
             expect.eq(5, e.cursor, 'should only seek to end of text')
         end)
 
     mock.patch(e, 'getMousePos', mock.func(2), function()
-            e:onInput{_MOUSE_L=true}
+            e:onInput{_MOUSE_L_DOWN=true}
             expect.eq(3, e.cursor)
         end)
 end
diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index 4693d3d0d..09ead7ad5 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -1,7 +1,9 @@
+config.target = 'core'
+
 local gui = require('gui')
 local widgets = require('gui.widgets')
 
-local fs = defclass(fs, gui.FramedScreen)
+local fs = defclass(nil, gui.FramedScreen)
 fs.ATTRS = {
     frame_style = gui.GREY_LINE_FRAME,
     frame_title = 'TestFramedScreen',
diff --git a/test/library/gui/widgets.Scrollbar.lua b/test/library/gui/widgets.Scrollbar.lua
index dbe033ba4..dd490256c 100644
--- a/test/library/gui/widgets.Scrollbar.lua
+++ b/test/library/gui/widgets.Scrollbar.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local gui = require('gui')
 local widgets = require('gui.widgets')
 
@@ -10,7 +12,7 @@ function test.update()
     expect.eq(1, s.elems_per_page)
     expect.eq(1, s.num_elems)
     expect.eq(0, s.bar_offset)
-    expect.eq(1, s.bar_height)
+    expect.eq(2, s.bar_height)
 
     -- top_elem, elems_per_page, num_elems
     s:update(1, 10, 0)
@@ -18,7 +20,7 @@ function test.update()
     expect.eq(10, s.elems_per_page)
     expect.eq(0, s.num_elems)
     expect.eq(0, s.bar_offset)
-    expect.eq(1, s.bar_height)
+    expect.eq(2, s.bar_height)
 
     -- first 10 of 50 shown
     s:update(1, 10, 50)
@@ -57,37 +59,37 @@ function test.onInput()
     s:update(23, 10, 50)
 
     expect.false_(s:onInput{}, 'no mouse down')
-    expect.false_(s:onInput{_MOUSE_L_DOWN=true}, 'no y coord')
+    expect.false_(s:onInput{_MOUSE_L=true}, 'no y coord')
 
     spec, y = nil, 0
-    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.true_(s:onInput{_MOUSE_L=true})
     expect.eq('up_small', spec, 'on up arrow')
 
     spec, y = nil, 1
-    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.true_(s:onInput{_MOUSE_L=true})
     expect.eq('up_large', spec, 'on body above bar')
 
     spec, y = nil, 44
-    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.true_(s:onInput{_MOUSE_L=true})
     expect.eq('up_large', spec, 'on body just above bar')
 
     spec, y = nil, 45
-    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.true_(s:onInput{_MOUSE_L=true})
     expect.nil_(spec, 'on top of bar')
 
     spec, y = nil, 63
-    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.true_(s:onInput{_MOUSE_L=true})
     expect.nil_(spec, 'on bottom of bar')
 
     spec, y = nil, 64
-    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.true_(s:onInput{_MOUSE_L=true})
     expect.eq('down_large', spec, 'on body just below bar')
 
     spec, y = nil, 98
-    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.true_(s:onInput{_MOUSE_L=true})
     expect.eq('down_large', spec, 'on body below bar')
 
     spec, y = nil, 99
-    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.true_(s:onInput{_MOUSE_L=true})
     expect.eq('down_small', spec, 'on down arrow')
 end
diff --git a/test/library/gui/widgets.lua b/test/library/gui/widgets.lua
index 51622e691..b37fbe04d 100644
--- a/test/library/gui/widgets.lua
+++ b/test/library/gui/widgets.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local widgets = require('gui.widgets')
 
 function test.hotkeylabel_click()
@@ -5,7 +7,7 @@ function test.hotkeylabel_click()
     local l = widgets.HotkeyLabel{key='SELECT', on_activate=func}
 
     mock.patch(l, 'getMousePos', mock.func(0), function()
-            l:onInput{_MOUSE_L_DOWN=true}
+            l:onInput{_MOUSE_L=true}
             expect.eq(1, func.call_count)
         end)
 end
@@ -31,7 +33,7 @@ function test.togglehotkeylabel_click()
     local l = widgets.ToggleHotkeyLabel{}
     expect.true_(l:getOptionValue())
     mock.patch(l, 'getMousePos', mock.func(0), function()
-            l:onInput{_MOUSE_L_DOWN=true}
+            l:onInput{_MOUSE_L=true}
             expect.false_(l:getOptionValue())
         end)
 end
diff --git a/test/library/helpdb.lua b/test/library/helpdb.lua
index 1f1e58ba9..7be2488df 100644
--- a/test/library/helpdb.lua
+++ b/test/library/helpdb.lua
@@ -1,3 +1,5 @@
+--config.target = 'core'
+
 local h = require('helpdb')
 
 local mock_plugin_db = {
diff --git a/test/library/misc.lua b/test/library/misc.lua
index e746ec1a6..58afed967 100644
--- a/test/library/misc.lua
+++ b/test/library/misc.lua
@@ -1,5 +1,7 @@
 -- tests misc functions added by dfhack.lua
 
+config.target = 'core'
+
 function test.safe_pairs()
     for k,v in safe_pairs(nil) do
         expect.fail('nil should not be iterable')
diff --git a/test/library/print.lua b/test/library/print.lua
index 3f9b5a78c..28a2e7037 100644
--- a/test/library/print.lua
+++ b/test/library/print.lua
@@ -1,5 +1,7 @@
 -- tests print-related functions added by dfhack.lua
 
+config.target = 'core'
+
 local dfhack = dfhack
 
 local mock_print = mock.func()
diff --git a/test/library/string.lua b/test/library/string.lua
index d22f262bf..f6374f652 100644
--- a/test/library/string.lua
+++ b/test/library/string.lua
@@ -1,5 +1,7 @@
 -- tests string functions added by dfhack.lua
 
+config.target = 'core'
+
 function test.startswith()
     expect.true_(('abcd'):startswith(''))
     expect.true_(('abcd'):startswith('abc'))
diff --git a/test/library/test_util/expect_unit.lua b/test/library/test_util/expect_unit.lua
index 1c3bd51e8..320e49707 100644
--- a/test/library/test_util/expect_unit.lua
+++ b/test/library/test_util/expect_unit.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local expect_raw = require('test_util.expect')
 
 function test.str_find()
diff --git a/test/library/test_util/mock.lua b/test/library/test_util/mock.lua
index 1031a496a..ce25e6e69 100644
--- a/test/library/test_util/mock.lua
+++ b/test/library/test_util/mock.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local mock = require('test_util.mock')
 
 local test_table = {
diff --git a/test/library/utils.lua b/test/library/utils.lua
index 509fab8bc..ac40bea1a 100644
--- a/test/library/utils.lua
+++ b/test/library/utils.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local utils = require 'utils'
 
 function test.OrderedTable()
@@ -94,7 +96,7 @@ function test.df_expr_to_ref()
         dfhack.with_temp_object(df.new('ptr-vector'), function(vec)
             fake_unit = vec
             vec:insert('#', df.global.world)
-            vec:insert('#', df.global.ui)
+            vec:insert('#', df.global.plotinfo)
 
             expect.eq(utils.df_expr_to_ref('unit'), vec)
 
@@ -102,7 +104,7 @@ function test.df_expr_to_ref()
             expect.eq(df.reinterpret_cast(df.world, utils.df_expr_to_ref('unit[0]').value), df.global.world)
 
             expect.eq(utils.df_expr_to_ref('unit[1]'), utils.df_expr_to_ref('unit.1'))
-            expect.eq(df.reinterpret_cast(df.ui, utils.df_expr_to_ref('unit[1]').value), df.global.ui)
+            expect.eq(df.reinterpret_cast(df.plotinfost, utils.df_expr_to_ref('unit[1]').value), df.global.plotinfo)
 
             expect.error_match('index out of bounds', function() utils.df_expr_to_ref('unit.2') end)
             expect.error_match('index out of bounds', function() utils.df_expr_to_ref('unit[2]') end)
diff --git a/test/modules/job.lua b/test/modules/job.lua
new file mode 100644
index 000000000..518cb26a3
--- /dev/null
+++ b/test/modules/job.lua
@@ -0,0 +1,19 @@
+config.target = 'core'
+config.mode = 'title' -- alters world state, not safe when a world is loaded
+
+function test.removeJob()
+    -- removeJob() calls DF code, so ensure that that DF code is actually running
+
+    -- for an explanation of why this is necessary to check,
+    -- see https://github.com/DFHack/dfhack/pull/3713 and Job.cpp:removeJob()
+
+    expect.nil_(df.global.world.jobs.list.next, 'job list is not empty')
+
+    local job = df.job:new()  -- will be deleted by removeJob() if the test passes
+    dfhack.job.linkIntoWorld(job)
+    expect.true_(df.global.world.jobs.list.next, 'job list is empty')
+    expect.eq(df.global.world.jobs.list.next.item, job, 'expected job not found in list')
+
+    expect.true_(dfhack.job.removeJob(job))
+    expect.nil_(df.global.world.jobs.list.next, 'job list is not empty after removeJob()')
+end
diff --git a/test/plugins/blueprint.lua b/test/plugins/blueprint.lua
index 6146aea3f..35d32e1ff 100644
--- a/test/plugins/blueprint.lua
+++ b/test/plugins/blueprint.lua
@@ -1,3 +1,5 @@
+config.target = 'blueprint'
+
 local b = require('plugins.blueprint')
 
 -- also covers code shared between parse_gui_commandline and parse_commandline
@@ -117,9 +119,9 @@ function test.parse_gui_commandline()
                        function() b.parse_gui_commandline({}, {''}) end)
 
     opts = {}
-    b.parse_gui_commandline(opts, {'imaname', 'dig', 'query'})
+    b.parse_gui_commandline(opts, {'imaname', 'dig', 'place'})
     expect.table_eq({auto_phase=false, format='minimal', split_strategy='none',
-                     name='imaname', dig=true, query=true},
+                     name='imaname', dig=true, place=true},
                     opts)
 
     expect.error_match('unknown phase',
@@ -203,9 +205,9 @@ function test.do_phase_positive_dims()
         function()
               local spos = {x=10, y=20, z=30}
               local epos = {x=11, y=21, z=31}
-              b.query(spos, epos, 'imaname')
+              b.place(spos, epos, 'imaname')
               expect.eq(1, mock_run.call_count)
-              expect.table_eq({'2', '2', '2', 'imaname', 'query',
+              expect.table_eq({'2', '2', '2', 'imaname', 'place',
                                '--cursor=10,20,30'},
                               mock_run.call_args[1])
         end)
@@ -217,9 +219,9 @@ function test.do_phase_negative_dims()
         function()
               local spos = {x=11, y=21, z=31}
               local epos = {x=10, y=20, z=30}
-              b.query(spos, epos, 'imaname')
+              b.place(spos, epos, 'imaname')
               expect.eq(1, mock_run.call_count)
-              expect.table_eq({'2', '2', '-2', 'imaname', 'query',
+              expect.table_eq({'2', '2', '-2', 'imaname', 'place',
                                '--cursor=10,20,31'},
                               mock_run.call_args[1])
         end)
@@ -231,9 +233,9 @@ function test.do_phase_ensure_cursor_is_at_upper_left()
         function()
               local spos = {x=11, y=20, z=30}
               local epos = {x=10, y=21, z=31}
-              b.query(spos, epos, 'imaname')
+              b.place(spos, epos, 'imaname')
               expect.eq(1, mock_run.call_count)
-              expect.table_eq({'2', '2', '2', 'imaname', 'query',
+              expect.table_eq({'2', '2', '2', 'imaname', 'place',
                                '--cursor=10,20,30'},
                               mock_run.call_args[1])
         end)
@@ -241,16 +243,16 @@ end
 
 function test.get_filename()
     local opts = {name='a', split_strategy='none'}
-    expect.eq('blueprints/a.csv', b.get_filename(opts, 'dig', 1))
+    expect.eq('dfhack-config/blueprints/a.csv', b.get_filename(opts, 'dig', 1))
 
     opts = {name='a/', split_strategy='none'}
-    expect.eq('blueprints/a/a.csv', b.get_filename(opts, 'dig', 1))
+    expect.eq('dfhack-config/blueprints/a/a.csv', b.get_filename(opts, 'dig', 1))
 
     opts = {name='a', split_strategy='phase'}
-    expect.eq('blueprints/a-1-dig.csv', b.get_filename(opts, 'dig', 1))
+    expect.eq('dfhack-config/blueprints/a-1-dig.csv', b.get_filename(opts, 'dig', 1))
 
     opts = {name='a/', split_strategy='phase'}
-    expect.eq('blueprints/a/a-5-dig.csv', b.get_filename(opts, 'dig', 5))
+    expect.eq('dfhack-config/blueprints/a/a-5-dig.csv', b.get_filename(opts, 'dig', 5))
 
     expect.error_match('could not parse basename', function()
             b.get_filename({name='', split_strategy='none'})
diff --git a/test/plugins/cxxrandom.lua b/test/plugins/cxxrandom.lua
index 6b11e1937..997cb2cb3 100644
--- a/test/plugins/cxxrandom.lua
+++ b/test/plugins/cxxrandom.lua
@@ -1,3 +1,5 @@
+config.target = 'cxxrandom'
+
 local rng = require('plugins.cxxrandom')
 
 function test.cxxrandom_distributions()
diff --git a/test/plugins/orders.lua b/test/plugins/orders.lua
index a0959ae94..d851adb02 100644
--- a/test/plugins/orders.lua
+++ b/test/plugins/orders.lua
@@ -1,4 +1,5 @@
 config.mode = 'fortress'
+config.target = 'orders'
 
 local FILE_PATH_PATTERN = 'dfhack-config/orders/%s.json'
 
diff --git a/test/plugins/workflow.lua b/test/plugins/workflow.lua
index a03d1c2f6..8d0c69c68 100644
--- a/test/plugins/workflow.lua
+++ b/test/plugins/workflow.lua
@@ -1,3 +1,5 @@
+config.target = 'workflow'
+
 local workflow = require('plugins.workflow')
 
 function test.job_outputs()
diff --git a/test/quickfort/ecosystem.lua b/test/quickfort/ecosystem.lua
index 27dddc5d5..bbe16319f 100644
--- a/test/quickfort/ecosystem.lua
+++ b/test/quickfort/ecosystem.lua
@@ -26,6 +26,7 @@
 -- crashing the game.
 
 config.mode = 'fortress'
+config.target = {'quickfort', 'blueprint', 'dig-now', 'tiletypes', 'gui/quantum'}
 
 local argparse = require('argparse')
 local gui = require('gui')
@@ -397,7 +398,7 @@ function extra_fns.gui_quantum(pos)
     local vehicles = assign_minecarts.get_free_vehicles()
     local confirm_state = confirm.isEnabled()
     local confirm_conf = confirm.get_conf_data()
-    local routes = df.global.ui.hauling.routes
+    local routes = df.global.plotinfo.hauling.routes
     local num_routes = #routes
     local next_order_id = df.global.world.manager_order_next_id
 
diff --git a/test/structures/find.lua b/test/structures/find.lua
index c01f071e1..590df8971 100644
--- a/test/structures/find.lua
+++ b/test/structures/find.lua
@@ -1,4 +1,5 @@
-config.mode = 'title'
+config.mode = 'title' -- not safe to run when a world is loaded
+config.target = 'core'
 
 local function clean_vec(vec)
     while #vec > 0 do
diff --git a/test/structures/globals.lua b/test/structures/globals.lua
new file mode 100644
index 000000000..81d77f8c7
--- /dev/null
+++ b/test/structures/globals.lua
@@ -0,0 +1,32 @@
+config.target = 'core'
+
+local function with_temp_global_address(name, addr, callback, ...)
+    dfhack.call_with_finalizer(2, true,
+        dfhack.internal.setAddress, name, dfhack.internal.getAddress(name),
+        function(...)
+            dfhack.internal.setAddress(name, addr)
+            callback(...)
+        end, ...)
+end
+
+function test.unknown_global_address()
+    expect.ne(dfhack.internal.getAddress('army_next_id'), 0)
+    local old_id = df.global.army_next_id
+
+    with_temp_global_address('army_next_id', 0, function()
+        expect.error_match('Cannot read field global.army_next_id: global address not known.', function()
+            local _ = df.global.army_next_id
+        end)
+
+        expect.error_match('Cannot write field global.army_next_id: global address not known.', function()
+            df.global.army_next_id = old_id
+        end)
+
+        expect.error_match('Cannot reference field global.army_next_id: global address not known.', function()
+            local _ = df.global:_field('army_next_id')
+        end)
+    end)
+
+    expect.gt(dfhack.internal.getAddress('army_next_id'), 0)
+    expect.eq(df.global.army_next_id, old_id)
+end
diff --git a/test/structures/misc.lua b/test/structures/misc.lua
index 5c9f41561..13febff56 100644
--- a/test/structures/misc.lua
+++ b/test/structures/misc.lua
@@ -1,6 +1,8 @@
+config.target = 'core'
+
 function test.overlappingGlobals()
     local globals = {}
-    for name, _ in pairs(df.global) do
+    for name in pairs(df.global) do
         local gvar = df.global:_field(name)
         local size, addr = gvar:sizeof()
         table.insert(globals, {
@@ -26,7 +28,7 @@ function test.viewscreenDtors()
     for name, type in pairs(df) do
         if name:startswith('viewscreen') then
             print('testing', name)
-            v = type:new()
+            local v = type:new()
             expect.true_(v:delete(), "destructor returned false: " .. name)
         end
     end
diff --git a/test/structures/other_vectors.lua b/test/structures/other_vectors.lua
index bfc6086a4..aea00c27c 100644
--- a/test/structures/other_vectors.lua
+++ b/test/structures/other_vectors.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 function test.index_name()
     for _, k in ipairs(df.units_other_id) do
         expect.eq(df.global.world.units.other[k]._kind, 'container')
diff --git a/test/structures/primitive_refs.lua b/test/structures/primitive_refs.lua
index 74abd02b9..7bd7daf3c 100644
--- a/test/structures/primitive_refs.lua
+++ b/test/structures/primitive_refs.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 utils = require('utils')
 
 function with_temp_ref(...)
diff --git a/test/structures/ref_target.lua b/test/structures/ref_target.lua
index b9c568805..560a5e4f7 100644
--- a/test/structures/ref_target.lua
+++ b/test/structures/ref_target.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 function test.get()
     dfhack.with_temp_object(df.unit:new(), function(unit)
         expect.eq(unit:_field('hist_figure_id').ref_target, df.historical_figure)
diff --git a/test/structures/struct_fields.lua b/test/structures/struct_fields.lua
new file mode 100644
index 000000000..01e4175d4
--- /dev/null
+++ b/test/structures/struct_fields.lua
@@ -0,0 +1,112 @@
+config.target = 'core'
+
+local COORD_FIELD_NAMES = {'x', 'y', 'z', 'isValid', 'clear'}
+local COORD_FIELD_EXPECTED_DATA = {
+    x = {type_name='int16_t'},
+    y = {type_name='int16_t'},
+    z = {type_name='int16_t'},
+    isValid = {type_name='function'},
+    clear = {type_name='function'},
+}
+
+local READONLY_MSG = 'Attempt to change a read%-only table.'
+
+local function listFieldNames(t)
+    local names = {}
+    for name in pairs(t._fields) do
+        table.insert(names, name)
+    end
+    return names
+end
+
+function test.access()
+    local fields = df.coord._fields
+    expect.true_(fields)
+    expect.eq(fields, df.coord._fields)
+
+    for name, expected in pairs(COORD_FIELD_EXPECTED_DATA) do
+        expect.true_(fields[name], name)
+        expect.eq(fields[name].name, name, name)
+        expect.eq(fields[name].type_name, expected.type_name, name)
+        expect.eq(type(fields[name].offset), 'number', name)
+        expect.eq(type(fields[name].mode), 'number', name)
+        expect.eq(type(fields[name].count), 'number', name)
+    end
+end
+
+function test.globals_original_name()
+    for name, info in pairs(df.global._fields) do
+        expect.eq(type(info.original_name), 'string', name)
+    end
+end
+
+function test.order()
+    expect.table_eq(listFieldNames(df.coord), COORD_FIELD_NAMES)
+end
+
+function test.nonexistent()
+    expect.nil_(df.coord._fields.nonexistent)
+
+    expect.error_match('string expected', function()
+        expect.nil_(df.coord._fields[2])
+    end)
+    expect.error_match('string expected', function()
+        expect.nil_(df.coord._fields[nil])
+    end)
+end
+
+function test.count()
+    expect.eq(df.unit._fields.relationship_ids.count, 10)
+end
+
+function test.index_enum()
+    expect.eq(df.unit._fields.relationship_ids.index_enum, df.unit_relationship_type)
+end
+
+function test.ref_target()
+    expect.eq(df.unit._fields.hist_figure_id.ref_target, df.historical_figure)
+end
+
+function test.readonly()
+    expect.error_match(READONLY_MSG, function()
+        df.coord._fields.x = 'foo'
+    end)
+    expect.error_match(READONLY_MSG, function()
+        df.coord._fields.nonexistent = 'foo'
+    end)
+    expect.nil_(df.coord._fields.nonexistent)
+
+    -- should have no effect
+    df.coord._fields.x.name = 'foo'
+    expect.eq(df.coord._fields.x.name, 'x')
+end
+
+function test.circular_refs_init()
+    expect.eq(df.job._fields.list_link.type, df.job_list_link)
+    expect.eq(df.job_list_link._fields.item.type, df.job)
+end
+
+function test.subclass_match()
+    for f, parent in pairs(df.viewscreen._fields) do
+        local child = df.viewscreen_titlest._fields[f]
+        expect.table_eq(parent, child, f)
+    end
+end
+
+function test.subclass_order()
+    -- ensure that parent class fields come before subclass fields
+    local hierarchy = {df.item, df.item_actual, df.item_crafted, df.item_constructed, df.item_bedst}
+    local field_names = {}
+    for _, t in pairs(hierarchy) do
+        field_names[t] = listFieldNames(t)
+    end
+    for ic = 1, #hierarchy do
+        for ip = 1, ic - 1 do
+            local parent_fields = listFieldNames(hierarchy[ip])
+            local child_fields = listFieldNames(hierarchy[ic])
+            child_fields = table.pack(table.unpack(child_fields, 1, #parent_fields))
+            child_fields.n = nil
+            expect.table_eq(child_fields, parent_fields, ('compare %s to %s'):format(hierarchy[ip], hierarchy[ic]))
+        end
+    end
+end
diff --git a/test/structures/types_meta.lua b/test/structures/types_meta.lua
index 212e9c7ed..79395575f 100644
--- a/test/structures/types_meta.lua
+++ b/test/structures/types_meta.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 function test.struct()
     expect.eq(df.coord._kind, 'struct-type')
     expect.eq(tostring(df.coord), '<type: coord>')
diff --git a/test/structures/unions.lua b/test/structures/unions.lua
index 714786a96..a664506df 100644
--- a/test/structures/unions.lua
+++ b/test/structures/unions.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 local utils = require('utils')
 
 function test.unit_action_fields()
diff --git a/test/test.lua b/test/test.lua
index 11f038d66..fbad06003 100644
--- a/test/test.lua
+++ b/test/test.lua
@@ -1,3 +1,5 @@
+config.target = 'core'
+
 function test.internal_in_test()
     expect.true_(dfhack.internal.IN_TEST)
 end
diff --git a/travis/authors-rst.py b/travis/authors-rst.py
deleted file mode 100755
index cf52385b5..000000000
--- a/travis/authors-rst.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-script_name = os.path.basename(__file__)
-new_script_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'ci', script_name)
-
-sys.stderr.write('\nNote: travis/{script_name} is deprecated. Use ci/{script_name} instead.\n\n'.format(script_name=script_name))
-sys.stderr.flush()
-
-p = subprocess.run([sys.executable, new_script_path] + sys.argv[1:])
-sys.exit(p.returncode)
diff --git a/travis/buildmaster-rebuild-pr.py b/travis/buildmaster-rebuild-pr.py
deleted file mode 100755
index cf52385b5..000000000
--- a/travis/buildmaster-rebuild-pr.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-script_name = os.path.basename(__file__)
-new_script_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'ci', script_name)
-
-sys.stderr.write('\nNote: travis/{script_name} is deprecated. Use ci/{script_name} instead.\n\n'.format(script_name=script_name))
-sys.stderr.flush()
-
-p = subprocess.run([sys.executable, new_script_path] + sys.argv[1:])
-sys.exit(p.returncode)
diff --git a/travis/check-rpc.py b/travis/check-rpc.py
deleted file mode 100755
index cf52385b5..000000000
--- a/travis/check-rpc.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-script_name = os.path.basename(__file__)
-new_script_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'ci', script_name)
-
-sys.stderr.write('\nNote: travis/{script_name} is deprecated. Use ci/{script_name} instead.\n\n'.format(script_name=script_name))
-sys.stderr.flush()
-
-p = subprocess.run([sys.executable, new_script_path] + sys.argv[1:])
-sys.exit(p.returncode)
diff --git a/travis/download-df.sh b/travis/download-df.sh
deleted file mode 100755
index aec2d6d99..000000000
--- a/travis/download-df.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-script_name="$(basename "$0")"
-new_script_path="$(dirname "$0")/../ci/${script_name}"
-
-printf >&2 "\nNote: travis/%s is deprecated. Use ci/%s instead.\n\n" "${script_name}" "${script_name}"
-
-"${new_script_path}" "$@"
-exit $?
diff --git a/travis/get-df-version.sh b/travis/get-df-version.sh
deleted file mode 100755
index aec2d6d99..000000000
--- a/travis/get-df-version.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-script_name="$(basename "$0")"
-new_script_path="$(dirname "$0")/../ci/${script_name}"
-
-printf >&2 "\nNote: travis/%s is deprecated. Use ci/%s instead.\n\n" "${script_name}" "${script_name}"
-
-"${new_script_path}" "$@"
-exit $?
diff --git a/travis/lint.py b/travis/lint.py
deleted file mode 100755
index cf52385b5..000000000
--- a/travis/lint.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-script_name = os.path.basename(__file__)
-new_script_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'ci', script_name)
-
-sys.stderr.write('\nNote: travis/{script_name} is deprecated. Use ci/{script_name} instead.\n\n'.format(script_name=script_name))
-sys.stderr.flush()
-
-p = subprocess.run([sys.executable, new_script_path] + sys.argv[1:])
-sys.exit(p.returncode)
diff --git a/travis/run-tests.py b/travis/run-tests.py
deleted file mode 100755
index cf52385b5..000000000
--- a/travis/run-tests.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-script_name = os.path.basename(__file__)
-new_script_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'ci', script_name)
-
-sys.stderr.write('\nNote: travis/{script_name} is deprecated. Use ci/{script_name} instead.\n\n'.format(script_name=script_name))
-sys.stderr.flush()
-
-p = subprocess.run([sys.executable, new_script_path] + sys.argv[1:])
-sys.exit(p.returncode)
diff --git a/travis/script-docs.py b/travis/script-docs.py
deleted file mode 100755
index cf52385b5..000000000
--- a/travis/script-docs.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-script_name = os.path.basename(__file__)
-new_script_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'ci', script_name)
-
-sys.stderr.write('\nNote: travis/{script_name} is deprecated. Use ci/{script_name} instead.\n\n'.format(script_name=script_name))
-sys.stderr.flush()
-
-p = subprocess.run([sys.executable, new_script_path] + sys.argv[1:])
-sys.exit(p.returncode)
diff --git a/travis/script-syntax.py b/travis/script-syntax.py
deleted file mode 100755
index cf52385b5..000000000
--- a/travis/script-syntax.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-script_name = os.path.basename(__file__)
-new_script_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'ci', script_name)
-
-sys.stderr.write('\nNote: travis/{script_name} is deprecated. Use ci/{script_name} instead.\n\n'.format(script_name=script_name))
-sys.stderr.flush()
-
-p = subprocess.run([sys.executable, new_script_path] + sys.argv[1:])
-sys.exit(p.returncode)