diff --git a/usr/bin/wallpaper-menu.sh b/usr/bin/wallpaper-menu.sh
index 70ba65ddee..5541eb23ed 100755
--- a/usr/bin/wallpaper-menu.sh
+++ b/usr/bin/wallpaper-menu.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 NEW_WALLPAPER=$(/usr/bin/ls -1 "$HOME/Pictures/Wallpapers/Mocha" | fuzzel --dmenu --prompt " Select Wallpaper:  ")
 
-"$HOME"/.local/bin/wallpaper "$HOME/Pictures/Wallpapers/Mocha/$NEW_WALLPAPER"
+/usr/bin/wallpaper "$HOME/Pictures/Wallpapers/Mocha/$NEW_WALLPAPER"
 
 
diff --git a/usr/etc/homedir/.config/sway/config b/usr/etc/sway/config
similarity index 100%
rename from usr/etc/homedir/.config/sway/config
rename to usr/etc/sway/config
diff --git a/usr/etc/homedir/.config/sway/config.d/binds.conf b/usr/etc/sway/config.d/binds.conf
similarity index 100%
rename from usr/etc/homedir/.config/sway/config.d/binds.conf
rename to usr/etc/sway/config.d/binds.conf
diff --git a/usr/etc/homedir/.config/sway/config.d/execs.conf b/usr/etc/sway/config.d/execs.conf
similarity index 100%
rename from usr/etc/homedir/.config/sway/config.d/execs.conf
rename to usr/etc/sway/config.d/execs.conf
diff --git a/usr/etc/homedir/.config/sway/config.d/inputs.conf b/usr/etc/sway/config.d/inputs.conf
similarity index 100%
rename from usr/etc/homedir/.config/sway/config.d/inputs.conf
rename to usr/etc/sway/config.d/inputs.conf
diff --git a/usr/etc/homedir/.config/sway/config.d/monitors.conf b/usr/etc/sway/config.d/monitors.conf
similarity index 100%
rename from usr/etc/homedir/.config/sway/config.d/monitors.conf
rename to usr/etc/sway/config.d/monitors.conf
diff --git a/usr/etc/homedir/.config/sway/config.d/theme.conf b/usr/etc/sway/config.d/theme.conf
similarity index 100%
rename from usr/etc/homedir/.config/sway/config.d/theme.conf
rename to usr/etc/sway/config.d/theme.conf
diff --git a/usr/etc/homedir/.config/swaylock/config b/usr/etc/swaylock/config
similarity index 100%
rename from usr/etc/homedir/.config/swaylock/config
rename to usr/etc/swaylock/config
diff --git a/usr/etc/homedir/.config/swaylock/config.save b/usr/etc/swaylock/config.save
similarity index 100%
rename from usr/etc/homedir/.config/swaylock/config.save
rename to usr/etc/swaylock/config.save
diff --git a/usr/etc/homedir/.config/foot/foot.ini b/usr/etc/xdg/foot/foot.ini
similarity index 100%
rename from usr/etc/homedir/.config/foot/foot.ini
rename to usr/etc/xdg/foot/foot.ini
diff --git a/usr/etc/homedir/.config/fuzzel/fuzzel.ini b/usr/etc/xdg/fuzzel/fuzzel.ini
similarity index 100%
rename from usr/etc/homedir/.config/fuzzel/fuzzel.ini
rename to usr/etc/xdg/fuzzel/fuzzel.ini
diff --git a/usr/etc/homedir/.config/waybar/colors.css b/usr/etc/xdg/waybar/colors.css
similarity index 100%
rename from usr/etc/homedir/.config/waybar/colors.css
rename to usr/etc/xdg/waybar/colors.css
diff --git a/usr/etc/homedir/.config/waybar/config b/usr/etc/xdg/waybar/config
similarity index 97%
rename from usr/etc/homedir/.config/waybar/config
rename to usr/etc/xdg/waybar/config
index 9403b061c7..4f923e0495 100644
--- a/usr/etc/homedir/.config/waybar/config
+++ b/usr/etc/xdg/waybar/config
@@ -204,7 +204,7 @@
         "tooltip": true,
         "return-type": "json",
         "interval": 10,
-        "on-click": "$HOME/.config/waybar/scripts/powerprofile-menu.sh",
-        "exec": "$HOME/.config/waybar/scripts/powerprofile.sh",
+        "on-click": "/etc/xdg/waybar/scripts/powerprofile-menu.sh",
+        "exec": "/etc/xdg/waybar/scripts/powerprofile.sh",
     },
 }
diff --git a/usr/etc/homedir/.config/waybar/pallete.css b/usr/etc/xdg/waybar/pallete.css
similarity index 100%
rename from usr/etc/homedir/.config/waybar/pallete.css
rename to usr/etc/xdg/waybar/pallete.css
diff --git a/usr/etc/homedir/.config/waybar/scripts/powerprofile-menu.sh b/usr/etc/xdg/waybar/scripts/powerprofile-menu.sh
similarity index 100%
rename from usr/etc/homedir/.config/waybar/scripts/powerprofile-menu.sh
rename to usr/etc/xdg/waybar/scripts/powerprofile-menu.sh
diff --git a/usr/etc/homedir/.config/waybar/scripts/powerprofile.sh b/usr/etc/xdg/waybar/scripts/powerprofile.sh
similarity index 100%
rename from usr/etc/homedir/.config/waybar/scripts/powerprofile.sh
rename to usr/etc/xdg/waybar/scripts/powerprofile.sh
diff --git a/usr/etc/homedir/.config/waybar/style.css b/usr/etc/xdg/waybar/style.css
similarity index 100%
rename from usr/etc/homedir/.config/waybar/style.css
rename to usr/etc/xdg/waybar/style.css
diff --git a/usr/share/ublue-os/firstboot/launcher/autostart.sh b/usr/share/ublue-os/firstboot/launcher/autostart.sh
index 3c4a335cfd..f1c691cc98 100755
--- a/usr/share/ublue-os/firstboot/launcher/autostart.sh
+++ b/usr/share/ublue-os/firstboot/launcher/autostart.sh
@@ -9,5 +9,12 @@ if [ ! -f "$HOME"/.config/ublue-firstboot ]; then
 
     sed -i " 1 d" "$HOME"/.config/sway/config
 
+    mkdir -p "$HOME"/.config/just
+    cp -r /usr/share/ublue-os/just/custom.just "$HOME"/.config/just/justfile
+
+    cp -r /usr/etc/homedir/.* "$HOME"/
+    cp -r /usr/etc/homedir/* "$HOME"/
+
     /usr/bin/yafti /usr/share/ublue-os/firstboot/yafti.yml
 fi
+