diff --git a/.gitmodules b/.gitmodules
index 7e89251..14f5c4d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -178,3 +178,12 @@
 [submodule "site-lisp/emms"]
 	path = site-lisp/emms
 	url = https://git.savannah.gnu.org/git/emms.git
+[submodule "site-lisp/emacs-corfu-terminal"]
+	path = site-lisp/emacs-corfu-terminal
+	url = https://codeberg.org/akib/emacs-corfu-terminal.git
+[submodule "site-lisp/emacs-popon"]
+	path = site-lisp/emacs-popon
+	url = https://codeberg.org/akib/emacs-popon.git
+[submodule "site-lisp/emacs-corfu-doc-terminal"]
+	path = site-lisp/emacs-corfu-doc-terminal
+	url = https://codeberg.org/akib/emacs-corfu-doc-terminal.git
diff --git a/lisp/init-vertico.el b/lisp/init-vertico.el
index 26a4f14..5f8b25c 100644
--- a/lisp/init-vertico.el
+++ b/lisp/init-vertico.el
@@ -41,4 +41,14 @@
   (recentf-mode 1))
 
 
+(defun creature/load-corfu-terminal-in-no-gui-env ()
+  (unless (display-graphic-p)
+    (require 'corfu-terminal)
+    (require 'corfu-doc-terminal)
+    (corfu-terminal-mode 1)
+    (corfu-doc-terminal-mode 1)))
+
+(add-hook 'emacs-startup-hook #'creature/load-corfu-terminal-in-no-gui-env)
+(add-hook 'server-after-make-frame-hook #'creature/load-corfu-terminal-in-no-gui-env)
+
 (provide 'init-vertico)
diff --git a/site-lisp/emacs-corfu-doc-terminal b/site-lisp/emacs-corfu-doc-terminal
new file mode 160000
index 0000000..da50420
--- /dev/null
+++ b/site-lisp/emacs-corfu-doc-terminal
@@ -0,0 +1 @@
+Subproject commit da5042082d2296946972599f6d95bbbffaf63fba
diff --git a/site-lisp/emacs-corfu-terminal b/site-lisp/emacs-corfu-terminal
new file mode 160000
index 0000000..501548c
--- /dev/null
+++ b/site-lisp/emacs-corfu-terminal
@@ -0,0 +1 @@
+Subproject commit 501548c3d51f926c687e8cd838c5865ec45d03cc
diff --git a/site-lisp/emacs-popon b/site-lisp/emacs-popon
new file mode 160000
index 0000000..bf8174c
--- /dev/null
+++ b/site-lisp/emacs-popon
@@ -0,0 +1 @@
+Subproject commit bf8174cb7e6e8fe0fe91afe6b01b6562c4dc39da