diff --git a/.spacemacs b/.spacemacs
index 3f301f8..b3360a3 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -31,32 +31,37 @@ values."
    ;; List of configuration layers to load.
    dotspacemacs-configuration-layers
    '(html
-     org
-     org-roam
-     org-gcal
-     ;; org-jira
-     mu4e
+     ;; mu4e
      ;; w3m
      python
      yaml
+     markdown
+     sql
      asciidoc
      ;; ----------------------------------------------------------------
      ;; Example of useful layers you may want to use right away.
      ;; Uncomment some layer names and press <SPC f e R> (Vim style) or
      ;; <M-m f e R> (Emacs style) to install them.
      ;; ----------------------------------------------------------------
-     helm
      auto-completion
      better-defaults
      emacs-lisp
      git
-     markdown
+     helm
+     ;; lsp
+     multiple-cursors
+     (org :variables
+          org-enable-roam-support t)
+     org-gcal
+     ;; org-jira
+     bibtex
      (shell :variables
             shell-default-height 30
             shell-default-position 'bottom)
      spell-checking
      syntax-checking
      version-control
+     treemacs
      )
    ;; List of additional packages that will be installed without being
    ;; wrapped in a layer. If you need some configuration for these
@@ -66,7 +71,7 @@ values."
                                       w3m
                                       elpy
                                       emacsql
-                                      emacsql-lite
+                                      ;; emacsql-lite
                                       org-web-tools
                                      )
    ;; A list of packages that cannot be updated.
@@ -281,7 +286,7 @@ values."
    ;; (default nil)
    dotspacemacs-smartparens-strict-mode nil
    ;; If non-nil pressing the closing parenthesis `)' key in insert mode passes
-   ;; over any automatically added closing parenthesis, bracket, quote, etc…
+   ;; over any automatically added closing parenthesis, bracket, quote, etc???
    ;; This can be temporary disabled by pressing `C-q' before `)'. (default nil)
    dotspacemacs-smart-closing-parenthesis nil
    ;; Select a scope to highlight delimiters. Possible values are `any',
@@ -348,7 +353,7 @@ you should place your code here."
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- ;; '(org-roam-directory "/mnt/wavier/perso/roam-notes")
+ '(org-roam-directory "/home/wavier/perso/roam-notes")
  '(package-selected-packages
    '(yapfify yaml-mode xterm-color unfill powerline smeargle shell-pop pytest pyenv-mode py-isort pip-requirements spinner orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download mwim multi-term magit-gitflow magit-popup live-py-mode hydra lv hy-mode dash-functional htmlize parent-mode helm-pydoc projectile helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter fuzzy flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck pkg-info epl flx highlight evil-magit magit git-commit with-editor transient smartparens iedit anzu evil goto-chg undo-tree eshell-z eshell-prompt-extras esh-help elpy pyvenv diff-hl cython-mode company-statistics company-anaconda bind-map bind-key auto-yasnippet yasnippet auto-dictionary packed anaconda-mode pythonic f dash s adoc-mode markup-faces helm avy helm-core async ac-ispell auto-complete popup mmm-mode markdown-toc markdown-mode gh-md company org-roam-server evil-unimpaired sqlite sqlite3 emacsql-sqlite3 org-roam ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu elisp-slime-nav dumb-jump diminish define-word column-enforce-mode clean-aindent-mode auto-highlight-symbol auto-compile aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line)))
 (custom-set-faces
@@ -373,13 +378,13 @@ This function is called at the very end of Spacemacs initialization."
    '("fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" default))
  '(evil-want-Y-yank-to-eol nil)
  '(helm-completion-style 'emacs)
- '(mu4e-maildir "/home/wavier/mailrepo")
+ '(mu4e-maildir "/home/wavier/mailrepo" t)
  '(package-selected-packages
-   '(web-mode web-beautify tagedit slim-mode scss-mode sass-mode pug-mode prettier-js impatient-mode simple-httpd helm-css-scss haml-mode emmet-mode counsel-css counsel swiper ivy company-web web-completion-data add-node-modules-path yapfify yaml-mode xterm-color unfill powerline smeargle shell-pop pytest pyenv-mode py-isort pip-requirements spinner orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download mwim multi-term magit-gitflow magit-popup live-py-mode hydra lv hy-mode dash-functional htmlize parent-mode helm-pydoc projectile helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter fuzzy flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck pkg-info epl flx highlight evil-magit magit git-commit with-editor transient smartparens iedit anzu evil goto-chg undo-tree eshell-z eshell-prompt-extras esh-help elpy pyvenv diff-hl cython-mode company-statistics company-anaconda bind-map bind-key auto-yasnippet yasnippet auto-dictionary packed anaconda-mode pythonic f dash s adoc-mode markup-faces helm avy helm-core async ac-ispell auto-complete popup mmm-mode markdown-toc markdown-mode gh-md company org-roam-server evil-unimpaired sqlite sqlite3 emacsql-sqlite3 org-roam ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu elisp-slime-nav dumb-jump diminish define-word column-enforce-mode clean-aindent-mode auto-highlight-symbol auto-compile aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line)))
+   '(aio web-mode web-beautify tagedit slim-mode scss-mode sass-mode pug-mode prettier-js impatient-mode simple-httpd helm-css-scss haml-mode emmet-mode counsel-css counsel swiper ivy company-web web-completion-data add-node-modules-path yapfify yaml-mode xterm-color unfill powerline smeargle shell-pop pytest pyenv-mode py-isort pip-requirements spinner orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download mwim multi-term magit-gitflow magit-popup live-py-mode hydra lv hy-mode dash-functional htmlize parent-mode helm-pydoc projectile helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter fuzzy flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck pkg-info epl flx highlight evil-magit magit git-commit with-editor transient smartparens iedit anzu evil goto-chg undo-tree eshell-z eshell-prompt-extras esh-help elpy pyvenv diff-hl cython-mode company-statistics company-anaconda bind-map bind-key auto-yasnippet yasnippet auto-dictionary packed anaconda-mode pythonic f dash s adoc-mode markup-faces helm avy helm-core async ac-ispell auto-complete popup mmm-mode markdown-toc markdown-mode gh-md company org-roam-server evil-unimpaired sqlite sqlite3 emacsql-sqlite3 org-roam ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu elisp-slime-nav dumb-jump diminish define-word column-enforce-mode clean-aindent-mode auto-highlight-symbol auto-compile aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(highlight-parentheses-highlight ((nil (:weight ultra-bold))) t))
 )
diff --git a/private/org/README.org b/private/xxx-org/README.org
similarity index 100%
rename from private/org/README.org
rename to private/xxx-org/README.org
diff --git a/private/org/packages.el b/private/xxx-org/packages.el
similarity index 100%
rename from private/org/packages.el
rename to private/xxx-org/packages.el