From 8884cc7a5c79ad5da98ec82584986ff048f45ac1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Wed, 23 Jul 2025 16:22:14 -0400
Subject: [PATCH 01/32] Prevent stacking of waybars after unlock by SIGUSR2'ing
 it

Bit crude, but better than a full kill.
Closes #196
---
 config/hypr/hypridle.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf
index 8b1449e..e607bda 100644
--- a/config/hypr/hypridle.conf
+++ b/config/hypr/hypridle.conf
@@ -2,6 +2,7 @@ general {
     lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
     before_sleep_cmd = loginctl lock-session    # lock before suspend.
     after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
+    on_unlock_cmd = pkill -SIGUSR2 waybar       # prevent stacking of waybar when waking
 }
 
 listener {

From d2fffc40eadd8fc7613e9cb3b164e285ef6f5561 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Wed, 23 Jul 2025 16:26:13 -0400
Subject: [PATCH 02/32] Add migration to prevent Waybar stacking

---
 migrations/1753302134.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 migrations/1753302134.sh

diff --git a/migrations/1753302134.sh b/migrations/1753302134.sh
new file mode 100644
index 0000000..022ce56
--- /dev/null
+++ b/migrations/1753302134.sh
@@ -0,0 +1,8 @@
+echo "Reload Waybar on unlock to prevent stacking"
+
+if ! grep -q 'on_unlock_cmd *= *pkill -SIGUSR2 waybar' ~/.config/hypr/hypridle.conf; then
+  sed -i '/^general[[:space:]]*{/,/^}/ {
+    /on_unlock_cmd *=/d
+    /^}$/ i\    on_unlock_cmd = pkill -SIGUSR2 waybar       # prevent stacking of waybar when waking
+  }' ~/.config/hypr/hypridle.conf
+fi

From 66b0fa02273853a50736998d42ca9db33e0cb6cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Saull=20Brand=C3=A3o?= <saullrb@proton.me>
Date: Thu, 24 Jul 2025 07:38:18 -0300
Subject: [PATCH 03/32] add chaotic aur

add chaotic aur repo

add noconfirm

only add chaotic aur for x86-64 arch
---
 install/1-setup-aur-support.sh | 37 ++++++++++++++++++++++++++++++++++
 install/1-yay.sh               | 16 ---------------
 migrations/1753352057.sh       | 17 ++++++++++++++++
 3 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 install/1-setup-aur-support.sh
 delete mode 100644 install/1-yay.sh
 create mode 100755 migrations/1753352057.sh

diff --git a/install/1-setup-aur-support.sh b/install/1-setup-aur-support.sh
new file mode 100644
index 0000000..02ff90d
--- /dev/null
+++ b/install/1-setup-aur-support.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Only add Chaotic-AUR if the architecture is x86_64 so ARM users can build the packages
+if [[ "$(uname -m)" == "x86_64" ]]; then
+  # Import Chaotic-AUR key
+  sudo pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+  sudo pacman-key --lsign-key 3056513887B78AEB
+
+  # Install Chaotic-AUR keyring and mirrorlist
+  sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
+  sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
+
+  # Add Chaotic-AUR repo to pacman config
+  echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
+
+  # Refresh pacman package databases
+  sudo pacman -Sy
+
+  # Install yay
+  sudo pacman -S --needed --noconfirm yay
+else
+  sudo pacman -S --needed --noconfirm base-devel
+
+  if ! command -v yay &>/dev/null; then
+    cd /tmp
+    git clone https://aur.archlinux.org/yay-bin.git
+    cd yay-bin
+    makepkg -si --noconfirm
+    cd -
+    rm -rf yay-bin
+    cd ~
+  fi
+
+fi
+
+# Add fun and color to the pacman installer
+sudo sed -i '/^\[options\]/a Color\nILoveCandy' /etc/pacman.conf
diff --git a/install/1-yay.sh b/install/1-yay.sh
deleted file mode 100644
index df6a9cd..0000000
--- a/install/1-yay.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S --needed --noconfirm base-devel
-
-if ! command -v yay &>/dev/null; then
-  cd /tmp
-  git clone https://aur.archlinux.org/yay-bin.git
-  cd yay-bin
-  makepkg -si --noconfirm
-  cd -
-  rm -rf yay-bin
-  cd ~
-
-  # Add fun and color to the pacman installer
-  sudo sed -i '/^\[options\]/a Color\nILoveCandy' /etc/pacman.conf
-fi
diff --git a/migrations/1753352057.sh b/migrations/1753352057.sh
new file mode 100755
index 0000000..2d5cded
--- /dev/null
+++ b/migrations/1753352057.sh
@@ -0,0 +1,17 @@
+echo "Add Chaotic-AUR to get compiled binaries"
+
+if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.conf; then
+  # Import Chaotic-AUR key
+  sudo pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+  sudo pacman-key --lsign-key 3056513887B78AEB
+
+  # Install Chaotic-AUR keyring and mirrorlist
+  sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
+  sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
+
+  # Add Chaotic-AUR repo to pacman config
+  echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
+
+  # Refresh pacman package databases
+  sudo pacman -Sy
+fi

From 70da2ecbe876503da69f62635707a2efb1206f19 Mon Sep 17 00:00:00 2001
From: Ben Homan <ben@benhoman.com>
Date: Thu, 24 Jul 2025 11:39:12 -0400
Subject: [PATCH 04/32] allow override of screenshot/screenrecord output

---
 bin/omarchy-cmd-screenrecord | 4 +++-
 bin/omarchy-cmd-screenshot   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/omarchy-cmd-screenrecord b/bin/omarchy-cmd-screenrecord
index 20cedfe..9a99f62 100755
--- a/bin/omarchy-cmd-screenrecord
+++ b/bin/omarchy-cmd-screenrecord
@@ -2,8 +2,10 @@
 
 # Set recorder based on GPU
 
+OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-$HOME/Videos}"
+
 screenrecording() {
-  filename="$HOME/Videos/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
   notify-send "Screen recording starting..." -t 1000
   sleep 1
 
diff --git a/bin/omarchy-cmd-screenshot b/bin/omarchy-cmd-screenshot
index e2878e4..1459bd2 100755
--- a/bin/omarchy-cmd-screenshot
+++ b/bin/omarchy-cmd-screenshot
@@ -1,8 +1,10 @@
 #!/bin/bash
 
+OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-$HOME/Pictures}"
+
 hyprshot -m ${1:-region} --raw |
   satty --filename - \
-    --output-filename ~/Pictures/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png \
+    --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
     --early-exit \
     --actions-on-enter save-to-clipboard \
     --save-after-copy \

From 205bcd7be89ced335a47d7a783a0de9c1e79a14b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 24 Jul 2025 16:13:36 -0400
Subject: [PATCH 05/32] Hyprland fullscreen may conflict with the app-specific
 fullscreen, so need a separate key

This is the case with Typora which will retain its ugly menu bar when
Hyprland does the fullscreening, but be beautifully bare when its doing
its own fullscreening. The best would be if we could make F11 work such
that the app got a shot at fullscreening first, then if it wasn't
capable, we let Hyprland do it. But not sure there's a way to do that?
---
 default/hypr/bindings/tiling.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default/hypr/bindings/tiling.conf b/default/hypr/bindings/tiling.conf
index 4b9224a..1176e19 100644
--- a/default/hypr/bindings/tiling.conf
+++ b/default/hypr/bindings/tiling.conf
@@ -5,7 +5,7 @@ bind = SUPER, W, killactive,
 bind = SUPER, J, togglesplit, # dwindle
 bind = SUPER, P, pseudo, # dwindle
 bind = SUPER, V, togglefloating,
-bind = , F11, fullscreen, 0
+bind = SHIFT, F11, fullscreen, 0
 
 # Move focus with mainMod + arrow keys
 bind = SUPER, left, movefocus, l

From 2d9ed8720bc55cced4df7e7543f074051c2e42c2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 24 Jul 2025 17:39:06 -0400
Subject: [PATCH 06/32] Match color to mako

---
 themes/tokyo-night/swayosd.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/tokyo-night/swayosd.css b/themes/tokyo-night/swayosd.css
index 14c0dcd..1300b6a 100644
--- a/themes/tokyo-night/swayosd.css
+++ b/themes/tokyo-night/swayosd.css
@@ -1,6 +1,6 @@
 @define-color background-color #1a1b26;
 @define-color border-color #33ccff;
