diff --git a/README.org b/README.org
index c1cffc4..0a62909 100644
--- a/README.org
+++ b/README.org
@@ -335,6 +335,7 @@ Build all of the =org= files within a given directory.
 #+end_src
 
 *** Keys
+
 Make the =ESC= key quit (most) prompts, instead of the default =C-g=.
 
 #+begin_src emacs-lisp
@@ -412,12 +413,10 @@ Again cherry picked from =Doom=, I want to continue utilizing the muscle memory
 
 + Close buffers with =SPC c=
 + Find files with =SPC . (period)=
-+ Switch buffers with =SPC , (comma)=
 
 #+begin_src emacs-lisp
 (dotfiles/leader
   "." '(find-file :which-key "Files")
-  "," '(switch-to-buffer :which-key "Buffers")
   "c" '(kill-buffer-and-window :which-key "Close"))
 #+end_src
 
@@ -1179,6 +1178,38 @@ Add a golang source code block structure template with ~<go~:
 
 *Bring Emacs out of the eighties*
 
+*** Ivy
+
+Download and configure [[https://oremacs.com/swiper/][ivy]], a powerful selection menu for Emacs.
+
+#+begin_src emacs-lisp
+(use-package ivy
+  :diminish
+  :config (ivy-mode 1))
+#+end_src
+
+Counsel is a customized set of commands to replace built in completion buffers.
+
+#+begin_src emacs-lisp
+(use-package counsel
+  :custom (counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only)
+  :config (counsel-mode 1))
+#+end_src
+
+Switch buffers with =SPC , (comma)=.
+
+#+begin_src emacs-lisp
+(dotfiles/leader
+  "," '(counsel-switch-buffer :which-key "Buffers"))
+#+end_src
+
+Provide more information about each item with [[https://github.com/Yevgnen/ivy-rich][ivy-rich]].
+
+#+begin_src emacs-lisp
+(use-package ivy-rich
+  :init (ivy-rich-mode 1))
+#+end_src
+
 *** Fonts
 
 Write out to all *3* of Emacs' default font faces.
@@ -1272,7 +1303,7 @@ Load a theme with =SPC t t=.
 
 #+begin_src emacs-lisp
 (dotfiles/leader
-  "tt" '(load-theme t t :which-key "Theme"))
+  "tt" '(counsel-load-theme t t :which-key "Theme"))
 #+end_src
 
 *** Ligatures
diff --git a/modules/core.el b/modules/core.el
index b847f6a..5968a79 100644
--- a/modules/core.el
+++ b/modules/core.el
@@ -94,7 +94,6 @@
 
 (dotfiles/leader
   "." '(find-file :which-key "Files")
-  "," '(switch-to-buffer :which-key "Buffers")
   "c" '(kill-buffer-and-window :which-key "Close"))
 
 (dotfiles/leader
diff --git a/modules/interface.el b/modules/interface.el
index 46b0e98..b5b54ff 100644
--- a/modules/interface.el
+++ b/modules/interface.el
@@ -1,3 +1,17 @@
+(use-package ivy
+  :diminish
+  :config (ivy-mode 1))
+
+(use-package counsel
+  :custom (counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only)
+  :config (counsel-mode 1))
+
+(dotfiles/leader
+  "," '(counsel-switch-buffer :which-key "Buffers"))
+
+(use-package ivy-rich
+  :init (ivy-rich-mode 1))
+
 (set-face-attribute 'default nil :font dotfiles/font :height dotfiles/font-size)
 (set-face-attribute 'fixed-pitch nil :font dotfiles/font :height dotfiles/font-size)
 (set-face-attribute 'variable-pitch nil :font dotfiles/font :height dotfiles/font-size)
@@ -29,7 +43,7 @@
   :config (doom-modeline-mode 1))
 
 (dotfiles/leader
-  "tt" '(load-theme t t :which-key "Theme"))
+  "tt" '(counsel-load-theme t t :which-key "Theme"))
 
 (when (display-graphic-p)
   (use-package fira-code-mode