diff --git a/03hydra.el b/03hydra.el
index 52721f8..8cf50df 100644
--- a/03hydra.el
+++ b/03hydra.el
@@ -2,7 +2,7 @@
 
 (defhydra hydra-file-switcher-menu (:color teal :hint nil)
   "
-^Ivy^                           ^Projectile^                  ^Magit^
+   ^Ivy^                           ^Projectile^                  ^Magit^
 ^^^^^^^^------------------------------------------------------------------------
 _a_: ag                         _s_: Switch project           _m_: status
 _b_: Switch buffer              _f_: Find file in project
@@ -22,24 +22,20 @@ _t_: Find file                  _g_: ag in current project
 
 (global-set-key (kbd "C-c p") 'hydra-file-switcher-menu/body)
 
-(defhydra hydra-programming-actions (:color teal :hint nil :columns 4)
+(defhydra hydra-programming-actions (:color teal :hint nil)
   "
   Programming actions
 
-    ^Windows^                    ^Code Manipulation^    ^Code Completion^
+   ^Code Manipulation^    ^Code Completion^
 ^^^^^^^^-----------------------------------------------------------------------
- _k_: kill buffer and window  _c_: comment line      _y_: yasnippet
-_sh_: split horizontally      _r_: regex replace     _m_: company
-_sv_: split vertically        _i_: indent region
-^^                            _a_: align regexp
-^^                            _e_: eval region
+_c_: comment line      _y_: yasnippet
+_r_: regex replace     _m_: company
+_i_: indent region
+_a_: align regexp
+_e_: eval region
 "
   ("q" nil "cancel" :color pink)
 
-  ("k"  kill-buffer-and-window)
-  ("sh" split-window-below)
-  ("sv" split-window-right)
-
   ("c"  comment-line)
   ("r"  vr/replace)
   ("i"  indent-region)
@@ -50,3 +46,27 @@ _sv_: split vertically        _i_: indent region
   ("m"  company-complete))
 
 (global-set-key (kbd "C-c c") 'hydra-programming-actions/body)
+
+(defhydra hydra-window-actions (:color teal :hint nil)
+  "
+  Window actions
+
+   ^Windows^                          ^Move around^
+^^^^^^^^-----------------------------------------------------------------------
+_k_: kill buffer and window   _<left>_: Move left
+_h_: split horizontally      _<right>_: Move right
+_v_: split vertically           _<up>_: Move up
+^^                            _<down>_: Move down
+"
+  ("q" nil "cancel" :color pink)
+
+  ("k"       kill-buffer-and-window)
+  ("h"       split-window-below)
+  ("v"       split-window-right)
+
+  ("<left>"  windmove-left)
+  ("<right>" windmove-right)
+  ("<up>"    windmove-up)
+  ("<down>"  windmove-down))
+
+(global-set-key (kbd "C-c w") 'hydra-window-actions/body)