diff --git a/.gitmodules b/.gitmodules
index 92e5c03..69ac768 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,9 @@
 [submodule "simple-wrapper"]
 	path = simple-wrapper
 	url = https://github.com/pop-os/simple-wrapper
+[submodule "cosmic-applet-host"]
+	path = cosmic-applet-host
+	url = https://github.com/pop-os/cosmic-applet-host
+[submodule "cosmic-settings-daemon"]
+	path = cosmic-settings-daemon
+	url = https://github.com/pop-os/cosmic-settings-daemon
diff --git a/README.md b/README.md
index b40212d..6739e67 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@ Currently an incomplete **pre-alpha**.
 
 ## Components of Cosmic Desktop
 * [cosmic-applets](https://github.com/pop-os/cosmic-applets)
+* [cosmic-applet-host](https://github.com/pop-os/cosmic-applet-host)
 * [cosmic-applibrary](https://github.com/pop-os/cosmic-applibrary)
 * [cosmic-comp](https://github.com/pop-os/cosmic-comp)
 * [xdg-desktop-portal-cosmic](https://github.com/pop-os/xdg-desktop-portal-cosmic)
@@ -16,7 +17,6 @@ Currently an incomplete **pre-alpha**.
 * [cosmic-theme](https://github.com/pop-os/cosmic-theme)
 * [cosmic-theme-editor](https://github.com/pop-os/cosmic-theme-editor)
 * [libcosmic](https://github.com/pop-os/libcosmic)
-* [simple-wrapper](https://github.com/pop-os/simple-wrapper)
 
 ## Setup
 
diff --git a/cosmic-applet-host b/cosmic-applet-host
new file mode 160000
index 0000000..461dfdf
--- /dev/null
+++ b/cosmic-applet-host
@@ -0,0 +1 @@
+Subproject commit 461dfdfb0ce0e1d096a8af967aa995d0748978c2
diff --git a/cosmic-applets b/cosmic-applets
index 1a13ea6..580df62 160000
--- a/cosmic-applets
+++ b/cosmic-applets
@@ -1 +1 @@
-Subproject commit 1a13ea6d002f85c516dcfad0668124ed2f867233
+Subproject commit 580df62e46bcc504d6f5248162f064434b80c2e9
diff --git a/cosmic-applibrary b/cosmic-applibrary
index f3215d7..4da5c3f 160000
--- a/cosmic-applibrary
+++ b/cosmic-applibrary
@@ -1 +1 @@
-Subproject commit f3215d7474cbd5238540059f3e4a08a84cc3211f
+Subproject commit 4da5c3fc4dffdeb135b7cefe6a7c86cceed018e5
diff --git a/cosmic-comp b/cosmic-comp
index 6c7b393..7708cdc 160000
--- a/cosmic-comp
+++ b/cosmic-comp
@@ -1 +1 @@
-Subproject commit 6c7b393b79a768d8e538f53b4f3510846a38d7ba
+Subproject commit 7708cdc1a2d8ff1cc2e237aa69abae2bfd9a80cf
diff --git a/cosmic-launcher b/cosmic-launcher
index 3e6cd74..a1270e3 160000
--- a/cosmic-launcher
+++ b/cosmic-launcher
@@ -1 +1 @@
-Subproject commit 3e6cd74b86b6d31e52a193e0d2a5fb73d4b05570
+Subproject commit a1270e367c85c250919123ffcc372c3c03f6f382
diff --git a/cosmic-panel b/cosmic-panel
index 317ea2e..f3947a6 160000
--- a/cosmic-panel
+++ b/cosmic-panel
@@ -1 +1 @@
-Subproject commit 317ea2edacb6d71230a04e25336d362aac2f4f7b
+Subproject commit f3947a6a3bb014782e888b5aeaebd93ee746fdcd
diff --git a/cosmic-session b/cosmic-session
index 378f137..29e6dd0 160000
--- a/cosmic-session
+++ b/cosmic-session
@@ -1 +1 @@
-Subproject commit 378f137d0a991f39caff36a1cdf75c036156ded1
+Subproject commit 29e6dd0f84cf3551da0668e4a424b4e0edf84f64
diff --git a/cosmic-settings-daemon b/cosmic-settings-daemon
new file mode 160000
index 0000000..3041a75
--- /dev/null
+++ b/cosmic-settings-daemon
@@ -0,0 +1 @@
+Subproject commit 3041a75f797b45cd9e0d09fccc62ffa655c3385a
diff --git a/justfile b/justfile
index ff93f58..733f1e3 100644
--- a/justfile
+++ b/justfile
@@ -3,22 +3,24 @@ make := `which make`
 
 build:
     {{ just }} cosmic-applets/all
+    {{ make }} -C cosmic-applet-host all
     {{ just }} cosmic-applibrary/all
     {{ make }} -C cosmic-comp all
     {{ just }} cosmic-launcher/all
     {{ make }} -C cosmic-panel all
+    {{ make }} -C cosmic-settings-daemon all
     {{ just }} cosmic-session/all
-    {{ make }} -C simple-wrapper all
 
 sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --short HEAD`): build && (_extension_release dir version)
     @mkdir -p {{dir}}/usr/lib/extension-release.d/
     {{ just }} rootdir={{dir}} cosmic-applets/install
+    {{ make }} -C cosmic-applet-host install DESTDIR={{dir}} prefix=/usr
     {{ just }} rootdir={{dir}} cosmic-applibrary/install
     {{ make }} -C cosmic-comp install DESTDIR={{dir}}
     {{ just }} rootdir={{dir}} cosmic-launcher/install
     {{ make }} -C cosmic-panel install DESTDIR={{dir}} prefix=/usr
+    {{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr
     {{ just }} rootdir={{dir}} cosmic-session/install
-    {{ make }} -C simple-wrapper install DESTDIR={{dir}} prefix=/usr
 
 _extension_release dir version:
     #!/usr/bin/env sh
@@ -32,9 +34,10 @@ _extension_release dir version:
 
 clean:
     rm -rf cosmic-applets/target
+    rm -rf cosmic-applet-host/target
     rm -rf cosmic-applibrary/target
     rm -rf cosmic-comp/target
     rm -rf cosmic-launcher/target
     rm -rf cosmic-panel/target
+    rm -rf cosmic-settings-daemon/target
     rm -rf cosmic-session/target
-    rm -rf simple-wrapper/target
diff --git a/simple-wrapper b/simple-wrapper
deleted file mode 160000
index 95db0da..0000000
--- a/simple-wrapper
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 95db0daff42acb879013763b55f31d85ce805642