diff --git a/user/firefox.nix b/user/firefox.nix
index 3e5c9df..1c891ae 100644
--- a/user/firefox.nix
+++ b/user/firefox.nix
@@ -1,18 +1,10 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }:
 let
-  inherit (config.my) desktop;
   inherit (config.my.theme) color;
-
-  swayCustomization = ''
-    #titlebar { display: none !important; }
-    #TabsToolbar { display: none !important; }
-    #sidebar-header { display: none !important; }
-  '';
 in
 {
   config = {
@@ -27,7 +19,6 @@ in
           settings = {
             "devtools.theme" = "auto";
             "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-            "browser.tabs.inTitlebar" = if desktop == "sway" then 0 else 1;
             "sidebar.position_start" = false; # Move sidebar to the right
 
             # enable media RDD to allow gpu acceleration
@@ -57,8 +48,6 @@ in
             "devtools.debugger.remote-enabled" = true;
           };
           userChrome = ''
-            ${lib.optionalString (desktop == "sway") swayCustomization}
-
             #sidebar-main {
               background-color: ${color.bg};
             }
diff --git a/user/sway/mako.nix b/user/sway/mako.nix
index af6c673..28b5eb4 100644
--- a/user/sway/mako.nix
+++ b/user/sway/mako.nix
@@ -34,12 +34,13 @@ in
 
       defaultTimeout = 10000;
 
-      extraConfig = ''
-        [app-name=volumesh]
-        default-timeout=5000
-        group-by=app-name
-        format=<b>%s</b>\n%b
-      '';
+      settings = {
+        "app-name=volumesh" = {
+          "default-timeout" = "5000";
+          "group-by" = "app-name";
+          "format" = "<b>%s</b>\\n%b";
+        };
+      };
 
       # # {{@@ header() @@}}
       # # text