diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index f8a58e383..d5c0b898e 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -45,19 +45,23 @@ jobs:
 
       - name: Git LFS Pull
         run: git lfs pull
- 
+
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v4
+        run: |
+          echo "ANDROID_HOME=/usr/local/lib/android/sdk" >> $GITHUB_ENV
+          echo "ANDROID_SDK_ROOT=/usr/local/lib/android/sdk" >> $GITHUB_ENV
+          echo "/usr/local/lib/android/sdk/cmdline-tools/latest/bin" >> $GITHUB_PATH
+          echo "/usr/local/lib/android/sdk/platform-tools" >> $GITHUB_PATH
 
       - name: Install Android SDK components
         run: |
-          sdkmanager "tools"
-          sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
-          sdkmanager "platforms;android-${ANDROID_API}"
+          yes | sdkmanager --licenses
+          sdkmanager "platforms;android-${{ env.ANDROID_API }}"
+          sdkmanager "build-tools;${{ env.ANDROID_BUILD_TOOLS }}"
           sdkmanager "extras;android;m2repository"
           sdkmanager "extras;google;m2repository"
           sdkmanager "extras;google;google_play_services"
-          
+
       - name: Prepare builddir
         run: |
           # secrets are only available for collabrators, other will build with OsmDroid (but a few more options than F-Droid still)
