diff --git a/.readthedocs.yml b/.readthedocs.yml
index 3d9bf46411..bf71c46b78 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -15,9 +15,7 @@ submodules:
 sphinx:
   configuration: conf.py
 
-formats:
-  - epub
-  - htmlzip
+formats: all
 
 python:
   install:
diff --git a/build/build-win64-from-linux.sh b/build/build-win64-from-linux.sh
index 7f878ef1c6..4a0988c2e3 100755
--- a/build/build-win64-from-linux.sh
+++ b/build/build-win64-from-linux.sh
@@ -44,7 +44,7 @@ if ! docker run --rm -i -v "$srcdir":/src -v "$srcdir/build/win64-cross/":/src/b
     -e steam_password \
     --name dfhack-win \
     ghcr.io/dfhack/build-env:master \
-    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 && find depends library plugins -iname '*.pdb' -exec cp '{}' pdb/ \;" \
+    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 && find $(find -name depends -o -name library -o -name plugins) -iname '*.pdb' -exec cp '{}' pdb/ \;" \
     ; then
     echo
     echo "Build failed"
diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst
index 6f1fff5de2..a3c94550f8 100644
--- a/docs/dev/Lua API.rst	
+++ b/docs/dev/Lua API.rst	
@@ -3702,8 +3702,6 @@ functions. These are invoked just like standard string functions, e.g.::
 script-manager
 ==============
 
-.. highlight:: none
-
 This module contains functions useful for mods that contain DFHack scripts to
 retrieve source and state paths. The value to pass as ``mod_id`` must be the
 same as the mod ID in the mod's :file:`info.txt` metadata file. The returned
@@ -3742,8 +3740,6 @@ paths will be relative to the top level game directory and will end in a slash
 utils
 =====
 
-.. highlight:: lua
-
 * ``utils.compare(a,b)``
 
   Comparator function; returns *-1* if a<b, *1* if a>b, *0* otherwise.
diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 5906c75208..e93051d41a 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -238,8 +238,6 @@ immensely, and you can always ask for help in the `right places <support>`.
 Reading and writing files and other persistent state
 ----------------------------------------------------
 
-.. highlight:: none
-
 There are several locations and APIs that a mod might need to read or store
 data:
 
@@ -256,8 +254,6 @@ for reading and writing JSON data. For example::
     -- modify state in the config.data table and persist it when it changes with
     -- config:write()
 
-.. highlight:: lua
-
 State that should be saved with a world or a specific fort within that world
 should use `persistent-api` API. You can attach a state change hook for new
 world loaded where you can load the state, which often includes whether the mod
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
index ba8ba8478b..69b305261d 100644
--- a/docs/plugins/stonesense.rst
+++ b/docs/plugins/stonesense.rst
@@ -82,7 +82,7 @@ Useful links
 ------------
 - Report issues on `Github <https://github.com/DFHack/stonesense/issues>`_
 - `support`
-- :forums:`Official Stonesense thread <106497>``
+- :forums:`Official Stonesense thread <106497>`
 - :forums:`Screenshots thread <48172>`
 - :wiki:`Main wiki page <Utility:Stonesense>`
 - :wiki:`How to add content <Utility:Stonesense/Adding_Content>`
diff --git a/library/xml b/library/xml
index 0273bce769..58d2e8684c 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 0273bce769e1ab3532b67987d7449852ccd568db
+Subproject commit 58d2e8684c5d57f813c46bf81e8e7f1564fc86ef