diff --git a/bin/omarchy-dev-add-migration b/bin/omarchy-dev-add-migration
index 21eea4f7..b0c1f736 100755
--- a/bin/omarchy-dev-add-migration
+++ b/bin/omarchy-dev-add-migration
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# FIXME: Update behavior
 cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
 touch $migration_file
diff --git a/bin/omarchy-menu-keybindings b/bin/omarchy-menu-keybindings
index 39a9e0b6..d7450aa1 100755
--- a/bin/omarchy-menu-keybindings
+++ b/bin/omarchy-menu-keybindings
@@ -89,7 +89,6 @@ dynamic_bindings() {
     jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' |
     sed -r \
       -e 's/null//' \
-      -e 's,~/.local/share/omarchy/bin/,,' \
       -e 's,uwsm app -- ,,' \
       -e 's,uwsm-app -- ,,' \
       -e 's/@0//' \
diff --git a/bin/omarchy-show-logo b/bin/omarchy-show-logo
index fbaf38df..cbcd7438 100755
--- a/bin/omarchy-show-logo
+++ b/bin/omarchy-show-logo
@@ -2,6 +2,6 @@
 
 clear
 echo -e "\033[32m"
-cat <~/.local/share/omarchy/logo.txt
+cat < /usr/share/omarchy/logo.txt
 echo -e "\033[0m"
 echo
diff --git a/boot.sh b/boot.sh
index 9593f758..cd6b2157 100755
--- a/boot.sh
+++ b/boot.sh
@@ -3,15 +3,15 @@
 # Set install mode to online since boot.sh is used for curl installations
 export OMARCHY_ONLINE_INSTALL=true
 
-ansi_art='                 ▄▄▄                                                   
- ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
+ansi_art='                 ▄▄▄
+ ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
 ███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
 ███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
 ███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
- ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀ 
+ ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀
                                        ███   █▀                                  '
 
 clear
@@ -19,21 +19,4 @@ echo -e "\n$ansi_art\n"
 
 sudo pacman -Syu --noconfirm --needed git
 
-# Use custom repo if specified, otherwise default to basecamp/omarchy
-OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
-
-echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
-rm -rf ~/.local/share/omarchy/
-git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
-
-# Use custom branch if instructed, otherwise default to master
-OMARCHY_REF="${OMARCHY_REF:-master}"
-if [[ $OMARCHY_REF != "master" ]]; then
-  echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
-  cd ~/.local/share/omarchy
-  git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
-  cd -
-fi
-
-echo -e "\nInstallation starting..."
-source ~/.local/share/omarchy/install.sh
+# FIXME: Update behavior or remove
diff --git a/config/walker/config.toml b/config/walker/config.toml
index 240c95e0..33226a74 100644
--- a/config/walker/config.toml
+++ b/config/walker/config.toml
@@ -1,7 +1,7 @@
 force_keyboard_focus = true                                                 # forces keyboard forcus to stay in Walker
 selection_wrap = true                                                       # wrap list if at bottom or top
 theme = "omarchy-default"                                                   # theme to use
-additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
+additional_theme_location = "/usr/share/omarchy/default/walker/themes/"
 
 [placeholders]
 "default" = { input = " Search...", list = "No Results" } # placeholders for input and empty list, key is the providers name, so f.e. "desktopapplications" or "menus:other"
diff --git a/default/hypr/windows.conf b/default/hypr/windows.conf
index bc665b22..c8b7d078 100644
--- a/default/hypr/windows.conf
+++ b/default/hypr/windows.conf
@@ -8,4 +8,4 @@ windowrule = opacity 0.97 0.9, class:.*
 windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
 
 # App-specific tweaks
-source = ~/.local/share/omarchy/default/hypr/apps.conf
+source = /usr/share/omarchy/default/hypr/apps.conf
diff --git a/install/helpers/errors.sh b/install/helpers/errors.sh
index 2b63409b..d8d29983 100644
--- a/install/helpers/errors.sh
+++ b/install/helpers/errors.sh
@@ -4,11 +4,11 @@ QR_CODE='
 █ ███ █ ▄▄▄▄▀▄▀▄▀ █ ███ █
 █ ▀▀▀ █ ▄█  ▄█▄▄▀ █ ▀▀▀ █
 ▀▀▀▀▀▀▀ ▀▄█ █ █ █ ▀▀▀▀▀▀▀
-▀▀█▀▀▄▀▀▀▀▄█▀▀█  ▀ █ ▀ █ 
+▀▀█▀▀▄▀▀▀▀▄█▀▀█  ▀ █ ▀ █
 █▄█ ▄▄▀▄▄ ▀ ▄ ▀█▄▄▄▄ ▀ ▀█
 ▄ ▄▀█ ▀▄▀▀▀▄ ▄█▀▄█▀▄▀▄▀█▀
 █ ▄▄█▄▀▄█ ▄▄▄  ▀ ▄▀██▀ ▀█
-▀ ▀   ▀ █ ▀▄  ▀▀█▀▀▀█▄▀  
+▀ ▀   ▀ █ ▀▄  ▀▀█▀▀▀█▄▀
 █▀▀▀▀▀█ ▀█  ▄▀▀ █ ▀ █▄▀██
 █ ███ █ █▀▄▄▀ █▀███▀█▄██▄
 █ ▀▀▀ █ ██  ▀ █▄█ ▄▄▄█▀ █
@@ -122,6 +122,7 @@ catch_errors() {
 
     case "$choice" in
     "Retry installation")
+      # FIXME: Update based on final setup
       bash ~/.local/share/omarchy/install.sh
       break
       ;;