diff --git a/app/build.gradle b/app/build.gradle
index 03cbdea00..4ec65b24e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -100,7 +100,7 @@ android {
     lint {
         baseline = file('lint-baseline.xml')
         checkReleaseBuilds = true
-        if (mapboxEnabled) {
+        if (rootProject.ext.mapboxEnabled) {
             lintConfig = file('lint.xml')
         } else {
             lintConfig = file('lint-osmdroid.xml')
@@ -131,7 +131,8 @@ android {
 
 repositories {
     google()
-    mavenCentral() //MapBox GraphView
+    mavenCentral()
+    maven { url = 'https://jitpack.io' }
     if (rootProject.ext.mapboxEnabled) {
         maven {
             url = 'https://api.mapbox.com/downloads/v2/releases/maven'
@@ -183,15 +184,6 @@ dependencies {
     testImplementation "org.mockito:mockito-core:${rootProject.ext.mockitoVersion}"
 }
 
-allprojects {
-    tasks.withType(JavaCompile).tap {
-        configureEach {
-            // options.compilerArgs << "-Xlint:deprecation";
-            options.compilerArgs << "-Xlint:unchecked"
-        }
-    }
-}
-
 def props = new Properties()
 // For locally signed builds only, Google Play signs the bundle
 if (rootProject.file("release.properties").exists()) {
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 8a682b1ce..914f595a2 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.3.1)" variant="all" version="9.3.1">
+<issues format="6" by="lint 9.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.4.1)" variant="all" version="9.4.1">
 
     <issue
         id="UnusedAttribute"
@@ -12,17 +12,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="AppBundleLocaleChanges"
-        message="Found dynamic locale changes, but did not find corresponding Play Core library calls for downloading languages and splitting by language is not disabled in the `bundle` configuration"
-        errorLine1="      configuration.setLocale(locale);"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/org/runnerup/util/Formatter.java"
-            line="830"
-            column="7"/>
-    </issue>
-
     <issue
         id="SourceLockedOrientationActivity"
         message="You should not lock orientation of your activities, so that you can support a good user experience for any device or orientation"
diff --git a/app/res/drawable-mdpi/tab_selected_focused_holo.9.png b/app/res/drawable-mdpi/tab_selected_focused_holo.9.png
deleted file mode 100644
index 0894bfb09..000000000
Binary files a/app/res/drawable-mdpi/tab_selected_focused_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_selected_holo.9.png b/app/res/drawable-mdpi/tab_selected_holo.9.png
deleted file mode 100644
index 7982f6837..000000000
Binary files a/app/res/drawable-mdpi/tab_selected_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_selected_pressed_holo.9.png b/app/res/drawable-mdpi/tab_selected_pressed_holo.9.png
deleted file mode 100644
index df8c8ba6c..000000000
Binary files a/app/res/drawable-mdpi/tab_selected_pressed_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_unselected_focused_holo.9.png b/app/res/drawable-mdpi/tab_unselected_focused_holo.9.png
deleted file mode 100644
index 08457312a..000000000
Binary files a/app/res/drawable-mdpi/tab_unselected_focused_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_unselected_holo.9.png b/app/res/drawable-mdpi/tab_unselected_holo.9.png
deleted file mode 100644
index 24661d4e4..000000000
Binary files a/app/res/drawable-mdpi/tab_unselected_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_unselected_pressed_holo.9.png b/app/res/drawable-mdpi/tab_unselected_pressed_holo.9.png
deleted file mode 100644
index da116b0f3..000000000
Binary files a/app/res/drawable-mdpi/tab_unselected_pressed_holo.9.png and /dev/null differ
diff --git a/app/res/drawable/tab_indicator_holo.xml b/app/res/drawable/tab_indicator_holo.xml
deleted file mode 100644
index 77f372126..000000000
--- a/app/res/drawable/tab_indicator_holo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/tab_unselected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/tab_unselected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!--    Non focused states -->
-    <item android:drawable="@drawable/tab_unselected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-</selector>
diff --git a/app/res/layout/detail.xml b/app/res/layout/detail.xml
index 826afc59c..b2e51ac4a 100644
--- a/app/res/layout/detail.xml
+++ b/app/res/layout/detail.xml
@@ -88,140 +88,133 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TabHost
-        android:id="@+id/tabhost"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@id/buttons"
-        android:layout_below="@id/appbarlayout">
+        android:layout_below="@id/appbarlayout"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/detail_tabs"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content" />
 
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-            <FrameLayout
-                android:id="@android:id/tabcontent"
+            <LinearLayout
+                android:id="@+id/tab_main"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_margin="@dimen/activity_margin"
+                android:orientation="vertical">
 
-                <LinearLayout
-                    android:id="@+id/tab_main"
+                <org.runnerup.widget.TitleSpinner
+                    android:id="@+id/summary_sport"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="@dimen/activity_margin"
-                    android:orientation="vertical">
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="1px"
+                    android:prompt="@string/Type"
+                    android:text="@string/Sport" />
 
-                    <org.runnerup.widget.TitleSpinner
-                        android:id="@+id/summary_sport"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="1px"
-                        android:prompt="@string/Type"
-                        android:text="@string/Sport" />
-
-                    <org.runnerup.widget.TitleSpinner
-                        android:id="@+id/summary_manual_distance"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="numberDecimal"
-                        android:minWidth="48dp"
-                        android:minHeight="48dp"
-                        android:prompt="@string/Type"
-                        android:text="@string/Distance"
-                        runnerup:type="distancepicker" />
-
-                    <EditText
-                        android:id="@+id/notes_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="top|start"
-                        android:hint="@string/Notes_about_your_workout"
-                        android:inputType="textCapSentences|textMultiLine"
-                        android:minLines="4"
-                        android:singleLine="false"
-                        tools:ignore="AutoFill" />
-
-                    <LinearLayout
-                        android:id="@+id/hrzonesBarLayout"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="@android:color/black"
-                        android:orientation="vertical"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="@string/Heartrate_zones_distribution"
-                            android:textAlignment="center"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
-                </LinearLayout>
+                <org.runnerup.widget.TitleSpinner
+                    android:id="@+id/summary_manual_distance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="numberDecimal"
+                    android:minWidth="48dp"
+                    android:minHeight="48dp"
+                    android:prompt="@string/Type"
+                    android:text="@string/Distance"
+                    runnerup:type="distancepicker" />
+
+                <EditText
+                    android:id="@+id/notes_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="top|start"
+                    android:hint="@string/Notes_about_your_workout"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:minLines="4"
+                    android:singleLine="false"
+                    tools:ignore="AutoFill" />
 
                 <LinearLayout
-                    android:id="@+id/tab_lap"
+                    android:id="@+id/hrzonesBarLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_margin="@dimen/activity_margin"
-                    android:baselineAligned="false">
+                    android:background="@android:color/black"
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
-                    <ListView
-                        android:id="@+id/laplist"
-                        android:layout_width="0dip"
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_gravity="center"
+                        android:text="@string/Heartrate_zones_distribution"
+                        android:textAlignment="center"
+                        android:textColor="@android:color/white" />
                 </LinearLayout>
+            </LinearLayout>
 
-                <LinearLayout
-                    android:id="@+id/tab_map"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-
-                    <org.runnerup.util.MapViewWrapper
-                        android:id="@+id/mapview"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-                </LinearLayout>
-
-                <ScrollView
-                    android:id="@+id/tab_graph"
+            <LinearLayout
+                android:id="@+id/tab_lap"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="@dimen/activity_margin"
+                android:baselineAligned="false">
+
+                <ListView
+                    android:id="@+id/laplist"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/tab_map"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <org.runnerup.util.MapViewWrapper
+                    android:id="@+id/mapview"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clipToPadding="false"
-                    android:scrollbars="none">
+                    android:layout_height="match_parent" />
+            </LinearLayout>
 
-                    <LinearLayout
-                        android:id="@+id/graphview"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/activity_margin"
-                        android:orientation="vertical"
-                        android:weightSum="1" />
-                </ScrollView>
+            <ScrollView
+                android:id="@+id/tab_graph"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:scrollbars="none">
 
                 <LinearLayout
-                    android:id="@+id/tab_upload"
+                    android:id="@+id/graphview"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_margin="@dimen/activity_margin"
-                    android:baselineAligned="false">
+                    android:orientation="vertical"
+                    android:weightSum="1" />
+            </ScrollView>
 
-                    <ListView
-                        android:id="@+id/report_list"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-                </LinearLayout>
-            </FrameLayout>
-        </LinearLayout>
-    </TabHost>
+            <LinearLayout
+                android:id="@+id/tab_upload"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="@dimen/activity_margin"
+                android:baselineAligned="false">
+
+                <ListView
+                    android:id="@+id/report_list"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+            </LinearLayout>
+        </FrameLayout>
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/buttons"
diff --git a/app/res/layout/start.xml b/app/res/layout/start.xml
index c3c7497b6..cfd99ff48 100644
--- a/app/res/layout/start.xml
+++ b/app/res/layout/start.xml
@@ -43,178 +43,171 @@
 
     </androidx.appcompat.widget.Toolbar>
 
-    <TabHost
-        android:id="@+id/tabhost_start"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <RelativeLayout
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/start_tabs"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:minWidth="48dp"
-                android:minHeight="48dp" />
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:minWidth="48dp"
+            android:minHeight="48dp" />
 
-            <FrameLayout
-                android:id="@android:id/tabcontent"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@android:id/tabs">
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/start_tabs">
 
-                <include layout="@layout/start_basic" />
+            <include layout="@layout/start_basic" />
 
-                <include layout="@layout/start_interval" />
+            <include layout="@layout/start_interval" />
 
-                <include layout="@layout/start_advanced" />
-            </FrameLayout>
+            <include layout="@layout/start_advanced" />
+        </FrameLayout>
 
-            <RelativeLayout
-                android:id="@+id/status_layout"
-                android:layout_width="match_parent"
+        <RelativeLayout
+            android:id="@+id/status_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:animateLayoutChanges="true"
+            android:background="#424242"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="vertical"
+            tools:ignore="UnusedAttribute">
+
+            <LinearLayout
+                android:id="@+id/status_frame"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:animateLayoutChanges="true"
-                android:background="#424242"
-                android:clickable="true"
-                android:focusable="true"
                 android:orientation="vertical"
-                tools:ignore="UnusedAttribute">
+                android:padding="16dp">
 
                 <LinearLayout
-                    android:id="@+id/status_frame"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="16dp">
+                    android:gravity="bottom|start"
+                    android:orientation="horizontal">
 
-                    <LinearLayout
+                    <TextView
+                        android:id="@+id/device_status"
+                        style="@style/StatusText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="bottom|start"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:id="@+id/device_status"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/No_devices_connected"
-                            android:visibility="gone" />
-
-                        <ImageView
-                            android:id="@+id/hr_indicator"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginEnd="4dp"
-                            android:contentDescription="@string/Heart_Rate_Monitor"
-                            android:visibility="gone"
-                            app:srcCompat="@drawable/ic_heartrate_white_24dp" />
-
-                        <TextView
-                            android:id="@+id/hr_message"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="8dp"
-                            android:visibility="gone" />
-
-                        <ImageView
-                            android:id="@+id/wearos_indicator"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginEnd="4dp"
-                            android:contentDescription="@string/Wear_OS_Device"
-                            android:visibility="gone"
-                            app:srcCompat="@drawable/ic_watch_white_24dp" />
-
-                        <TextView
-                            android:id="@+id/wearos_message"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="8dp" />
-
-                        <ImageView
-                            android:id="@+id/gps_indicator"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginEnd="4dp"
-                            app:srcCompat="@drawable/ic_gps_1"
-                            tools:ignore="ContentDescription" />
-
-                        <TextView
-                            android:id="@+id/gps_message"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/gps_detail_row"
+                        android:text="@string/No_devices_connected"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/hr_indicator"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginEnd="4dp"
+                        android:contentDescription="@string/Heart_Rate_Monitor"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/ic_heartrate_white_24dp" />
+
+                    <TextView
+                        android:id="@+id/hr_message"
+                        style="@style/StatusText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:gravity="bottom|start"
+                        android:layout_marginEnd="8dp"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/wearos_indicator"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginEnd="4dp"
+                        android:contentDescription="@string/Wear_OS_Device"
                         android:visibility="gone"
-                        tools:ignore="UseCompoundDrawables">
-
-                        <ImageView
-                            android:id="@+id/gps_detail_indicator"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginEnd="4dp"
-                            app:srcCompat="@drawable/ic_gps_1"
-                            tools:ignore="ContentDescription" />
+                        app:srcCompat="@drawable/ic_watch_white_24dp" />
 
-                        <TextView
-                            android:id="@+id/gps_detail_message"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
+                    <TextView
+                        android:id="@+id/wearos_message"
+                        style="@style/StatusText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp" />
+
+                    <ImageView
+                        android:id="@+id/gps_indicator"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginEnd="4dp"
+                        app:srcCompat="@drawable/ic_gps_1"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/gps_message"
+                        style="@style/StatusText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
 
                 </LinearLayout>
 
-                <ImageView
-                    android:id="@+id/expand_icon"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@id/status_frame"
-                    android:minWidth="48dp"
-                    android:minHeight="48dp"
-                    app:srcCompat="@drawable/ic_expand_up_white_24dp"
-                    tools:ignore="ContentDescription" />
-
-                <Button
-                    android:id="@+id/gps_enable_button"
-                    style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                <LinearLayout
+                    android:id="@+id/gps_detail_row"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    tools:ignore="RelativeOverlap" />
+                    android:layout_marginTop="8dp"
+                    android:gravity="bottom|start"
+                    android:visibility="gone"
+                    tools:ignore="UseCompoundDrawables">
+
+                    <ImageView
+                        android:id="@+id/gps_detail_indicator"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginEnd="4dp"
+                        app:srcCompat="@drawable/ic_gps_1"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/gps_detail_message"
+                        style="@style/StatusText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                </LinearLayout>
+
+            </LinearLayout>
 
-            </RelativeLayout>
+            <ImageView
+                android:id="@+id/expand_icon"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/status_frame"
+                android:minWidth="48dp"
+                android:minHeight="48dp"
+                app:srcCompat="@drawable/ic_expand_up_white_24dp"
+                tools:ignore="ContentDescription" />
 
-            <include
-                layout="@layout/start_fab"
+            <Button
+                android:id="@+id/gps_enable_button"
+                style="@style/Widget.AppCompat.Button.Borderless.Colored"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:layout_marginStart="@dimen/activity_margin"
-                android:layout_marginBottom="20dp" />
+                android:layout_centerVertical="true"
+                tools:ignore="RelativeOverlap" />
 
         </RelativeLayout>
-    </TabHost>
+
+        <include
+            layout="@layout/start_fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="@dimen/activity_margin"
+            android:layout_marginBottom="20dp" />
+
+    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
index 7478ab464..abdb0ead5 100644
--- a/app/res/values/styles.xml
+++ b/app/res/values/styles.xml
@@ -27,9 +27,7 @@
         <item name="windowActionBar">false</item>
     </style>
 
-    <style name="MainLayoutTheme" parent="AppTheme.NoActionBar">
-        <item name="android:tabWidgetStyle">@style/BottomNavigationTabWidget</item>
-    </style>
+    <style name="MainLayoutTheme" parent="AppTheme.NoActionBar" />
 
     <style name="ButtonText" parent="Widget.AppCompat.Button.Colored">
         <item name="android:textColor">@color/btn_text_color</item>
@@ -55,14 +53,6 @@
         <item name="android:textSize">20sp</item>
     </style>
 
-    <style name="BottomNavigationTabWidget" parent="android:Widget.TabWidget">
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:tabStripEnabled">false</item>
-        <item name="divider">@null</item>
-        <item name="android:gravity">fill_horizontal|center_vertical</item>
-    </style>
-
     <style name="BottomNavigationTabText" tools:ignore="UnusedResources">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">@color/bottom_tabs</item>
diff --git a/app/src/main/org/runnerup/view/DetailActivity.java b/app/src/main/org/runnerup/view/DetailActivity.java
index c9364023c..5bc88496e 100644
--- a/app/src/main/org/runnerup/view/DetailActivity.java
+++ b/app/src/main/org/runnerup/view/DetailActivity.java
@@ -46,11 +46,11 @@
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.TabHost;
-import android.widget.TabHost.TabSpec;
 import android.widget.TextView;
 import androidx.activity.EdgeToEdge;
 import androidx.activity.OnBackPressedCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -61,6 +61,7 @@
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
+import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -120,7 +121,11 @@ public class DetailActivity extends AppCompatActivity implements Constants {
   private EditText notes = null;
   private View rootView;
   private View mapTab;
-  private View graphTab;
+  private TabLayout detailTabs;
+  private final ArrayList<View> tabContents = new ArrayList<>();
+  private final ActivityResultLauncher<Intent> accountListLauncher =
+      registerForActivityResult(
+          new ActivityResultContracts.StartActivityForResult(), result -> requery());
 
   private MapWrapper mapWrapper = null;
   private final GraphWrapper graphWrapper = null;
@@ -227,43 +232,31 @@ public int preSetValue(int newValue) throws IllegalArgumentException {
 
     uploadButton.setVisibility(View.GONE);
 
-    TabHost th = findViewById(R.id.tabhost);
-    th.setup();
-    TabSpec tabSpec = th.newTabSpec("notes");
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Notes)));
-    tabSpec.setContent(R.id.tab_main);
-    th.addTab(tabSpec);
-
-    tabSpec = th.newTabSpec("laps");
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Laps)));
-    tabSpec.setContent(R.id.tab_lap);
-    th.addTab(tabSpec);
+    detailTabs = findViewById(R.id.detail_tabs);
+    addDetailTab(org.runnerup.common.R.string.Notes, R.id.tab_main);
+    addDetailTab(org.runnerup.common.R.string.Laps, R.id.tab_lap);
 
     if (BuildConfig.OSMDROID_ENABLED || BuildConfig.MAPBOX_ENABLED) {
-      tabSpec = th.newTabSpec("map");
-      tabSpec.setIndicator(
-          WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Map)));
-      tabSpec.setContent(R.id.tab_map);
-      th.addTab(tabSpec);
-      mapTab = th.getTabWidget().getChildTabViewAt(2);
+      addDetailTab(org.runnerup.common.R.string.Map, R.id.tab_map);
+      mapTab = detailTabs.getTabAt(2).view;
     }
 
-    tabSpec = th.newTabSpec("graph");
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Graph)));
-    tabSpec.setContent(R.id.tab_graph);
-    th.addTab(tabSpec);
-    // Get graph tab (cannot hardcode index due to optional map tab).
-    int graphTabIndex = th.getTabWidget().getChildCount() - 1;
-    graphTab = th.getTabWidget().getChildTabViewAt(graphTabIndex);
-
-    tabSpec = th.newTabSpec("share");
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Upload)));
-    tabSpec.setContent(R.id.tab_upload);
-    th.addTab(tabSpec);
+    addDetailTab(org.runnerup.common.R.string.Graph, R.id.tab_graph);
+    addDetailTab(org.runnerup.common.R.string.Upload, R.id.tab_upload);
+    detailTabs.addOnTabSelectedListener(
+        new TabLayout.OnTabSelectedListener() {
+          @Override
+          public void onTabSelected(@NonNull TabLayout.Tab tab) {
+            showDetailTab(tab.getPosition());
+          }
+
+          @Override
+          public void onTabUnselected(@NonNull TabLayout.Tab tab) {}
+
+          @Override
+          public void onTabReselected(@NonNull TabLayout.Tab tab) {}
+        });
+    showDetailTab(0);
 
     fillHeaderData();
     requery();
