diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 6f91e9c..2846775 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -54,7 +54,7 @@ in {
   gtk = {
     enable = true;
     theme = {
-      name = "Adwaita-dark";
+      name = if config.omarchy.theme == "generated_light" then "Adwaita" else "Adwaita:dark";
       package = pkgs.gnome-themes-extra;
     };
   };
diff --git a/modules/home-manager/hyprland/envs.nix b/modules/home-manager/hyprland/envs.nix
index 0fd76c7..accbe06 100644
--- a/modules/home-manager/hyprland/envs.nix
+++ b/modules/home-manager/hyprland/envs.nix
@@ -48,7 +48,7 @@ in {
         "EDITOR,nvim"
         
         # GTK theme
-        "GTK_THEME,Adwaita:dark"
+        "GTK_THEME,${if cfg.theme == "generated_light" then "Adwaita" else "Adwaita:dark"}"
 
         # Podman compatibility. Probably need to add cfg.env?
         # "DOCKER_HOST,unix://$XDG_RUNTIME_DIR/podman/podman.sock"
diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
index fe7a242..ee4141c 100644
--- a/modules/home-manager/waybar.nix
+++ b/modules/home-manager/waybar.nix
@@ -143,14 +143,14 @@ in {
           format-disabled = "󰂲";
           format-connected = "";
           tooltip-format = "Devices connected: {num_connections}";
-          on-click = "GTK_THEME=Adwaita-dark blueberry";
+          on-click = "blueberry";
         };
         wireplumber = {
           # Changed from "pulseaudio"
           "format" = "";
           format-muted = "󰝟";
           scroll-step = 5;
-          on-click = "GTK_THEME=Adwaita-dark pavucontrol";
+          on-click = "pavucontrol";
           tooltip-format = "Playing at {volume}%";
           on-click-right = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; # Updated command
           max-volume = 150; # Optional: allow volume over 100%