diff --git a/.emacs.d/settings.org b/.emacs.d/settings.org
index fe11539..dcf8b1c 100644
--- a/.emacs.d/settings.org
+++ b/.emacs.d/settings.org
@@ -18,8 +18,7 @@ Shamelessly stole this from Simponic, made some modifications myself.
   	:ensure t)
 #+END_SRC
 ** Configure some packages for internal only
-#+BEGIN_SRC emacs-lisp
-  ;; (use-package eldoc :straight (:type built-in))
+#+BEGIN_SRC disabled
   (use-package flymake :straight (:type built-in))
 #+END_SRC
 * General emacs
@@ -470,9 +469,33 @@ Indent using tabs, render with tab-width of 2.
   (font-lock-add-keywords 'org-mode
   												'(("^ *\\([-]\\) "
   													 (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
+  ;; Agenda stuff
+  (setq org-agenda-files '("~/org"))
+  (setq org-log-done 'time)
+
+  ;; Follow links
+  (setq org-return-follows-link t)
+
+  ;; Priority key bindings
+  (define-key org-mode-map (kbd "C-c C-p") 'org-priority-up)
+  (define-key org-mode-map (kbd "C-c C-n") 'org-priority-down)
+
+  (define-key global-map (kbd "C-c l") 'org-store-link)
+  (define-key global-map (kbd "C-c a") 'org-agenda)
+  (define-key global-map (kbd "C-c c") 'org-capture)
+
+  (add-hook 'org-mode-hook 'visual-line-mode)
 #+END_SRC
 
-#+RESULTS:
+** Extra Plugins
+
+#+BEGIN_SRC emacs-lisp
+  (use-package org-super-agenda
+  	:ensure t)
+
+  (use-package comment-tags
+  	:ensure t)
+#+END_SRC
 
 ** Fonts
 #+BEGIN_SRC emacs-lisp
@@ -537,13 +560,6 @@ Indent using tabs, render with tab-width of 2.
   	)
 
 #+END_SRC
-** Auto Text Wrap
-#+BEGIN_SRC emacs-lisp
-  ;; (add-hook 'org-mode-hook (lambda ()
-  ;;                            (setq fill-column 85)
-  ;;                            (visual-fill-column-mode)
-  ;;                            (visual-line-mode)))
-#+END_SRC
 ** Babel
 *** Elixir
 #+BEGIN_SRC emacs-lisp
@@ -596,11 +612,62 @@ Indent using tabs, render with tab-width of 2.
   					 (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id)))
 #+END_SRC
 
-** Emoji Input
+** TODOs
+
 #+BEGIN_SRC emacs-lisp
+  ;; Define keywords
+  (setq org-todo-keywords
+  			'((sequence "TODO(t)" "PLANNING(p)" "IN-PROGRESS(i@/!)" "VERIFYING(v!)" "BLOCKED(b@)" "|" "DONE(d!)" "REPLACED(o@!)" "WONT-DO(w@/!)" )))
 
-  (add-hook 'org-mode-hook '(lambda () (set-input-method "emoji")))
+  ;; Set fancy colors :3
+  (setq org-todo-keyword-faces
+  			'(
+  				("TODO" . (:foreground "GoldenRod" :weight bold))
+  				("PLANNING" . (:foreground "DeepPink" :weight bold))
+  				("IN-PROGRESS" . (:foreground "Cyan" :weight bold))
+  				("VERIFYING" . (:foreground "DarkOrange" :weight bold))
+  				("BLOCKED" . (:foreground "Red" :weight bold))
+  				("DONE" . (:foreground "LimeGreen" :weight bold))
+  				("REPLACED" . (:foreground "LimeGreen" :weight bold))
+  				("WONT-DO" . (:foreground "LimeGreen" :weight bold))
+  				))
+#+END_SRC
 
+** Capture Templates
+
+#+BEGIN_SRC emacs-lisp
+  (setq org-capture-templates
+  			'(("j" "Work Log Entry"
+  				 entry (file+olp+datetree "~/org/work-log.org")
+  				 "* %? \n %a"
+  				 :empty-lines 0)
+  				("n" "Note"
+  				 entry (file+headline "~/org/notes.org" "Notes")
+  				 "** %?"
+  				 :empty-lines 0)
+  				("g" "General To-Do"
+  				 entry (file+headline "~/org/todos.org" "General Tasks")
+  				 "* TODO [#B] %?\n:Created: %T\n "
+  				 :empty-lines 0)
+  				("l" "Backlinked To-Do"
+  				 entry (file+headline "~/org/todos.org" "Linked Tasks")
+  				 "* TODO [#B] %?\n:Created: %T\n%i\n%a\nProposed Solution: "
+  				 :empty-lines 0)
+  				("m" "Meeting"
+  				 entry (file+datetree "~/org/meetings.org")
+  				 "* %? :meeting:%^g \n:Created: %T\n** Attendees\n- \n** Notes\n** Action Items\n"
+  				 :tree-type week
+  				 :clock-in t
+  				 :clock-resume t
+  				 :empty-lines 0)
+  				("c" "Class Lecture Notes"
+  				 entry (file+datetree "~/org/lecture-notes.org")
+  				 "* %? :lecture:%^{Course}g\n:Created: %T\n** Topics\n- \n** Notes\n**Action Items"
+  				 :tree-type week
+  				 :clock-in t
+  				 :clock-resume t
+  				 :empty-lines 0)
+  				))
 #+END_SRC
 
 * Development
@@ -675,6 +742,9 @@ Indent using tabs, render with tab-width of 2.
 
 ** LSP
 #+BEGIN_SRC emacs-lisp
+  (use-package eldoc
+  	:ensure t
+  	:defer t)
   (use-package eglot
     :ensure t
     :defer t