diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 000000000..1637e8149
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,28 @@
+ Andreas Shimokawa <shimokawa@fsfe.org>
+ cpfeiffer <cpfeiffer@users.noreply.github.com>
+ Daniele Gobbetti <daniele+github@gobbetti.name>
+ Daniele Gobbetti <daniele@gobbetti.name>
+ danielegobbetti <daniele+github@gobbetti.name>
+ Carsten Pfeiffer <cpfeiffer@users.noreply.github.com>
+ Julien Pivotto <roidelapluie@inuits.eu>
+ Lem Dulfo <lemuel.dulfo@gmail.com>
+ Sergey Trofimov <sarg@sarg.org.ru>
+ Daniele Gobbetti <daniele.gobbetti@gmail.com>
+ cpfeiffer <cpfeiffer@users.github.com>
+ 0nse <0nse@users.noreply.github.com>
+ Christian Fischer <sw-dev@computerlyrik.de>
+ Normano64 <per.bergqwist@gmail.com>
+ Ⲇⲁⲛⲓ Φi <daniphii@outlook.com>
+ xphnx <xphnx@users.noreply.github.com>
+ Tarik Sekmen <tarik@ilixi.org>
+ rober <rober@prtl.nodomain.net>
+ Nicolò Balzarotti <anothersms@gmail.com>
+ Marc Schlaich <marc.schlaich@googlemail.com>
+ kevlarcade <kevlarcade@gmail.com>
+ Kasha <kasha_malaga@hotmail.com>
+ Chris Perelstein <chris.perelstein@gmail.com>
+ Alexey Afanasev <avafanasiev@gmail.com>
+
+And all the Transifex translators, which I cannot automatically list, at the moment.
+
+git log --raw | grep "^Author: " | sort | uniq -c | sort -k 1 -n -r | cut -f 2- -d: > CONTRIBUTORS.md
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 028a68a33..3e7dda6fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -1,16 +1,21 @@
 package nodomain.freeyourgadget.gadgetbridge;
 
 import android.app.Application;
+import android.app.NotificationManager;
+import android.app.NotificationManager.Policy;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.preference.PreferenceManager;
+import android.provider.ContactsContract.PhoneLookup;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.util.TypedValue;
@@ -61,6 +66,7 @@ public class GBApplication extends Application {
     private static Prefs prefs;
     private static GBPrefs gbPrefs;
     private static DBHandler lockHandler;
+    private static NotificationManager notificationManager;
 
     public static final String ACTION_QUIT
             = "nodomain.freeyourgadget.gadgetbridge.gbapplication.action.quit";
@@ -123,6 +129,10 @@ public class GBApplication extends Application {
         filterLocal.addAction(ACTION_QUIT);
         LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filterLocal);
 
+        if (isRunningMarshmallowOrLater()) {
+            notificationManager = (NotificationManager) context.getSystemService(context.NOTIFICATION_SERVICE);
+        }
+
 // for testing DB stuff
 //        SQLiteDatabase db = mActivityDatabaseHandler.getWritableDatabase();
 //        db.close();
@@ -260,6 +270,61 @@ public class GBApplication extends Application {
         return VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
     }
 
+    public static boolean isRunningMarshmallowOrLater() {
+        return VERSION.SDK_INT >= Build.VERSION_CODES.M;
+    }
+
+    private static boolean isPrioritySender(int prioritySenders, String number) {
+        if (prioritySenders == Policy.PRIORITY_SENDERS_ANY) {
+            return true;
+        } else {
+            Uri uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number));
+            String[] projection = new String[]{PhoneLookup._ID, PhoneLookup.STARRED};
+            Cursor cursor = context.getContentResolver().query(uri, projection, null, null, null);
+            boolean exists = false;
+            int starred = 0;
+            try {
+                if (cursor.moveToFirst()) {
+                    exists = true;
+                    starred = cursor.getInt(cursor.getColumnIndexOrThrow(PhoneLookup.STARRED));
+                }
+            } finally {
+                if (cursor != null) {
+                    cursor.close();
+                }
+            }
+            if (prioritySenders == Policy.PRIORITY_SENDERS_CONTACTS && exists) {
+                return true;
+            } else if (prioritySenders == Policy.PRIORITY_SENDERS_STARRED && starred == 1) {
+                return true;
+            }
+            return false;
+        }
+    }
+
+    public static boolean isPriorityNumber(int priorityType, String number) {
+        NotificationManager.Policy notificationPolicy = notificationManager.getNotificationPolicy();
+        if(priorityType == Policy.PRIORITY_CATEGORY_MESSAGES) {
+            if ((notificationPolicy.priorityCategories & Policy.PRIORITY_CATEGORY_MESSAGES) == Policy.PRIORITY_CATEGORY_MESSAGES) {
+                return isPrioritySender(notificationPolicy.priorityMessageSenders, number);
+            }
+        } else if (priorityType == Policy.PRIORITY_CATEGORY_CALLS) {
+            if ((notificationPolicy.priorityCategories & Policy.PRIORITY_CATEGORY_CALLS) == Policy.PRIORITY_CATEGORY_CALLS) {
+                return isPrioritySender(notificationPolicy.priorityCallSenders, number);
+            }
+        }
+        return false;
+    }
+
+    public static int getGrantedInterruptionFilter() {
+        if (prefs.getBoolean("notification_filter", false) && GBApplication.isRunningMarshmallowOrLater()) {
+            if (notificationManager.isNotificationPolicyAccessGranted()) {
+                return notificationManager.getCurrentInterruptionFilter();
+            }
+        }
+        return NotificationManager.INTERRUPTION_FILTER_ALL;
+    }
+
     public static HashSet<String> blacklist = null;
 
     private static void loadBlackList() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
