diff --git a/lisp/icejam-avy.el b/lisp/icejam-avy.el
index 01ec8eb..9924382 100644
--- a/lisp/icejam-avy.el
+++ b/lisp/icejam-avy.el
@@ -9,12 +9,6 @@
 ;; Avy is a navigation manager.
 
 ;;; Code:
-(use-package avy :straight t :defer t
-  :config
-  (setq avy-timeout-seconds 1)
-  :bind (:map icejam-keys-mode-map
-              ([(hyper j)] . avy-goto-char-timer)) ;; Jump to text.
-  )
-
+(use-package avy :straight t :defer t)
 (provide 'icejam-avy)
 ;;; icejam-avy.el ends here
diff --git a/lisp/icejam-base.el b/lisp/icejam-base.el
index be27e54..ce95e62 100644
--- a/lisp/icejam-base.el
+++ b/lisp/icejam-base.el
@@ -44,7 +44,13 @@
   :config (global-set-key [remap kill-ring-save] 'easy-kill))
 
 ;; Move buffers around with buffer keys
-(use-package buffer-move :straight t :defer t)
+(use-package buffer-move
+  :straight t
+  :defer t
+  :bind ("C-c m [" . buf-move-left)
+        ("C-c m ]" . buf-move-right)
+        ("C-c m {" . buf-move-up)
+        ("C-c m }" . buf-move-down))
 
 ;; #====================== Backup config #==============================
 (setq backup-directory-alist
@@ -102,6 +108,7 @@
              (exec-path-from-shell-initialize))
 
 (use-package direnv :straight t :config (direnv-mode))
+;; (use-package shadowenv :straight t :config (shadowenv-global-mode))
 
 ;; Draw underline lower
 (setq x-underline-at-descent-line t)
@@ -113,10 +120,7 @@
       indicate-empty-lines nil)
 
 ;;;;;;;;;;;;;;;;; Treemacs
-(use-package treemacs :straight t :defer t
-  :bind (:map icejam-keys-mode-map
-              ([(hyper b)] . treemacs))) ;; Show the folder tree
-
+(use-package treemacs :straight t :defer t)
 (use-package treemacs-all-the-icons :defer t :requires (treemacs) :straight t
   :config
   (treemacs-load-theme "all-the-icons")
diff --git a/lisp/icejam-keys-mode.el b/lisp/icejam-keys-mode.el
index 172e5a3..062e31d 100644
--- a/lisp/icejam-keys-mode.el
+++ b/lisp/icejam-keys-mode.el
@@ -52,10 +52,5 @@
 (define-key icejam-keys-mode-map [home] 'beginning-of-line)
 (define-key icejam-keys-mode-map [end] 'end-of-line)
 
-;;;;;;;;; Translate keys ;;;;;;;;;;;;;;;;;;;;;
-(define-key key-translation-map (kbd "<f6>") (kbd "C-c l")) ;; On F6, send C-c l
-(define-key key-translation-map (kbd "<f7>") (kbd "C-c c")) ;; On F7, send C-c c
-(define-key key-translation-map (kbd "<f8>") (kbd "C-c p")) ;; On F8, send C-c p
-
 (provide 'icejam-keys-mode)
 ;;; icejam-keys-mode.el ends here
diff --git a/lisp/icejam-magit.el b/lisp/icejam-magit.el
index 08a47c8..47abd91 100644
--- a/lisp/icejam-magit.el
+++ b/lisp/icejam-magit.el
@@ -2,15 +2,12 @@
 ;;; Commentary:
 ;;; Code:
 
-(require 'icejam-keys-mode)
-
 (use-package magit
   :straight t
   :defer t
-  :bind (:map icejam-keys-mode-map
-              ("<f5> c" . magit-checkout)
-              ("<f5> b" . magit-blame-addition)
-              ("<f5> g" . magit-status))
+  :bind ("<f5> c" . magit-checkout)
+        ("<f5> b" . magit-blame-addition)
+        ("<f5> g" . magit-status)
         (:map magit-blame-mode-map
               ("<f5> b" . 'magit-blame-quit)))
 
diff --git a/lisp/icejam-sys-specific.el b/lisp/icejam-sys-specific.el
index be9e2cf..380cc00 100644
--- a/lisp/icejam-sys-specific.el
+++ b/lisp/icejam-sys-specific.el
@@ -31,23 +31,22 @@
             (setq mac-command-modifier 'meta))))
 
       ;;;;;;;;; Mac binding (fix) ;;;;;;;;;;;;;;;;;;
-      (define-key icejam-keys-mode-map (kbd "H-<right>") #'end-of-line)
-      (define-key icejam-keys-mode-map (kbd "H-<left>") #'beginning-of-line)
-      (define-key icejam-keys-mode-map (kbd "H-<up>") #'scroll-down) ; WTF is this reverse, I dunno
-      (define-key icejam-keys-mode-map (kbd "H-<down>") #'scroll-up)
+      (define-key icejam-keys-mode-map (kbd "H-<right>") 'end-of-line)
+      (define-key icejam-keys-mode-map (kbd "H-<left>") 'beginning-of-line)
+      (define-key icejam-keys-mode-map (kbd "H-<up>") 'scroll-down) ; WTF is this reverse, I dunno
+      (define-key icejam-keys-mode-map (kbd "H-<down>") 'scroll-up)
 
-      ;; Use CMD bindings that you know from the operating system
-      (define-key icejam-keys-mode-map [(hyper a)] #'mark-whole-buffer) ;; Select all
-      (define-key icejam-keys-mode-map [(hyper v)] #'yank) ;; Paste
-      (define-key icejam-keys-mode-map [(hyper x)] #'kill-region) ;; Cut
-      (define-key icejam-keys-mode-map [(hyper c)] #'kill-ring-save) ;; Copy
-      (define-key icejam-keys-mode-map [(hyper s)] #'save-buffer) ;; Save
-      (define-key icejam-keys-mode-map [(hyper z)] #'undo) ;; Undo
-      (define-key icejam-keys-mode-map [(hyper q)] #'kill-emacs) ;; Close emacs
-      (define-key icejam-keys-mode-map [(hyper w)] #'icejam-function-delete-window) ;; Close window
+      (define-key icejam-keys-mode-map [(hyper a)] 'mark-whole-buffer)
+      (define-key icejam-keys-mode-map [(hyper v)] 'yank)
+      (define-key icejam-keys-mode-map [(hyper x)] 'kill-region)
+      (define-key icejam-keys-mode-map [(hyper c)] 'kill-ring-save)
+      (define-key icejam-keys-mode-map [(hyper s)] 'save-buffer)
+      (define-key icejam-keys-mode-map [(hyper l)] 'goto-line)
+      (define-key icejam-keys-mode-map [(hyper b)] 'treemacs)
+      (define-key icejam-keys-mode-map [(hyper w)] 'icejam-function-delete-window)
+      (define-key icejam-keys-mode-map [(hyper z)] 'undo)
+      (define-key icejam-keys-mode-map [(hyper q)] 'kill-emacs)
 
-      ;; And then some extras
-      (define-key icejam-keys-mode-map [(hyper l)] #'goto-line) ;; Goto Line
       ;; Disable meta on right alt (useful for Polish characters)
       ;; (setq mac-right-option-modifier nil)
       ))
@@ -63,7 +62,7 @@
       (setq mac-option-modifier 'meta)
       (setq mac-right-option-modifier nil))))
 
-;;;;;;;;; Linux-specific config ;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;; Mac-specific config ;;;;;;;;;;;;;;;;;;;;;
 (if IS-GNU
     (progn
       ;;;; Save and undo
diff --git a/lisp/icejam-transient.el b/lisp/icejam-transient.el
index 33ac39d..a0cef53 100644
--- a/lisp/icejam-transient.el
+++ b/lisp/icejam-transient.el
@@ -4,7 +4,6 @@
 ;;; Code:
 
 (require 'icejam-avy)
-(require 'icejam-keys-mode)
 (use-package transient :straight t)
 
 (defun icejam-mark-and-indent-whole-buffer ()
@@ -112,13 +111,13 @@
     ("d" "Smaller"          (lambda () (interactive) (text-scale-decrease 1)))
     ("r" "Reset"            (lambda () (interactive) (text-scale-adjust 0)))]])
 
-(define-key icejam-keys-mode-map (kbd "C-c p") 'icejam/project-menu)
-(define-key icejam-keys-mode-map (kbd "C-c c") 'icejam/code-menu)
-(define-key icejam-keys-mode-map (kbd "C-c w") 'icejam/window-menu)
-(define-key icejam-keys-mode-map (kbd "C-c s") 'icejam/history-menu)
-(define-key icejam-keys-mode-map (kbd "C-c f") 'icejam/font-menu)
-(define-key icejam-keys-mode-map (kbd "C-c m") 'icejam/move-menu)
-(define-key icejam-keys-mode-map (kbd "C-c l") 'icejam/language-context-menu)
+(define-key global-map (kbd "C-c p") 'icejam/project-menu)
+(define-key global-map (kbd "C-c c") 'icejam/code-menu)
+(define-key global-map (kbd "C-c w") 'icejam/window-menu)
+(define-key global-map (kbd "C-c s") 'icejam/history-menu)
+(define-key global-map (kbd "C-c f") 'icejam/font-menu)
+(define-key global-map (kbd "C-c m") 'icejam/move-menu)
+(define-key global-map (kbd "C-c l") 'icejam/language-context-menu)
 
 (provide 'icejam-transient)
 ;;; icejam-transient.el ends here
diff --git a/lisp/langs/icejam-lang-elisp.el b/lisp/langs/icejam-lang-elisp.el
index 1968a09..c03dc4d 100644
--- a/lisp/langs/icejam-lang-elisp.el
+++ b/lisp/langs/icejam-lang-elisp.el
@@ -26,7 +26,7 @@
 
   ;; Company list override
   (add-to-list (make-local-variable 'company-backends)
-               '(company-yasnippet company-capf)))
+               '(company-yasnippet company-elisp)))
 
 (add-hook 'emacs-lisp-mode-hook 'icejam/activate-emacs-lisp-mode)
 
diff --git a/lisp/langs/icejam-lang-erlang.el b/lisp/langs/icejam-lang-erlang.el
index a19573f..5b4def7 100644
--- a/lisp/langs/icejam-lang-erlang.el
+++ b/lisp/langs/icejam-lang-erlang.el
@@ -53,7 +53,7 @@
 
 (cl-defun icejam/erlang-current-plist ()
   "Create plist from current Erlang version."
-  (seq-find 'icejam/erlang-current-version--plistp icejam/erlang-available-versions))
+  (seq-find 'erlang/current-version--plistp icejam/erlang-available-versions))
 
 ;; Flycheck checker for Erlang
 (flycheck-define-checker erlang-otp