3 files changed, 15 insertions, 14 deletions
diff --git a/src/Internal/DMenu.hs b/src/Internal/DMenu.hs
index 850612e..f964544 100644
--- a/src/Internal/DMenu.hs
+++ b/src/Internal/DMenu.hs
@@ -8,6 +8,7 @@ import Data.Map (Map)
 import qualified Data.Map as Map
 import XMonad.Util.Run
 import Data.List (intercalate)
+import Text.Printf (printf)
 
 data Colors =
   Colors {
@@ -17,8 +18,7 @@ data Colors =
 
 runDMenu :: X ()
 runDMenu = void $
-  safeSpawn "dmenu_run" [
-    "-p", "Execute ", "-l", "12", "-dim", "0.4"]
+  safeSpawn "rofi" ["-display-run", "Execute", "-show", "run"]
 
 runDMenuPrompt :: String -> Maybe String -> [String] -> X String
 runDMenuPrompt prompt color select =
@@ -32,8 +32,7 @@ runDMenuPrompt prompt color select =
 
 runDMenuPromptWithMap :: String -> Maybe String -> Map String a -> X (Maybe a)
 runDMenuPromptWithMap prompt color map = do
-  let realColor = maybe [] (\c -> ["-sb", c, "-nf", c]) color
-  menuMapArgs "dmenu"([
-      "-p", prompt,
-      "-l", "12",
-      "-dim", "0.4" ]  ++ realColor) map
+  let realColor = maybe [] (
+          \c -> ["-theme-str", printf "* {theme-color: %s;}" c]) color
+  menuMapArgs "rofi"
+    (["-p", prompt, "-dmenu"] ++ realColor) map
diff --git a/src/Internal/Keys.hs b/src/Internal/Keys.hs
index d4a856c..bf9b62c 100644
--- a/src/Internal/Keys.hs
+++ b/src/Internal/Keys.hs
@@ -68,7 +68,7 @@ keymap = runKeys $ do
     -- something goes wrong with the keyboard layout and for first-time boots
     -- where dmenu/alacritty may not be installed.
     rawMask mod4Mask $ spawn "xterm"
-    justMod $ spawn "pkill -SIGUSR 1 xmobar"
+    justMod $ spawn "pkill -SIGUSR1 xmobar"
 
   bind xK_F1 $ do
     -- Button programmed on mouse
@@ -231,8 +231,12 @@ keymap = runKeys $ do
       bind xK_c $ do
         shiftMod CopyWindow.killAllOtherCopies
 
-      bind xK_e $
+      bind xK_e $ do
         (justMod -|- noMod) $ spawn "emoji-select.sh"
+        (shiftMod -|- rawMask shiftMask) $ spawn "emoticon-select.sh"
+
+      bind xK_a $
+        (justMod -|- noMod) $ spawn "set-sink.sh"
         
 
       -- Double-tap Z to toggle zoom.
diff --git a/src/Internal/PassMenu.hs b/src/Internal/PassMenu.hs
index 7374bed..bb3bc4d 100644
--- a/src/Internal/PassMenu.hs
+++ b/src/Internal/PassMenu.hs
@@ -6,10 +6,8 @@ import Control.Monad
 
 runPassMenu :: X ()
 runPassMenu = void $
-  safeSpawn "passmenu" [
+  safeSpawn "rofi-pass" [
     "-p", "Password ", 
-    "-l", "12",
-    "-dim", "0.4",
-    "-sb", "#f54245",
-    "-nf", "#f54245" ]
+    "-theme-str",
+    "* {theme-color: #f54245;}"]