diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 32c4c45..35a2272 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -76,7 +76,9 @@ lib.mkIf osConfig.programs.hyprland.enable {
       };
       windowrulev2 = [
         "float,initialClass:(com.nextcloud.desktopclient.nextcloud)"
+        "bordercolor rgba(FF0000AA) rgba(88080877),fullscreen:1"
         "float,initialClass:(org.keepassxc.KeePassXC)"
+        "workspace 2,initialClass:(firefox)"
         "workspace 5,initialClass:(lollypop)"
       ];
       # https://wiki.hyprland.org/Configuring/Variables/#animations
diff --git a/home/themes/catppuccin.nix b/home/themes/catppuccin.nix
index 737af4e..a543ad0 100644
--- a/home/themes/catppuccin.nix
+++ b/home/themes/catppuccin.nix
@@ -1,4 +1,8 @@
 { pkgs, ... }:
+let
+  validatePath =
+    s: if (builtins.pathExists s) then (builtins.baseNameOf s) else throw "${s} does not exist";
+in
 rec {
   qt.platformTheme.name = "gtk";
 
@@ -9,16 +13,16 @@ rec {
 
   gtk = {
     enable = true;
-    theme = {
-      name = "Catppuccin-Frappe-Compact-Lavender-Dark";
+    theme = rec {
+      name = validatePath "${package}/share/themes/catppuccin-frappe-lavender-compact+default";
       package = pkgs.catppuccin-gtk.override {
         accents = [ "lavender" ];
         size = "compact";
         variant = "frappe";
       };
     };
-    iconTheme = {
-      name = "Papirus-Dark";
+    iconTheme = rec {
+      name = validatePath "${package}/share/icons/Papirus-Dark";
       package = pkgs.catppuccin-papirus-folders.override {
         accent = "lavender";
         flavor = "frappe";