diff --git a/flake.lock b/flake.lock
index f55fab72..32b27ee6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -186,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700847865,
-        "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=",
+        "lastModified": 1706001011,
+        "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe",
+        "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084",
         "type": "github"
       },
       "original": {
diff --git a/modules/bemenu/hm.nix b/modules/bemenu/hm.nix
index f69e7491..564297be 100644
--- a/modules/bemenu/hm.nix
+++ b/modules/bemenu/hm.nix
@@ -26,23 +26,26 @@ in {
   };
 
   config = lib.mkIf config.stylix.targets.bemenu.enable {
-    home.sessionVariables.BEMENU_OPTS = with config.stylix.targets.bemenu; builtins.concatStringsSep " " [
-      # Inspired from https://git.sr.ht/~h4n1/base16-bemenu_opts
-      "--tb '${base01}${bemenuOpacity}'"
-      "--nb '${base01}${bemenuOpacity}'"
-      "--fb '${base01}${bemenuOpacity}'"
-      "--hb '${base03}${bemenuOpacity}'"
-      "--sb '${base03}${bemenuOpacity}'"
-      "--hf '${base0A}'"
-      "--sf '${base0B}'"
-      "--tf '${base05}'"
-      "--ff '${base05}'"
-      "--nf '${base05}'"
-      "--scb '${base01}'"
-      "--scf '${base03}'"
-      "--ab '${if alternate then base00 else base01}'"
-      "--af '${if alternate then base04 else base05}'"
-      "--fn '${sansSerif.name} ${lib.optionalString (fontSize != null) (builtins.toString fontSize)}'" 
-    ];
+    programs.bemenu.settings = with config.stylix.targets.bemenu; {
+      tb = "${base01}${bemenuOpacity}"; # Title bg
+      nb = "${base01}${bemenuOpacity}"; # Normal bg
+      fb = "${base01}${bemenuOpacity}"; # Filter bg
+      hb = "${base03}${bemenuOpacity}"; # Highlighted bg
+      sb = "${base03}${bemenuOpacity}"; # Selected bg
+      scb = "${base01}"; # Scrollbar bg
+
+      hf = "${base0A}"; # Highlighted fg
+      sf = "${base0B}"; # Selected fg
+      tf = "${base05}"; # Title fg
+      ff = "${base05}"; # Filter fg
+      nf = "${base05}"; # Normal fg
+      scf = "${base03}"; # Scrollbar fg
+
+      ab = "${if alternate then base00 else base01}"; # Alternate bg
+      af = "${if alternate then base04 else base05}"; # Alternate fg
+
+      # Font name
+      fn = "${sansSerif.name} ${lib.optionalString (fontSize != null) (builtins.toString fontSize)}";
+    };
   };
 }