diff --git a/.config/emacs/config.el b/.config/emacs/config.el
index 39e4561..0833ad4 100644
--- a/.config/emacs/config.el
+++ b/.config/emacs/config.el
@@ -478,8 +478,6 @@
     (evil-define-key 'normal git-timemachine-mode-map (kbd "C-k") 'git-timemachine-show-next-revision)
 )
 
-(use-package magit)
-
 (use-package hl-todo
   :hook ((org-mode . hl-todo-mode)
          (prog-mode . hl-todo-mode))
@@ -570,14 +568,14 @@
 
 (eval-after-load 'org-indent '(diminish 'org-indent-mode))
 
-  (custom-set-faces
-   '(org-level-1 ((t (:inherit outline-1 :height 1.7))))
-   '(org-level-2 ((t (:inherit outline-2 :height 1.6))))
-   '(org-level-3 ((t (:inherit outline-3 :height 1.5))))
-   '(org-level-4 ((t (:inherit outline-4 :height 1.4))))
-   '(org-level-5 ((t (:inherit outline-5 :height 1.3))))
-   '(org-level-6 ((t (:inherit outline-5 :height 1.2))))
-   '(org-level-7 ((t (:inherit outline-5 :height 1.1)))))
+(custom-set-faces
+ '(org-level-1 ((t (:inherit outline-1 :height 1.7))))
+ '(org-level-2 ((t (:inherit outline-2 :height 1.6))))
+ '(org-level-3 ((t (:inherit outline-3 :height 1.5))))
+ '(org-level-4 ((t (:inherit outline-4 :height 1.4))))
+ '(org-level-5 ((t (:inherit outline-5 :height 1.3))))
+ '(org-level-6 ((t (:inherit outline-5 :height 1.2))))
+ '(org-level-7 ((t (:inherit outline-5 :height 1.1)))))
 
 (require 'org-tempo)
 
@@ -657,11 +655,6 @@
 (setq use-dialog-box nil)    ;; No dialog box
 (setq pop-up-windows nil)    ;; No popup windows
 
-;; The eshell prompt
-(setopt eshell-prompt-function 'fancy-shell)
-(setopt eshell-prompt-regexp "^[^#$\n]* [$#] ")
-(setopt eshell-highlight-prompt nil)
-
 ;; Disabling company mode in eshell, because it's annoying.
 (setq company-global-modes '(not eshell-mode))
 
diff --git a/.config/emacs/config.org b/.config/emacs/config.org
index 2c365df..fd30784 100644
--- a/.config/emacs/config.org
+++ b/.config/emacs/config.org
@@ -27,7 +27,6 @@
 - [[#general-keybindings][GENERAL KEYBINDINGS]]
 - [[#git-programs][GIT PROGRAMS]]
   - [[#git-time-machine][Git Time Machine]]
-  - [[#magit][Magit]]
 - [[#highlight-todo][HIGHLIGHT TODO]]
 - [[#ivy-counsel][IVY (COUNSEL)]]
 - [[#language-support][LANGUAGE SUPPORT]]
@@ -643,14 +642,6 @@ You can use the bindings CTRL plus =/- for zooming in/out.  You can also use CTR
 )
 #+end_src
 
-** Magit
-[[https://magit.vc/manual/][Magit]] is a full-featured git client for Emacs.
-
-#+begin_src emacs-lisp
-(use-package magit)
-
-#+end_src
-
 * HIGHLIGHT TODO
 Adding highlights to TODO and related words.
 
@@ -953,10 +944,6 @@ In my configs, all of my shells (bash, fish, zsh and the ESHELL) require my shel
 Eshell is an Emacs 'shell' that is written in Elisp.
 
 #+begin_src emacs-lisp
-;; The eshell prompt
-(setopt eshell-prompt-function 'fancy-shell)
-(setopt eshell-prompt-regexp "^[^#$\n]* [$#] ")
-(setopt eshell-highlight-prompt nil)
 
 ;; Disabling company mode in eshell, because it's annoying.
 (setq company-global-modes '(not eshell-mode))
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index d5fd26d..e5d82df 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -8,7 +8,13 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
-   '("02f57ef0a20b7f61adce51445b68b2a7e832648ce2e7efb19d217b6454c1b644" "6945dadc749ac5cbd47012cad836f92aea9ebec9f504d32fe89a956260773ca4" "944d52450c57b7cbba08f9b3d08095eb7a5541b0ecfb3a0a9ecd4a18f3c28948" "636b135e4b7c86ac41375da39ade929e2bd6439de8901f53f88fde7dd5ac3561" "1f669e8abe4dc2855268c9a607b5e350e2811b3c5afd09af5939ff0c01a89c5a" default))
+   '("02f57ef0a20b7f61adce51445b68b2a7e832648ce2e7efb19d217b6454c1b644"
+     "6945dadc749ac5cbd47012cad836f92aea9ebec9f504d32fe89a956260773ca4"
+     "944d52450c57b7cbba08f9b3d08095eb7a5541b0ecfb3a0a9ecd4a18f3c28948"
+     "636b135e4b7c86ac41375da39ade929e2bd6439de8901f53f88fde7dd5ac3561"
+     "1f669e8abe4dc2855268c9a607b5e350e2811b3c5afd09af5939ff0c01a89c5a"
+     default))
+ '(package-selected-packages '(magit taxy-magit-section))
  '(send-mail-function 'smtpmail-send-it)
  '(smtpmail-smtp-server "smtp.1and1.com")
  '(smtpmail-smtp-service 587))
diff --git a/.config/emacs/scripts/elpaca-setup.el b/.config/emacs/scripts/elpaca-setup.el
index 0eae777..3066abc 100644
--- a/.config/emacs/scripts/elpaca-setup.el
+++ b/.config/emacs/scripts/elpaca-setup.el
@@ -1,7 +1,7 @@
 
 ;;; Code:
 
-(defvar elpaca-installer-version 0.8)
+(defvar elpaca-installer-version 0.10)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@@ -62,6 +62,11 @@
 
 ;; Don't install anything. Defer execution of BODY
 ;;(elpaca nil (message "deferred"))
+(elpaca (magit :branch "main" :pre-build ("make" "info")))
+(elpaca (forge :branch "main"))
+(elpaca (ghub :branch "main"))
+(elpaca (transient :branch "main"))
+(elpaca (with-editor :branch "main"))
 
 (provide 'elpaca-setup)