diff --git a/src/coffee/asio/include/coffee/asio/tcp_socket.h b/src/coffee/asio/include/coffee/asio/tcp_socket.h
index 4492a996a..3959fe5ca 100644
--- a/src/coffee/asio/include/coffee/asio/tcp_socket.h
+++ b/src/coffee/asio/include/coffee/asio/tcp_socket.h
@@ -33,6 +33,7 @@ using service_t = std::string;
 
 namespace tcp {
 
+#if defined(ASIO_USE_SSL)
 struct ssl_socket
 {
     using lowest_layer = socket_types::ssl::lowest_layer_type;
@@ -115,6 +116,7 @@ struct ssl_socket
     asio::ip::tcp::resolver& m_resolver;
     socket_types::ssl        m_socket;
 };
+#endif
 
 struct raw_socket
 {
diff --git a/src/libs/asio b/src/libs/asio
index 8d4c8c3ce..22afb8608 160000
--- a/src/libs/asio
+++ b/src/libs/asio
@@ -1 +1 @@
-Subproject commit 8d4c8c3ce43c866f609d2eda9a43fe5b334620be
+Subproject commit 22afb86087a77037cd296d27134756c9b0d2cb75
diff --git a/toolchain/cmake/Preload/docs-all.cmake b/toolchain/cmake/Preload/docs-all.cmake
deleted file mode 100644
index 7c8d311cc..000000000
--- a/toolchain/cmake/Preload/docs-all.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set ( BUILD_LIBRARIES OFF CACHE BOOL "Whether any source should be compiled" )
-set ( BUILD_DOCS      ON  CACHE BOOL "Generate documentation" )
diff --git a/toolchain/cmake/Preload/gamecube.cmake b/toolchain/cmake/Preload/gamecube.cmake
deleted file mode 100644
index af371234d..000000000
--- a/toolchain/cmake/Preload/gamecube.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set ( BUILD_ASIO    OFF CACHE BOOL "" )
-set ( BUILD_AUDIO   OFF CACHE BOOL "" )
-set ( BUILD_OPENGL  OFF CACHE BOOL "" )
-set ( BUILD_SDL2    OFF CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/js-emscripten-wasm.cmake b/toolchain/cmake/Preload/js-emscripten-wasm.cmake
deleted file mode 100644
index 59144a5fb..000000000
--- a/toolchain/cmake/Preload/js-emscripten-wasm.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-set ( BUILD_OPENSSL   OFF CACHE BOOL "" )
-set ( BUILD_OPENAL    OFF CACHE BOOL "" )
-set ( BUILD_ASSIMP    OFF CACHE BOOL "" )
-set ( BUILD_GLES      ON  CACHE BOOL "" )
-set ( BUILD_GLES_20   ON  CACHE BOOL "" )
-set ( GENERATE_HTML   ON  CACHE BOOL "" )
-set ( GENERATE_WASM   ON  CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/js-emscripten.cmake b/toolchain/cmake/Preload/js-emscripten.cmake
deleted file mode 100644
index 8ebbb6338..000000000
--- a/toolchain/cmake/Preload/js-emscripten.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set ( BUILD_OPENSSL OFF CACHE BOOL "" )
-set ( BUILD_AUDIO   OFF CACHE BOOL "" )
-set ( BUILD_GLES    ON  CACHE BOOL "" )
-set ( BUILD_GLES_20 ON  CACHE BOOL "" )
-
-set ( GENERATE_HTML ON  CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/linux-coverage.cmake b/toolchain/cmake/Preload/linux-coverage.cmake
deleted file mode 100644
index 2988ee52e..000000000
--- a/toolchain/cmake/Preload/linux-coverage.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-set ( BUILD_COVERAGE ON  CACHE BOOL "" )
-set ( BUILD_ASAN     ON  CACHE BOOL "" )
-set ( BUILD_EXAMPLES OFF CACHE BOOL "" )
-
-set ( SKIP_HIGHMEM_TESTS ON CACHE BOOL "" )
-set ( SKIP_LINKAGE_TEST  ON CACHE BOOL "" )
-set ( SKIP_OPENVR_TEST   ON CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/linux-fedora.cmake b/toolchain/cmake/Preload/linux-fedora.cmake
deleted file mode 100644
index e7d4cce57..000000000
--- a/toolchain/cmake/Preload/linux-fedora.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set ( GENERATE_FLATPAK  ON CACHE BOOL "" )
-set ( BUILD_ASSIMP      ON CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/linux-generic.cmake b/toolchain/cmake/Preload/linux-generic.cmake
deleted file mode 100644
index 00e6d7fb3..000000000
--- a/toolchain/cmake/Preload/linux-generic.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set ( BUILD_ASSIMP ON CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/linux-gles.cmake b/toolchain/cmake/Preload/linux-gles.cmake
deleted file mode 100644
index a29f08afa..000000000
--- a/toolchain/cmake/Preload/linux-gles.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set ( BUILD_GLES ON CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/linux-gles20.cmake b/toolchain/cmake/Preload/linux-gles20.cmake
deleted file mode 100644
index 4928cab0b..000000000
--- a/toolchain/cmake/Preload/linux-gles20.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set ( BUILD_ASSIMP  ON CACHE BOOL "" )
-set ( BUILD_GLES    ON CACHE BOOL "" )
-set ( BUILD_GLES_20 ON CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/linux-maemo.cmake b/toolchain/cmake/Preload/linux-maemo.cmake
deleted file mode 100644
index 2c069fffa..000000000
--- a/toolchain/cmake/Preload/linux-maemo.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set ( BUILD_ASIO    OFF CACHE BOOL "" )
-set ( BUILD_GLES    ON CACHE BOOL "" )
-set ( BUILD_GLES_20 ON CACHE BOOL "" )
-set ( BUILD_SDL2    OFF CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/linux-raspberry.cmake b/toolchain/cmake/Preload/linux-raspberry.cmake
deleted file mode 100644
index 0d45d8630..000000000
--- a/toolchain/cmake/Preload/linux-raspberry.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set ( BUILD_GLES    ON  CACHE BOOL "" )
-set ( BUILD_GLES_20 ON  CACHE BOOL "" )
-set ( BUILD_OPENSSL OFF CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/linux-steam.cmake b/toolchain/cmake/Preload/linux-steam.cmake
deleted file mode 100644
index 00e6d7fb3..000000000
--- a/toolchain/cmake/Preload/linux-steam.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set ( BUILD_ASSIMP ON CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/linux-vr.cmake b/toolchain/cmake/Preload/linux-vr.cmake
deleted file mode 100644
index 83b257e4a..000000000
--- a/toolchain/cmake/Preload/linux-vr.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set ( BUILD_OPENVR ON CACHE BOOL "" )
diff --git a/toolchain/cmake/Preload/osx-generic.cmake b/toolchain/cmake/Preload/osx-generic.cmake
deleted file mode 100644
index e69de29bb..000000000
diff --git a/toolchain/cmake/Preload/osx-ios.cmake b/toolchain/cmake/Preload/osx-ios.cmake
deleted file mode 100644
index e69de29bb..000000000
diff --git a/toolchain/cmake/Preload/windows-generic.cmake b/toolchain/cmake/Preload/windows-generic.cmake
index 242ec835e..840fb8749 100644
--- a/toolchain/cmake/Preload/windows-generic.cmake
+++ b/toolchain/cmake/Preload/windows-generic.cmake
@@ -1,5 +1,3 @@
-set ( BUILD_OPENVR ON CACHE BOOL "" )
-
 set ( OPENSSL_ROOT_DIR "C:/OpenSSL-Win64" CACHE PATH "" )
 set ( OPENSSL_SSL_LIBRARY "C:/OpenSSL-Win64/lib/libssl.lib" CACHE FILEPATH "" )
 set ( OPENSSL_CRYPTO_LIBRARY "C:/OpenSSL-Win64/lib/libcrypto.lib" CACHE FILEPATH "" )
diff --git a/toolchain/cmake/Preload/windows-mingw64.cmake b/toolchain/cmake/Preload/windows-mingw64.cmake
deleted file mode 100644
index 5be2fb80b..000000000
--- a/toolchain/cmake/Preload/windows-mingw64.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set ( BUILD_AUDIO   OFF CACHE BOOL "" )
-set ( BUILD_OPENSSL OFF CACHE BOOL "" )
diff --git a/toolchain/makers/Makefile.linux b/toolchain/makers/Makefile.linux
index 02759ecff..65574c6f4 100644
--- a/toolchain/makers/Makefile.linux
+++ b/toolchain/makers/Makefile.linux
@@ -1291,15 +1291,20 @@ coverage: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi.twostage \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-coverage.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_ASAN=ON \
 	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
-	-DBUILD_CPP14=ON \
+	-DBUILD_COVERAGE=ON \
+	-DBUILD_EXAMPLES=OFF \
 	-DCMAKE_BUILD_TYPE=Debug \
 	-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/coverage \
 	-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
 	-DGIT_DEP_BUILDVARIANT=ubuntu.amd64 \
 	-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
+	-DSKIP_HIGHMEM_TESTS=ON \
+	-DSKIP_LINKAGE_TEST=ON \
+	-DSKIP_OPENVR_TEST=ON \
 	-G'CodeBlocks - Ninja'" \
 	-e DOCKER_EXTRA_OPTIONS=" \
 	 \
@@ -1322,9 +1327,11 @@ docs: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/docs-all.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
+	-DBUILD_DOCS=ON \
+	-DBUILD_LIBRARIES=OFF \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
 	-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/docs \
 	-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
@@ -1350,18 +1357,24 @@ emscripten.wasm: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/js-emscripten-wasm.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_ASSIMP=OFF \
+	-DBUILD_AUDIO=OFF \
 	-DBUILD_AUDIO=OFF \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_GLES=ON \
+	-DBUILD_GLES=ON \
+	-DBUILD_GLES_20=ON \
 	-DBUILD_GLES_20=ON \
 	-DBUILD_OPENSSL=OFF \
+	-DBUILD_OPENSSL=OFF \
 	-DBUILD_SDL2=ON \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
 	-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/emscripten.wasm \
 	-DCMAKE_TOOLCHAIN_FILE=/home/coffee/emsdk_portable/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
 	-DEMSCRIPTEN_ROOT_PATH=/home/coffee/emsdk_portable/upstream/emscripten \
 	-DGENERATE_HTML=ON \
+	-DGENERATE_HTML=ON \
 	-DGIT_DEP_BUILDVARIANT=emscripten.wasm \
 	-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
 	-G'Ninja'" \
@@ -1386,11 +1399,16 @@ emscripten.wasm.shell: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) shell \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/js-emscripten-wasm.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_ASSIMP=OFF \
+	-DBUILD_AUDIO=OFF \
 	-DBUILD_AUDIO=OFF \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_GLES=ON \
+	-DBUILD_GLES=ON \
 	-DBUILD_GLES_20=ON \
+	-DBUILD_GLES_20=ON \
+	-DBUILD_OPENSSL=OFF \
 	-DBUILD_OPENSSL=OFF \
 	-DBUILD_SDL2=ON \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
@@ -1398,6 +1416,7 @@ emscripten.wasm.shell: FORCE
 	-DCMAKE_TOOLCHAIN_FILE=/home/coffee/emsdk_portable/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
 	-DEMSCRIPTEN_ROOT_PATH=/home/coffee/emsdk_portable/upstream/emscripten \
 	-DGENERATE_HTML=ON \
+	-DGENERATE_HTML=ON \
 	-DGIT_DEP_BUILDVARIANT=emscripten.wasm \
 	-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
 	-G'Ninja'" \
@@ -1422,12 +1441,14 @@ fedora.amd64: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-fedora.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_ASSIMP=ON \
 	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
 	-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/fedora.amd64 \
 	-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
+	-DGENERATE_FLATPAK=ON \
 	-DGIT_DEP_BUILDVARIANT=fedora.amd64 \
 	-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
 	-G'CodeBlocks - Ninja'" \
@@ -1450,12 +1471,14 @@ fedora.amd64.shell: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) shell \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-fedora.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_ASSIMP=ON \
 	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
 	-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/fedora.amd64 \
 	-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
+	-DGENERATE_FLATPAK=ON \
 	-DGIT_DEP_BUILDVARIANT=fedora.amd64 \
 	-DSKIP_GRAPHIC_TESTS=$(HEADLESS) \
 	-G'CodeBlocks - Ninja'" \
@@ -1552,9 +1575,13 @@ maemo.armel: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi.make8 \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-maemo.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_ASIO=OFF \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_EGL=ON \
+	-DBUILD_GLES=ON \
+	-DBUILD_GLES_20=ON \
+	-DBUILD_SDL2=OFF \
 	-DBUILD_SDL2=OFF \
 	-DBUILD_X11=ON \
 	-DCMAKE_BUILD_TYPE=Release \
@@ -1585,9 +1612,13 @@ maemo.armel.shell: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) shell \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-maemo.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_ASIO=OFF \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_EGL=ON \
+	-DBUILD_GLES=ON \
+	-DBUILD_GLES_20=ON \
+	-DBUILD_SDL2=OFF \
 	-DBUILD_SDL2=OFF \
 	-DBUILD_X11=ON \
 	-DCMAKE_BUILD_TYPE=Release \
@@ -1618,8 +1649,10 @@ mingw.w64: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/windows-mingw64.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_AUDIO=OFF \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
+	-DBUILD_OPENSSL=OFF \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
 	-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/mingw.w64 \
 	-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/windows-mingw64_linux.toolchain.cmake \
@@ -1645,8 +1678,11 @@ raspberry.armhf: FORCE rpi-sdk
 	make -f $(ROOT_DIR)/$(RUNNER) multi \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-raspberry.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
+	-DBUILD_GLES=ON \
+	-DBUILD_GLES_20=ON \
+	-DBUILD_OPENSSL=ON \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
 	-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/raspberry.armhf \
 	-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-raspberry-armhf_linux.toolchain.cmake \
@@ -1673,8 +1709,11 @@ raspberry.armhf.shell: FORCE rpi-sdk
 	make -f $(ROOT_DIR)/$(RUNNER) shell \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-raspberry.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
+	-DBUILD_GLES=ON \
+	-DBUILD_GLES_20=ON \
+	-DBUILD_OPENSSL=ON \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
 	-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/raspberry.armhf \
 	-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-raspberry-armhf_linux.toolchain.cmake \
@@ -1701,7 +1740,8 @@ steam.amd64: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-steam.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_ASSIMP=ON \
 	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_CPP11=ON \
@@ -1732,7 +1772,8 @@ steam.amd64.shell: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) shell \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-steam.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
+	-DBUILD_ASSIMP=ON \
 	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_CPP11=ON \
@@ -1861,9 +1902,10 @@ ubuntu.amd64: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-generic.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DAPPIMAGE_RUNTIME_BINARY=$(NATIVE_LIBRARY_DIR)/Ubuntu/util/x86_64-linux-gnu/runtime \
 	-DBUILD_ASSIMP=ON \
+	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_DISCORD_RPC=ON \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
@@ -1893,9 +1935,10 @@ ubuntu.amd64.tools: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-generic.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DAPPIMAGE_RUNTIME_BINARY=$(NATIVE_LIBRARY_DIR)/Ubuntu/util/x86_64-linux-gnu/runtime \
 	-DBUILD_ASSIMP=ON \
+	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_DISCORD_RPC=ON \
 	-DBUILD_ETC2COMP=ON \
@@ -1934,11 +1977,13 @@ ubuntu.amd64.gles3: FORCE
 	make -f $(ROOT_DIR)/$(RUNNER) multi \
 	-e EXTRA_OPTIONS=" \
 	$(CMAKE_SOURCE_DIR) \
-	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/linux-gles.cmake \
+	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DAPPIMAGE_RUNTIME_BINARY=$(NATIVE_LIBRARY_DIR)/Ubuntu/util/x86_64-linux-gnu/runtime \
 	-DBUILD_ASSIMP=ON \
+	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_DISCORD_RPC=ON \
+	-DBUILD_GLES=ON \
 	-DCMAKE_BUILD_TYPE=$(CONFIGURATION) \
 	-DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_DIR)/ubuntu.amd64.gles3 \
 	-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_SOURCE_DIR)/toolchain/cmake/Toolchains/linux-generic_linux.toolchain.cmake \
diff --git a/toolchain/makers/Makefile.mac b/toolchain/makers/Makefile.mac
index 64b6c9e5b..f62823d43 100644
--- a/toolchain/makers/Makefile.mac
+++ b/toolchain/makers/Makefile.mac
@@ -46,7 +46,7 @@ ios: FORCE
 	make -f $(ROOT_DIR)/Makefile.mac-base build \
 	-e EXTRA_OPTIONS=" \
 	$(SOURCE_DIR) \
-	-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-ios.cmake \
+	-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_EGL=ON \
 	-DBUILD_GLES=ON \
@@ -70,7 +70,7 @@ ios.x86_64: FORCE
 	make -f $(ROOT_DIR)/Makefile.mac-base build \
 	-e EXTRA_OPTIONS=" \
 	$(SOURCE_DIR) \
-	-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-ios.cmake \
+	-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_EGL=ON \
 	-DBUILD_GLES=ON \
@@ -95,7 +95,7 @@ ios.x86: FORCE
 	make -f $(ROOT_DIR)/Makefile.mac-base build \
 	-e EXTRA_OPTIONS=" \
 	$(SOURCE_DIR) \
-	-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-ios.cmake \
+	-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_EGL=ON \
 	-DBUILD_GLES=ON \
@@ -120,7 +120,7 @@ osx: FORCE
 	make -f $(ROOT_DIR)/Makefile.mac-base build \
 	-e EXTRA_OPTIONS=" \
 	$(SOURCE_DIR) \
-	-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-generic.cmake \
+	-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
 	-DBUILD_DISCORD_RPC=ON \
@@ -143,7 +143,7 @@ osx.coverage: FORCE
 	make -f $(ROOT_DIR)/Makefile.mac-base build \
 	-e EXTRA_OPTIONS=" \
 	$(SOURCE_DIR) \
-	-C$(SOURCE_DIR)/toolchain/cmake/Preload/osx-generic.cmake \
+	-C$(SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_ASAN=ON \
 	-DBUILD_ASSIMP=ON \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
diff --git a/toolchain/makers/toolchain-config.yml b/toolchain/makers/toolchain-config.yml
index 417247505..dd4ec0f98 100644
--- a/toolchain/makers/toolchain-config.yml
+++ b/toolchain/makers/toolchain-config.yml
@@ -61,7 +61,6 @@
     =description: Apple OS X
     =flavor: mac-osx
     =toolchain: osx-generic_osx.toolchain.cmake
-    =preload: osx-generic.cmake
     +cmake-opts:
       - -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
     .*coverage.*:
@@ -74,7 +73,6 @@
         - -DSKIP_OPENVR_TEST=ON
   .*ios.*:
     =toolchain: all-ios.toolchain.cmake
-    =preload: osx-ios.cmake
   .*ios$:
     =description: Device-oriented build for ARM64 and ARMv7-A
   .*ios.x86.*:
@@ -103,14 +101,18 @@
 coverage:
   =description: Coverage build using same config as Ubuntu
   =compiler: GCC 7+
-  =preload: linux-coverage.cmake
   =build-type: Debug
   =git-dep-target: ubuntu.amd64
   +container-opts: # Default to GCC
     - -e CC=
     - -e CXX=
   +cmake-opts:
-    - -DBUILD_CPP14=ON # Older GCC on Ubuntu, turn to C++14
+    - -DBUILD_COVERAGE=ON
+    - -DBUILD_ASAN=ON
+    - -DBUILD_EXAMPLES=OFF
+    - -DSKIP_HIGHMEM_TESTS=ON
+    - -DSKIP_LINKAGE_TEST=ON
+    - -DSKIP_OPENVR_TEST=ON
 
 testing.linux.*:
   =compiler: Clang 8+
@@ -137,35 +139,43 @@ testing.linux.*:
 .*docs:
   =description: Documentation build using only Doxygen
   =compiler: Doxygen
-  =preload: docs-all.cmake
+  +cmake-opts:
+    - -DBUILD_LIBRARIES=OFF
+    - -DBUILD_DOCS=ON
 
 .*ubuntu.*:
   =description: Ubuntu build in a Ubuntu Docker
   =compiler: GCC 7+
-  =preload: linux-generic.cmake
+  +cmake-opts:
+    - -DBUILD_ASSIMP=ON
   .*i686.*:
     =container: ubuntu-i686
     =toolchain: linux-generic-i686_linux.toolchain.cmake
   .*gles[^2]?$:
-    =preload: linux-gles.cmake
+    +cmake-opts:
+      - -DBUILD_GLES=ON
   .*gles2:
-    =preload: linux-gles20.cmake
+    +cmake-opts:
+      - -DBUILD_GLES=ON
+      - -DBUILD_GLES_20=ON
 
 .*fedora.*:
   =description: Fedora build in a Fedora Docker
   =compiler: GCC 8+
-  =preload: linux-fedora.cmake
   =container: fedora
+  +cmake-opts:
+    - -DBUILD_ASSIMP=ON
+    - -DGENERATE_FLATPAK=ON
 
 
 .*steam.*:
   =description: Build against the SteamRT SDK
   =compiler: GCC 4.8.4
-  =preload: linux-steam.cmake
   =toolchain: cxx11.toolchain.cmake
   =container: steam
   +cmake-opts:
     - -DBUILD_CPP11=ON
+    - -DBUILD_ASSIMP=ON
   +container-opts:
     - -e CC=clang-3.6
     - -e CXX=clang++-3.6
@@ -175,7 +185,6 @@ testing.linux.*:
   =description: Emscripten with WebAssembly
   =compiler: Clang 7+
   =container: emscripten
-  =preload: js-emscripten.cmake
   =emscripten.root: $(dependencies.emscripten.target)/upstream/emscripten
   =emscripten.cmake: $(emscripten.root)/cmake
   +dependencies:
@@ -183,11 +192,15 @@ testing.linux.*:
   +cmake-opts:
     - -DEMSCRIPTEN_ROOT_PATH=$(emscripten.root)
     - -DCMAKE_TOOLCHAIN_FILE=$(emscripten.cmake)/Modules/Platform/Emscripten.cmake
+    - -DBUILD_AUDIO=OFF
+    - -DBUILD_GLES=ON
+    - -DBUILD_GLES_20=ON
+    - -DBUILD_OPENSSL=OFF
+    - -DBUILD_ASSIMP=OFF
+    - -DGENERATE_HTML=ON
   +container-opts:
     - -e EMSCRIPTEN=$(emscripten.root)
     - -e CMAKE='emcmake cmake'
-  .*wasm.*:
-    =preload: js-emscripten-wasm.cmake
 
 
 .*android.*:
@@ -246,7 +259,6 @@ testing.linux.*:
 .*maemo.*:
   =description: Maemo 5 builds, performed within a Maemo 5 armel chroot
   =compiler: GCC 6
-  =preload: linux-maemo.cmake
   =toolchain: linux-maemo-armv7_linux.toolchain.cmake
   =container: hbirch/maemo-builder:v3
   =build.build-type: Release
@@ -258,24 +270,33 @@ testing.linux.*:
     - -v $(project.src):/maemo/$(container.src):ro
     - -v $(project.install):/maemo/$(container.install):rw
     - -v $(project.build)/$(target-name):/maemo/$(container.build):rw
+  +cmake-opts:
+    - -DBUILD_ASIO=OFF
+    - -DBUILD_GLES=ON
+    - -DBUILD_GLES_20=ON
+    - -DBUILD_SDL2=OFF
 
 
 .*raspberry.*:
   =description: Raspberry Pi ARM 32-bit build
   =compiler: GCC 9.x
-  =preload: linux-raspberry.cmake
   =toolchain: linux-raspberry-armhf_linux.toolchain.cmake
   =container: raspberry
   +dependencies: rpi-sdk
   +cmake-opts:
     - -DRASPBERRY_SDK=/pi-sysroot
+    - -DBUILD_GLES=ON
+    - -DBUILD_GLES_20=ON
+    - -DBUILD_OPENSSL=ON
 
 .*mingw.*:
   =description: MinGW64 environment in Ubuntu Docker
   =compiler: GCC 5+
   =toolchain: windows-mingw64_linux.toolchain.cmake
-  =preload: windows-mingw64.cmake
   =container: mingw64
+  +cmake-opts:
+    - -DBUILD_AUDIO=OFF
+    - -DBUILD_OPENSSL=OFF
 
 .*gamecube.*:
   =description: Nintendo Gamecube through DevkitPPC