diff --git a/Makefile b/Makefile
index ed6b53b..e124bf3 100644
--- a/Makefile
+++ b/Makefile
@@ -272,21 +272,37 @@ macos:
 macos-app:
 	./utils/run.sh macos-universal-10.15 $(MAKE) -C systray
 
+macos-bootstrap:
+	./PawPaw/bootstrap-mod.sh macos-universal-10.15
+
 macos-plugins:
 	$(MAKE) PAWPAW_TARGET=macos-universal-10.15 plugins
 
+# ---------------------------------------------------------------------------------------------------------------------
+
 wasm:
 	$(MAKE) PAWPAW_TARGET=wasm
 
+wasm-app:
+	./utils/run.sh wasm $(MAKE) -C systray
+
+wasm-bootstrap:
+	./PawPaw/bootstrap-mod.sh wasm
+
 wasm-plugins:
 	$(MAKE) PAWPAW_TARGET=wasm plugins
 
+# ---------------------------------------------------------------------------------------------------------------------
+
 win64:
 	$(MAKE) PAWPAW_TARGET=win64
 
 win64-app:
 	./utils/run.sh win64 $(MAKE) -C systray
 
+win64-bootstrap:
+	./PawPaw/bootstrap-mod.sh win64
+
 win64-plugins:
 	$(MAKE) PAWPAW_TARGET=win64 plugins
 
diff --git a/PawPaw b/PawPaw
index 4587dad..7d15998 160000
--- a/PawPaw
+++ b/PawPaw
@@ -1 +1 @@
-Subproject commit 4587dad6ae5ed8c2efa9e5135a9df654e6cfa86f
+Subproject commit 7d15998ac075f8982d8680873b5396c2e7554032
diff --git a/mod-ui b/mod-ui
index 704ee89..4532204 160000
--- a/mod-ui
+++ b/mod-ui
@@ -1 +1 @@
-Subproject commit 704ee89f03882faffb09933a4388c2e2dbb37e02
+Subproject commit 45322046e9fa6a34faae9d5849470fea4f9e56a7