diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix
index 5ae6324..9a222b2 100644
--- a/instances/odin/common_configuration.nix
+++ b/instances/odin/common_configuration.nix
@@ -97,12 +97,12 @@
     xserver = {
       enable = true;
       # Enable the GNOME 3 Desktop Environment.
-      # desktopManager.gnome.enable = true;
+      desktopManager.gnome.enable = true;
       # desktopManager.plasma5 = {
       #   enable = true;
       #   runUsingSystemd = true;
       # };
-      windowManager.bspwm.enable = true;
+      # windowManager.bspwm.enable = true;
 
       # Configure keymap in X11
       layout = "it,us";
diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix
index 25ab720..fb542b9 100644
--- a/instances/odin/hm.nix
+++ b/instances/odin/hm.nix
@@ -100,7 +100,7 @@
     ../../modules/hm/biblio.nix
     ../../modules/hm/bitwarden.nix
     ../../modules/hm/blender.nix
-    ../../modules/hm/bspwm.nix
+    # ../../modules/hm/bspwm.nix
     ../../modules/hm/cava.nix
     ../../modules/hm/dunst.nix
     # ../../modules/hm/dwarf-fortress.nix
diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix
index 73f7d5e..2f12209 100644
--- a/instances/thor/hm.nix
+++ b/instances/thor/hm.nix
@@ -88,7 +88,7 @@
     ../../modules/hm/biblio.nix
     ../../modules/hm/bitwarden.nix
     ../../modules/hm/blender_nvidia.nix
-    ../../modules/hm/bspwm.nix
+    # ../../modules/hm/bspwm.nix
     ../../modules/hm/cava.nix
     ../../modules/hm/dunst.nix
     # ../../modules/hm/dwarf-fortress.nix
@@ -119,7 +119,6 @@
     ../../modules/hm/office.nix
     ../../modules/hm/pass.nix
     ../../modules/hm/picom.nix
-    ../../modules/hm/polybar.nix
     # ../../modules/hm/pro_audio.nix
     # ../../modules/hm/pycharm.nix
     ../../modules/hm/research.nix
diff --git a/modules/hm/hyprland.nix b/modules/hm/hyprland.nix
index a0d1f0e..a7e4f0f 100644
--- a/modules/hm/hyprland.nix
+++ b/modules/hm/hyprland.nix
@@ -12,6 +12,12 @@
 
   # wayland.windowManager.hyprland = { };
 
+  systemd.user.targets."hyprland-login".Unit = {
+    Description = "User Graphical Login";
+    Requires = [ "graphical-session.target" ];
+    After = [ "graphical-session.target" ];
+  };
+
   xdg.configFile."hypr/hyprland.conf".text =
     let
       strPalette = pkgs.lib.nix-rice.palette.toRgbaShortHex pkgs.rice.colorPalette;
@@ -49,7 +55,7 @@
       # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
       # Execute your favorite apps at launch
-      exec-once = ${if nixosConfig.networking.hostName == "thor" then "xrandr --output DP-2 --primary" else "true"} & waybar & swww init & blueman-applet & nm-applet & systemctl --user restart swayidle wl-update-background easyeffects kdeconnect kdeconnect-indicator # & firefox
+      exec-once = ${if nixosConfig.networking.hostName == "thor" then "xrandr --output DP-2 --primary" else "true"} & waybar & swww init & systemctl --user start hyprland-login
 
       # Source a file (multi-file configs)
       # source = ~/.config/hypr/myColors.conf