diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el
index 0f15ddd..ab26330 100644
--- a/home/.config/doom/config.el
+++ b/home/.config/doom/config.el
@@ -16,14 +16,16 @@
 (setq inhibit-compacting-font-caches t)
 
 ;; Emoji
-(setq emojify-display-style 'unicode)
+(after! emojify
+        (setq emojify-display-style 'unicode))
 
 ;; Theme
 (setq doom-theme 'doom-nord)
 (setq doom-themes-enable-bold t
       doom-themes-enable-italic t)
-(setq doom-themes-treemacs-theme 'doom-colors
-      doom-themes-treemacs-enable-variable-pitch nil)
+(after! treemacs
+        (setq doom-themes-treemacs-theme 'doom-colors
+              doom-themes-treemacs-enable-variable-pitch nil))
 
 ;; Pick an image for dashboard
 ;;(defun random-choice (items)
@@ -63,10 +65,18 @@
             ranger-dont-show-binary t))
 
 ;; Projectile
-(setq projectile-project-search-path '("~/Code/")
-      projectile-auto-discover nil)
+(after! projectile
+        (setq projectile-project-search-path '("~/Code/")
+              projectile-auto-discover nil))
 
-;; lsp
+;; Counsel
+(after! counsel
+        (setq counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only))
+(map! "C-M-j" 'counsel-switch-buffer)
+(map! :map minibuffer-local-map
+      "C-r" 'counsel-minibuffer-history)
+
+;; Completion + lsp
 (after! company
       (setq company-idle-delay 0.5
             company-minimum-prefix-length 2)
@@ -81,7 +91,8 @@
 (after! lsp-clangd (set-lsp-priority! 'clangd 2))  ;; Use clangd instead of default ccls
 
 ;; Quicker which-key
-(setq which-key-idle-delay 0.5)
+(after! which-key
+        (setq which-key-idle-delay 0.5))
 
 ;; Org mode
 (setq org-directory "~/Documents/Org/"
@@ -128,10 +139,6 @@
 ;;      "e n" #'emms-next)
 
 ;; Modeline
-(setq display-time-day-and-date t)
-(display-time-mode 1)
-(if (not (equal "Battery status not available" (battery)))
-      (display-battery-mode 1))
 ;;(emms-mode-line 1)
 (setq doom-modeline-unicode-fallback t)
 
diff --git a/home/.config/doom/exwm.el b/home/.config/doom/exwm.el
index bd29c32..a1f2af8 100644
--- a/home/.config/doom/exwm.el
+++ b/home/.config/doom/exwm.el
@@ -92,7 +92,7 @@ You can find the original one at `exwm-config-ido-buffer-window-other-frame'."
   (add-hook 'exwm-manage-finish-hook #'follie/configure-window-by-class)
 
   ;; Automatically move EXWM buffer to current workspace
-  (setq exwm-layout-show-all-buffers t)
+  ;;(setq exwm-layout-show-all-buffers t)
   ;; Display all buffers in every workspace buffer list
   (setq exwm-workspace-show-all-buffers t)
 
@@ -107,7 +107,7 @@ You can find the original one at `exwm-config-ido-buffer-window-other-frame'."
 
   ;; System tray on minibuffer
   (require 'exwm-systemtray)
-  ;;(setq exwm-systemtray-height 12)
+  (setq exwm-systemtray-height 12)
   (exwm-systemtray-enable)
 
   ;; Automatically send cursor to the selected display
@@ -166,12 +166,12 @@ You can find the original one at `exwm-config-ido-buffer-window-other-frame'."
   (exwm-config-ido))
 
 ;; Control dunst
-(defun efs/disable-desktop-notifications ()
+(defun follie/disable-desktop-notifications ()
   (interactive)
   (start-process-shell-command "notify-send" nil "notify-send \"DUNST_COMMAND_PAUSE\""))
-(defun efs/enable-desktop-notifications ()
+(defun follie/enable-desktop-notifications ()
   (interactive)
   (start-process-shell-command "notify-send" nil "notify-send \"DUNST_COMMAND_RESUME\""))
-(defun efs/toggle-desktop-notifications ()
+(defun follie/toggle-desktop-notifications ()
   (interactive)
   (start-process-shell-command "notify-send" nil "notify-send \"DUNST_COMMAND_TOGGLE\""))