diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java
index 2e33b4a5..1a7e4b97 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java
@@ -17,7 +17,6 @@ import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.pebble.MisfitSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
@@ -46,8 +45,7 @@ public class AppMessageHandlerMisfit extends AppMessageHandler {
     @Override
     public boolean isEnabled() {
         Prefs prefs = GBApplication.getPrefs();
-        int activityTracker = prefs.getInt("pebble_activitytracker", SampleProvider.PROVIDER_PEBBLE_HEALTH);
-        return (activityTracker == SampleProvider.PROVIDER_PEBBLE_MISFIT);
+        return prefs.getBoolean("pebble_sync_misfit", true);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java
index a9f1d9cb..62f4d39a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java
@@ -60,8 +60,7 @@ public class AppMessageHandlerMorpheuz extends AppMessageHandler {
     @Override
     public boolean isEnabled() {
         Prefs prefs = GBApplication.getPrefs();
-        int activityTracker = prefs.getInt("pebble_activitytracker", SampleProvider.PROVIDER_PEBBLE_HEALTH);
-        return (activityTracker == SampleProvider.PROVIDER_PEBBLE_MORPHEUZ);
+        return prefs.getBoolean("pebble_sync_morpheuz", true);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java
index acbbe9f7..6df7a751 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java
@@ -3,7 +3,6 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 abstract class DatalogSessionPebbleHealth extends DatalogSession {
@@ -14,7 +13,6 @@ abstract class DatalogSessionPebbleHealth extends DatalogSession {
 
     protected boolean isPebbleHealthEnabled() {
         Prefs prefs = GBApplication.getPrefs();
-        int activityTracker = prefs.getInt("pebble_activitytracker", SampleProvider.PROVIDER_PEBBLE_HEALTH);
-        return (activityTracker == SampleProvider.PROVIDER_PEBBLE_HEALTH);
+        return prefs.getBoolean("pebble_sync_health", true);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 988e5905..35c8c70f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,7 +74,13 @@
     <string name="pref_title_development_miaddr">Mi Band address</string>
 
     <string name="pref_title_pebble_settings">Pebble Settings</string>
+
+    <string name="pref_header_activitytrackers">Activity Trackers</string>
     <string name="pref_title_pebble_activitytracker">Preferred Activitytracker</string>
+    <string name="pref_title_pebble_sync_health">Sync Pebble Health</string>
+    <string name="pref_title_pebble_sync_misfit">Sync Misfit</string>
+    <string name="pref_title_pebble_sync_morpheuz">Sync Morpheuz</string>
+
     <string name="pref_title_enable_pebblekit">Allow 3rd Party Android App Access</string>
     <string name="pref_summary_enable_pebblekit">Enable experimental support for Android Apps using PebbleKit</string>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index aa784331..7c5723b6 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -215,17 +215,31 @@
                     android:key="pebble_reconnect_attempts"
                     android:maxLength="4"
                     android:title="@string/pref_title_pebble_reconnect_attempts" />
+                <CheckBoxPreference
+                    android:title="@string/pref_title_sunrise_sunset"
+                    android:summary="@string/pref_summary_sunrise_sunset"
+                    android:key="send_sunrise_sunset" />
+            </PreferenceCategory>
+            <PreferenceCategory android:title="@string/pref_header_activitytrackers">
                 <ListPreference
                     android:defaultValue="4"
                     android:entries="@array/pebble_activitytracker"
                     android:entryValues="@array/pebble_activitytracker_values"
                     android:key="pebble_activitytracker"
-                    android:title="@string/pref_title_pebble_activitytracker"
-                    android:summary="%s" />
+                    android:summary="%s"
+                    android:title="@string/pref_title_pebble_activitytracker" />
                 <CheckBoxPreference
-                    android:title="@string/pref_title_sunrise_sunset"
-                    android:summary="@string/pref_summary_sunrise_sunset"
-                    android:key="send_sunrise_sunset" />
+                    android:defaultValue="true"
+                    android:key="pebble_sync_health"
+                    android:title="@string/pref_title_pebble_sync_health" />
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="pebble_sync_misfit"
+                    android:title="@string/pref_title_pebble_sync_misfit" />>
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="pebble_sync_morpheuz"
+                    android:title="@string/pref_title_pebble_sync_morpheuz" />
             </PreferenceCategory>
             <PreferenceCategory
                 android:title="@string/pref_header_location">