diff --git a/Containerfile b/Containerfile
index 0ed836dc1a..ebd43e3b2a 100644
--- a/Containerfile
+++ b/Containerfile
@@ -597,7 +597,7 @@ RUN /tmp/image-info.sh && \
     ln -s /usr/bin/steamos-logger /usr/bin/steamos-notice && \
     ln -s /usr/bin/steamos-logger /usr/bin/steamos-warning && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
-        sed -i 's/Exec=.*/Exec=systemctl start return-to-gamemode.service/' /etc/skel.d/Desktop/Return.desktop \
+        sed -i 's/Exec=.*/Exec=systemctl start return-to-gamemode.service/' /etc/skel/Desktop/Return.desktop \
     ; fi && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/input-remapper-gtk.desktop && \
     cp "/usr/share/ublue-os/firstboot/yafti.yml" "/usr/etc/yafti.yml" && \
diff --git a/system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css b/system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css
new file mode 100644
index 0000000000..6446ce0fe8
--- /dev/null
+++ b/system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css
@@ -0,0 +1,2 @@
+@import 'colors.css';
+@import 'kde-window-geometry.css'
diff --git a/system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/kde-window-geometry.css b/system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/kde-window-geometry.css
new file mode 100644
index 0000000000..ff232514e1
--- /dev/null
+++ b/system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/kde-window-geometry.css
@@ -0,0 +1,35 @@
+/*
+  Extremely trimmed down version of https://github.com/MrCompoopter/Libadwaita-Breeze-Dark
+  Modifies only the window shape, and otherwise makes no other changes.
+  This should ensure compatibility with most if not all themes and applications.
+*/
+
+window {
+  border-radius: 3px 3px 0 0;
+  border-width: 0px;
+  margin: 0px;
+}
+
+window.maximized {
+  border-radius: 0;
+}
+
+.maximized window,
+.fullscreen window,
+.tiled window {
+  border-radius: 0;
+}
+
+.popup window {
+  border-radius: 3px;
+}
+
+.csd window {
+  border-radius: 3px;
+}
+
+.solid-csd window {
+  border-radius: 0;
+  margin: 0;
+  border-width: 5px;
+}
diff --git a/system_files/desktop/shared/usr/bin/bazzite-flatpak-manager b/system_files/desktop/shared/usr/bin/bazzite-flatpak-manager
index 205cc0cdcb..0008a1a8f9 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-flatpak-manager
+++ b/system_files/desktop/shared/usr/bin/bazzite-flatpak-manager
@@ -1,11 +1,12 @@
 #!/usr/bin/bash
 
 # SCRIPT VERSION
-VER=11
+VER=12
 VER_FILE="/etc/bazzite/flatpak_manager_version"
 VER_RAN=$(cat $VER_FILE)
 IMAGE_INFO="/usr/share/ublue-os/image-info.json"
 IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
+BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
 
 # IMAGE IDENTIFIERS
 KNOWN_IMAGE_FLAVOR_FILE="/etc/bazzite/flatpak_manager_image_flavor"
@@ -39,6 +40,13 @@ INSTALL_LIST_FILE="/usr/share/ublue-os/bazzite/flatpak/install"
 REMOVE_LIST_FILE="/usr/share/ublue-os/bazzite/flatpak/remove"
 
 # Configure needed params for flatpaks
+if [[ $BASE_IMAGE_NAME =~ "kinoite" ]]; then
+  # GTK4 theme for KDE
+  flatpak override \
+    --filesystem=xdg-config/gtk-4.0:ro
+fi
+
+# Wayland and XInput for Firefox
 flatpak override \
   --system \
   --env=MOZ_ENABLE_WAYLAND=1 \