diff --git a/recipes-wlroots/wayfire/wayfire_0.9.0.bb b/recipes-wlroots/wayfire/wayfire/wayfire-0.9_0.9.0.bb
similarity index 95%
rename from recipes-wlroots/wayfire/wayfire_0.9.0.bb
rename to recipes-wlroots/wayfire/wayfire/wayfire-0.9_0.9.0.bb
index 8d8719d..f74d41a 100644
--- a/recipes-wlroots/wayfire/wayfire_0.9.0.bb
+++ b/recipes-wlroots/wayfire/wayfire/wayfire-0.9_0.9.0.bb
@@ -31,14 +31,14 @@ DEPENDS += " \
 "
 
 RRECOMMENDS:${PN} += " \
-	wcm \
+	wcm-0.9 \
 	wf-recorder \
-	wf-shell \
+	wf-shell-0.9 \
 	pywayfire \
 "
 
 PACKAGECONFIG[gles32] = "-Denable_gles32=true,-Denable_gles32=false"
-PACKAGECONFIG[use_system_wfconfig] = "-Duse_system_wfconfig=enabled,-Duse_system_wfconfig=disabled,wf-config"
+PACKAGECONFIG[use_system_wfconfig] = "-Duse_system_wfconfig=enabled,-Duse_system_wfconfig=disabled,wf-config-0.9"
 PACKAGECONFIG[use_system_wlroots] = "-Duse_system_wlroots=enabled,-Duse_system_wlroots=disabled,wlroots-0.18"
 PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-util-renderutil xcb-util-wm"
 PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang-native"
diff --git a/recipes-wlroots/wayfire/wayfire/wayfire_0.10-devel.bb b/recipes-wlroots/wayfire/wayfire/wayfire_0.10-devel.bb
new file mode 100644
index 0000000..f1554e3
--- /dev/null
+++ b/recipes-wlroots/wayfire/wayfire/wayfire_0.10-devel.bb
@@ -0,0 +1,68 @@
+SUMMARY = "A Wayland WM"
+HOMEPAGE = "https://github.com/WayfireWM/wayfire"
+BUGTRACKER = "https://github.com/WayfireWM/wayfire/issues"
+SECTION = "graphics"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=14e4594093363e3c3a530e9b54cb5285"
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+DEPENDS += " \
+	cairo \
+	freetype \
+	glm \
+	hwdata-native \
+	jpeg \
+	libdrm \
+	libevdev \
+	libinput \
+	libpng \
+	libxkbcommon \
+	libxml2 \
+	nlohmann-json \
+	pango \
+	pixman \
+	seatd \
+	virtual/libgl \
+	wayland \
+	wayland-native \
+	wayland-protocols \
+	yyjson \
+"
+
+RRECOMMENDS:${PN} += " \
+	wcm \
+	wf-recorder \
+	wf-shell \
+	pywayfire \
+"
+
+PACKAGECONFIG[gles32] = "-Denable_gles32=true,-Denable_gles32=false"
+PACKAGECONFIG[use_system_wfconfig] = "-Duse_system_wfconfig=enabled,-Duse_system_wfconfig=disabled,wf-config"
+PACKAGECONFIG[use_system_wlroots] = "-Duse_system_wlroots=enabled,-Duse_system_wlroots=disabled,wlroots-0.19"
+PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-util-renderutil xcb-util-wm"
+PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang-native"
+
+PACKAGECONFIG ?= " \
+	${@bb.utils.filter('DISTRO_FEATURES', 'vulkan xwayland', d)} \
+	gles32 \
+	use_system_wlroots \
+	use_system_wfconfig \
+"
+
+SRC_URI = "gitsm://github.com/WayfireWM/wayfire.git;protocol=https;nobranch=1"
+
+SRCREV = "60231d5d8e7e4e5261894cea098b2c688726544f"
+
+inherit meson pkgconfig features_check
+
+EXTRA_OEMESON += "--buildtype release"
+
+do_install:append() {
+	rm -rf ${D}${prefix}/man
+}
+
+FILES:${PN} += "${datadir} ${libdir}"
+FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/libwlroots.so ${libdir}/libwf-utils.so ${libdir}/libwf-config.so"
+
diff --git a/recipes-wlroots/wayfire/wcm/wcm-0.9_0.9.0.bb b/recipes-wlroots/wayfire/wcm/wcm-0.9_0.9.0.bb
new file mode 100644
index 0000000..4324063
--- /dev/null
+++ b/recipes-wlroots/wayfire/wcm/wcm-0.9_0.9.0.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Wayfire Config Manager"
+HOMEPAGE = "https://github.com/WayfireWM/wcm"
+BUGTRACKER = "https://github.com/WayfireWM/wcm/issues"
+SECTION = "graphics"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=553c79c4d7ca30085e1d7bfea724a8aa"
+DEPENDS = " \
+	wayfire-0.9 \
+	wayland \
+	wayland-native \
+	wayland-protocols \
+	gtkmm3 \
+	wf-shell-0.9 \
+"
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+SRC_URI = "gitsm://github.com/WayfireWM/wcm.git;protocol=https;nobranch=1"
+SRCREV = "74a16f5ca6aaff9f17e8a38976968b3007c74e87"
+
+inherit meson pkgconfig features_check
+
+EXTRA_OEMESON += "--buildtype release -Denable_wdisplays=false"
+
+FILES:${PN} += "${prefix}"
+
+BBCLASSEXTEND = ""
+
diff --git a/recipes-wlroots/wayfire/wcm_0.9.0.bb b/recipes-wlroots/wayfire/wcm/wcm_0.10-devel.bb
similarity index 91%
rename from recipes-wlroots/wayfire/wcm_0.9.0.bb
rename to recipes-wlroots/wayfire/wcm/wcm_0.10-devel.bb
index 5c67fda..492fdec 100644
--- a/recipes-wlroots/wayfire/wcm_0.9.0.bb
+++ b/recipes-wlroots/wayfire/wcm/wcm_0.10-devel.bb
@@ -17,7 +17,7 @@ DEPENDS = " \
 REQUIRED_DISTRO_FEATURES = "wayland"
 
 SRC_URI = "gitsm://github.com/WayfireWM/wcm.git;protocol=https;nobranch=1"
