diff --git a/init.el b/init.el
index 02a5c6c..d22d74f 100644
--- a/init.el
+++ b/init.el
@@ -131,12 +131,27 @@
                           '("<escape>" . ignore))
   (meow-global-mode))
 
+(use-package ace-window
+  :bind ("C-c w" . ace-window)
+  :custom-face
+  (aw-leading-char-face ((t (:foreground "#181926" :background "#ed8796" ; crust, red
+                                         :weight bold))))
+  (aw-background-face ((t (:foreground "#8087a2"))))                     ; overlay1
+  :custom
+  (aw-keys '(?a ?w ?e ?f ?g ?h ?j ?k ?l ?p))
+  (aw-dispatch-always t)
+  :config
+  (dolist (c aw-dispatch-alist)
+    (cond ((eq (car c) ?j) (setcar c ?J))
+          ((eq (car c) ?v) (setcar c ?s) (setcar (nthcdr 2 c) "Split Window"))
+          ((eq (car c) ?b) (setcar c ?v) (setcar (nthcdr 2 c) "Vertical Split")))))
+
 (use-package goggles
   :hook ((prog-mode text-mode) . goggles-mode)
   :custom-face
-  (goggles-added ((t (:background "#a6da95"))))   ;; green
-  (goggles-removed ((t (:background "#ed8796")))) ;; red
-  (goggles-changed ((t (:background "#8aadf4")))) ;; blue
+  (goggles-added ((t (:background "#a6da95"))))   ; green
+  (goggles-removed ((t (:background "#ed8796")))) ; red
+  (goggles-changed ((t (:background "#8aadf4")))) ; blue
   :config
   (setq-default goggles-pulse t))
 
@@ -363,7 +378,7 @@
 (use-package gruvbox-theme)
 (use-package catppuccin-theme
   :custom-face
-  (region ((t (:background "#5b6078"))))) ;; surface2
+  (region ((t (:background "#5b6078"))))) ; surface2
 
 (defun load-theme-with-solaire ()
   (load-theme 'catppuccin-macchiato t)
@@ -408,7 +423,7 @@
 
 (setq server-client-instructions nil
       scroll-step 1
-      scroll-margin 3
+      scroll-margin 8
       scroll-conservatively 9999
       python-indent-guess-indent-offset nil
       read-file-name-completion-ignore-case t
@@ -444,6 +459,8 @@
 (add-hook 'prog-mode-hook #'electric-pair-local-mode)
 (add-hook 'eval-expression-minibuffer-setup-hook #'electric-pair-local-mode)
 
+(ffap-bindings)
+
 (defun scroll-down-3 ()
   "Scrolls down by 3"
   (interactive)