diff --git a/applications/blueberry.desktop b/applications/blueberry.desktop
deleted file mode 100644
index 3b4d87a..0000000
--- a/applications/blueberry.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Bluetooth
-Comment=Configure Bluetooth settings
-Icon=bluetooth
-Exec=env GTK_THEME=Adwaita-dark blueberry
-Terminal=false
-Type=Application
-Categories=GTK;GNOME;Settings;HardwareSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
-StartupNotify=true
-NotShowIn=GNOME;KDE;Unity;
diff --git a/applications/org.pulseaudio.pavucontrol.desktop b/applications/org.pulseaudio.pavucontrol.desktop
deleted file mode 100644
index 16fb180..0000000
--- a/applications/org.pulseaudio.pavucontrol.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Volume Control
-Comment=Adjust the volume level
-Exec=env GTK_THEME=Adwaita-dark pavucontrol
-Icon=multimedia-volume-control
-StartupNotify=true
-Type=Application
-Categories=AudioVideo;Audio;Mixer;GTK;Settings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
-Keywords=pavucontrol;PulseAudio;Microphone;Volume;Fade;Balance;Headset;Speakers;Headphones;Audio;Mixer;Output;Input;Devices;Playback;Recording;System Sounds;Sound Card;Settings;Preferences;
diff --git a/bin/omarchy-theme-menu b/bin/omarchy-theme-menu
index 70a32c6..63c3c94 100755
--- a/bin/omarchy-theme-menu
+++ b/bin/omarchy-theme-menu
@@ -23,7 +23,7 @@ selection=$(printf '%s\n' "${themes[@]}" | wofi \
   --show dmenu \
   --allow-markup \
   --width 150 \
-  --height 300 \
+  --height 400 \
   -O alphabetical \
   --style ~/.config/wofi/select.css 2>/dev/null)
 
diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set
index 2998fb0..06160b9 100755
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@@ -13,7 +13,12 @@ CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
 
 THEME_NAME="$1"
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
-BACKGROUND_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME"
+
+if [[ -d "$HOME/.config/omarchy/themes/$THEME_NAME/backgrounds" ]]; then
+  BACKGROUND_PATH="$HOME/.config/omarchy/themes/$THEME_NAME/backgrounds"
+else
+  BACKGROUND_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME"
+fi
 
 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
@@ -25,6 +30,15 @@ fi
 ln -nsf "$BACKGROUND_PATH" "$HOME/.config/omarchy/current/backgrounds"
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
+# Change gnome modes
+if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
+else
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+fi
+
 # Trigger alacritty config reload
 touch "$HOME/.config/alacritty/alacritty.toml"
 
diff --git a/config/waybar/config b/config/waybar/config
index 47607a7..ed56d8a 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -92,11 +92,11 @@
     "format-disabled": "󰂲",
     "format-connected": "",
     "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "GTK_THEME=Adwaita-dark blueberry"
+    "on-click": "blueberry"
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
+    "on-click": "pavucontrol",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
diff --git a/migrations/1752725616.sh b/migrations/1752725616.sh
new file mode 100644
index 0000000..5dddefe
--- /dev/null
+++ b/migrations/1752725616.sh
@@ -0,0 +1,15 @@
+echo "Make light themes possible"
+if [[ -f ~/.local/share/applications/blueberry.desktop ]]; then
+  rm -f ~/.local/share/applications/blueberry.desktop
+  rm -f ~/.local/share/applications/org.pulseaudio.pavucontrol.desktop
+  update-desktop-database ~/.local/share/applications/
+
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+
+  omarchy-refresh-waybar
+fi
+
+if [[ ! -L "~/.config/omarchy/themes/rose-pine" ]]; then
+  ln -snf ~/.local/share/omarchy/themes/rose-pine ~/.config/omarchy/themes/
+fi
diff --git a/themes/rose-pine/alacritty.toml b/themes/rose-pine/alacritty.toml
new file mode 100644
index 0000000..947e42d
--- /dev/null
+++ b/themes/rose-pine/alacritty.toml
@@ -0,0 +1,72 @@
+[colors.primary]
+foreground = "#575279"
+background = "#faf4ed"
+dim_foreground = "#797593"
+bright_foreground = "#575279"
+
+[colors.cursor]
+text = "#575279"
+cursor = "#cecacd"
+
+[colors.vi_mode_cursor]
+text = "#575279"
+cursor = "#cecacd"
+
+[colors.search.matches]
+foreground = "#797593"
+background = "#f2e9e1"
+
+[colors.search.focused_match]
+foreground = "#faf4ed"
+background = "#d7827e"
+
+[colors.hints.start]
+foreground = "#797593"
+background = "#fffaf3"
+
+[colors.hints.end]
+foreground = "#9893a5"
+background = "#fffaf3"
+
+[colors.line_indicator]
+foreground = "None"
+background = "None"
+
+[colors.footer_bar]
+foreground = "#575279"
+background = "#fffaf3"
+
+[colors.selection]
+text = "#575279"
+background = "#dfdad9"
+
+[colors.normal]
+black = "#f2e9e1"
+red = "#b4637a"
+green = "#286983"
+yellow = "#ea9d34"
+blue = "#56949f"
+magenta = "#907aa9"
+cyan = "#d7827e"
+white = "#575279"
+
+[colors.bright]
+black = "#9893a5"
+red = "#b4637a"
+green = "#286983"
+yellow = "#ea9d34"
+blue = "#56949f"
+magenta = "#907aa9"
+cyan = "#d7827e"
+white = "#575279"
+
+[colors.dim]
+black = "#9893a5"
+red = "#b4637a"
+green = "#286983"
+yellow = "#ea9d34"
+blue = "#56949f"
+magenta = "#907aa9"
+cyan = "#d7827e"
+white = "#575279"
+
diff --git a/themes/rose-pine/backgrounds/background.jpg b/themes/rose-pine/backgrounds/background.jpg
new file mode 100644
index 0000000..adfe242
Binary files /dev/null and b/themes/rose-pine/backgrounds/background.jpg differ
diff --git a/themes/rose-pine/btop.theme b/themes/rose-pine/btop.theme
new file mode 100644
index 0000000..a992faa
--- /dev/null
+++ b/themes/rose-pine/btop.theme
@@ -0,0 +1,119 @@
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#faf4ed"
+# Base
+
+# Main text color
+theme[main_fg]="#575279"
+# Text
+
+# Title color for boxes
+theme[title]="#908caa"
+# Subtle
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#e0def4"
+# Text
+
+# Background color of selected item in processes box
+theme[selected_bg]="#524f67"
+# HL High
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#f6c177"
+# Gold
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#403d52"
+# HL Med
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="#9ccfd8"
+# Foam
+
+# Background color of the percentage meters
+theme[meter_bg]="#9ccfd8"
+# Foam
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#c4a7e7"
+# Iris
+
+# Cpu box outline color
+theme[cpu_box]="#ebbcba"
+# Rose
+
+# Memory/disks box outline color
+theme[mem_box]="#31748f"
+# Pine
+
+# Net up/down box outline color
+theme[net_box]="#c4a7e7"
+# Iris
+
+# Processes box outline color
+theme[proc_box]="#eb6f92"
+# Love
+
+# Box divider line and small boxes line color
+theme[div_line]="#6e6a86"
+# Muted
+
+# Temperature graph colors
+theme[temp_start]="#ebbcba"
+# Rose
+theme[temp_mid]="#f6c177"
+# Gold
+theme[temp_end]="#eb6f92"
+# Love
+
+# CPU graph colors
+theme[cpu_start]="#f6c177"
+# Gold
+theme[cpu_mid]="#ebbcba"
+# Rose
+theme[cpu_end]="#eb6f92"
+# Love
+
+# Mem/Disk free meter
+# all love
+theme[free_start]="#eb6f92"
+theme[free_mid]="#eb6f92"
+theme[free_end]="#eb6f92"
+
+# Mem/Disk cached meter
+# all iris
+theme[cached_start]="#c4a7e7"
+theme[cached_mid]="#c4a7e7"
+theme[cached_end]="#c4a7e7"
+
+# Mem/Disk available meter
+# all pine
+theme[available_start]="#31748f"
+theme[available_mid]="#31748f"
+theme[available_end]="#31748f"
+
+# Mem/Disk used meter
+# all rose
+theme[used_start]="#ebbcba"
+theme[used_mid]="#ebbcba"
+theme[used_end]="#ebbcba"
+
+# Download graph colors
+# Pine for start, foam for the rest
+theme[download_start]="#31748f"
+theme[download_mid]="#9ccfd8"
+theme[download_end]="#9ccfd8"
+
+# Upload graph colors
+theme[upload_start]="#ebbcba"
+# Rose for start
+theme[upload_mid]="#eb6f92"
+# Love for mid and end
+theme[upload_end]="#eb6f92"
+
+# Process box color gradient for threads, mem and cpu usage
+theme[process_start]="#31748f"
+# Pine
+theme[process_mid]="#9ccfd8"
+# Foam for mid and end
+theme[process_end]="#9ccfd8"
diff --git a/themes/rose-pine/hyprland.conf b/themes/rose-pine/hyprland.conf
new file mode 100644
index 0000000..c39b9e7
--- /dev/null
+++ b/themes/rose-pine/hyprland.conf
@@ -0,0 +1,4 @@
+general {
+    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
+    col.active_border = rgb(575279)
+}
diff --git a/themes/rose-pine/hyprlock.conf b/themes/rose-pine/hyprlock.conf
new file mode 100644
index 0000000..097ff5c
--- /dev/null
+++ b/themes/rose-pine/hyprlock.conf
@@ -0,0 +1,9 @@
+$color = rgba(250, 244, 237,1.0)
+
+$inner_color = rgba(250, 244, 237,0.8)
+$outer_color = rgba(57,52,79,1.0)
+
+$font_color = rgba(57,52,79,1.0)
+
+$placeholder_color = rgba(216,222,233,0.6)
+$check_color = rgba(136, 192, 208, 1.0)
diff --git a/themes/rose-pine/light.mode b/themes/rose-pine/light.mode
new file mode 100644
index 0000000..66bb2d0
--- /dev/null
+++ b/themes/rose-pine/light.mode
@@ -0,0 +1 @@
+# This will set "prefer-light" and use "Adwaita" as the theme
diff --git a/themes/rose-pine/mako.ini b/themes/rose-pine/mako.ini
new file mode 100644
index 0000000..cab1a2e
--- /dev/null
+++ b/themes/rose-pine/mako.ini
@@ -0,0 +1,21 @@
+text-color=#575279
+border-color=#575279
+background-color=#faf4ed
+width=420
+height=110
+padding=10
+border-size=2
+font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
+max-icon-size=32
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
diff --git a/themes/rose-pine/neovim.lua b/themes/rose-pine/neovim.lua
new file mode 100644
index 0000000..591e8c7
--- /dev/null
+++ b/themes/rose-pine/neovim.lua
@@ -0,0 +1,9 @@
+return {
+	{ "rose-pine/neovim", name = "rose-pine" },
+	{
+		"LazyVim/LazyVim",
+		opts = {
+			colorscheme = "rose-pine-dawn",
+		},
+	},
+}
diff --git a/themes/rose-pine/waybar.css b/themes/rose-pine/waybar.css
new file mode 100644
index 0000000..d2e5942
--- /dev/null
+++ b/themes/rose-pine/waybar.css
@@ -0,0 +1,2 @@
+@define-color foreground #575279;
+@define-color background #faf4ed;
diff --git a/themes/rose-pine/wofi.css b/themes/rose-pine/wofi.css
new file mode 100644
index 0000000..51bf573
--- /dev/null
+++ b/themes/rose-pine/wofi.css
@@ -0,0 +1,4 @@
+@define-color	selected-text  #88C0D0;
+@define-color	text  #575279;
+@define-color	base  #faf4ed;
+@define-color	border  #575279;