diff --git a/config.el b/config.el
index 932e500..e96b54c 100644
--- a/config.el
+++ b/config.el
@@ -10,6 +10,11 @@
 (setq deft-directory "~/org/deft")
 (setq org-superstar-headline-bullets-list '("⁖" "◉" "○" "✸" "✿"))
 
+(setq org-todo-keywords
+      '((sequence "TODO(t)" "PROJ(p)" "STRT(s)" "WAIT(w)" "HOLD(h)" "IDEA(i)" "|" "DONE(d)" "KILL(k)")
+           (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")
+           (sequence "|" "OKAY(o)" "YES(y)" "NO(n)")))
+
 (setq display-line-numbers-type t)
 
 (setq org-emphasis-alist
@@ -53,6 +58,8 @@
  org-noter-hide-other nil
  org-noter-notes-search-path (list org-directory))
 
+(setq org-log-done t)
+
 (use-package! org-super-agenda
   :after org-agenda
   :init
diff --git a/config.org b/config.org
index ae462c4..9cbc043 100644
--- a/config.org
+++ b/config.org
@@ -1,42 +1,57 @@
 #+TITLE: Config
+#+STARTUP: overview
 
-
-;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
-
-;; Place your private configuration here! Remember, you do not need to run 'doom
-;; sync' after modifying this file!
+Place your private configuration here! Remember, you do not need to run 'doom
+sync' after modifying this file!
 
 * Identity
-;; Some functionality uses this to identify you, e.g. GPG configuration, email
-;; clients, file templates and snippets.
+Some functionality uses this to identify you, e.g. GPG configuration, email
+clients, file templates and snippets.
 #+begin_src  emacs-lisp
 (setq user-full-name "Francis Kore"
       user-mail-address "me@korefrancis.com")
 #+end_src
 
 * Doom
+
+Here are some additional functions/macros that could help you configure Doom:
+
+- `load!' for loading external *.el files relative to this one
+- `use-package!' for configuring packages
+- `after!' for running code after a package has loaded
+- `add-load-path!' for adding directories to the `load-path', relative to
+  this file. Emacs searches the `load-path' when you load packages with
+  `require' or `use-package'.
+- `map!' for binding new keys
+
+To get information about any of these functions/macros, move the cursor over
+the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
+This will open documentation for it, including demos of how they are used.
+
+You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
+they are implemented.
 ** Fonts
-;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
-;; are the three important ones:
-;;
-;; + `doom-font'
-;; + `doom-variable-pitch-font'
-;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for
-;;   presentations or streaming.
-;;
-;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
-;; font string. You generally only need these two:
+Doom exposes five (optional) variables for controlling fonts in Doom. Here
+are the three important ones:
+
++ `doom-font'
++ `doom-variable-pitch-font'
++ `doom-big-font' -- used for `doom-big-font-mode'; use this for
+  presentations or streaming.
+
+They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
+font string. You generally only need these two:
 #+begin_src emacs-lisp
 
-;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
-;;       doom-variable-pitch-font (font-spec :family "sans" :size 13))
+(setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
+      doom-variable-pitch-font (font-spec :family "sans" :size 13))
 
 #+end_src
 ** Theme
 
-;; There are two ways to load a theme. Both assume the theme is installed and
-;; available. You can either set `doom-theme' or manually load a theme with the
-;; `load-theme' function. This is the default:
+There are two ways to load a theme. Both assume the theme is installed and
+available. You can either set `doom-theme' or manually load a theme with the
+`load-theme' function. This is the default:
 
 #+begin_src emacs-lisp
 (setq doom-theme 'doom-one)
@@ -44,39 +59,35 @@
 
 * Org
 ** Basic
-;; If you use `org' and don't want your org files in the default location below,
-;; change `org-directory'. It must be set before org loads!
+If you use `org' and don't want your org files in the default location below,
+change `org-directory'. It must be set before org loads!
 #+begin_src emacs-lisp
 (setq org-directory "~/org/")
 (setq deft-directory "~/org/deft")
 (setq org-superstar-headline-bullets-list '("⁖" "◉" "○" "✸" "✿"))
+
+;; Startup folded
+(setq org-startup-folded 'overview)
+#+end_src
+
+** Setup Org TODO keywords
+
+#+begin_src emacs-lisp
+(setq org-todo-keywords
+      '((sequence "TODO(t)" "PROJ(p)" "STRT(s)" "WAIT(w)" "HOLD(h)" "IDEA(i)" "|" "DONE(d)" "KILL(k)")
+           (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")
+           (sequence "|" "OKAY(o)" "YES(y)" "NO(n)")))
 #+end_src
 
 ** Line Number
-;; This determines the style of line numbers in effect. If set to `nil', line
-;; numbers are disabled. For relative line numbers, set this to `relative'.
+This determines the style of line numbers in effect. If set to `nil', line
+numbers are disabled. For relative line numbers, set this to `relative'.
 
 #+begin_src emacs-lisp
 (setq display-line-numbers-type t)
 #+end_src
 
 
-;; Here are some additional functions/macros that could help you configure Doom:
-;;
-;; - `load!' for loading external *.el files relative to this one
-;; - `use-package!' for configuring packages
-;; - `after!' for running code after a package has loaded
-;; - `add-load-path!' for adding directories to the `load-path', relative to
-;;   this file. Emacs searches the `load-path' when you load packages with
-;;   `require' or `use-package'.
-;; - `map!' for binding new keys
-;;
-;; To get information about any of these functions/macros, move the cursor over
-;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
-;; This will open documentation for it, including demos of how they are used.
-;;
-;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
-;; they are implemented.
 
 ** Org Emphasis
 ;; this controls the color of bold, italic, underline, verbatim, strikethrough