diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el
index d7feaef..dc35e2d 100644
--- a/dot_doom.d/config.el
+++ b/dot_doom.d/config.el
@@ -80,7 +80,7 @@
   (if (project-current)
      (setq lsp-dart-flutter-sdk-dir (concat (project-root (project-current)) ".fvm/flutter_sdk")))
 )
-(add-hook 'projectile-after-switch-project-hook #'on-switch-project-update-flutter-path)
+(add-hook 'projectile-before-switch-project-hook #'on-switch-project-update-flutter-path)
 
 ;; (use-package! lsp-dart
 ;;   :hook (dart-mode . lsp)
@@ -98,3 +98,27 @@
   (setq lsp-rust-server 'rust-analyzer
         lsp-rust-analyzer-server-display-inlay-hints t
         lsp-metals-show-inferred-type t))
+
+;; Centaur tabs custom conf | See ema2159/centaur-tabs in github
+(use-package! centaur-tabs
+   :config
+   (setq centaur-tabs-style "wave"
+	  centaur-tabs-height 32
+	  centaur-tabs-set-icons t
+	  centaur-tabs-set-modified-marker t
+	  centaur-tabs-set-bar 'over
+	  x-underline-at-descent-line t)
+   (centaur-tabs-headline-match)
+   (centaur-tabs-mode t)
+   :hook
+   (calendar-mode . centaur-tabs-local-mode)
+   (org-agenda-mode . centaur-tabs-local-mode)
+   :bind
+   ("C-<prior>" . centaur-tabs-backward)
+   ("C-<next>" . centaur-tabs-forward)
+   ("C-c t s" . centaur-tabs-counsel-switch-group)
+   ("C-c t p" . centaur-tabs-group-by-projectile-project)
+   ("C-c t g" . centaur-tabs-group-buffer-groups)
+   (:map evil-normal-state-map
+	  ("g t" . centaur-tabs-forward)
+	  ("g T" . centaur-tabs-backward)))