diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 526130e..c937b66 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -126,6 +126,11 @@ emacs -q --batch --eval '(require \'ob-tangle)' \
 --eval '(setq org-confirm-babel-evaluate nil)' \
 --eval '(org-babel-tangle-file "~/org/config/bin.org")'
 
+printf '\n\n==== Tangling emacs.org\n\n' && \
+emacs -q --batch --eval '(require \'ob-tangle)' \
+--eval '(setq org-confirm-babel-evaluate nil)' \
+--eval '(org-babel-tangle-file "~/org/config/emacs.org")'
+
 printf '\n\n==== Tangling fish.org\n\n' && \
 emacs -q --batch --eval '(require \'ob-tangle)' \
 --eval '(setq org-confirm-babel-evaluate nil)' \
@@ -146,11 +151,6 @@ emacs -q --batch --eval '(require \'ob-tangle)' \
 --eval '(setq org-confirm-babel-evaluate nil)' \
 --eval '(org-babel-tangle-file "~/org/config/rustfmt.org")'
 
-printf '\n\n==== Tangling spacemacs.org\n\n' && \
-emacs -q --batch --eval '(require \'ob-tangle)' \
---eval '(setq org-confirm-babel-evaluate nil)' \
---eval '(org-babel-tangle-file "~/org/config/spacemacs.org")'
-
 printf '\n\n==== Tangling tmux.org\n\n' && \
 emacs -q --batch --eval '(require \'ob-tangle)' \
 --eval '(setq org-confirm-babel-evaluate nil)' \
diff --git a/org/config/spacemacs.org b/org/config/emacs.org
similarity index 99%
rename from org/config/spacemacs.org
rename to org/config/emacs.org
index cfd1e28..603bda4 100644
--- a/org/config/spacemacs.org
+++ b/org/config/emacs.org
@@ -3890,4 +3890,4 @@
 
 [fn:2] [[https://labs.phundrak.com/phundrak/dotfiles/src/branch/master/.spacemacs][labs.phundrak.com/phundrak/dotfiles/src/branch/master/.spacemacs]]
 
-[fn:1] [[https://labs.phundrak.com/phundrak/dotfiles/src/branch/master/org/config/spacemacs.org][labs.phundrak.com/phundrak/dotfiles/src/branch/master/org/config/spacemacs.org]]
+[fn:1] [[https://labs.phundrak.com/phundrak/dotfiles/src/branch/master/org/config/emacs.org][labs.phundrak.com/phundrak/dotfiles/src/branch/master/org/config/emacs.org]]
diff --git a/org/config/index.org b/org/config/index.org
index 533eb1b..a66efbb 100644
--- a/org/config/index.org
+++ b/org/config/index.org
@@ -335,7 +335,7 @@
     #+end_quote
 
     You can find my Emacs config, based on Spacemacs, in my [[https://labs.phundrak.com/phundrak/dotfiles/src/branch/master/.spacemacs][.spacemacs]] file, and
-    my user configuration in my [[file:spacemacs.org][spacemacs.org]] file.
+    my user configuration in my [[file:emacs.org][emacs.org]] file.
 
 *** Nano (deprecated)
     :PROPERTIES:
diff --git a/org/config/installation.org b/org/config/installation.org
index ba5d9c3..c45016d 100644
--- a/org/config/installation.org
+++ b/org/config/installation.org
@@ -329,16 +329,16 @@
    The next step is  to tangle all the Org files. Here is the list of files that
    are to be tangled:
    #+NAME: tangled-files
-   | filename      |
-   |---------------|
-   | awesome.org   |
-   | bin.org       |
-   | fish.org      |
-   | index.org     |
-   | picom.org     |
-   | rustfmt.org   |
-   | spacemacs.org |
-   | tmux.org      |
+   | filename    |
+   |-------------|
+   | awesome.org |
+   | bin.org     |
+   | emacs.org   |
+   | fish.org    |
+   | index.org   |
+   | picom.org   |
+   | rustfmt.org |
+   | tmux.org    |
 
    #+NAME: generate-tangle
    #+BEGIN_SRC emacs-lisp :var files=tangled-files[,0]
@@ -351,7 +351,7 @@
                 "\n")
    #+END_SRC
 
-   #+RESULTS[3f6418dc98ed415c34e76eb1f55f00763b1af202]: generate-tangle
+   #+RESULTS[67c945c10d77b620097d8dc7d35017e3c848adc4]: generate-tangle
    #+begin_example
    printf '\n\n==== Tangling awesome.org\n\n' && \
    emacs -q --batch --eval '(require \'ob-tangle)' \
@@ -363,6 +363,11 @@
    --eval '(setq org-confirm-babel-evaluate nil)' \
    --eval '(org-babel-tangle-file "~/org/config/bin.org")'
 
+   printf '\n\n==== Tangling emacs.org\n\n' && \
+   emacs -q --batch --eval '(require \'ob-tangle)' \
+   --eval '(setq org-confirm-babel-evaluate nil)' \
+   --eval '(org-babel-tangle-file "~/org/config/emacs.org")'
+
    printf '\n\n==== Tangling fish.org\n\n' && \
    emacs -q --batch --eval '(require \'ob-tangle)' \
    --eval '(setq org-confirm-babel-evaluate nil)' \
@@ -383,11 +388,6 @@
    --eval '(setq org-confirm-babel-evaluate nil)' \
    --eval '(org-babel-tangle-file "~/org/config/rustfmt.org")'
 
-   printf '\n\n==== Tangling spacemacs.org\n\n' && \
-   emacs -q --batch --eval '(require \'ob-tangle)' \
-   --eval '(setq org-confirm-babel-evaluate nil)' \
-   --eval '(org-babel-tangle-file "~/org/config/spacemacs.org")'
-
    printf '\n\n==== Tangling tmux.org\n\n' && \
    emacs -q --batch --eval '(require \'ob-tangle)' \
    --eval '(setq org-confirm-babel-evaluate nil)' \
diff --git a/org/config/sitemap.org b/org/config/sitemap.org
index 860a5bf..3b774d9 100644
--- a/org/config/sitemap.org
+++ b/org/config/sitemap.org
@@ -2,7 +2,7 @@
 
 - [[file:awesome.org][AwesomeWM configuration]]
 - [[file:bin.org][Executable scripts]]
-- [[file:spacemacs.org][Emacs Configuration]]
+- [[file:emacs.org][Emacs Configuration]]
 - [[file:fish.org][Fish config]]
 - [[file:nano.org][Nano configuration (Deprecated)]]
 - [[file:ncmpcpp.org][Ncmpcpp Configuration (WIP)]]