diff --git a/home/home.nix b/home/home.nix
index 0bd3689..de58e4a 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -85,17 +85,17 @@ in {
         "audio/opus" = "mpv-slow.desktop";
         "audio/x-opus" = "mpv-slow.desktop";
         "audio/x-opus+ogg" = "mpv-slow.desktop";
-        "x-scheme-handler/http" = "librewolf.desktop";
-        "x-scheme-handler/https" = "librewolf.desktop";
-        "text/html" = "librewolf.desktop";
+        "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
+        "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
+        "text/html" = "org.qutebrowser.qutebrowser.desktop";
         "text/org" = "emacsclient.desktop";
         "text/md" = "emacsclient.desktop";
         "text/txt" = "emacsclient.desktop";
         "text/rs" = "emacsclient.desktop";
         "text/plain" = "emacsclient.desktop";
         "application/pdf" = "emacsclient.desktop";
-        "x-scheme-handler/about" = "librewolf.desktop";
-        "x-scheme-handler/unknown" = "librewolf.desktop";
+        "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
+        "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
         "x-scheme-handler/magnet" = "torrent.desktop";
       };
       defaultApplications = {
@@ -124,17 +124,17 @@ in {
         "audio/flac" = "mpv-slow.desktop";
         "audio/wav" = "mpv-slow.desktop";
         "audio/opus" = "mpv-slow.desktop";
-        "x-scheme-handler/http" = "librewolf.desktop";
-        "x-scheme-handler/https" = "librewolf.desktop";
-        "text/html" = "librewolf.desktop";
+        "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
+        "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
+        "text/html" = "org.qutebrowser.qutebrowser.desktop";
         "text/org" = "emacsclient.desktop";
         "text/md" = "emacsclient.desktop";
         "text/txt" = "emacsclient.desktop";
         "text/rs" = "emacsclient.desktop";
         "text/plain" = "emacsclient.desktop";
         "application/pdf" = "emacsclient.desktop";
-        "x-scheme-handler/about" = "librewolf.desktop";
-        "x-scheme-handler/unknown" = "librewolf.desktop";
+        "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
+        "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
         "x-scheme-handler/magnet" = "torrent.desktop";
       };
     };
