diff --git a/00-run-installers.sh b/00-run-installers.sh
index d738e0ca3a6375c73347e60c8e376871d3683e89..15f6983e19c347232adcd51bdb50b15429efbc0c 100755
--- a/00-run-installers.sh
+++ b/00-run-installers.sh
@@ -21,4 +21,4 @@ export -f mefs_message
 ./02-chemacs-setup.sh
 ./03-clone-spacemacs-develop.sh
 ./04-multiple-spacemacs-configs.sh
-./05-doom-setup.sh
+# ./05-doom-setup.sh
diff --git a/03-clone-spacemacs-develop.sh b/03-clone-spacemacs-develop.sh
index 751796cd4c2e24e9c57ea1255e53c86f345cac36..e91cf0be68df6b5977590399ee5fde0fa65da9b2 100755
--- a/03-clone-spacemacs-develop.sh
+++ b/03-clone-spacemacs-develop.sh
@@ -8,4 +8,4 @@ mefs_indent_message "Cloning spacemacs repo..."
 cd $mefs_FLAVORDIR/spacemacs-develop
 git checkout develop
 
-emacs --with-profile develop
+emacs --with-profile develop -nw
diff --git a/99-emacs-and-tools.sh b/99-emacs-and-tools.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9cba509d2f15ca7559d495761b08a82f3c8fed5a
--- /dev/null
+++ b/99-emacs-and-tools.sh
@@ -0,0 +1 @@
+sudo pacman --sync --needed --noconfirm cmake the_silver_searcher emacs
diff --git a/dot.emacs-profiles.el b/dot.emacs-profiles.el
index 743379a924eaf5e58197e08cb37ff74776090028..7a8e58e01c448f6bc50fe65e1b545972dbaa458b 100644
--- a/dot.emacs-profiles.el
+++ b/dot.emacs-profiles.el
@@ -9,13 +9,13 @@
  ;; SPACEMACS MULTIPLE CONFIGURATIONS STARTS HERE
 ("spacemacs-test" . ((user-emacs-directory . "~/emacs/flavors/spacemacs-test")
 (env . (("SPACEMACSDIR" . "~/emacs/configs/spacemacs-test")))))
+("spacemacs-pietrodito" . ((user-emacs-directory . "~/emacs/flavors/spacemacs-pietrodito")
+(env . (("SPACEMACSDIR" . "~/emacs/configs/spacemacs-pietrodito")))))
 ("spacemacs-minimal" . ((user-emacs-directory . "~/emacs/flavors/spacemacs-minimal")
 (env . (("SPACEMACSDIR" . "~/emacs/configs/spacemacs-minimal")))))
 ("spacemacs-develop" . ((user-emacs-directory . "~/emacs/flavors/spacemacs-develop")
 (env . (("SPACEMACSDIR" . "~/emacs/configs/spacemacs-develop")))))
 ("spacemacs-default" . ((user-emacs-directory . "~/emacs/flavors/spacemacs-default")
 (env . (("SPACEMACSDIR" . "~/emacs/configs/spacemacs-default")))))
-("spacemacs-pietrodito" . ((user-emacs-directory . "~/emacs/flavors/spacemacs-pietrodito")
-(env . (("SPACEMACSDIR" . "~/emacs/configs/spacemacs-pietrodito")))))
  ;; SPACEMACS MULTIPLE CONFIGURATIONS ENDS HERE
  )
diff --git a/layers/general/layers.el b/layers/general/layers.el
index 77e1c42298ccdf16f03837e79fc95360022d84cf..b8cc183208663677c87277d2eaa61089de964e09 100644
--- a/layers/general/layers.el
+++ b/layers/general/layers.el
@@ -1,7 +1,7 @@
 (configuration-layer/declare-layers
  '(
    (shell :variables
-          shell-default-term-shell 'vterm
+          shell-default-shell 'vterm
           shell-default-height 30
           shell-default-position 'bottom)
    (helm :variables