diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index d2ffd19..22468d3 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -770,23 +770,21 @@ Return nil if DIR is not in a hugo project at all."
   :elpaca (:files (:defaults "extensions/*.el"))
   ;; :if (display-graphic-p) ; breaks in emacsclient
   :custom
-  (corfu-quit-no-match 'separator)      ;; Never quit, even if there is no match
-  (corfu-preview-current nil)    ;; Disable current candidate preview
-  (corfu-preselect-first nil)    ;; Disable candidate preselection
-  (corfu-on-exact-match nil)     ;; Configure handling of exact matches
-  (completion-cycle-threshold 0)
   ;; (corfu-cycle t)                ;; Enable cycling for `corfu-next/previous'
   ;; (corfu-auto t)                 ;; Enable auto completion
   ;; (corfu-auto-delay 1.5)
   ;; (corfu-auto-prefix 2)
   ;; (corfu-separator ?-)          ;; Orderless field separator
   ;; (corfu-quit-at-boundary 'separator)   ;; Never quit at completion boundary
+  (corfu-quit-no-match t)
+  (corfu-preview-current nil)
+  (corfu-on-exact-match 'insert)
   ;; (corfu-scroll-margin 5)
   (tab-always-indent 'complete)
+  (tab-first-completion 'eol)
   (tooltip-delay 0.01)
   (use-system-tooltips nil)
   (tooltip-hide-delay 60)
-  (corfu-echo-delay t)
   :custom-face
   (tooltip
    ((t (:inherit 'corfu-default))))