diff --git a/dotfiles/newsboat.org b/dotfiles/newsboat.org
index 96f7f39..63c27ae 100644
--- a/dotfiles/newsboat.org
+++ b/dotfiles/newsboat.org
@@ -57,11 +57,22 @@ https://newsboat.org/releases/2.12/docs/newsboat.html
   # If set to no, then the keymap hints on the bottom of screen will not be displayed.
   show-keymap-hint no
 
-  feed-sort-order none
+  feed-sort-order unreadarticlecount
+  article-sort-order date
 
   player "mpv"
 #+END_SRC
 
+** Queries
+#+begin_src conf
+  prepopulate-query-feeds yes
+#+end_src
+
+** Filters
+#+begin_src conf
+  define-filter "Unread Articles" "unread = \"yes\""
+#+end_src
+
 ** Notifications
 #+BEGIN_SRC conf
   notify-format "%n unread articles"
@@ -94,7 +105,7 @@ https://newsboat.org/releases/2.12/docs/newsboat.html
   bind-key u pageup
 
   bind-key q toggle-show-read-feeds
-  bind-key Q toggle-show-read-feeds
+  bind-key Q quit
 
   bind-key l open
   bind-key h quit
@@ -108,8 +119,6 @@ https://newsboat.org/releases/2.12/docs/newsboat.html
 
   bind-key U show-urls
 
-  # bind-key x pb-delete
-
   bind-key t set-tag
   bind-key T clear-tag
 
@@ -205,6 +214,15 @@ https://newsboat.org/releases/2.12/docs/newsboat.html
 :header-args+: :comments both :mkdirp yes
 :END:
 
+** Queries
+#+begin_src conf
+  "query:Unread:unread = \"yes\""
+  "query:Unwatch - Youtube:unread = \"yes\" and tags # \"youtube\""
+  "query:Unread - Linux:unread = \"yes\" and tags # \"linux\""
+  "query:Unread - Emacs:unread = \"yes\" and tags # \"emacs\""
+  "query:Unread - Sciences:unread = \"yes\" and tags # \"science\""
+#+end_src
+
 ** NEWSFEEDS
 *** Linux
 #+begin_src conf
@@ -220,7 +238,6 @@ https://newsboat.org/releases/2.12/docs/newsboat.html
 
 *** Emacs
 #+begin_src conf
-  http://www.planet.emacsen.org/atom.xml "~NEWSFEED: Planet Emacs" emacs
   http://sachachua.com/blog/feed/ "~NEWSFEED: Sacha Chua" emacs
   https://scripter.co/categories/org/index.xml "~NEWSFEED: Scripter" emacs
   http://kitchingroup.cheme.cmu.edu/blog/feed "~NEWSFEED: The Kitchin Research Group" emacs
@@ -235,7 +252,7 @@ https://newsboat.org/releases/2.12/docs/newsboat.html
 
 *** Other
 #+begin_src conf
-  http://xkcd.com/rss.xml "~NEWSFEED: XKCD" fun
+  http://xkcd.com/rss.xml "~NEWSFEED: XKCD" random
   https://undocumentedmatlab.com/feed/ "~NEWSFEED: undocumentedmatlab" matlab
   http://feeds.feedburner.com/mathworks/pick?format=xml "~NEWSFEED: Matlab Pick of the Week" matlab
 #+end_src
@@ -254,7 +271,6 @@ https://newsboat.org/releases/2.12/docs/newsboat.html
   https://www.youtube.com/feeds/videos.xml?channel_id=UCkf4VIqu3Acnfzuk3kRIFwA "~YT gotbletu" youtube linux
   https://www.youtube.com/feeds/videos.xml?channel_id=UC7DdEm33SyaTDtWYGO2CwdA "~YT Physics Girl" youtube science
   https://www.youtube.com/feeds/videos.xml?channel_id=UCRCdl2SXma02BG384RuZPqg "~YT katkimshow" youtube science control
-  https://www.youtube.com/feeds/videos.xml?channel_id=UCmLLvPSfrTmNcINunrOMNBQ "~YT Emacs Guy" youtube emacs
   https://www.youtube.com/feeds/videos.xml?channel_id=UC3gZqwD45zGCsduBn-Q2lew "~YT Gabrielle Grau" youtube music
   https://www.youtube.com/feeds/videos.xml?channel_id=UCVHICXXtKG7rZgtC5xonNdQ "~YT Howard Abrams" youtube emacs
   https://www.youtube.com/feeds/videos.xml?channel_id=UCgREucssIfY9e0Iy3yhse8w "~YT Conner McDaniel" youtube linux