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-set b/bin/omarchy-theme-set
index 2998fb0..73d61b9 100755
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@@ -25,6 +25,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.marker ]]; 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..d3e83b1
--- /dev/null
+++ b/migrations/1752725616.sh
@@ -0,0 +1,11 @@
+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