diff --git a/doom/config.el b/doom/config.el
index f8e4cf4..6d4da9b 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -65,10 +65,10 @@
 
 
 ;; Org-mode custom keybindings
-(map! :map org-mode-map :nvi "C-k" #'org-backward-element)
-(map! :map org-mode-map :nvi "C-j" #'org-forward-element)
-(map! :map org-mode-map :nvi "C-h" #'org-up-element)
-(map! :map org-mode-map :nvi "C-l" #'org-down-element)
+;; (map! :map org-mode-map :nvi "C-k" #'org-backward-element)
+;; (map! :map org-mode-map :nvi "C-j" #'org-forward-element)
+;; (map! :map org-mode-map :nvi "C-h" #'org-up-element)
+;; (map! :map org-mode-map :nvi "C-l" #'org-down-element)
 
 
 ;; Spell checking settings
@@ -115,11 +115,8 @@
 ;; (add-to-list 'org-agenda-files "~/org/anothertest.org" 'append)
 
 ;; Adding my org-agenda files
-;; TODO Maybe only specify one file where all agenda files are listed => Could be edited via commands
 (after! org
-  (setq org-agenda-files
-        '("/home/julian/Nextcloud/studium/vorlesungen/SS21/luftundraumfahrtlabor/lrl-fragenkatalog.org"
-          "/home/julian/Nextcloud/studium/vorlesungen/SS21/borddatenverarbeitung/bdv-fragenkatalog.org")))
+  (setq org-agenda-files "org-agenda-files"))
 
 (map! :map cdlatex-mode-map
     :i "TAB" #'cdlatex-tab)
diff --git a/doom/org-agenda-files b/doom/org-agenda-files
new file mode 100644
index 0000000..4690396
--- /dev/null
+++ b/doom/org-agenda-files
@@ -0,0 +1,3 @@
+/home/julian/Nextcloud/studium/vorlesungen/SS21/luftundraumfahrtlabor/lrl-fragenkatalog.org
+/home/julian/Nextcloud/studium/vorlesungen/SS21/borddatenverarbeitung/bdv-fragenkatalog.org
+/home/julian/Nextcloud/studium/vorlesungen/SS21/raumfahrtbetrieb/rb-vorbereitung.org