diff --git a/emacs/init.el b/emacs/init.el
index a14eb48..c2c3a76 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -90,32 +90,13 @@
          ("C-o -" . split-window-below)
          ("C-o C-k" . delete-window)
          ("C-o 1" . delete-other-windows)
-         ("C-o w" . windmove-up)
-         ("C-o s" . windmove-down)
-         ("C-o a" . windmove-left)
-         ("C-o d" . windmove-right)
-         ("C-o W" . windmove-swap-states-up)
-         ("C-o S" . windmove-swap-states-down)
-         ("C-o A" . windmove-swap-states-left)
-         ("C-o D" . windmove-swap-states-right)
-         ;; TODO C-wasd for resizing
+         ("C-o w" . hycontrol-windows)
+         ("C-o f" . hycontrol-frame)
          ;; TODO C-/ for undo window state change
          ("C-o z" . my/zoom-window)
          ;; TODO other-window scrolling
          ("C-o n" . next-buffer)
          ("C-o p" . previous-buffer)
-         :repeat-map windmove-repeat-map
-         ("w" . windmove-up)
-         ("a" . windmove-left)
-         ("s" . windmove-down)
-         ("d" . windmove-right)
-         ("W" . windmove-swap-states-up)
-         ("S" . windmove-swap-states-down)
-         ("A" . windmove-swap-states-left)
-         ("D" . windmove-swap-states-right)
-         :repeat-map next-buffer-repeat-map
-         ("n" . next-buffer)
-         ("p" . previous-buffer)
          :repeat-map kmacro-repeat-map
          (")" . kmacro-end-or-call-macro)))