diff --git a/install/backgrounds.sh b/install/backgrounds.sh
deleted file mode 100644
index 135c7dc..0000000
--- a/install/backgrounds.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-BACKGROUNDS_DIR=~/.config/omarchy/backgrounds/
-
-download_background_image() {
-  local url="$1"
-  local path="$2"
-  gum spin --title "Downloading $url as $path..." -- curl -sL -o "$BACKGROUNDS_DIR/$path" "$url"
-}
-
-for t in ~/.local/share/omarchy/themes/*; do source "$t/backgrounds.sh"; done
diff --git a/install/theme.sh b/install/theme.sh
index cad2666..9f13fae 100644
--- a/install/theme.sh
+++ b/install/theme.sh
@@ -15,13 +15,13 @@ for f in ~/.local/share/omarchy/themes/*; do ln -s "$f" ~/.config/omarchy/themes
 # Set initial theme
 mkdir -p ~/.config/omarchy/current
 ln -snf ~/.config/omarchy/themes/tokyo-night ~/.config/omarchy/current/theme
-source ~/.local/share/omarchy/themes/tokyo-night/backgrounds.sh
-ln -snf ~/.config/omarchy/backgrounds/tokyo-night ~/.config/omarchy/current/backgrounds
 ln -snf ~/.config/omarchy/current/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg ~/.config/omarchy/current/background
 
 # Set specific app links for current theme
 ln -snf ~/.config/omarchy/current/theme/neovim.lua ~/.config/nvim/lua/plugins/theme.lua
+
 mkdir -p ~/.config/btop/themes
 ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme
+
 mkdir -p ~/.config/mako
 ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config
diff --git a/themes/catppuccin/backgrounds.sh b/themes/catppuccin/backgrounds.sh
deleted file mode 100644
index 8f9dc00..0000000
--- a/themes/catppuccin/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/catppuccin"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/catppuccin/background.png" "catppuccin/1-catppuccin.png"
diff --git a/themes/catppuccin/backgrounds/1-catppuccin.png b/themes/catppuccin/backgrounds/1-catppuccin.png
new file mode 100644
index 0000000..5fbcebc
Binary files /dev/null and b/themes/catppuccin/backgrounds/1-catppuccin.png differ
diff --git a/themes/everforest/backgrounds.sh b/themes/everforest/backgrounds.sh
deleted file mode 100644
index ace1914..0000000
--- a/themes/everforest/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/everforest"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/everforest/background.jpg" "everforest/1-everforest.jpg"
diff --git a/themes/everforest/backgrounds/1-everforest.jpg b/themes/everforest/backgrounds/1-everforest.jpg
new file mode 100644
index 0000000..6d75259
Binary files /dev/null and b/themes/everforest/backgrounds/1-everforest.jpg differ
diff --git a/themes/gruvbox/backgrounds.sh b/themes/gruvbox/backgrounds.sh
deleted file mode 100644
index 7fbb0dd..0000000
--- a/themes/gruvbox/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/gruvbox"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/gruvbox/background.jpg" "gruvbox/1-grubox.jpg"
diff --git a/themes/gruvbox/backgrounds/1-grubox.jpg b/themes/gruvbox/backgrounds/1-grubox.jpg
new file mode 100644
index 0000000..fd31869
Binary files /dev/null and b/themes/gruvbox/backgrounds/1-grubox.jpg differ
diff --git a/themes/kanagawa/backgrounds.sh b/themes/kanagawa/backgrounds.sh
deleted file mode 100644
index 9ce2920..0000000
--- a/themes/kanagawa/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/kanagawa"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/kanagawa/background.jpg" "kanagawa/1-kanagawa.jpg"
diff --git a/themes/kanagawa/backgrounds/1-kanagawa.jpg b/themes/kanagawa/backgrounds/1-kanagawa.jpg
new file mode 100644
index 0000000..197c48d
Binary files /dev/null and b/themes/kanagawa/backgrounds/1-kanagawa.jpg differ
diff --git a/themes/matte-black/backgrounds.sh b/themes/matte-black/backgrounds.sh
deleted file mode 100644
index 4c0c8d8..0000000
--- a/themes/matte-black/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/matte-black"
-download_background_image "https://raw.githubusercontent.com/tahayvr/omarchy-matte-black/refs/heads/main/images/1-matte-black.jpg" "matte-black/1-matte-black.jpg"
diff --git a/themes/matte-black/backgrounds/1-matte-black.jpg b/themes/matte-black/backgrounds/1-matte-black.jpg
new file mode 100644
index 0000000..2afb1bc
Binary files /dev/null and b/themes/matte-black/backgrounds/1-matte-black.jpg differ
diff --git a/themes/nord/backgrounds.sh b/themes/nord/backgrounds.sh
deleted file mode 100644
index b78e084..0000000
--- a/themes/nord/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/nord"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/nord/background.png" "nord/1-nord.png"
diff --git a/themes/nord/backgrounds/1-nord.png b/themes/nord/backgrounds/1-nord.png
new file mode 100644
index 0000000..56dbc1d
Binary files /dev/null and b/themes/nord/backgrounds/1-nord.png differ
diff --git a/themes/tokyo-night/backgrounds.sh b/themes/tokyo-night/backgrounds.sh
deleted file mode 100644
index bccbaa3..0000000
--- a/themes/tokyo-night/backgrounds.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/tokyo-night"
-download_background_image "https://images.unsplash.com/photo-1651870364199-fc5f9f46ac85" "tokyo-night/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg"
-download_background_image "https://images.unsplash.com/photo-1620207418302-439b387441b0" "tokyo-night/2-Milad-Fakurian-Abstract-Purple-Blue.jpg"
diff --git a/themes/tokyo-night/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg b/themes/tokyo-night/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg
new file mode 100644
index 0000000..2767138
Binary files /dev/null and b/themes/tokyo-night/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg differ
diff --git a/themes/tokyo-night/backgrounds/2--Milad-Fakurian-Abstract-Purple-Blue.jpg b/themes/tokyo-night/backgrounds/2--Milad-Fakurian-Abstract-Purple-Blue.jpg
new file mode 100644
index 0000000..b9663ff
Binary files /dev/null and b/themes/tokyo-night/backgrounds/2--Milad-Fakurian-Abstract-Purple-Blue.jpg differ