index c8bfe8356..c6479695e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
@@ -6,6 +6,7 @@ import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.support.v4.content.LocalBroadcastManager;
 import android.widget.Toast;
 
@@ -107,6 +108,12 @@ public class SettingsActivity extends AbstractSettingsActivity {
 
         });
 
+        if (!GBApplication.isRunningMarshmallowOrLater()) {
+            pref = findPreference("notification_filter");
+            PreferenceCategory category = (PreferenceCategory) findPreference("pref_key_notifications");
+            category.removePreference(pref);
+        }
+
         // Get all receivers of Media Buttons
         Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/K9Receiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/K9Receiver.java
index 899ee0c6a..439c34b09 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/K9Receiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/K9Receiver.java
@@ -1,5 +1,6 @@
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
+import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -33,6 +34,14 @@ public class K9Receiver extends BroadcastReceiver {
                 return;
             }
         }
+        switch (GBApplication.getGrantedInterruptionFilter()) {
+            case NotificationManager.INTERRUPTION_FILTER_ALL:
+                break;
+            case NotificationManager.INTERRUPTION_FILTER_ALARMS:
+            case NotificationManager.INTERRUPTION_FILTER_NONE:
+            case NotificationManager.INTERRUPTION_FILTER_PRIORITY:
+                return;
+        }
 
         String uriWanted = intent.getData().toString();
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index 9f93618b2..a3c3d37c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -3,6 +3,7 @@ package nodomain.freeyourgadget.gadgetbridge.externalevents;
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -167,6 +168,16 @@ public class NotificationListener extends NotificationListenerService {
                 return;
             }
         }
+        switch (GBApplication.getGrantedInterruptionFilter()) {
+            case NotificationManager.INTERRUPTION_FILTER_ALL:
+                break;
+            case NotificationManager.INTERRUPTION_FILTER_ALARMS:
+            case NotificationManager.INTERRUPTION_FILTER_NONE:
+                return;
+            case NotificationManager.INTERRUPTION_FILTER_PRIORITY:
+                // FIXME: Handle Reminders and Events if they are enabled in Do Not Disturb
+                return;
+        }
 
         String source = sbn.getPackageName();
         Notification notification = sbn.getNotification();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
