diff --git a/scripts/bmenu b/scripts/bmenu
index c793269..8abad08 100755
--- a/scripts/bmenu
+++ b/scripts/bmenu
@@ -8,13 +8,10 @@
 if test "$argv[1]" = "run"
     test -n "$argv[2]" && set t "$argv[2]" || set t "terminal"
 
-    test -n "$i3SOCK" && set wrapper 'i3-msg exec --'
-    test -n "$SWAYSOCK" && set wrapper 'swaymsg exec --'
-
     exec j4-dmenu-desktop \
         --dmenu="bmenu start -p Iniciar:" \
         --term "$t" \
-        --wrapper="$wrapper" \
+        --i3-ipc \
         --no-generic
 end
 
diff --git a/system/locale.nix b/system/locale.nix
index 07e7175..e2c7e81 100644
--- a/system/locale.nix
+++ b/system/locale.nix
@@ -2,7 +2,7 @@
 {
   time.timeZone = "America/Sao_Paulo";
   environment.variables.TZ = config.time.timeZone;
-  i18n.defaultLocale = "pt_BR.utf8";
+  i18n.defaultLocale = "pt_BR.UTF-8";
 
   # Configure keymap in X11
   services.xserver.xkb = {
diff --git a/user/firefox.nix b/user/firefox.nix
index 29d7f07..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 = {
@@ -23,11 +15,10 @@ in
         dev-edition-default = {
           isDefault = true;
           search.force = true;
-          search.default = "DuckDuckGo";
+          search.default = "ddg";
           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