diff --git a/.gitmodules b/.gitmodules
index bfc3c35..95e7858 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule "iced-workspaces-applet"]
 	path = iced-workspaces-applet
 	url = https://github.com/pop-os/iced-workspaces-applet.git
+[submodule "wayland-proxy-virtwl"]
+	path = wayland-proxy-virtwl
+	url = https://github.com/talex5/wayland-proxy-virtwl
diff --git a/README.md b/README.md
index 060054d..d6c1968 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,13 @@ It also requires the previously mentioned libraries/dependencies at runtime to b
 
 It is thus no proper method for long term deployment.
 
+### Experimental X Support
+
+With [opam installed](https://opam.ocaml.org/doc/Install.html) X support using wayland-proxy-virtwl can be optionally enabled during installation. When building, use `just x=1 sysext` and after refreshing with `sudo systemd-sysext refresh`, run
+```
+systemctl --user daemon-reload
+systemctl --user enable --now wayland-proxy-virtwl
+```
 ### Packaging
 
 Cosmic DE is packaged for Pop!_OS for reference look at the `debian` folders in the projects repositories.
diff --git a/cosmic-applet-host b/cosmic-applet-host
index 1af5a1d..b550074 160000
--- a/cosmic-applet-host
+++ b/cosmic-applet-host
@@ -1 +1 @@
-Subproject commit 1af5a1dde6844237296dadee98d5a7bfb8ea3cb6
+Subproject commit b550074e913434a4a28a9084e629365d694da1fd
diff --git a/cosmic-applets b/cosmic-applets
index 59a1125..e3be1c1 160000
--- a/cosmic-applets
+++ b/cosmic-applets
@@ -1 +1 @@
-Subproject commit 59a112523d911b333fdef54793a7c83bbf7934b1
+Subproject commit e3be1c1809760c032ffd62aeb3d6e701272c348b
diff --git a/cosmic-applibrary b/cosmic-applibrary
index bedfe1d..3ea62d9 160000
--- a/cosmic-applibrary
+++ b/cosmic-applibrary
@@ -1 +1 @@
-Subproject commit bedfe1da354e1b32a1af2df9ed252e5dcaaf376a
+Subproject commit 3ea62d97337a35783bb26703e57ad382fb523eba
diff --git a/cosmic-bg b/cosmic-bg
index ec228ef..3781ed0 160000
--- a/cosmic-bg
+++ b/cosmic-bg
@@ -1 +1 @@
-Subproject commit ec228ef6a1c6572ee7b42739b4b25a4e33fedb1f
+Subproject commit 3781ed0d597960e5880c7dfaf3a4852d56c54fee
diff --git a/cosmic-launcher b/cosmic-launcher
index 0d2b1fb..cf2df9e 160000
--- a/cosmic-launcher
+++ b/cosmic-launcher
@@ -1 +1 @@
-Subproject commit 0d2b1fb8c630162048d9167b34371671e3edec26
+Subproject commit cf2df9ef966d14e979c653746b1502ae3a12ef5b
diff --git a/cosmic-panel b/cosmic-panel
index 6b163a5..2e075e8 160000
--- a/cosmic-panel
+++ b/cosmic-panel
@@ -1 +1 @@
-Subproject commit 6b163a544144a031d2283ce1ffb9a168d0298ab7
+Subproject commit 2e075e8715854d8321ca1d21fb8fc4e98eca78af
diff --git a/cosmic-session b/cosmic-session
index 9c57475..9a9861f 160000
--- a/cosmic-session
+++ b/cosmic-session
@@ -1 +1 @@
-Subproject commit 9c57475bb6c8185857cc70a716a3da72e2c4c004
+Subproject commit 9a9861f8e3a0b2964f7064bb64258f41ac2d5b11
diff --git a/data/wayland-proxy-virtwl.service b/data/wayland-proxy-virtwl.service
new file mode 100644
index 0000000..e323913
--- /dev/null
+++ b/data/wayland-proxy-virtwl.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Wayland-proxy-virtwl
+After=cosmic-session.target
+
+[Service]
+ExecStart=/usr/bin/wayland-proxy-virtwl --wayland-display wayland-virtwl --x-display=0
+
+[Install]
+WantedBy=cosmic-session.target
diff --git a/justfile b/justfile
index cea72ad..5f97391 100644
--- a/justfile
+++ b/justfile
@@ -1,6 +1,8 @@
+set dotenv-load
 just := just_executable()
 make := `which make`
 meson := `which meson`
+x := '0'
 
 _meson_build dir:
     -rm -rf {{dir}}_build
@@ -28,7 +30,8 @@ build:
     {{ make }} -C xdg-desktop-portal-cosmic 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/
+    #!/usr/bin/env sh
+    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
@@ -38,11 +41,16 @@ sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --sh
     {{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr
     {{ 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
     {{ just }} _meson_install iced-workspaces-applet {{dir}}
     {{ just }} _meson_install user-color-editor {{dir}}
     {{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr
-
+    if test {{x}} = 1; then
+        install -Dm0644 data/wayland-proxy-virtwl.service {{dir}}/usr/lib/systemd/user/wayland-proxy-virtwl.service
+        opam install ./wayland-proxy-virtwl --destdir={{dir}}/usr
+        {{ just }} x=1 rootdir={{dir}} cosmic-session/install
+    else
+        {{ just }} rootdir={{dir}} cosmic-session/install
+    fi
 _extension_release dir version:
     #!/usr/bin/env sh
     cat >{{dir}}/usr/lib/extension-release.d/extension-release.cosmic-sysext <<EOF
diff --git a/user-color-editor b/user-color-editor
index f71f16f..c6e1270 160000
--- a/user-color-editor
+++ b/user-color-editor
@@ -1 +1 @@
-Subproject commit f71f16f8fb4957b46e3203afcaf095c330093c98
+Subproject commit c6e1270f26d9a0d7f14e3440ef1830e964651e4b
diff --git a/wayland-proxy-virtwl b/wayland-proxy-virtwl
new file mode 160000
index 0000000..5940346
--- /dev/null
+++ b/wayland-proxy-virtwl
@@ -0,0 +1 @@
+Subproject commit 5940346db2a4427f21c7b30a2593b179af36a935
diff --git a/xdg-desktop-portal-cosmic b/xdg-desktop-portal-cosmic
index 585b916..9136fa1 160000
--- a/xdg-desktop-portal-cosmic
+++ b/xdg-desktop-portal-cosmic
@@ -1 +1 @@
-Subproject commit 585b916082b04bdda47a65205c71f6c3e37d623b
+Subproject commit 9136fa15123e0167b40a9f1af30579782b8d9fee