diff --git a/home/toph/common/optional/hyprland/default.nix b/home/toph/common/optional/hyprland/default.nix
index 9f7504d..558a244 100644
--- a/home/toph/common/optional/hyprland/default.nix
+++ b/home/toph/common/optional/hyprland/default.nix
@@ -11,30 +11,40 @@
 
   wayland.windowManager.hyprland = {
     enable = true;
-    # withUWSM = true; # One day, but not today
+    systemd.enable = false; # using withUWSM
+    package = null;
+    portalPackage = null;
 
-    systemd = {
-      enable = true;
-      variables = [ "--all" ];
-      extraCommands = lib.mkBefore [
-        "systemctl --user stop graphical-session.target"
-        "systemctl --user start hyprland-session.target"
-      ];
-    };
+    # systemd = {
+    #   enable = true;
+    #   variables = [ "--all" ];
+    #   extraCommands = lib.mkBefore [
+    #     "systemctl --user stop graphical-session.target"
+    #     "systemctl --user start hyprland-session.target"
+    #   ];
+    # };
 
     settings = {
       ##  Environment Vars ##
       env = [
+        "NIXOS_XDG_OPEN_USE_PORTAL, 1" # for xdg-open to use portal
         "NIXOS_OZONE_WL, 1" # for ozone-based and electron apps to run on wayland
         "MOZ_ENABLE_WAYLAND, 1" # for firefox to run on wayland
         "MOZ_WEBRENDER, 1" # for firefox to run on wayland
         "XDG_SESSION_TYPE,wayland"
+        "XDG_SESSION_DESKTOP,Hyprland"
+        "XDG_CURRENT_DESKTOP,Hyprland"
         "WLR_NO_HARDWARE_CURSORS,1"
         "WLR_RENDERER_ALLOW_SOFTWARE,1"
         "QT_QPA_PLATFORM,wayland"
+        "GTK_USE_PORTAL,1"
         "HYPRCURSOR_THEME,rose-pine-hyprcursor" # this will be better than default for now
       ];
 
+      xwayland = {
+        force_zero_scaling = true;
+      };
+
       ## Monitor ##
 
       monitor = (
diff --git a/home/toph/rune/default.nix b/home/toph/rune/default.nix
index 6acc0fc..6d77e38 100644
--- a/home/toph/rune/default.nix
+++ b/home/toph/rune/default.nix
@@ -42,6 +42,9 @@
       ## Productivity ##
       gimp
       inkscape
+
+      xdg-desktop-portal-gtk
+      xdg-desktop-portal-hyprland
       ;
   };
 
diff --git a/hosts/common/optional/hyprland/default.nix b/hosts/common/optional/hyprland/default.nix
index 1b2072d..90af817 100644
--- a/hosts/common/optional/hyprland/default.nix
+++ b/hosts/common/optional/hyprland/default.nix
@@ -10,7 +10,7 @@
 
   programs.hyprland = {
     enable = true;
-    # withUWSM = true; # One day, but not today
+    withUWSM = true;
   };
 
   environment.systemPackages = [
diff --git a/hosts/common/optional/hyprland/greetd.nix b/hosts/common/optional/hyprland/greetd.nix
index 9da1b4f..6d4b812 100644
--- a/hosts/common/optional/hyprland/greetd.nix
+++ b/hosts/common/optional/hyprland/greetd.nix
@@ -13,11 +13,12 @@
 let
   hostSpec = config.hostSpec.username;
   default = {
-    command = "${pkgs.greetd.tuigreet}/bin/tuigreet --asterisks --time --time-format '%I:%M %p | %a • %h | %F' --cmd Hyprland";
+    command = "${pkgs.greetd.tuigreet}/bin/tuigreet --asterisks --time --time-format '%I:%M %p | %a • %h | %F' --cmd uwsm start hyprland.desktop";
     user = "toph";
   };
   initial = {
-    command = "${pkgs.hyprland}/bin/Hyprland";
+    # command = "${pkgs.hyprland}/bin/Hyprland";
+    command = "uwsm start hyprland.desktop";
     user = "toph";
   };
 in
diff --git a/hosts/common/optional/hyprland/wayland.nix b/hosts/common/optional/hyprland/wayland.nix
index 03c69f8..d9568fd 100644
--- a/hosts/common/optional/hyprland/wayland.nix
+++ b/hosts/common/optional/hyprland/wayland.nix
@@ -14,9 +14,9 @@
     xdgOpenUsePortal = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal-hyprland
+      # pkgs.xdg-desktop-portal-hyprland
     ];
-    configPackages = [ pkgs.hyprland ];
-    config.common.default = "*";
+    # configPackages = [ pkgs.hyprland ];
+    # config.common.default = "*";
   };
 }