diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index 1905aeb..228d6c4 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -45,25 +45,6 @@ in {
       };
     };
 
-    favIcons = mkOption {
-      description = "Your favourite icons pack";
-      default = {};
-      type = types.submodule {
-        options = {
-          name = mkOption {
-            type = types.str;
-            default = "Papirus-Dark";
-            description = "Name of your icon pack";
-          };
-          package = mkOption {
-            type = types.package;
-            default = pkgs.papirus-icon-theme;
-            description = "Package for your icon pack";
-          };
-        };
-      };
-    };
-
     bluetooth = mkOption {
       type = types.bool;
       default = false;
@@ -537,11 +518,19 @@ in {
     gtk = {
       enable = lib.mkDefault true;
       iconTheme = {
-        package = lib.mkDefault cfg.favIcons.package;
-        name = lib.mkDefault cfg.favIcons.name;
+        package = lib.mkDefault pkgs.papirus-icon-theme;
+        name = lib.mkDefault "Papirus-Dark";
       };
     };
 
+    home.pointerCursor = {
+      package = lib.mkDefault pkgs.gnome.adwaita-icon-theme;
+      name = lib.mkDefault "Adwaita";
+      size = lib.mkDefault 24;
+      x11.enable = lib.mkDefault true;
+      gtk.enable = lib.mkDefault true;
+    };
+
     qt = {
       enable = lib.mkDefault true;
       platformTheme = lib.mkDefault "gtk";
diff --git a/modules/ezpc.nix b/modules/ezpc.nix
index ffaefb6..dc4e011 100644
--- a/modules/ezpc.nix
+++ b/modules/ezpc.nix
@@ -44,7 +44,17 @@ in {
       vt = 1;
       settings = {
         default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd sway";
+          # command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd sway";
+          command = let
+            swayGreeterConfig = pkgs.writeText "sway-greeter-config" ''
+              exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c sway; swaymsg exit"
+              bindsym Mod4+shift+e exec swaynag \
+                -t warning \
+                -m 'What do you want to do?' \
+                -b 'Poweroff' 'systemctl poweroff' \
+                -b 'Reboot' 'systemctl reboot'
+            '';
+          in "${pkgs.sway}/bin/sway --config ${swayGreeterConfig}";
         };
       };
     };