@@ -370,6 +363,9 @@ private void updateViewForSport(int sportValue) {
 
     if (mapTab != null) {
       if (Sport.isWithoutGps(sportValue)) {
+        if (detailTabs.getSelectedTabPosition() == 2) {
+          detailTabs.selectTab(detailTabs.getTabAt(0));
+        }
         mapTab.setVisibility(View.GONE);
       } else {
         mapTab.setVisibility(View.VISIBLE);
@@ -381,6 +377,17 @@ private void updateViewForSport(int sportValue) {
     }
   }
 
+  private void addDetailTab(int titleId, int contentId) {
+    detailTabs.addTab(detailTabs.newTab().setText(titleId));
+    tabContents.add(findViewById(contentId));
+  }
+
+  private void showDetailTab(int selectedPosition) {
+    for (int i = 0; i < tabContents.size(); i++) {
+      tabContents.get(i).setVisibility(i == selectedPosition ? View.VISIBLE : View.GONE);
+    }
+  }
+
   private void setUploadVisibility() {
     boolean enabled = !pendingSynchronizers.isEmpty();
     if (enabled) {
@@ -817,7 +824,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         b.setOnClickListener(
             v -> {
               Intent i = new Intent(DetailActivity.this, AccountListActivity.class);
-              DetailActivity.this.startActivityForResult(i, EDIT_ACCOUNT_REQUEST);
+              accountListLauncher.launch(i);
             });
         return b;
       }
@@ -1036,6 +1043,7 @@ public void onCheckedChanged(CompoundButton arg0, boolean arg1) {
                   (dialog, which) -> dialog.dismiss())
               .show();
 
+  @SuppressWarnings("deprecation")
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
diff --git a/app/src/main/org/runnerup/view/HistoryFragment.java b/app/src/main/org/runnerup/view/HistoryFragment.java
index cf544215a..5bd91a950 100644
--- a/app/src/main/org/runnerup/view/HistoryFragment.java
+++ b/app/src/main/org/runnerup/view/HistoryFragment.java
@@ -31,6 +31,8 @@
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -61,6 +63,16 @@ public class HistoryFragment extends Fragment
   CursorAdapter cursorAdapter = null;
   View fab = null;
 
+  private final ActivityResultLauncher<Intent> manualActivityLauncher =
+      registerForActivityResult(
+          new StartActivityForResult(),
+          result -> LoaderManager.getInstance(this).restartLoader(0, null, this));
+
+  private final ActivityResultLauncher<Intent> detailActivityLauncher =
+      registerForActivityResult(
+          new StartActivityForResult(),
+          result -> LoaderManager.getInstance(this).restartLoader(0, null, this));
+
   public HistoryFragment() {
     super(R.layout.history);
   }
@@ -76,8 +88,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     fab.setOnClickListener(
         v -> {
           Intent i = new Intent(context, ManualActivity.class);
-          // TODO: Use the Activity Result API
-          startActivityForResult(i, 0);
+          manualActivityLauncher.launch(i);
         });
 
     mDB = DBHelper.getReadableDatabase(context);
@@ -138,14 +149,7 @@ public void onItemClick(AdapterView<?> arg0, View arg1, int position, long id) {
     Intent intent = new Intent(requireContext(), DetailActivity.class);
     intent.putExtra("ID", id);
     intent.putExtra("mode", "details");
-    startActivityForResult(intent, 0);
-  }
-
-  // TODO: Use Activity Result API
-  @Override
-  public void onActivityResult(int arg0, int arg1, Intent arg2) {
-    super.onActivityResult(arg0, arg1, arg2);
-    LoaderManager.getInstance(this).restartLoader(0, null, this);
+    detailActivityLauncher.launch(intent);
   }
 
   class HistoryListAdapter extends CursorAdapter {
diff --git a/app/src/main/org/runnerup/view/MainLayout.java b/app/src/main/org/runnerup/view/MainLayout.java
index 0cb5ffd06..ebdf1cf20 100644
--- a/app/src/main/org/runnerup/view/MainLayout.java
+++ b/app/src/main/org/runnerup/view/MainLayout.java
@@ -315,7 +315,7 @@ private void handleBundled(AssetManager mgr, String srcBase, String dstBase) {
 
         if (!isFile) {
           // The request is hierarchical, source is still on a directory level
-          File dstDir = new File(dstBase);
+          File dstDir = new File(dst);
           //noinspection ResultOfMethodCallIgnored
           dstDir.mkdir();
           if (!dstDir.isDirectory()) {
@@ -348,14 +348,13 @@ private void handleBundled(AssetManager mgr, String srcBase, String dstBase) {
             continue;
           }
 
-          pref.edit().putBoolean(key, true).apply();
-
           Log.d(getClass().getName(), "Copying: " + dst);
           InputStream input = null;
           try {
             input = mgr.open(src);
             FileUtil.copy(input, dst);
             handleHooks(add);
+            pref.edit().putBoolean(key, true).apply(); // Store successfull copy
           } catch (IOException e) {
             e.printStackTrace();
           } finally {
diff --git a/app/src/main/org/runnerup/view/StartFragment.java b/app/src/main/org/runnerup/view/StartFragment.java
index 1a442b4b1..29bc0557c 100644
--- a/app/src/main/org/runnerup/view/StartFragment.java
+++ b/app/src/main/org/runnerup/view/StartFragment.java
@@ -50,10 +50,9 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.TabHost;
-import android.widget.TabHost.OnTabChangeListener;
-import android.widget.TabHost.TabSpec;
 import android.widget.TextView;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -62,6 +61,7 @@
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
+import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -91,7 +91,6 @@
 import org.runnerup.widget.SpinnerInterface.OnCloseDialogListener;
 import org.runnerup.widget.SpinnerInterface.OnSetValueListener;
 import org.runnerup.widget.TitleSpinner;
-import org.runnerup.widget.WidgetUtil;
 import org.runnerup.workout.Dimension;
 import org.runnerup.workout.Sport;
 import org.runnerup.workout.Workout;
@@ -122,7 +121,14 @@ private enum GpsLevel {
   private Tracker mTracker = null;
   private org.runnerup.tracker.GpsStatus mGpsStatus = null;
 
-  private TabHost tabHost = null;
+  private TabLayout tabLayout = null;
+  private final ActivityResultLauncher<Intent> runActivityLauncher =
+      registerForActivityResult(
+          new ActivityResultContracts.StartActivityForResult(),
+          result -> handleActivityResult(START_ACTIVITY, result.getResultCode(), result.getData()));
+  private View basicTabView;
+  private View intervalTabView;
+  private View advancedTabView;
   private View startButton = null;
 
   private ImageView expandIcon = null;
@@ -251,31 +257,34 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     view.findViewById(R.id.status_layout).setOnClickListener(v -> toggleStatusDetails());
 
-    // TODO: Replace TabHost with ViewPager2 and TabLayout
-    tabHost = view.findViewById(R.id.tabhost_start);
-    tabHost.setup();
-    TabSpec tabSpec = tabHost.newTabSpec(TAB_BASIC);
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(context, getString(org.runnerup.common.R.string.Basic)));
-    tabSpec.setContent(R.id.start_basic_tab);
-    tabHost.addTab(tabSpec);
-
-    tabSpec = tabHost.newTabSpec(TAB_INTERVAL);
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(
-            context, getString(org.runnerup.common.R.string.Interval)));
-    tabSpec.setContent(R.id.start_interval_tab);
-    tabHost.addTab(tabSpec);
-
-    tabSpec = tabHost.newTabSpec(TAB_ADVANCED);
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(
-            context, getString(org.runnerup.common.R.string.Advanced)));
-    tabSpec.setContent(R.id.start_advanced_tab);
-    tabHost.addTab(tabSpec);
-
-    tabHost.setOnTabChangedListener(onTabChangeListener);
-    // tabHost.getTabWidget().setBackgroundColor(Color.DKGRAY);
+    tabLayout = view.findViewById(R.id.start_tabs);
+    basicTabView = view.findViewById(R.id.start_basic_tab);
+    intervalTabView = view.findViewById(R.id.start_interval_tab);
+    advancedTabView = view.findViewById(R.id.start_advanced_tab);
+    setWorkoutTabVisibility(0);
+    tabLayout.addTab(
+        tabLayout.newTab().setText(org.runnerup.common.R.string.Basic).setTag(TAB_BASIC));
+    tabLayout.addTab(
+        tabLayout.newTab().setText(org.runnerup.common.R.string.Interval).setTag(TAB_INTERVAL));
+    tabLayout.addTab(
+        tabLayout.newTab().setText(org.runnerup.common.R.string.Advanced).setTag(TAB_ADVANCED));
+    tabLayout.addOnTabSelectedListener(
+        new TabLayout.OnTabSelectedListener() {
+          @Override
+          public void onTabSelected(@NonNull TabLayout.Tab tab) {
+            setWorkoutTabVisibility(tab.getPosition());
+            if (TAB_ADVANCED.equals(tab.getTag())) {
+              loadAdvanced(null);
+            }
+            updateView();
+          }
+
+          @Override
+          public void onTabUnselected(@NonNull TabLayout.Tab tab) {}
+
+          @Override
+          public void onTabReselected(@NonNull TabLayout.Tab tab) {}
+        });
 
     LayoutInflater inflater = getLayoutInflater();
     simpleAudioListAdapter = new AudioSchemeListAdapter(mDB, inflater, false);
@@ -328,7 +337,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     if (i != null) {
       if (i.hasExtra("mode")) {
         if (Objects.equals(i.getStringExtra("mode"), TAB_ADVANCED)) {
-          tabHost.setCurrentTab(2);
+          tabLayout.selectTab(tabLayout.getTabAt(2));
           i.removeExtra("mode");
         }
       }
@@ -463,7 +472,7 @@ public void onResume() {
       simpleTargetType.clearDisabled();
     }
 
-    if (Objects.requireNonNull(tabHost.getCurrentTabTag()).contentEquals(TAB_ADVANCED)) {
+    if (getSelectedTabTag().contentEquals(TAB_ADVANCED)) {
       loadAdvanced(null);
     }
 
@@ -685,13 +694,16 @@ private void notificationBatteryLevel(int batteryLevel) {
         .show();
   }
 
-  private final OnTabChangeListener onTabChangeListener =
-      tabId -> {
-        if (tabId.contentEquals(TAB_ADVANCED)) {
-          loadAdvanced(null);
-        }
-        updateView();
-      };
+  private String getSelectedTabTag() {
+    TabLayout.Tab selectedTab = tabLayout.getTabAt(tabLayout.getSelectedTabPosition());
+    return selectedTab == null ? TAB_BASIC : (String) selectedTab.getTag();
+  }
+
+  private void setWorkoutTabVisibility(int selectedPosition) {
+    basicTabView.setVisibility(selectedPosition == 0 ? View.VISIBLE : View.GONE);
+    intervalTabView.setVisibility(selectedPosition == 1 ? View.VISIBLE : View.GONE);
+    advancedTabView.setVisibility(selectedPosition == 2 ? View.VISIBLE : View.GONE);
+  }
 
   private Workout prepareWorkout() {
     Context ctx = requireActivity().getApplicationContext();
@@ -699,16 +711,16 @@ private Workout prepareWorkout() {
     SharedPreferences audioPref;
     Workout w;
 
-    if (Objects.requireNonNull(tabHost.getCurrentTabTag()).contentEquals(TAB_BASIC)) {
+    if (getSelectedTabTag().contentEquals(TAB_BASIC)) {
       audioPref =
           WorkoutBuilder.getAudioCuePreferences(ctx, pref, getString(R.string.pref_basic_audio));
       Dimension target = Dimension.valueOf(simpleTargetType.getValueInt());
       w = WorkoutBuilder.createDefaultWorkout(getResources(), pref, target);
-    } else if (tabHost.getCurrentTabTag().contentEquals(TAB_INTERVAL)) {
+    } else if (getSelectedTabTag().contentEquals(TAB_INTERVAL)) {
       audioPref =
           WorkoutBuilder.getAudioCuePreferences(ctx, pref, getString(R.string.pref_interval_audio));
       w = WorkoutBuilder.createDefaultIntervalWorkout(getResources(), pref);
-    } else if (tabHost.getCurrentTabTag().contentEquals(TAB_ADVANCED)) {
+    } else if (getSelectedTabTag().contentEquals(TAB_ADVANCED)) {
       audioPref =
           WorkoutBuilder.getAudioCuePreferences(ctx, pref, getString(R.string.pref_advanced_audio));
       w = advancedWorkout;
@@ -735,8 +747,7 @@ private void startWorkout() {
 
     runActivityPending = true;
     Intent intent = new Intent(requireContext(), RunActivity.class);
-    // TODO: Use the Activity Result API
-    StartFragment.this.startActivityForResult(intent, START_ACTIVITY);
+    runActivityLauncher.launch(intent);
     notificationStateManager.cancelNotification(); // will be added by RunActivity
   }
 
@@ -1005,8 +1016,7 @@ private void updateStartButtonView() {
         break;
       }
 
-      if (Objects.requireNonNull(tabHost.getCurrentTabTag()).contentEquals(TAB_ADVANCED)
-          && advancedWorkout == null) {
+      if (getSelectedTabTag().contentEquals(TAB_ADVANCED) && advancedWorkout == null) {
         break;
       }
 
@@ -1304,10 +1314,7 @@ private void unbindGpsTracker() {
     mTracker = null;
   }
 
-  // TODO: Use Activity Result API
-  @Override
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    super.onActivityResult(requestCode, resultCode, data);
+  private void handleActivityResult(int requestCode, int resultCode, Intent data) {
     registerStartEventListener();
 
     if (data != null) {
diff --git a/app/src/main/org/runnerup/widget/AboutPreference.java b/app/src/main/org/runnerup/widget/AboutPreference.java
index 2c2c4c7dc..b9b156e6d 100644
--- a/app/src/main/org/runnerup/widget/AboutPreference.java
+++ b/app/src/main/org/runnerup/widget/AboutPreference.java
@@ -24,6 +24,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.webkit.WebView;
 import androidx.annotation.NonNull;
@@ -52,8 +53,7 @@ private void init(Context context) {
               + " v"
               + pInfo.versionName);
     } catch (NameNotFoundException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+      Log.e(getClass().getName(), "Failed to get package info", e);
     }
     setNegativeButtonText(context.getString(org.runnerup.common.R.string.OK));
     if (GoogleApiHelper.isGooglePlayServicesAvailable(context)) {
@@ -92,7 +92,7 @@ public void onDialogClosed(boolean positiveResult) {
           Uri uri = Uri.parse("market://details?id=" + applicationId);
           this.requireContext().startActivity(new Intent(Intent.ACTION_VIEW, uri));
         } catch (Exception ex) {
-          ex.printStackTrace();
+          Log.e(AboutDialogFragment.class.getName(), "Failed to open Play Store", ex);
         }
       }
     }
diff --git a/app/src/main/org/runnerup/widget/WidgetUtil.java b/app/src/main/org/runnerup/widget/WidgetUtil.java
index fab23b33a..96675cf65 100644
--- a/app/src/main/org/runnerup/widget/WidgetUtil.java
+++ b/app/src/main/org/runnerup/widget/WidgetUtil.java
@@ -17,16 +17,9 @@
 
 package org.runnerup.widget;
 
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.TextView;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.view.ViewCompat;
-import org.runnerup.R;
 
 public class WidgetUtil {
 
@@ -39,21 +32,6 @@ public static void setEditable(EditText editText, boolean onoff) {
     }
   }
 
-  public static View createHoloTabIndicator(Context ctx, String title) {
-    TextView txtTab = new TextView(ctx);
-    txtTab.setText(title);
-    // txtTab.setTextColor(Color.WHITE);
-    // txtTab.setGravity(Gravity.CENTER_HORIZONTAL);
-    Drawable drawable = AppCompatResources.getDrawable(ctx, R.drawable.tab_indicator_holo);
-    ViewCompat.setBackground(txtTab, drawable);
-
-    int h = (25 * drawable.getIntrinsicHeight()) / 10;
-    txtTab.setPadding(0, h, 0, h);
-    // txtTab.setHeight(1 + 10 * drawable.getIntrinsicHeight());
-    // txtTab.setLineSpacing(1 + 5 * drawable.getIntrinsicHeight(), 1);
-    return txtTab;
-  }
-
   public static void addLegacyOverflowButton(Window window) {
     if (window.peekDecorView() == null) {
       return;
diff --git a/build.gradle b/build.gradle
index bcfcf3791..7c98ddfdb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,12 +4,12 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:9.4.0'
+        classpath 'com.android.tools.build:gradle:9.4.1'
     }
 }
 
 plugins {
-    id "com.diffplug.spotless" version "8.6.0"
+    id "com.diffplug.spotless" version "8.10.2"
 }
 
 repositories {
@@ -107,29 +107,37 @@ project.ext {
     }
 }
 
-// Special setup for antPlusLib, not allowed to copy the .aar and create mavenLocal
-// Raises warning:
-// AGPBI: {"kind":"warning","text":"Using flatDir should be avoided because it doesn't support any meta-data formats.","sources":[{}]}
 allprojects {
     repositories {
+        google()
+        mavenCentral()
         if (rootProject.ext.antPlusLibName) {
-            flatDir { dirs rootProject.ext.antPlusLibPath }
+            ivy {
+                url = uri(rootProject.ext.antPlusLibPath)
+                patternLayout {
+                    artifact '[artifact].[ext]'
+                }
+                metadataSources {
+                    artifact()
+                }
+            }
+        }
+    }
+    tasks.withType(JavaCompile).tap {
+        configureEach {
+            // if (project.name != 'wear') {
+            //    options.compilerArgs << "-Xlint:deprecation";
+            // }
+            options.compilerArgs << "-Xlint:unchecked"
         }
     }
 }
 
 spotless {
-    lineEndings 'UNIX'
+    lineEndings = 'UNIX'
     java {
         googleJavaFormat()
         target '**/*.java'
         targetExclude '**/ANT-Android-SDKs/**', '**/build/**'
     }
 }
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
\ No newline at end of file
diff --git a/common/lint-baseline.xml b/common/lint-baseline.xml
index 355b2f37d..b0027d3ed 100644
--- a/common/lint-baseline.xml
+++ b/common/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.2.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.2.1)" variant="all" version="9.2.1">
+<issues format="6" by="lint 9.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.4.1)" variant="all" version="9.4.1">
 
 </issues>
diff --git a/gradle.properties b/gradle.properties
index b33955542..b31340008 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,16 +2,11 @@
 # Build with ./gradlew app:minifyLatestReleaseWithProguard
 # required for com.jjoe64:graphview:4.2.2
 android.enableJetifier=true
-android.useAndroidX=true
-org.gradle.caching = true
-org.gradle.parallel = true
-org.gradle.configureondemand = true
 org.gradle.vfs.watch = true
 org.gradle.unsafe.configuration-cache=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
 org.gradle.jvmargs=-Xmx4096m
--XX=MaxMetaspaceSize=1024m
 -Dfile.encoding=UTF-8
 
 # org.runnerup.free=true
@@ -21,9 +16,5 @@ org.gradle.jvmargs=-Xmx4096m
 # Disable map (i.e. neither MapBox nor osmdroid is used)
 # org.runnerup.nomap=true
 
-# Disable warnings due to the way ant+ is consumed
-# Using flatDir should be avoided because it doesn't support any meta-data formats
-android.sync.suppressAgpWarnings=FLAT_DIR_REPOSITORY_USED
-
 # Enabled parallel sync for Gradle 9.4+
 org.gradle.tooling.parallel=true
diff --git a/hrdevice/build.gradle b/hrdevice/build.gradle
index cdfa31ac3..c151dd561 100644
--- a/hrdevice/build.gradle
+++ b/hrdevice/build.gradle
@@ -64,6 +64,6 @@ dependencies {
     implementation "androidx.preference:preference:${rootProject.ext.preference_version}"
 
     if (rootProject.ext.antPlusLibName) {
-        implementation(name: rootProject.ext.antPlusLibName, ext: 'aar')
+        implementation "local:${rootProject.ext.antPlusLibName}:1.0@aar"
     }
-}
\ No newline at end of file
+}
diff --git a/hrdevice/lint-baseline.xml b/hrdevice/lint-baseline.xml
index 5a1071ecf..61f072c5d 100644
--- a/hrdevice/lint-baseline.xml
+++ b/hrdevice/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.2.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.2.1)" variant="all" version="9.2.1">
+<issues format="6" by="lint 9.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.4.1)" variant="all" version="9.4.1">
 
     <issue
         id="UnusedAttribute"
diff --git a/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java b/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java
index 0a7a66248..2ebc26761 100644
--- a/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java
+++ b/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java
@@ -26,6 +26,7 @@
 import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
 import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothStatusCodes;
 import android.bluetooth.le.BluetoothLeScanner;
 import android.bluetooth.le.ScanCallback;
 import android.bluetooth.le.ScanFilter;
@@ -48,7 +49,8 @@
 import java.util.UUID;
 
 /**
- * Connects to a Bluetooth Low Energy module for Android versions >= 5.0
+ * Connects to a Bluetooth Low Energy module for Android versions >= 5.0 This implementation
+ * suppresses some deprecated, keep compatibility with versions before api-33/android-13
  *
  * @author jonas
  */
@@ -78,28 +80,37 @@ public class AndroidBLEHRProvider extends BtHRBase implements HRProvider {
       new BluetoothGattCallback() {
 
         @Override
-        public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic arg0) {
+        @SuppressWarnings("deprecation")
+        public void onCharacteristicChanged(
+            BluetoothGatt gatt, BluetoothGattCharacteristic btChar) {
+          byte[] value = btChar.getValue();
+          onCharacteristicChanged(gatt, btChar, value);
+        }
+
+        @Override
+        public void onCharacteristicChanged(
+            BluetoothGatt gatt, BluetoothGattCharacteristic btChar, byte[] value) {
           try {
-            if (!checkBtGattOnlyLogError(gatt)) {
+            if (!checkBtGatt(gatt, true)) {
               return;
             }
 
-            if (!arg0.getUuid().equals(HEART_RATE_MEASUREMENT_CHARAC)) {
-              log("onCharacteristicChanged(" + arg0 + ") != HEART_RATE ??");
+            if (!btChar.getUuid().equals(HEART_RATE_MEASUREMENT_CHARAC)) {
+              log("onCharacteristicChanged(" + btChar + ") != HEART_RATE ??");
               return;
             }
 
-            int length = arg0.getValue().length;
-            if (length == 0) {
-              log("onCharacteristicChanged length = 0");
+            int length = value.length;
+            if (length < 2 || length < 3 && isHeartRateInUINT16(value[0])) {
+              log("onCharacteristicChanged: insufficient data, length=" + length);
               return;
             }
 
             int val;
-            if (isHeartRateInUINT16(arg0.getValue()[0])) {
-              val = arg0.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, 1);
+            if (isHeartRateInUINT16(value[0])) {
+              val = ((value[2] & 0xFF) << 8) | (value[1] & 0xFF);
             } else {
-              val = arg0.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT8, 1);
+              val = value[1] & 0xFF;
             }
 
             hrTimestamp = System.currentTimeMillis();
@@ -132,39 +143,45 @@ public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteris
           }
         }
 
+        @Override
+        @SuppressWarnings("deprecation")
+        public void onCharacteristicRead(
+            BluetoothGatt gatt, BluetoothGattCharacteristic btChar, int status) {
+          byte[] value = btChar.getValue();
+          onCharacteristicRead(gatt, btChar, value, status);
+        }
+
         @Override
         public void onCharacteristicRead(
-            BluetoothGatt gatt, BluetoothGattCharacteristic arg0, int status) {
+            BluetoothGatt gatt, BluetoothGattCharacteristic btChar, byte[] value, int status) {
           try {
-            log(
-                "onCharacteristicRead(): "
-                    + gatt
-                    + ", char: "
-                    + arg0.getUuid()
-                    + ", status: "
-                    + status);
+            UUID charUuid = btChar.getUuid();
+            log("onCharacteristicRead(): " + gatt + ", char: " + charUuid + ", status: " + status);
 
-            if (!checkBtGatt(gatt)) {
+            if (!checkBtGatt(gatt, false)) {
               return;
             }
 
-            UUID charUuid = arg0.getUuid();
             if (charUuid.equals(FIRMWARE_REVISON_UUID)) {
               log("firmware => startHR()");
-              // triggered from DummyReadForSecLevelCheck
+              // triggered from ReadDeviceInfoServices
               startHR();
             } else if (mSupportPaired && charUuid.equals(HARDWARE_REVISON_UUID)) {
               // Some paired devices like Huami (MiBand) has no firmware uuid
               log("BLE hardware rev => startHR()");
-              // triggered from DummyReadForSecLevelCheck
+              // triggered from ReadDeviceInfoServices
               startHR();
             } else if (charUuid.equals(BATTERY_LEVEL_CHARAC)) {
-              log("batterylevel: " + arg0);
-              batteryLevel = arg0.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT8, 0);
-              log("Battery level: " + batteryLevel);
+              if (value != null && value.length >= 1) {
+                batteryLevel = value[0] & 0xFF;
+                log("Battery level: " + batteryLevel);
+              } else {
+                batteryLevel = HRProvider.BATTERY_LEVEL_UNAVAILABLE;
+                log("Battery level unavailable");
+              }
 
-              log(" => startHR()");
-              // triggered from DummyReadForSecLevelCheck
+              log("battery level => startHR()");
+              // triggered from ReadDeviceInfoServices
               startHR();
 
             } else {
@@ -192,7 +209,7 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
                     + mIsConnected
                     + ", mIsDisconnecting: "
                     + mIsDisconnecting);
-            if (!checkBtGatt(gatt)) {
+            if (!checkBtGatt(gatt, false)) {
               log("checkBtGatt => return");
               return;
             }
@@ -231,9 +248,16 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
         }
 
         @Override
-        public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor arg0, int status) {
+        @SuppressWarnings("deprecation")
+        public void onDescriptorRead(
+            BluetoothGatt gatt, BluetoothGattDescriptor btDesc, int status) {
+          onDescriptorRead(gatt, btDesc, status, btDesc.getValue());
+        }
 
-          BluetoothGattCharacteristic mHRMcharac = arg0.getCharacteristic();
+        @Override
+        public void onDescriptorRead(
+            BluetoothGatt gatt, BluetoothGattDescriptor btDesc, int status, byte[] value) {
+          BluetoothGattCharacteristic mHRMcharac = btDesc.getCharacteristic();
           if (!enableNotification(gatt, true, mHRMcharac)) {
             reportConnectFailed("Failed to enable notification in onDescriptorRead");
           }
@@ -243,11 +267,11 @@ public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor arg0, i
         public void onServicesDiscovered(BluetoothGatt gatt, int status) {
           log("onServicesDiscoverd(): " + gatt + ", status: " + status);
 
-          if (!checkBtGatt(gatt)) {
+          if (!checkBtGatt(gatt, false)) {
             return;
           }
 
-          List<BluetoothGattService> list = btGatt.getServices();
+          List<BluetoothGattService> list = gatt.getServices();
           for (BluetoothGattService s : list) {
             log("Found service: " + s.getType() + ", " + s.getInstanceId() + ", " + s.getUuid());
             for (BluetoothGattCharacteristic a : s.getCharacteristics()) {
@@ -257,13 +281,13 @@ public void onServicesDiscovered(BluetoothGatt gatt, int status) {
               log("  serv: " + a.getUuid());
             }
 
-            if (s.getUuid().equals(BATTERY_SERVICE)) {
+            if (s.getUuid().equals(BATTERY_SERVICE_UUID)) {
               hasBatteryService = true;
             }
           }
 
-          log(" => DummyRead");
-          DummyReadForSecLevelCheck(gatt);
+          log(" => ReadDeviceInfoServices");
+          ReadDeviceInfoServices(gatt);
           // if GATT_SUCCESS, continue in onCharacteristicRead
           // no report on error
         }
@@ -271,7 +295,7 @@ public void onServicesDiscovered(BluetoothGatt gatt, int status) {
         /*
          * from Samsung HRPService.java
          */
-        private void DummyReadForSecLevelCheck(BluetoothGatt btGatt) {
+        private void ReadDeviceInfoServices(BluetoothGatt btGatt) {
           if (btGatt == null) {
             return;
           }
@@ -280,9 +304,13 @@ private void DummyReadForSecLevelCheck(BluetoothGatt btGatt) {
             return;
           }
 
-          BluetoothGattService disService = btGatt.getService(DIS_UUID);
+          BluetoothGattService disService = btGatt.getService(DEVICE_INFORMATION_SERVICE_UUID);
           if (disService == null) {
-            reportConnectFailed("Dis service not found");
+            log("Device Information service not found");
+            // This occurs for e.g. Garmin devices transmitting HR from a watch.
+            // Start HR (check HRP service) without reading characteristic (no trigger of
+            // onCharacteristicRead())
+            startHR();
             return;
           }
           BluetoothGattCharacteristic firmwareIdCharc =
@@ -302,11 +330,12 @@ private void DummyReadForSecLevelCheck(BluetoothGatt btGatt) {
         }
 
         private boolean isHeartRateInUINT16(byte b) {
+          // Bluetooth SIG UUID 0x2A37 first bit in first byte describes the length
           return (b & 1) != 0;
         }
 
         private void startHR() {
-          BluetoothGattService mHRP = btGatt.getService(HRP_SERVICE);
+          BluetoothGattService mHRP = btGatt.getService(HEART_RATE_SERVICE_UUID);
           if (mHRP == null) {
             reportConnectFailed("HRP service not found!");
             return;
@@ -318,7 +347,8 @@ private void startHR() {
             reportConnectFailed("HEART RATE MEASUREMENT charateristic not found!");
             return;
           }
-          BluetoothGattDescriptor mHRMccc = mHRMcharac.getDescriptor(CCC);
+          BluetoothGattDescriptor mHRMccc =
+              mHRMcharac.getDescriptor(CLIENT_CHARACTERISTIC_CONFIGURATION);
           if (mHRMccc == null) {
             reportConnectFailed("CCC for HEART RATE MEASUREMENT charateristic not found!");
             return;
@@ -330,7 +360,7 @@ private void startHR() {
         }
 
         private boolean readBatteryLevel() {
-          BluetoothGattService mBS = btGatt.getService(BATTERY_SERVICE);
+          BluetoothGattService mBS = btGatt.getService(BATTERY_SERVICE_UUID);
           if (mBS == null) {
             log("Battery service not found.");
             return false;
@@ -392,7 +422,7 @@ private static BluetoothGattCharacteristic getHeartrateCharacteristic(BluetoothG
     if (gatt == null) {
       return null;
     }
-    BluetoothGattService mHRP = gatt.getService(HRP_SERVICE);
+    BluetoothGattService mHRP = gatt.getService(HEART_RATE_SERVICE_UUID);
     if (mHRP == null) {
       return null;
     }
@@ -423,7 +453,9 @@ public void open(Handler handler, HRClient hrClient) {
     this.hrClient = hrClient;
     this.hrClientHandler = handler;
     if (btAdapter == null) {
-      btAdapter = BluetoothAdapter.getDefaultAdapter();
+      @SuppressWarnings("deprecation")
+      BluetoothAdapter adapterDeprecated = BluetoothAdapter.getDefaultAdapter();
+      btAdapter = adapterDeprecated;
     }
 
     hrClient.onOpenResult(btAdapter != null);
@@ -468,18 +500,27 @@ private boolean enableNotification(
       return false;
     }
 
-    BluetoothGattDescriptor clientConfig = charac.getDescriptor(CCC);
+    BluetoothGattDescriptor clientConfig =
+        charac.getDescriptor(CLIENT_CHARACTERISTIC_CONFIGURATION);
     if (clientConfig == null) {
       log("clientConfig == null");
       return false;
     }
 
-    if (onoff) {
-      clientConfig.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
+    boolean result;
+    byte[] notifValue =
+        onoff
+            ? BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
+            : BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE;
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      result = gatt.writeDescriptor(clientConfig, notifValue) == BluetoothStatusCodes.SUCCESS;
     } else {
-      clientConfig.setValue(BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE);
+      @SuppressWarnings("deprecation")
+      boolean setValueResult = clientConfig.setValue(notifValue);
+      @SuppressWarnings("deprecation")
+      boolean writeDescResult = gatt.writeDescriptor(clientConfig);
+      result = setValueResult && writeDescResult;
     }
-    boolean result = gatt.writeDescriptor(clientConfig);
     if (result) {
       mNotificationsOn = onoff;
     }
@@ -592,7 +633,9 @@ public void startScan() {
       mIsScanning = true;
       btScanner.startScan(
           Collections.singletonList(
-              new ScanFilter.Builder().setServiceUuid(new ParcelUuid(HRP_SERVICE)).build()),
+              new ScanFilter.Builder()
+                  .setServiceUuid(new ParcelUuid(HEART_RATE_SERVICE_UUID))
+                  .build()),
           new ScanSettings.Builder().build(),
           mLeScanCallback);
     }
@@ -636,7 +679,9 @@ private BluetoothGatt connectGatt(BluetoothDevice device, BluetoothGattCallback
     if (!checkPermission(Manifest.permission.BLUETOOTH_CONNECT, "connectGatt")) {
       return null;
     }
-    return device.connectGatt(context, false, callbacks);
+    @SuppressWarnings("deprecation")
+    BluetoothGatt gattDeprecated = device.connectGatt(context, false, callbacks);
+    return gattDeprecated;
   }
 
   private boolean connect(BluetoothGatt gatt) {
@@ -843,7 +888,7 @@ boolean disableNotification(BluetoothGatt gatt) {
       return false;
     }
 
-    BluetoothGattService mHRP = gatt.getService(HRP_SERVICE);
+    BluetoothGattService mHRP = gatt.getService(HEART_RATE_SERVICE_UUID);
     if (mHRP == null) {
       log("disableNotification: HRP service not found!");
       return false;
@@ -851,7 +896,7 @@ boolean disableNotification(BluetoothGatt gatt) {
 
     BluetoothGattCharacteristic mHRMcharac = mHRP.getCharacteristic(HEART_RATE_MEASUREMENT_CHARAC);
     if (mHRMcharac == null) {
-      log("disableNotification: HEART RATE MEASUREMENT charateristic not found!");
+      log("disableNotification: HEART RATE MEASUREMENT characteristic not found!");
       return false;
     }
 
@@ -943,16 +988,6 @@ public int getBatteryLevel() {
     return this.batteryLevel;
   }
 
-  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-  private boolean checkBtGatt(BluetoothGatt gatt) {
-    return checkBtGatt(gatt, false);
-  }
-
-  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-  private boolean checkBtGattOnlyLogError(BluetoothGatt gatt) {
-    return checkBtGatt(gatt, true);
-  }
-
   private synchronized boolean checkBtGatt(BluetoothGatt gatt, boolean onlyLogError) {
     if (btGatt == null) {
       if (!onlyLogError) {
diff --git a/hrdevice/src/org/runnerup/hr/BtHRBase.java b/hrdevice/src/org/runnerup/hr/BtHRBase.java
index 5bbce1dbb..3ae3f3b32 100644
--- a/hrdevice/src/org/runnerup/hr/BtHRBase.java
+++ b/hrdevice/src/org/runnerup/hr/BtHRBase.java
@@ -22,14 +22,17 @@
 import java.util.UUID;
 
 abstract class BtHRBase implements HRProvider {
-  static final UUID HRP_SERVICE = UUID.fromString("0000180D-0000-1000-8000-00805f9b34fb");
-  static final UUID BATTERY_SERVICE = UUID.fromString("0000180f-0000-1000-8000-00805f9b34fb");
+  static final UUID HEART_RATE_SERVICE_UUID =
+      UUID.fromString("0000180D-0000-1000-8000-00805f9b34fb");
+  static final UUID BATTERY_SERVICE_UUID = UUID.fromString("0000180f-0000-1000-8000-00805f9b34fb");
   static final UUID FIRMWARE_REVISON_UUID = UUID.fromString("00002a26-0000-1000-8000-00805f9b34fb");
-  static final UUID DIS_UUID = UUID.fromString("0000180a-0000-1000-8000-00805f9b34fb");
+  static final UUID DEVICE_INFORMATION_SERVICE_UUID =
+      UUID.fromString("0000180a-0000-1000-8000-00805f9b34fb");
   static final UUID HEART_RATE_MEASUREMENT_CHARAC =
       UUID.fromString("00002A37-0000-1000-8000-00805f9b34fb");
   static final UUID BATTERY_LEVEL_CHARAC = UUID.fromString("00002A19-0000-1000-8000-00805f9b34fb");
-  static final UUID CCC = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
+  static final UUID CLIENT_CHARACTERISTIC_CONFIGURATION =
+      UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
   static final UUID HARDWARE_REVISON_UUID = UUID.fromString("00002a27-0000-1000-8000-00805f9b34fb");
 
   HRProvider.HRClient hrClient;
diff --git a/wear/build.gradle b/wear/build.gradle
index ba5f76069..ce7dd6bc3 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -72,10 +72,10 @@ dependencies {
     implementation "androidx.wear:wear:1.4.0"
     implementation "androidx.wear:wear-ongoing:1.1.0"
     // Includes LocusIdCompat and new Notification categories for Ongoing Activity.
-    implementation "androidx.core:core:1.18.0"
+    implementation "androidx.core:core:1.19.1"
 
     implementation "androidx.activity:activity:1.13.0"
-    implementation "androidx.fragment:fragment:1.9.0"
+    implementation "androidx.fragment:fragment:1.9.1"
 }
 
 def props = new Properties()
diff --git a/wear/lint-baseline.xml b/wear/lint-baseline.xml
index 19afff74f..b0027d3ed 100644
--- a/wear/lint-baseline.xml
+++ b/wear/lint-baseline.xml
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.3.1)" variant="all" version="9.3.1">
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.core:core than 1.18.0 is available: 1.19.0"
-        errorLine1="    implementation &quot;androidx.core:core:1.18.0&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="75"
-            column="20"/>
-    </issue>
+<issues format="6" by="lint 9.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.4.1)" variant="all" version="9.4.1">
 
 </issues>