index 496872db3..29693538b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
@@ -1,5 +1,7 @@
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
+import android.app.NotificationManager;
+import android.app.NotificationManager.Policy;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -67,6 +69,19 @@ public class PhoneCallReceiver extends BroadcastReceiver {
             if ("never".equals(prefs.getString("notification_mode_calls", "always"))) {
                 return;
             }
+            switch (GBApplication.getGrantedInterruptionFilter()) {
+                case NotificationManager.INTERRUPTION_FILTER_ALL:
+                    break;
+                case NotificationManager.INTERRUPTION_FILTER_ALARMS:
+                case NotificationManager.INTERRUPTION_FILTER_NONE:
+                    return;
+                case NotificationManager.INTERRUPTION_FILTER_PRIORITY:
+                    if (GBApplication.isPriorityNumber(Policy.PRIORITY_CATEGORY_CALLS, mSavedNumber)) {
+                        break;
+                    }
+                    // FIXME: Handle Repeat callers if it is enabled in Do Not Disturb
+                    return;
+            }
             CallSpec callSpec = new CallSpec();
             callSpec.number = mSavedNumber;
             callSpec.command = callCommand;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
index 0404cbc22..5df07c8d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
@@ -1,5 +1,7 @@
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
+import android.app.NotificationManager;
+import android.app.NotificationManager.Policy;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -41,6 +43,18 @@ public class SMSReceiver extends BroadcastReceiver {
                     notificationSpec.body = message.getDisplayMessageBody();
                     notificationSpec.phoneNumber = message.getOriginatingAddress();
                     if (notificationSpec.phoneNumber != null) {
+                        switch (GBApplication.getGrantedInterruptionFilter()) {
+                            case NotificationManager.INTERRUPTION_FILTER_ALL:
+                                break;
+                            case NotificationManager.INTERRUPTION_FILTER_ALARMS:
+                            case NotificationManager.INTERRUPTION_FILTER_NONE:
+                                return;
+                            case NotificationManager.INTERRUPTION_FILTER_PRIORITY:
+                                if (GBApplication.isPriorityNumber(Policy.PRIORITY_CATEGORY_MESSAGES, notificationSpec.phoneNumber)) {
+                                    break;
+                                }
+                                return;
+                        }
                         GBApplication.deviceService().onNotification(notificationSpec);
                     }
                 }
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6dc1e3cc2..adf7da93a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -69,8 +69,6 @@
   <string name="this_is_a_test_notification_from_gadgetbridge">Notificación de prueba desde Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">Bluetooth no está soportado.</string>
   <string name="bluetooth_is_disabled_">Bluetooth está desactivado.</string>
-  <string name="tap_connected_device_for_app_mananger">pulsa el dispositivo conectado para el Gestor de App</string>
-  <string name="tap_a_device_to_connect">pulsa un dispositivo para conectar</string>
   <string name="cannot_connect_bt_address_invalid_">No se puede conectar. ¿Dirección BT incorrecta?</string>
   <string name="gadgetbridge_running">Gadgetbridge funcionando</string>
   <string name="installing_binary_d_d">instalando binario %1$d/%2$d</string>
@@ -101,13 +99,11 @@
   <string name="miband_pairing_using_dummy_userdata">No se han proporcionado datos de usuario válidos, se usarán datos de usuario por defecto.</string>
   <string name="miband_pairing_tap_hint">Cuando tu MiBand vibre y parpadee, púlsala repetidas veces.</string>
   <string name="appinstaller_install">Instalar</string>
-  <string name="discovery_connected_devices_hint">Haz visible tu dispositivo. No es probable que se detecten los dispositivos que ya están conectados.</string>
   <string name="discovery_note">Nota:</string>
   <string name="candidate_item_device_image">Imagen del dispositivo</string>
   <string name="miband_prefs_alias">Nombre/Apodo</string>
   <string name="pref_header_vibration_count">Número de vibraciones</string>
   <string name="title_activity_sleepmonitor">Monitor de sueño</string>
-  <string name="pref_write_logfiles">Guardar logs</string>
   <string name="initializing">iniciando</string>
   <string name="busy_task_fetch_activity_data">Recuperando datos de actividad</string>
   <string name="sleep_activity_date_range">Desde %1$s a %2$s</string>
@@ -178,9 +174,9 @@
   <string name="chart_steps">Pasos</string>
   <string name="liveactivity_live_activity">Actividad</string>
   <string name="weeksteps_today_steps_description">Pasos hoy, objetivo: %1$s</string>
+  <string name="pref_title_dont_ack_transfer">No confirmar transferencia</string>
   <string name="pref_summary_dont_ack_transfers">Si los datos no son marcados como descargados, no serán borrados de tu MiBand. Útil si Gadgetbridge se usa conjuntamente con otras apps.</string>
   <string name="pref_summary_keep_data_on_device">Mantendrá los datos de actividad en la MiBand incluso después de la sincronización. Útil si GB se usa junto con otras apps.</string>
-  <string name="pref_title_dont_ack_transfer">No confirmar transferencia</string>
   <string name="live_activity_steps_history">Historial de pasos</string>
   <string name="live_activity_current_steps_per_minute">Pasos/min actuales</string>
   <string name="live_activity_total_steps">Pasos totales</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4324f1f65..0ae83aa00 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -178,9 +178,9 @@
   <string name="chart_steps">Pas</string>
   <string name="liveactivity_live_activity">Activité en direct</string>
   <string name="weeksteps_today_steps_description">Nombre de pas aujourd\'hui, objectif: %1$s</string>
+  <string name="pref_title_dont_ack_transfer">Ne pas confirmer le transfert de données d\'activités</string>
   <string name="pref_summary_dont_ack_transfers">Les données d\'activités ne seront pas effacées du bracelet si elles ne sont pas confirmées. Utile si GB est utilisé avec d\'autres applications.</string>
   <string name="pref_summary_keep_data_on_device">Les données d\'activités seront conservées sur le Mi Band après la synchronisation. Utile si GB est utilisé avec d\'autres applications.</string>
-  <string name="pref_title_dont_ack_transfer">Ne pas confirmer le transfert de données d\'activités</string>
   <string name="live_activity_steps_history">Historique de pas</string>
   <string name="live_activity_current_steps_per_minute">Pas/minute actuel</string>
   <string name="live_activity_total_steps">Nombre total de pas</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 14f87afb0..3f1e31357 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -70,8 +70,6 @@
   <string name="this_is_a_test_notification_from_gadgetbridge">Notifica di prova creata da Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">Bluetooth non supportato.</string>
   <string name="bluetooth_is_disabled_">Bluetooth disabilitato.</string>
-  <string name="tap_connected_device_for_app_mananger">tocca il dispositivo connesso per gestire le App</string>
-  <string name="tap_a_device_to_connect">tocca il dispositivo da connettere</string>
   <string name="cannot_connect_bt_address_invalid_">Impossibile connettersi. Indirizzo BT non valido?</string>
   <string name="gadgetbridge_running">Gadgetbridge in esecuzione</string>
   <string name="installing_binary_d_d">installazione del binario %1$d/%2$d</string>
@@ -102,13 +100,11 @@
   <string name="miband_pairing_using_dummy_userdata">Dati dell\'utente non inseriti, vengono usati dati d\'esempio.</string>
   <string name="miband_pairing_tap_hint">Quando la Mi Band vibra e lampeggia, dalle qualche leggero colpetto.</string>
   <string name="appinstaller_install">Installa</string>
-  <string name="discovery_connected_devices_hint">Imposta il tuo dispositivo perchè sia rilevabile. I dispositivi attualmente connessi non saranno probabilmente rilevati.</string>
   <string name="discovery_note">Nota:</string>
   <string name="candidate_item_device_image">Immagine dispositivo</string>
   <string name="miband_prefs_alias">Nome / Soprannome</string>
   <string name="pref_header_vibration_count">Numero vibrazioni</string>
   <string name="title_activity_sleepmonitor">Monitoraggio del sonno</string>
-  <string name="pref_write_logfiles">Salva il log su file</string>
   <string name="initializing">inizializzazione in corso</string>
   <string name="busy_task_fetch_activity_data">Recupero dati attività</string>
   <string name="sleep_activity_date_range">Da %1$s a %2$s</string>
@@ -179,9 +175,9 @@
   <string name="chart_steps">Passi</string>
   <string name="liveactivity_live_activity">Attività in tempo reale</string>
   <string name="weeksteps_today_steps_description">Passi di oggi, traguardo: %1$s</string>
+  <string name="pref_title_dont_ack_transfer">Non confermare il trasferimento dati</string>
   <string name="pref_summary_dont_ack_transfers">Se il trasferimento non viene confermato, i dati rimangono memorizzati sulla Mi Band. Utile se GB è usato insieme ad altre app.</string>
   <string name="pref_summary_keep_data_on_device">Conserva i dati delle attività sulla Mi Band anche dopo averli sincronizzati. Utile se GB è usato insieme ad altre app.</string>
-  <string name="pref_title_dont_ack_transfer">Non confermare il trasferimento dati</string>
   <string name="live_activity_steps_history">Storico dei passi</string>
   <string name="live_activity_current_steps_per_minute">Passi/minuto</string>
   <string name="live_activity_total_steps">Passi totali</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ddce42bca..2afb4a029 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -181,9 +181,9 @@
   <string name="chart_steps">걸음 수</string>
   <string name="liveactivity_live_activity">실시간 활동</string>
   <string name="weeksteps_today_steps_description">오늘 걸음 수, 목표: %1$s</string>
+  <string name="pref_title_dont_ack_transfer">활동 데이터 전송을 확인하지 않음</string>
   <string name="pref_summary_dont_ack_transfers">만약 활동 데이터가 밴드에 확인되지 않았다면, 지워지지 않을 것입니다. 가젯브릿지가 다른 앱들과 같이 사용될 때 유용합니다.</string>
   <string name="pref_summary_keep_data_on_device">동기화 이후에도 Mi Band의 활동 데이터가 유지될 것입니다. 가젯브릿지가 다른 앱들과 같이 사용될 때 유용합니다.</string>
-  <string name="pref_title_dont_ack_transfer">활동 데이터 전송을 확인하지 않음</string>
   <string name="live_activity_steps_history">걸음 수 기록</string>
   <string name="live_activity_current_steps_per_minute">현재의 분당 걸음 수</string>
   <string name="live_activity_total_steps">전체 걸음 수</string>
@@ -224,4 +224,5 @@
   <string name="updatefirmwareoperation_firmware_not_sent">펌웨어가 전송되지 않음</string>
   <string name="charts_legend_heartrate">심박수</string>
   <string name="live_activity_heart_rate">심박수</string>
+  <string name="pref_title_general_autocreonnect">자동으로 재연결</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f17487481..bc0929a38 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -67,8 +67,6 @@
   <string name="this_is_a_test_notification_from_gadgetbridge">To jest testowe powiadomienie z Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">Bluetooth nie jest obsługiwane</string>
   <string name="bluetooth_is_disabled_">Bluetooth jest wyłączone</string>
-  <string name="tap_connected_device_for_app_mananger">Kliknij podłączone urządzenia dla zarządzania aplikacjami</string>
-  <string name="tap_a_device_to_connect">kliknij urządzenie by połączyć</string>
   <string name="cannot_connect_bt_address_invalid_">Nie można połączyć. Adres BT nieprawidłowy?</string>
   <string name="gadgetbridge_running">Gadgetbridge działa</string>
   <string name="installing_binary_d_d">Instalowanie binarki %1$d/%2$d</string>
@@ -99,13 +97,11 @@
   <string name="miband_pairing_using_dummy_userdata">Brak prawidłowych danych użytkownika, używam danych zastępczych na ten moment.</string>
   <string name="miband_pairing_tap_hint">Gdy twój Mi Band wibruje i błyska, stuknij go kilka razy pod rząd.</string>
   <string name="appinstaller_install">instaluj</string>
-  <string name="discovery_connected_devices_hint">Uwidocznij swoje urządzenie. Aktualnie połączone urządzenia prawdopodobnie nie będą znalezione.</string>
   <string name="discovery_note">Uwaga</string>
   <string name="candidate_item_device_image">Obraz urządzenia</string>
   <string name="miband_prefs_alias">Nazwisko/Pseudonim</string>
   <string name="pref_header_vibration_count">Liczba wibracji</string>
   <string name="title_activity_sleepmonitor">Monitor snu</string>
-  <string name="pref_write_logfiles">Zapisuj logi</string>
   <string name="initializing">Uruchamianie</string>
   <string name="busy_task_fetch_activity_data">Pobieranie danych aktywności</string>
   <string name="sleep_activity_date_range">Od %1$s do %2$s</string>
@@ -176,9 +172,9 @@
   <string name="chart_steps">Kroki</string>
   <string name="liveactivity_live_activity">Ostatnia aktywność</string>
   <string name="weeksteps_today_steps_description">Kroków dziś, cel: %1$s</string>
+  <string name="pref_title_dont_ack_transfer">Nie wysyłaj danych aktywności</string>
   <string name="pref_summary_dont_ack_transfers">Gdy dane aktywności nie są przesłane na opaskę, wtedy nie będą usuwane. Przydatne gdy Gadgetbridge jest używany wraz z innymi aplikacjami</string>
   <string name="pref_summary_keep_data_on_device">Dane aktywności będą zachowane na Mi Band nawet po synchronizacji. Przydatne gdy Gadgetbridge jest używany z innymi aplikacjami.</string>
-  <string name="pref_title_dont_ack_transfer">Nie wysyłaj danych aktywności</string>
   <string name="live_activity_steps_history">Historia kroków</string>
   <string name="live_activity_current_steps_per_minute">Aktualnie kroków/min</string>
   <string name="live_activity_total_steps">Kroków łącznie</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5039e880b..5ea805eba 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -68,8 +68,6 @@
   <string name="this_is_a_test_notification_from_gadgetbridge">Это тестовое уведомление от Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">Bluetooth не поддерживается.</string>
   <string name="bluetooth_is_disabled_">Bluetooth отключён.</string>
-  <string name="tap_connected_device_for_app_mananger">нажмите на подключённое устройство для App Manager</string>
-  <string name="tap_a_device_to_connect">нажмите на устройство для соединения</string>
   <string name="cannot_connect_bt_address_invalid_">Не удалось соединиться. Неверен адрес BT?</string>
   <string name="gadgetbridge_running">Gadgetbridge запущен</string>
   <string name="installing_binary_d_d">установки бинарного файла %1$d/%2$d</string>
@@ -100,13 +98,11 @@
   <string name="miband_pairing_using_dummy_userdata">Не предоставлено действительных данных пользователя. Используются данные по-умолчанию.</string>
   <string name="miband_pairing_tap_hint">Когда ваш Mi Band вибрирует и мигает, постучите по нему несколько раз.</string>
   <string name="appinstaller_install">Установить</string>
-  <string name="discovery_connected_devices_hint">Подключённые в настоящее время устройства, скорее всего, не будут обнаружены.</string>
   <string name="discovery_note">Заметка:</string>
   <string name="candidate_item_device_image">Изображение устройства</string>
   <string name="miband_prefs_alias">Имя/псевдоним</string>
   <string name="pref_header_vibration_count">Количество вибраций</string>
   <string name="title_activity_sleepmonitor">Анализ сна</string>
-  <string name="pref_write_logfiles">Записывать  файлы журнала</string>
   <string name="initializing">Инициализация</string>
   <string name="busy_task_fetch_activity_data">Получение данных активности</string>
   <string name="sleep_activity_date_range">От %1$s до %2$s</string>
@@ -177,9 +173,9 @@
   <string name="chart_steps">Шаги</string>
   <string name="liveactivity_live_activity">Жизненная активность</string>
   <string name="weeksteps_today_steps_description">Шагов сегодня, цель: %1$s</string>
+  <string name="pref_title_dont_ack_transfer">Не передавать данные об активности</string>
   <string name="pref_summary_dont_ack_transfers">Если данные об активности не будут переданы на устройство, оно не будет очищено. Полезно, если GB используется с другими приложениями.</string>
   <string name="pref_summary_keep_data_on_device">Хранить данные о деятельности на Mi Band, даже после синхронизации. Полезно, если Mi Band используется совместно с другими приложениями.</string>
-  <string name="pref_title_dont_ack_transfer">Не передавать данные об активности</string>
   <string name="live_activity_steps_history">История шагов</string>
   <string name="live_activity_current_steps_per_minute">Текущие шаги в минуту</string>
   <string name="live_activity_total_steps">Всего шагов</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f0d6f36a4..7f79179f6 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -31,6 +31,9 @@
   <string name="pref_header_datetime">Дата і час</string>
   <string name="pref_title_datetime_syctimeonconnect">Синхронізувати час під час з\'єднання</string>
   <string name="pref_summary_datetime_syctimeonconnect">Синхронізувати час під час з\'єднання з пристроєм, а також під час зміни часу чи часової зони в системі</string>
+  <string name="pref_title_theme">Тема</string>
+  <string name="pref_theme_light">Світла</string>
+  <string name="pref_theme_dark">Темна</string>
   <string name="pref_header_notifications">Сповіщення</string>
   <string name="pref_title_notifications_repetitions">Повтори</string>
   <string name="pref_title_notifications_call">Виклики</string>
@@ -67,8 +70,6 @@
   <string name="this_is_a_test_notification_from_gadgetbridge">Це тестове сповіщення від Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">Bluetooth не підтримується.</string>
   <string name="bluetooth_is_disabled_">Bluetooth вимкнуто.</string>
-  <string name="tap_connected_device_for_app_mananger">натисніть на під\'єднаний пристрій для App Manager</string>
-  <string name="tap_a_device_to_connect">натисніть на пристрій для з\'єднання</string>
   <string name="cannot_connect_bt_address_invalid_">Не вдалося з\'єднатися. Можливо помилкова адреса BT?</string>
   <string name="gadgetbridge_running">Gadgetbridge запущено</string>
   <string name="installing_binary_d_d">встановлення бінарного файлу %1$d/%2$d</string>
@@ -99,13 +100,11 @@
   <string name="miband_pairing_using_dummy_userdata">Не отримано дійсних даних користувача. Використовуються типові дані.</string>
   <string name="miband_pairing_tap_hint">Коли ваш Mi—Band вібрує та блимає, постукайте по ньому кілька раз.</string>
   <string name="appinstaller_install">Встановити</string>
-  <string name="discovery_connected_devices_hint">Під\'єднані на даний момент пристрої, скоріш за все не будуть виявлені.</string>
   <string name="discovery_note">Замітка:</string>
   <string name="candidate_item_device_image">Зображення пристрою</string>
   <string name="miband_prefs_alias">Ім\'я/нік</string>
   <string name="pref_header_vibration_count">Кількість вібрацій</string>
   <string name="title_activity_sleepmonitor">Аналіз сну</string>
-  <string name="pref_write_logfiles">Записувати файли звіту</string>
   <string name="initializing">Ініціалізація…</string>
   <string name="busy_task_fetch_activity_data">Отримання даних активності</string>
   <string name="sleep_activity_date_range">Від %1$s до %2$s</string>
@@ -176,9 +175,9 @@
   <string name="chart_steps">Кроки</string>
   <string name="liveactivity_live_activity">Життєва активність</string>
   <string name="weeksteps_today_steps_description">Кроків сьогодні, мета: %1$s</string>
+  <string name="pref_title_dont_ack_transfer">Не передавати дані про активність</string>
   <string name="pref_summary_dont_ack_transfers">Якщо дані не будуть передані на пристрій, пристрій не буде очищений. Корисно, якщо Gadgetbridge використовується разом з іншими додатками.</string>
   <string name="pref_summary_keep_data_on_device">Дозволяє лишити дані на Mi-браслеті після синхронізації. Зазвичай використовується, якщо GB працює ще з іншими додатками.</string>
-  <string name="pref_title_dont_ack_transfer">Не передавати дані про активність</string>
   <string name="live_activity_steps_history">Історія кроків</string>
   <string name="live_activity_current_steps_per_minute">Поточні кроки/хв</string>
   <string name="live_activity_total_steps">Загалом кроків</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index af3de63c3..f41f84780 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -52,8 +52,6 @@
   <string name="this_is_a_test_notification_from_gadgetbridge">Đây là một kiểm tra thông báo từ Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">Không hỗ trợ Bluetooth.</string>
   <string name="bluetooth_is_disabled_">Đã tắt Bluetooth.</string>
-  <string name="tap_connected_device_for_app_mananger">chạm vào thiết bị đã kết nối để chạy Trình quản lý ứng dụng</string>
-  <string name="tap_a_device_to_connect">chạm vào một thiết bị để kết nối</string>
   <string name="cannot_connect_bt_address_invalid_">Không thể kết nối. Địa chỉ BT không hợp lệ?</string>
   <string name="gadgetbridge_running">Gadgetbridge đang chạy</string>
   <string name="installing_binary_d_d">đang cài phần mềm chạy %1$d/%2$d</string>
@@ -83,7 +81,6 @@
   <string name="candidate_item_device_image">Ảnh thiết bị</string>
   <string name="miband_prefs_alias">Tên/Bí danh</string>
   <string name="title_activity_sleepmonitor">Trình giám sát giấc ngủ</string>
-  <string name="pref_write_logfiles">Ghi tập tin nhật ký</string>
   <string name="initializing">đang khởi chạy</string>
   <string name="sleep_activity_date_range">Từ %1$s đến %2$s</string>
   <string name="miband_prefs_wearside">Đeo bên trái hay phải?</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 133216e52..95f0f1884 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,6 +52,8 @@
     <string name="pref_summary_notifications_pebblemsg">Support for applications which send Notifications to the Pebble via Intent. Can be used for Conversations.</string>
     <string name="pref_title_notifications_generic">Generic notification support</string>
     <string name="pref_title_whenscreenon">… also when screen is on</string>
+    <string name="pref_title_notification_filter">Do Not Disturb</string>
+    <string name="pref_summary_notification_filter">Stop unwanted Notifications from being sent based on the Do Not Disturb mode.</string>
 
     <string name="always">always</string>
     <string name="when_screen_off">when screen is off</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 4def8d019..6ae2be495 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -77,6 +77,13 @@
             android:defaultValue="false"
             android:key="notifications_generic_whenscreenon"
             android:title="@string/pref_title_whenscreenon" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="notification_filter"
+            android:summary="@string/pref_summary_notification_filter"
+            android:title="@string/pref_title_notification_filter" />
+
         <Preference
             android:key="pref_key_blacklist"
             android:title="@string/pref_blacklist" />