-@define-color label #33ccff;
-@define-color image #33ccff;
-@define-color progress #33ccff;
+@define-color label #a9b1d6;
+@define-color image #a9b1d6;
+@define-color progress #a9b1d6;
 

From 7242a57c182b456edcb2fd6d8e1afe49e8451761 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 24 Jul 2025 18:00:00 -0400
Subject: [PATCH 07/32] Fix more swayosd colors

---
 themes/catppuccin-latte/swayosd.css | 3 +--
 themes/catppuccin/swayosd.css       | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/themes/catppuccin-latte/swayosd.css b/themes/catppuccin-latte/swayosd.css
index 5b0eaea..74f0485 100644
--- a/themes/catppuccin-latte/swayosd.css
+++ b/themes/catppuccin-latte/swayosd.css
@@ -1,6 +1,5 @@
 @define-color background-color #eff1f5;
-@define-color border-color #4c4f69;
+@define-color border-color #dce0e8;
 @define-color label #4c4f69;
 @define-color image #4c4f69;
 @define-color progress #4c4f69;
-
diff --git a/themes/catppuccin/swayosd.css b/themes/catppuccin/swayosd.css
index a25d38a..0ff80d2 100644
--- a/themes/catppuccin/swayosd.css
+++ b/themes/catppuccin/swayosd.css
@@ -1,6 +1,5 @@
 @define-color background-color #24273a;
 @define-color border-color #c6d0f5;
-@define-color label #c6d0f5;
-@define-color image #c6d0f5;
-@define-color progress #c6d0f5;
-
+@define-color label #cad3f5;
+@define-color image #cad3f5;
+@define-color progress #cad3f5;

From 4578d4e418e1ffcde27d50b3809fd1b8c78e82be Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 24 Jul 2025 18:02:00 -0400
Subject: [PATCH 08/32] Cleanup files from needless comments

---
 themes/catppuccin-latte/hyprland.conf | 6 +-----
 themes/catppuccin/hyprland.conf       | 1 -
 themes/everforest/hyprland.conf       | 1 -
 themes/gruvbox/hyprland.conf          | 1 -
 themes/kanagawa/hyprland.conf         | 1 -
 themes/matte-black/hyprland.conf      | 1 -
 themes/nord/hyprland.conf             | 1 -
 themes/rose-pine/hyprland.conf        | 1 -
 themes/tokyo-night/hyprland.conf      | 1 -
 9 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/themes/catppuccin-latte/hyprland.conf b/themes/catppuccin-latte/hyprland.conf
index 3d8d7e9..afc429d 100644
--- a/themes/catppuccin-latte/hyprland.conf
+++ b/themes/catppuccin-latte/hyprland.conf
@@ -1,8 +1,4 @@
-# https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-
-$latte_blue = rgb(1e66f5)
-
 general {
-    col.active_border = $latte_blue
+    col.active_border = rgb(1e66f5)
 }
 
diff --git a/themes/catppuccin/hyprland.conf b/themes/catppuccin/hyprland.conf
index dd59f04..46ff7e6 100644
--- a/themes/catppuccin/hyprland.conf
+++ b/themes/catppuccin/hyprland.conf
@@ -1,4 +1,3 @@
 general {
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgb(c6d0f5)
 }
diff --git a/themes/everforest/hyprland.conf b/themes/everforest/hyprland.conf
index 67b51cd..e88f030 100644
--- a/themes/everforest/hyprland.conf
+++ b/themes/everforest/hyprland.conf
@@ -1,4 +1,3 @@
 general {
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgb(d3c6aa)
 }
diff --git a/themes/gruvbox/hyprland.conf b/themes/gruvbox/hyprland.conf
index 52331e8..85dbf14 100644
--- a/themes/gruvbox/hyprland.conf
+++ b/themes/gruvbox/hyprland.conf
@@ -1,4 +1,3 @@
 general {
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgb(a89984)
 }
diff --git a/themes/kanagawa/hyprland.conf b/themes/kanagawa/hyprland.conf
index 49c58d7..4972f14 100644
--- a/themes/kanagawa/hyprland.conf
+++ b/themes/kanagawa/hyprland.conf
@@ -1,4 +1,3 @@
 general {
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgb(dcd7ba)
 }
diff --git a/themes/matte-black/hyprland.conf b/themes/matte-black/hyprland.conf
index 13020af..bb90b38 100644
--- a/themes/matte-black/hyprland.conf
+++ b/themes/matte-black/hyprland.conf
@@ -1,4 +1,3 @@
 general {
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgb(8A8A8D)
 }
diff --git a/themes/nord/hyprland.conf b/themes/nord/hyprland.conf
index e5fd3b8..bce729f 100644
--- a/themes/nord/hyprland.conf
+++ b/themes/nord/hyprland.conf
@@ -1,4 +1,3 @@
 general {
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgb(D8DEE9)
 }
diff --git a/themes/rose-pine/hyprland.conf b/themes/rose-pine/hyprland.conf
index c39b9e7..ae0f2b6 100644
--- a/themes/rose-pine/hyprland.conf
+++ b/themes/rose-pine/hyprland.conf
@@ -1,4 +1,3 @@
 general {
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgb(575279)
 }
diff --git a/themes/tokyo-night/hyprland.conf b/themes/tokyo-night/hyprland.conf
index 0611c0a..f0b824a 100644
--- a/themes/tokyo-night/hyprland.conf
+++ b/themes/tokyo-night/hyprland.conf
@@ -1,5 +1,4 @@
 general {
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
 }
 

From 42d80f2ce7746f238d24de4ca6d5c4649a8602f5 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 24 Jul 2025 18:03:00 -0400
Subject: [PATCH 09/32] Consistent colors

---
 themes/catppuccin-latte/mako.ini    | 2 +-
 themes/catppuccin-latte/swayosd.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/catppuccin-latte/mako.ini b/themes/catppuccin-latte/mako.ini
index b123ca6..d19a1c3 100644
--- a/themes/catppuccin-latte/mako.ini
+++ b/themes/catppuccin-latte/mako.ini
@@ -1,5 +1,5 @@
 text-color=#4c4f69
-border-color=#dce0e8
+border-color=#1e66f5
 background-color=#eff1f5
 width=420
 height=110
diff --git a/themes/catppuccin-latte/swayosd.css b/themes/catppuccin-latte/swayosd.css
index 74f0485..c5f23aa 100644
--- a/themes/catppuccin-latte/swayosd.css
+++ b/themes/catppuccin-latte/swayosd.css
@@ -1,5 +1,5 @@
 @define-color background-color #eff1f5;
-@define-color border-color #dce0e8;
+@define-color border-color #1e66f5;
 @define-color label #4c4f69;
 @define-color image #4c4f69;
 @define-color progress #4c4f69;

From db63219398a76f2db1032baf65dde6583b608e24 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 24 Jul 2025 18:05:08 -0400
Subject: [PATCH 10/32] A few more color corrections

---
 themes/gruvbox/swayosd.css     | 2 +-
 themes/matte-black/swayosd.css | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/themes/gruvbox/swayosd.css b/themes/gruvbox/swayosd.css
index 614748f..16240ae 100644
--- a/themes/gruvbox/swayosd.css
+++ b/themes/gruvbox/swayosd.css
@@ -1,5 +1,5 @@
 @define-color background-color #282828;
-@define-color border-color #ebdbb2;
+@define-color border-color #a89984;
 @define-color label #ebdbb2;
 @define-color image #ebdbb2;
 @define-color progress #ebdbb2;
diff --git a/themes/matte-black/swayosd.css b/themes/matte-black/swayosd.css
index 08c28d7..3f24dbb 100644
--- a/themes/matte-black/swayosd.css
+++ b/themes/matte-black/swayosd.css
@@ -1,6 +1,6 @@
 @define-color background-color #121212;
-@define-color border-color #EAEAEA;
-@define-color label #EAEAEA;
-@define-color image #EAEAEA;
-@define-color progress #EAEAEA;
+@define-color border-color #8A8A8D;
+@define-color label #8A8A8D;
+@define-color image #8A8A8D;
+@define-color progress #8A8A8D;
 