-SRCREV = "74a16f5ca6aaff9f17e8a38976968b3007c74e87"
+SRCREV = "b5b5aefc321b2030d365dd6711ead043639625b9"
 
 inherit meson pkgconfig features_check
 
diff --git a/recipes-wlroots/wayfire/wf-config_0.9.0.bb b/recipes-wlroots/wayfire/wf-config/wf-config-0.9_0.9.0.bb
similarity index 100%
rename from recipes-wlroots/wayfire/wf-config_0.9.0.bb
rename to recipes-wlroots/wayfire/wf-config/wf-config-0.9_0.9.0.bb
diff --git a/recipes-wlroots/wayfire/wf-config/wf-config_0.10-devel.bb b/recipes-wlroots/wayfire/wf-config/wf-config_0.10-devel.bb
new file mode 100644
index 0000000..cc44ec0
--- /dev/null
+++ b/recipes-wlroots/wayfire/wf-config/wf-config_0.10-devel.bb
@@ -0,0 +1,25 @@
+SUMMARY = "A library for managing configuration files, written for wayfire "
+HOMEPAGE = "https://github.com/WayfireWM/wf-config"
+BUGTRACKER = "https://github.com/WayfireWM/wf-config/issues"
+SECTION = "graphics"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e165ae90e5190201fda9741b611f9378"
+
+DEPENDS = " \
+	glm \
+	libevdev \
+	libxml2 \
+"
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+SRC_URI = "git://github.com/WayfireWM/wf-config.git;protocol=https;branch=master"
+SRCREV = "d67161d184e85b43cf2c5ac88588944b210259ef"
+
+
+inherit meson pkgconfig features_check
+
+EXTRA_OEMESON += "--buildtype release"
+
+BBCLASSEXTEND = ""
diff --git a/recipes-wlroots/wayfire/wf-shell_0.9.0.bb b/recipes-wlroots/wayfire/wf-shell/wf-shell-0.9_0.9.0.bb
similarity index 97%
rename from recipes-wlroots/wayfire/wf-shell_0.9.0.bb
rename to recipes-wlroots/wayfire/wf-shell/wf-shell-0.9_0.9.0.bb
index ed29a43..dd0d57e 100644
--- a/recipes-wlroots/wayfire/wf-shell_0.9.0.bb
+++ b/recipes-wlroots/wayfire/wf-shell/wf-shell-0.9_0.9.0.bb
@@ -10,7 +10,7 @@ DEPENDS = " \
 	wayland \
 	wayland-native \
 	wayland-protocols \
-	wayfire \
+	wayfire-0.9 \
 	gtkmm3 \
 	gtk-layer-shell \
 	pulseaudio \
diff --git a/recipes-wlroots/wayfire/wf-shell/wf-shell_0.10-devel.bb b/recipes-wlroots/wayfire/wf-shell/wf-shell_0.10-devel.bb
new file mode 100644
index 0000000..ff60048
--- /dev/null
+++ b/recipes-wlroots/wayfire/wf-shell/wf-shell_0.10-devel.bb
@@ -0,0 +1,33 @@
+SUMMARY = "A GTK3-based panel for wayfire"
+HOMEPAGE = "https://github.com/WayfireWM/wf-shell"
+BUGTRACKER = "https://github.com/WayfireWM/wf-shell/issues"
+SECTION = "graphics"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=36b5a4f8bf9f782fbab2099fdeb44369"
+
+DEPENDS = " \
+	wayland \
+	wayland-native \
+	wayland-protocols \
+	wayfire \
+	gtkmm3 \
+	gtk-layer-shell \
+	pulseaudio \
+	libnotify3 \
+	libdbusmenu-gtk \
+"
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+SRC_URI = "gitsm://github.com/WayfireWM/wf-shell.git;protocol=https;nobranch=1"
+SRCREV = "aaadead17cfbb98c64cb7f76fb339dc3485aca7c"
+
+inherit meson pkgconfig features_check
+
+EXTRA_OEMESON += "--buildtype release"
+
+FILES:${PN} += "${datadir}"
+
+BBCLASSEXTEND = ""
+