diff --git a/desktop.nix b/desktop.nix
index 8d40eb8..a2d6689 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -86,6 +86,8 @@ in {
     keyboard:usb:*
     evdev:input:*
       KEYBOARD_KEY_700E7=rightctrl # Super_R -> Control_R
+      KEYBOARD_KEY_7B=leftalt # Muhenkan -> Alt_R
+      KEYBOARD_KEY_38=muhenkan # Alt_R -> Muhenkan
   '';
 
   services.xserver.displayManager.lightdm = {
diff --git a/etc/xmonad.hs b/etc/xmonad.hs
index c2e57bf..d77f5b6 100644
--- a/etc/xmonad.hs
+++ b/etc/xmonad.hs
@@ -9,7 +9,7 @@ import qualified XMonad.StackSet as W
 main =  xmonad $ def
   { terminal    = "kitty"
   , borderWidth = 0
-  , modMask     = mod4Mask
+  , modMask     = mod3Mask
   , startupHook = startup
   , manageHook  = windowManage
   , workspaces  = [ "1:emacs", "2:web", "3", "4", "5", "6", "7", "8", "9" ]
@@ -18,6 +18,7 @@ main =  xmonad $ def
 startup = do
   setWMName "LG3D"
   spawn "xrandr --auto && xrandr --output DP-1.3 --above DP-2"
+  spawn "xmodmap -e 'add mod3 = Muhenkan'"
 
 windowManage = composeAll
   [ className =? "Emacs"                 --> doShift "1:emacs"