From 674c5bfdda15fc1c07253379a9f73b088fdd8380 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 24 Jul 2025 18:11:02 -0400
Subject: [PATCH 11/32] Use Arch icon for this instead too for now

---
 install/webapps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/webapps.sh b/install/webapps.sh
index fbaf3a3..6f5c444 100644
--- a/install/webapps.sh
+++ b/install/webapps.sh
@@ -12,5 +12,5 @@ if [ -z "$OMARCHY_BARE" ]; then
   web2app "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png
   web2app "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png
   web2app "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x-light.png
-  web2app "Omarchy Manual" https://manuals.omamix.org/2/the-omarchy-manual https://manuals.omamix.org/rails/active_storage/blobs/redirect/eyJfcmFpbHMiOnsiZGF0YSI6NDgsInB1ciI6ImJsb2JfaWQifX0=--c26606490139480f5bcb3cf91b09fc45825007f6/omarchy.jpg?disposition=attachment
+  web2app "Omarchy Manual" https://manuals.omamix.org/2/the-omarchy-manual https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/arch-linux.png
 fi

From a76c7ee33bb1d07cd9a0ab671696bd4b338a72f4 Mon Sep 17 00:00:00 2001
From: Taha <paprikataha@gmail.com>
Date: Thu, 24 Jul 2025 17:45:31 -0700
Subject: [PATCH 12/32] add matteblack plugin for neovim

---
 themes/matte-black/neovim.lua | 197 ++--------------------------------
 1 file changed, 7 insertions(+), 190 deletions(-)

diff --git a/themes/matte-black/neovim.lua b/themes/matte-black/neovim.lua
index 1ecffe3..7b3f72b 100644
--- a/themes/matte-black/neovim.lua
+++ b/themes/matte-black/neovim.lua
@@ -1,192 +1,9 @@
 return {
-  "EdenEast/nightfox.nvim",
-  lazy = false,
-  priority = 1000,
-  dependencies = {
-    "folke/snacks.nvim",
-    "nvim-tree/nvim-web-devicons",
-    "nvim-lualine/lualine.nvim",
-  },
-
-  config = function()
-    local nightfox = require('nightfox')
-    local Shade = require('nightfox.lib.shade')
-    local c = require('nightfox.lib.color')
-
-    local matte_black_palette = {
-      -- Base "Matte Black" Palette Overrides
-      bg0 = "#0D0D0D", bg1 = "#121212", bg2 = "#1E1E1E", bg3 = "#2C2C2C", bg4 = "#333333",
-      fg0 = "#FFFFFF", fg1 = "#EAEAEA", fg2 = "#BEBEBE", fg3 = "#8A8A8D",
-      sel0 = "#2C2C2C",
-      sel1 = c.from_hex("#2C2C2C"):blend(c.from_hex("#F59E0B"), 0.2):to_css(),
-      comment = "#8A8A8D",
-      red = Shade.new("#D35F5F", c.from_hex("#D35F5F"):lighten(8):to_css(), "#B91C1C"),
-      orange = Shade.new("#F59E0B", "#FFC107", c.from_hex("#F59E0B"):lighten(-8):to_css()),
-      yellow = Shade.new("#FFC107", c.from_hex("#FFC107"):lighten(10):to_css(), "#F59E0B"),
-      white = Shade.new("#EAEAEA", "#FFFFFF", "#BEBEBE"),
-      black = Shade.new("#333333", "#8A8A8D", "#1E1E1E"),
-      green = Shade.new("#8A9A7B", "#A5B799", "#6F7C62"),
-      cyan = Shade.new("#88AABB", "#A2C4D3", "#6E8A99"),
-      blue = Shade.new("#8A9FBE", "#A4BBDD", "#7084A1"),
-      magenta = Shade.new("#C1A1C1", "#D9B9D9", "#A989A9"),
-      pink = Shade.new("#D398A7", "#EBC0CB", "#B97E8D"),
-
-      -- Lualine Palette Extensions
-      lualine_normal_bg = "#F59E0B",
-      lualine_insert_bg = "#B91C1C",
-      lualine_visual_bg = "#C1A1C1",
-      lualine_command_bg = "#F59E0B",
-      lualine_inactive_bg = c.from_hex("#121212"):lighten(5):to_css(),
-
-      -- Treesitter Palette Extensions
-      ts_parameter = "#D398A7",
-      ts_property = "#EAEAEA",
-    }
-
-    local final_palettes = {
-      carbonfox = require('nightfox.lib.collect').deep_extend(
-        require('nightfox.palette').load('carbonfox'),
-        matte_black_palette
-      )
-    }
-
-    local specs = {
-      carbonfox = {
-        syntax = {
-          keyword = "red", -- "local", "function", "if"
-          conditional = "red",
-          statement = "red",
-          func = "orange",
-          string = "orange.dim",
-          number = "orange",
-          operator = "yellow",
-          variable = "white",
-          ident = "white.dim",
-          const = "white",
-          type = "white",
-          field = "white.dim",
-          comment = "comment",
-        },
-        diag = {
-            error = "red",
-            warn = "red",
-            info = "cyan",
-            hint = "magenta",
-        }
-      }
-    }
-
-    local groups = {
-      all = {
-        -- Base Groups
-        Whitespace = { fg = "palette.black.bright" },
-        NonText = { fg = "palette.black.bright" },
-        IncSearch = { bg = "palette.sel1" },
-        CursorLine = { bg = "palette.bg2" },
-        Normal = { fg = "palette.fg1" },
-
-        -- Noice Cmdline Overrides
-        NoiceCmdlinePopupBorder = { fg = "palette.fg3" },
-        NoiceCmdlinePopupTitle = { fg = "palette.fg3", style = "bold" },
-        NoiceCmdlinePopupBorderSearch = { fg = "palette.fg3" },
-        NoiceCmdlinePopupTitleSearch = { fg = "palette.fg3", style = "bold" },
-        NoiceCmdLineIcon = { fg = "palette.red" },
-
-        -- Neo-tree overrides
-        NeoTreeNormal = { bg = "palette.bg0" },
-        NeoTreeNormalNC = { link = "NeoTreeNormal" },
-        NeoTreeDirectoryName = { fg = "palette.fg3" },
-        NeoTreeDirectoryIcon = { fg = "palette.fg3" },
-        NeoTreeRootName = { fg = "palette.orange", style = "bold" },
-        NeoTreeGitAdded = { fg = "palette.green" },
-        NeoTreeGitModified = { fg = "palette.yellow" },
-        NeoTreeGitDeleted = { fg = "palette.red" },
-        NeoTreeGitIgnored = { fg = "palette.comment" },
-        NeoTreeC = { fg = "palette.orange", bg = "palette.sel0" },
-
-        -- Dashboard overrides
-        SnacksDashboardHeader = { fg = "palette.fg3" },
-        SnacksDashboardIcon = { fg = "palette.fg1" },
-        SnacksDashboardDir = { fg = "palette.orange" },
-        SnacksDashboardFile = { fg = "palette.fg3" },
-        SnacksDashboardFooter = { fg = "palette.fg3" },
-        SnacksDashboardKey = { fg = "palette.orange" },
-        SnacksDashboardDesc = { fg = "palette.fg1" },
-        SnacksDashboardSpecial = { fg = "palette.fg1" },
-
-        -- Treesitter overrides
-        ["@comment"] = { fg = "palette.comment", style = "italic" },
-        ["@keyword"] = { fg = "palette.red", style = "bold" },
-        ["@keyword.function"] = { fg = "palette.red", style = "bold" },
-        ["@keyword.operator"] = { fg = "palette.red", style = "bold" },
-        ["@function"] = { fg = "palette.orange", style = "bold" },
-        ["@function.builtin"] = { fg = "palette.orange", style = "bold" },
-        ["@function.call"] = { fg = "palette.orange" },
-        ["@string"] = { fg = "palette.orange" },
-        ["@number"] = { fg = "palette.orange" },
-        ["@operator"] = { fg = "palette.yellow" },
-        ["@variable"] = { fg = "palette.white" },
-        ["@constant"] = { fg = "palette.white" },
-        ["@type"] = { fg = "palette.white.dim" },
-        ["@variable.parameter"] = { fg = "palette.ts_parameter", style = "italic" },
-        ["@property"] = { fg = "palette.ts_property" },
-        ["@field"] = { fg = "palette.ts_property" },
-      }
-    }
-
-    nightfox.setup({
-      options = {
-        style = "carbonfox",
-        terminal_colors = true,
-        dim_inactive = true,
-        styles = { comments = "italic", functions = "bold", keywords = "bold" },
-        modules = {
-          neotree = true,
-          treesitter = true,
-        },
-      },
-      palettes = final_palettes,
-      specs = specs,
-      groups = groups
-    })
-
-    vim.cmd("colorscheme carbonfox")
-
-    -- Lualine overrides
-    local lualine_theme = {
-      normal = {
-        a = { fg = matte_black_palette.bg0, bg = matte_black_palette.lualine_normal_bg, gui = "bold" },
-        b = { fg = matte_black_palette.fg1, bg = matte_black_palette.lualine_inactive_bg },
-        c = { fg = matte_black_palette.fg2, bg = matte_black_palette.lualine_inactive_bg },
-      },
-      insert = {
-        a = { fg = matte_black_palette.bg0, bg = matte_black_palette.lualine_insert_bg, gui = "bold" },
-        b = { fg = matte_black_palette.fg1, bg = matte_black_palette.lualine_inactive_bg },
-        c = { fg = matte_black_palette.fg2, bg = matte_black_palette.lualine_inactive_bg },
-      },
-      visual = {
-        a = { fg = matte_black_palette.bg0, bg = matte_black_palette.lualine_visual_bg, gui = "bold" },
-        b = { fg = matte_black_palette.fg1, bg = matte_black_palette.lualine_inactive_bg },
-        c = { fg = matte_black_palette.fg2, bg = matte_black_palette.lualine_inactive_bg },
-      },
-      command = {
-        a = { fg = matte_black_palette.bg0, bg = matte_black_palette.lualine_command_bg, gui = "bold" },
-        b = { fg = matte_black_palette.fg1, bg = matte_black_palette.lualine_inactive_bg },
-        c = { fg = matte_black_palette.fg2, bg = matte_black_palette.lualine_inactive_bg },
-      },
-      inactive = {
-        a = { fg = matte_black_palette.fg3, bg = matte_black_palette.lualine_inactive_bg },
-        b = { fg = matte_black_palette.fg3, bg = matte_black_palette.lualine_inactive_bg },
-        c = { fg = matte_black_palette.comment, bg = matte_black_palette.lualine_inactive_bg },
-      },
-    }
-
-   require('lualine').setup({
-      options = {
-        theme = lualine_theme,
-      },
-    })
-
-  end,
-
+  { "tahayvr/matteblack.nvim", lazy = false, priority = 1000 },
+  {
+		"LazyVim/LazyVim",
+		opts = {
+			colorscheme = "matteblack",
+		},
+	},
 }
