diff --git a/mybindings.lua b/mybindings.lua
index 08eb34c..590b4a1 100644
--- a/mybindings.lua
+++ b/mybindings.lua
@@ -165,8 +165,7 @@ local myglobalkeys = awful.util.table.join(
 	awful.key({ modkey }, "x", binder.spawn("dmxrandr")),
 	awful.key({ modkey, "Shift" }, "x", binder.spawn("xd --dmenu")),
 	awful.key({ modkey }, "z", binder.spawn("dmumount")),
-	--awful.key({ modkey }, "p", nil, binder.spawn("passmenu --type")),
-	awful.key({ modkey }, "p", nil, binder.spawn("rofi-rbw")),
+	awful.key({ modkey }, "p", nil, binder.spawn("passmenu --type")),
 	awful.key({ modkey, "Shift" }, "p", binder.spawn("rofi-pass")),
 
 	--}}}
@@ -190,7 +189,7 @@ local myglobalkeys = awful.util.table.join(
 	awful.key({}, "XF86Display", mb.grabf({ keymap = displaymap, name = "Rotate" })),
 
 	awful.key({ modkey }, "e", binder.spawn("rofi -show emoji")),
-	--awful.key({}, "Num_Lock", lockhl("Num", true)),
+	awful.key({}, "Num_Lock", lockhl("Num", true)),
 	awful.key({}, "Caps_Lock", lockhl("Caps"))
 
 	--}}}
diff --git a/rules.lua b/rules.lua
index 0137cc3..64a00a7 100644
--- a/rules.lua
+++ b/rules.lua
@@ -61,7 +61,6 @@ awful.rules.rules = {
 		callback = function(c)
 			if startswith(c["class"], "steam_app_") then
 				keyboard_layer(3)(c)
-				c.fullscreen = true
 			end
 			log("-----------\nnew client\n")
 			if c["name"] ~= nil then
@@ -131,13 +130,9 @@ awful.rules.rules = {
 		rule = { class = "TelegramDesktop", name = "Media viewer" },
 		properties = { size_hints_honor = true, floating = true, fullscreen = true },
 	},
-	{
-		rule_any = { class = { "Jellyfin Media Player" }, name = { "jellyfinmediaplayer" } },
-		properties = { size_hints_honor = true, fullscreen = true },
-	},
 	{ rule_any = { role = { "conversation" }, instance = { "Weechat" } }, callback = awful.client.setslave },
 	{ rule = { class = "Irssi" }, properties = { tag = "3" }, callback = awful.client.setslave },
-	{ rule_any = { instance = { "Gmutt" }, name = { "Gmutt" } }, properties = { tag = "4" } },
+	{ rule_any = { instance = { "Gmutt" }, name = { "Gmutt" } }, properties = { tag = "4", screen = screen_mail } },
 	{ rule_any = { class = { "Gmpc", "Spotify" } }, properties = { tag = "6" } },
 	{ rule = { class = "Pdfpc" }, properties = { size_hints_honor = true, floating = true, fullscreen = true } },
 	{
diff --git a/separable/binder.lua b/separable/binder.lua
index 1cf5fa0..92c2a35 100644
--- a/separable/binder.lua
+++ b/separable/binder.lua
@@ -15,6 +15,9 @@ local app_folders = {
 	(os.getenv("XDG_DATA_HOME") or os.getenv("HOME") .. "/.local/share") .. "/applications",
 	os.getenv("HOME") .. "/Desktop",
 }
+local menubar = require("menubar")
+
+menubar.utils.terminal = conf.cmd.terminal -- Set the terminal for applications that require it
 
 local binder = { modal = mb }
 
@@ -200,7 +203,7 @@ local clientkeys = awful.util.table.join(
 				c["class"],
 				c["instance"],
 				c["type"],
-				c["pid"] or -1
+				c["pid"]
 			),
 		})
 	end)