 
       (setq golden-ratio-extra-commands
             (append golden-ratio-extra-commands
-                    '(windmove-left
+                    '(ace-window
+                      ace-delete-window
+                      ace-select-window
+                      ace-swap-window
+                      ace-maximize-window
+                      avy-pop-mark
+                      evil-avy-goto-word-or-subword-1
+                      evil-avy-goto-line
+                      windmove-left
                       windmove-right
                       windmove-up
                       windmove-down

      (setq avy-keys (number-sequence ?a ?z))
      (setq avy-all-windows 'all-frames)
      (setq avy-background t)
      ; make golden ratio work after switching windows with avy-goto-word-or-subword-1
      (eval-after-load 'golden-ratio
        '(setq golden-ratio-extra-commands
               (append golden-ratio-extra-commands
                       '(evil-avy-goto-word-or-subword-1))))
      (evil-leader/set-key
        "SPC" 'avy-goto-word-or-subword-1
        "l" 'avy-goto-line))

        "wC"  'ace-delete-window
        "w <SPC>"  'ace-window)
      ;; set ace-window keys to home-row
      (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)))))

(defun spacemacs/init-adaptive-wrap ()
  (use-package adaptive-wrap