\ No newline at end of file

From 46d135025e64d6e19e599c996d0bbc9e5cf457d9 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 13:02:31 -0400
Subject: [PATCH 13/32] Center steam window to prevent it from being off screen

---
 default/hypr/windows.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/default/hypr/windows.conf b/default/hypr/windows.conf
index bf9049d..ec62f32 100644
--- a/default/hypr/windows.conf
+++ b/default/hypr/windows.conf
@@ -15,7 +15,8 @@ windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Fil
 windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
 
 # Float Steam, fullscreen RetroArch
-windowrule = float, class:^(steam)$
+windowrule = float, class:steam
+windowrule = center, class:steam
 windowrule = fullscreen, class:^(com.libretro.RetroArch)$
 
 # Just dash of opacity

From f2b58c2b8ea31ce367e339fbf81ea0fbe5c5a3f1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 13:02:54 -0400
Subject: [PATCH 14/32] Add dedicated omarchy-setup-steam script

---
 bin/omarchy             | 3 ++-
 bin/omarchy-setup-steam | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100755 bin/omarchy-setup-steam

diff --git a/bin/omarchy b/bin/omarchy
index 936aec2..8b8a34b 100755
--- a/bin/omarchy
+++ b/bin/omarchy
@@ -95,9 +95,10 @@ remove_theme_prompt() {
 
 setup_menu() {
   show_ascii_art
-  local menu=("Dropbox" "Docker DBs" "Fingerprint sensor" "Fido2 device" "Back")
+  local menu=("Dropbox" "Steam" "Docker DBs" "Fingerprint sensor" "Fido2 device" "Back")
   local commands=(
     "omarchy-setup-dropbox"
+    "omarchy-setup-steam"
     "setup_docker_dbs"
     "omarchy-setup-fingerprint"
     "omarchy-setup-fido2"
diff --git a/bin/omarchy-setup-steam b/bin/omarchy-setup-steam
new file mode 100755
index 0000000..ae4051c
--- /dev/null
+++ b/bin/omarchy-setup-steam
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "Adding multilib repository for 32-bit compatibility"
+sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
+sudo pacman -Sy
+
+echo "Now pick dependencies matching your graphics card"
+yay -S steam
+gtk-launch steam >/dev/null 2>&1 &

From 19c0d2887ee70ea405ed3202aa82b343dff7273a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 13:04:53 -0400
Subject: [PATCH 15/32] Reorder

---
 bin/omarchy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/omarchy b/bin/omarchy
index 8b8a34b..813621b 100755
--- a/bin/omarchy
+++ b/bin/omarchy
@@ -127,10 +127,10 @@ setup_docker_dbs() {
   if [[ -n "$choices" ]]; then
     for db in $choices; do
       case $db in
-      MariaDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mariadb11 -e MARIADB_ROOT_PASSWORD= -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true mariadb:11.8 ;;
       MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;;
-      Redis) sudo docker run -d --restart unless-stopped -p "127.0.0.1:6379:6379" --name=redis redis:7 ;;
       PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres16 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16 ;;
+      MariaDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mariadb11 -e MARIADB_ROOT_PASSWORD= -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true mariadb:11.8 ;;
+      Redis) sudo docker run -d --restart unless-stopped -p "127.0.0.1:6379:6379" --name=redis redis:7 ;;
       esac
     done
   fi

From 10f71885b2f7bb9b33d9ced6aab72c161c178904 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 13:43:32 -0400
Subject: [PATCH 16/32] No longer needed

---
 bin/omarchy-theme-install | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/bin/omarchy-theme-install b/bin/omarchy-theme-install
index 67a7909..93b30ab 100755
--- a/bin/omarchy-theme-install
+++ b/bin/omarchy-theme-install
@@ -12,9 +12,6 @@ REPO_URL="$1"
 THEMES_DIR="$HOME/.config/omarchy/themes"
 THEME_NAME=$(basename "$REPO_URL" .git | sed -E 's/^omarchy-//; s/-theme$//')
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
-THEME_BACKGROUND_PATH="$THEME_PATH/backgrounds"
-BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds"
-BACKGROUNDS_THEME_PATH="$BACKGROUNDS_PATH/$THEME_NAME"
 
 # Remove existing theme if present
 if [ -d "$THEME_PATH" ]; then
@@ -27,10 +24,5 @@ if ! git clone "$REPO_URL" "$THEME_PATH"; then
   exit 1
 fi
 
-# Link backgrounds if present
-if [ -d $THEME_BACKGROUND_PATH ]; then
-  ln -snf $THEME_BACKGROUND_PATH $BACKGROUNDS_THEME_PATH
-fi
-
 # Apply the new theme with omarchy-theme-set
 omarchy-theme-set $THEME_NAME

From e01c1bb139849659e583f0813fa6ccb1e6426d6a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 14:29:08 -0400
Subject: [PATCH 17/32] It's all setup

---
 install/{1-setup-aur-support.sh => 1-aur.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename install/{1-setup-aur-support.sh => 1-aur.sh} (100%)

diff --git a/install/1-setup-aur-support.sh b/install/1-aur.sh
similarity index 100%
rename from install/1-setup-aur-support.sh
rename to install/1-aur.sh

From 1c14b8eba2c1512ac84e65acfbb9839210eb83e3 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 14:30:18 -0400
Subject: [PATCH 18/32] Have to check for the right command

---
 migrations/1753138691.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migrations/1753138691.sh b/migrations/1753138691.sh
index b37208f..04012e4 100644
--- a/migrations/1753138691.sh
+++ b/migrations/1753138691.sh
@@ -1,6 +1,6 @@
 echo "Install swayOSD to show volume status"
 
-if ! command -v swayosd &>/dev/null; then
+if ! command -v swayosd-server &>/dev/null; then
   yay -S --noconfirm --needed swayosd
   setsid uwsm app -- swayosd-server &>/dev/null &
 fi

From 6d3df204bc6aac677273e012d2b0d7b2e8b0dda8 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 15:05:41 -0400
Subject: [PATCH 19/32] Use terminal text effects for extra rizz

---
 bin/omarchy                 | 3 ++-
 install/2-identification.sh | 5 +++--
 ansi.sh => logo.txt         | 9 ++-------
 migrations/1753468218.sh    | 4 ++++
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename ansi.sh => logo.txt (82%)
 create mode 100644 migrations/1753468218.sh

diff --git a/bin/omarchy b/bin/omarchy
index 813621b..3de2c62 100755
--- a/bin/omarchy
+++ b/bin/omarchy
@@ -4,7 +4,8 @@ OMARCHY_VERSION=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/de
 PATH="$PATH:$HOME/.local/share/omarchy/bin"
 
 show_ascii_art() {
-  source ~/.local/share/omarchy/ansi.sh
+  clear
+  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 640 expand
   echo "                                                                                 $OMARCHY_VERSION"
 }
 
diff --git a/install/2-identification.sh b/install/2-identification.sh
index f31b1e8..38fa1da 100644
--- a/install/2-identification.sh
+++ b/install/2-identification.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 
 # Need gum to query for input
-yay -S --noconfirm --needed gum
+yay -S --noconfirm --needed gum python-terminaltexteffects
 
 # Configure identification
-source ~/.local/share/omarchy/ansi.sh
+clear
+tte -i ~/.local/share/omarchy/logo.txt --frame-rate 120 expand
 echo -e "\nEnter identification for git and autocomplete..."
 export OMARCHY_USER_NAME=$(gum input --placeholder "Enter full name" --prompt "Name> ")
 export OMARCHY_USER_EMAIL=$(gum input --placeholder "Enter email address" --prompt "Email> ")
diff --git a/ansi.sh b/logo.txt
similarity index 82%
rename from ansi.sh
rename to logo.txt
index 4ce2952..e0d0525 100644
--- a/ansi.sh
+++ b/logo.txt
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-ansi_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+ ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
 ███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
 ███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
 ███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
@@ -8,7 +6,4 @@ ansi_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      
 ███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
 ███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
  ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
-                                          ███    ███                                    '
-
-clear
-echo -e "\n$ansi_art\n"
+                                          ███    ███                                    
diff --git a/migrations/1753468218.sh b/migrations/1753468218.sh
new file mode 100644
index 0000000..b9f22e9
--- /dev/null
+++ b/migrations/1753468218.sh
@@ -0,0 +1,4 @@
+echo "Add Terminal Text Effects for rizzing Omarchy"
+if yay -Qe python-terminaltexteffects &>/dev/null; then
+  yay -S --noconfirm --needed python-terminaltexteffects
+fi

From 824ba780009c59ca8c4c4fe03df4c958a2e1003a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 15:14:05 -0400
Subject: [PATCH 20/32] Let's try just showing the logo at identification time

---
 boot.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/boot.sh b/boot.sh
index 3ff9965..dda0289 100755
--- a/boot.sh
+++ b/boot.sh
@@ -1,17 +1,5 @@
 #!/bin/bash
 
-ansi_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
-███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
-███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
-███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
-███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
-███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
-███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
- ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
-                                          ███    ███                                    '
-
-echo -e "\n$ansi_art\n"
-
 sudo pacman -Sy --noconfirm --needed git
 
 echo -e "\nCloning Omarchy..."

From 165c940df2ee25497834685829586c19ab86fc4a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 15:21:36 -0400
Subject: [PATCH 21/32] A bit more effects

---
 install/2-identification.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install/2-identification.sh b/install/2-identification.sh
index 38fa1da..bd286ff 100644
--- a/install/2-identification.sh
+++ b/install/2-identification.sh
@@ -6,6 +6,8 @@ yay -S --noconfirm --needed gum python-terminaltexteffects
 # Configure identification
 clear
 tte -i ~/.local/share/omarchy/logo.txt --frame-rate 120 expand
-echo -e "\nEnter identification for git and autocomplete..."
+echo -e ""
+echo "Let's install Omarchy!" | tte --frame-rate 640 wipe
+echo -e ""
 export OMARCHY_USER_NAME=$(gum input --placeholder "Enter full name" --prompt "Name> ")
 export OMARCHY_USER_EMAIL=$(gum input --placeholder "Enter email address" --prompt "Email> ")

From 65a5bbad82c1cb046e20797b2902adc6caf95a39 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 15:25:39 -0400
Subject: [PATCH 22/32] Setup presentation tooling and functions as a separate
 step

---
 install/2-identification.sh              | 13 -------------
 install/2-presentation.sh                | 15 +++++++++++++++
 install/3-identification.sh              |  7 +++++++
 install/{3-terminal.sh => 4-terminal.sh} |  0
 install/{4-config.sh => 5-config.sh}     |  0
 5 files changed, 22 insertions(+), 13 deletions(-)
 delete mode 100644 install/2-identification.sh
 create mode 100644 install/2-presentation.sh
 create mode 100644 install/3-identification.sh
 rename install/{3-terminal.sh => 4-terminal.sh} (100%)
 rename install/{4-config.sh => 5-config.sh} (100%)

diff --git a/install/2-identification.sh b/install/2-identification.sh
deleted file mode 100644
index bd286ff..0000000
--- a/install/2-identification.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Need gum to query for input
-yay -S --noconfirm --needed gum python-terminaltexteffects
-
-# Configure identification
-clear
-tte -i ~/.local/share/omarchy/logo.txt --frame-rate 120 expand
-echo -e ""
-echo "Let's install Omarchy!" | tte --frame-rate 640 wipe
-echo -e ""
-export OMARCHY_USER_NAME=$(gum input --placeholder "Enter full name" --prompt "Name> ")
-export OMARCHY_USER_EMAIL=$(gum input --placeholder "Enter email address" --prompt "Email> ")
diff --git a/install/2-presentation.sh b/install/2-presentation.sh
new file mode 100644
index 0000000..cb90f2b
--- /dev/null
+++ b/install/2-presentation.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Need gum to query for input
+yay -S --noconfirm --needed gum python-terminaltexteffects
+
+show_logo() {
+  clear
+  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 120 expand
+  echo -e ""
+}
+
+show_subtext() {
+  echo "$1" | tte --frame-rate 640 wipe
+  echo -e ""
+}
diff --git a/install/3-identification.sh b/install/3-identification.sh
new file mode 100644
index 0000000..2dbf494
--- /dev/null
+++ b/install/3-identification.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+show_logo
+show_subtext "Let's install Omarchy!"
+
+export OMARCHY_USER_NAME=$(gum input --placeholder "Enter full name" --prompt "Name> ")
+export OMARCHY_USER_EMAIL=$(gum input --placeholder "Enter email address" --prompt "Email> ")
diff --git a/install/3-terminal.sh b/install/4-terminal.sh
similarity index 100%
rename from install/3-terminal.sh
rename to install/4-terminal.sh
diff --git a/install/4-config.sh b/install/5-config.sh
similarity index 100%
rename from install/4-config.sh
rename to install/5-config.sh

From 0c36142f8a0346aaa8ecb15f6e51d2ceff927ebf Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 15:26:38 -0400
Subject: [PATCH 23/32] Default to expand but allow others

---
 install/2-presentation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/2-presentation.sh b/install/2-presentation.sh
index cb90f2b..ea72b2b 100644
--- a/install/2-presentation.sh
+++ b/install/2-presentation.sh
@@ -5,7 +5,7 @@ yay -S --noconfirm --needed gum python-terminaltexteffects
 
 show_logo() {
   clear
-  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 120 expand
+  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 120 ${1:-expand}
   echo -e ""
 }
 

From c4a08c3c25f6e53af81a9908b039fc7c95d1578e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 15:27:10 -0400
Subject: [PATCH 24/32] Try to do another header

---
 install/4-terminal.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install/4-terminal.sh b/install/4-terminal.sh
index 2df35f9..ac959da 100644
--- a/install/4-terminal.sh
+++ b/install/4-terminal.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+show_logo
+show_subtext "Let's install basic terminal tools..."
+
 yay -S --noconfirm --needed \
   wget curl unzip inetutils impala \
   fd eza fzf ripgrep zoxide bat jq \

From 37f4d4a4111983c28e64a144de6cb2525f0ad2eb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 15:30:49 -0400
Subject: [PATCH 25/32] More tweaks to the animations

---
 install/2-presentation.sh   | 4 ++--
 install/3-identification.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/2-presentation.sh b/install/2-presentation.sh
index ea72b2b..636a769 100644
--- a/install/2-presentation.sh
+++ b/install/2-presentation.sh
@@ -5,11 +5,11 @@ yay -S --noconfirm --needed gum python-terminaltexteffects
 
 show_logo() {
   clear
-  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 120 ${1:-expand}
+  tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
   echo -e ""
 }
 
 show_subtext() {
-  echo "$1" | tte --frame-rate 640 wipe
+  echo "$1" | tte --frame-rate ${3:-640} ${2:-wipe}
   echo -e ""
 }
diff --git a/install/3-identification.sh b/install/3-identification.sh
index 2dbf494..859a300 100644
--- a/install/3-identification.sh
+++ b/install/3-identification.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-show_logo
+show_logo beams 240
 show_subtext "Let's install Omarchy!"
 
 export OMARCHY_USER_NAME=$(gum input --placeholder "Enter full name" --prompt "Name> ")

From 0ead8947f7c37bec9de5b4d28e644d5933d5d411 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 15:42:27 -0400
Subject: [PATCH 26/32] Add logo to logical substeps

---
 install/4-terminal.sh  | 3 ---
 install/desktop.sh     | 3 +++
 install/development.sh | 3 +++
 install/fonts.sh       | 3 +++
 install/hyprlandia.sh  | 3 +++
 install/login.sh       | 4 +++-
 install/nvidia.sh      | 3 +++
 install/printer.sh     | 3 +++
 install/theme.sh       | 3 +++
 install/xtras.sh       | 3 +++
 10 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/install/4-terminal.sh b/install/4-terminal.sh
index ac959da..2df35f9 100644
--- a/install/4-terminal.sh
+++ b/install/4-terminal.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-show_logo
-show_subtext "Let's install basic terminal tools..."
-
 yay -S --noconfirm --needed \
   wget curl unzip inetutils impala \
   fd eza fzf ripgrep zoxide bat jq \
diff --git a/install/desktop.sh b/install/desktop.sh
index 0b2b320..712f6c8 100644
--- a/install/desktop.sh
+++ b/install/desktop.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+show_logo
+show_subtext "Let's install desktop tools..."
+
 yay -S --noconfirm --needed \
   brightnessctl playerctl pamixer wiremix wireplumber \
   fcitx5 fcitx5-gtk fcitx5-qt wl-clip-persist \
diff --git a/install/development.sh b/install/development.sh
index 20d8957..97f9c77 100644
--- a/install/development.sh
+++ b/install/development.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+show_logo
+show_subtext "Let's install development tools..."
+
 yay -S --noconfirm --needed \
   cargo clang llvm mise \
   imagemagick \
diff --git a/install/fonts.sh b/install/fonts.sh
index b1a7ea0..ab4d348 100644
--- a/install/fonts.sh
+++ b/install/fonts.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+show_logo
+show_subtext "Install beautiful fonts..."
+
 if [ -z "$OMARCHY_BARE" ]; then
   yay -S --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
 else
diff --git a/install/hyprlandia.sh b/install/hyprlandia.sh
index e5d9368..72bffd4 100644
--- a/install/hyprlandia.sh
+++ b/install/hyprlandia.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+show_logo
+show_subtext "Installing Hyprland ecosystem..."
+
 yay -S --noconfirm --needed \
   hyprland hyprshot hyprpicker hyprlock hypridle polkit-gnome hyprland-qtutils \
   walker-bin libqalculate waybar mako swaybg swayosd \
diff --git a/install/login.sh b/install/login.sh
index 5e090b7..a62a08a 100644
--- a/install/login.sh
+++ b/install/login.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-# Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
+show_logo
+show_subtext "Install decryption and boot loader..."
+
 yay -S --noconfirm --needed uwsm
 
 # Compile the seamless login helper -- needed to prevent seeing terminal between loader and desktop
diff --git a/install/nvidia.sh b/install/nvidia.sh
index 3385e04..e3a475a 100644
--- a/install/nvidia.sh
+++ b/install/nvidia.sh
@@ -12,6 +12,9 @@
 
 # --- GPU Detection ---
 if [ -n "$(lspci | grep -i 'nvidia')" ]; then
+  show_logo
+  show_subtext "Install NVIDIA drivers..."
+
   # --- Driver Selection ---
   # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
   if echo "$(lspci | grep -i 'nvidia')" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then
diff --git a/install/printer.sh b/install/printer.sh
index 17b2d31..fc9e671 100644
--- a/install/printer.sh
+++ b/install/printer.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
 
+show_logo
+show_subtext "Installing printer system..."
+
 sudo pacman -S --noconfirm cups cups-pdf cups-filters system-config-printer
 sudo systemctl enable --now cups.service
diff --git a/install/theme.sh b/install/theme.sh
index 12a29ae..c4951e2 100644
--- a/install/theme.sh
+++ b/install/theme.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+show_logo
+show_subtext "Installing themes..."
+
 # Use dark mode for QT apps too (like kdenlive)
 sudo pacman -S --noconfirm kvantum-qt5
 
diff --git a/install/xtras.sh b/install/xtras.sh
index 36c88e9..35eecdb 100644
--- a/install/xtras.sh
+++ b/install/xtras.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 if [ -z "$OMARCHY_BARE" ]; then
+  show_logo
+  show_subtext "Installing default applications..."
+
   yay -S --noconfirm --needed \
     gnome-calculator gnome-keyring signal-desktop \
     obsidian-bin libreoffice obs-studio kdenlive \

From 25acc313b1471b0828131bf5d92403ba18c889a2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 15:43:21 -0400
Subject: [PATCH 27/32] Just straight reboot when we're done

Script will abort anyway if there were any issues along the way
---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index a329185..cb074d5 100755
--- a/install.sh
+++ b/install.sh
@@ -24,4 +24,4 @@ sudo updatedb
 # Update all built-in packages
 sudo pacman -Syu --noconfirm
 
-gum confirm "Reboot to apply all settings?" && reboot
+reboot

From b5f60f78a890ad5754ca8c39ad42af8bcece5963 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 16:48:53 -0400
Subject: [PATCH 28/32] Structure the installers explicitly with clearly
 defined segments

---
 install.sh                                    | 72 ++++++++++++++++---
 install/2-presentation.sh                     | 15 ----
 install/{ => apps}/mimetypes.sh               |  0
 install/{ => apps}/webapps.sh                 |  0
 install/{ => apps}/xtras.sh                   |  0
 install/{5-config.sh => config/config.sh}     |  0
 .../{ => config}/detect-keyboard-layout.sh    |  0
 install/{ => config}/fix-fkeys.sh             |  0
 .../identification.sh}                        |  3 -
 install/{ => config}/login.sh                 |  3 -
 install/{ => config}/network.sh               |  0
 install/{ => config}/nvidia.sh                |  0
 install/{ => config}/plymouth.sh              |  0
 install/{ => config}/power.sh                 |  0
 install/{ => config}/theme.sh                 |  0
 install/{ => desktop}/asdcontrol.sh           |  0
 install/{ => desktop}/bluetooth.sh            |  0
 install/{ => desktop}/desktop.sh              |  3 -
 install/{ => desktop}/fonts.sh                |  3 -
 install/{ => desktop}/hyprlandia.sh           |  3 -
 install/{ => desktop}/printer.sh              |  3 -
 install/{ => development}/development.sh      |  3 -
 install/{ => development}/docker.sh           |  0
 install/{ => development}/firewall.sh         |  0
 install/{ => development}/nvim.sh             |  0
 install/{ => development}/ruby.sh             |  0
 .../terminal.sh}                              |  0
 install/{1-aur.sh => preflight/aur.sh}        |  0
 install/preflight/presentation.sh             |  3 +
 29 files changed, 67 insertions(+), 44 deletions(-)
 delete mode 100644 install/2-presentation.sh
 rename install/{ => apps}/mimetypes.sh (100%)
 rename install/{ => apps}/webapps.sh (100%)
 rename install/{ => apps}/xtras.sh (100%)
 rename install/{5-config.sh => config/config.sh} (100%)
 rename install/{ => config}/detect-keyboard-layout.sh (100%)
 rename install/{ => config}/fix-fkeys.sh (100%)
 rename install/{3-identification.sh => config/identification.sh} (76%)
 rename install/{ => config}/login.sh (98%)
 rename install/{ => config}/network.sh (100%)
 rename install/{ => config}/nvidia.sh (100%)
 rename install/{ => config}/plymouth.sh (100%)
 rename install/{ => config}/power.sh (100%)
 rename install/{ => config}/theme.sh (100%)
 rename install/{ => desktop}/asdcontrol.sh (100%)
 rename install/{ => desktop}/bluetooth.sh (100%)
 rename install/{ => desktop}/desktop.sh (87%)
 rename install/{ => desktop}/fonts.sh (96%)
 rename install/{ => desktop}/hyprlandia.sh (79%)
 rename install/{ => desktop}/printer.sh (70%)
 rename install/{ => development}/development.sh (72%)
 rename install/{ => development}/docker.sh (100%)
 rename install/{ => development}/firewall.sh (100%)
 rename install/{ => development}/nvim.sh (100%)
 rename install/{ => development}/ruby.sh (100%)
 rename install/{4-terminal.sh => development/terminal.sh} (100%)
 rename install/{1-aur.sh => preflight/aur.sh} (100%)
 create mode 100644 install/preflight/presentation.sh

diff --git a/install.sh b/install.sh
index cb074d5..c4bbc64 100755
--- a/install.sh
+++ b/install.sh
@@ -3,6 +3,8 @@
 # Exit immediately if a command exits with a non-zero status
 set -e
 
+OMARCHY_INSTALL=~/.local/share/omarchy/install/
+
 # Give people a chance to retry running the installation
 catch_errors() {
   echo -e "\n\e[31mOmarchy installation failed!\e[0m"
@@ -12,16 +14,70 @@ catch_errors() {
 
 trap catch_errors ERR
 
-# Install everything
-for f in ~/.local/share/omarchy/install/*.sh; do
-  echo -e "\nRunning installer: $f"
-  source "$f"
-done
+show_logo() {
+  clear
+  tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
+  echo
+}
 
-# Ensure locate is up to date now that everything has been installed
+show_subtext() {
+  echo "$1" | tte --frame-rate ${3:-640} ${2:-wipe}
+  echo
+}
+
+# Install prerequisites
+source $OMARCHY_INSTALL/preflight/aur.sh
+source $OMARCHY_INSTALL/preflight/presentation.sh
+
+# Configuration
+show_logo beams 240
+show_subtext "Let's configure Omarchy! [1/5]"
+source $OMARCHY_INSTALL/config/identification.sh
+source $OMARCHY_INSTALL/config/config.sh
+source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
+source $OMARCHY_INSTALL/config/fix-fkeys.sh
+source $OMARCHY_INSTALL/config/network.sh
+source $OMARCHY_INSTALL/config/power.sh
+source $OMARCHY_INSTALL/config/theme.sh
+source $OMARCHY_INSTALL/config/login.sh
+source $OMARCHY_INSTALL/config/plymouth.sh
+source $OMARCHY_INSTALL/config/nvidia.sh
+
+# Development
+show_logo decrypt 920
+show_subtext "Installing terminal tools [2/10]"
+source $OMARCHY_INSTALL/development/terminal.sh
+source $OMARCHY_INSTALL/development/developmment.sh
+source $OMARCHY_INSTALL/development/nvim.sh
+source $OMARCHY_INSTALL/development/ruby.sh
+source $OMARCHY_INSTALL/development/docker.sh
+source $OMARCHY_INSTALL/development/firewall.sh
+
+# Desktop
+show_logo slice
+show_subtext "Installing desktop tools [3/10]"
+source $OMARCHY_INSTALL/desktop/desktop.sh
+source $OMARCHY_INSTALL/desktop/hyprlandia.sh
+source $OMARCHY_INSTALL/desktop/bluetooth.sh
+source $OMARCHY_INSTALL/desktop/asdcontrol.sh
+source $OMARCHY_INSTALL/desktop/fonts.sh
+source $OMARCHY_INSTALL/desktop/printer.sh
+
+# Apps
+show_logo expand
+show_subtext "Installing default applications [4/5]"
+source $OMARCHY_INSTALL/apps/webapps.sh
+source $OMARCHY_INSTALL/apps/xtras.sh
+source $OMARCHY_INSTALL/apps/mimetypes.sh
+
+# Updates
+show_logo highlight
+show_subtext "Updating system packages [5/5]"
 sudo updatedb
-
-# Update all built-in packages
 sudo pacman -Syu --noconfirm
 
+# Reboot
+show_logo laseretch 920
+show_subtext "You're done! So we'll be rebooting now..."
+sleep 2
 reboot
diff --git a/install/2-presentation.sh b/install/2-presentation.sh
deleted file mode 100644
index 636a769..0000000
--- a/install/2-presentation.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Need gum to query for input
-yay -S --noconfirm --needed gum python-terminaltexteffects
-
-show_logo() {
-  clear
-  tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
-  echo -e ""
-}
-
-show_subtext() {
-  echo "$1" | tte --frame-rate ${3:-640} ${2:-wipe}
-  echo -e ""
-}
diff --git a/install/mimetypes.sh b/install/apps/mimetypes.sh
similarity index 100%
rename from install/mimetypes.sh
rename to install/apps/mimetypes.sh
diff --git a/install/webapps.sh b/install/apps/webapps.sh
similarity index 100%
rename from install/webapps.sh
rename to install/apps/webapps.sh
diff --git a/install/xtras.sh b/install/apps/xtras.sh
similarity index 100%
rename from install/xtras.sh
rename to install/apps/xtras.sh
diff --git a/install/5-config.sh b/install/config/config.sh
similarity index 100%
rename from install/5-config.sh
rename to install/config/config.sh
diff --git a/install/detect-keyboard-layout.sh b/install/config/detect-keyboard-layout.sh
similarity index 100%
rename from install/detect-keyboard-layout.sh
rename to install/config/detect-keyboard-layout.sh
diff --git a/install/fix-fkeys.sh b/install/config/fix-fkeys.sh
similarity index 100%
rename from install/fix-fkeys.sh
rename to install/config/fix-fkeys.sh
diff --git a/install/3-identification.sh b/install/config/identification.sh
similarity index 76%
rename from install/3-identification.sh
rename to install/config/identification.sh
index 859a300..94e9d7b 100644
--- a/install/3-identification.sh
+++ b/install/config/identification.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-show_logo beams 240
-show_subtext "Let's install Omarchy!"
-
 export OMARCHY_USER_NAME=$(gum input --placeholder "Enter full name" --prompt "Name> ")
 export OMARCHY_USER_EMAIL=$(gum input --placeholder "Enter email address" --prompt "Email> ")
diff --git a/install/login.sh b/install/config/login.sh
similarity index 98%
rename from install/login.sh
rename to install/config/login.sh
index a62a08a..b0e268d 100644
--- a/install/login.sh
+++ b/install/config/login.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-show_logo
-show_subtext "Install decryption and boot loader..."
-
 yay -S --noconfirm --needed uwsm
 
 # Compile the seamless login helper -- needed to prevent seeing terminal between loader and desktop
diff --git a/install/network.sh b/install/config/network.sh
similarity index 100%
rename from install/network.sh
rename to install/config/network.sh
diff --git a/install/nvidia.sh b/install/config/nvidia.sh
similarity index 100%
rename from install/nvidia.sh
rename to install/config/nvidia.sh
diff --git a/install/plymouth.sh b/install/config/plymouth.sh
similarity index 100%
rename from install/plymouth.sh
rename to install/config/plymouth.sh
diff --git a/install/power.sh b/install/config/power.sh
similarity index 100%
rename from install/power.sh
rename to install/config/power.sh
diff --git a/install/theme.sh b/install/config/theme.sh
similarity index 100%
rename from install/theme.sh
rename to install/config/theme.sh
diff --git a/install/asdcontrol.sh b/install/desktop/asdcontrol.sh
similarity index 100%
rename from install/asdcontrol.sh
rename to install/desktop/asdcontrol.sh
diff --git a/install/bluetooth.sh b/install/desktop/bluetooth.sh
similarity index 100%
rename from install/bluetooth.sh
rename to install/desktop/bluetooth.sh
diff --git a/install/desktop.sh b/install/desktop/desktop.sh
similarity index 87%
rename from install/desktop.sh
rename to install/desktop/desktop.sh
index 712f6c8..0b2b320 100644
--- a/install/desktop.sh
+++ b/install/desktop/desktop.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-show_logo
-show_subtext "Let's install desktop tools..."
-
 yay -S --noconfirm --needed \
   brightnessctl playerctl pamixer wiremix wireplumber \
   fcitx5 fcitx5-gtk fcitx5-qt wl-clip-persist \
diff --git a/install/fonts.sh b/install/desktop/fonts.sh
similarity index 96%
rename from install/fonts.sh
rename to install/desktop/fonts.sh
index ab4d348..b1a7ea0 100644
--- a/install/fonts.sh
+++ b/install/desktop/fonts.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-show_logo
-show_subtext "Install beautiful fonts..."
-
 if [ -z "$OMARCHY_BARE" ]; then
   yay -S --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
 else
diff --git a/install/hyprlandia.sh b/install/desktop/hyprlandia.sh
similarity index 79%
rename from install/hyprlandia.sh
rename to install/desktop/hyprlandia.sh
index 72bffd4..e5d9368 100644
--- a/install/hyprlandia.sh
+++ b/install/desktop/hyprlandia.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-show_logo
-show_subtext "Installing Hyprland ecosystem..."
-
 yay -S --noconfirm --needed \
   hyprland hyprshot hyprpicker hyprlock hypridle polkit-gnome hyprland-qtutils \
   walker-bin libqalculate waybar mako swaybg swayosd \
diff --git a/install/printer.sh b/install/desktop/printer.sh
similarity index 70%
rename from install/printer.sh
rename to install/desktop/printer.sh
index fc9e671..17b2d31 100644
--- a/install/printer.sh
+++ b/install/desktop/printer.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-show_logo
-show_subtext "Installing printer system..."
-
 sudo pacman -S --noconfirm cups cups-pdf cups-filters system-config-printer
 sudo systemctl enable --now cups.service
diff --git a/install/development.sh b/install/development/development.sh
similarity index 72%
rename from install/development.sh
rename to install/development/development.sh
index 97f9c77..20d8957 100644
--- a/install/development.sh
+++ b/install/development/development.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-show_logo
-show_subtext "Let's install development tools..."
-
 yay -S --noconfirm --needed \
   cargo clang llvm mise \
   imagemagick \
diff --git a/install/docker.sh b/install/development/docker.sh
similarity index 100%
rename from install/docker.sh
rename to install/development/docker.sh
diff --git a/install/firewall.sh b/install/development/firewall.sh
similarity index 100%
rename from install/firewall.sh
rename to install/development/firewall.sh
diff --git a/install/nvim.sh b/install/development/nvim.sh
similarity index 100%
rename from install/nvim.sh
rename to install/development/nvim.sh
diff --git a/install/ruby.sh b/install/development/ruby.sh
similarity index 100%
rename from install/ruby.sh
rename to install/development/ruby.sh
diff --git a/install/4-terminal.sh b/install/development/terminal.sh
similarity index 100%
rename from install/4-terminal.sh
rename to install/development/terminal.sh
diff --git a/install/1-aur.sh b/install/preflight/aur.sh
similarity index 100%
rename from install/1-aur.sh
rename to install/preflight/aur.sh
diff --git a/install/preflight/presentation.sh b/install/preflight/presentation.sh
new file mode 100644
index 0000000..98957ae
--- /dev/null
+++ b/install/preflight/presentation.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+yay -S --noconfirm --needed gum python-terminaltexteffects

From 106641557652435e5ea91233f5421b0a8ed593b1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 16:49:29 -0400
Subject: [PATCH 29/32] Bring back the first art

---
 boot.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/boot.sh b/boot.sh
index dda0289..65c1cac 100755
--- a/boot.sh
+++ b/boot.sh
@@ -1,5 +1,18 @@
 #!/bin/bash
 
+ansi_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
+███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
+███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
+███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
+ ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
+                                          ███    ███                                    '
+
+clear
+echo -e "\n$ansi_art\n"
+
 sudo pacman -Sy --noconfirm --needed git
 
 echo -e "\nCloning Omarchy..."

From d60563fe92b6752674fc84f7d586aba7124a9075 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 16:54:02 -0400
Subject: [PATCH 30/32] Need to happen as part of the destkop

---
 install.sh                           | 2 +-
 install/{config => desktop}/theme.sh | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
 rename install/{config => desktop}/theme.sh (96%)

diff --git a/install.sh b/install.sh
index c4bbc64..cee518a 100755
--- a/install.sh
+++ b/install.sh
@@ -38,7 +38,6 @@ source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
 source $OMARCHY_INSTALL/config/fix-fkeys.sh
 source $OMARCHY_INSTALL/config/network.sh
 source $OMARCHY_INSTALL/config/power.sh
-source $OMARCHY_INSTALL/config/theme.sh
 source $OMARCHY_INSTALL/config/login.sh
 source $OMARCHY_INSTALL/config/plymouth.sh
 source $OMARCHY_INSTALL/config/nvidia.sh
@@ -58,6 +57,7 @@ show_logo slice
 show_subtext "Installing desktop tools [3/10]"
 source $OMARCHY_INSTALL/desktop/desktop.sh
 source $OMARCHY_INSTALL/desktop/hyprlandia.sh
+source $OMARCHY_INSTALL/dekstop/theme.sh
 source $OMARCHY_INSTALL/desktop/bluetooth.sh
 source $OMARCHY_INSTALL/desktop/asdcontrol.sh
 source $OMARCHY_INSTALL/desktop/fonts.sh
diff --git a/install/config/theme.sh b/install/desktop/theme.sh
similarity index 96%
rename from install/config/theme.sh
rename to install/desktop/theme.sh
index c4951e2..12a29ae 100644
--- a/install/config/theme.sh
+++ b/install/desktop/theme.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-show_logo
-show_subtext "Installing themes..."
-
 # Use dark mode for QT apps too (like kdenlive)
 sudo pacman -S --noconfirm kvantum-qt5
 

From 8336788e0a6954a5883a3a9a7837633ba4111f68 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 16:54:51 -0400
Subject: [PATCH 31/32] So 1/5 is right

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index cee518a..9d0b44a 100755
--- a/install.sh
+++ b/install.sh
@@ -31,7 +31,7 @@ source $OMARCHY_INSTALL/preflight/presentation.sh
 
 # Configuration
 show_logo beams 240
-show_subtext "Let's configure Omarchy! [1/5]"
+show_subtext "Let's install Omarchy! [1/5]"
 source $OMARCHY_INSTALL/config/identification.sh
 source $OMARCHY_INSTALL/config/config.sh
 source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh

From f25be1d07546b284785978150e3ebab37133319a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 25 Jul 2025 16:56:53 -0400
Subject: [PATCH 32/32] Fix path

---
 install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 9d0b44a..f393a7f 100755
--- a/install.sh
+++ b/install.sh
@@ -3,7 +3,7 @@
 # Exit immediately if a command exits with a non-zero status
 set -e
 
-OMARCHY_INSTALL=~/.local/share/omarchy/install/
+OMARCHY_INSTALL=~/.local/share/omarchy/install
 
 # Give people a chance to retry running the installation
 catch_errors() {
@@ -46,7 +46,7 @@ source $OMARCHY_INSTALL/config/nvidia.sh
 show_logo decrypt 920
 show_subtext "Installing terminal tools [2/10]"
 source $OMARCHY_INSTALL/development/terminal.sh
-source $OMARCHY_INSTALL/development/developmment.sh
+source $OMARCHY_INSTALL/development/developent.sh
 source $OMARCHY_INSTALL/development/nvim.sh
 source $OMARCHY_INSTALL/development/ruby.sh
 source $OMARCHY_INSTALL/development/docker.sh