diff --git a/etc/dconf-editor.profile b/etc/dconf-editor.profile
index f38d0e591b1..62379d3efce 100644
--- a/etc/dconf-editor.profile
+++ b/etc/dconf-editor.profile
@@ -48,5 +48,4 @@ private-tmp
 dbus-user filter
 dbus-user.own ca.desrt.dconf-editor
 dbus-user.talk ca.desrt.dconf
-dbus-user.talk org.gnome.SettingsDaemon.Color
 dbus-system none
diff --git a/etc/feedreader.profile b/etc/feedreader.profile
index d4d92f3a6f4..60c6c85488a 100644
--- a/etc/feedreader.profile
+++ b/etc/feedreader.profile
@@ -51,7 +51,8 @@ private-tmp
 dbus-user filter
 dbus-user.own org.gnome.FeedReader
 dbus-user.own org.gnome.FeedReader.ArticleView
-dbus-user.talk org.freedesktop.Notifications
-dbus-user.talk org.freedesktop.secrets
-dbus-user.talk org.gnome.OnlineAccounts
+# Enable as you need.
+#dbus-user.talk org.freedesktop.Notifications
+#dbus-user.talk org.freedesktop.secrets
+#dbus-user.talk org.gnome.OnlineAccounts
 dbus-system none
diff --git a/etc/firefox.profile b/etc/firefox.profile
index feae3d82ad3..337311ed8e8 100644
--- a/etc/firefox.profile
+++ b/etc/firefox.profile
@@ -30,9 +30,10 @@ include whitelist-usr-share-common.inc
 
 dbus-user filter
 dbus-user.own org.mozilla.firefox.*
-dbus-user.talk org.freedesktop.Notifications
-dbus-system none
-ignore nodbus
+dbus-user.own org.mpris.MediaPlayer2.firefox.*
+# Uncomment or put in your firefox.local to enable native notifications.
+#dbus-user.talk org.freedesktop.Notifications
+ignore dbus-user none
 
 # Redirect
 include firefox-common.profile
diff --git a/etc/ghostwriter.profile b/etc/ghostwriter.profile
index 16c2d15800c..1d5398403cb 100644
--- a/etc/ghostwriter.profile
+++ b/etc/ghostwriter.profile
@@ -49,6 +49,5 @@ private-dev
 private-etc alternatives,ca-certificates,crypto-policies,dbus-1,dconf,firejail,fonts,gconf,groups,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,login.defs,machine-id,mime.types,nsswitch.conf,pango,passwd,pki,protocols,resolv.conf,rpc,services,ssl,texlive,Trolltech.conf,X11,xdg
 private-tmp
 
-dbus-user filter
-dbus-user.own io.github.wereturtle.ghostwriter
+dbus-user none
 dbus-system none
diff --git a/etc/gitg.profile b/etc/gitg.profile
index b1480b06bd3..71b8e9b115e 100644
--- a/etc/gitg.profile
+++ b/etc/gitg.profile
@@ -56,5 +56,6 @@ private-tmp
 dbus-user filter
 dbus-user.own org.gnome.gitg
 dbus-user.talk ca.desrt.dconf
-dbus-user.talk org.freedesktop.secrets
+# Uncomment (or put in your gitg.local) if you need keyring access.
+#dbus-user.talk org.freedesktop.secrets
 dbus-system none
diff --git a/etc/gnome-maps.profile b/etc/gnome-maps.profile
index b34ab438420..1366d1e1e10 100644
--- a/etc/gnome-maps.profile
+++ b/etc/gnome-maps.profile
@@ -65,12 +65,8 @@ private-tmp
 
 dbus-user filter
 dbus-user.own org.gnome.Maps
-dbus-user.talk org.gnome.evolution.dataserver.Sources5
-dbus-user.talk org.gnome.evolution.dataserver.AddressBook10
-dbus-user.talk org.freedesktop.secrets
-dbus-user.talk org.gnome.OnlineAccounts
-dbus-user.talk org.gnome.evolution.dataserver.Calendar7
-dbus-user.talk org.gnome.evolution.dataserver.Subprocess.Backend.*
+#dbus-user.talk org.freedesktop.secrets
+#dbus-user.talk org.gnome.OnlineAccounts
 dbus-system filter
-dbus-system.talk org.freedesktop.NetworkManager
+#dbus-system.talk org.freedesktop.NetworkManager
 dbus-system.talk org.freedesktop.GeoClue2
diff --git a/etc/gnome-todo.profile b/etc/gnome-todo.profile
index 3ad85866a2b..8651d4d5928 100644
--- a/etc/gnome-todo.profile
+++ b/etc/gnome-todo.profile
@@ -51,13 +51,14 @@ private-tmp
 dbus-user filter
 dbus-user.own org.gnome.Todo
 dbus-user.talk ca.desrt.dconf
