diff --git a/modules/home/wayland/apps/dunst/default.nix b/modules/home/wayland/apps/dunst/default.nix
index 3fda2c0..be6b83d 100755
--- a/modules/home/wayland/apps/dunst/default.nix
+++ b/modules/home/wayland/apps/dunst/default.nix
@@ -12,8 +12,10 @@
           width = "350";
           scale = "0";
           origin = "top-right";
-          offset =
-            "${config.colorScheme.palette.gaps-bar}x${config.colorScheme.palette.gaps-screen}";
+          offset = "${
+              toString ((lib.strings.toInt config.colorScheme.palette.gaps-bar)
+                + (lib.strings.toInt config.colorScheme.palette.gaps-screen))
+            }x${config.colorScheme.palette.gaps-screen}";
           notification_limit = "0";
           progress_bar = "true";
           progress_bar_height = "10";
diff --git a/modules/home/wayland/hyprland/config.nix b/modules/home/wayland/hyprland/config.nix
index 46ca372..170dbec 100755
--- a/modules/home/wayland/hyprland/config.nix
+++ b/modules/home/wayland/hyprland/config.nix
@@ -137,11 +137,11 @@
         windowrulev2 = float,title:^(File Operation Progress)$
         windowrulev2 = float,class:^(firefox)$,title:^(Picture-in-Picture)$
         windowrulev2 = pin,class:^(firefox)$,title:^(Picture-in-Picture)$
-        windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Picture-in-Picture)$
+        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Picture-in-Picture)$
         windowrulev2 = float,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
-        windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
+        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
         windowrulev2 = float,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
-        windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
+        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
         windowrulev2 = float,class:^(org.telegram.desktop)$,title:^(Media viewer)$
         windowrulev2 = center,class:^(org.telegram.desktop)$,title:^(Media viewer)$