diff --git a/bedrock-full.el b/bedrock-full.el
index 530b87bedfa40e20a6e4dc957f8c50a25842153e..383d01cd0f20f5a566e8a973734ad908747d7c1f 100644
--- a/bedrock-full.el
+++ b/bedrock-full.el
@@ -5,4 +5,17 @@
 ;; Author: Emmanuel Agullo <eagullo@tek11>
 ;; Keywords: emacs emacs-bedrock emacs-starter-kit ide hpc
 
-(provide bedrock-full)
+(use-package emacs
+  :config
+  ;; Treesitter config
+  (add-to-list 'major-mode-remap-alist '(bash-mode . bash-ts-mode))
+  (add-to-list 'major-mode-remap-alist '(bibtex-mode . bibtex-ts-mode))
+  (add-to-list 'major-mode-remap-alist '(c-mode . c-ts-mode))
+  (add-to-list 'major-mode-remap-alist '(c++-mode . c++-ts-mode))
+  (add-to-list 'major-mode-remap-alist
+               '(c-or-c++-mode . c-or-c++-ts-mode))
+  ;; (add-to-list 'major-mode-remap-alist '(cmake-mode . cmake-ts-mode))
+  ;; (add-to-list 'major-mode-remap-alist '(julia-mode . julia-ts-mode))
+  (add-to-list 'major-mode-remap-alist '  (python-mode . python-ts-mode)))
+
+(provide 'bedrock-full)