diff --git a/disabled.el b/disabled.el
new file mode 100644
index 0000000..e12940f
--- /dev/null
+++ b/disabled.el
@@ -0,0 +1,126 @@
+;; icomplete
+;; (use-package icomplete
+;;   :disable
+;;   :ensure nil
+;;   :demand t
+;;   :bind (:map icomplete-minibuffer-map
+;;          ("C-S-s" . kill-line)
+;;          ("C-j" . icomplete-forward-completions)
+;;          ("C-k" . icomplete-backward-completions)
+;;          ("DEL" . icomplete-fido-backward-updir)
+;;          ("M-DEL". delete-backward-char)
+;;          ("M-RET" . icomplete-force-complete-and-exit)
+;;          ("TAB" . icomplete-force-complete)
+;;          ("<escape>" . abort-recursive-edit)
+;;          ("C-;" . embark-dwim)
+;;          ("C-." . embark-act)
+;;          ("<left>" . backward-char)
+;;          ("<right>" . forward-char))
+;;   :hook (icomplete-minibuffer-setup . my/icomplete-setup-hook-func)
+;;   :init
+;;   (defun my/icomplete-setup-hook-func ()
+;;     (setq truncate-lines t))
+;;   (setq completion-ignore-case t
+;;         read-file-name-completion-ignore-case t
+;;         read-buffer-completion-ignore-case t
+;;         enable-recursive-minibuffers t
+;;         minibuffer-prompt-properties '(read-only t
+;;                                        cursor-intangible t
+;;                                        face minibuffer-prompt)
+;;         ;;completions-detailed t
+;;         icomplete-compute-delay 0
+;;         icomplete-scroll t)
+;;   (defun my/crm-indicator (args)
+;;     (cons (format "[CRM%s] %s"
+;;                   (replace-regexp-in-string
+;;                    "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" ""
+;;                    crm-separator)
+;;                   (car args))
+;;           (cdr args)))
+;;   (advice-add #'completing-read-multiple :filter-args #'my/crm-indicator)
+;;   (defun my/marginalia-trim-right (list)
+;;     (cl-loop for (cand prefix suffix) in list collect
+;;              (list cand prefix (string-trim-right suffix))))
+;;   (advice-add #'marginalia--align :filter-return #'my/marginalia-trim-right)
+;;   :config
+;;   (set-face-attribute 'icomplete-selected-match nil :inherit 'region)
+;;   (fido-mode 1)
+;;   (fido-vertical-mode 1))
+
+;; flycheck
+;; (use-package flycheck
+;;   :hook (emacs-lisp-mode . flycheck-mode)
+;;   :bind (:map flycheck-mode-map
+;;          ("C-c e" . my/flycheck-show-diagnostic-at-point))
+;;   :init
+;;   (setq flycheck-display-errors-function nil)
+;;   (defun my/flycheck-show-diagnostic-at-point ()
+;;     (interactive)
+;;     (if-let ((flycheck-mode)
+;;              (errors (flycheck-overlay-errors-at (point)))
+;;              (message (apply 'concat
+;;                              (mapcar
+;;                               (lambda (error)
+;;                                 (concat "•" (flycheck-error-message error) "\n"))
+;;                               errors))))
+;;         (if (display-graphic-p)
+;;             (progn
+;;               (posframe-show " *flycheck-error-posframe*"
+;;                              :string message
+;;                              :position (point)
+;;                              :max-width 80
+;;                              :border-width 2
+;;                              :border-color "white")
+;;               (clear-this-command-keys)
+;;               (push (read-event) unread-command-events)
+;;               (posframe-hide " *flycheck-error-posframe*"))
+;;           (popup-tip message)))))
+;; (use-package consult-flycheck
+;;   :bind (:map flycheck-mode-map
+;;          ("C-c C-e" . consult-flycheck)))
+
+;; lsp-mode
+;; (use-package consult-lsp)
+;; (use-package lsp-mode
+;;   :hook (((c-ts-mode c++-ts-mode java-ts-mode rust-ts-mode python-ts-mode
+;;            latex-mode markdown-mode blueprint-ts-mode) . lsp-mode)
+;;          (lsp-mode . my/-setup-lsp-mode-buffer))
+;;   :init
+;;   (setq lsp-completion-provider :none
+;;         lsp-headerline-breadcrumb-enable nil
+;;         lsp-inlay-hint-enable nil
+;;         lsp-signature-doc-lines 1)
+;;   (defun my/-setup-lsp-mode-buffer ()
+;;     "Called by `lsp-mode-hook' to setup lsp-mode buffers."
+;;     (evil-define-key '(normal visual motion) 'local
+;;       "gR" #'lsp-rename
+;;       "gA" #'lsp-execute-code-action
+;;       "gs" #'consult-lsp-symbols)
+;;     (setq-local evil-lookup-func #'lsp-describe-thing-at-point)))
+
+;; vterm
+;; (use-package vterm
+;;   :hook (vterm-mode . with-editor-export-editor)
+;;   :init
+;;   (defvar my/project-vterm-hash-table (make-hash-table :test 'equal)
+;;     "Hash table that maps project root dirs to vterm buffers.")
+;;   (defun my/project-vterm (prompt)
+;;     "Switch to or create a vterm buffer in the current projects root."
+;;     (interactive (list t))
+;;     (if-let ((proj (project-current prompt))
+;;              (default-directory (project-root proj)))
+;;         (if-let ((vterm-buff (gethash default-directory
+;;                                       my/project-vterm-hash-table))
+;;                  ((buffer-live-p vterm-buff)))
+;;             (switch-to-buffer vterm-buff)
+;;           (puthash default-directory
+;;                    (vterm (concat "*vterm for project " default-directory "*"))
+;;                    my/project-vterm-hash-table))))
+;;   (defun my/project-vterm-or-default ()
+;;     "Open a vterm for the current project, otherwise, open a normal vterm."
+;;     (interactive)
+;;     (unless (my/project-vterm nil)
+;;       (if-let ((vterm-buff (gethash nil my/project-vterm-hash-table))
+;;                ((buffer-live-p vterm-buff)))
+;;           (switch-to-buffer vterm-buff)
+;;         (puthash nil (vterm vterm-buffer-name) my/project-vterm-hash-table)))))
diff --git a/init.el b/init.el
index 626fdca..4abd181 100644
--- a/init.el
+++ b/init.el
@@ -64,11 +64,6 @@
   (global-hl-line-mode 1)
   (blink-cursor-mode -1)
 
-  ;; Spell stuff
-  (setq ispell-program-name "hunspell"
-        flyspell-issue-message-flag nil
-        flyspell-issue-welcome-flag nil)
-
   ;; Enable all disabled stuff
   (setq disabled-command-function nil)
 
@@ -166,6 +161,15 @@
     "go" #'ff-find-other-file
     "gO" #'ff-find-other-file-other-window))
 
+;; flyspell
+(use-package flyspell
+  :config
+  (setq ispell-program-name "hunspell"
+	flyspell-issue-message-flag nil
+	flyspell-issue-welcome-flag nil)
+  (define-key flyspell-mode-map (kbd "C-;") nil t)
+  (define-key flyspell-mode-map (kbd "C-,") nil t))
+
 ;; recentf
 (use-package recentf
   :init
@@ -266,63 +270,16 @@ visual states."
   (savehist-mode 1))
 
 ;; vertico
-;; (use-package vertico
-;;   :bind (:map vertico-map
-;;               ("C-S-k" . kill-line)
-;;               ("C-k" . vertico-previous)
-;;               ("C-j" . vertico-next)
-;;               ("RET" . vertico-directory-enter)
-;;               ("DEL" . vertico-directory-delete-char)
-;;               ("M-DEL" . vertico-directory-delete-word))
-;;   :hook (minibuffer-setup . cursor-intangible-mode)
-;;   :init
-;;   (defun my/crm-indicator (args)
-;;     (cons (format "[CRM%s] %s"
-;;                   (replace-regexp-in-string
-;;                    "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" ""
-;;                    crm-separator)
-;;                   (car args))
-;;           (cdr args)))
-;;   (advice-add #'completing-read-multiple :filter-args #'my/crm-indicator)
-;;   (setq vertico-cycle t
-;;         enable-recursive-minibuffers t
-;;         read-extended-command-predicate #'command-completion-default-include-p
-;;         minibuffer-prompt-properties '(read-only t
-;;                                                  cursor-intangible t
-;;                                                  face minibuffer-prompt))
-;;   (vertico-mode 1))
-
-;; icomplete
-(use-package icomplete
-  :ensure nil
-  :demand t
-  :bind (:map icomplete-minibuffer-map
-         ("C-S-s" . kill-line)
-         ("C-j" . icomplete-forward-completions)
-         ("C-k" . icomplete-backward-completions)
-         ("DEL" . icomplete-fido-backward-updir)
-         ("M-DEL". delete-backward-char)
-         ("M-RET" . icomplete-force-complete-and-exit)
-         ("TAB" . icomplete-force-complete)
-         ("<escape>" . abort-recursive-edit)
-         ("C-;" . embark-dwim)
-         ("C-." . embark-act)
-         ("<left>" . backward-char)
-         ("<right>" . forward-char))
-  :hook (icomplete-minibuffer-setup . my/icomplete-setup-hook-func)
+(use-package vertico
+  :bind (:map vertico-map
+              ("C-S-k" . kill-line)
+              ("C-k" . vertico-previous)
+              ("C-j" . vertico-next)
+              ("RET" . vertico-directory-enter)
+              ("DEL" . vertico-directory-delete-char)
+              ("M-DEL" . vertico-directory-delete-word))
+  :hook (minibuffer-setup . cursor-intangible-mode)
   :init
-  (defun my/icomplete-setup-hook-func ()
-    (setq truncate-lines t))
-  (setq completion-ignore-case t
-        read-file-name-completion-ignore-case t
-        read-buffer-completion-ignore-case t
-        enable-recursive-minibuffers t
-        minibuffer-prompt-properties '(read-only t
-                                       cursor-intangible t
-                                       face minibuffer-prompt)
-        ;;completions-detailed t
-        icomplete-compute-delay 0
-        icomplete-scroll t)
   (defun my/crm-indicator (args)
     (cons (format "[CRM%s] %s"
                   (replace-regexp-in-string
@@ -331,14 +288,13 @@ visual states."
                   (car args))
           (cdr args)))
   (advice-add #'completing-read-multiple :filter-args #'my/crm-indicator)
-  (defun my/marginalia-trim-right (list)
-    (cl-loop for (cand prefix suffix) in list collect
-             (list cand prefix (string-trim-right suffix))))
-  (advice-add #'marginalia--align :filter-return #'my/marginalia-trim-right)
-  :config
-  (set-face-attribute 'icomplete-selected-match nil :inherit 'region)
-  (fido-mode 1)
-  (fido-vertical-mode 1))
+  (setq vertico-cycle t
+        enable-recursive-minibuffers t
+        read-extended-command-predicate #'command-completion-default-include-p
+        minibuffer-prompt-properties '(read-only t
+                                       cursor-intangible t
+                                       face minibuffer-prompt))
+  (vertico-mode 1))
 
 ;; orderless
 (use-package orderless
@@ -349,18 +305,16 @@ visual states."
     (setq-local completion-styles '(basic)))
   (orderless-define-completion-style my/orderless-with-initialism
     (orderless-matching-styles '(orderless-initialism
-                                 orderless-literal
                                  orderless-regexp)))
-  (setq completion-styles '(orderless basic)
+  (setq orderless-matching-styles '(orderless-regexp)
+        completion-styles '(orderless basic)
         completion-category-defaults nil
         completion-category-overrides '((file
                                          (styles basic partial-completion))
                                         (command
-                                         (my/orderless-with-initialism basic))
-                                        (eglot
-                                         (orderless basic)))))
+                                         (styles my/orderless-with-initialism basic)))))
 
-;; marginalia
+; marginalia
 (use-package marginalia
   :bind (:map minibuffer-local-map
               ("M-a" . marginalia-cycle))
@@ -369,12 +323,11 @@ visual states."
 
 ;; embark
 (use-package embark
-  :bind (("C-." . embark-act)
-	     ("C-;" . embark-dwim))
+  :bind (("C-," . embark-act)
+         ("C-;" . embark-dwim)
+         :map help-map
+         ("B" . embark-bindings))
   :init
-  (evil-define-key '(normal visual motion operator insert replace) 'global
-    (kbd "M-e") #'embark-act
-    (kbd "M-E") #'embark-dwim)
   (setq embark-quit-after-action nil)
   (add-to-list 'display-buffer-alist
                '("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
@@ -427,7 +380,7 @@ visual states."
   (setq corfu-cycle t
         corfu-auto t
         corfu-on-exact-match nil
-        completion-cycle-threshold 3)
+        completion-cycle-threshold nil)
   (global-corfu-mode 1)
   (corfu-popupinfo-mode 1)
   :config
@@ -439,6 +392,7 @@ visual states."
 ;; cape (a bunch of capfs!)
 (use-package cape
   :bind (("C-c p" . cape-dabbrev)
+         ([remap dabbrev-expand] . cape-dabbrev)
          ("C-c P" . cape-line))
   :hook (text-mode . my/-cape-setup-text-mode)
   :init
@@ -542,57 +496,6 @@ visual states."
                        "--header-insertion=never" "--pch-storage=memory"
                        "--malloc-trim" "--function-arg-placeholders"))))
 
-;; flycheck
-;; (use-package flycheck
-;;   :hook (emacs-lisp-mode . flycheck-mode)
-;;   :bind (:map flycheck-mode-map
-;;          ("C-c e" . my/flycheck-show-diagnostic-at-point))
-;;   :init
-;;   (setq flycheck-display-errors-function nil)
-;;   (defun my/flycheck-show-diagnostic-at-point ()
-;;     (interactive)
-;;     (if-let ((flycheck-mode)
-;;              (errors (flycheck-overlay-errors-at (point)))
-;;              (message (apply 'concat
-;;                              (mapcar
-;;                               (lambda (error)
-;;                                 (concat "•" (flycheck-error-message error) "\n"))
-;;                               errors))))
-;;         (if (display-graphic-p)
-;;             (progn
-;;               (posframe-show " *flycheck-error-posframe*"
-;;                              :string message
-;;                              :position (point)
-;;                              :max-width 80
-;;                              :border-width 2
-;;                              :border-color "white")
-;;               (clear-this-command-keys)
-;;               (push (read-event) unread-command-events)
-;;               (posframe-hide " *flycheck-error-posframe*"))
-;;           (popup-tip message)))))
-;; (use-package consult-flycheck
-;;   :bind (:map flycheck-mode-map
-;;          ("C-c C-e" . consult-flycheck)))
-
-;; lsp-mode
-;; (use-package consult-lsp)
-;; (use-package lsp-mode
-;;   :hook (((c-ts-mode c++-ts-mode java-ts-mode rust-ts-mode python-ts-mode
-;;            latex-mode markdown-mode blueprint-ts-mode) . lsp-mode)
-;;          (lsp-mode . my/-setup-lsp-mode-buffer))
-;;   :init
-;;   (setq lsp-completion-provider :none
-;;         lsp-headerline-breadcrumb-enable nil
-;;         lsp-inlay-hint-enable nil
-;;         lsp-signature-doc-lines 1)
-;;   (defun my/-setup-lsp-mode-buffer ()
-;;     "Called by `lsp-mode-hook' to setup lsp-mode buffers."
-;;     (evil-define-key '(normal visual motion) 'local
-;;       "gR" #'lsp-rename
-;;       "gA" #'lsp-execute-code-action
-;;       "gs" #'consult-lsp-symbols)
-;;     (setq-local evil-lookup-func #'lsp-describe-thing-at-point)))
-
 ;; yasnippet
 (use-package yasnippet
   :bind ("C-c s" . yas-expand)
@@ -796,33 +699,6 @@ Take directly from doom-modeline."
            (doom-modeline-spc)
            "IAlg"))))))))
 
