diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 6c7aa599..252ebf18 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -16,8 +16,8 @@ env:
   OSTREE_GPG: ${{secrets.OSTREE_GPG}}
   VERSION: ${{ github.run_number }}
   SOURCEFORGE_PREFIX: ${{secrets.SOURCEFORGE_PREFIX}}
-  CHANNEL: ${{ endsWith(github.ref, 'stable') && 'stable' || 'unstable' }}
-  OSTREE_BRANCH: "x86_64/os/${{ endsWith(github.ref, 'stable') && 'stable' || 'unstable' }}"
+  CHANNEL: ${{ endsWith(github.ref, 'stable') && 'stable' || (endsWith(github.ref, 'lite') && 'lite' || 'unstable') }}
+  OSTREE_BRANCH: "x86_64/os/${{ endsWith(github.ref, 'stable') && 'stable' || (endsWith(github.ref, 'lite') && 'lite' || 'unstable') }}"
   APPMARKET_PATH: ${{secrets.APPMARKET_PATH}}
   SIGN_KEYS_PATH: ${{secrets.SIGN_KEYS_PATH}}
 
diff --git a/elements/components/cage.yml b/elements/components/cage.yml
index ccb35386..425487c7 100644
--- a/elements/components/cage.yml
+++ b/elements/components/cage.yml
@@ -2,11 +2,13 @@ id: cage
 version: 0.1.5
 about: A kiosk compositor for Wayland
 
+commit: e7d8780f46277af87881e0be91cb2092541bb1d5
+
 post-script: |-
   install -v -D -m 0644 LICENSE -t ${install-root}/%{datadir}/licenses/%{id}/
 
 depends:
-  - components/wlroots0.16.yml
+  - components/wlroots.yml
   - components/x11/libxkbcommon.yml
   - components/wayland.yml
 
@@ -16,4 +18,4 @@ build-depends:
   - components/wayland-protocols.yml
 
 sources:
-  - https://github.com/cage-kiosk/cage/releases/download/v%{version}/cage-%{version}.tar.gz
\ No newline at end of file
+  - cage-%{version}-%{commit}.tar.gz::https://github.com/cage-kiosk/cage/archive/%{commit}.tar.gz
\ No newline at end of file
diff --git a/elements/components/meta-desktop-shell.yml b/elements/components/meta-desktop-shell.yml
new file mode 100644
index 00000000..d0cfadfb
--- /dev/null
+++ b/elements/components/meta-desktop-shell.yml
@@ -0,0 +1,85 @@
+id: desktop-shell
+version: 0.0.1
+about: Desktop shell for rlxos
+
+merge:
+  - elements/include/theme.inc
+
+depends:
+  - components/swayfx.yml
+  - components/swaybg.yml
+  - components/swayidle.yml
+  - components/swaylock.yml
+  - components/cage.yml
+  
+  - components/greetd.yml
+  - components/wlgreet.yml
+  
+  - components/i3blocks.yml
+  - components/rofi.yml
+  - components/bemenu.yml
+  - components/foot.yml
+  - components/brightnessctl.yml
+  - components/pipewire.yml
+  - components/pamixer.yml
+  - components/mako.yml
+  - components/playerctl.yml
+  - components/iio-sway.yml
+  - components/psmisc.yml
+  - components/wvkbd.yml
+  - components/wob.yml
+  - components/grimshot.yml
+  - components/sfwbar.yml
+
+  - components/fonts/ibm-plex.yml
+  - components/fonts/noto.yml
+  - components/fonts/noto-cjk.yml
+  - components/fonts/noto-emoji.yml
+  - components/fonts/adobe-source-code-pro-fonts.yml
+  - components/fonts/ibm-plex-nerd-fonts.yml
+
+  - components/themes/qogir-icon-theme.yml
+  - components/themes/qogir-gtk-theme.yml
+
+
+script: |-
+  install -v -D -m 0755 /dev/stdin %{install-root}%{libdir}/systemd/systemd-preset << "EOF"
+  enable greetd
+  EOF
+
+  install -v -D -m 0644 /files/backgrounds/default.jpg %{install-root}%{datadir}/backgrounds/default.jpg
+  install -v -D -m 0644 /files/backgrounds/default_blur.jpg %{install-root}%{datadir}/backgrounds/default_blur.jpg
+
+  mkdir -p %{install-root}%{sysconfdir}/xdg/
+
+  for dir in sway swaylock greetd wob; do
+    cp -rf /files/$dir %{install-root}%{sysconfdir}/
+  done
+
+  mkdir -p %{install-root}%{datadir}/
+  cp -rf /files/rofi %{install-root}%{datadir}/
+
+  for script in Powermenu TabletMode ; do
+    install -vDm 0755 /files/scripts/$script -t %{install-root}%{bindir}/
+  done
+
+  for dir in foot ; do
+    cp -rf /files/$dir %{install-root}%{sysconfdir}/xdg/
+  done
+
+  install -vDm 0644 /files/i3blocks/i3blocks.conf -t %{install-root}%{sysconfdir}/
+  for script in audio battery network ; do
+    install -vDm 0755 /files/i3blocks/${script}.sh -t %{install-root}%{libdir}/i3blocks/
+  done
+
+  install -vDm 0644 /files/dialogrc -t %{install-root}%{sysconfdir}/
+
+  install -vDm0644 /dev/stdin %{install-root}/%{datadir}/glib-2.0/schemas/10_rlxos-default-settings.gschema.override << "EOF"
+  [org.gnome.desktop.interface]
+  gtk-theme="Qogir-Light"
+  icon-theme="Qogir"
+  cursor-theme="Qogir"
+  font-name="%{font_theme}"
+  monospace-font-name="Source Code Pro 12"
+  font-antialiasing = "rgba"
+  EOF
\ No newline at end of file
diff --git a/elements/components/playerctl.yml b/elements/components/playerctl.yml
index bd20b038..06846620 100644
--- a/elements/components/playerctl.yml
+++ b/elements/components/playerctl.yml
@@ -9,6 +9,7 @@ build-depends:
   - components/gobject-introspection.yml
   - components/gtk-doc.yml
   - components/meson.yml
+  - components/py/py-packaging.yml
 
 sources:
   - playerctl-%{version}.tar.gz::https://github.com/altdesktop/playerctl/archive/refs/tags/v%{version}.tar.gz
\ No newline at end of file
diff --git a/elements/components/sfwbar.yml b/elements/components/sfwbar.yml
index 1d1dbbd9..968e3356 100644
--- a/elements/components/sfwbar.yml
+++ b/elements/components/sfwbar.yml
@@ -11,4 +11,4 @@ build-depends:
 - components/wayland-protocols.yml
 
 sources:
-- sfwbar-%{version}.tar.gz::https://github.com/LBCrion/sfwbar/archive/refs/tags/v1.0_beta14.tar.gz
\ No newline at end of file
+- sfwbar-%{version}.tar.gz::https://github.com/LBCrion/sfwbar/archive/refs/tags/v1.0_beta15.tar.gz
\ No newline at end of file
diff --git a/elements/platform.yml b/elements/platform.yml
index 88666f49..1b27be29 100644
--- a/elements/platform.yml
+++ b/elements/platform.yml
@@ -70,7 +70,7 @@ depends:
   - components/fuse2.yml
 
   - components/xdg-desktop-portal-gtk.yml
-  - components/xdg-desktop-portal-xapp.yml
+  - components/xdg-desktop-portal-wlr.yml
   - components/xdg-dbus-proxy.yml
   - components/wireplumber.yml
   - components/gnome-keyring.yml
@@ -98,9 +98,7 @@ depends:
   - components/ntfs-3g.yml
   - components/file-roller.yml
 
-  - components/meta-xfce4.yml
-  - components/meta-x11.yml
-  - components/lightdm.yml
+  - components/meta-desktop-shell.yml
   - components/epdfview.yml
 
   - components/firefox.yml
@@ -117,4 +115,3 @@ depends:
   - system/etc-skel.yml
   - system/etc-sysctl.yml
   - system/etc-default-useradd.yml
-  - system/x11-config.yml
diff --git a/files/backgrounds/default-blur.jpg b/files/backgrounds/default-blur.jpg
deleted file mode 100644
index 481d0ceb..00000000
Binary files a/files/backgrounds/default-blur.jpg and /dev/null differ
diff --git a/files/backgrounds/default.jpg b/files/backgrounds/default.jpg
index bbba8f6e..c55f8816 100644
Binary files a/files/backgrounds/default.jpg and b/files/backgrounds/default.jpg differ
diff --git a/files/backgrounds/default_blur.jpg b/files/backgrounds/default_blur.jpg
new file mode 100644
index 00000000..3c382ada
Binary files /dev/null and b/files/backgrounds/default_blur.jpg differ
diff --git a/files/initial-setup/first-boot.sh b/files/initial-setup/first-boot.sh
index 6b8bb676..3d480cb3 100644
--- a/files/initial-setup/first-boot.sh
+++ b/files/initial-setup/first-boot.sh
@@ -37,10 +37,10 @@ sudo install -v -D -m 0644 /dev/stdin /etc/greetd/config.toml << EOF
 vt = 1
 
 [default_session]
-command = "sway --config /etc/greetd/sway-config"
+command = "sway --unsupported-gpu --config /etc/greetd/sway-config"
 
 [initial_session]
-command = "sway --config /etc/sway/config-locked"
+command = "sway --unsupported-gpu --config /etc/sway/config-locked"
 user = "${ISE_USERNAME}"
 EOF