diff --git a/init.el b/init.el
index aec7771..7b28946 100644
--- a/init.el
+++ b/init.el
@@ -293,12 +293,16 @@
             db/important-documents-path
             db/path-to-onenote
             db/path-to-outlook
-            db/cert-file-directory))
-
-(defcustom db/after-init-load-files nil
-  "A list of files to be loaded by `db/run-init' as the last step."
-  :group 'personal-settings
-  :type '(repeat file))
+            db/cert-file-directory
+            org-working-task-id
+            org-break-task-id
+            org-home-task-id
+            db/org-clock-current-task-file
+            db/org-default-work-file
+            db/org-default-home-file
+            db/org-default-notes-file
+            db/org-default-refile-file
+            db/after-init-load-files))
 
 
 ;; * General configuration
@@ -891,28 +895,6 @@ With given ARG, display files in `db/important-document-path’."
                   ;; This is different in the original implementation
                   (org-entry-get pom property))))))
 
-;; Default Tasks for Working, Home, Breaks
-
-(defcustom org-working-task-id ""
-  "Task ID of default working task."
-  :group 'personal-settings
-  :type 'string)
-
-(defcustom org-break-task-id ""
-  "Task ID of default break task."
-  :group 'personal-settings
-  :type 'string)
-
-(defcustom org-home-task-id ""
-  "Task ID of default home task."
-  :group 'personal-settings
-  :type 'string)
-
-(defcustom db/org-clock-current-task-file "~/.org-current-task"
-  "File to save the currently clocked in task to."
-  :group 'personal-settings
-  :type 'string)
-
 (use-package org-clock
   :defer t
   :commands (org-clock-save)
@@ -960,49 +942,6 @@ With given ARG, display files in `db/important-document-path’."
 
 ;; Agenda
 
-;; NB: some of those files should also be elements of `org-agenda-files', but
-;; this is not done automatically.  The reason is that automatically changing
-;; `org-agenda-files' when setting those variables may conflict with the
-;; customization of `org-agenda-files' itself.  Thus, when setting one of those
-;; variables would update `org-agenda-files' (possibly saving the customiztion),
-;; the original value of `org-agenda-files' would be gone.  Conversely, loading
-;; the customization for `org-agenda-files' would overwrite the work done by
-;; custom setters.  Thus, the only reasonable thing to do is to not update
-;; `org-agenda-files' automatically and leave it to the user to update it.
-
-(defcustom db/org-default-work-file nil
-  "Path to default org-mode file at work.
-You may also want to add this file to `org-agenda-files'."
-  :group 'personal-settings
-  :type '(choice (const nil) file))
-
-(defcustom db/org-default-home-file nil
-  "Path to default org-mode file at home.
-You may also want to add this file to `org-agenda-files'."
-  :group 'personal-settings
-  :type '(choice (const nil) file))
-
-(defcustom db/org-default-notes-file nil
-  "Path to default org-mode file for notes.
-You may also want to add this file to `org-agenda-files'."
-  :group 'personal-settings
-  :type '(choice (const nil) file))
-
-(defcustom db/org-default-refile-file nil
-  "Path to default org-mode file for capturing.
-This file is used by `org-agenda' to query for tasks that need to
-be refiled, independently of whether it's part of
-`org-agenda-files' or not.  You may still want to add this file
-to `org-agenda-files' to have appointments, deadlines, etc shown
-in the main agenda view."
-  :group 'personal-settings
-  :type '(choice (const nil) file))
-
-(defcustom db/org-default-pensieve-file nil
-  "Path to default org-mode file for private notes."
-  :group 'personal-settings
-  :type '(choice (const nil) file))
-
 (use-package org-agenda
   :commands (org-agenda)
   :bind (:map org-agenda-mode-map
diff --git a/site-lisp/db-customize.el b/site-lisp/db-customize.el
index f9f4180..4eb4d34 100644
--- a/site-lisp/db-customize.el
+++ b/site-lisp/db-customize.el
@@ -56,6 +56,80 @@ If this path is not set, i.e., is null, no automatic download will happen."
   :group 'personal-settings
   :type '(choice (const nil) file))
 
+(defcustom db/after-init-load-files nil
+  "A list of files to be loaded by `db/run-init' as the last step."
+  :group 'personal-settings
+  :type '(repeat file))
+
+
+
+(defcustom org-working-task-id ""
+  "Task ID of default working task."
+  :group 'personal-settings
+  :type 'string)
+
+(defcustom org-break-task-id ""
+  "Task ID of default break task."
+  :group 'personal-settings
+  :type 'string)
+
+(defcustom org-home-task-id ""
+  "Task ID of default home task."
+  :group 'personal-settings
+  :type 'string)
+
+(defcustom db/org-clock-current-task-file "~/.org-current-task"
+  "File to save the currently clocked in task to."
+  :group 'personal-settings
+  :type 'string)
+
+
+
+;; NB: some of those files should also be elements of `org-agenda-files', but
+;; this is not done automatically.  The reason is that automatically changing
+;; `org-agenda-files' when setting those variables may conflict with the
+;; customization of `org-agenda-files' itself.  Thus, when setting one of those
+;; variables would update `org-agenda-files' (possibly saving the customiztion),
+;; the original value of `org-agenda-files' would be gone.  Conversely, loading
+;; the customization for `org-agenda-files' would overwrite the work done by
+;; custom setters.  Thus, the only reasonable thing to do is to not update
+;; `org-agenda-files' automatically and leave it to the user to update it.
+
+(defcustom db/org-default-work-file nil
+  "Path to default org-mode file at work.
+You may also want to add this file to `org-agenda-files'."
+  :group 'personal-settings
+  :type '(choice (const nil) file))
+
+(defcustom db/org-default-home-file nil
+  "Path to default org-mode file at home.
+You may also want to add this file to `org-agenda-files'."
+  :group 'personal-settings
+  :type '(choice (const nil) file))
+
+(defcustom db/org-default-notes-file nil
+  "Path to default org-mode file for notes.
+You may also want to add this file to `org-agenda-files'."
+  :group 'personal-settings
+  :type '(choice (const nil) file))
+
+(defcustom db/org-default-refile-file nil
+  "Path to default org-mode file for capturing.
+This file is used by `org-agenda' to query for tasks that need to
+be refiled, independently of whether it's part of
+`org-agenda-files' or not.  You may still want to add this file
+to `org-agenda-files' to have appointments, deadlines, etc shown
+in the main agenda view."
+  :group 'personal-settings
+  :type '(choice (const nil) file))
+
+(defcustom db/org-default-pensieve-file nil
+  "Path to default org-mode file for private notes."
+  :group 'personal-settings
+  :type '(choice (const nil) file))
+
+
+
 (provide 'db-customize)
 
 ;;; db-customize ends here