diff --git a/src/mastodon.defaults b/src/mastodon.defaults
index 81113b82..14a3578e 100644
--- a/src/mastodon.defaults
+++ b/src/mastodon.defaults
@@ -11,7 +11,7 @@ reverse_timelines = boolean(default=False)
 persist_size = integer(default=0)
 load_cache_in_memory=boolean(default=True)
 show_screen_names = boolean(default=False)
-buffer_order = list(default=list('home', 'local', 'federated', 'mentions', 'dm', 'sent_dm', 'sent','favorites','followers','friends','blocks','muted'))
+buffer_order = list(default=list('home', 'local', 'federated', 'notifications', 'conversations', 'sent', 'favorites', 'bookmarks', 'followers', 'friends', 'blocks', 'muted'))
 boost_mode = string(default="ask")
 
 [sound]
@@ -27,7 +27,6 @@ indicate_img = boolean(default=True)
 timelines = list(default=list())
 searches = list(default=list())
 lists = list(default=list())
-favourites_timelines = list(default=list())
 followers_timelines = list(default=list())
 friends_timelines =  list(default=list())
 trending_topic_buffers = list(default=list())