diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
index e79baeb2f..2395be357 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
@@ -85,7 +85,7 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
-                R.xml.devicesettings_amazfitbips,
+                R.xml.devicesettings_amazfitbipu,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_custom_emoji_font,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
index 3fcd9dd7d..f567fc610 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
@@ -46,8 +46,11 @@ class HuamiMenuType {
         put("timer_stopwatch", 0x1b);
         put("stress", 0x1c);
         put("period", 0x1d);
+        put("goal", 0x21);
+        put("sleep", 0x23);
         put("spo2", 0x24);
         put("breathing",0x33);
+        put("pomodoro", 0x38);
         put("alexa", 0x39);
     }};
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index c749121d9..48f22c2ce 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -730,6 +730,67 @@
         <item>@string/p_menuitem_settings</item>
     </string-array>
 
+    <string-array name="pref_bipu_display_items">
+        <item>@string/menuitem_hr</item>
+        <item>@string/menuitem_pai</item>
+        <item>@string/menuitem_goal</item>
+        <item>@string/menuitem_workout</item>
+        <item>@string/menuitem_activity</item>
+        <item>@string/menuitem_sleep</item>
+        <item>@string/menuitem_weather</item>
+        <item>@string/menuitem_alarm</item>
+        <item>@string/menuitem_stress</item>
+        <item>@string/menuitem_spo2</item>
+        <item>@string/menuitem_breathing</item>
+        <item>@string/menuitem_stopwatch</item>
+        <item>@string/menuitem_timer</item>
+        <item>@string/menuitem_worldclock</item>
+        <item>@string/menuitem_pomodoro</item>
+        <item>@string/menuitem_music</item>
+        <item>@string/menuitem_cycles</item>
+        <item>@string/menuitem_settings</item>
+        <item>@string/menuitem_more</item>
+        <item>@string/menuitem_findphone</item>
+        <item>@string/menuitem_takephoto</item>
+    </string-array>
+
+    <string-array name="pref_bipu_display_items_values">
+        <item>@string/p_menuitem_hr</item>
+        <item>@string/p_menuitem_pai</item>
+        <item>@string/p_menuitem_goal</item>
+        <item>@string/p_menuitem_workout</item>
+        <item>@string/p_menuitem_activity</item>
+        <item>@string/p_menuitem_sleep</item>
+        <item>@string/p_menuitem_weather</item>
+        <item>@string/p_menuitem_alarm</item>
+        <item>@string/p_menuitem_stress</item>
+        <item>@string/p_menuitem_spo2</item>
+        <item>@string/p_menuitem_breathing</item>
+        <item>@string/p_menuitem_stopwatch</item>
+        <item>@string/p_menuitem_timer</item>
+        <item>@string/p_menuitem_worldclock</item>
+        <item>@string/p_menuitem_pomodoro</item>
+        <item>@string/p_menuitem_music</item>
+        <item>@string/p_menuitem_cycles</item>
+        <item>@string/p_menuitem_settings</item>
+        <item>@string/p_menuitem_more</item>
+        <item>@string/p_menuitem_findphone</item>
+        <item>@string/p_menuitem_takephoto</item>
+    </string-array>
+
+    <string-array name="pref_bipu_display_items_default">
+        <item>@string/p_menuitem_hr</item>
+        <item>@string/p_menuitem_pai</item>
+        <item>@string/p_menuitem_workout</item>
+        <item>@string/p_menuitem_weather</item>
+        <item>@string/p_menuitem_alarm</item>
+        <item>@string/p_menuitem_timer</item>
+        <item>@string/p_menuitem_music</item>
+        <item>@string/p_menuitem_settings</item>
+        <item>@string/p_menuitem_more</item>
+        <item>@string/p_menuitem_worldclock</item>
+    </string-array>
+
     <string-array name="pref_bips_shortcuts">
         <item>@string/menuitem_status</item>
         <item>@string/menuitem_alipay</item>
@@ -1245,4 +1306,4 @@
     </string-array>
 
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a87597b7a..a26b9bc37 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -853,6 +853,9 @@
     <string name="menuitem_alexa">Alexa</string>
     <string name="menuitem_dnd">DND</string>
     <string name="menuitem_stopwatch">Stopwatch</string>
+    <string name="menuitem_goal">Activity Goal</string>
+    <string name="menuitem_sleep">Sleep</string>
+    <string name="menuitem_pomodoro">Pomodoro Tracker</string>
     <string name="watch9_time_minutes">Minutes:</string>
     <string name="watch9_time_hours">Hours:</string>
     <string name="watch9_time_seconds">Seconds:</string>
@@ -1093,4 +1096,4 @@
         <item quantity="many">%d hours</item>
         <item quantity="other">%d hours</item>
     </plurals>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 64b14b3f0..bb9cd637a 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -47,6 +47,9 @@
     <item name="p_menuitem_takephoto" type="string">takephoto</item>
     <item name="p_menuitem_alexa" type="string">alexa</item>
     <item name="p_menuitem_timer_stopwatch" type="string">timer_stopwatch</item>
+    <item name="p_menuitem_goal" type="string">goal</item>
+    <item name="p_menuitem_sleep" type="string">sleep</item>
+    <item name="p_menuitem_pomodoro" type="string">pomodoro</item>
 
     <item name="p_off" type="string">off</item>
     <item name="p_on" type="string">on</item>
diff --git a/app/src/main/res/xml/devicesettings_amazfitbipu.xml b/app/src/main/res/xml/devicesettings_amazfitbipu.xml
new file mode 100644
index 000000000..3356f829d
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_amazfitbipu.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_widgets"
+        android:defaultValue="@array/pref_bipu_display_items_default"
+        android:dialogTitle="@string/mi2_prefs_display_items"
+        android:entries="@array/pref_bipu_display_items"
+        android:entryValues="@array/pref_bipu_display_items_values"
+        android:key="display_items_sortable"
+        android:persistent="true"
+        android:summary="@string/mi2_prefs_display_items_summary"
+        android:title="@string/mi2_prefs_display_items" />
+    <ListPreference
+        android:icon="@drawable/ic_language"
+        android:defaultValue="auto"
+        android:entries="@array/pref_amazfitbip_language"
+        android:entryValues="@array/pref_amazfitbip_language_values"
+        android:key="language"
+        android:summary="%s"
+        android:title="@string/pref_title_language" />
+</androidx.preference.PreferenceScreen>