diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index e5040d1..6ad029b 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -71,9 +71,10 @@ mKeys = [ ("M-S-n", sendMessage MirrorShrink  ) -- Expand current window
         , ("<XF86AudioStop>"       , spawn "mpc stop"         ) -- stop mpd
         , ("<XF86AudioPrev>"       , spawn "mpc prev"         ) -- prev song
         , ("<XF86AudioNext>"       , spawn "mpc next"         ) -- next song
-        , ("<XF86AudioLowerVolume>", spawn "mpc volume -3"    ) -- volume down via custom script
-        , ("<XF86AudioRaiseVolume>", spawn "mpc volume +3"    ) -- volume up via custom script
-        , ("<XF86AudioMute>"       , spawn "amixer -q -- sset Headphone togglemute") -- toggle mute via custom script
+        , ("<XF86AudioLowerVolume>", spawn "mpc volume -3"    ) -- volume down
+        , ("<XF86AudioRaiseVolume>", spawn "mpc volume +3"    ) -- volume up
+        , ("<XF86AudioMute>"       , spawn "amixer -q -- sset Headphone togglemute") -- toggle mute
+        , ("M-<XF86AudioMute>"     , spawn "amixer -q -- sset Speaker togglemute")
 
         -- Dynamic workspace commands
         , ("M-S-<Backspace>"       , removeWorkspace)
diff --git a/.zshrc b/.zshrc
index 7871840..6bc5006 100644
--- a/.zshrc
+++ b/.zshrc
@@ -77,7 +77,9 @@ export LC_COLLATE="C" #order files in ls
 export DIALOGOPTS='--visit-items'
 export MAIL=~/mail
 export MAILCHECK=0
-export AWT_TOOLKIT=MToolkit
+#export AWT_TOOLKIT=MToolkit
+#export AWT_TOOLKIT=XToolkit
+export _JAVA_AWT_WM_NONREPARENTING=1
 if [ -x `which less` ] ; then
     export PAGER==less
 else
diff --git a/keymaps/xkb/hunner.xkb b/keymaps/xkb/hunner.xkb
index cf6a9b7..58b762f 100644
--- a/keymaps/xkb/hunner.xkb
+++ b/keymaps/xkb/hunner.xkb
@@ -5,7 +5,7 @@ xkb_keymap {
     xkb_geometry  { include "thinkpad(us)" };
 
     xkb_symbols "hunner" {
-        include "pc+us(dvorak)+inet(evdev)"
+        include "pc+us(dvorak)+inet(evdev)+group(win_switch)"
 
         name[group1]="Dvorak";
         //name[group2]="Colemak";
@@ -94,7 +94,7 @@ xkb_keymap {
         modifier_map Lock { <LCTL> };
         modifier_map Control { <CAPS> };
 
-        include "group(alts_toggle)+level3(ralt_switch_for_alts_toggle)"
+        //include "group(alts_toggle)+level3(ralt_switch_for_alts_toggle)"
     };
 
 };