diff --git a/config-org.org b/config-org.org
index 79347d8..fdd01ec 100644
--- a/config-org.org
+++ b/config-org.org
@@ -142,16 +142,6 @@
   (use-package org)
   (require 'org-agenda)
 
-  (global-set-key "\C-cl" 'org-store-link)
-  (global-set-key "\C-cc" 'org-capture)
-  (global-set-key (kbd "<f5>") 'org-agenda)
-  (global-set-key (kbd "C-x C-o") 'org-agenda)
-  (define-key org-agenda-mode-map (kbd "a") 'org-agenda)
-
-  (setq org-src-window-setup 'current-window)
-
-  (setq org-list-allow-alphabetical t)  
-
   ;; This is for safety
   (define-key org-mode-map (kbd "C-S-<backspace>") 
     (lambda (arg)
@@ -171,62 +161,6 @@
 
   (define-key org-agenda-mode-map (kbd "C") #'my/org-count-subtree-characters)
 #+end_src
-
-* My Template
-#+BEGIN_SRC emacs-lisp
-  (add-to-list 'org-structure-template-alist
-               '("sv" . "src :results value"))
-  (add-to-list 'org-structure-template-alist
-               '("so" . "src :results output"))
-#+END_SRC
-* Face
-#+BEGIN_SRC emacs-lisp
-  (when (and (not (eq system-type 'windows-nt))
-             (find-font (font-spec :name "Font Awesome 5 Free")))
-    (setq org-ellipsis " "))
-#+END_SRC
-* Variables
-#+begin_src emacs-lisp
-  (setq org-log-done 'time)
-  (setq org-agenda-window-setup 'current-window)
-  (setq org-agenda-restore-windows-after-quit t)
-
-  (setq org-agenda-sticky t)
-
-  ;;(org-agenda-load-file-list)
-
-  ;; Targets include this file and any file contributing to the agenda - up to 9 levels deep
-  (setq org-refile-targets `((nil :maxlevel . 9)
-                             (my/all-agenda-files :maxlevel . 9)
-                             ("~/MEGA/org/entries/panic.org" :maxlevel . 9)))
-
-  (setq org-refile-use-cache t)
-
-  (setq org-refile-target-verify-function
-        (lambda () 
-          (let ((tags (org-get-tags-at)))
-            (and (not (member "ARCHIVE" tags))
-                 (not (equal "DONE" (org-get-todo-state)))))))
-
-  (setq org-agenda-show-future-repeats nil)
-
-  ;; Use full outline paths for refile targets - we file directly with IDO
-  (setq org-refile-use-outline-path 'file)
-
-  ;; Targets complete directly with IDO
-  (setq org-outline-path-complete-in-steps nil)
-
-  ;; Allow refile to create parent tasks with confirmation
-  (setq org-refile-allow-creating-parent-nodes (quote confirm))
-
-  ;; Use the current window for indirect buffer display
-  (setq org-indirect-buffer-display 'current-window)
-
-  ;; Do not dim blocked tasks
-  (setq org-agenda-dim-blocked-tasks nil)
-
-  (setq org-agenda-compact-blocks t)
-#+end_src
 * Tag hierarchy
 #+begin_src emacs-lisp
   (setq org-tag-alist
@@ -414,18 +348,8 @@
 #+begin_src emacs-lisp
   ;; TODO
 #+end_src
-* empty lines
-#+begin_src emacs-lisp
-  (setq org-cycle-separator-lines 0)
-#+end_src
-* invisibel
-#+begin_src emacs-lisp
-  (setq org-catch-invisible-edits 'show-and-error)
-#+end_src
 * link abbreviation
 #+begin_src emacs-lisp
-  (setq org-link-abbrev-alist 
-        '(("youtube" . "https://youtube.com/watch?v=")))
 #+end_src
 * refile to datetree
 #+begin_src emacs-lisp
@@ -598,10 +522,6 @@
   (setq org-now-location
         nil)
 #+end_src
-* org-use-speed-commands
-#+begin_src emacs-lisp
-  (setq org-use-speed-commands t)
-#+end_src
 * new headline set property
 #+begin_src emacs-lisp
   (defun my/org-set-created-property (&rest args)
@@ -648,12 +568,6 @@
 
   (add-hook 'org-agenda-finalize-hook #'org-agenda-delete-empty-compact-blocks)
 #+end_src
-* org-mode faces
-#+begin_src emacs-lisp
-  (set-face-attribute 'org-agenda-date-today nil :inherit 'org-agenda-date :foreground "cyan" :slant 'italic :weight 'bold :height 1.1)
-  (set-face-attribute 'org-agenda-structure  nil :foreground "LightSkyBlue" :box '(:line-width 1 :color "grey75" :style released-button))
-  (set-face-attribute 'org-ellipsis          nil :foreground "turquoise" :underline nil)
-#+end_src
 * org-notmuch
 #+begin_src emacs-lisp
   (require 'ol-notmuch)
@@ -714,18 +628,6 @@
               :before
               #'my/archive-remove-all-sibling)
 #+end_src
-* org agenda start on saturday
-#+begin_src emacs-lisp
-  (setq org-agenda-start-on-weekday 6)
-#+end_src
-* org mode startup
-#+begin_src emacs-lisp
-  (with-eval-after-load 'org
-    (setq org-startup-indented t) ; Enable `org-indent-mode' by default
-    (add-hook 'org-mode-hook #'visual-line-mode)
-    (add-hook 'org-mode-hook #'auto-fill-mode))
-#+end_src
-
 * Learning chinese, setup org-drill
 #+begin_src emacs-lisp
   (use-package org-drill)
@@ -758,49 +660,6 @@
                  (file ,(my/org-file "templates/daily-plan.org"))))
 #+end_src
 
-* My org-indent look
-#+begin_src emacs-lisp
-  (defun my/org-indent-prefixes ()
-    "Compute prefix strings for regular text and headlines."
-    (setq org-indent--heading-line-prefixes
-          (make-vector org-indent--deepest-level nil))
-    (setq org-indent--inlinetask-line-prefixes
-          (make-vector org-indent--deepest-level nil))
-    (setq org-indent--text-line-prefixes
-          (make-vector org-indent--deepest-level nil))
-    (dotimes (n org-indent--deepest-level)
-      (let ((indentation (if (<= n 1) 0
-                           (* (1- org-indent-indentation-per-level)
-                              (1- n)))))
-        ;; Headlines line prefixes.
-        (let ((heading-prefix ""))
-          (aset org-indent--heading-line-prefixes
-                n
-                (org-add-props heading-prefix nil 'face 'org-indent))
-          ;; Inline tasks line prefixes
-          (aset org-indent--inlinetask-line-prefixes
-                n
-                (cond ((<= n 1) "")
-                      ((bound-and-true-p org-inlinetask-show-first-star)
-                       (concat org-indent-inlinetask-first-star
-                               (substring heading-prefix 1)))
-                      (t (org-add-props heading-prefix nil 'face 'org-indent)))))
-        ;; Text line prefixes.
-        (aset org-indent--text-line-prefixes
-              n
-              (org-add-props
-                  (concat (make-string (if (< n 2) n
-                                         (1+ indentation)) ?\s)
-                          (and (> n 0)
-                               (char-to-string org-indent-boundary-char)))
-                  nil 'face 'org-indent)))))
-
-
-  (advice-add #'org-indent--compute-prefixes
-              :override
-              #'my/org-indent-prefixes)
-#+end_src
-
 * Insert inactive timestamp after last org-datetree--find-create
 #+begin_src emacs-lisp
   (defun org-datetree--find-create-add-timestamp (regex-template year &optional month day insert)
@@ -820,10 +679,6 @@
               #'org-datetree--find-create-add-timestamp)
 #+end_src
 
-* repeat to previous state
-#+begin_src emacs-lisp
-  (setq org-todo-repeat-to-state t)
-#+end_src
 * I'm bored
 #+begin_src emacs-lisp
   (defun im-bored ()
@@ -860,11 +715,6 @@
 
   (define-key org-agenda-mode-map (kbd "T") #'my/tickle-todo)
 #+end_src
-* org-src dont ask
-#+begin_src emacs-lisp
-  (setq org-src-ask-before-returning-to-edit-buffer
-        nil)
-#+end_src
 * olivetti
 #+begin_src emacs-lisp
   (use-package olivetti
@@ -1001,15 +851,6 @@
   ;;              org-meta-line org-special-keyword org-table org-todo
   ;;              org-verbatim org-date org-drawer))
 #+end_src
-* Ediffing with org mode
-#+begin_src emacs-lisp
-  (with-eval-after-load 'outline
-    (add-hook 'ediff-prepare-buffer-hook #'org-show-all))
-#+end_src
-* ctrl-k
-#+begin_src emacs-lisp
-(setq org-ctrl-k-protect-subtree t)
-#+end_src
 * Restriction from org-agenda
 #+begin_src emacs-lisp
   (define-key org-agenda-mode-map (kbd "N") #'(lambda ()
diff --git a/lisp/org-config/my-org-agenda-commands.el b/lisp/org-config/my-org-agenda-commands.el
index e41150c..5f34db8 100644
--- a/lisp/org-config/my-org-agenda-commands.el
+++ b/lisp/org-config/my-org-agenda-commands.el
@@ -23,6 +23,7 @@
 ;;; Commentary:
 
 ;;; Code:
+(require 'my-org-agenda-misc)
 
 (add-to-list 'load-path 
              "~/.emacs.d/submodule/org-ql")
@@ -370,9 +371,12 @@
       ("\tReviews and Journals" (advice-add #'org-agenda-show
                                             :override
                                             #'my/org-agenda-show-journal))
-      ("\tDev" (advice-add #'org-agenda-show
-                           :override
-                           #'my/org-agenda-show-project))
+      ("\tDev" (advice-add #'org-agenda-show
+                            :override
+                            #'my/org-agenda-show-project))
+      ("\tMinimal" (advice-add #'org-agenda-show
+                               :override
+                               #'my/org-agenda-show-project))
       (_ (advice-unadvice #'org-agenda-show)))))
 
 (defun advice-unadvice (sym)
diff --git a/lisp/org-config/my-org-agenda-misc.el b/lisp/org-config/my-org-agenda-misc.el
new file mode 100644
index 0000000..00cc50d
--- /dev/null
+++ b/lisp/org-config/my-org-agenda-misc.el
@@ -0,0 +1,74 @@
+;;; my-org-agenda-misc.el ---  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2020 Benson Chu
+
+;; Author: Benson Chu <bensonchu457@gmail.com>
+;; Created: [2020-05-06 18:37]
+
+;; This file is not part of GNU Emacs
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+(require 'org)
+
+(setq org-agenda-skip-deadline-if-done t
+      org-agenda-skip-scheduled-if-done t)
+(setq org-agenda-start-on-weekday 6)
+
+(setq org-tags-match-list-sublevels 'indented)
+(setq org-agenda-span 'day)
+
+(setq org-agenda-window-setup 'current-window)
+(setq org-agenda-restore-windows-after-quit t)
+(setq org-agenda-sticky t)
+
+;;(org-agenda-load-file-list)
+
+;; Targets include this file and any file contributing to the agenda - up to 9 levels deep
+(setq org-refile-targets `((nil :maxlevel . 9)
+                           (my/all-agenda-files :maxlevel . 9)
+                           ("~/MEGA/org/entries/panic.org" :maxlevel . 9)))
+
+(setq org-refile-use-cache t)
+
+(setq org-refile-target-verify-function
+      (lambda () 
+        (let ((tags (org-get-tags-at)))
+          (and (not (member "ARCHIVE" tags))
+               (not (equal "DONE" (org-get-todo-state)))))))
+
+(setq org-agenda-show-future-repeats nil)
+
+;; Use full outline paths for refile targets - we file directly with IDO
+(setq org-refile-use-outline-path 'file)
+
+;; Targets complete directly with IDO
+(setq org-outline-path-complete-in-steps nil)
+
+;; Allow refile to create parent tasks with confirmation
+(setq org-refile-allow-creating-parent-nodes (quote confirm))
+
+;; Use the current window for indirect buffer display
+(setq org-indirect-buffer-display 'current-window)
+
+;; Do not dim blocked tasks
+(setq org-agenda-dim-blocked-tasks nil)
+
+(setq org-agenda-compact-blocks t)
+
+(provide 'my-org-agenda-misc)
+;;; my-org-agenda-misc.el ends here
diff --git a/lisp/org-config/my-org-indent.el b/lisp/org-config/my-org-indent.el
new file mode 100644
index 0000000..31615ab
--- /dev/null
+++ b/lisp/org-config/my-org-indent.el
@@ -0,0 +1,72 @@
+;;; my-org-indent.el ---  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2020 Benson Chu
+
+;; Author: Benson Chu <bensonchu457@gmail.com>
+;; Created: [2020-05-06 18:35]
+
+;; This file is not part of GNU Emacs
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'org)
+
+(setq org-startup-indented t)
+
+(defun my/org-indent-prefixes ()
+  "Compute prefix strings for regular text and headlines."
+  (setq org-indent--heading-line-prefixes
+        (make-vector org-indent--deepest-level nil))
+  (setq org-indent--inlinetask-line-prefixes
+        (make-vector org-indent--deepest-level nil))
+  (setq org-indent--text-line-prefixes
+        (make-vector org-indent--deepest-level nil))
+  (dotimes (n org-indent--deepest-level)
+    (let ((indentation (if (<= n 1) 0
+                         (* (1- org-indent-indentation-per-level)
+                            (1- n)))))
+      ;; Headlines line prefixes.
+      (let ((heading-prefix ""))
+        (aset org-indent--heading-line-prefixes
+              n
+              (org-add-props heading-prefix nil 'face 'org-indent))
+        ;; Inline tasks line prefixes
+        (aset org-indent--inlinetask-line-prefixes
+              n
+              (cond ((<= n 1) "")
+                    ((bound-and-true-p org-inlinetask-show-first-star)
+                     (concat org-indent-inlinetask-first-star
+                             (substring heading-prefix 1)))
+                    (t (org-add-props heading-prefix nil 'face 'org-indent)))))
+      ;; Text line prefixes.
+      (aset org-indent--text-line-prefixes
+            n
+            (org-add-props
+                (concat (make-string (if (< n 2) n
+                                       (1+ indentation)) ?\s)
+                        (and (> n 0)
+                             (char-to-string org-indent-boundary-char)))
+                nil 'face 'org-indent)))))
+
+
+(advice-add #'org-indent--compute-prefixes
+            :override
+            #'my/org-indent-prefixes)
+
+(provide 'my-org-indent)
+;;; my-org-indent.el ends here
diff --git a/lisp/org-config/my-org-misc.el b/lisp/org-config/my-org-misc.el
index 3e86c05..38c11ba 100644
--- a/lisp/org-config/my-org-misc.el
+++ b/lisp/org-config/my-org-misc.el
@@ -24,11 +24,53 @@
 
 ;;; Code:
 
-(setq org-agenda-skip-deadline-if-done t
-      org-agenda-skip-scheduled-if-done t)
+(require 'org)
 
-(setq org-tags-match-list-sublevels 'indented)
-(setq org-agenda-span 'day)
+(global-set-key "\C-cl" 'org-store-link)
+(global-set-key "\C-cc" 'org-capture)
+(global-set-key (kbd "<f5>") 'org-agenda)
+(global-set-key (kbd "C-x C-o") 'org-agenda)
+
+(define-key org-agenda-mode-map (kbd "a") 'org-agenda)
+
+(setq org-src-window-setup 'current-window)
+
+(setq org-list-allow-alphabetical t)
+(setq org-todo-repeat-to-state t)
+
+(setq org-src-ask-before-returning-to-edit-buffer nil)
+
+(with-eval-after-load 'outline
+  (add-hook 'ediff-prepare-buffer-hook #'org-show-all))
+
+(setq org-ctrl-k-protect-subtree t)
+
+(add-hook 'org-mode-hook #'visual-line-mode)
+(add-hook 'org-mode-hook #'auto-fill-mode)
+
+(add-to-list 'org-structure-template-alist
+             '("sv" . "src :results value"))
+(add-to-list 'org-structure-template-alist
+             '("so" . "src :results output"))
+
+
+
+(set-face-attribute 'org-agenda-date-today nil :inherit 'org-agenda-date :foreground "cyan" :slant 'italic :weight 'bold :height 1.1)
+(set-face-attribute 'org-agenda-structure  nil :foreground "LightSkyBlue" :box '(:line-width 1 :color "grey75" :style released-button))
+(set-face-attribute 'org-ellipsis          nil :foreground "turquoise" :underline nil)
+(when (and (not (eq system-type 'windows-nt))
+           (find-font (font-spec :name "Font Awesome 5 Free")))
+  (setq org-ellipsis " "))
+
+(setq org-log-done 'time)
+
+
+(setq org-cycle-separator-lines 0)
+(setq org-catch-invisible-edits 'show-and-error)
+(setq org-link-abbrev-alist 
+      '(("youtube" . "https://youtube.com/watch?v=")))
+
+(setq org-use-speed-commands t)
 
 (provide 'my-org-misc)
 ;;; my-org-misc.el ends here
diff --git a/lisp/org-config/my-org.el b/lisp/org-config/my-org.el
index 4b56b38..b33bc14 100644
--- a/lisp/org-config/my-org.el
+++ b/lisp/org-config/my-org.el
@@ -23,8 +23,9 @@
 ;;; Commentary:
 
 ;;; Code:
-
+(require 'org)
 (require 'my-org-misc)
+(require 'my-org-indent)
 (require 'my-org-agenda-commands)
 (require 'my-org-capture-templates)