@@ -152,7 +152,7 @@ in {
 
   services.gpg-agent = {
     enable = true;
-    pinentryPackage = pkgs.pinentry-qt;
+    pinentryPackage = pkgs.pinentry-emacs;
     # extraConfig = ''
     #   pinentry-program ${pkgs.pinentry.qt}/bin/pinentry
     # '';
diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix
index f8dcbfe..752ddd4 100644
--- a/home/modules/hyprland.nix
+++ b/home/modules/hyprland.nix
@@ -209,45 +209,45 @@ in
       # example window rules
       # for windows named/classed as abc and xyz
       windowrule = [
-        "opaque,ff"
+        "opaque, class:ff"
         # if !laptop then "workspace 1,mpv"
-        "float,org.kde.dolphin"
-        "float,thunar"
-        "float,title:dadired"
-        "float,com.system76.CosmicFiles"
-        "float,org.freedesktop.impl.portal.desktop.kde"
-        "float,nm-tray"
-        "size 60% 60%,org.kde.dolphin"
-        "size 60% 60%,thunar"
-        "size 60% 60%,title:dadired"
-        "size 60% 60%,com.system76.CosmicFiles"
-        "size 60% 60%,org.freedesktop.impl.portal.desktop.kde"
-        "float,mpv"
+        "float, class:org.kde.dolphin"
+        "float, class:thunar"
+        "float, class:title:dadired"
+        "float, class:com.system76.CosmicFiles"
+        "float, class:org.freedesktop.impl.portal.desktop.kde"
+        "float, class:nm-tray"
+        "size 60% 60%, class:org.kde.dolphin"
+        "size 60% 60%, class:thunar"
+        "size 60% 60%, title:dadired"
+        "size 60% 60%, class:com.system76.CosmicFiles"
+        "size 60% 60%, class:org.freedesktop.impl.portal.desktop.kde"
+        "float, class:mpv"
         "float,title:Picture-in-Picture"
         "center,title:Picture-in-Picture"
-        "size ${if laptop then "90% 76%" else "85% 85%"},mpv"
-        "${if laptop then "workspace 1,idk #dummy rule" else "workspace 9,mpv"}"
-        "${if laptop then "workspace 1,idk #dummy rule" else "workspace 9,title:Picture-In-Picture"}"
-        "${if laptop then "workspace 1,idk #dummy rule" else "fullscreen,title:Picture-In-Picture"}"
-        "center,mpv"
-        "opaque,mpv"
-        "float,pulsemixer"
-        "workspace 2,ff"
-        "workspace 2,vivaldi-stable"
-        "workspace 2,org.qutebrowser.qutebrowser"
-        "workspace 1,emacs"
-        "float,btop"
-        "size 70% 70%,btop"
-        "center,btop"
-        "float,lumina"
-        "size 80% 80%,lumina"
-        "center,lumina"
-        "opaque,lumina"
-        "float,'org.chriscochrun.lumina'"
-        "size 80% 80%,'org.chriscochrun.lumina'"
-        "center,'org.chriscochrun.lumina'"
-        "opaque,'org.chriscochrun.lumina'"
-        "workspace ${if laptop then "1" else "3"},title:presentation-window"
+        "size ${if laptop then "90% 76%" else "85% 85%"}, class:mpv"
+        "${if laptop then "workspace 1, class:idk #dummy rule" else "workspace 9, class:mpv"}"
+        "${if laptop then "workspace 1, class:idk #dummy rule" else "workspace 9, title:Picture-In-Picture"}"
+        "${if laptop then "workspace 1, class:idk #dummy rule" else "fullscreen, title:Picture-In-Picture"}"
+        "center, class:mpv"
+        "opaque, class:mpv"
+        "float, class:pulsemixer"
+        "workspace 2, class:ff"
+        "workspace 2, class:vivaldi-stable"
+        "workspace 2, class:org.qutebrowser.qutebrowser"
+        "workspace 1, class:emacs"
+        "float, class:btop"
+        "size 70% 70%, class:btop"
+        "center, class:btop"
+        "float, class:lumina"
+        "size 80% 80%, class:lumina"
+        "center, class:lumina"
+        "opaque, class:lumina"
+        "float, class:'org.chriscochrun.lumina'"
+        "size 80% 80%, class:'org.chriscochrun.lumina'"
+        "center, class:'org.chriscochrun.lumina'"
+        "opaque, class:'org.chriscochrun.lumina'"
+        "workspace ${if laptop then "1" else "3"}, title:presentation-window"
       ];
 
       # example binds
@@ -261,7 +261,7 @@ in
         "SUPER,E,exec,/home/chris/bin/emacslof"
         "SUPER,d,exec,emacsclient -c -F '`(name . \"dadired\")' -e '(dired-jump)'"
         "SUPER,v,exec,cliphist list | rofi -p '󱃔 ' -dmenu | cliphist decode | wl-copy"
-        "SUPER,B,exec,/home/chris/bin/fflof"
+        "SUPER,B,exec,/home/chris/bin/qblof"
         "SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer"
         "SUPERCTRL,i,exec,alacritty --class btop -e btop"
         ",Print,exec,screenshot"
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index 1323ceb..d1c28ff 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -34,7 +34,7 @@
     xfce.thunar-archive-plugin
     xfce.xfconf
     zathura
-    # kdePackages.okular
+    kdePackages.okular
     just
     scribus
     # guix
diff --git a/systems/kaladin/configuration.nix b/systems/kaladin/configuration.nix
index 41a1e9d..c9d02c5 100644
--- a/systems/kaladin/configuration.nix
+++ b/systems/kaladin/configuration.nix
@@ -24,7 +24,7 @@
     graphics = {
       enable = true;
       extraPackages = with pkgs; [
-        mesa.drivers
+        mesa
         vaapiVdpau
         libvdpau-va-gl
       ];