diff --git a/Containerfile b/Containerfile
index bb956a28..86547438 100644
--- a/Containerfile
+++ b/Containerfile
@@ -398,12 +398,12 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
         lsb_release && \
     rpm-ostree install \
         ublue-update && \
-    mkdir -p /usr/etc/xdg/autostart && \
+    mkdir -p /etc/xdg/autostart && \
     sed -i '1s/^/[include]\npaths = ["\/etc\/ublue-os\/topgrade.toml"]\n\n/' /usr/share/ublue-update/topgrade-user.toml && \
-    sed -i 's/min_battery_percent.*/min_battery_percent = 20.0/' /usr/etc/ublue-update/ublue-update.toml && \
-    sed -i 's/max_cpu_load_percent.*/max_cpu_load_percent = 100.0/' /usr/etc/ublue-update/ublue-update.toml && \
-    sed -i 's/max_mem_percent.*/max_mem_percent = 90.0/' /usr/etc/ublue-update/ublue-update.toml && \
-    sed -i 's/dbus_notify.*/dbus_notify = false/' /usr/etc/ublue-update/ublue-update.toml && \
+    sed -i 's/min_battery_percent.*/min_battery_percent = 20.0/' /etc/ublue-update/ublue-update.toml && \
+    sed -i 's/max_cpu_load_percent.*/max_cpu_load_percent = 100.0/' /etc/ublue-update/ublue-update.toml && \
+    sed -i 's/max_mem_percent.*/max_mem_percent = 90.0/' /etc/ublue-update/ublue-update.toml && \
+    sed -i 's/dbus_notify.*/dbus_notify = false/' /etc/ublue-update/ublue-update.toml && \
     curl -Lo /usr/bin/installcab https://raw.githubusercontent.com/KyleGospo/steam-proton-mf-wmv/master/installcab.py && \
     chmod +x /usr/bin/installcab && \
     curl -Lo /usr/bin/install-mf-wmv https://github.com/KyleGospo/steam-proton-mf-wmv/blob/master/install-mf-wmv.sh && \
@@ -621,9 +621,9 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
     cp --no-dereference --preserve=links /usr/lib/libdrm.so.2 /usr/lib/libdrm.so && \
     cp --no-dereference --preserve=links /usr/lib64/libdrm.so.2 /usr/lib64/libdrm.so && \
     sed -i 's@/usr/bin/steam@/usr/bin/bazzite-steam@g' /usr/share/applications/steam.desktop && \
-    mkdir -p /usr/etc/skel/.config/autostart/ && \
-    cp "/usr/share/applications/steam.desktop" "/usr/etc/skel/.config/autostart/steam.desktop" && \
-    sed -i 's@/usr/bin/bazzite-steam %U@/usr/bin/bazzite-steam -silent %U@g' /usr/etc/skel/.config/autostart/steam.desktop && \
+    mkdir -p /etc/skel/.config/autostart/ && \
+    cp "/usr/share/applications/steam.desktop" "/etc/skel/.config/autostart/steam.desktop" && \
+    sed -i 's@/usr/bin/bazzite-steam %U@/usr/bin/bazzite-steam -silent %U@g' /etc/skel/.config/autostart/steam.desktop && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/fish.desktop && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/nvtop.desktop && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/btop.desktop && \
@@ -631,12 +631,12 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
     sed -i 's/#UserspaceHID.*/UserspaceHID=true/' /etc/bluetooth/input.conf && \
     sed -i "s/^SCX_SCHEDULER=.*/SCX_SCHEDULER=scx_bpfland/" /etc/default/scx && \
     rm -f /usr/share/vulkan/icd.d/lvp_icd.*.json && \
-    mkdir -p "/usr/etc/profile.d/" && \
+    mkdir -p "/etc/profile.d/" && \
     ln -s "/usr/share/ublue-os/firstboot/launcher/login-profile.sh" \
