diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java
index 884804411..da9d9f57b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java
@@ -18,15 +18,10 @@ package nodomain.freeyourgadget.gadgetbridge.devices.zetime;
 
 import android.os.Bundle;
 import android.preference.Preference;
-import android.widget.Toast;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.AbstractSettingsActivity;
-import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
-import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
-import nodomain.freeyourgadget.gadgetbridge.util.GB;
-import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class ZeTimePreferenceActivity extends AbstractSettingsActivity {
     @Override
@@ -34,14 +29,9 @@ public class ZeTimePreferenceActivity extends AbstractSettingsActivity {
         super.onCreate(savedInstanceState);
 
         addPreferencesFromResource(R.xml.zetime_preferences);
-        addPreferencesFromResource(R.xml.preferences);
 
         GBApplication.deviceService().onReadConfiguration("do_it");
 
-        //addTryListeners();
-
-        Prefs prefs = GBApplication.getPrefs();
-
         final Preference heartrateMeasurementInterval = findPreference(ZeTimeConstants.PREF_ZETIME_HEARTRATE_INTERVAL);
         heartrateMeasurementInterval.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
diff --git a/app/src/main/res/xml/zetime_preferences.xml b/app/src/main/res/xml/zetime_preferences.xml
index 40f05cd7e..6facc1a1f 100644
--- a/app/src/main/res/xml/zetime_preferences.xml
+++ b/app/src/main/res/xml/zetime_preferences.xml
@@ -24,6 +24,40 @@
             android:title="@string/zetime_activity_tracking"
             android:summary="@string/zetime_activity_tracking_summary" />
 
+        <EditTextPreference
+            android:defaultValue="10000"
+            android:inputType="number"
+            android:key="mi_fitness_goal"
+            android:maxLength="5"
+            android:title="@string/miband_prefs_fitness_goal" />
+
+        <EditTextPreference
+            android:inputType="number"
+            android:key="activity_user_sleep_duration"
+            android:maxLength="2"
+            android:title="@string/activity_prefs_sleep_duration" />
+
+        <EditTextPreference
+            android:defaultValue="2000"
+            android:inputType="number"
+            android:key="activity_user_calories_burnt"
+            android:maxLength="4"
+            android:title="@string/activity_prefs_calories_burnt" />
+
+        <EditTextPreference
+            android:defaultValue="5"
+            android:inputType="number"
+            android:key="activity_user_distance_meters"
+            android:maxLength="5"
+            android:title="@string/activity_prefs_distance_meters" />
+
+        <EditTextPreference
+            android:defaultValue="60"
+            android:inputType="number"
+            android:key="activity_user_activetime_minutes"
+            android:maxLength="3"
+            android:title="@string/activity_prefs_activetime_minutes" />
+
         <PreferenceScreen
             android:key="zetime_inactivity_warning_key"
             android:summary="@string/mi2_prefs_inactivity_warnings_summary"