diff --git a/Containerfile b/Containerfile
index 88390e81..f0f3c196 100644
--- a/Containerfile
+++ b/Containerfile
@@ -7,16 +7,11 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
 FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite
 
 ARG IMAGE_NAME="${IMAGE_NAME}"
+ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
 COPY system_files/desktop/shared /
-COPY system_files/desktop/gnome/* /tmp/gnome
-COPY system_files/desktop/kde/* /tmp/kde
-RUN if grep "gnome" <<< "${IMAGE_NAME}"; then \
-    rsync -rvK /tmp/gnome/ / \
-; else \
-    rsync -rvK /tmp/kde/ / \
-; fi
+COPY system_files/desktop/${BASE_IMAGE_NAME} /
 
 # Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
 COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
@@ -164,16 +159,11 @@ RUN rm /usr/share/applications/shredder.desktop && \
 FROM bazzite as bazzite-deck
 
 ARG IMAGE_NAME="${IMAGE_NAME}"
+ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
 COPY system_files/deck/shared /
-COPY system_files/deck/gnome/* /tmp/gnome
-COPY system_files/deck/kde/* /tmp/kde
-RUN if grep "gnome" <<< "${IMAGE_NAME}"; then \
-    rsync -rvK /tmp/gnome/ / \
-; else \
-    rsync -rvK /tmp/kde/ / \
-; fi
+COPY system_files/deck/${BASE_IMAGE_NAME} /
 
 # Setup Copr repos
 RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-multilib-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
diff --git a/system_files/deck/kde/usr/bin/gamescope-wayland-teardown-workaround b/system_files/deck/kinoite/usr/bin/gamescope-wayland-teardown-workaround
similarity index 100%
rename from system_files/deck/kde/usr/bin/gamescope-wayland-teardown-workaround
rename to system_files/deck/kinoite/usr/bin/gamescope-wayland-teardown-workaround
diff --git a/system_files/deck/kde/usr/bin/startplasma-steamos-oneshot b/system_files/deck/kinoite/usr/bin/startplasma-steamos-oneshot
similarity index 100%
rename from system_files/deck/kde/usr/bin/startplasma-steamos-oneshot
rename to system_files/deck/kinoite/usr/bin/startplasma-steamos-oneshot
diff --git a/system_files/deck/kde/usr/bin/steamos-session-select b/system_files/deck/kinoite/usr/bin/steamos-session-select
similarity index 100%
rename from system_files/deck/kde/usr/bin/steamos-session-select
rename to system_files/deck/kinoite/usr/bin/steamos-session-select
diff --git a/system_files/deck/kde/usr/share/wayland-sessions/plasma-steamos-wayland-oneshot.desktop b/system_files/deck/kinoite/usr/share/wayland-sessions/plasma-steamos-wayland-oneshot.desktop
similarity index 100%
rename from system_files/deck/kde/usr/share/wayland-sessions/plasma-steamos-wayland-oneshot.desktop
rename to system_files/deck/kinoite/usr/share/wayland-sessions/plasma-steamos-wayland-oneshot.desktop
diff --git a/system_files/deck/kde/usr/share/xsessions/plasma-steamos-oneshot.desktop b/system_files/deck/kinoite/usr/share/xsessions/plasma-steamos-oneshot.desktop
similarity index 100%
rename from system_files/deck/kde/usr/share/xsessions/plasma-steamos-oneshot.desktop
rename to system_files/deck/kinoite/usr/share/xsessions/plasma-steamos-oneshot.desktop
diff --git a/system_files/deck/gnome/usr/bin/gnome-session-oneshot b/system_files/deck/silverblue/usr/bin/gnome-session-oneshot
similarity index 100%
rename from system_files/deck/gnome/usr/bin/gnome-session-oneshot
rename to system_files/deck/silverblue/usr/bin/gnome-session-oneshot
diff --git a/system_files/deck/gnome/usr/bin/steamos-session-select b/system_files/deck/silverblue/usr/bin/steamos-session-select
similarity index 100%
rename from system_files/deck/gnome/usr/bin/steamos-session-select
rename to system_files/deck/silverblue/usr/bin/steamos-session-select
diff --git a/system_files/deck/gnome/usr/share/wayland-sessions/gnome-session-oneshot.desktop b/system_files/deck/silverblue/usr/share/wayland-sessions/gnome-session-oneshot.desktop
similarity index 100%
rename from system_files/deck/gnome/usr/share/wayland-sessions/gnome-session-oneshot.desktop
rename to system_files/deck/silverblue/usr/share/wayland-sessions/gnome-session-oneshot.desktop
diff --git a/system_files/desktop/kde/etc/flatpak/install b/system_files/desktop/kinoite/etc/flatpak/install
similarity index 100%
rename from system_files/desktop/kde/etc/flatpak/install
rename to system_files/desktop/kinoite/etc/flatpak/install
diff --git a/system_files/desktop/kde/etc/systemd/user/com.system76.Scheduler.dbusproxy.service b/system_files/desktop/kinoite/etc/systemd/user/com.system76.Scheduler.dbusproxy.service
similarity index 100%
rename from system_files/desktop/kde/etc/systemd/user/com.system76.Scheduler.dbusproxy.service
rename to system_files/desktop/kinoite/etc/systemd/user/com.system76.Scheduler.dbusproxy.service
diff --git a/system_files/desktop/kde/usr/bin/plasma-autologin b/system_files/desktop/kinoite/usr/bin/plasma-autologin
similarity index 100%
rename from system_files/desktop/kde/usr/bin/plasma-autologin
rename to system_files/desktop/kinoite/usr/bin/plasma-autologin
diff --git a/system_files/desktop/kde/usr/bin/system76-scheduler-dbus-proxy b/system_files/desktop/kinoite/usr/bin/system76-scheduler-dbus-proxy
similarity index 100%
rename from system_files/desktop/kde/usr/bin/system76-scheduler-dbus-proxy
rename to system_files/desktop/kinoite/usr/bin/system76-scheduler-dbus-proxy
diff --git a/system_files/desktop/kde/usr/lib/systemd/system/plasma-autologin.service b/system_files/desktop/kinoite/usr/lib/systemd/system/plasma-autologin.service
similarity index 100%
rename from system_files/desktop/kde/usr/lib/systemd/system/plasma-autologin.service
rename to system_files/desktop/kinoite/usr/lib/systemd/system/plasma-autologin.service
diff --git a/system_files/desktop/kde/usr/share/ublue-os/distrobox/bazzite-arch b/system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch
similarity index 100%
rename from system_files/desktop/kde/usr/share/ublue-os/distrobox/bazzite-arch
rename to system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch
diff --git a/system_files/desktop/kde/usr/share/ublue-os/distrobox/bazzite-arch-nvidia b/system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch-nvidia
similarity index 100%
rename from system_files/desktop/kde/usr/share/ublue-os/distrobox/bazzite-arch-nvidia
rename to system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch-nvidia
diff --git a/system_files/desktop/gnome/usr/share/backgrounds/steamdeck/VGUI2.jpg b/system_files/desktop/kinoite/usr/share/wallpapers/VGUI2.jpg
similarity index 100%
rename from system_files/desktop/gnome/usr/share/backgrounds/steamdeck/VGUI2.jpg
rename to system_files/desktop/kinoite/usr/share/wallpapers/VGUI2.jpg
diff --git a/system_files/desktop/gnome/etc/environment b/system_files/desktop/silverblue/etc/environment
similarity index 100%
rename from system_files/desktop/gnome/etc/environment
rename to system_files/desktop/silverblue/etc/environment
diff --git a/system_files/desktop/gnome/etc/flatpak/install b/system_files/desktop/silverblue/etc/flatpak/install
similarity index 100%
rename from system_files/desktop/gnome/etc/flatpak/install
rename to system_files/desktop/silverblue/etc/flatpak/install
diff --git a/system_files/desktop/gnome/etc/flatpak/remove b/system_files/desktop/silverblue/etc/flatpak/remove
similarity index 100%
rename from system_files/desktop/gnome/etc/flatpak/remove
rename to system_files/desktop/silverblue/etc/flatpak/remove
diff --git a/system_files/desktop/gnome/usr/bin/gnome-autologin b/system_files/desktop/silverblue/usr/bin/gnome-autologin
similarity index 100%
rename from system_files/desktop/gnome/usr/bin/gnome-autologin
rename to system_files/desktop/silverblue/usr/bin/gnome-autologin
diff --git a/system_files/desktop/gnome/usr/lib/systemd/system/gnome-autologin.service b/system_files/desktop/silverblue/usr/lib/systemd/system/gnome-autologin.service
similarity index 100%
rename from system_files/desktop/gnome/usr/lib/systemd/system/gnome-autologin.service
rename to system_files/desktop/silverblue/usr/lib/systemd/system/gnome-autologin.service
diff --git a/system_files/desktop/kde/usr/share/wallpapers/VGUI2.jpg b/system_files/desktop/silverblue/usr/share/backgrounds/steamdeck/VGUI2.jpg
similarity index 100%
rename from system_files/desktop/kde/usr/share/wallpapers/VGUI2.jpg
rename to system_files/desktop/silverblue/usr/share/backgrounds/steamdeck/VGUI2.jpg
diff --git a/system_files/desktop/gnome/usr/share/ublue-os/bazzite/themes/vapor.json b/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/themes/vapor.json
similarity index 100%
rename from system_files/desktop/gnome/usr/share/ublue-os/bazzite/themes/vapor.json
rename to system_files/desktop/silverblue/usr/share/ublue-os/bazzite/themes/vapor.json
diff --git a/system_files/desktop/gnome/usr/share/ublue-os/bazzite/themes/vgui2.json b/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/themes/vgui2.json
similarity index 100%
rename from system_files/desktop/gnome/usr/share/ublue-os/bazzite/themes/vgui2.json
rename to system_files/desktop/silverblue/usr/share/ublue-os/bazzite/themes/vgui2.json
diff --git a/system_files/desktop/gnome/usr/share/ublue-os/distrobox/bazzite-arch b/system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch
similarity index 100%
rename from system_files/desktop/gnome/usr/share/ublue-os/distrobox/bazzite-arch
rename to system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch
diff --git a/system_files/desktop/gnome/usr/share/ublue-os/distrobox/bazzite-arch-nvidia b/system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch-nvidia
similarity index 100%
rename from system_files/desktop/gnome/usr/share/ublue-os/distrobox/bazzite-arch-nvidia
rename to system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch-nvidia