-    "/usr/etc/profile.d/ublue-firstboot.sh" && \
-    mkdir -p "/usr/etc/xdg/autostart" && \
-    cp "/usr/share/applications/discover_overlay.desktop" "/usr/etc/xdg/autostart/discover_overlay.desktop" && \
-    sed -i 's@Exec=discover-overlay@Exec=/usr/bin/bazzite-discover-overlay@g' /usr/etc/xdg/autostart/discover_overlay.desktop && \
+    "/etc/profile.d/ublue-firstboot.sh" && \
+    mkdir -p "/etc/xdg/autostart" && \
+    cp "/usr/share/applications/discover_overlay.desktop" "/etc/xdg/autostart/discover_overlay.desktop" && \
+    sed -i 's@Exec=discover-overlay@Exec=/usr/bin/bazzite-discover-overlay@g' /etc/xdg/autostart/discover_overlay.desktop && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/discover_overlay.desktop && \
     cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \
     echo "import \"/usr/share/ublue-os/just/80-bazzite.just\"" >> /usr/share/ublue-os/justfile && \
@@ -671,8 +671,8 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo && \
-    mkdir -p /usr/etc/flatpak/remotes.d && \
-    curl -Lo /usr/etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo && \
+    mkdir -p /etc/flatpak/remotes.d && \
+    curl -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo && \
     systemctl enable brew-dir-fix.service && \
     systemctl enable brew-setup.service && \
     systemctl enable brew-upgrade.timer && \
@@ -694,7 +694,7 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
     systemctl --global enable podman.socket && \
     systemctl --global enable systemd-tmpfiles-setup.service && \
     systemctl disable waydroid-container.service && \
-    curl -Lo /usr/etc/dxvk-example.conf https://raw.githubusercontent.com/doitsujin/dxvk/master/dxvk.conf && \
+    curl -Lo /etc/dxvk-example.conf https://raw.githubusercontent.com/doitsujin/dxvk/master/dxvk.conf && \
     curl -Lo /usr/bin/waydroid-choose-gpu https://raw.githubusercontent.com/KyleGospo/waydroid-scripts/main/waydroid-choose-gpu.sh && \
     chmod +x /usr/bin/waydroid-choose-gpu && \
     curl -Lo /usr/lib/sysctl.d/99-bore-scheduler.conf https://github.com/CachyOS/CachyOS-Settings/raw/master/usr/lib/sysctl.d/99-bore-scheduler.conf && \
@@ -809,14 +809,14 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
 
 # Cleanup & Finalize
 RUN /usr/libexec/containerbuild/image-info && \
-    mkdir -p "/usr/etc/xdg/autostart" && \
-    mv "/usr/etc/skel/.config/autostart/steam.desktop" "/usr/etc/xdg/autostart/steam.desktop" && \
+    mkdir -p "/etc/xdg/autostart" && \
+    mv "/etc/skel/.config/autostart/steam.desktop" "/etc/xdg/autostart/steam.desktop" && \
     sed -i 's@Exec=waydroid first-launch@Exec=/usr/bin/waydroid-launcher first-launch\nX-Steam-Library-Capsule=/usr/share/applications/Waydroid/capsule.png\nX-Steam-Library-Hero=/usr/share/applications/Waydroid/hero.png\nX-Steam-Library-Logo=/usr/share/applications/Waydroid/logo.png\nX-Steam-Library-StoreCapsule=/usr/share/applications/Waydroid/store-logo.png\nX-Steam-Controller-Template=Desktop@g' /usr/share/applications/Waydroid.desktop && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         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" && \
+    cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \
     sed -i "s/^SCX_SCHEDULER=.*/SCX_SCHEDULER=scx_lavd/" /etc/default/scx && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
