diff --git a/xmonad.hs b/xmonad.hs
index 5d20376..b036315 100755
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -141,6 +141,7 @@ myManageHook = composeAll
   [ isDialog --> doFloat
     , className =? "Gnome-dictionary" --> doFloat
   , className =? "Xfce4-dict" --> doFloat
+  , className =? "Goldendict" --> doFloat
   , className =? "Last.fm"    --> doFloat
   , className =? "Xmessage"   --> doFloat
   , className    =? "Audacious"  --> doFloat
@@ -370,8 +371,9 @@ myKeys =    [
   --, ((winKey ,                                            xK_i),                                              spawnHere "iceweasel")
   --, ((winKey ,                                            xK_i),                                              spawnHere "clementine")
     , ((winKey ,                                            xK_i),                                              ifWindows (className =? "Clementine") (mapM_ killWindow) (spawnHere "clementine"))
-  , ((winKey ,                                            xK_d),                                              ifWindows (className =? "Xfce4-dict") (mapM_ killWindow) (spawnHere "xfce4-dict"))
-  --, ((winKey ,                                                xK_d),                                          ifWindows (className =? "Gnome-dictionary") (mapM_ killWindow) (spawnHere "gnome-dictionary"))
+    , ((winKey , xK_d ),             ifWindows (className =? "Goldendict") (mapM_ killWindow) (spawnHere "goldendict"))
+--  , ((winKey ,                                            xK_d),                                              ifWindows (className =? "Xfce4-dict") (mapM_ killWindow) (spawnHere "xfce4-dict"))
+--  , ((winKey ,                                                xK_d),                                          ifWindows (className =? "Gnome-dictionary") (mapM_ killWindow) (spawnHere "gnome-dictionary"))
   , ((winKey ,                                            xK_f),                                              spawnHere (myTerminal ++ " -e vifm . ~"))
   --, ((winKey ,                                            xK_f),                                              spawnHere ("export SHELL=/bin/bash && " ++ myTerminal ++ " -e mc"))
   --, ((winKey ,                                            xK_e),                                              spawnHere ("export SHELL=/bin/bash && " ++ myTerminal ++ " -e mc")) -- key stroke matches Win+E (from Win7)
@@ -525,7 +527,7 @@ myKeys =    [
    [((m .|. winKey, key), screenWorkspace sc >>= flip whenJust (windows . f))                                                                                                                 
 --    | (key, sc) <- zip [xK_w, xK_r] [0..]                                                                                                                                                   
     -- | (key, sc) <- zip [xK_Left, xK_Right] [0..] -- For arrow keys                                                                                                                         
-    | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..] -- For w,r keys                                                                                                                                     
+    | (key, sc) <- zip [xK_e, xK_r, xK_w] [0..] -- For w,r keys                                                                                                                                     
     -- | (key, sc) <- zip [xK_w, xK_r] [1,0] -- For w,r keys in backwards order  
     -- | (key, sc) <- zip [xK_w, xK_r] [1,0] -- For w,r keys in backwards order
      , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]