diff --git a/.gitignore b/.gitignore
index e0114d1..7d58ec6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 TAGS
 mpd/*
 ncmpcpp/*
+*.elc
 Emacs/.config/emacs/transient/*
 Emacs/.config/emacs/straight/*
-Doom/.doom.d/org/*.el
-*.elc
 Emacs/.config/emacs/elpa/
-Doom/.doom.d/modules/private/bindings/*.el
+Doom/.config/doom/org/*.el
+Doom/.config/doom/modules/private/bindings/*.el
diff --git a/Doom/.doom.d/README.org b/Doom/.config/doom/README.org
similarity index 100%
rename from Doom/.doom.d/README.org
rename to Doom/.config/doom/README.org
diff --git a/Doom/.doom.d/config.el b/Doom/.config/doom/config.el
similarity index 100%
rename from Doom/.doom.d/config.el
rename to Doom/.config/doom/config.el
diff --git a/Doom/.doom.d/init.el b/Doom/.config/doom/init.el
similarity index 99%
rename from Doom/.doom.d/init.el
rename to Doom/.config/doom/init.el
index 16f7ef2..19e9d44 100644
--- a/Doom/.doom.d/init.el
+++ b/Doom/.config/doom/init.el
@@ -9,12 +9,12 @@
 ;; found in modules/README.org.
 (doom! :private
        ;;(oreoline)
-       (bindings)
-       (startup)
-       (gentemplate)
+       bindings
+       startup
+       gentemplate
+       narrow
        ;; (ocaml +lsp)
        ;; (rss +elfeed)
-       (narrow)
        ;;(completion)
 
        :input
diff --git a/Doom/.doom.d/modules/private/bindings/README.org b/Doom/.config/doom/modules/private/bindings/README.org
similarity index 100%
rename from Doom/.doom.d/modules/private/bindings/README.org
rename to Doom/.config/doom/modules/private/bindings/README.org
diff --git a/Doom/.doom.d/modules/private/completion/config.el b/Doom/.config/doom/modules/private/completion/config.el
similarity index 100%
rename from Doom/.doom.d/modules/private/completion/config.el
rename to Doom/.config/doom/modules/private/completion/config.el
diff --git a/Doom/.doom.d/modules/private/gentemplate/README.org b/Doom/.config/doom/modules/private/gentemplate/README.org
similarity index 100%
rename from Doom/.doom.d/modules/private/gentemplate/README.org
rename to Doom/.config/doom/modules/private/gentemplate/README.org
diff --git a/Doom/.doom.d/modules/private/gentemplate/config.el b/Doom/.config/doom/modules/private/gentemplate/config.el
similarity index 100%
rename from Doom/.doom.d/modules/private/gentemplate/config.el
rename to Doom/.config/doom/modules/private/gentemplate/config.el
diff --git a/Doom/.doom.d/modules/private/narrow/README.org b/Doom/.config/doom/modules/private/narrow/README.org
similarity index 100%
rename from Doom/.doom.d/modules/private/narrow/README.org
rename to Doom/.config/doom/modules/private/narrow/README.org
diff --git a/Doom/.doom.d/modules/private/narrow/config.el b/Doom/.config/doom/modules/private/narrow/config.el
similarity index 100%
rename from Doom/.doom.d/modules/private/narrow/config.el
rename to Doom/.config/doom/modules/private/narrow/config.el
diff --git a/Doom/.doom.d/modules/private/ocaml/README.org b/Doom/.config/doom/modules/private/ocaml/README.org
similarity index 100%
rename from Doom/.doom.d/modules/private/ocaml/README.org
rename to Doom/.config/doom/modules/private/ocaml/README.org
diff --git a/Doom/.doom.d/modules/private/ocaml/config.el b/Doom/.config/doom/modules/private/ocaml/config.el
similarity index 100%
rename from Doom/.doom.d/modules/private/ocaml/config.el
rename to Doom/.config/doom/modules/private/ocaml/config.el
diff --git a/Doom/.doom.d/modules/private/ocaml/packages.el b/Doom/.config/doom/modules/private/ocaml/packages.el
similarity index 100%
rename from Doom/.doom.d/modules/private/ocaml/packages.el
rename to Doom/.config/doom/modules/private/ocaml/packages.el
diff --git a/Doom/.doom.d/modules/private/oreoline/README.org b/Doom/.config/doom/modules/private/oreoline/README.org
similarity index 100%
rename from Doom/.doom.d/modules/private/oreoline/README.org
rename to Doom/.config/doom/modules/private/oreoline/README.org
diff --git a/Doom/.doom.d/modules/private/oreoline/config.el b/Doom/.config/doom/modules/private/oreoline/config.el
similarity index 100%
rename from Doom/.doom.d/modules/private/oreoline/config.el
rename to Doom/.config/doom/modules/private/oreoline/config.el
diff --git a/Doom/.doom.d/modules/private/oreoline/packages.el b/Doom/.config/doom/modules/private/oreoline/packages.el
similarity index 100%
rename from Doom/.doom.d/modules/private/oreoline/packages.el
rename to Doom/.config/doom/modules/private/oreoline/packages.el
diff --git a/Doom/.doom.d/modules/private/rss/README.org b/Doom/.config/doom/modules/private/rss/README.org
similarity index 100%
rename from Doom/.doom.d/modules/private/rss/README.org
rename to Doom/.config/doom/modules/private/rss/README.org
diff --git a/Doom/.doom.d/modules/private/rss/config.el b/Doom/.config/doom/modules/private/rss/config.el
similarity index 100%
rename from Doom/.doom.d/modules/private/rss/config.el
rename to Doom/.config/doom/modules/private/rss/config.el
diff --git a/Doom/.doom.d/modules/private/rss/packages.el b/Doom/.config/doom/modules/private/rss/packages.el
similarity index 100%
rename from Doom/.doom.d/modules/private/rss/packages.el
rename to Doom/.config/doom/modules/private/rss/packages.el
diff --git a/Doom/.doom.d/modules/private/startup/README.org b/Doom/.config/doom/modules/private/startup/README.org
similarity index 100%
rename from Doom/.doom.d/modules/private/startup/README.org
rename to Doom/.config/doom/modules/private/startup/README.org
diff --git a/Doom/.doom.d/modules/private/startup/config.el b/Doom/.config/doom/modules/private/startup/config.el
similarity index 51%
rename from Doom/.doom.d/modules/private/startup/config.el
rename to Doom/.config/doom/modules/private/startup/config.el
index e2e6722..48c4f5f 100644
--- a/Doom/.doom.d/modules/private/startup/config.el
+++ b/Doom/.config/doom/modules/private/startup/config.el
@@ -8,5 +8,7 @@ Time of startup: %s"
           (emacs-init-time)
           (current-time-string (current-time))))
 
-(setq-default mode-line-format (list "%l:%c %P \t %+%b(" '(:eval (format "%s" major-mode)) ") \t %I \t" vc-mode mode-line-end-spaces))
-(setq initial-scratch-message (+startup/create-scratch-message))
+(add-hook 'doom-first-input-hook
+          #'(lambda ()
+              (setq-default mode-line-format (list "%l:%c %P \t %+%b(" '(:eval (format "%s" major-mode)) ") \t %I \t" vc-mode mode-line-end-spaces))
+              (setq-default initial-scratch-message (+startup/create-scratch-message))))
diff --git a/Doom/.doom.d/org/config.org b/Doom/.config/doom/org/config.org
similarity index 100%
rename from Doom/.doom.d/org/config.org
rename to Doom/.config/doom/org/config.org
diff --git a/Doom/.doom.d/org/literate.org b/Doom/.config/doom/org/literate.org
similarity index 100%
rename from Doom/.doom.d/org/literate.org
rename to Doom/.config/doom/org/literate.org
diff --git a/Doom/.doom.d/org/packages.org b/Doom/.config/doom/org/packages.org
similarity index 100%
rename from Doom/.doom.d/org/packages.org
rename to Doom/.config/doom/org/packages.org
diff --git a/Doom/.doom.d/org/personal.org b/Doom/.config/doom/org/personal.org
similarity index 100%
rename from Doom/.doom.d/org/personal.org
rename to Doom/.config/doom/org/personal.org
diff --git a/Doom/.doom.d/packages.el b/Doom/.config/doom/packages.el
similarity index 100%
rename from Doom/.doom.d/packages.el
rename to Doom/.config/doom/packages.el
diff --git a/Doom/.doom.d/snippets/c++-mode/For_reverse b/Doom/.config/doom/snippets/c++-mode/For_reverse
similarity index 100%
rename from Doom/.doom.d/snippets/c++-mode/For_reverse
rename to Doom/.config/doom/snippets/c++-mode/For_reverse
diff --git a/Doom/.doom.d/snippets/csharp-mode/class ... { ... } b/Doom/.config/doom/snippets/csharp-mode/class ... { ... }
similarity index 100%
rename from Doom/.doom.d/snippets/csharp-mode/class ... { ... }
rename to Doom/.config/doom/snippets/csharp-mode/class ... { ... }
diff --git a/Doom/.doom.d/snippets/csharp-mode/foreach b/Doom/.config/doom/snippets/csharp-mode/foreach
similarity index 100%
rename from Doom/.doom.d/snippets/csharp-mode/foreach
rename to Doom/.config/doom/snippets/csharp-mode/foreach
diff --git a/Doom/.doom.d/snippets/csharp-mode/method b/Doom/.config/doom/snippets/csharp-mode/method
similarity index 100%
rename from Doom/.doom.d/snippets/csharp-mode/method
rename to Doom/.config/doom/snippets/csharp-mode/method
diff --git a/Doom/.doom.d/snippets/csharp-mode/params b/Doom/.config/doom/snippets/csharp-mode/params
similarity index 100%
rename from Doom/.doom.d/snippets/csharp-mode/params
rename to Doom/.config/doom/snippets/csharp-mode/params
diff --git a/Doom/.doom.d/snippets/csharp-mode/prop b/Doom/.config/doom/snippets/csharp-mode/prop
similarity index 100%
rename from Doom/.doom.d/snippets/csharp-mode/prop
rename to Doom/.config/doom/snippets/csharp-mode/prop
diff --git a/Doom/.doom.d/snippets/csharp-mode/returns b/Doom/.config/doom/snippets/csharp-mode/returns
similarity index 100%
rename from Doom/.doom.d/snippets/csharp-mode/returns
rename to Doom/.config/doom/snippets/csharp-mode/returns
diff --git a/Doom/.doom.d/snippets/org-mode/author b/Doom/.config/doom/snippets/org-mode/author
similarity index 100%
rename from Doom/.doom.d/snippets/org-mode/author
rename to Doom/.config/doom/snippets/org-mode/author
diff --git a/Doom/.doom.d/snippets/org-mode/date b/Doom/.config/doom/snippets/org-mode/date
similarity index 100%
rename from Doom/.doom.d/snippets/org-mode/date
rename to Doom/.config/doom/snippets/org-mode/date
diff --git a/Doom/.doom.d/snippets/org-mode/description b/Doom/.config/doom/snippets/org-mode/description
similarity index 100%
rename from Doom/.doom.d/snippets/org-mode/description
rename to Doom/.config/doom/snippets/org-mode/description
diff --git a/Doom/.doom.d/snippets/org-mode/img b/Doom/.config/doom/snippets/org-mode/img
similarity index 100%
rename from Doom/.doom.d/snippets/org-mode/img
rename to Doom/.config/doom/snippets/org-mode/img
diff --git a/Doom/.doom.d/snippets/org-mode/include b/Doom/.config/doom/snippets/org-mode/include
similarity index 100%
rename from Doom/.doom.d/snippets/org-mode/include
rename to Doom/.config/doom/snippets/org-mode/include
diff --git a/Doom/.doom.d/snippets/org-mode/review b/Doom/.config/doom/snippets/org-mode/review
similarity index 100%
rename from Doom/.doom.d/snippets/org-mode/review
rename to Doom/.config/doom/snippets/org-mode/review
diff --git a/Doom/.doom.d/snippets/org-mode/title b/Doom/.config/doom/snippets/org-mode/title
similarity index 100%
rename from Doom/.doom.d/snippets/org-mode/title
rename to Doom/.config/doom/snippets/org-mode/title
diff --git a/Doom/.doom.d/snippets/web-mode/New component b/Doom/.config/doom/snippets/web-mode/New component
similarity index 100%
rename from Doom/.doom.d/snippets/web-mode/New component
rename to Doom/.config/doom/snippets/web-mode/New component
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 5bf0027..7e727e9 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -102,11 +102,11 @@ window:
 # Font configuration
 font:
   # Normal (roman) font face
-  normal:
-      Default:
-       - (macOS) Menlo
-       - (Linux/BSD) monospace
-       - (Windows) Consolas
+  # normal:
+  #     Default:
+  #      - (macOS) Menlo
+  #      - (Linux/BSD) monospace
+  #      - (Windows) Consolas
   family: Fira Code
   style: Regular