diff --git a/config/elfeed.org b/config/elfeed.org
index 760e100..f806c69 100644
--- a/config/elfeed.org
+++ b/config/elfeed.org
@@ -23,7 +23,10 @@ Manage elfeed subscriptions in an org-mode file instead of elisp.
     :ensure t
     :after (elfeed org)
     :custom
-    (rmh-elfeed-org-files (list (expand-file-name "feeds.org" org-directory)))
+    (rmh-elfeed-org-files
+     (list
+      (expand-file-name "feeds/rss.org" org-directory)
+      (expand-file-name "feeds/youtube.org" org-directory)))
     :config
     (elfeed-org))
 #+end_src
@@ -34,16 +37,17 @@ Use elfeed for YouTube subscriptions, including getting video transcripts.
   (use-package elfeed-tube
     :ensure t
     :after elfeed
-    :config
-    (setq elfeed-tube-auto-save-p nil)
-    (setq elfeed-tube-auto-fetch-p t)
-    (elfeed-tube-setup)
     :bind ( :map elfeed-show-mode-map
             ("F" . elfeed-tube-fetch)
             ([remap save-buffer] . elfeed-tube-save)
             :map elfeed-search-mode-map
             ("F" . elfeed-tube-fetch)
-            ([remap save-buffer] . elfeed-tube-save)))
+            ([remap save-buffer] . elfeed-tube-save))
+    :custom
+    (elfeed-tube-auto-save-p nil)
+    (elfeed-tube-auto-fetch-p t)
+    :config
+    (elfeed-tube-setup))
   (use-package elfeed-tube-mpv
     :ensure t
     :after elfeed-tube