diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 0af5c41..74f2ab1 100755
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -4539,41 +4539,63 @@ Elfeed is a feed reader for Emacs.
       (interactive)
       (shr-browse-url t))
     (setq elfeed-feeds
-          '(;; ("http://www.wsj.com/xml/rss/3_7085.xml" news)
-            ;; ("https://www.wsj.com/xml/rss/3_7014.xml" news)
-            ;; ("http://rss.nytimes.com/services/xml/rss/nyt/HomePage.xml" news)
-            ;; ("https://www.newyorker.com/feed/everything" news)
-            ;; ("https://www.economist.com/sections/business-finance/rss.xml" news)
-            ;; ("https://www.economist.com/sections/economics/rss.xml" news)
-            ("https://taibbi.substack.com/feed" news)
-            ;; NYTimes - The Morning newsletter
-            ("https://www.kill-the-newsletter.com/feeds/lb5od7xsvr3nwmg9qp2a.xml" news)
-            ;; Boston Globe - Today's Headlines
-            ("https://www.kill-the-newsletter.com/feeds/nhmomrn756ihlqorrg5w.xml" news)
-            ("http://syndication.boston.com/news/local/walker?mode=rss_10" news)
-            ("https://metaredux.com/feed.xml" clojure blog)
-            ("https://lambdaisland.com/feeds/blog.atom" clojure blog)
-            ("https://emacsredux.com/atom.xml" emacs)
-            ("https://sachachua.com/blog/category/emacs-news/feed" emacs)
-            ("https://mxb.dev/feed.xml" web blog)
-            "https://feed.tedium.co/"
-            "https://joy.recurse.com/feed.atom"
-            ;; Changelog Weekly
-            "https://www.kill-the-newsletter.com/feeds/cfiasax3ct12r7b9svjq.xml"
-            ("https://wiki.xxiivv.com/links/rss.xml" blog)
-            ("https://jeremydormitzer.com/blog/feed.xml" my-website)
-            ("https://fossegr.im/feed.xml" emacs blog)
-            ("https://nullprogram.com/feed/" blog)
-            ;; The Economist - This Week
-            ("https://www.kill-the-newsletter.com/feeds/x3cwlql9hhc5pn39ci31.xml" news)
-            ;; The Economist - Today
-            ("https://www.kill-the-newsletter.com/feeds/rl6dr7kiotn6kn2ry6aa.xml" news)
-            ;; AllSides Weekly Newsletter
-            ("https://kill-the-newsletter.com/feeds/31flkb42eg3v31yu7ecm.xml" news)
-            ("https://joshwcomeau.com/rss.xml" web blog)
-            ("https://victoria.dev/index.xml" blog)
-            ("https://www.murilopereira.com/index.xml" blog emacs))
+          (list (list (password-store-get "freshrss-blog-feed-url") 'blog)
+                (list (password-store-get "freshrss-clojure-feed-url") 'clojure)
+                (list (password-store-get "freshrss-computing-feed-url") 'computing)
+                (list (password-store-get "freshrss-emacs-feed-url") 'emacs)
+                (list (password-store-get "freshrss-misc-feed-url") 'misc)
+                (list (password-store-get "freshrss-news-feed-url") 'news)
+                (list (password-store-get "freshrss-web-feed-url") 'web))
           shr-use-colors nil)
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "metaredux.com")
+               :add 'blog))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "lambdaisland.com")
+               :add 'blob))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "emacsredux.com")
+               :add 'blog))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "sachachua.com")
+               :add 'blog))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "mxb.dev")
+               :add 'blog))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "joy.recurse.com")
+               :add 'joy-of-computing))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               ;; Changelog Weekly
+               :entry-link (rx "kill-the-newsletter.com/alternate/cfiasax3ct12r7b9svjq")
+               :add 'open-source))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "jeremydormitzer.com")
+               :add 'my-website))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "fossegr.im")
+               :add 'blog))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "joshwcomeau.com")
+               :add 'blog))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "murilopereira.com")
+               :add 'blog))
+    (add-hook 'elfeed-new-entry-hook
+              (elfeed-make-tagger
+               :entry-link (rx "tedium.co")
+               :add 'tedium))
     :general
     ('normal elfeed-search-mode-map "q" 'elfeed-search-quit-window)
     ('normal elfeed-search-mode-map "C-r" 'elfeed-search-update--force)
@@ -4607,7 +4629,7 @@ Elfeed is a feed reader for Emacs.
     ('normal elfeed-show-mode-map [mouse-2] 'shr-browse-url)
     ('normal elfeed-show-mode-map "A" 'elfeed-show-add-enclosure-to-playlist)
     ('normal elfeed-show-mode-map "P" 'elfeed-show-play-enclosure)
-    ('normal elfeed-show-mode-map "M-RET" 'elfeed-browse-url-external))
+    ('normal elfeed-show-mode-map "<M-return>" 'elfeed-browse-url-external))
 #+END_SRC
 
 Keybinding for opening Elfeed: