diff --git a/.config/doom/config.el b/.config/doom/config.el
index 40c65ea..37076da 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -93,10 +93,9 @@
   (setq org-log-into-drawer t)
 
   (setq org-agenda-files
-        '("~/org/planner.org"
-          "~/org/archive.org"
-          "~/org/dates.org"
-          "~/org/journal.org"))
+        '("~/org/planner"
+          "~/org/projects"
+          "~/org/archive"))
 
   (require 'org-habit)
   (add-to-list 'org-modules 'org-habit)
@@ -146,13 +145,17 @@
       (org-agenda-files org-agenda-files)))))
 
   (setq org-capture-templates
-    `(("t" "Tasks / Projects")
-      ("tt" "Task" entry (file+olp "/home/ry/org/planner.org" "Inbox")
+    `(("t" "Tasks")
+      ("tt" "Task" entry (file+olp "~/org/planner/tasks.org" "Inbox")
            "* TODO %?\n  %U\n  %a\n  %i" :empty-lines 1)
 
+      ("p" "Projects")
+      ("pp" "Project File" entry (file+olp "~/org/projects/auto-infra-overview.org" "Inbox")
+            "* TODO %?\n  %U\n  %a\n  %i" :empty-lines 1)
+
       ("j" "Journal Entries")
       ("jj" "Journal" entry
-           (file+olp+datetree "/home/ry/org/journal.org")
+           (file+olp+datetree "~/org/planner/journal.org")
            "\n* %<%I:%M %p> - Journal :journal:\n\n%?\n\n"
            :clock-in :clock-resume
            :empty-lines 1)))
diff --git a/.config/doom/init.el b/.config/doom/init.el
index d3b2bbb..b78f39d 100644
--- a/.config/doom/init.el
+++ b/.config/doom/init.el
@@ -135,7 +135,7 @@
        ;;(haskell +lsp)    ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ; a language you can depend on
-       ;;json              ; At least it ain't XML
+       json              ; At least it ain't XML
        ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
        ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
        ;;julia             ; a better, faster MATLAB
@@ -168,11 +168,11 @@
        ;;swift             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
        ;;web               ; the tubes
-       ;;yaml              ; JSON, but readable
+       yaml              ; JSON, but readable
        ;;zig               ; C, but simpler
 
        :email
-       ;;(mu4e +org +gmail)
+       (mu4e +org +gmail)
        ;;notmuch
        ;;(wanderlust +gmail)
 
@@ -181,7 +181,7 @@
        ;;emms
        ;;everywhere        ; *leave* Emacs!? You must be joking
        ;;irc               ; how neckbeards socialize
-       ;;(rss +org)        ; emacs as an RSS reader
+       (rss +org)        ; emacs as an RSS reader
        ;;twitter           ; twitter client https://twitter.com/vnought
 
        :config
diff --git a/Emacs.org b/Emacs.org
index 6b717d5..95673d0 100644
--- a/Emacs.org
+++ b/Emacs.org
@@ -148,10 +148,9 @@ Main Org/Agenda configuration.
   (setq org-log-into-drawer t)
 
   (setq org-agenda-files
-        '("~/org/planner.org"
-          "~/org/archive.org"
-          "~/org/dates.org"
-          "~/org/journal.org"))
+        '("~/org/planner"
+          "~/org/projects"
+          "~/org/archive"))
 
   (require 'org-habit)
   (add-to-list 'org-modules 'org-habit)
@@ -201,13 +200,17 @@ Main Org/Agenda configuration.
       (org-agenda-files org-agenda-files)))))
 
   (setq org-capture-templates
-    `(("t" "Tasks / Projects")
-      ("tt" "Task" entry (file+olp "/home/ry/org/planner.org" "Inbox")
+    `(("t" "Tasks")
+      ("tt" "Task" entry (file+olp "~/org/planner/tasks.org" "Inbox")
            "* TODO %?\n  %U\n  %a\n  %i" :empty-lines 1)
 
+      ("p" "Projects")
+      ("pp" "Project File" entry (file+olp "~/org/projects/auto-infra-overview.org" "Inbox")
+            "* TODO %?\n  %U\n  %a\n  %i" :empty-lines 1)
+
       ("j" "Journal Entries")
       ("jj" "Journal" entry
-           (file+olp+datetree "/home/ry/org/journal.org")
+           (file+olp+datetree "~/org/planner/journal.org")
            "\n* %<%I:%M %p> - Journal :journal:\n\n%?\n\n"
            :clock-in :clock-resume
            :empty-lines 1)))
@@ -217,7 +220,6 @@ Main Org/Agenda configuration.
 #+end_src
 
 
-
 ** Better Heading Bullets
 
 #+begin_src emacs-lisp