-;; vterm
-;; (use-package vterm
-;;   :hook (vterm-mode . with-editor-export-editor)
-;;   :init
-;;   (defvar my/project-vterm-hash-table (make-hash-table :test 'equal)
-;;     "Hash table that maps project root dirs to vterm buffers.")
-;;   (defun my/project-vterm (prompt)
-;;     "Switch to or create a vterm buffer in the current projects root."
-;;     (interactive (list t))
-;;     (if-let ((proj (project-current prompt))
-;;              (default-directory (project-root proj)))
-;;         (if-let ((vterm-buff (gethash default-directory
-;;                                       my/project-vterm-hash-table))
-;;                  ((buffer-live-p vterm-buff)))
-;;             (switch-to-buffer vterm-buff)
-;;           (puthash default-directory
-;;                    (vterm (concat "*vterm for project " default-directory "*"))
-;;                    my/project-vterm-hash-table))))
-;;   (defun my/project-vterm-or-default ()
-;;     "Open a vterm for the current project, otherwise, open a normal vterm."
-;;     (interactive)
-;;     (unless (my/project-vterm nil)
-;;       (if-let ((vterm-buff (gethash nil my/project-vterm-hash-table))
-;;                ((buffer-live-p vterm-buff)))
-;;           (switch-to-buffer vterm-buff)
-;;         (puthash nil (vterm vterm-buffer-name) my/project-vterm-hash-table)))))
-
 ;; eat
 (use-package eat
   :config
@@ -840,7 +716,7 @@ Take directly from doom-modeline."
           (let ((eat-buffer-name (concat "*eat for project " default-directory "*")))
             (puthash default-directory
                      (eat)
-                     my/project-vterm-hash-table)))))
+                     my/project-eaeat-hash-table)))))
   (defun my/project-eat-or-default ()
     "Open an eat for the current project, otherwise, open a normal eat."
     (interactive)