diff --git a/config/graphical/default.nix b/config/graphical/default.nix
index 938cdab..68511fb 100644
--- a/config/graphical/default.nix
+++ b/config/graphical/default.nix
@@ -44,20 +44,20 @@ in
     services.dbus.packages = [ pkgs.gcr ];
 
     xdg.portal = {
-      wlr.enable = true;
       enable = true;
       xdgOpenUsePortal = true;
       config.common = {
         default = [
-          "wlr"
           "gtk"
+          "hyprland"
         ];
         "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
-        "org.freedesktop.impl.portal.ScreenCast" = [ "xdg-desktop-portal-wlr" ];
-        "org.freedesktop.impl.portal.Screenshot" = [ "xdg-desktop-portal-wlr" ];
+        "org.freedesktop.impl.portal.ScreenCast" = [ "hyprland" ];
+        "org.freedesktop.impl.portal.Screenshot" = [ "hyprland" ];
         "org.freedesktop.portal.FileChooser" = [ "xdg-desktop-portal-gtk" ];
       };
       extraPortals = [
+        pkgs.xdg-desktop-portal-hyprland
         pkgs.xdg-desktop-portal-gtk
       ];
     };
diff --git a/users/myuser/default.nix b/users/myuser/default.nix
index a7efcd7..f31bf81 100644
--- a/users/myuser/default.nix
+++ b/users/myuser/default.nix
@@ -63,8 +63,8 @@ lib.optionalAttrs (!minimal) {
     # Autostart hyprland if on tty1 (once, don't restart after logout)
     programs.zsh.initExtra = lib.mkOrder 9999 ''
       if [[ -t 0 && "$(tty || true)" == /dev/tty1 && -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" ]] && uwsm check may-start; then
-        echo "Login shell detected. Starting sway..."
-        uwsm start -S -F sway
+        echo "Login shell detected. Starting Hyprland..."
+        uwsm start -S -F Hyprland
       fi
     '';
   };
diff --git a/users/myuser/graphical/sway.nix b/users/myuser/graphical/sway.nix
index 9da63f4..eb60fb5 100644
--- a/users/myuser/graphical/sway.nix
+++ b/users/myuser/graphical/sway.nix
@@ -145,7 +145,7 @@ in
 
         assigns = {
           "1" = [
-            { class = "^firefox$"; }
+            { app_id = "firefox"; }
           ];
           "5" = [
             { class = "^bottles$"; }
diff --git a/users/myuser/graphical/waybar.nix b/users/myuser/graphical/waybar.nix
index 8067932..e7b4af8 100644
--- a/users/myuser/graphical/waybar.nix
+++ b/users/myuser/graphical/waybar.nix
@@ -14,14 +14,14 @@
       height = 28;
 
       modules-left = [
-        "sway/workspaces"
+        "hyprland/workspaces"
         "tray"
-        "sway/mode"
+        "hyprland/submap"
         "privacy"
         #"custom/whisper_overlay"
       ];
       modules-center = [
-        "sway/window"
+        "hyprland/window"
       ];
       modules-right = [
         "custom/scan_qr"