diff --git a/emacs/.emacs.d/config/init-defaults.el b/emacs/.emacs.d/config/init-defaults.el
index 579084d..5cc09e3 100644
--- a/emacs/.emacs.d/config/init-defaults.el
+++ b/emacs/.emacs.d/config/init-defaults.el
@@ -26,6 +26,7 @@
   (add-hook 'prog-mode-hook #'display-line-numbers-mode)
   (add-hook 'text-mode-hook #'display-line-numbers-mode)
   :custom
-  (require-final-newline t))
+  (require-final-newline t)
+  (tab-always-indent 'complete))
 
 (provide 'init-defaults)
diff --git a/emacs/.emacs.d/config/init-ide.el b/emacs/.emacs.d/config/init-ide.el
index 8dd12e2..58c0ae7 100644
--- a/emacs/.emacs.d/config/init-ide.el
+++ b/emacs/.emacs.d/config/init-ide.el
@@ -2,18 +2,10 @@
 
 ;; IDE features
 
-;; Company-mode provides inline autocompletion
-(use-package company
-  :hook (after-init . global-company-mode)
-  :config
-  (setq tab-always-indent 'complete)
-  (evil-collection-company-setup)
-  (general-def company-active-map "RET" #'company-complete-selection)
-  :custom
-  (company-idle-delay 0.3)
-  :general
-  ([remap indent-for-tab-command] #'company-indent-or-complete-common)
-  ([remap c-indent-line-or-region] #'company-indent-or-complete-common))
+;; Corfu-mode provides inline autocompletion
+(use-package corfu
+  :init
+  (global-corfu-mode))
 
 ;; Quick file overview for supported modes
 (use-package imenu