-dbus-user.talk org.gnome.evolution.dataserver.AddressBook9
-dbus-user.talk org.gnome.evolution.dataserver.Calendar8
-dbus-user.talk org.gnome.evolution.dataserver.Sources5
-dbus-user.talk org.gnome.evolution.dataserver.Subprocess.Backend.*
-dbus-user.talk org.gnome.OnlineAccounts
-dbus-user.talk org.gnome.SettingsDaemon.Color
-dbus-system filter
-dbus-system.talk org.freedesktop.login1
+#dbus-user.talk org.gnome.evolution.dataserver.AddressBook9
+#dbus-user.talk org.gnome.evolution.dataserver.Calendar8
+#dbus-user.talk org.gnome.evolution.dataserver.Sources5
+#dbus-user.talk org.gnome.evolution.dataserver.Subprocess.Backend.*
+#dbus-user.talk org.gnome.OnlineAccounts
+#dbus-user.talk org.gnome.SettingsDaemon.Color
+#dbus-system filter
+#dbus-system.talk org.freedesktop.login1
+dbus-system none
 
 read-only ${HOME}
diff --git a/etc/keepassxc.profile b/etc/keepassxc.profile
index 0c089f7e753..c6f724bcbdb 100644
--- a/etc/keepassxc.profile
+++ b/etc/keepassxc.profile
@@ -31,13 +31,6 @@ machine-id
 net none
 no3d
 nodvd
-<<<<<<< HEAD
-# Breaks 'Lock database when session is locked or lid is closed' (#2899).
-# Also breaks (Plasma) tray icon,
-# you can safely uncomment it or add to keepassxc.local if you don't need these features.
-#
-=======
->>>>>>> dbus filter (1)
 nogroups
 nonewprivs
 noroot
@@ -56,16 +49,16 @@ private-etc alternatives,fonts,ld.so.cache,machine-id
 private-tmp
 
 dbus-user filter
-dbus-user.own org.keepassxc.KeePassXC
+#dbus-user.own org.keepassxc.KeePassXC
 dbus-user.talk org.freedesktop.ScreenSaver
-dbus-user.talk org.freedesktop.Notifications
-dbus-user.talk org.freedesktop.login1.Manager
 dbus-user.talk org.gnome.ScreenSaver
-dbus-user.talk org.kde.StatusNotifierWatcher
-dbus-user.talk org.gnome.SessionManager.Presence
-dbus-user.talk org.gnome.SessionManager
-dbus-user.talk com.canonical.Unity.Session
-dbus-user.talk org.freedesktop.login1.Session
+#dbus-user.talk org.freedesktop.Notifications
+# dbus-user.talk org.freedesktop.login1.Manager
+#dbus-user.talk org.kde.StatusNotifierWatcher
+#dbus-user.talk org.gnome.SessionManager.Presence
+#dbus-user.talk org.gnome.SessionManager
+#dbus-user.talk com.canonical.Unity.Session
+#dbus-user.talk org.freedesktop.login1.Session
 dbus-system none
 
 # Mutex is stored in /tmp by default, which is broken by private-tmp
diff --git a/etc/libreoffice.profile b/etc/libreoffice.profile
index 06e13b97009..948e2927c9c 100644
--- a/etc/libreoffice.profile
+++ b/etc/libreoffice.profile
@@ -46,9 +46,7 @@ tracelog
 private-dev
 private-tmp
 
-dbus-user filter
-dbus-user.own org.libreoffice.LibreOffice
-dbus-user.own org.libreoffice.LibreOfficeIpc0
+dbus-user none
 dbus-system none
 
 join-or-start libreoffice
diff --git a/etc/rhythmbox.profile b/etc/rhythmbox.profile
index e4359f952b7..d898bca90e4 100644
--- a/etc/rhythmbox.profile
+++ b/etc/rhythmbox.profile
@@ -52,7 +52,6 @@ dbus-user.own org.gnome.Rhythmbox3
 dbus-user.own org.mpris.MediaPlayer2.rhythmbox
 dbus-user.own org.gnome.UPnP.MediaServer2.Rhythmbox
 dbus-user.talk ca.desrt.dconf
-dbus-user.talk org.gnome.SettingsDaemon.MediaKeys
 dbus-user.talk org.freedesktop.Notifications
 dbus-system filter
 dbus-system.talk org.freedesktop.Avahi
diff --git a/etc/templates/profile.template b/etc/templates/profile.template
index 37d4bc620ce..68d69b5265f 100644
--- a/etc/templates/profile.template
+++ b/etc/templates/profile.template
@@ -137,10 +137,7 @@ include globals.local
 #net none
 #netfilter
 #no3d
-<<<<<<< HEAD
-=======
-##nodbus (deprecated, use 'dbus-user none' and 'dbus-system none')
->>>>>>> dbus filter (1)
+##nodbus (deprecated, use 'dbus-user none' and 'dbus-system none', see below)
 #nodvd
 #nogroups
 #nonewprivs