diff --git a/system_files/deck/kinoite/usr/etc/xdg/autostart/bazzite-plasma-bootstrap.desktop b/system_files/deck/kinoite/etc/xdg/autostart/bazzite-plasma-bootstrap.desktop
similarity index 100%
rename from system_files/deck/kinoite/usr/etc/xdg/autostart/bazzite-plasma-bootstrap.desktop
rename to system_files/deck/kinoite/etc/xdg/autostart/bazzite-plasma-bootstrap.desktop
diff --git a/system_files/deck/kinoite/usr/etc/xdg/kcm-about-distrorc b/system_files/deck/kinoite/etc/xdg/kcm-about-distrorc
similarity index 100%
rename from system_files/deck/kinoite/usr/etc/xdg/kcm-about-distrorc
rename to system_files/deck/kinoite/etc/xdg/kcm-about-distrorc
diff --git a/system_files/deck/shared/usr/etc/X11/Xsession.d/50rotate-screen b/system_files/deck/shared/etc/X11/Xsession.d/50rotate-screen
similarity index 100%
rename from system_files/deck/shared/usr/etc/X11/Xsession.d/50rotate-screen
rename to system_files/deck/shared/etc/X11/Xsession.d/50rotate-screen
diff --git a/system_files/deck/shared/usr/etc/bluetooth/main.conf b/system_files/deck/shared/etc/bluetooth/main.conf
similarity index 100%
rename from system_files/deck/shared/usr/etc/bluetooth/main.conf
rename to system_files/deck/shared/etc/bluetooth/main.conf
diff --git a/system_files/deck/shared/usr/etc/default/batterylimit b/system_files/deck/shared/etc/default/batterylimit
similarity index 100%
rename from system_files/deck/shared/usr/etc/default/batterylimit
rename to system_files/deck/shared/etc/default/batterylimit
diff --git a/system_files/deck/shared/usr/etc/default/discover-overlay b/system_files/deck/shared/etc/default/discover-overlay
similarity index 100%
rename from system_files/deck/shared/usr/etc/default/discover-overlay
rename to system_files/deck/shared/etc/default/discover-overlay
diff --git a/system_files/deck/shared/usr/etc/environment b/system_files/deck/shared/etc/environment
similarity index 100%
rename from system_files/deck/shared/usr/etc/environment
rename to system_files/deck/shared/etc/environment
diff --git a/system_files/deck/shared/usr/etc/modprobe.d/deck-blacklist.conf b/system_files/deck/shared/etc/modprobe.d/deck-blacklist.conf
similarity index 100%
rename from system_files/deck/shared/usr/etc/modprobe.d/deck-blacklist.conf
rename to system_files/deck/shared/etc/modprobe.d/deck-blacklist.conf
diff --git a/system_files/deck/shared/usr/etc/modules-load.d/ryzen_smu.conf b/system_files/deck/shared/etc/modules-load.d/ryzen_smu.conf
similarity index 100%
rename from system_files/deck/shared/usr/etc/modules-load.d/ryzen_smu.conf
rename to system_files/deck/shared/etc/modules-load.d/ryzen_smu.conf
diff --git a/system_files/deck/shared/usr/etc/polkit-1/rules.d/bazzite-autologin.rules b/system_files/deck/shared/etc/polkit-1/rules.d/bazzite-autologin.rules
similarity index 100%
rename from system_files/deck/shared/usr/etc/polkit-1/rules.d/bazzite-autologin.rules
rename to system_files/deck/shared/etc/polkit-1/rules.d/bazzite-autologin.rules
diff --git a/system_files/deck/shared/usr/etc/polkit-1/rules.d/return-to-gamemode.rules b/system_files/deck/shared/etc/polkit-1/rules.d/return-to-gamemode.rules
similarity index 100%
rename from system_files/deck/shared/usr/etc/polkit-1/rules.d/return-to-gamemode.rules
rename to system_files/deck/shared/etc/polkit-1/rules.d/return-to-gamemode.rules
diff --git a/system_files/deck/shared/usr/etc/polkit-1/rules.d/ublue-update-force.rules b/system_files/deck/shared/etc/polkit-1/rules.d/ublue-update-force.rules
similarity index 100%
rename from system_files/deck/shared/usr/etc/polkit-1/rules.d/ublue-update-force.rules
rename to system_files/deck/shared/etc/polkit-1/rules.d/ublue-update-force.rules
diff --git a/system_files/deck/shared/usr/etc/sddm.conf.d/steamos.conf b/system_files/deck/shared/etc/sddm.conf.d/steamos.conf
similarity index 100%
rename from system_files/deck/shared/usr/etc/sddm.conf.d/steamos.conf
rename to system_files/deck/shared/etc/sddm.conf.d/steamos.conf
diff --git a/system_files/deck/shared/usr/etc/sddm.conf.d/virtualkbd.conf b/system_files/deck/shared/etc/sddm.conf.d/virtualkbd.conf
similarity index 100%
rename from system_files/deck/shared/usr/etc/sddm.conf.d/virtualkbd.conf
rename to system_files/deck/shared/etc/sddm.conf.d/virtualkbd.conf
diff --git a/system_files/deck/shared/usr/etc/systemd/logind.conf.d/deck.conf b/system_files/deck/shared/etc/systemd/logind.conf.d/deck.conf
similarity index 100%
rename from system_files/deck/shared/usr/etc/systemd/logind.conf.d/deck.conf
rename to system_files/deck/shared/etc/systemd/logind.conf.d/deck.conf
diff --git a/system_files/deck/shared/usr/etc/systemd/zram-generator.conf b/system_files/deck/shared/etc/systemd/zram-generator.conf
similarity index 100%
rename from system_files/deck/shared/usr/etc/systemd/zram-generator.conf
rename to system_files/deck/shared/etc/systemd/zram-generator.conf
diff --git a/system_files/deck/silverblue/usr/etc/dconf/db/local.d/05-bazzite-extensions b/system_files/deck/silverblue/etc/dconf/db/local.d/05-bazzite-extensions
similarity index 100%
rename from system_files/deck/silverblue/usr/etc/dconf/db/local.d/05-bazzite-extensions
rename to system_files/deck/silverblue/etc/dconf/db/local.d/05-bazzite-extensions
diff --git a/system_files/deck/silverblue/usr/etc/dconf/db/local.d/07-bazzite-deck b/system_files/deck/silverblue/etc/dconf/db/local.d/07-bazzite-deck
similarity index 100%
rename from system_files/deck/silverblue/usr/etc/dconf/db/local.d/07-bazzite-deck
rename to system_files/deck/silverblue/etc/dconf/db/local.d/07-bazzite-deck
diff --git a/system_files/deck/silverblue/usr/etc/environment b/system_files/deck/silverblue/etc/environment
similarity index 100%
rename from system_files/deck/silverblue/usr/etc/environment
rename to system_files/deck/silverblue/etc/environment
diff --git a/system_files/desktop/kinoite/usr/etc/dconf/db/local.d/02-bazzite-kde b/system_files/desktop/kinoite/etc/dconf/db/local.d/02-bazzite-kde
similarity index 100%
rename from system_files/desktop/kinoite/usr/etc/dconf/db/local.d/02-bazzite-kde
rename to system_files/desktop/kinoite/etc/dconf/db/local.d/02-bazzite-kde
diff --git a/system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css b/system_files/desktop/kinoite/etc/skel/.config/gtk-4.0/gtk.css
similarity index 100%
rename from system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css
rename to system_files/desktop/kinoite/etc/skel/.config/gtk-4.0/gtk.css
diff --git a/system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css b/system_files/desktop/kinoite/etc/skel/.config/gtk-4.0/kde_window_geometry.css
similarity index 100%
rename from system_files/desktop/kinoite/usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css
rename to system_files/desktop/kinoite/etc/skel/.config/gtk-4.0/kde_window_geometry.css
diff --git a/system_files/desktop/kinoite/usr/etc/xdg/autostart/joystickwake.desktop b/system_files/desktop/kinoite/etc/xdg/autostart/joystickwake.desktop
similarity index 100%
rename from system_files/desktop/kinoite/usr/etc/xdg/autostart/joystickwake.desktop
rename to system_files/desktop/kinoite/etc/xdg/autostart/joystickwake.desktop
diff --git a/system_files/desktop/kinoite/usr/etc/xdg/kcm-about-distrorc b/system_files/desktop/kinoite/etc/xdg/kcm-about-distrorc
similarity index 100%
rename from system_files/desktop/kinoite/usr/etc/xdg/kcm-about-distrorc
rename to system_files/desktop/kinoite/etc/xdg/kcm-about-distrorc
diff --git a/system_files/desktop/shared/usr/etc/conf.d/btrfs-dedup b/system_files/desktop/shared/etc/conf.d/btrfs-dedup
similarity index 100%
rename from system_files/desktop/shared/usr/etc/conf.d/btrfs-dedup
rename to system_files/desktop/shared/etc/conf.d/btrfs-dedup
diff --git a/system_files/desktop/shared/usr/etc/custom-device-pollrates/custom-device-pollrates.conf b/system_files/desktop/shared/etc/custom-device-pollrates/custom-device-pollrates.conf
similarity index 100%
rename from system_files/desktop/shared/usr/etc/custom-device-pollrates/custom-device-pollrates.conf
rename to system_files/desktop/shared/etc/custom-device-pollrates/custom-device-pollrates.conf
diff --git a/system_files/desktop/shared/usr/etc/default/cec-control b/system_files/desktop/shared/etc/default/cec-control
similarity index 100%
rename from system_files/desktop/shared/usr/etc/default/cec-control
rename to system_files/desktop/shared/etc/default/cec-control
diff --git a/system_files/desktop/shared/usr/etc/default/discover-overlay b/system_files/desktop/shared/etc/default/discover-overlay
similarity index 100%
rename from system_files/desktop/shared/usr/etc/default/discover-overlay
rename to system_files/desktop/shared/etc/default/discover-overlay
diff --git a/system_files/desktop/shared/usr/etc/default/ryzenadj b/system_files/desktop/shared/etc/default/ryzenadj
similarity index 100%
rename from system_files/desktop/shared/usr/etc/default/ryzenadj
rename to system_files/desktop/shared/etc/default/ryzenadj
diff --git a/system_files/desktop/shared/usr/etc/default/steamos-btrfs b/system_files/desktop/shared/etc/default/steamos-btrfs
similarity index 100%
rename from system_files/desktop/shared/usr/etc/default/steamos-btrfs
rename to system_files/desktop/shared/etc/default/steamos-btrfs
diff --git a/system_files/desktop/shared/usr/etc/default/steamos-nested-desktop b/system_files/desktop/shared/etc/default/steamos-nested-desktop
similarity index 100%
rename from system_files/desktop/shared/usr/etc/default/steamos-nested-desktop
rename to system_files/desktop/shared/etc/default/steamos-nested-desktop
diff --git a/system_files/desktop/shared/usr/etc/default/waydroid-launcher b/system_files/desktop/shared/etc/default/waydroid-launcher
similarity index 100%
rename from system_files/desktop/shared/usr/etc/default/waydroid-launcher
rename to system_files/desktop/shared/etc/default/waydroid-launcher
diff --git a/system_files/desktop/shared/usr/etc/profile.d/askpass.sh b/system_files/desktop/shared/etc/profile.d/askpass.sh
similarity index 100%
rename from system_files/desktop/shared/usr/etc/profile.d/askpass.sh
rename to system_files/desktop/shared/etc/profile.d/askpass.sh
diff --git a/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh b/system_files/desktop/shared/etc/profile.d/bazzite-neofetch.sh
similarity index 100%
rename from system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
rename to system_files/desktop/shared/etc/profile.d/bazzite-neofetch.sh
diff --git a/system_files/desktop/shared/usr/etc/profile.d/brew-bash-completion.sh b/system_files/desktop/shared/etc/profile.d/brew-bash-completion.sh
similarity index 100%
rename from system_files/desktop/shared/usr/etc/profile.d/brew-bash-completion.sh
rename to system_files/desktop/shared/etc/profile.d/brew-bash-completion.sh
diff --git a/system_files/desktop/shared/usr/etc/security/limits.d/memlock.conf b/system_files/desktop/shared/etc/security/limits.d/memlock.conf
similarity index 100%
rename from system_files/desktop/shared/usr/etc/security/limits.d/memlock.conf
rename to system_files/desktop/shared/etc/security/limits.d/memlock.conf
diff --git a/system_files/desktop/shared/usr/etc/skel/.config/lutris/system.yml b/system_files/desktop/shared/etc/skel/.config/lutris/system.yml
similarity index 100%
rename from system_files/desktop/shared/usr/etc/skel/.config/lutris/system.yml
rename to system_files/desktop/shared/etc/skel/.config/lutris/system.yml
diff --git a/system_files/desktop/shared/usr/etc/skel/.config/user-tmpfiles.d/discord-rpc.conf b/system_files/desktop/shared/etc/skel/.config/user-tmpfiles.d/discord-rpc.conf
similarity index 100%
rename from system_files/desktop/shared/usr/etc/skel/.config/user-tmpfiles.d/discord-rpc.conf
rename to system_files/desktop/shared/etc/skel/.config/user-tmpfiles.d/discord-rpc.conf
diff --git a/system_files/desktop/shared/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/vapor.palette b/system_files/desktop/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/vapor.palette
similarity index 100%
rename from system_files/desktop/shared/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/vapor.palette
rename to system_files/desktop/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/vapor.palette
diff --git a/system_files/desktop/shared/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/vgui2.palette b/system_files/desktop/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/vgui2.palette
similarity index 100%
rename from system_files/desktop/shared/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/vgui2.palette
rename to system_files/desktop/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/vgui2.palette
diff --git a/system_files/desktop/shared/usr/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vapor.json b/system_files/desktop/shared/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vapor.json
similarity index 100%
rename from system_files/desktop/shared/usr/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vapor.json
rename to system_files/desktop/shared/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vapor.json
diff --git a/system_files/desktop/shared/usr/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vgui2.json b/system_files/desktop/shared/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vgui2.json
similarity index 100%
rename from system_files/desktop/shared/usr/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vgui2.json
rename to system_files/desktop/shared/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vgui2.json
diff --git a/system_files/desktop/shared/usr/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile b/system_files/desktop/shared/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile
similarity index 100%
rename from system_files/desktop/shared/usr/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile
rename to system_files/desktop/shared/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile
diff --git a/system_files/desktop/shared/usr/etc/systemd/system.conf.d/timeout.conf b/system_files/desktop/shared/etc/systemd/system.conf.d/timeout.conf
similarity index 100%
rename from system_files/desktop/shared/usr/etc/systemd/system.conf.d/timeout.conf
rename to system_files/desktop/shared/etc/systemd/system.conf.d/timeout.conf
diff --git a/system_files/desktop/shared/usr/etc/systemd/user.conf.d/timeout.conf b/system_files/desktop/shared/etc/systemd/user.conf.d/timeout.conf
similarity index 100%
rename from system_files/desktop/shared/usr/etc/systemd/user.conf.d/timeout.conf
rename to system_files/desktop/shared/etc/systemd/user.conf.d/timeout.conf
diff --git a/system_files/desktop/shared/usr/etc/systemd/zram-generator.conf b/system_files/desktop/shared/etc/systemd/zram-generator.conf
similarity index 100%
rename from system_files/desktop/shared/usr/etc/systemd/zram-generator.conf
rename to system_files/desktop/shared/etc/systemd/zram-generator.conf
diff --git a/system_files/desktop/shared/usr/etc/ublue-os/topgrade.toml b/system_files/desktop/shared/etc/ublue-os/topgrade.toml
similarity index 100%
rename from system_files/desktop/shared/usr/etc/ublue-os/topgrade.toml
rename to system_files/desktop/shared/etc/ublue-os/topgrade.toml
diff --git a/system_files/desktop/shared/usr/etc/xdg/weston/weston.ini b/system_files/desktop/shared/etc/xdg/weston/weston.ini
similarity index 100%
rename from system_files/desktop/shared/usr/etc/xdg/weston/weston.ini
rename to system_files/desktop/shared/etc/xdg/weston/weston.ini
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/gdm.d/02-bazzite-global b/system_files/desktop/silverblue/etc/dconf/db/gdm.d/02-bazzite-global
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/dconf/db/gdm.d/02-bazzite-global
rename to system_files/desktop/silverblue/etc/dconf/db/gdm.d/02-bazzite-global
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/02-bazzite-global b/system_files/desktop/silverblue/etc/dconf/db/local.d/02-bazzite-global
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/dconf/db/local.d/02-bazzite-global
rename to system_files/desktop/silverblue/etc/dconf/db/local.d/02-bazzite-global
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/03-bazzite-dash b/system_files/desktop/silverblue/etc/dconf/db/local.d/03-bazzite-dash
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/dconf/db/local.d/03-bazzite-dash
rename to system_files/desktop/silverblue/etc/dconf/db/local.d/03-bazzite-dash
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders b/system_files/desktop/silverblue/etc/dconf/db/local.d/04-bazzite-folders
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders
rename to system_files/desktop/silverblue/etc/dconf/db/local.d/04-bazzite-folders
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/05-bazzite-extensions b/system_files/desktop/silverblue/etc/dconf/db/local.d/05-bazzite-extensions
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/dconf/db/local.d/05-bazzite-extensions
rename to system_files/desktop/silverblue/etc/dconf/db/local.d/05-bazzite-extensions
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/06-bazzite-theme b/system_files/desktop/silverblue/etc/dconf/db/local.d/06-bazzite-theme
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/dconf/db/local.d/06-bazzite-theme
rename to system_files/desktop/silverblue/etc/dconf/db/local.d/06-bazzite-theme
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/locks/02-bazzite-global-lock b/system_files/desktop/silverblue/etc/dconf/db/local.d/locks/02-bazzite-global-lock
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/dconf/db/local.d/locks/02-bazzite-global-lock
rename to system_files/desktop/silverblue/etc/dconf/db/local.d/locks/02-bazzite-global-lock
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/profile/gdm b/system_files/desktop/silverblue/etc/dconf/profile/gdm
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/dconf/profile/gdm
rename to system_files/desktop/silverblue/etc/dconf/profile/gdm
diff --git a/system_files/desktop/silverblue/usr/etc/dconf/profile/user b/system_files/desktop/silverblue/etc/dconf/profile/user
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/dconf/profile/user
rename to system_files/desktop/silverblue/etc/dconf/profile/user
diff --git a/system_files/desktop/silverblue/usr/etc/environment b/system_files/desktop/silverblue/etc/environment
similarity index 100%
rename from system_files/desktop/silverblue/usr/etc/environment
rename to system_files/desktop/silverblue/etc/environment
diff --git a/system_files/nvidia/kinoite/usr/etc/xdg/kcm-about-distrorc b/system_files/nvidia/kinoite/etc/xdg/kcm-about-distrorc
similarity index 100%
rename from system_files/nvidia/kinoite/usr/etc/xdg/kcm-about-distrorc
rename to system_files/nvidia/kinoite/etc/xdg/kcm-about-distrorc
diff --git a/system_files/nvidia/silverblue/usr/etc/dconf/db/local.d/05-bazzite-extensions b/system_files/nvidia/silverblue/etc/dconf/db/local.d/05-bazzite-extensions
similarity index 100%
rename from system_files/nvidia/silverblue/usr/etc/dconf/db/local.d/05-bazzite-extensions
rename to system_files/nvidia/silverblue/etc/dconf/db/local.d/05-bazzite-extensions
diff --git a/system_files/overrides/usr/etc/favicon.png b/system_files/overrides/etc/favicon.png
similarity index 100%
rename from system_files/overrides/usr/etc/favicon.png
rename to system_files/overrides/etc/favicon.png