diff --git a/agenda-common.el b/agenda-common.el
deleted file mode 100644
index b166ba0..0000000
--- a/agenda-common.el
+++ /dev/null
@@ -1,20 +0,0 @@
-(setq org-agenda-show-current-time-in-grid nil)
-(setq org-extend-today-until 3)
-(setq org-agenda-skip-scheduled-if-done t)
-(setq org-agenda-skip-deadline-if-done t)
-(setq org-agenda-skip-timestamp-if-done t)
-(setq org-agenda-breadcrumbs-separator " ▸ ") ; requires org 9.3
-(setq calendar-day-name-array ["de Sul" "de Lun" "de Meurth" "de Mergher"
-			       "de Yow" "de Gwener" "de Sadorn"])
-(setq calendar-day-abbrev-array ["Su" "L" "Mth" "Mr" "Y" "G" "Sa"])
-(setq calendar-month-name-array ["mis Genver" "mis Whevrel" "mis Meur’"
-				 "mis Ebrel" "mis Me" "mis Efen"
-				 "mis Gorefen" "mis Est" "mis Gwyngala"
-				 "mis Hedra" "mis Du" "mis Kevardhu"])
-(setq org-todo-keywords
-      '((sequence "TODO" "|" "DONE" "CANCELLED")))
-(setq org-agenda-time-grid
-      '((daily today require-timed remove-match)
-	 (800 1000 1200 1400 1600 1800 2000)
-	 "......" "----------------"))
-(setq org-agenda-time-leading-zero t)
diff --git a/agenda.el b/agenda.el
deleted file mode 100644
index 5346d53..0000000
--- a/agenda.el
+++ /dev/null
@@ -1,10 +0,0 @@
-(load-file "~/.emacs.d/agenda-common.el")
-(load-file "~/.emacs.d/custom/workday.el")
-(if workday
-    (if (< (string-to-number (format-time-string "%H")) 19)
-        (if (> (string-to-number (format-time-string "%H")) 7)
-            (setq org-agenda-files (list "~/Documents/drive/org/calendar/admin.org" "~/Documents/drive/org/calendar/home.org" "~/Documents/drive/org/calendar/music.org" "~/Documents/drive/org/calendar/work.org"))
-	  (setq org-agenda-files (list "~/Documents/drive/org/calendar/admin.org" "~/Documents/drive/org/calendar/home.org" "~/Documents/drive/org/calendar/music.org" "~/Documents/drive/org/calendar/personal.org")))
-      (setq org-agenda-files (list "~/Documents/drive/org/calendar/admin.org" "~/Documents/drive/org/calendar/home.org" "~/Documents/drive/org/calendar/music.org" "~/Documents/drive/org/calendar/personal.org")))
-  (setq org-agenda-files (list "~/Documents/drive/org/calendar/admin.org" "~/Documents/drive/org/calendar/home.org" "~/Documents/drive/org/calendar/music.org" "~/Documents/drive/org/calendar/personal.org")))
-(setq org-agenda-prefix-format '((agenda . "%?-12t%s")))
diff --git a/config.org b/config.org
index 734e2e8..d11f81b 100644
--- a/config.org
+++ b/config.org
@@ -485,10 +485,27 @@ Display images in =org= buffers. I’ve increased the width to 500px because 300
       (setq org-image-actual-width '(500)))
 #+END_SRC
 
-Load the common agenda settings, i.e. those that I use in conky as well.
+Some agenda settings.
   
   #+BEGIN_SRC emacs-lisp
-    (load-file "~/.emacs.d/agenda-common.el")
+    (setq org-agenda-show-current-time-in-grid nil)
+    (setq org-extend-today-until 3)
+    (setq org-agenda-skip-scheduled-if-done t)
+    (setq org-agenda-skip-deadline-if-done t)
+    (setq org-agenda-skip-timestamp-if-done t)
+    (setq org-agenda-breadcrumbs-separator " ▸ ") ; requires org 9.3
+    (setq calendar-day-name-array ["de Sul" "de Lun" "de Meurth" "de Mergher"
+                                   "de Yow" "de Gwener" "de Sadorn"])
+    (setq calendar-day-abbrev-array ["Su" "L" "Mth" "Mr" "Y" "G" "Sa"])
+    (setq calendar-month-name-array ["mis Genver" "mis Whevrel" "mis Meur’"
+                                     "mis Ebrel" "mis Me" "mis Efen"
+                                     "mis Gorefen" "mis Est" "mis Gwyngala"
+                                     "mis Hedra" "mis Du" "mis Kevardhu"])
+    (setq org-agenda-time-grid
+          '((daily today require-timed remove-match)
+             (800 1000 1200 1400 1600 1800 2000)
+             "......" "----------------"))
+    (setq org-agenda-time-leading-zero t)
 #+END_SRC
 
 Set general TODO keywords.