diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1250ce72..1f8f648a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/auto" />
             <option value="$PROJECT_DIR$/common" />
             <option value="$PROJECT_DIR$/mobile" />
             <option value="$PROJECT_DIR$/wear" />
diff --git a/GlucoDataAuto.md b/GlucoDataAuto.md
new file mode 100644
index 00000000..e1298e99
--- /dev/null
+++ b/GlucoDataAuto.md
@@ -0,0 +1,50 @@
+[<img src='images/de.png' height=10> Deutsche Version](GlucoDataAuto_DE.md)  
+[<img src='images/pl.png' height=10> Wersja polska](GlucoDataAuto_PL.md)
+
+# Android Auto
+
+As the Android Auto part of GlucoDataHandler does not fullfill Google PlayStore policies, this part has been moved to an extra app called GlucoDataAuto, which receives its settings and values from GlucoDataHandler. 
+
+It can also be used as standalone application for Juggluco or xDrip+.
+
+## Option #1: Using dummy media player
+If you are not using any Android Auto media player for listen music, you can use GlucoDataHandler to display its values in the media tap:
+
+<img src='images/AA_media.png' width=300>
+
+IMPORTANT: it is recommended to disable all other media apps in the Android Auto launcher, to get this to work.
+
+## Option #2: Using notifications
+
+You can also use notifications:
+
+<img src='images/AA_notification.png' width=300> <img src='images/AA_notification_view.png' width=300>
+
+## Option #3: Using the app
+
+<img src='images/AA_App.png' width=300>
+
+# Setup Android Auto
+
+Install last GlucoDataAuto_X.X.X.apk from [Releases](https://github.com/pachi81/GlucoDataHandler/releases) 
+
+## 1. Activate developer mode
+
+* open Android Auto app
+* scroll down to the Version
+* tap several times on the Version until a popup appears to "Allow development settings"
+* press "OK"
+
+## 2. Activate "Unknwon sources"
+
+* open Android Auto app
+* open in the 3-dot menu the "Developer settings"
+* scroll down to "Unknown source"
+* enable it
+
+## 3. Set Notifications settings
+
+* open Android Auto app
+* scroll down to "Notifications"
+* enable "Show conversations"
+* enable "Show first line of conversations"
diff --git a/GlucoDataAuto_DE.md b/GlucoDataAuto_DE.md
new file mode 100644
index 00000000..934d9e77
--- /dev/null
+++ b/GlucoDataAuto_DE.md
@@ -0,0 +1,52 @@
+[<img src='images/en.png' height=10> English version](GlucoDataAuto.md)  
+[<img src='images/pl.png' height=10> Wersja polska](GlucoDataAuto_PL.md)
+
+# Android Auto
+
+Nachdem der Android Auto Teil gegen die Richtlinien von Google Play verstosen hat, wurde dieser Teil in eine extra App namens GlucoDataAuto ausgelagert.
+Diese App empfäng sowohl die Glukosewerte, als auch die Einstellungen von GlucoDataHandler.
+
+Alternativ kann sie auch als eigenständige App für Juggluco oder xDrip+ verwendet werden.
+
+## Option #1: Dummy Media Player
+Wenn sie nicht über Android Auto Musik hören, können sie die Media Player Unterstützung verwenden:
+
+<img src='images/AA_media.png' width=300>
+
+WICHTIG: da die App selber keine Musik abspielt, sollte man alle anderen Media Player aus dem Launcher entfernen, damit diese App entsprechend angezeigt wird.
+
+## Option #2: Benachrichtigungen verwenden
+
+Alternativ zum Media Player kann die Android Auto Benachrichtigung verwendet werden:
+
+<img src='images/AA_notification.png' width=300> <img src='images/AA_notification_view.png' width=300>
+
+INFO: das Benachrichtigungs Popup erscheint bei jedem neuen Wert.
+
+## Option #3: APP verwenden
+
+<img src='images/AA_App.png' width=300>
+
+# Android Auto Installieren
+
+Installiere die letzte GlucoDataAuto_X.X.X.apk von [hier](https://github.com/pachi81/GlucoDataHandler/releases)
+
+## 1. Entwicklereinstellungen aktivieren
+
+* Android Auto App öffnen
+* bis zu Version scrollen
+* mehrfach auf Version drücken bis ein Popup mit "Entwicklereinstellungen zulassen" kommt
+* "OK" drücken
+
+## 2. "Unbekannte Quellen" aktivieren
+
+* Android Auto App öffnen
+* in den 3-Punkt Menü "Entwicklereinstellungen auswählen"
+* bis zu "Unbekannte Quellen" scrollen und aktivieren
+
+## 3. Benachrichtigungen aktivieren
+
+* Android Auto App öffnen
+* bis zu "Benachrichtigungen" scrollen
+* "Unterhaltungen anzeigen" aktivieren
+* "Erste Zeile einer Unterhaltung anzeigen" aktivieren
diff --git a/GlucoDataAuto_PL.md b/GlucoDataAuto_PL.md
new file mode 100644
index 00000000..597936e0
--- /dev/null
+++ b/GlucoDataAuto_PL.md
@@ -0,0 +1,50 @@
+[<img src='images/en.png' height=10> English version](GlucoDataAuto.md)  
+[<img src='images/de.png' height=10> Deutsche Version](GlucoDataAuto_DE.md)
+
+# Android Auto
+
+Ze względu na to, że część aplikacji GlucodataHandler dotycząca Android Auto nie spełnia wymagań polityk sklepu Google Play, została ona przeniesiona do dodatkowej aplikacji pod nazwą GlucoDataAuto, która odbiera ustawienia i wartości glukozy z GlucoDataHandler.
+
+Może ona być też używana jako samodzielna aplikacja w połączeniu z Juggluco lub xDrip+.
+
+## Opcja nr 1: Korzystanie z fikcyjnego odtwarzacza multimediów
+Jeśli nie używasz żadnego odtwarzacza multimedialnego w Android Auto do słuchania muzyki, możesz użyć aplikacji GlucoDataHandler, aby wyświetlić jego wartości w wiadomościach dotyczących multimediów:
+
+<img src='images/AA_media.png' width=300>
+
+WAŻNE: aby to działało, zaleca się wyłączenie wszystkich innych aplikacji multimedialnych w programie uruchamiającym Android Auto.
+
+## Opcja nr 2: Użycie powiadomień
+
+Można również korzystać z powiadomień:
+
+<img src='images/AA_notification.png' width=300> <img src='images/AA_notification_view.png' width=300>
+
+## Opcja nr 3: Korzystanie z aplikacji
+
+<img src='images/AA_App.png' width=300>
+
+# Konfiguracja Android Auto
+
+Zainstaluj ostatnią wersję GlucoDataAuto_X.X.X.apk, którą znaleźć można w zakładce [Releases](https://github.com/pachi81/GlucoDataHandler/releases) 
+
+## 1. Aktywacja trybu programisty
+
+- otwórz aplikację Android Auto
+- przewiń w dół do pozycji Wersja
+- dotknij kilkakrotnie pozycji Wersja, aż pojawi się wyskakujące okienko „Zezwalaj na ustawienia programistyczne"
+- naciśnij "OK"
+
+## 2. Aktywuj „Nieznane źródła"
+
+- otwórz aplikację Android Auto
+- otwórz w menu (3 kropki) „Ustawienia programisty"
+- przewiń w dół do pozycji „Nieznane źródło"
+- włącz ją
+
+## 3. Ustawienia powiadomień
+
+- otwórz aplikację Android Auto
+- przewiń w dół do pozycji „Powiadomienia"
+- włącz „Pokazuj rozmowy"
+- włącz „Pokazuj pierwszy wiersz rozmów"
diff --git a/INSTALLATION.md b/INSTALLATION.md
index bf8bcbcc..7db0907e 100644
--- a/INSTALLATION.md
+++ b/INSTALLATION.md
@@ -105,28 +105,3 @@ You can customize other fields with different information.
 And you should be set.
 
 <img src='images/complication4.png' width=300>
-
-## 4 - Setup Android Auto
-
-To activate GlucoDataHandler for Android Auto, you have to do the following steps:
-
-### 1. Activate developer mode
-
-* open Android Auto app
-* scroll down to the Version
-* tap several times on the Version until a popup appears to "Allow development settings"
-* press "OK"
-
-### 2. Activate "Unknwon sources"
-
-* open Android Auto app
-* open in the 3-dot menu the "Developer settings"
-* scroll down to "Unknown source"
-* enable it
-
-### 3. Set Notifications settings
-
-* open Android Auto app
-* scroll down to "Notifications"
-* enable "Show conversations"
-* enable "Show first line of conversations"
diff --git a/INSTALLATION_DE.md b/INSTALLATION_DE.md
index 9886dced..78c6315f 100644
--- a/INSTALLATION_DE.md
+++ b/INSTALLATION_DE.md
@@ -115,27 +115,3 @@ Dann GlucoDataHandler auswählen und eine Complication nach Wahl verwenden:
 Das für anderen Complications entsprechend wiederholen. Danach müssten die Werte im Watchface sichtbar sein:
 
 <img src='images/complication4.png' width=300>
-
-## 4 - Android Auto Einstellungen
-
-Um GlucoDataHandler in Android Auto zu verwenden, müssen die folgende Schritte durchgeführt werden:
-
-### 1. Entwicklereinstellungen aktivieren
-
-* Android Auto App öffnen
-* bis zu Version scrollen
-* mehrfach auf Version drücken bis ein Popup mit "Entwicklereinstellungen zulassen" kommt
-* "OK" drücken
-
-### 2. "Unbekannte Quellen" aktivieren
-
-* Android Auto App öffnen
-* in den 3-Punkt Menü "Entwicklereinstellungen auswählen"
-* bis zu "Unbekannte Quellen" scrollen und aktivieren
-
-### 3. Benachrichtigungen aktivieren
-
-* Android Auto App öffnen
-* bis zu "Benachrichtigungen" scrollen
-* "Unterhaltungen anzeigen" aktivieren
-* "Erste Zeile einer Unterhaltung anzeigen" aktivieren
diff --git a/INSTALLATION_PL.md b/INSTALLATION_PL.md
index 7475d266..5b1d6571 100644
--- a/INSTALLATION_PL.md
+++ b/INSTALLATION_PL.md
@@ -91,28 +91,3 @@ Inne pola można dostosować za pomocą różnych informacji.
 I powinieneś być gotowy.
 
 <img src='images/complication4.png' width=300>
-
-## 4 – Konfiguracja Android Auto
-
-Aby aktywować GlucoDataHandler dla Android Auto, należy wykonać następujące kroki:
-
-### 1. Aktywacja trybu programisty
-
-- otwórz aplikację Android Auto
-- przewiń w dół do pozycji Wersja
-- dotknij kilkakrotnie pozycji Wersja, aż pojawi się wyskakujące okienko „Zezwalaj na ustawienia programistyczne"
-- naciśnij "OK"
-
-### 2. Aktywuj „Nieznane źródła"
-
-- otwórz aplikację Android Auto
-- otwórz w menu (3 kropki) „Ustawienia programisty"
-- przewiń w dół do pozycji „Nieznane źródło"
-- włącz ją
-
-### 3. Ustawienia powiadomień
-
-- otwórz aplikację Android Auto
-- przewiń w dół do pozycji „Powiadomienia"
-- włącz „Pokazuj rozmowy"
-- włącz „Pokazuj pierwszy wiersz rozmów"
\ No newline at end of file
diff --git a/README.md b/README.md
index 94abdfa6..527f223c 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,13 @@
 * provides several **[widgets](#widgets)** and a floating widget for the phone
 * provides optional **[notifications](#notifications)** with different icons for the phone
 * provides several **[complications](#complications)** for Wear OS
-* provides **[Android Auto](#android-auto)** support
+* provides **[Android Auto](./GlucoDataAuto.md)** support using GlucoDataAuto.apk
 * **[Tasker](#tasker)** integration
 * sends glucodata broadcasts to other apps (which supports this broadcast)
 
 ## Download
+[<img src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' height=100>](https://play.google.com/store/apps/details?id=de.michelinside.glucodatahandler) 
+
 You can download the current version [here](https://github.com/pachi81/GlucoDataHandler/releases).
 
 ## Installation
@@ -92,27 +94,6 @@ There are several complications for the different types of wear OS complications
 **IMPORTANT:** Not all complications are fully supported by any watchface. For example the SHORT_TEXT type supports an icon, a text and a title, but the most watchfaces only show icon and text or text and title, but there are some, showing all 3 types in one.
 Also the RANGE_VALUE complication is handled different in each watchface.
 
-## Android Auto
-
-This app supports Android Auto.
-
-### Option #1: Using dummy media player
-If you are not using any Android Auto media player for listen music, you can use GlucoDataHandler to display its values in the media tap:
-
-<img src='images/AA_media.png' width=300>
-
-IMPORTANT: it is recommended to disable all other media apps in the Android Auto launcher, to get this to work.
-
-### Option #2: Using notifications
-
-You can also use notifications:
-
-<img src='images/AA_notification.png' width=300> <img src='images/AA_notification_view.png' width=300>
-
-### Option #3: Using the app
-
-<img src='images/AA_App.png' width=300>
-
 ## Tasker
 
 -> [Tasker support](./TASKER.md)
diff --git a/README_DE.md b/README_DE.md
index d5e1f9cc..48435eb0 100644
--- a/README_DE.md
+++ b/README_DE.md
@@ -11,11 +11,13 @@
 * stellt mehrere **[Widgets](#widgets)** für Android zur Verfügung
 * optionale **[Benachrichtigungen](#benachrichtigungen)** um weitere Statusbar-Icons zur Verfügung zu haben
 * stellt mehrere **[Complications](#complications)** für Wear OS zur Verfügung
-* unterstützt **[Android Auto](#android-auto)**
+* unterstützt **[Android Auto](./GlucoDataAuto_DE.md)** über die GlucoDataAuto APP
 * **[Tasker Ereignisse](#tasker)** Integration
 * sendet Glucodata Broadcasts an andere Apps (die dies unterstützen)
 
 ## Download
+[<img src='https://play.google.com/intl/en_us/badges/static/images/badges/de_badge_web_generic.png' height=100>](https://play.google.com/store/apps/details?id=de.michelinside.glucodatahandler) 
+
 Die neuste Version kann [hier](https://github.com/pachi81/GlucoDataHandler/releases) heruntergeladen werden.
 
 ## Installation
@@ -92,29 +94,6 @@ Die Wear OS version stellt mehrere Complications zur Verfügung:
 
 **WICHTIG:** Nicht alle Watchfaces zeigen die Complications gleich an, darauf habe ich keinen Einfluss, außer man verwendet die Bilder (farbigen Complications).
 
-## Android Auto
-
-Die App unterstützt Android Auto auf zweit Arten:
-
-### Option #1: Dummy Media Player
-Wenn sie nicht über Android Auto Musik hören, können sie die Media Player Unterstützung verwenden:
-
-<img src='images/AA_media.png' width=300>
-
-WICHTIG: da die App selber keine Musik abspielt, sollte man alle anderen Media Player aus dem Launcher entfernen, damit diese App entsprechend angezeigt wird.
-
-### Option #2: Benachrichtigungen verwenden
-
-Alternativ zum Media Player kann die Android Auto Benachrichtigung verwendet werden:
-
-<img src='images/AA_notification.png' width=300> <img src='images/AA_notification_view.png' width=300>
-
-INFO: das Benachrichtigungs Popup erscheint bei jedem neuen Wert.
-
-### Option #3: APP verwenden
-
-<img src='images/AA_App.png' width=300>
-
 ## Tasker
 
 -> [Tasker Integration](./TASKER.md)
diff --git a/README_PL.md b/README_PL.md
index b9097fc0..c0788a62 100644
--- a/README_PL.md
+++ b/README_PL.md
@@ -12,12 +12,14 @@
 * udostępnia kilka **[widgetów](#widgety)** i pływający widget dla telefonu
 * udostępnia opcjonalne **[powiadomienia](#powiadomienia)** z różnymi ikonami dla telefonu
 * udostępnia kilka **[komplikacj](#komplikacje)** dla Wear OS
-* umożliwia połączenie z **[Android Auto](#android-auto)**
+* umożliwia połączenie z **[Android Auto](./GlucoDataAuto_PL.md)**
 * Integracja z aplikacją **[Tasker](#aplikacja-tasker)**
 * wysyła transmisje danych o glukozie do innych aplikacji (które obsługują tę transmisję)
 
 ## Pobierz
 
+[<img src='https://play.google.com/intl/en_us/badges/static/images/badges/pl_badge_web_generic.png' height=100>](https://play.google.com/store/apps/details?id=de.michelinside.glucodatahandler) 
+
 Aktualną wersję można pobrać [tutaj](https://github.com/pachi81/GlucoDataHandler/releases).
 
 ## Instalacja
@@ -95,27 +97,6 @@ Istnieje kilka komplikacji dla różnych typów komplikacji w ramach Wear OS, kt
 **WAŻNA UWAGA:** Nie wszystkie komplikacje są w pełni obsługiwane przez każdą tarczę zegarka. Na przykład typ SHORT_TEXT obsługuje ikonę, tekst i tytuł, ale większość tarcz zegarków pokazuje tylko ikonę i tekst lub tekst i tytuł, ale są też takie, które pokazują wszystkie 3 typy w jednym.
 Również komplikacja WARTOŚĆ_ZAKRESU jest obsługiwana inaczej na każdej tarczy zegarka.
 
-## Android Auto
-
-Ta aplikacja obsługuje Android Auto.
-
-### Opcja nr 1: Korzystanie z fikcyjnego odtwarzacza multimediów
-Jeśli nie używasz żadnego odtwarzacza multimedialnego w Android Auto do słuchania muzyki, możesz użyć aplikacji GlucoDataHandler, aby wyświetlić jego wartości w wiadomościach dotyczących multimediów:
-
-<img src='images/AA_media.png' width=300>
-
-WAŻNE: aby to działało, zaleca się wyłączenie wszystkich innych aplikacji multimedialnych w programie uruchamiającym Android Auto.
-
-### Opcja nr 2: Użycie powiadomień
-
-Można również korzystać z powiadomień:
-
-<img src='images/AA_notification.png' width=300> <img src='images/AA_notification_view.png' width=300>
-
-### Opcja nr 3: Korzystanie z aplikacji
-
-<img src='images/AA_App.png' width=300>
-
 ## Aplikacja Tasker
 
 -> [Obsługa aplikacji Tasker](./TASKER.md)
diff --git a/auto/.gitignore b/auto/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/auto/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/auto/build.gradle b/auto/build.gradle
new file mode 100644
index 00000000..ff120b81
--- /dev/null
+++ b/auto/build.gradle
@@ -0,0 +1,83 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'de.michelinside.glucodataauto'
+    compileSdk rootProject.compileSdk
+
+    defaultConfig {
+        applicationId "de.michelinside.glucodataauto"
+        minSdk rootProject.minSdk
+        targetSdk rootProject.targetSdk
+        versionCode 1000 + rootProject.versionCode
+        versionName rootProject.versionName
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            // Enable ProGuard
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            resValue "string", "app_name", "GlucoDataAuto"
+        }
+        debug {
+            applicationIdSuffix '.debug'
+            minifyEnabled false
+            resValue "string", "app_name", "GlucoDataAuto"
+        }
+        applicationVariants.all {
+                // this method is use to rename your all apk weather
+                // it may be signed or unsigned(debug apk)
+            variant ->
+                variant.outputs.each {
+                        // on below line we are setting a
+                        // name to our apk as GlucoDataAuto.apk
+                    output ->
+                        def name = "GlucoDataAuto_" + versionName + ".apk"
+                        // on below line we are setting the
+                        // outputFile Name to our apk file.
+                        output.outputFileName = name
+                }
+        }
+
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.joaomgcd:taskerpluginlibrary:0.4.4'
+    implementation project(path: ':common')
+    implementation "androidx.car.app:app:1.2.0"
+    implementation "androidx.preference:preference:1.2.1"
+    implementation "com.jaredrummler:colorpicker:1.1.0"
+    implementation "androidx.media:media:1.7.0"
+}
+
+afterEvaluate {
+    //noinspection ConfigurationAvoidance
+    def assembleRelease = tasks.getByPath(':auto:assembleRelease')
+    def copyAndroidApksPostBuild = tasks.register('copyAndroidApksPostBuild', Copy) {
+        dependsOn assembleRelease
+        from "${projectDir}/release"
+        include '**/*.apk'
+        into rootProject.releasePath
+    }
+    assembleRelease.finalizedBy(copyAndroidApksPostBuild)
+}
\ No newline at end of file
diff --git a/auto/proguard-rules.pro b/auto/proguard-rules.pro
new file mode 100644
index 00000000..89c2cd95
--- /dev/null
+++ b/auto/proguard-rules.pro
@@ -0,0 +1,33 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+-dontwarn **
+-keep class **
+-keepclassmembers class *{*;}
+-keepattributes *
+
+# --------------------------------------------------------------------
+# REMOVE all debug log messages
+# --------------------------------------------------------------------
+-assumenosideeffects class android.util.Log {
+    public static *** d(...);
+    public static *** v(...);
+}
\ No newline at end of file
diff --git a/auto/src/main/AndroidManifest.xml b/auto/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..3d052ee6
--- /dev/null
+++ b/auto/src/main/AndroidManifest.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+
+    <queries>
+        <package android:name="tk.glucodata" />
+    </queries>
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent>
+    </queries>
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:persistent="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.GlucoDataHandler"
+        android:usesCleartextTraffic="true"
+        tools:targetApi="31">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <meta-data
+                android:name="de.michelinside.glucodataauto"
+                android:value="" />
+        </activity>
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/menu_settings"
+            android:parentActivityName=".MainActivity"
+            tools:ignore="LockedOrientationActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity" />
+        </activity>
+        <receiver
+            android:name=".de.michelinside.glucodataauto.GlucoDataActionReceiver"
+            android:enabled="true"
+            android:exported="true"
+            tools:ignore="ExportedReceiver">
+            <intent-filter>
+                <action android:name="de.michelinside.glucodatahandler.GLUCODATA" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="de.michelinside.glucodatahandler.common.receiver.GlucoseDataReceiver"
+            android:enabled="true"
+            android:exported="true"
+            tools:ignore="ExportedReceiver">
+            <intent-filter>
+                <action android:name="glucodata.Minute" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="de.michelinside.glucodatahandler.common.receiver.XDripBroadcastReceiver"
+            android:enabled="true"
+            android:exported="true"
+            tools:ignore="ExportedReceiver">
+            <intent-filter>
+                <action android:name="com.eveningoutpost.dexdrip.BgEstimate" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name="de.michelinside.glucodatahandler.common.tasks.TimeAlarmReceiver" />
+
+        <service
+            android:name=".android_auto.CarMediaBrowserService"
+            android:exported="true"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="android.media.browse.MediaBrowserService" />
+            </intent-filter>
+        </service>
+
+        <meta-data
+            android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc" />
+    </application>
+
+</manifest>
diff --git a/auto/src/main/ic_launcher-playstore.png b/auto/src/main/ic_launcher-playstore.png
new file mode 100644
index 00000000..ffc19fca
Binary files /dev/null and b/auto/src/main/ic_launcher-playstore.png differ
diff --git a/auto/src/main/java/de/michelinside/glucodataauto/GlucoDataActionReceiver.kt b/auto/src/main/java/de/michelinside/glucodataauto/GlucoDataActionReceiver.kt
new file mode 100644
index 00000000..7a00d9e1
--- /dev/null
+++ b/auto/src/main/java/de/michelinside/glucodataauto/GlucoDataActionReceiver.kt
@@ -0,0 +1,35 @@
+package de.michelinside.glucodataauto.de.michelinside.glucodataauto
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import de.michelinside.glucodatahandler.common.Constants
+import de.michelinside.glucodatahandler.common.ReceiveData
+import de.michelinside.glucodatahandler.common.notifier.DataSource
+
+open class GlucoDataActionReceiver: BroadcastReceiver() {
+    private val LOG_ID = "GDH.AA.GlucoDataActionReceiver"
+    override fun onReceive(context: Context, intent: Intent) {
+        try {
+            val action = intent.action
+            Log.v(LOG_ID, intent.action + " receveived: " + intent.extras.toString())
+            if (action != Constants.GLUCODATA_ACTION) {
+                Log.e(LOG_ID, "action=" + action + " != " + Constants.GLUCODATA_ACTION)
+                return
+            }
+            val extras = intent.extras
+            if (extras != null) {
+                if (extras.containsKey(Constants.SETTINGS_BUNDLE)) {
+                    val bundle = extras.getBundle(Constants.SETTINGS_BUNDLE)
+                    Log.d(LOG_ID, "Glucose settings receceived: " + bundle.toString())
+                    ReceiveData.setSettings(context, bundle!!)
+                    extras.remove(Constants.SETTINGS_BUNDLE)
+                }
+                ReceiveData.handleIntent(context, DataSource.PHONE, extras, true)
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "Receive exception: " + exc.message.toString() )
+        }
+    }
+}
\ No newline at end of file
diff --git a/auto/src/main/java/de/michelinside/glucodataauto/MainActivity.kt b/auto/src/main/java/de/michelinside/glucodataauto/MainActivity.kt
new file mode 100644
index 00000000..32b3a8b3
--- /dev/null
+++ b/auto/src/main/java/de/michelinside/glucodataauto/MainActivity.kt
@@ -0,0 +1,210 @@
+package de.michelinside.glucodataauto
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.graphics.Paint
+import android.net.Uri
+import android.os.Bundle
+import android.os.PowerManager
+import android.provider.Settings
+import android.util.Log
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.MenuCompat
+import androidx.preference.PreferenceManager
+import de.michelinside.glucodataauto.android_auto.CarNotification
+import de.michelinside.glucodatahandler.common.Constants
+import de.michelinside.glucodatahandler.common.ReceiveData
+import de.michelinside.glucodatahandler.common.Utils
+import de.michelinside.glucodatahandler.common.notifier.InternalNotifier
+import de.michelinside.glucodatahandler.common.notifier.NotifierInterface
+import de.michelinside.glucodatahandler.common.notifier.NotifySource
+import de.michelinside.glucodatahandler.common.R as CR
+
+class MainActivity : AppCompatActivity(), NotifierInterface {
+    private lateinit var txtBgValue: TextView
+    private lateinit var viewIcon: ImageView
+    private lateinit var txtLastValue: TextView
+    private lateinit var txtVersion: TextView
+    private lateinit var txtCarInfo: TextView
+    private lateinit var txtBatteryOptimization: TextView
+    private lateinit var sharedPref: SharedPreferences
+    private val LOG_ID = "GDH.AA.Main"
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        try {
+            super.onCreate(savedInstanceState)
+            setContentView(R.layout.activity_main)
+            Log.v(LOG_ID, "onCreate called")
+            txtBgValue = findViewById(R.id.txtBgValue)
+            viewIcon = findViewById(R.id.viewIcon)
+            txtLastValue = findViewById(R.id.txtLastValue)
+            txtCarInfo = findViewById(R.id.txtCarInfo)
+            txtBatteryOptimization = findViewById(R.id.txtBatteryOptimization)
+
+            PreferenceManager.setDefaultValues(this, R.xml.preferences, false)
+            sharedPref = this.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
+
+            ReceiveData.initData(this)
+
+            txtVersion = findViewById(R.id.txtVersion)
+            txtVersion.text = BuildConfig.VERSION_NAME
+
+            val sendToAod = sharedPref.getBoolean(Constants.SHARED_PREF_SEND_TO_GLUCODATA_AOD, false)
+
+            if(!sharedPref.contains(Constants.SHARED_PREF_GLUCODATA_RECEIVERS)) {
+                val receivers = HashSet<String>()
+                if (sendToAod)
+                    receivers.add("de.metalgearsonic.glucodata.aod")
+                Log.i(LOG_ID, "Upgrade receivers to " + receivers.toString())
+                with(sharedPref.edit()) {
+                    putStringSet(Constants.SHARED_PREF_GLUCODATA_RECEIVERS, receivers)
+                    apply()
+                }
+            }
+
+            if(!sharedPref.contains(Constants.SHARED_PREF_XDRIP_RECEIVERS)) {
+                val receivers = HashSet<String>()
+                receivers.add("com.eveningoutpost.dexdrip")
+                Log.i(LOG_ID, "Upgrade receivers to " + receivers.toString())
+                with(sharedPref.edit()) {
+                    putStringSet(Constants.SHARED_PREF_XDRIP_RECEIVERS, receivers)
+                    apply()
+                }
+            }
+            CarNotification.initNotification(this)
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onCreate exception: " + exc.message.toString() )
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (!CarNotification.connected)
+            CarNotification.cleanupNotification(this)
+    }
+
+    override fun onPause() {
+        try {
+            super.onPause()
+            InternalNotifier.remNotifier(this, this)
+            Log.v(LOG_ID, "onPause called")
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onPause exception: " + exc.message.toString() )
+        }
+    }
+
+    override fun onResume() {
+        try {
+            super.onResume()
+            Log.v(LOG_ID, "onResume called")
+            update()
+            InternalNotifier.addNotifier( this, this, mutableSetOf(
+                NotifySource.BROADCAST,
+                NotifySource.MESSAGECLIENT,
+                NotifySource.CAPILITY_INFO,
+                NotifySource.NODE_BATTERY_LEVEL,
+                NotifySource.SETTINGS,
+                NotifySource.CAR_CONNECTION,
+                NotifySource.OBSOLETE_VALUE,
+                NotifySource.SOURCE_STATE_CHANGE))
+            checkBatteryOptimization()
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onResume exception: " + exc.message.toString() )
+        }
+    }
+
+    private fun checkBatteryOptimization() {
+        try {
+            val pm = getSystemService(POWER_SERVICE) as PowerManager
+            if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+                Log.w(LOG_ID, "Battery optimization is inactive")
+                txtBatteryOptimization.visibility = View.VISIBLE
+                txtBatteryOptimization.setOnClickListener {
+                    val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                    intent.data = Uri.parse("package:$packageName")
+                    startActivity(intent)
+                }
+            } else {
+                txtBatteryOptimization.visibility = View.GONE
+                Log.i(LOG_ID, "Battery optimization is active")
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "checkBatteryOptimization exception: " + exc.message.toString() )
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        try {
+            Log.v(LOG_ID, "onCreateOptionsMenu called")
+            val inflater = menuInflater
+            inflater.inflate(R.menu.menu_items, menu)
+            MenuCompat.setGroupDividerEnabled(menu!!, true)
+            return true
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onCreateOptionsMenu exception: " + exc.message.toString() )
+        }
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        try {
+            Log.v(LOG_ID, "onOptionsItemSelected for " + item.itemId.toString())
+            when(item.itemId) {
+                R.id.action_settings -> {
+                    val intent = Intent(this, SettingsActivity::class.java)
+                    startActivity(intent)
+                    return true
+                }
+                R.id.action_help -> {
+                    val browserIntent = Intent(
+                        Intent.ACTION_VIEW,
+                        Uri.parse(resources.getText(CR.string.glucodataauto_link).toString())
+                    )
+                    startActivity(browserIntent)
+                    return true
+                }
+                R.id.action_support -> {
+                    val browserIntent = Intent(
+                        Intent.ACTION_VIEW,
+                        Uri.parse(resources.getText(CR.string.support_link).toString())
+                    )
+                    startActivity(browserIntent)
+                    return true
+                }
+                else -> return super.onOptionsItemSelected(item)
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onOptionsItemSelected exception: " + exc.message.toString() )
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun update() {
+        try {
+            Log.v(LOG_ID, "update values")
+            txtBgValue.text = ReceiveData.getClucoseAsString()
+            txtBgValue.setTextColor(ReceiveData.getClucoseColor())
+            if (ReceiveData.isObsolete(Constants.VALUE_OBSOLETE_SHORT_SEC) && !ReceiveData.isObsolete()) {
+                txtBgValue.paintFlags = Paint.STRIKE_THRU_TEXT_FLAG
+            } else {
+                txtBgValue.paintFlags = 0
+            }
+            viewIcon.setImageIcon(Utils.getRateAsIcon())
+            txtLastValue.text = ReceiveData.getAsString(this, CR.string.gda_no_data)
+            txtCarInfo.text = if (CarNotification.connected) resources.getText(CR.string.activity_main_car_connected_label) else resources.getText(CR.string.activity_main_car_disconnected_label)
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "update exception: " + exc.message.toString() )
+        }
+    }
+
+    override fun OnNotifyData(context: Context, dataSource: NotifySource, extras: Bundle?) {
+        Log.v(LOG_ID, "new intent received")
+        update()
+    }
+}
\ No newline at end of file
diff --git a/auto/src/main/java/de/michelinside/glucodataauto/StartReceiver.kt b/auto/src/main/java/de/michelinside/glucodataauto/StartReceiver.kt
new file mode 100644
index 00000000..3163ac8d
--- /dev/null
+++ b/auto/src/main/java/de/michelinside/glucodataauto/StartReceiver.kt
@@ -0,0 +1,18 @@
+package de.michelinside.glucodataauto
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+
+class StartReceiver: BroadcastReceiver() {
+
+    private val LOG_ID = "GDH.AA.StartReceiver"
+    override fun onReceive(context: Context, intent: Intent) {
+        try {
+            Log.i(LOG_ID, "Start Service after intent action received: " + intent.action)
+        } catch( exc: Exception ) {
+            Log.e(LOG_ID, exc.message + "\n" + exc.stackTraceToString())
+        }
+    }
+}
diff --git a/mobile/src/main/java/de/michelinside/glucodatahandler/android_auto/CarMediaBrowserService.kt b/auto/src/main/java/de/michelinside/glucodataauto/android_auto/CarMediaBrowserService.kt
similarity index 89%
rename from mobile/src/main/java/de/michelinside/glucodatahandler/android_auto/CarMediaBrowserService.kt
rename to auto/src/main/java/de/michelinside/glucodataauto/android_auto/CarMediaBrowserService.kt
index 8db4297a..b8f5b51f 100644
--- a/mobile/src/main/java/de/michelinside/glucodatahandler/android_auto/CarMediaBrowserService.kt
+++ b/auto/src/main/java/de/michelinside/glucodataauto/android_auto/CarMediaBrowserService.kt
@@ -1,4 +1,4 @@
-package de.michelinside.glucodatahandler.android_auto
+package de.michelinside.glucodataauto.android_auto
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -21,16 +21,18 @@ import de.michelinside.glucodatahandler.common.notifier.NotifierInterface
 import de.michelinside.glucodatahandler.common.notifier.NotifySource
 
 class CarMediaBrowserService: MediaBrowserServiceCompat(), NotifierInterface, SharedPreferences.OnSharedPreferenceChangeListener {
-    private val LOG_ID = "GDH.CarMediaBrowserService"
+    private val LOG_ID = "GDH.AA.CarMediaBrowserService"
     private val MEDIA_ROOT_ID = "root"
     private val MEDIA_GLUCOSE_ID = "glucose_value"
     private lateinit var  sharedPref: SharedPreferences
     private lateinit var session: MediaSessionCompat
 
     override fun onCreate() {
-        Log.d(LOG_ID, "onCreate")
+        Log.v(LOG_ID, "onCreate")
         try {
             super.onCreate()
+            CarNotification.initNotification(this)
+            ReceiveData.initData(this)
             sharedPref = this.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
             sharedPref.registerOnSharedPreferenceChangeListener(this)
 
@@ -51,7 +53,7 @@ class CarMediaBrowserService: MediaBrowserServiceCompat(), NotifierInterface, Sh
 
             sessionToken = session.sessionToken
 
-            InternalNotifier.addNotifier(this, mutableSetOf(
+            InternalNotifier.addNotifier(this, this, mutableSetOf(
                 NotifySource.BROADCAST,
                 NotifySource.MESSAGECLIENT,
                 NotifySource.SETTINGS,
@@ -62,11 +64,12 @@ class CarMediaBrowserService: MediaBrowserServiceCompat(), NotifierInterface, Sh
     }
 
     override fun onDestroy() {
-        Log.d(LOG_ID, "onDestroy")
+        Log.v(LOG_ID, "onDestroy")
         try {
-            InternalNotifier.remNotifier(this)
+            InternalNotifier.remNotifier(this, this)
             sharedPref.unregisterOnSharedPreferenceChangeListener(this)
             session.release()
+            CarNotification.cleanupNotification(this)
             super.onDestroy()
         } catch (exc: Exception) {
             Log.e(LOG_ID, "onDestroy exception: " + exc.message.toString() )
@@ -79,7 +82,7 @@ class CarMediaBrowserService: MediaBrowserServiceCompat(), NotifierInterface, Sh
         rootHints: Bundle?
     ): BrowserRoot? {
         try {
-            Log.d(LOG_ID, "onGetRoot - package: " + clientPackageName + " - UID: " + clientUid.toString())
+            Log.v(LOG_ID, "onGetRoot - package: " + clientPackageName + " - UID: " + clientUid.toString())
             return BrowserRoot(MEDIA_ROOT_ID, null)
         } catch (exc: Exception) {
             Log.e(LOG_ID, "onGetRoot exception: " + exc.message.toString() )
@@ -92,7 +95,7 @@ class CarMediaBrowserService: MediaBrowserServiceCompat(), NotifierInterface, Sh
         result: Result<MutableList<MediaBrowserCompat.MediaItem>>
     ) {
         try {
-            Log.d(LOG_ID, "onLoadChildren for parent: " + parentId)
+            Log.v(LOG_ID, "onLoadChildren for parent: " + parentId)
             if (MEDIA_ROOT_ID == parentId) {
                 result.sendResult(mutableListOf(createMediaItem()))
             } else {
@@ -104,7 +107,7 @@ class CarMediaBrowserService: MediaBrowserServiceCompat(), NotifierInterface, Sh
     }
 
     override fun OnNotifyData(context: Context, dataSource: NotifySource, extras: Bundle?) {
-        Log.d(LOG_ID, "OnNotifyData called")
+        Log.v(LOG_ID, "OnNotifyData called")
         try {
             notifyChildrenChanged(MEDIA_ROOT_ID)
         } catch (exc: Exception) {
@@ -113,7 +116,7 @@ class CarMediaBrowserService: MediaBrowserServiceCompat(), NotifierInterface, Sh
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        Log.d(LOG_ID, "onSharedPreferenceChanged called for key " + key)
+        Log.v(LOG_ID, "onSharedPreferenceChanged called for key " + key)
         try {
             when(key) {
                 Constants.SHARED_PREF_CAR_MEDIA -> {
@@ -121,7 +124,7 @@ class CarMediaBrowserService: MediaBrowserServiceCompat(), NotifierInterface, Sh
                 }
             }
         } catch (exc: Exception) {
-            Log.e(LOG_ID, "OnNotifyData exception: " + exc.message.toString() )
+            Log.e(LOG_ID, "onSharedPreferenceChanged exception: " + exc.message.toString() )
         }
     }
 
diff --git a/auto/src/main/java/de/michelinside/glucodataauto/android_auto/CarNotification.kt b/auto/src/main/java/de/michelinside/glucodataauto/android_auto/CarNotification.kt
new file mode 100644
index 00000000..c66465dd
--- /dev/null
+++ b/auto/src/main/java/de/michelinside/glucodataauto/android_auto/CarNotification.kt
@@ -0,0 +1,280 @@
+package de.michelinside.glucodataauto.android_auto
+
+import android.annotation.SuppressLint
+import android.app.*
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.util.Log
+import androidx.car.app.connection.CarConnection
+import androidx.car.app.notification.CarAppExtender
+import androidx.car.app.notification.CarNotificationManager
+import androidx.core.app.NotificationChannelCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.Person
+import androidx.core.app.RemoteInput
+import androidx.core.graphics.drawable.IconCompat
+import de.michelinside.glucodataauto.R
+import de.michelinside.glucodatahandler.common.R as CR
+import de.michelinside.glucodatahandler.common.*
+import de.michelinside.glucodatahandler.common.notifier.*
+import java.text.DateFormat
+import java.util.*
+
+
+@SuppressLint("StaticFieldLeak")
+object CarNotification: NotifierInterface, SharedPreferences.OnSharedPreferenceChangeListener {
+    private const val LOG_ID = "GDH.AA.CarNotification"
+    private const val CHANNEL_ID = "GlucoDataNotify_Car"
+    private const val CHANNEL_NAME = "Notification for Android Auto"
+    const val ACTION_REPLY = "de.michelinside.glucodataauto.REPLY"
+    const val ACTION_MARK_AS_READ = "de.michelinside.glucodataauto.MARK_AS_READ"
+    private const val NOTIFICATION_ID = 789
+    private var init = false
+    @SuppressLint("StaticFieldLeak")
+    private lateinit var notificationMgr: CarNotificationManager
+    private var show_notification = false  // default: no notification
+    private var car_connected = false
+    private var last_notification_time = 0L
+    private var notification_interval = 1L   // every minute -> always, -1L: only for alarms
+    private var forceNextNotify = false
+    val connected: Boolean get() = car_connected
+    @SuppressLint("StaticFieldLeak")
+    private lateinit var notificationCompat: NotificationCompat.Builder
+    @SuppressLint("StaticFieldLeak")
+    private var context: Context? = null
+
+    var enable_notification : Boolean get() {
+        return show_notification
+    }
+    set(value) {
+        show_notification = value
+        Log.d(LOG_ID, "show_notification set to " + show_notification.toString())
+    }
+
+    private fun createNotificationChannel(context: Context) {
+        notificationMgr = CarNotificationManager.from(context)
+        val notificationChannel = NotificationChannelCompat.Builder(
+            CHANNEL_ID,
+            NotificationManager.IMPORTANCE_HIGH
+        )
+        notificationChannel.setSound(null, null)   // silent
+        notificationMgr.createNotificationChannel(notificationChannel.setName(CHANNEL_NAME).build())
+    }
+
+    private fun createNofitication(context: Context) {
+        createNotificationChannel(context)
+        notificationCompat = NotificationCompat.Builder(context, CHANNEL_ID)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setContentTitle("GlucoDataAuto")
+            .setContentText("Android Auto")
+            .addInvisibleAction(createReplyAction(context))
+            .addInvisibleAction(createDismissAction(context))
+            .setSilent(true)
+            .setPriority(NotificationCompat.PRIORITY_MIN)
+            .extend (
+                CarAppExtender.Builder()
+                    .setImportance(NotificationManager.IMPORTANCE_HIGH)
+                    .build()
+            )
+    }
+
+    private fun updateSettings(sharedPref: SharedPreferences) {
+        val cur_enabled = enable_notification
+        enable_notification = sharedPref.getBoolean(Constants.SHARED_PREF_CAR_NOTIFICATION, enable_notification)
+        notification_interval = sharedPref.getString(Constants.SHARED_PREF_CAR_NOTIFICATION_INTERVAL, "-1")!!.toLong()
+        if(init && car_connected && cur_enabled != enable_notification) {
+            if(enable_notification)
+                showNotification(context!!, false)
+            else
+                removeNotification()
+        }
+    }
+
+    fun initNotification(context: Context) {
+        try {
+            if(!init) {
+                Log.v(LOG_ID, "initNotification called")
+                CarNotification.context = context
+                val sharedPref = context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
+                sharedPref.registerOnSharedPreferenceChangeListener(this)
+                updateSettings(sharedPref)
+                createNofitication(context)
+                CarConnection(context).type.observeForever(CarNotification::onConnectionStateUpdated)
+                init = true
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "init exception: " + exc.message.toString() )
+        }
+    }
+
+    fun cleanupNotification(context: Context) {
+        try {
+            if (init) {
+                Log.v(LOG_ID, "remNotification called")
+                CarConnection(context).type.removeObserver(CarNotification::onConnectionStateUpdated)
+                val sharedPref = context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
+                sharedPref.unregisterOnSharedPreferenceChangeListener(this)
+                init = false
+                CarNotification.context = null
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "init exception: " + exc.message.toString())
+        }
+    }
+
+    private fun onConnectionStateUpdated(connectionState: Int) {
+        try {
+            val message = when(connectionState) {
+                CarConnection.CONNECTION_TYPE_NOT_CONNECTED -> "Not connected to a head unit"
+                CarConnection.CONNECTION_TYPE_NATIVE -> "Connected to Android Automotive OS"
+                CarConnection.CONNECTION_TYPE_PROJECTION -> "Connected to Android Auto"
+                else -> "Unknown car connection type"
+            }
+            Log.v(LOG_ID, "onConnectionStateUpdated: " + message + " (" + connectionState.toString() + ")")
+            if (init) {
+                if (connectionState == CarConnection.CONNECTION_TYPE_NOT_CONNECTED)  {
+                    Log.i(LOG_ID, "Exited Car Mode")
+                    removeNotification()
+                    car_connected = false
+                    InternalNotifier.remNotifier(context!!, this)
+                } else {
+                    Log.i(LOG_ID, "Entered Car Mode")
+                    forceNextNotify = false
+                    car_connected = true
+                    InternalNotifier.addNotifier(context!!, this, mutableSetOf(
+                        NotifySource.BROADCAST,
+                        NotifySource.MESSAGECLIENT,
+                        NotifySource.OBSOLETE_VALUE))
+                    showNotification(context!!, false)
+                }
+                InternalNotifier.notify(context!!, NotifySource.CAR_CONNECTION, null)
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onConnectionStateUpdated exception: " + exc.message.toString() + "\n" + exc.stackTraceToString() )
+        }
+    }
+
+    override fun OnNotifyData(context: Context, dataSource: NotifySource, extras: Bundle?) {
+        Log.v(LOG_ID, "OnNotifyData called")
+        try {
+            showNotification(context, dataSource == NotifySource.OBSOLETE_VALUE)
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "OnNotifyData exception: " + exc.message.toString() + "\n" + exc.stackTraceToString() )
+        }
+    }
+
+    fun removeNotification() {
+        notificationMgr.cancel(NOTIFICATION_ID)  // remove notification
+        forceNextNotify = false
+    }
+
+    private fun getTimeDiffMinute(): Long {
+        return Utils.round((ReceiveData.time-last_notification_time).toFloat()/60000, 0).toLong()
+    }
+
+    private fun canShowNotification(isObsolete: Boolean): Boolean {
+        if (init && enable_notification && car_connected) {
+            if(notification_interval == 1L || ReceiveData.forceAlarm)
+                return true
+            if (ReceiveData.getAlarmType() == ReceiveData.AlarmType.VERY_LOW || isObsolete) {
+                forceNextNotify = true  // if obsolete or VERY_LOW, the next value is important!
+                return true
+            }
+            if (forceNextNotify) {
+                forceNextNotify = false
+                return true
+            }
+            if (notification_interval > 1L) {
+                return getTimeDiffMinute() >= notification_interval
+            }
+            return false
+        }
+        return false
+    }
+
+    fun showNotification(context: Context, isObsolete: Boolean) {
+        try {
+            if (canShowNotification(isObsolete)) {
+                Log.v(LOG_ID, "showNotification called")
+                notificationCompat
+                    .setLargeIcon(Utils.getRateAsBitmap(resizeFactor = 0.75F))
+                    .setWhen(ReceiveData.time)
+                    .setStyle(createMessageStyle(context, isObsolete))
+                notificationMgr.notify(NOTIFICATION_ID, notificationCompat)
+                last_notification_time = ReceiveData.time
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "showNotification exception: " + exc.toString() )
+        }
+    }
+
+    private fun createMessageStyle(context: Context, isObsolete: Boolean): NotificationCompat.MessagingStyle {
+        val person = Person.Builder()
+            .setIcon(IconCompat.createWithBitmap(Utils.getRateAsBitmap(resizeFactor = 0.75F)!!))
+            .setName(ReceiveData.getClucoseAsString())
+            .setImportant(true)
+            .build()
+        val messagingStyle = NotificationCompat.MessagingStyle(person)
+        if (isObsolete)
+            messagingStyle.conversationTitle = context.getString(CR.string.no_new_value, ReceiveData.getElapsedTimeMinute())
+        else
+            messagingStyle.conversationTitle = ReceiveData.getClucoseAsString()  + " (" + ReceiveData.getDeltaAsString() + ")"
+        messagingStyle.isGroupConversation = false
+        messagingStyle.addMessage(DateFormat.getTimeInstance(DateFormat.SHORT).format(Date(ReceiveData.time)), System.currentTimeMillis(), person)
+        return messagingStyle
+    }
+
+    private fun createReplyAction(context: Context): NotificationCompat.Action {
+        val remoteInputWear =
+            RemoteInput.Builder("extra_voice_reply").setLabel("Reply")
+                .build()
+        val intent = Intent(ACTION_REPLY)
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            1,
+            intent,
+            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+        return NotificationCompat.Action.Builder(R.mipmap.ic_launcher, "Reply", pendingIntent)
+            //.setAllowGeneratedReplies(true)
+            .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
+            .setShowsUserInterface(false)
+            .addRemoteInput(remoteInputWear)
+            .build()
+    }
+
+    private fun createDismissAction(context: Context): NotificationCompat.Action {
+        val intent = Intent(ACTION_MARK_AS_READ)
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            2,
+            intent,
+            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+        return NotificationCompat.Action.Builder(
+            R.mipmap.ic_launcher,
+            "Mark as read",
+            pendingIntent
+        )
+            .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ)
+            .setShowsUserInterface(false)
+            .build()
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        try {
+            Log.v(LOG_ID, "onSharedPreferenceChanged called for key " + key)
+            when(key) {
+                Constants.SHARED_PREF_CAR_NOTIFICATION,
+                Constants.SHARED_PREF_CAR_NOTIFICATION_INTERVAL -> {
+                    updateSettings(sharedPreferences!!)
+                }
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onSharedPreferenceChanged exception: " + exc.toString() + "\n" + exc.stackTraceToString() )
+        }
+    }
+}
+
diff --git a/auto/src/main/java/de/michelinside/glucodataauto/preferences/AppSettingsActivity.kt b/auto/src/main/java/de/michelinside/glucodataauto/preferences/AppSettingsActivity.kt
new file mode 100644
index 00000000..493ebcc5
--- /dev/null
+++ b/auto/src/main/java/de/michelinside/glucodataauto/preferences/AppSettingsActivity.kt
@@ -0,0 +1,18 @@
+package de.michelinside.glucodataauto
+
+//noinspection SuspiciousImport
+import android.R
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import de.michelinside.glucodataauto.preferences.SettingsFragment
+import de.michelinside.glucodatahandler.common.R as RC
+
+class SettingsActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        this.supportActionBar!!.title = this.applicationContext.resources.getText(RC.string.menu_settings)
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.content, SettingsFragment())
+            .commit()
+    }
+}
\ No newline at end of file
diff --git a/auto/src/main/java/de/michelinside/glucodataauto/preferences/GlucoseEditPreference.kt b/auto/src/main/java/de/michelinside/glucodataauto/preferences/GlucoseEditPreference.kt
new file mode 100644
index 00000000..993a9536
--- /dev/null
+++ b/auto/src/main/java/de/michelinside/glucodataauto/preferences/GlucoseEditPreference.kt
@@ -0,0 +1,92 @@
+package de.michelinside.glucodataauto.preferences
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.text.InputType
+import android.util.AttributeSet
+import android.util.Log
+import android.widget.EditText
+import androidx.preference.EditTextPreference
+import androidx.preference.EditTextPreference.OnBindEditTextListener
+import de.michelinside.glucodatahandler.common.ReceiveData
+import de.michelinside.glucodatahandler.common.Utils
+
+class GlucoseEditPreference : EditTextPreference, OnBindEditTextListener {
+    companion object {
+        private val LOG_ID = "GDH.AA.GlucoseEditPreference"
+    }
+    private var defaultValue = 0F
+    constructor(context: Context?) : super(context!!)  {
+        initDialog()
+    }
+    constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs) {
+        initDialog()
+    }
+    constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(
+        context!!, attrs, defStyle
+    ) {
+        initDialog()
+    }
+
+    fun initDialog() {
+        try {
+            Log.d(LOG_ID, "initDialog called")
+            setOnBindEditTextListener(this)
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "initDialog exception: " + exc.toString())
+        }
+    }
+
+    override fun persistFloat(value: Float): Boolean {
+        Log.i(LOG_ID, "persistFloat called with value " + value)
+        return super.persistFloat(value)
+    }
+
+    override fun onGetDefaultValue(a: TypedArray, index: Int): Any? {
+        Log.d(LOG_ID, "onGetDefaultValue called")
+        val value = super.onGetDefaultValue(a, index)
+        try {
+            if (value != null)
+                defaultValue = value.toString().toFloat()
+            Log.d(LOG_ID, "Using default value: " + defaultValue)
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onGetDefaultValue exception: " + exc.toString())
+        }
+        return value
+    }
+
+    override fun getPersistedString(defaultReturnValue: String?): String {
+        Log.i(LOG_ID, "getPersistedString called")
+        return getPersistedFloat(defaultValue).toString()
+    }
+
+    override fun persistString(value: String?): Boolean {
+        Log.i(LOG_ID, "persistString called with value " + value)
+        try {
+            if (Utils.isMmolValue(value!!.toFloat()))
+                return persistFloat(Utils.mmolToMg(value.toFloat()))
+            return persistFloat(value.toFloat())
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "persistString exception: " + exc.toString())
+        }
+        return false
+    }
+
+    override fun onBindEditText(editText: EditText) {
+        Log.i(LOG_ID, "onBindEditText called " + editText.text)
+        try {
+            editText.inputType = if (ReceiveData.isMmol) InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL else InputType.TYPE_CLASS_NUMBER
+            var value = editText.getText().toString().toFloat()
+            if (!ReceiveData.isMmol) {
+                if(Utils.isMmolValue(value))
+                    value = Utils.mmolToMg(value)
+                editText.setText(value.toInt().toString())
+            } else if (ReceiveData.isMmol && !Utils.isMmolValue(value)) {
+                editText.setText(Utils.mgToMmol(value).toString())
+            }
+            Log.i(LOG_ID, "onBindEditText new text: " + editText.text)
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onBindEditText exception: " + exc.toString())
+        }
+    }
+}
\ No newline at end of file
diff --git a/auto/src/main/java/de/michelinside/glucodataauto/preferences/SettingsFragment.kt b/auto/src/main/java/de/michelinside/glucodataauto/preferences/SettingsFragment.kt
new file mode 100644
index 00000000..a56b63ac
--- /dev/null
+++ b/auto/src/main/java/de/michelinside/glucodataauto/preferences/SettingsFragment.kt
@@ -0,0 +1,78 @@
+package de.michelinside.glucodataauto.preferences
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.util.Log
+import androidx.preference.*
+import de.michelinside.glucodataauto.BuildConfig
+import de.michelinside.glucodataauto.R
+import de.michelinside.glucodatahandler.common.Constants
+
+
+class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener {
+    private val LOG_ID = "GDH.AA.SettingsFragment"
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        Log.d(LOG_ID, "onCreatePreferences called")
+        try {
+            preferenceManager.sharedPreferencesName = Constants.SHARED_PREF_TAG
+            setPreferencesFromResource(R.xml.preferences, rootKey)
+
+            if (BuildConfig.DEBUG) {
+                val notifySwitch =
+                    findPreference<SwitchPreferenceCompat>(Constants.SHARED_PREF_DUMMY_VALUES)
+                notifySwitch!!.isVisible = true
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onCreatePreferences exception: " + exc.toString())
+        }
+    }
+
+    override fun onResume() {
+        Log.d(LOG_ID, "onResume called")
+        try {
+            preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
+            updateEnableStates(preferenceManager.sharedPreferences!!)
+            super.onResume()
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onResume exception: " + exc.toString())
+        }
+    }
+
+    override fun onPause() {
+        Log.d(LOG_ID, "onPause called")
+        try {
+            preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
+            super.onPause()
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onPause exception: " + exc.toString())
+        }
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        Log.d(LOG_ID, "onSharedPreferenceChanged called for " + key)
+        try {
+            when(key) {
+                Constants.SHARED_PREF_CAR_NOTIFICATION -> {
+                    updateEnableStates(sharedPreferences!!)
+                }
+            }
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "onSharedPreferenceChanged exception: " + exc.toString())
+        }
+    }
+
+    fun <T : Preference?> setEnableState(sharedPreferences: SharedPreferences, key: String, enableKey: String, secondEnableKey: String? = null, defValue: Boolean = false) {
+        val pref = findPreference<T>(key)
+        if (pref != null)
+            pref.isEnabled = sharedPreferences.getBoolean(enableKey, defValue) && (if (secondEnableKey != null) sharedPreferences.getBoolean(secondEnableKey, defValue) else true)
+    }
+
+    fun updateEnableStates(sharedPreferences: SharedPreferences) {
+        try {
+            setEnableState<ListPreference>(sharedPreferences, Constants.SHARED_PREF_CAR_NOTIFICATION_INTERVAL, Constants.SHARED_PREF_CAR_NOTIFICATION)
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "updateEnableStates exception: " + exc.toString())
+        }
+    }
+}
diff --git a/auto/src/main/res/drawable/ic_launcher_background.xml b/auto/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..e009ebe7
--- /dev/null
+++ b/auto/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0"
+      android:scaleY="0"
+      android:translateX="54"
+      android:translateY="54">
+      <path android:fillColor="#3DDC84"
+            android:pathData="M0,0h108v108h-108z"/>
+      <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+  </group>
+</vector>
diff --git a/auto/src/main/res/layout/activity_main.xml b/auto/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000..c889991c
--- /dev/null
+++ b/auto/src/main/res/layout/activity_main.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    android:padding="10dp">
+<LinearLayout
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    tools:context=".MainActivity"
+    android:orientation="vertical"
+    android:gravity="center|top">
+
+
+    <LinearLayout
+        android:id="@+id/layout_glucose_trend"
+        android:layout_width="250dp"
+        android:layout_height="80dp"
+        android:layout_marginTop="20dp"
+        android:gravity="center|top"
+        android:orientation="horizontal"
+        app:layout_constraintStart_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="UselessParent">
+
+        <TextView
+            android:id="@+id/txtBgValue"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="4"
+            android:autoSizeStepGranularity="1sp"
+            android:autoSizeTextType="uniform"
+            android:maxLines="1"
+            android:text="---"
+            android:textAlignment="viewEnd"
+            android:textColor="#757575"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
+
+        <ImageView
+            android:id="@+id/viewIcon"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="3"
+            android:paddingVertical="2dp"
+            android:src="@drawable/icon_question"
+            tools:ignore="ContentDescription" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/txtLastValue"
+        android:layout_width="350dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"
+        android:text="@string/gda_no_data"
+        android:textAlignment="center"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/layout_glucose_trend"
+        app:layout_constraintTop_toTopOf="@+id/layout_info_elements" />
+
+    <LinearLayout
+        android:id="@+id/layout_info_elements"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="20dp"
+        android:gravity="center|bottom"
+        android:orientation="vertical"
+        app:layout_constraintStart_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="UselessParent">
+        <TextView
+            android:id="@+id/txtBatteryOptimization"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/activity_main_battery_optimization_disabled"
+            android:textSize="16sp"
+            android:visibility="gone"
+            tools:ignore="HardcodedText"
+            android:textAlignment="center"
+            app:layout_constraintBottom_toTopOf="@+id/txtSourceInfo"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+            android:id="@+id/txtCarInfo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:text="@string/activity_main_car_disconnected_label"
+            android:textAlignment="center"
+            app:layout_constraintBottom_toTopOf="@+id/txtVersion"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/txtVersion"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="25dp"
+            android:text="1.0"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:textSize="16sp"
+            tools:ignore="HardcodedText" />
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/auto/src/main/res/layout/fragment_select_receiver.xml b/auto/src/main/res/layout/fragment_select_receiver.xml
new file mode 100644
index 00000000..652cfe32
--- /dev/null
+++ b/auto/src/main/res/layout/fragment_select_receiver.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="30dp">
+
+
+    <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/showAllSwitch"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/select_receiver_show_all"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ScrollView
+        android:id="@+id/receiverScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true"
+        android:padding="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/showAllSwitch">
+
+        <LinearLayout
+            android:id="@+id/receiverLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/auto/src/main/res/menu/menu_items.xml b/auto/src/main/res/menu/menu_items.xml
new file mode 100644
index 00000000..2863e588
--- /dev/null
+++ b/auto/src/main/res/menu/menu_items.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <group
+        android:id="@+id/group_settings">
+        <item
+            android:id="@+id/action_settings"
+            android:title="@string/menu_settings"
+            app:showAsAction="never" />
+    </group>
+    <group
+        android:id="@+id/group_github">
+        <item
+            android:id="@+id/group_github_title"
+            android:title="@string/menu_group_github">
+            <menu>
+                <item
+                    android:id="@+id/action_support"
+                    android:title="@string/menu_support"
+                    app:showAsAction="never" />
+                <item
+                    android:id="@+id/action_help"
+                    android:title="@string/menu_help"
+                    app:showAsAction="never" />
+            </menu>
+        </item>
+    </group>
+</menu>
\ No newline at end of file
diff --git a/auto/src/main/res/mipmap-anydpi b/auto/src/main/res/mipmap-anydpi
new file mode 100644
index 00000000..e69de29b
diff --git a/auto/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/auto/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..c4a603d4
--- /dev/null
+++ b/auto/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/auto/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/auto/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..c4a603d4
--- /dev/null
+++ b/auto/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/auto/src/main/res/mipmap-hdpi/ic_launcher.png b/auto/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..e9dd2026
Binary files /dev/null and b/auto/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/auto/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/auto/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..2e011f50
Binary files /dev/null and b/auto/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/auto/src/main/res/mipmap-hdpi/ic_launcher_round.png b/auto/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..3a8f410d
Binary files /dev/null and b/auto/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/auto/src/main/res/mipmap-mdpi/ic_launcher.png b/auto/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..27d9a076
Binary files /dev/null and b/auto/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/auto/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/auto/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..cec964a1
Binary files /dev/null and b/auto/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/auto/src/main/res/mipmap-mdpi/ic_launcher_round.png b/auto/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..1c2259c4
Binary files /dev/null and b/auto/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/auto/src/main/res/mipmap-xhdpi/ic_launcher.png b/auto/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..edef926c
Binary files /dev/null and b/auto/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/auto/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/auto/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..2bdfe9c6
Binary files /dev/null and b/auto/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/auto/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/auto/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..f1e11048
Binary files /dev/null and b/auto/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/auto/src/main/res/mipmap-xxhdpi/ic_launcher.png b/auto/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..08d58165
Binary files /dev/null and b/auto/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/auto/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/auto/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..0188355e
Binary files /dev/null and b/auto/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/auto/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/auto/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..63afdd16
Binary files /dev/null and b/auto/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/auto/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/auto/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..cbad4c25
Binary files /dev/null and b/auto/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/auto/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/auto/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..84fd5f0b
Binary files /dev/null and b/auto/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/auto/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/auto/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..84934dcd
Binary files /dev/null and b/auto/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/auto/src/main/res/values-night/colors.xml b/auto/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..edcc8bfc
--- /dev/null
+++ b/auto/src/main/res/values-night/colors.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="red">#FFFF0000</color>
+    <color name="yellow">#FFFFFF00</color>
+    <color name="green">#FF00FF00</color>
+    <color name="text_color">@color/white</color>
+    <color name="transparent_widget_background">#55000000</color>
+    <color name="transparent_widget_textcolor">@color/white</color>
+</resources>
\ No newline at end of file
diff --git a/auto/src/main/res/values-night/themes.xml b/auto/src/main/res/values-night/themes.xml
new file mode 100644
index 00000000..ec58cb59
--- /dev/null
+++ b/auto/src/main/res/values-night/themes.xml
@@ -0,0 +1,16 @@
+<resources>
+    <!-- Base application theme. -->
+    <style name="Theme.GlucoDataHandler" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">#94C2FA</item>
+        <item name="colorPrimaryVariant">@color/teal_200</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">#94C2FA</item>
+        <item name="colorSecondaryVariant">#5EC3F1</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">#005CCC</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/auto/src/main/res/values/arrays.xml b/auto/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..ce8122b4
--- /dev/null
+++ b/auto/src/main/res/values/arrays.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Label ordering must match values -->
+    <array name="pref_status_bar_icon_labels">
+        <item>@string/pref_status_bar_icon_app</item>
+        <item>@string/pref_status_bar_icon_glucose</item>
+        <item>@string/pref_status_bar_icon_trend</item>
+        <item>@string/pref_status_bar_icon_delta</item>
+    </array>
+    <array name="pref_status_bar_icon_values">
+        <item>"app"</item>
+        <item>"glucose"</item>
+        <item>"trend"</item>
+        <item>"delta"</item>
+    </array>
+    <array name="pref_floating_widget_style_labels">
+        <item>@string/widget_glucose</item>
+        <item>@string/widget_glucose_trend</item>
+        <item>@string/widget_glucose_trend_delta</item>
+        <item>@string/widget_glucose_trend_delta_timestamp</item>
+    </array>
+    <array name="pref_floating_widget_style_values">
+        <item>"glucose"</item>
+        <item>"glucose_trend"</item>
+        <item>"glucose_trend_delta"</item>
+        <item>"glucose_trend_delta_time"</item>
+    </array>
+    <array name="tasker_supported_settings_labels">
+        <item>@string/pref_floating_widget</item>
+        <item>@string/pref_notification</item>
+        <item>@string/pref_switch_car_notification</item>
+        <item>@string/pref_wear_notification</item>
+    </array>
+    <array name="tasker_supported_settings_values">
+        <item>"floating_widget"</item>
+        <item>"permanent_notification"</item>
+        <item>"car_notification"</item>
+        <item>"wear_notification"</item>
+    </array>
+    <array name="source_request_interval_labels">
+        <item>@string/source_request_interval_1</item>
+        <item>@string/source_request_interval_5</item>
+        <item>@string/source_request_interval_10</item>
+        <item>@string/source_request_interval_15</item>
+    </array>
+    <array name="source_request_interval_values">
+        <item>"1"</item>
+        <item>"5"</item>
+        <item>"10"</item>
+        <item>"15"</item>
+    </array>
+    <array name="car_notification_interval_labels">
+        <item>@string/source_request_interval_always</item>
+        <item>@string/source_request_interval_5</item>
+        <item>@string/source_request_interval_10</item>
+        <item>@string/source_request_interval_15</item>
+        <item>@string/source_request_interval_20</item>
+        <item>@string/source_request_interval_30</item>
+        <item>@string/source_request_interval_alarm</item>
+    </array>
+    <array name="car_notification_interval_values">
+        <item>"1"</item>
+        <item>"5"</item>
+        <item>"10"</item>
+        <item>"15"</item>
+        <item>"20"</item>
+        <item>"30"</item>
+        <item>"-1"</item>
+    </array>
+</resources>
diff --git a/auto/src/main/res/values/colors.xml b/auto/src/main/res/values/colors.xml
new file mode 100644
index 00000000..84c4444b
--- /dev/null
+++ b/auto/src/main/res/values/colors.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="red">#FFFF0000</color>
+    <color name="yellow">#FFFFFF00</color>
+    <color name="orange">#FFFF7700</color>
+    <color name="green">#FF00FF00</color>
+    <color name="text_color">@color/black</color>
+    <color name="transparent_widget_background">#55000000</color>
+    <color name="transparent_widget_textcolor">@color/white</color>
+</resources>
\ No newline at end of file
diff --git a/auto/src/main/res/values/ic_launcher_background.xml b/auto/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 00000000..3f45128d
--- /dev/null
+++ b/auto/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FDFDFD</color>
+</resources>
\ No newline at end of file
diff --git a/auto/src/main/res/values/themes.xml b/auto/src/main/res/values/themes.xml
new file mode 100644
index 00000000..bb9abe1b
--- /dev/null
+++ b/auto/src/main/res/values/themes.xml
@@ -0,0 +1,17 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.GlucoDataHandler" parent="Theme.MaterialComponents.Light.DarkActionBar">
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">#005CCC</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">#0099FF</item>
+        <item name="colorSecondaryVariant">#4000FF</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">#005CCC</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/xml/automotive_app_desc.xml b/auto/src/main/res/xml/automotive_app_desc.xml
similarity index 100%
rename from mobile/src/main/res/xml/automotive_app_desc.xml
rename to auto/src/main/res/xml/automotive_app_desc.xml
diff --git a/auto/src/main/res/xml/backup_rules.xml b/auto/src/main/res/xml/backup_rules.xml
new file mode 100644
index 00000000..fa0f996d
--- /dev/null
+++ b/auto/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
\ No newline at end of file
diff --git a/auto/src/main/res/xml/data_extraction_rules.xml b/auto/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 00000000..79c56928
--- /dev/null
+++ b/auto/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
\ No newline at end of file
diff --git a/auto/src/main/res/xml/preferences.xml b/auto/src/main/res/xml/preferences.xml
new file mode 100644
index 00000000..e1ca2e9e
--- /dev/null
+++ b/auto/src/main/res/xml/preferences.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:title="@string/pref_cat_android_auto"
+        app:iconSpaceReserved="false"
+        app:initialExpandedChildrenCount="1">
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="car_notification"
+            android:summary="@string/pref_switch_car_notification_summary"
+            android:title="@string/pref_switch_car_notification"
+            app:iconSpaceReserved="false" />
+        <androidx.preference.ListPreference
+            android:defaultValue="-1"
+            android:entries="@array/car_notification_interval_labels"
+            android:entryValues="@array/car_notification_interval_values"
+            android:key="car_notification_interval"
+            android:title="@string/pref_car_notification_interval"
+            android:summary="@string/pref_car_notification_interval_summary"
+            app:iconSpaceReserved="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_gda_info"
+        app:iconSpaceReserved="false">
+    <Preference
+        android:key="gda_info"
+        android:summary="@string/pref_gda_info_summary"
+
+        app:iconSpaceReserved="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_cat_general"
+        app:iconSpaceReserved="false"
+        app:initialExpandedChildrenCount="0">
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="use_mmol"
+            android:summary="@string/pref_switch_use_mmol_summary"
+            android:title="@string/pref_switch_use_mmol"
+            app:iconSpaceReserved="false" />
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="relative_time"
+            android:summary="@string/pref_relative_time_summary"
+            android:title="@string/pref_relative_time"
+            app:iconSpaceReserved="false" />
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="five_minute_delta"
+            android:summary="@string/pref_switch_use_5_min_delta_summary"
+            android:title="@string/pref_switch_use_5_min_delta"
+            app:iconSpaceReserved="false" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/pref_target_range"
+        app:iconSpaceReserved="false"
+        app:initialExpandedChildrenCount="0">
+        <de.michelinside.glucodataauto.preferences.GlucoseEditPreference
+            android:defaultValue="240"
+            android:inputType="numberDecimal"
+            android:key="high_glucose"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_high_value"
+            android:summary="@string/pref_high_value_summary"
+            app:iconSpaceReserved="false" />
+        <de.michelinside.glucodataauto.preferences.GlucoseEditPreference
+            android:defaultValue="165"
+            android:inputType="numberDecimal"
+            android:key="target_max_value"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_target_max_value"
+            android:summary="@string/pref_target_max_value_summary"
+            app:iconSpaceReserved="false" />
+        <de.michelinside.glucodataauto.preferences.GlucoseEditPreference
+            android:defaultValue="90"
+            android:inputType="numberDecimal"
+            android:key="target_min_value"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_target_min_value"
+            android:summary="@string/pref_target_min_value_summary"
+            app:iconSpaceReserved="false" />
+        <de.michelinside.glucodataauto.preferences.GlucoseEditPreference
+            android:defaultValue="70"
+            android:inputType="numberDecimal"
+            android:key="low_glucose"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_low_value"
+            android:summary="@string/pref_low_value_summary"
+            app:iconSpaceReserved="false" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/pref_cat_colors"
+        app:iconSpaceReserved="false"
+        app:initialExpandedChildrenCount="0">
+        <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+            android:defaultValue="@color/red"
+            android:key="color_alarm"
+            android:title="@string/pref_color_alarm"
+            app:cpv_dialogTitle="@string/pref_color_alarm"
+            android:summary="@string/pref_color_alarm_summary"
+            app:iconSpaceReserved="false"/>
+        <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+            android:defaultValue="@color/yellow"
+            android:key="color_out_of_range"
+            android:title="@string/pref_color_out_of_range"
+            app:cpv_dialogTitle="@string/pref_color_out_of_range"
+            android:summary="@string/pref_color_out_of_range_summary"
+            app:iconSpaceReserved="false"/>
+        <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+            android:defaultValue="@color/green"
+            android:key="color_ok"
+            android:title="@string/pref_color_ok"
+            app:cpv_dialogTitle="@string/pref_color_ok"
+            android:summary="@string/pref_color_ok_summary"
+            app:iconSpaceReserved="false"/>
+    </PreferenceCategory>
+
+    <androidx.preference.SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="dummy_values"
+        android:title="@string/pref_switch_notification"
+        app:iconSpaceReserved="false"
+        app:isPreferenceVisible="false" />
+
+</PreferenceScreen>
diff --git a/build.gradle b/build.gradle
index 518a42be..de142d38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,9 @@ plugins {
     id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
 }
 
-project.ext.set("versionCode", 2)
-project.ext.set("versionName", "0.9.7")
+project.ext.set("versionCode", 8)
+project.ext.set("versionName", "0.9.8")
 project.ext.set("compileSdk", 34)
-project.ext.set("targetSdk", 31)
+project.ext.set("targetSdk", 33)
 project.ext.set("minSdk", 26)
-project.ext.set("releasePath", "D:/Daten/Michel/OneDrive/Projekte/Release")
+project.ext.set("releasePath", "D:/Daten/Michel/OneDrive/Projekte/Release")
\ No newline at end of file
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 68b5a171..2b4162e8 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -7,5 +7,6 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
 </manifest>
\ No newline at end of file
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/Constants.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/Constants.kt
index aa465469..8021e58f 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/Constants.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/Constants.kt
@@ -19,10 +19,15 @@ object Constants {
     const val XDRIP_ACTION_GLUCOSE_READING = "com.librelink.app.ThirdPartyIntegration.GLUCOSE_READING"
     const val XDRIP_BROADCAST_ACTION = "com.eveningoutpost.dexdrip.BgEstimate"
 
+    const val GLUCODATA_ACTION = "de.michelinside.glucodatahandler.GLUCODATA"
+    const val PACKAGE_GLUCODATAAUTO = "de.michelinside.glucodataauto"
+
     const val VALUE_OBSOLETE_SHORT_SEC = 300
     const val VALUE_OBSOLETE_LONG_SEC  = 600
 
     const val SHARED_PREF_TAG = "GlucoDataHandlerPrefs"
+    const val SHARED_PREF_NO_GLUCODATAAUTO = "no_gda_info"
+    const val SHARED_PREF_SEND_TO_GLUCODATAAUTO = "send_to_glucodataauto"
     const val SHARED_PREF_SEND_TO_GLUCODATA_AOD = "send_to_glucodata_aod"
     const val SHARED_PREF_GLUCODATA_RECEIVERS = "glucodata_receivers"
     const val SHARED_PREF_SEND_TO_XDRIP = "send_to_xdrip"
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/GlucoDataService.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/GlucoDataService.kt
index 9bd0409c..85662d12 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/GlucoDataService.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/GlucoDataService.kt
@@ -88,7 +88,7 @@ abstract class GlucoDataService(source: AppSource) : WearableListenerService(),
             Log.d(LOG_ID, "onStartCommand called")
             super.onStartCommand(intent, flags, startId)
             val isForeground = intent?.getBooleanExtra(Constants.SHARED_PREF_FOREGROUND_SERVICE, true)
-            if (isForeground == true && !isForegroundService) {
+            if (isForeground == true && !isForegroundService && Utils.checkPermission(this, android.Manifest.permission.POST_NOTIFICATIONS, Build.VERSION_CODES.TIRAMISU)) {
                 Log.i(LOG_ID, "Starting service in foreground!")
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
                     startForeground(NOTIFICATION_ID, getNotification(), ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
@@ -114,7 +114,6 @@ abstract class GlucoDataService(source: AppSource) : WearableListenerService(),
             isRunning = true
 
             ReceiveData.initData(this)
-            TimeTaskService.run(this)
             SourceTaskService.run(this)
 
             connection.open(this)
@@ -128,8 +127,9 @@ abstract class GlucoDataService(source: AppSource) : WearableListenerService(),
             if (appSource == AppSource.PHONE_APP) {
                 filter.add(NotifySource.SETTINGS)   // only send setting changes from phone to wear!
                 filter.add(NotifySource.SOURCE_SETTINGS)
+                filter.add(NotifySource.CAR_CONNECTION)
             }
-            InternalNotifier.addNotifier(this, filter)
+            InternalNotifier.addNotifier(this, this, filter)
 
             Log.d(LOG_ID, "Register Receiver")
             receiver = GlucoseDataReceiver()
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/ReceiveData.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/ReceiveData.kt
index 042f7779..a31d2365 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/ReceiveData.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/ReceiveData.kt
@@ -9,6 +9,7 @@ import android.util.Log
 import de.michelinside.glucodatahandler.common.notifier.*
 import de.michelinside.glucodatahandler.common.notifier.DataSource
 import de.michelinside.glucodatahandler.common.tasks.ElapsedTimeTask
+import de.michelinside.glucodatahandler.common.tasks.TimeTaskService
 import java.math.RoundingMode
 import java.text.DateFormat
 import java.util.*
@@ -24,6 +25,8 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
     const val TIME = "glucodata.Minute.Time"
     const val DELTA = "glucodata.Minute.Delta"
     const val SOURCE_RES_ID = "source_resid"
+    private const val LAST_ALARM_TYPE = "last_alarm_type"
+    private const val LAST_ALARM_TIME = "last_alarm_time"
     private const val WAKE_LOCK_TIMEOUT = 10000L // 10 seconds
 
     enum class AlarmType(val resId: Int) {
@@ -32,7 +35,18 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
         LOW(R.string.alarm_low),
         OK(R.string.alarm_none),
         HIGH(R.string.alarm_high),
-        VERY_HIGH(R.string.alarm_very_high)
+        VERY_HIGH(R.string.alarm_very_high);
+
+        companion object {
+            fun fromResId(id: Int): AlarmType {
+                AlarmType.values().forEach {
+                    if(it.resId == id) {
+                        return it
+                    }
+                }
+                return NONE
+            }
+        }
     }
 
     var sensorID: String? = null
@@ -45,7 +59,7 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
     var rateLabel: String? = null
     var source: DataSource = DataSource.NONE
     var forceAlarm: Boolean = false
-    private var lowValue: Float = 0F
+    private var lowValue: Float = 70F
     private val low: Float get() {
         if(isMmol && lowValue > 0F)  // mmol/l
         {
@@ -53,7 +67,7 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
         }
         return lowValue
     }
-    private var highValue: Float = 0F
+    private var highValue: Float = 240F
     private val high: Float get() {
         if(isMmol && highValue > 0F)  // mmol/l
         {
@@ -101,31 +115,32 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
     private var initialized = false
 
     init {
-        Log.d(LOG_ID, "init called")
+        Log.v(LOG_ID, "init called")
     }
 
     fun initData(context: Context) {
-        Log.d(LOG_ID, "initData called")
         try {
             if (!initialized) {
+                Log.v(LOG_ID, "initData called")
+                initialized = true
                 readTargets(context)
                 loadExtras(context)
-                initialized = true
+                TimeTaskService.run(context)
             }
         } catch (exc: Exception) {
             Log.e(LOG_ID, "initData exception: " + exc.toString() + "\n" + exc.stackTraceToString() )
         }
     }
 
-    fun getAsString(context: Context): String {
+    fun getAsString(context: Context, noDataResId: Int = R.string.no_data): String {
         if (time == 0L)
-            return context.getString(R.string.no_data)
+            return context.getString(noDataResId)
         return (context.getString(R.string.info_label_delta) + ": " + getDeltaAsString() + " " + getUnit() + "\r\n" +
                 context.getString(R.string.info_label_rate) + ": " + rate + "\r\n" +
                 context.getString(R.string.info_label_timestamp) + ": " + DateFormat.getTimeInstance(DateFormat.DEFAULT).format(Date(time)) + "\r\n" +
                 context.getString(R.string.info_label_alarm) + ": " + context.getString(getAlarmType().resId) + (if (forceAlarm) " ⚠" else "" ) + " (" + alarm + ")\r\n" +
                 if (isMmol) context.getString(R.string.info_label_raw) + ": " + rawValue + " mg/dl\r\n" else "" ) +
-                context.getString(R.string.info_label_sensor_id) + ": " + sensorID + "\r\n" +
+                context.getString(R.string.info_label_sensor_id) + ": " + (if(BuildConfig.DEBUG) "ABCDE12345" else sensorID) + "\r\n" +
                 context.getString(R.string.info_label_source) + ": " + context.getString(source.resId)
     }
 
@@ -195,7 +210,7 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
             AlarmType.VERY_LOW -> 7
             else -> 0
         }
-        forceAlarm = checkForceAlarm(curAlarmType)
+        setForceAlarm(checkForceAlarm(curAlarmType), curAlarmType)
         if (curAlarm != 0 && forceAlarm) {
             return curAlarm or 8
         }
@@ -219,9 +234,6 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
             AlarmType.VERY_LOW -> {
                 if(curAlarmType < lastAlarmType || ((delta < 0F || rate < 0F) && (time - lastAlarmTime >= lowAlarmDuration)))
                 {
-                    lastAlarmTime = time
-                    lastAlarmType = curAlarmType
-                    Log.i(LOG_ID, "Force low alarm for type " + curAlarmType)
                     return true
                 }
                 return false
@@ -230,9 +242,6 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
             AlarmType.VERY_HIGH -> {
                 if(curAlarmType > lastAlarmType || ((delta > 0F || rate > 0F) && (time - lastAlarmTime >= highAlarmDuration)))
                 {
-                    lastAlarmTime = time
-                    lastAlarmType = curAlarmType
-                    Log.i(LOG_ID, "Force high alarm for type " + curAlarmType)
                     return true
                 }
                 return false
@@ -241,6 +250,15 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
         }
     }
 
+    private fun setForceAlarm(force: Boolean, curAlarmType: AlarmType) {
+        forceAlarm = force
+        if (forceAlarm) {
+            lastAlarmTime = time
+            lastAlarmType = curAlarmType
+            Log.i(LOG_ID, "Force alarm for type " + curAlarmType)
+        }
+    }
+
     fun getClucoseColor(monoChrome: Boolean = false): Int {
         if(isObsolete(Constants.VALUE_OBSOLETE_SHORT_SEC))
             return Color.GRAY
@@ -329,6 +347,7 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
         if (extras == null || extras.isEmpty) {
             return false
         }
+        initData(context)
         var result = false
         val wakeLock: PowerManager.WakeLock =
             (context.getSystemService(Context.POWER_SERVICE) as PowerManager).run {
@@ -357,7 +376,6 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
                 glucose = Utils.round(extras.getFloat(GLUCOSECUSTOM), 1) //Glucose value in unit in setting
                 rate = extras.getFloat(RATE) //Rate of change of glucose. See libre and dexcom label functions
                 rateLabel = getRateLabel(context)
-                alarm = extras.getInt(ALARM) // if bit 8 is set, then an alarm is triggered
                 deltaValue = Float.NaN
                 if (extras.containsKey(DELTA)) {
                     deltaValue = extras.getFloat(DELTA, Float.NaN)
@@ -385,7 +403,12 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
                 changeIsMmol(rawValue!=glucose.toInt(), context)
 
                 // check for alarm
-                alarm = calculateAlarm()
+                if (interApp) {
+                    alarm = extras.getInt(ALARM) // if bit 8 is set, then an alarm is triggered
+                    setForceAlarm((alarm and 8) == 8, getAlarmType())
+                } else {
+                    alarm = calculateAlarm()
+                }
                 val notifySource = if(interApp) NotifySource.MESSAGECLIENT else NotifySource.BROADCAST
 
                 InternalNotifier.notify(context, notifySource, createExtras())  // re-create extras to have all changed value inside...
@@ -435,6 +458,9 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
             putInt(Constants.SHARED_PREF_COLOR_ALARM, bundle.getInt(Constants.SHARED_PREF_COLOR_ALARM, colorAlarm))
             putLong(Constants.SHARED_PREF_NOTIFY_DURATION_LOW, bundle.getLong(Constants.SHARED_PREF_NOTIFY_DURATION_LOW, lowAlarmDuration/60000))
             putLong(Constants.SHARED_PREF_NOTIFY_DURATION_HIGH, bundle.getLong(Constants.SHARED_PREF_NOTIFY_DURATION_HIGH, highAlarmDuration/60000))
+            if (bundle.containsKey(Constants.SHARED_PREF_RELATIVE_TIME)) {
+                putBoolean(Constants.SHARED_PREF_RELATIVE_TIME, bundle.getBoolean(Constants.SHARED_PREF_RELATIVE_TIME, ElapsedTimeTask.relativeTime))
+            }
             apply()
         }
         updateSettings(sharedPref)
@@ -539,6 +565,8 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
                 putInt(ALARM, alarm)
                 putFloat(DELTA, deltaValue)
                 putInt(SOURCE_RES_ID, source.resId)
+                putLong(LAST_ALARM_TIME, lastAlarmTime)
+                putInt(LAST_ALARM_TYPE, lastAlarmType.resId)
                 apply()
             }
         } catch (exc: Exception) {
@@ -560,6 +588,8 @@ object ReceiveData: SharedPreferences.OnSharedPreferenceChangeListener {
                     extras.putFloat(RATE, sharedGlucosePref.getFloat(RATE, rate))
                     extras.putInt(ALARM, sharedGlucosePref.getInt(ALARM, alarm))
                     extras.putFloat(DELTA, sharedGlucosePref.getFloat(DELTA, deltaValue))
+                    lastAlarmType = AlarmType.fromResId(sharedGlucosePref.getInt(LAST_ALARM_TYPE, AlarmType.NONE.resId))
+                    lastAlarmTime = sharedGlucosePref.getLong(LAST_ALARM_TIME, 0L)
                     handleIntent(context, DataSource.fromResId(sharedGlucosePref.getInt(SOURCE_RES_ID,
                         DataSource.NONE.resId)), extras)
                 }
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/Utils.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/Utils.kt
index 2390e654..af5e5e2e 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/Utils.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/Utils.kt
@@ -1,10 +1,13 @@
 package de.michelinside.glucodatahandler.common
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.*
 import android.graphics.drawable.Icon
+import android.os.Build
 import android.os.Bundle
 import android.os.Parcel
 import android.util.Log
@@ -85,6 +88,18 @@ object Utils {
         return string
     }
 
+    @SuppressLint("ObsoleteSdkInt")
+    fun checkPermission(context: Context, permission: String, minSdk: Int = Build.VERSION_CODES.O): Boolean {
+        if (Build.VERSION.SDK_INT >= minSdk) {
+            if (context.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
+                Log.w(LOG_ID, "Permission " + permission + " not granted!")
+                return false
+            }
+        }
+        Log.d(LOG_ID, "Permission " + permission + " granted!")
+        return true
+    }
+
     fun getAppIntent(context: Context, activityClass: Class<*>, requestCode: Int, useExternalApp: Boolean = false): PendingIntent {
         var launchIntent: Intent? = null
         if (useExternalApp) {
@@ -101,6 +116,10 @@ object Utils {
         )
     }
 
+    fun isPackageAvailable(context: Context, packageName: String): Boolean {
+        return context.packageManager.getInstalledApplications(0).find { info -> info.packageName.startsWith(packageName) } != null
+    }
+
     fun getBackgroundColor(transparancyFactor: Int) : Int {
         if( transparancyFactor <= 0 )
             return 0
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/notifier/InternalNotifier.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/notifier/InternalNotifier.kt
index 0e4e4d96..5032ee84 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/notifier/InternalNotifier.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/notifier/InternalNotifier.kt
@@ -7,31 +7,43 @@ import android.util.Log
 object InternalNotifier {
     private const val LOG_ID = "GDH.InternalNotifier"
     private var notifiers = mutableMapOf<NotifierInterface, MutableSet<NotifySource>?>()
-    fun addNotifier(notifier: NotifierInterface, sourceFilter: MutableSet<NotifySource>)
+    fun addNotifier(context: Context, notifier: NotifierInterface, sourceFilter: MutableSet<NotifySource>)
     {
         Log.i(LOG_ID, "add notifier " + notifier.toString() + " - filter: " + sourceFilter.toString() )
         notifiers[notifier] = sourceFilter
         Log.d(LOG_ID, "notifier size: " + notifiers.size.toString() )
+        notify(context, NotifySource.NOTIFIER_CHANGE, null)
     }
-    fun remNotifier(notifier: NotifierInterface)
+    fun remNotifier(context: Context, notifier: NotifierInterface)
     {
         Log.i(LOG_ID, "rem notifier " + notifier.toString() )
         notifiers.remove(notifier)
         Log.d(LOG_ID, "notifier size: " + notifiers.size.toString() )
+        notify(context, NotifySource.NOTIFIER_CHANGE, null)
     }
 
-    fun notify(context: Context, dataSource: NotifySource, extras: Bundle?)
+    fun notify(context: Context, notifySource: NotifySource, extras: Bundle?)
     {
         Log.d(LOG_ID, "Sending new data to " + notifiers.size.toString() + " notifier(s).")
         notifiers.forEach{
             try {
-                if (it.value == null || it.value!!.contains(dataSource)) {
-                    Log.d(LOG_ID, "Sending new data from " + dataSource.toString() + " to " + it.toString())
-                    it.key.OnNotifyData(context, dataSource, extras)
+                if (it.value == null || it.value!!.contains(notifySource)) {
+                    Log.d(LOG_ID, "Sending new data from " + notifySource.toString() + " to " + it.toString())
+                    it.key.OnNotifyData(context, notifySource, extras)
                 }
             } catch (exc: Exception) {
                 Log.e(LOG_ID, "OnNotifyData exception: " + exc.message.toString() )
             }
         }
     }
+
+    fun getNotifierCount(notifySource: NotifySource): Int {
+        var count = 0
+        notifiers.forEach {
+            if (it.value == null || it.value!!.contains(notifySource)) {
+                count++
+            }
+        }
+        return count
+    }
 }
\ No newline at end of file
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/notifier/NotifySource.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/notifier/NotifySource.kt
index a8263df4..a8b6cb34 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/notifier/NotifySource.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/notifier/NotifySource.kt
@@ -11,5 +11,6 @@ enum class NotifySource {
     OBSOLETE_VALUE,
     TIME_VALUE,
     SOURCE_SETTINGS,
-    SOURCE_STATE_CHANGE;
+    SOURCE_STATE_CHANGE,
+    NOTIFIER_CHANGE;
 }
\ No newline at end of file
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/BackgroundTaskService.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/BackgroundTaskService.kt
index 34833e3f..5b43d31a 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/BackgroundTaskService.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/BackgroundTaskService.kt
@@ -236,14 +236,18 @@ abstract class BackgroundTaskService(val alarmReqId: Int, protected val LOG_ID:
         }
     }
 
+    open fun getNotifySourceFilter() : MutableSet<NotifySource> = mutableSetOf()
+
     fun run(set_context: Context) {
         try {
             context = set_context
             sharedPref = context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
             sharedPref.registerOnSharedPreferenceChangeListener(this)
+            val filter = mutableSetOf(NotifySource.BROADCAST, NotifySource.MESSAGECLIENT)
+            filter.addAll(getNotifySourceFilter())
             InternalNotifier.addNotifier(
-                this,
-                mutableSetOf(NotifySource.BROADCAST, NotifySource.MESSAGECLIENT)
+                context, this,
+                filter
             )
             initBackgroundTasks()
             checkTimer()  // this will start the time
@@ -254,7 +258,7 @@ abstract class BackgroundTaskService(val alarmReqId: Int, protected val LOG_ID:
 
     fun stop() {
         try {
-            InternalNotifier.remNotifier(this)
+            InternalNotifier.remNotifier(context, this)
             sharedPref.unregisterOnSharedPreferenceChangeListener(this)
             stopTimer()
         } catch (ex: Exception) {
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/ElapsedTimeTask.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/ElapsedTimeTask.kt
index b8dfe525..8fc46e50 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/ElapsedTimeTask.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/ElapsedTimeTask.kt
@@ -28,7 +28,7 @@ class ElapsedTimeTask : BackgroundTask() {
     }
 
     override fun active(elapsetTimeMinute: Long): Boolean {
-        return relativeTimeValue && elapsetTimeMinute <= 60
+        return relativeTimeValue && elapsetTimeMinute <= 60 && InternalNotifier.getNotifierCount(NotifySource.TIME_VALUE) > 0
     }
 
     override fun checkPreferenceChanged(sharedPreferences: SharedPreferences, key: String?, context: Context): Boolean {
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/ObsoleteTask.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/ObsoleteTask.kt
index b2a46451..c82a5122 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/ObsoleteTask.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/ObsoleteTask.kt
@@ -25,6 +25,6 @@ class ObsoleteTask : BackgroundTask() {
     }
 
     override fun active(elapsetTimeMinute: Long): Boolean {
-        return  elapsetTimeMinute <= 10
+        return elapsetTimeMinute <= 10 && (InternalNotifier.getNotifierCount(NotifySource.OBSOLETE_VALUE) > 0 || (!ElapsedTimeTask.relativeTime && InternalNotifier.getNotifierCount(NotifySource.TIME_VALUE) > 0) )
     }
 }
\ No newline at end of file
diff --git a/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/TimeTaskService.kt b/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/TimeTaskService.kt
index 4ebffc3e..8f0007e8 100644
--- a/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/TimeTaskService.kt
+++ b/common/src/main/java/de/michelinside/glucodatahandler/common/tasks/TimeTaskService.kt
@@ -4,11 +4,14 @@ import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import de.michelinside.glucodatahandler.common.notifier.NotifySource
 
 @SuppressLint("StaticFieldLeak")
 object TimeTaskService: BackgroundTaskService(42, "GDH.Task.TimeTaskService") {
     override fun getAlarmReceiver() : Class<*> = TimeAlarmReceiver::class.java
 
+    override fun getNotifySourceFilter() : MutableSet<NotifySource> = mutableSetOf(NotifySource.NOTIFIER_CHANGE)
+
     override fun getBackgroundTasks(): MutableList<BackgroundTask> =
         mutableListOf(ElapsedTimeTask(), ObsoleteTask())
 }
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index c238fc07..9fd3cbb3 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -125,7 +125,7 @@
     <string name="pref_target_range">Zielbereich</string>
     <string name="pref_switch_notification">Dummy Werte</string>
     <string name="pref_switch_car_notification">Android Auto Benachrichtigung</string>
-    <string name="pref_switch_car_notification_summary">Benachrichtigung für Android Auto.\nUm diese App in Android Auto zu verwenden, müssen die Entwicklereinstellungen aktiviert werden. Dafür mehrfach in Android Auto auf Version klicken. Danach in den Entwicklereinstellungen "Unbekannte Quellen" aktivieren.</string>
+    <string name="pref_switch_car_notification_summary">Benachrichtigung für Android Auto.</string>
     <string name="pref_switch_car_media">Dummy Media Player</string>
     <string name="pref_switch_car_media_summary">Stellt den Glucose Wert als aktuellen Song dar.</string>
     <string name="pref_car_notification_interval">Benachrichtigungsintervall</string>
@@ -242,4 +242,15 @@
     <string name="timestamp">Zeitpunkt des Zuckerwertes</string>
     <string name="battery_level">Akku (Uhr und Telefon)</string>
 
+    <!-- GlucoDataAuto -->
+
+    <string name="glucodataauto_link">https://github.com/pachi81/GlucoDataHandler/blob/master/GlucoDataAuto_DE.md</string>
+    <string name="gda_no_data">Um diese App in Android Auto zu verwenden, müssen die Entwicklereinstellungen aktiviert werden. Dafür mehrfach in Android Auto auf Version klicken. Danach in den Entwicklereinstellungen \"Unbekannte Quellen\" aktivieren.\n\nWenn GlucoDataHandler als Quelle verwendet wird, werden die Daten erst übermittelt, wenn das Telefon mit Android Auto verbunden ist.</string>
+    <string name="pref_gda_info">Information</string>
+    <string name="pref_gda_info_summary">Wenn GlucoDataHandler als Quelle verwendet wird, dann werden die Daten von GlucoDataHandler überschrieben und müssen hier nicht konfigiert werden.</string>
+    <string name="pref_no_gda_info">GlucoDataAuto installieren</string>
+    <string name="pref_no_gda_info_summary">Um GlucoDataHandler für Android Auto zu verwenden, muss GlucoDataAuto von GitHub installiert werden.\nKlicken sie hier, für mehr Informationen und um zum Download zu gelangen.</string>
+    <string name="pref_send_to_glucodataauto">An GlucoDataAuto senden</string>
+    <string name="pref_send_to_glucodataauto_summary">Sendet den aktuellen Glucose Wert und die Einstellungen an GlucoDataAuto.</string>
+
 </resources>
diff --git a/common/src/main/res/values-pl/strings.xml b/common/src/main/res/values-pl/strings.xml
index ea323de7..d39f80c0 100644
--- a/common/src/main/res/values-pl/strings.xml
+++ b/common/src/main/res/values-pl/strings.xml
@@ -11,7 +11,7 @@
     <string name="info_label_alarm">Alarm</string>
     <string name="info_label_source">Źródło</string>
     <string name="info_label_per_minute">min.</string>
-    <string name="no_data">Nie otrzymano jeszcze transmisji!\nINFORMACJA: Aktywuj źródło LibreLink albo, aby zacząć otrzymywać dane z Juggluco, otwórz aplikację Juggluco, przejdź do ustawień i aktywuj \&quot;Glucodata Broadcast\&quot; dla &quot;de.michelinside.glucodatahandler&quot;\nAby odbierać dane z xDrip+, aktywuj lokalną transmisję i wybierz brak odbiorcy.</string>
+    <string name="no_data">Nie otrzymano jeszcze transmisji!\nINFORMACJA: Aktywuj źródło LibreLink albo, aby zacząć otrzymywać dane z Juggluco, otwórz aplikację Juggluco, przejdź do ustawień i aktywuj \"Glucodata Broadcast\" dla \"de.michelinside.glucodatahandler\"\nAby odbierać dane z xDrip+, aktywuj lokalną transmisję i wybierz brak odbiorcy.</string>
 
     <string name="elapsed_time">%1$d min</string>
     <string name="elapsed_time_hour">\&gt; 1h</string>
@@ -135,17 +135,17 @@
     <string name="pref_low_value">Niskie stęż. glukozy</string>
     <string name="pref_low_value_summary">Granica dla niskich wartości glukozy.\nJeśli aktywowałeś alarm niskiego stęż. glukozy w Juggluco, nie musisz ustawiać tej wartości.</string>
     <string name="pref_switch_car_notification">Powiadomienia w Android Auto</string>
-    <string name="pref_switch_car_notification_summary">Powiadomienie dla Android Auto.\nAby korzystać z tej aplikacji w Android Auto, musisz aktywować ustawienia programisty w Android Auto, klikając kilka razy na oznaczenie wersji. Następnie należy włączyć opcję &quot;Nieznane źródła&quot; w menu ustawień dewelopera.</string>
+    <string name="pref_switch_car_notification_summary">Powiadomienie dla Android Auto.</string>
     <string name="pref_car_notification_interval">Odstęp czasu między powiadomieniami</string>
     <string name="pref_car_notification_interval_summary">Odstęp czasu między wyświetlaniem powiadomień. Opcja \"Tylko alarm\" wyświetli powiadomienia wyłącznie wtedy, gdy wartości będą poza zakresem docelowym.</string>
     <string name="pref_switch_car_media">Odtwarzacz fikcyjnych multimediów</string>
     <string name="pref_switch_car_media_summary">Wyświetl wartość glukozy jako bieżący utwór dla Android Auto.</string>
-    <string name="pref_switch_send_to_aod">Wyślij transmisję &quot;glucodata broadcast&quot;</string>
-    <string name="pref_switch_send_to_aod_summary">Wyślij transmisję &quot;glucodata broadcast&quot; dla nowych wartości otrzymanych z dowolnego źródła.</string>
+    <string name="pref_switch_send_to_aod">Wyślij transmisję \"glucodata broadcast\"</string>
+    <string name="pref_switch_send_to_aod_summary">Wyślij transmisję \"glucodata broadcast\" dla nowych wartości otrzymanych z dowolnego źródła.</string>
     <string name="pref_button_select_target">Identyfikacja odbiorcy</string>
-    <string name="pref_button_select_target_summary">Wybierz odbiorców, do których wysyłana jest transmisja &quot;glucodata broadcast&quot;. Transmisja globalna będzie wysyłana do każdej aplikacji dynamicznie odbierającej tę transmisję.</string>
+    <string name="pref_button_select_target_summary">Wybierz odbiorców, do których wysyłana jest transmisja \"glucodata broadcast\". Transmisja globalna będzie wysyłana do każdej aplikacji dynamicznie odbierającej tę transmisję.</string>
     <string name="pref_switch_send_to_xdrip">Wysyłaj transmisję „Patched Libre broadcast”</string>
-    <string name="pref_switch_send_to_xdrip_summary">Prześlij dalej wartości glukozy do xDrip+. Wybierz \&quot;Libre (patched app)\&quot; jako źródło w xDrip+.</string>
+    <string name="pref_switch_send_to_xdrip_summary">Prześlij dalej wartości glukozy do xDrip+. Wybierz \"Libre (patched app)\" jako źródło w xDrip+.</string>
     <string name="pref_button_select_xdrip_target">Identyfikacja odbiorców „patched libre”</string>
     <string name="pref_button_select_xdrip_target_summary">Wybierz odbiorców, do których wysyłana jest transmisja „patched libre broadcast”. Transmisja globalna będzie wysyłana do każdej aplikacji dynamicznie odbierającej tę transmisję.</string>
     <string name="pref_switch_send_xdrip_broadcast">Wyślij transmisję xDrip+ broadcast</string>
@@ -244,4 +244,15 @@
     <string name="timestamp">Znacznik czasu glukozy</string>
     <string name="battery_level">Poziom baterii (zegarek i telefon)</string>
 
+    <!-- GlucoDataAuto -->
+
+    <string name="glucodataauto_link">https://github.com/pachi81/GlucoDataHandler/blob/master/GlucoDataAuto_PL.md</string>
+    <string name="gda_no_data">Aby korzystać z tej aplikacji w Android Auto, musisz aktywować ustawienia programisty w Android Auto, klikając kilka razy na oznaczenie wersji. Następnie należy włączyć opcję \"Nieznane źródła\" w menu ustawień dewelopera.\n\nJeśli używasz aplikacji GlucoDataHandler jako źródła, wartości zostaną wysłane, jeśli telefon jest podłączony do Android Auto.</string>
+    <string name="pref_gda_info">Informacje</string>
+    <string name="pref_gda_info_summary">Jeśli używasz aplikacji GlucoDataHandler jako źródła, ustawienia te zostaną nadpisane z GlucoDataHandler, więc nie musisz ich tutaj zmieniać.</string>
+    <string name="pref_no_gda_info">Brak GlucoDataAuto</string>
+    <string name="pref_no_gda_info_summary">Aby korzystać z GlucoDataHandler dla Android Auto, należy zainstalować aplikację GlucoDataAuto z GitHub.\nKliknij tutaj, aby uzyskać więcej informacji i pobrać GlucoDataAuto.</string>
+    <string name="pref_send_to_glucodataauto">Przekaż do GlucoDataAuto</string>
+    <string name="pref_send_to_glucodataauto_summary">Wysyłanie wartości glukozy i ustawień do GlucoDataAuto, jeśli telefon jest połączony z Android Auto.</string>
+
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 1e4a8657..bb0ce290 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="info_label_alarm">Alarm</string>
     <string name="info_label_source">Source</string>
     <string name="info_label_per_minute">per minute</string>
-    <string name="no_data">No broadcast received yet!\nINFO: Activate LibreLink source or to receive data from Juggluco, please open Juggluco, go to settings and activate \"Glucodata Broadcast\" for "de.michelinside.glucodatahandler"\nTo receive from xDrip+ activate local broadcast and select no receiver.</string>
+    <string name="no_data">No broadcast received yet!\nINFO: Activate LibreLink source or to receive data from Juggluco, please open Juggluco, go to settings and activate \"Glucodata Broadcast\" for \"de.michelinside.glucodatahandler\"\nTo receive from xDrip+ activate local broadcast and select no receiver.</string>
 
     <string name="elapsed_time">%1$d min</string>
     <string name="elapsed_time_hour">\> 1h</string>
@@ -144,7 +144,7 @@
     <string name="pref_low_value">Low glucose</string>
     <string name="pref_low_value_summary">Border for low glucose values.\nIf you have activated low alarm in Juggluco, you do not have to set this value.</string>
     <string name="pref_switch_car_notification">Android Auto notifications</string>
-    <string name="pref_switch_car_notification_summary">Notification for Android Auto.\nFor using this app in Android Auto, you have to activate developer settings in Android Auto by clicking several times on the version. Then you have to enable "Unknown sources" in the developer settings menu.</string>
+    <string name="pref_switch_car_notification_summary">Notification for Android Auto.</string>
     <string name="pref_car_notification_interval">Notification interval</string>
     <string name="pref_car_notification_interval_summary">Interval for showing notifications. \"Alarm only\" will only trigger notifications if the values are outside of the target range.</string>
     <string name="pref_switch_car_media">Dummy Media Player</string>
@@ -253,4 +253,15 @@
     <string name="short_rate_icon">Trend value with icon</string>
     <string name="timestamp">Glucose timestamp</string>
     <string name="battery_level">Battery level (wear and phone)</string>
+
+    <!-- GlucoDataAuto -->
+
+    <string name="glucodataauto_link">https://github.com/pachi81/GlucoDataHandler/blob/master/GlucoDataAuto.md</string>
+    <string name="gda_no_data">For using this app in Android Auto, you have to activate developer settings in Android Auto by clicking several times on the version. Then you have to enable \"Unknown sources\" in the developer settings menu.\n\nIf you are using GlucoDataHandler as source, the values will be send if the phone is connected to Android Auto.</string>
+    <string name="pref_gda_info">Information</string>
+    <string name="pref_gda_info_summary">If you are using GlucoDataHandler as source, these settings will be overwritten from GlucoDataHandler, so you do not have to change them here.</string>
+    <string name="pref_no_gda_info">GlucoDataAuto missing</string>
+    <string name="pref_no_gda_info_summary">To use GlucoDataHandler for Android Auto, you have to install GlucoDataAuto from GitHub.\nPlease click here for more information and to download GlucoDataAuto.</string>
+    <string name="pref_send_to_glucodataauto">Forward to GlucoDataAuto</string>
+    <string name="pref_send_to_glucodataauto_summary">Send glucose values and settings to GlucoDataAuto, if the phone is connected to Android Auto.</string>
 </resources>
diff --git a/images/GDH_icon.png b/images/GDH_icon.png
new file mode 100644
index 00000000..bda64fdb
Binary files /dev/null and b/images/GDH_icon.png differ
diff --git a/images/playstore/Complications1x1.png b/images/playstore/Complications1x1.png
new file mode 100644
index 00000000..61d1c97a
Binary files /dev/null and b/images/playstore/Complications1x1.png differ
diff --git a/images/playstore/Playstore_Present.png b/images/playstore/Playstore_Present.png
new file mode 100644
index 00000000..6be1c910
Binary files /dev/null and b/images/playstore/Playstore_Present.png differ
diff --git a/images/playstore/Playstore_Present.xcf b/images/playstore/Playstore_Present.xcf
new file mode 100644
index 00000000..8715d9de
Binary files /dev/null and b/images/playstore/Playstore_Present.xcf differ
diff --git a/images/playstore/Screenshot_20231126_183833.png b/images/playstore/Screenshot_20231126_183833.png
deleted file mode 100644
index 52652776..00000000
Binary files a/images/playstore/Screenshot_20231126_183833.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_183940.png b/images/playstore/Screenshot_20231126_183940.png
deleted file mode 100644
index 44c4fc8c..00000000
Binary files a/images/playstore/Screenshot_20231126_183940.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_184034.png b/images/playstore/Screenshot_20231126_184034.png
deleted file mode 100644
index 10c55538..00000000
Binary files a/images/playstore/Screenshot_20231126_184034.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_184116.png b/images/playstore/Screenshot_20231126_184116.png
deleted file mode 100644
index 5a80b1b3..00000000
Binary files a/images/playstore/Screenshot_20231126_184116.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_184313.png b/images/playstore/Screenshot_20231126_184313.png
deleted file mode 100644
index 27455a41..00000000
Binary files a/images/playstore/Screenshot_20231126_184313.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_184431.png b/images/playstore/Screenshot_20231126_184431.png
deleted file mode 100644
index 4f7b3987..00000000
Binary files a/images/playstore/Screenshot_20231126_184431.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_185049.png b/images/playstore/Screenshot_20231126_185049.png
deleted file mode 100644
index 09cf280c..00000000
Binary files a/images/playstore/Screenshot_20231126_185049.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_185058.png b/images/playstore/Screenshot_20231126_185058.png
deleted file mode 100644
index 5f441c53..00000000
Binary files a/images/playstore/Screenshot_20231126_185058.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_185224.png b/images/playstore/Screenshot_20231126_185224.png
deleted file mode 100644
index 880cde90..00000000
Binary files a/images/playstore/Screenshot_20231126_185224.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_185606.png b/images/playstore/Screenshot_20231126_185606.png
deleted file mode 100644
index fd483bec..00000000
Binary files a/images/playstore/Screenshot_20231126_185606.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_185642.png b/images/playstore/Screenshot_20231126_185642.png
deleted file mode 100644
index e5929a41..00000000
Binary files a/images/playstore/Screenshot_20231126_185642.png and /dev/null differ
diff --git a/images/playstore/Screenshot_20231126_185704.png b/images/playstore/Screenshot_20231126_185704.png
deleted file mode 100644
index 8a70325f..00000000
Binary files a/images/playstore/Screenshot_20231126_185704.png and /dev/null differ
diff --git a/images/playstore/complications2_square.png b/images/playstore/complications2_square.png
new file mode 100644
index 00000000..d41f0fe1
Binary files /dev/null and b/images/playstore/complications2_square.png differ
diff --git a/images/playstore/gdh_wear.png b/images/playstore/gdh_wear.png
new file mode 100644
index 00000000..cb20788f
Binary files /dev/null and b/images/playstore/gdh_wear.png differ
diff --git a/images/playstore/gdh_wear_settings.png b/images/playstore/gdh_wear_settings.png
new file mode 100644
index 00000000..db7ee89a
Binary files /dev/null and b/images/playstore/gdh_wear_settings.png differ
diff --git a/images/playstore/tablet_10.png b/images/playstore/tablet_10.png
new file mode 100644
index 00000000..aabd3008
Binary files /dev/null and b/images/playstore/tablet_10.png differ
diff --git a/images/playstore/tablet_10_settings.png b/images/playstore/tablet_10_settings.png
new file mode 100644
index 00000000..776c3149
Binary files /dev/null and b/images/playstore/tablet_10_settings.png differ
diff --git a/images/playstore/tablet_10_source_settings.png b/images/playstore/tablet_10_source_settings.png
new file mode 100644
index 00000000..91c40a7a
Binary files /dev/null and b/images/playstore/tablet_10_source_settings.png differ
diff --git a/mobile/build.gradle b/mobile/build.gradle
index 8de15176..f04f2e11 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -11,7 +11,7 @@ android {
         applicationId "de.michelinside.glucodatahandler"
         minSdk rootProject.minSdk
         targetSdk rootProject.targetSdk
-        versionCode rootProject.versionCode
+        versionCode 1000 + rootProject.versionCode
         versionName rootProject.versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -26,9 +26,8 @@ android {
         }
         debug {
             applicationIdSuffix '.debug'
-            versionNameSuffix '-DEBUG'
             minifyEnabled false
-            resValue "string", "app_name", "GDH Debug"
+            resValue "string", "app_name", "GlucoDataHandler"
         }
         second {
             applicationIdSuffix '.second'
@@ -77,7 +76,7 @@ dependencies {
     implementation "androidx.car.app:app:1.2.0"
     implementation "androidx.preference:preference:1.2.1"
     implementation "com.jaredrummler:colorpicker:1.1.0"
-    implementation "androidx.media:media:1.6.0"
+    implementation "androidx.media:media:1.7.0"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
@@ -85,6 +84,16 @@ dependencies {
 }
 
 afterEvaluate {
+    //noinspection ConfigurationAvoidance
+    def bundleRelease = tasks.getByPath(':mobile:bundleRelease')
+    def copyAndroidBundlePostBuild = tasks.register('copyAndroidBundlePostBuild', Copy) {
+        dependsOn bundleRelease
+        from "${projectDir}/release"
+        include '**/*.aab'
+        into rootProject.releasePath + "/Playstore" + "/" + versionName
+    }
+
+    bundleRelease.finalizedBy(copyAndroidBundlePostBuild)
     //noinspection ConfigurationAvoidance
     def assembleRelease = tasks.getByPath(':mobile:assembleRelease')
     def copyAndroidApksPostBuild = tasks.register('copyAndroidApksPostBuild', Copy) {
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index e0f14764..0749eb2b 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.ACTION_MANAGE_OVERLAY_PERMISSION" />
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -14,7 +15,6 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
 
-
     <queries>
         <package android:name="tk.glucodata" />
     </queries>
@@ -105,7 +105,6 @@
             android:name=".SettingsActivity"
             android:label="@string/menu_settings"
             android:parentActivityName=".MainActivity"
-            android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -211,18 +210,6 @@
                     android:scheme="glucodata_intent_wear" />
             </intent-filter>
         </service>
-        <service
-            android:name=".android_auto.CarMediaBrowserService"
-            android:exported="true"
-            tools:ignore="ExportedService">
-            <intent-filter>
-                <action android:name="android.media.browse.MediaBrowserService" />
-            </intent-filter>
-        </service>
-
-        <meta-data
-            android:name="com.google.android.gms.car.application"
-            android:resource="@xml/automotive_app_desc" />
     </application>
 
 </manifest>
diff --git a/mobile/src/main/ic_launcher-playstore.png b/mobile/src/main/ic_launcher-playstore.png
index fff71fa4..e3e7bf30 100644
Binary files a/mobile/src/main/ic_launcher-playstore.png and b/mobile/src/main/ic_launcher-playstore.png differ
diff --git a/mobile/src/main/java/de/michelinside/glucodatahandler/GlucoDataServiceMobile.kt b/mobile/src/main/java/de/michelinside/glucodatahandler/GlucoDataServiceMobile.kt
index ef651932..909a1a9c 100644
--- a/mobile/src/main/java/de/michelinside/glucodatahandler/GlucoDataServiceMobile.kt
+++ b/mobile/src/main/java/de/michelinside/glucodatahandler/GlucoDataServiceMobile.kt
@@ -10,6 +10,7 @@ import de.michelinside.glucodatahandler.android_auto.CarModeReceiver
 import de.michelinside.glucodatahandler.common.*
 import de.michelinside.glucodatahandler.common.notifier.*
 import de.michelinside.glucodatahandler.common.receiver.XDripBroadcastReceiver
+import de.michelinside.glucodatahandler.common.tasks.ElapsedTimeTask
 import de.michelinside.glucodatahandler.tasker.setWearConnectionState
 import de.michelinside.glucodatahandler.widget.FloatingWidget
 import de.michelinside.glucodatahandler.widget.GlucoseBaseWidget
@@ -19,7 +20,7 @@ class GlucoDataServiceMobile: GlucoDataService(AppSource.PHONE_APP), NotifierInt
     private lateinit var floatingWidget: FloatingWidget
     init {
         Log.d(LOG_ID, "init called")
-        InternalNotifier.addNotifier(TaskerDataReceiver, mutableSetOf(NotifySource.BROADCAST,NotifySource.MESSAGECLIENT,NotifySource.OBSOLETE_VALUE))
+        InternalNotifier.addNotifier(this, TaskerDataReceiver, mutableSetOf(NotifySource.BROADCAST,NotifySource.MESSAGECLIENT,NotifySource.OBSOLETE_VALUE))
     }
 
     companion object {
@@ -34,7 +35,7 @@ class GlucoDataServiceMobile: GlucoDataService(AppSource.PHONE_APP), NotifierInt
             super.onCreate()
             floatingWidget = FloatingWidget(this)
             PermanentNotification.create(applicationContext)
-            CarModeReceiver.initNotification(applicationContext)
+            CarModeReceiver.init(applicationContext)
             GlucoseBaseWidget.updateWidgets(applicationContext)
             floatingWidget.create()
         } catch (exc: Exception) {
@@ -53,7 +54,7 @@ class GlucoDataServiceMobile: GlucoDataService(AppSource.PHONE_APP), NotifierInt
         try {
             Log.d(LOG_ID, "onDestroy called")
             PermanentNotification.destroy()
-            CarModeReceiver.cleanupNotification(applicationContext)
+            CarModeReceiver.cleanup(applicationContext)
             floatingWidget.destroy()
             super.onDestroy()
         } catch (exc: Exception) {
@@ -84,47 +85,71 @@ class GlucoDataServiceMobile: GlucoDataService(AppSource.PHONE_APP), NotifierInt
         }
     }
 
+    private fun sendToGlucoDataAuto(context: Context, extras: Bundle) {
+        val sharedPref = context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
+        if (CarModeReceiver.connected && sharedPref.getBoolean(Constants.SHARED_PREF_SEND_TO_GLUCODATAAUTO, true) && Utils.isPackageAvailable(context, Constants.PACKAGE_GLUCODATAAUTO)) {
+            val intent = Intent(Constants.GLUCODATA_ACTION)
+            val settings = ReceiveData.getSettingsBundle()
+            settings.putBoolean(Constants.SHARED_PREF_RELATIVE_TIME, ElapsedTimeTask.relativeTime)
+            extras.putBundle(Constants.SETTINGS_BUNDLE, settings)
+            intent.putExtras(extras)
+            intent.setPackage(Constants.PACKAGE_GLUCODATAAUTO)
+            context.sendBroadcast(intent)
+        }
+    }
+
+    private fun forwardBroadcast(context: Context, extras: Bundle) {
+        Log.v(LOG_ID, "forwardBroadcast called")
+        val sharedPref = context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
+        sendToGlucoDataAuto(context, extras.clone() as Bundle)
+        if (sharedPref.getBoolean(Constants.SHARED_PREF_SEND_TO_XDRIP, false)) {
+            val intent = Intent(Constants.XDRIP_ACTION_GLUCOSE_READING)
+            // always sends time as start time, because it is only set, if the sensorId have changed!
+            val sensor = Bundle()
+            sensor.putLong("sensorStartTime", ReceiveData.time)  // use last received time as start time
+            val currentSensor = Bundle()
+            currentSensor.putBundle("currentSensor", sensor)
+            intent.putExtra("sas", currentSensor)
+            val bleManager = Bundle()
+            bleManager.putString("sensorSerial", ReceiveData.sensorID)
+            intent.putExtra("bleManager", bleManager)
+            intent.putExtra("glucose", ReceiveData.rawValue.toDouble())
+            intent.putExtra("timestamp", ReceiveData.time)
+            sendBroadcast(intent, Constants.SHARED_PREF_XDRIP_RECEIVERS, context, sharedPref)
+        }
+
+        if (sharedPref.getBoolean(Constants.SHARED_PREF_SEND_XDRIP_BROADCAST, false)) {
+            val xDripExtras = XDripBroadcastReceiver.createExtras(context)
+            if (xDripExtras != null) {
+                val intent = Intent(Constants.XDRIP_BROADCAST_ACTION)
+                intent.putExtras(xDripExtras)
+                sendBroadcast(intent, Constants.SHARED_PREF_XDRIP_BROADCAST_RECEIVERS, context, sharedPref)
+            }
+        }
+
+        if (sharedPref.getBoolean(Constants.SHARED_PREF_SEND_TO_GLUCODATA_AOD, false)) {
+            val intent = Intent(Constants.GLUCODATA_BROADCAST_ACTION)
+            intent.putExtras(extras)
+            sendBroadcast(intent, Constants.SHARED_PREF_GLUCODATA_RECEIVERS, context, sharedPref)
+        }
+    }
+
     override fun OnNotifyData(context: Context, dataSource: NotifySource, extras: Bundle?) {
         try {
-            Log.d(LOG_ID, "OnNotifyData called for source " + dataSource.toString())
+            Log.v(LOG_ID, "OnNotifyData called for source " + dataSource.toString())
             start(context)
             super.OnNotifyData(context, dataSource, extras)
             if (dataSource == NotifySource.CAPILITY_INFO) {
                 context.setWearConnectionState(WearPhoneConnection.nodesConnected)
             }
+            if (dataSource == NotifySource.CAR_CONNECTION && CarModeReceiver.connected) {
+                val autoExtras = ReceiveData.createExtras()
+                if (autoExtras != null)
+                    sendToGlucoDataAuto(context, autoExtras)
+            }
             if (extras != null) {
                 if (dataSource == NotifySource.MESSAGECLIENT || dataSource == NotifySource.BROADCAST) {
-                    val sharedPref = context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
-                    if (sharedPref.getBoolean(Constants.SHARED_PREF_SEND_TO_XDRIP, false)) {
-                        val intent = Intent(Constants.XDRIP_ACTION_GLUCOSE_READING)
-                        // always sends time as start time, because it is only set, if the sensorId have changed!
-                        val sensor = Bundle()
-                        sensor.putLong("sensorStartTime", ReceiveData.time)  // use last received time as start time
-                        val currentSensor = Bundle()
-                        currentSensor.putBundle("currentSensor", sensor)
-                        intent.putExtra("sas", currentSensor)
-                        val bleManager = Bundle()
-                        bleManager.putString("sensorSerial", ReceiveData.sensorID)
-                        intent.putExtra("bleManager", bleManager)
-                        intent.putExtra("glucose", ReceiveData.rawValue.toDouble())
-                        intent.putExtra("timestamp", ReceiveData.time)
-                        sendBroadcast(intent, Constants.SHARED_PREF_XDRIP_RECEIVERS, context, sharedPref)
-                    }
-
-                    if (sharedPref.getBoolean(Constants.SHARED_PREF_SEND_XDRIP_BROADCAST, false)) {
-                        val xDripExtras = XDripBroadcastReceiver.createExtras(context)
-                        if (xDripExtras != null) {
-                            val intent = Intent(Constants.XDRIP_BROADCAST_ACTION)
-                            intent.putExtras(xDripExtras)
-                            sendBroadcast(intent, Constants.SHARED_PREF_XDRIP_BROADCAST_RECEIVERS, context, sharedPref)
-                        }
-                    }
-
-                    if (sharedPref.getBoolean(Constants.SHARED_PREF_SEND_TO_GLUCODATA_AOD, false)) {
-                        val intent = Intent(Constants.GLUCODATA_BROADCAST_ACTION)
-                        intent.putExtras(extras)
-                        sendBroadcast(intent, Constants.SHARED_PREF_GLUCODATA_RECEIVERS, context, sharedPref)
-                    }
+                    forwardBroadcast(context, extras)
                 }
             }
         } catch (exc: Exception) {
diff --git a/mobile/src/main/java/de/michelinside/glucodatahandler/MainActivity.kt b/mobile/src/main/java/de/michelinside/glucodatahandler/MainActivity.kt
index a9e3a6e2..46dac6fa 100644
--- a/mobile/src/main/java/de/michelinside/glucodatahandler/MainActivity.kt
+++ b/mobile/src/main/java/de/michelinside/glucodatahandler/MainActivity.kt
@@ -1,13 +1,16 @@
 package de.michelinside.glucodatahandler
 
+import android.app.AlarmManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Paint
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.PowerManager
 import android.provider.Settings
+import android.provider.Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
@@ -39,6 +42,7 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
     private lateinit var txtBatteryOptimization: TextView
     private lateinit var sharedPref: SharedPreferences
     private val LOG_ID = "GDH.Main"
+    private var requestNotificationPermission = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         try {
@@ -86,6 +90,9 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
                     apply()
                 }
             }
+
+            if (requestPermission())
+                GlucoDataServiceMobile.start(this, true)
         } catch (exc: Exception) {
             Log.e(LOG_ID, "onCreate exception: " + exc.message.toString() )
         }
@@ -94,7 +101,7 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
     override fun onPause() {
         try {
             super.onPause()
-            InternalNotifier.remNotifier(this)
+            InternalNotifier.remNotifier(this, this)
             Log.v(LOG_ID, "onPause called")
         } catch (exc: Exception) {
             Log.e(LOG_ID, "onPause exception: " + exc.message.toString() )
@@ -106,7 +113,7 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
             super.onResume()
             Log.v(LOG_ID, "onResume called")
             update()
-            InternalNotifier.addNotifier(this, mutableSetOf(
+            InternalNotifier.addNotifier(this, this, mutableSetOf(
                 NotifySource.BROADCAST,
                 NotifySource.MESSAGECLIENT,
                 NotifySource.CAPILITY_INFO,
@@ -116,11 +123,37 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
                 NotifySource.OBSOLETE_VALUE,
                 NotifySource.SOURCE_STATE_CHANGE))
             checkBatteryOptimization()
+
+            if (requestNotificationPermission && Utils.checkPermission(this, android.Manifest.permission.POST_NOTIFICATIONS, Build.VERSION_CODES.TIRAMISU)) {
+                Log.i(LOG_ID, "Notification permission granted")
+                requestNotificationPermission = false
+                GlucoDataServiceMobile.start(this, true)
+            }
         } catch (exc: Exception) {
             Log.e(LOG_ID, "onResume exception: " + exc.message.toString() )
         }
     }
 
+    fun requestPermission() : Boolean {
+        requestNotificationPermission = false
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (!Utils.checkPermission(this, android.Manifest.permission.POST_NOTIFICATIONS, Build.VERSION_CODES.TIRAMISU)) {
+                Log.i(LOG_ID, "Request notification permission...")
+                requestNotificationPermission = true
+                this.requestPermissions(arrayOf(android.Manifest.permission.POST_NOTIFICATIONS), 3)
+                return false
+            }
+        }
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            val alarmManager = this.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+            if (!alarmManager.canScheduleExactAlarms()) {
+                Log.i(LOG_ID, "Request exact alarm permission...")
+                startActivity(Intent(ACTION_REQUEST_SCHEDULE_EXACT_ALARM))
+            }
+        }
+        return true
+    }
+
     private fun checkBatteryOptimization() {
         try {
             val pm = getSystemService(POWER_SERVICE) as PowerManager
@@ -170,14 +203,6 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
                     startActivity(intent)
                     return true
                 }
-                R.id.action_update -> {
-                    val browserIntent = Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse(resources.getText(CR.string.update_link).toString())
-                    )
-                    startActivity(browserIntent)
-                    return true
-                }
                 R.id.action_help -> {
                     val browserIntent = Intent(
                         Intent.ACTION_VIEW,
@@ -219,7 +244,12 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
             }
             else
                 txtWearInfo.text = resources.getText(CR.string.activity_main_disconnected_label)
-            txtCarInfo.text = if (CarModeReceiver.connected) resources.getText(CR.string.activity_main_car_connected_label) else resources.getText(CR.string.activity_main_car_disconnected_label)
+            if (Utils.isPackageAvailable(this, Constants.PACKAGE_GLUCODATAAUTO)) {
+                txtCarInfo.text = if (CarModeReceiver.connected) resources.getText(CR.string.activity_main_car_connected_label) else resources.getText(CR.string.activity_main_car_disconnected_label)
+                txtCarInfo.visibility = View.VISIBLE
+            } else {
+                txtCarInfo.visibility = View.GONE
+            }
 
             txtSourceInfo.text = DataSourceTask.getState(this)
         } catch (exc: Exception) {
diff --git a/mobile/src/main/java/de/michelinside/glucodatahandler/PermanentNotification.kt b/mobile/src/main/java/de/michelinside/glucodatahandler/PermanentNotification.kt
index 5b28a8ed..783cfe08 100644
--- a/mobile/src/main/java/de/michelinside/glucodatahandler/PermanentNotification.kt
+++ b/mobile/src/main/java/de/michelinside/glucodatahandler/PermanentNotification.kt
@@ -55,7 +55,7 @@ object PermanentNotification: NotifierInterface, SharedPreferences.OnSharedPrefe
     fun destroy() {
         try {
             Log.v(LOG_ID, "destroy called")
-            InternalNotifier.remNotifier(this)
+            InternalNotifier.remNotifier(GlucoDataService.context!!, this)
             sharedPref.unregisterOnSharedPreferenceChangeListener(this)
             removeNotifications()
         } catch (exc: Exception) {
@@ -96,7 +96,7 @@ object PermanentNotification: NotifierInterface, SharedPreferences.OnSharedPrefe
 
         notificationCompat = Notification.Builder(context, CHANNEL_ID)
             .setSmallIcon(R.mipmap.ic_launcher)
-            .setContentIntent(Utils.getAppIntent(context, MainActivity::class.java, 4, false))
+            .setContentIntent(Utils.getAppIntent(context, MainActivity::class.java, 5, false))
             .setOngoing(true)
             .setOnlyAlertOnce(true)
             .setAutoCancel(false)
@@ -217,12 +217,12 @@ object PermanentNotification: NotifierInterface, SharedPreferences.OnSharedPrefe
                     NotifySource.MESSAGECLIENT,
                     NotifySource.SETTINGS,
                     NotifySource.OBSOLETE_VALUE)   // to trigger re-start for the case of stopped by the system
-                InternalNotifier.addNotifier(this, filter)
+                InternalNotifier.addNotifier(GlucoDataService.context!!, this, filter)
                 showNotifications()
             }
             else {
                 Log.i(LOG_ID, "deactivate permanent notification")
-                InternalNotifier.remNotifier(this)
+                InternalNotifier.remNotifier(GlucoDataService.context!!, this)
                 removeNotifications()
             }
         } catch (exc: Exception) {
diff --git a/mobile/src/main/java/de/michelinside/glucodatahandler/android_auto/CarModeReceiver.kt b/mobile/src/main/java/de/michelinside/glucodatahandler/android_auto/CarModeReceiver.kt
index 8c9242c2..737eed5d 100644
--- a/mobile/src/main/java/de/michelinside/glucodatahandler/android_auto/CarModeReceiver.kt
+++ b/mobile/src/main/java/de/michelinside/glucodatahandler/android_auto/CarModeReceiver.kt
@@ -1,101 +1,22 @@
 package de.michelinside.glucodatahandler.android_auto
 
-import android.annotation.SuppressLint
-import android.app.*
 import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.os.Bundle
 import android.util.Log
 import androidx.car.app.connection.CarConnection
-import androidx.car.app.notification.CarAppExtender
-import androidx.car.app.notification.CarNotificationManager
-import androidx.core.app.NotificationChannelCompat
-import androidx.core.app.NotificationCompat
-import androidx.core.app.Person
-import androidx.core.app.RemoteInput
-import androidx.core.graphics.drawable.IconCompat
-import de.michelinside.glucodatahandler.R
-import de.michelinside.glucodatahandler.common.R as CR
 import de.michelinside.glucodatahandler.common.*
 import de.michelinside.glucodatahandler.common.notifier.*
 import de.michelinside.glucodatahandler.tasker.setAndroidAutoConnectionState
-import java.text.DateFormat
-import java.util.*
 
-
-object CarModeReceiver: NotifierInterface, SharedPreferences.OnSharedPreferenceChangeListener {
+object CarModeReceiver {
     private const val LOG_ID = "GDH.CarModeReceiver"
-    private const val CHANNEL_ID = "GlucoDataNotify_Car"
-    private const val CHANNEL_NAME = "Notification for Android Auto"
-    private const val NOTIFICATION_ID = 789
     private var init = false
-    @SuppressLint("StaticFieldLeak")
-    private lateinit var notificationMgr: CarNotificationManager
-    private var show_notification = false
     private var car_connected = false
-    private var last_notification_time = 0L
-    private var notification_interval = 1L   // every minute -> always, -1L: only for alarms
-    private var forceNextNotify = false
     val connected: Boolean get() = car_connected
-    @SuppressLint("StaticFieldLeak")
-    private lateinit var notificationCompat: NotificationCompat.Builder
-
-    var enable_notification : Boolean get() {
-        return show_notification
-    }
-    set(value) {
-        show_notification = value
-        Log.d(LOG_ID, "show_notification set to " + show_notification.toString())
-    }
-
-    private fun createNotificationChannel(context: Context) {
-        notificationMgr = CarNotificationManager.from(context)
-        val notificationChannel = NotificationChannelCompat.Builder(
-            CHANNEL_ID,
-            NotificationManager.IMPORTANCE_HIGH
-        )
-        notificationChannel.setSound(null, null)   // silent
-        notificationMgr.createNotificationChannel(notificationChannel.setName(CHANNEL_NAME).build())
-    }
 
-    private fun createNofitication(context: Context) {
-        createNotificationChannel(context)
-        notificationCompat = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(R.mipmap.ic_launcher)
-            .setContentTitle(context.getString(CR.string.name))
-            .setContentText("Android Auto")
-            .addInvisibleAction(createReplyAction(context))
-            .addInvisibleAction(createDismissAction(context))
-            .setSilent(true)
-            .setPriority(NotificationCompat.PRIORITY_MIN)
-            .extend (
-                CarAppExtender.Builder()
-                    .setImportance(NotificationManager.IMPORTANCE_HIGH)
-                    .build()
-            )
-    }
-
-    private fun updateSettings(sharedPref: SharedPreferences) {
-        val cur_enabled = enable_notification
-        enable_notification = sharedPref.getBoolean(Constants.SHARED_PREF_CAR_NOTIFICATION, enable_notification)
-        notification_interval = sharedPref.getString(Constants.SHARED_PREF_CAR_NOTIFICATION_INTERVAL, "1")!!.toLong()
-        if(init && car_connected && cur_enabled != enable_notification) {
-            if(enable_notification)
-                showNotification(GlucoDataService.context!!, ReceiveData.isObsolete())
-            else
-                removeNotification()
-        }
-    }
-
-    fun initNotification(context: Context) {
+    fun init(context: Context) {
         try {
             if(!init) {
-                Log.d(LOG_ID, "initNotification called")
-                val sharedPref = context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
-                sharedPref.registerOnSharedPreferenceChangeListener(this)
-                updateSettings(sharedPref)
-                createNofitication(context)
+                Log.v(LOG_ID, "init called")
                 CarConnection(context).type.observeForever(CarModeReceiver::onConnectionStateUpdated)
                 init = true
             }
@@ -104,13 +25,11 @@ object CarModeReceiver: NotifierInterface, SharedPreferences.OnSharedPreferenceC
         }
     }
 
-    fun cleanupNotification(context: Context) {
+    fun cleanup(context: Context) {
         try {
             if (init) {
-                Log.d(LOG_ID, "remNotification called")
+                Log.v(LOG_ID, "cleanup called")
                 CarConnection(context).type.removeObserver(CarModeReceiver::onConnectionStateUpdated)
-                val sharedPref = context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE)
-                sharedPref.unregisterOnSharedPreferenceChangeListener(this)
                 init = false
             }
         } catch (exc: Exception) {
@@ -129,145 +48,16 @@ object CarModeReceiver: NotifierInterface, SharedPreferences.OnSharedPreferenceC
             Log.d(LOG_ID, "onConnectionStateUpdated: " + message + " (" + connectionState.toString() + ")")
             if (connectionState == CarConnection.CONNECTION_TYPE_NOT_CONNECTED)  {
                 Log.d(LOG_ID, "Exited Car Mode")
-                removeNotification()
                 car_connected = false
                 GlucoDataService.context?.setAndroidAutoConnectionState(false)
-                InternalNotifier.remNotifier(this)
             } else {
                 Log.d(LOG_ID, "Entered Car Mode")
-                forceNextNotify = false
                 car_connected = true
                 GlucoDataService.context?.setAndroidAutoConnectionState(true)
-                InternalNotifier.addNotifier(this, mutableSetOf(
-                    NotifySource.BROADCAST,
-                    NotifySource.MESSAGECLIENT,
-                    NotifySource.OBSOLETE_VALUE))
-                showNotification(GlucoDataService.context!!, ReceiveData.isObsolete())
             }
             InternalNotifier.notify(GlucoDataService.context!!, NotifySource.CAR_CONNECTION, null)
         } catch (exc: Exception) {
             Log.e(LOG_ID, "OnNotifyData exception: " + exc.message.toString() )
         }
     }
-
-    override fun OnNotifyData(context: Context, dataSource: NotifySource, extras: Bundle?) {
-        Log.d(LOG_ID, "OnNotifyData called")
-        try {
-            showNotification(context, dataSource == NotifySource.OBSOLETE_VALUE)
-        } catch (exc: Exception) {
-            Log.e(LOG_ID, "OnNotifyData exception: " + exc.message.toString() )
-        }
-    }
-
-    fun removeNotification() {
-        notificationMgr.cancel(NOTIFICATION_ID)  // remove notification
-        forceNextNotify = false
-    }
-
-    private fun getTimeDiffMinute(): Long {
-        return Utils.round((ReceiveData.time-last_notification_time).toFloat()/60000, 0).toLong()
-    }
-
-    private fun canShowNotification(isObsolete: Boolean): Boolean {
-        if (enable_notification && car_connected) {
-            if(notification_interval == 1L || ReceiveData.forceAlarm)
-                return true
-            if (ReceiveData.getAlarmType() == ReceiveData.AlarmType.VERY_LOW || isObsolete) {
-                forceNextNotify = true  // if obsolete or VERY_LOW, the next value is important!
-                return true
-            }
-            if (forceNextNotify) {
-                forceNextNotify = false
-                return true
-            }
-            if (notification_interval > 1L) {
-                return getTimeDiffMinute() >= notification_interval
-            }
-            return false
-        }
-        return false
-    }
-
-    fun showNotification(context: Context, isObsolete: Boolean) {
-        try {
-            if (canShowNotification(isObsolete)) {
-                Log.d(LOG_ID, "showNotification called")
-                notificationCompat
-                    .setLargeIcon(Utils.getRateAsBitmap(resizeFactor = 0.75F))
-                    .setWhen(ReceiveData.time)
-                    .setStyle(createMessageStyle(context, isObsolete))
-                notificationMgr.notify(NOTIFICATION_ID, notificationCompat)
-                last_notification_time = ReceiveData.time
-            }
-        } catch (exc: Exception) {
-            Log.e(LOG_ID, "showNotification exception: " + exc.toString() )
-        }
-    }
-
-    private fun createMessageStyle(context: Context, isObsolete: Boolean): NotificationCompat.MessagingStyle {
-        val person = Person.Builder()
-            .setIcon(IconCompat.createWithBitmap(Utils.getRateAsBitmap(resizeFactor = 0.75F)!!))
-            .setName(ReceiveData.getClucoseAsString())
-            .setImportant(true)
-            .build()
-        val messagingStyle = NotificationCompat.MessagingStyle(person)
-        if (isObsolete)
-            messagingStyle.conversationTitle = context.getString(CR.string.no_new_value, ReceiveData.getElapsedTimeMinute())
-        else
-            messagingStyle.conversationTitle = ReceiveData.getClucoseAsString()  + " (" + ReceiveData.getDeltaAsString() + ")"
-        messagingStyle.isGroupConversation = false
-        messagingStyle.addMessage(DateFormat.getTimeInstance(DateFormat.SHORT).format(Date(ReceiveData.time)), System.currentTimeMillis(), person)
-        return messagingStyle
-    }
-
-    private fun createReplyAction(context: Context): NotificationCompat.Action {
-        val remoteInputWear =
-            RemoteInput.Builder("extra_voice_reply").setLabel("Reply")
-                .build()
-        val intent = Intent("DoNothing") //new Intent(this, PopupReplyReceiver.class);
-        val pendingIntent = PendingIntent.getBroadcast(
-            context,
-            1,
-            intent,
-            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-        )
-        return NotificationCompat.Action.Builder(R.mipmap.ic_launcher, "Reply", pendingIntent)
-            //.setAllowGeneratedReplies(true)
-            .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
-            .setShowsUserInterface(false)
-            .addRemoteInput(remoteInputWear)
-            .build()
-    }
-
-    private fun createDismissAction(context: Context): NotificationCompat.Action {
-        val intent = Intent("DoNothing") //new Intent(this, DismissReceiver.class);
-        val pendingIntent = PendingIntent.getBroadcast(
-            context,
-            2,
-            intent,
-            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-        )
-        return NotificationCompat.Action.Builder(
-            R.mipmap.ic_launcher,
-            "Mark as read",
-            pendingIntent
-        )
-            .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ)
-            .setShowsUserInterface(false)
-            .build()
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        try {
-            Log.d(LOG_ID, "onSharedPreferenceChanged called for key " + key)
-            when(key) {
-                Constants.SHARED_PREF_CAR_NOTIFICATION,
-                Constants.SHARED_PREF_CAR_NOTIFICATION_INTERVAL -> {
-                    updateSettings(sharedPreferences!!)
-                }
-            }
-        } catch (exc: Exception) {
-            Log.e(LOG_ID, "onSharedPreferenceChanged exception: " + exc.toString() + "\n" + exc.stackTraceToString() )
-        }
-    }
 }
diff --git a/mobile/src/main/java/de/michelinside/glucodatahandler/preferences/SettingsFragment.kt b/mobile/src/main/java/de/michelinside/glucodatahandler/preferences/SettingsFragment.kt
index 402b0281..44d8d34b 100644
--- a/mobile/src/main/java/de/michelinside/glucodatahandler/preferences/SettingsFragment.kt
+++ b/mobile/src/main/java/de/michelinside/glucodatahandler/preferences/SettingsFragment.kt
@@ -14,6 +14,7 @@ import androidx.preference.*
 import de.michelinside.glucodatahandler.BuildConfig
 import de.michelinside.glucodatahandler.R
 import de.michelinside.glucodatahandler.common.Constants
+import de.michelinside.glucodatahandler.common.Utils
 import de.michelinside.glucodatahandler.common.R as CR
 
 
@@ -37,6 +38,24 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
             setupReceivers(Constants.XDRIP_ACTION_GLUCOSE_READING, Constants.SHARED_PREF_XDRIP_RECEIVERS)
             setupReceivers(Constants.XDRIP_BROADCAST_ACTION, Constants.SHARED_PREF_XDRIP_BROADCAST_RECEIVERS)
 
+            if (Utils.isPackageAvailable(requireContext(), Constants.PACKAGE_GLUCODATAAUTO)) {
+                val sendToGDA = findPreference<SwitchPreferenceCompat>(Constants.SHARED_PREF_SEND_TO_GLUCODATAAUTO)
+                sendToGDA!!.isVisible = true
+            } else {
+                val no_gda_info = findPreference<Preference>(Constants.SHARED_PREF_NO_GLUCODATAAUTO)
+                if (no_gda_info != null) {
+                    no_gda_info.isVisible = true
+                    no_gda_info.setOnPreferenceClickListener {
+                        val browserIntent = Intent(
+                            Intent.ACTION_VIEW,
+                            Uri.parse(resources.getText(CR.string.glucodataauto_link).toString())
+                        )
+                        startActivity(browserIntent)
+                        true
+                    }
+                }
+            }
+
             activityResultOverlayLauncher = registerForActivityResult(
                 ActivityResultContracts.StartActivityForResult()
             ) {
diff --git a/mobile/src/main/java/de/michelinside/glucodatahandler/widget/ActiveWidgetHandler.kt b/mobile/src/main/java/de/michelinside/glucodatahandler/widget/ActiveWidgetHandler.kt
index d5d3260e..ede77a27 100644
--- a/mobile/src/main/java/de/michelinside/glucodatahandler/widget/ActiveWidgetHandler.kt
+++ b/mobile/src/main/java/de/michelinside/glucodatahandler/widget/ActiveWidgetHandler.kt
@@ -33,7 +33,7 @@ object ActiveWidgetHandler: NotifierInterface, SharedPreferences.OnSharedPrefere
                         filter.add(NotifySource.TIME_VALUE)
                     else
                         filter.add(NotifySource.OBSOLETE_VALUE)
-                    InternalNotifier.addNotifier(this, filter)
+                    InternalNotifier.addNotifier(context, this, filter)
                 }
                 if (activeWidgets.size == 1)
                     context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE).registerOnSharedPreferenceChangeListener(this)
@@ -48,7 +48,7 @@ object ActiveWidgetHandler: NotifierInterface, SharedPreferences.OnSharedPrefere
             activeWidgets.remove(type)
             Log.i(LOG_ID, "remove widget " + type.toString() + " new size " + activeWidgets.size)
             if (activeWidgets.isEmpty()) {
-                InternalNotifier.remNotifier(this)
+                InternalNotifier.remNotifier(context, this)
                 context.getSharedPreferences(Constants.SHARED_PREF_TAG, Context.MODE_PRIVATE).unregisterOnSharedPreferenceChangeListener(this)
             } else if (type == WidgetType.GLUCOSE_TREND_DELTA_TIME) {
                 // re-add filter to remove TIME_VALUE
@@ -58,7 +58,7 @@ object ActiveWidgetHandler: NotifierInterface, SharedPreferences.OnSharedPrefere
                     NotifySource.SETTINGS,
                     NotifySource.OBSOLETE_VALUE
                 )
-                InternalNotifier.addNotifier(this, filter)
+                InternalNotifier.addNotifier(context, this, filter)
             }
         } catch (exc: Exception) {
             Log.e(LOG_ID, "Exception in remWidget: " + exc.toString())
diff --git a/mobile/src/main/java/de/michelinside/glucodatahandler/widget/FloatingWidget.kt b/mobile/src/main/java/de/michelinside/glucodatahandler/widget/FloatingWidget.kt
index a8f34aa0..a9e483ef 100644
--- a/mobile/src/main/java/de/michelinside/glucodatahandler/widget/FloatingWidget.kt
+++ b/mobile/src/main/java/de/michelinside/glucodatahandler/widget/FloatingWidget.kt
@@ -64,7 +64,7 @@ class FloatingWidget(val context: Context) : NotifierInterface, SharedPreference
 
     private fun remove() {
         Log.d(LOG_ID, "remove called")
-        InternalNotifier.remNotifier(this)
+        InternalNotifier.remNotifier(context, this)
         if (windowManager != null) windowManager?.removeView(floatingView)
         windowManager = null
     }
@@ -135,7 +135,7 @@ class FloatingWidget(val context: Context) : NotifierInterface, SharedPreference
                         } else {
                             filter.add(NotifySource.OBSOLETE_VALUE)
                         }
-                        InternalNotifier.addNotifier(this, filter)
+                        InternalNotifier.addNotifier(context, this, filter)
                         createWindow()
                     } else {
                         Log.d(LOG_ID, "update window")
diff --git a/mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt b/mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt
index 9a6f634d..f3d2fc41 100644
--- a/mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt
+++ b/mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt
@@ -1,6 +1,5 @@
 package de.michelinside.glucodatahandler.widget
 
-import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
 import android.content.ComponentName
@@ -10,7 +9,6 @@ import android.graphics.Paint
 import android.os.Bundle
 import android.util.Log
 import android.widget.RemoteViews
-import de.michelinside.glucodatahandler.BuildConfig
 import de.michelinside.glucodatahandler.GlucoDataServiceMobile
 import de.michelinside.glucodatahandler.MainActivity
 import de.michelinside.glucodatahandler.R
@@ -231,13 +229,12 @@ abstract class GlucoseBaseWidget(private val type: WidgetType,
             val height = if (isPortrait) maxHeight else minHeight
 
             val remoteViews = getRemoteViews(context, width, height)
-            if (BuildConfig.DEBUG) {
+            /*if (BuildConfig.DEBUG) {
                 // for debug create dummy broadcast (to check in emulator)
                 val pendingIntent = PendingIntent.getBroadcast(context, 5, Utils.getDummyGlucodataIntent(false), PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
                 remoteViews.setOnClickPendingIntent(R.id.widget, pendingIntent)
-            } else {
-                remoteViews.setOnClickPendingIntent(R.id.widget, Utils.getAppIntent(context, MainActivity::class.java, 5, true))
-            }
+            } else*/
+            remoteViews.setOnClickPendingIntent(R.id.widget, Utils.getAppIntent(context, MainActivity::class.java, 5, true))
 
             // Instruct the widget manager to update the widget
             appWidgetManager.updateAppWidget(appWidgetId, remoteViews)
diff --git a/mobile/src/main/res/drawable/ic_launcher_background.xml b/mobile/src/main/res/drawable/ic_launcher_background.xml
index cec2dc08..e009ebe7 100644
--- a/mobile/src/main/res/drawable/ic_launcher_background.xml
+++ b/mobile/src/main/res/drawable/ic_launcher_background.xml
@@ -4,10 +4,10 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.02"
-      android:scaleY="0.02"
-      android:translateX="52.92"
-      android:translateY="52.92">
+  <group android:scaleX="0"
+      android:scaleY="0"
+      android:translateX="54"
+      android:translateY="54">
       <path android:fillColor="#3DDC84"
             android:pathData="M0,0h108v108h-108z"/>
       <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml
index fa9c68af..1de117e3 100644
--- a/mobile/src/main/res/layout/activity_main.xml
+++ b/mobile/src/main/res/layout/activity_main.xml
@@ -62,12 +62,11 @@
         android:layout_marginEnd="20dp"
         android:text="@string/no_data"
         android:textAlignment="center"
-        android:textSize="20dp"
+        android:textSize="20sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/layout_glucose_trend"
-        app:layout_constraintTop_toTopOf="@+id/layout_info_elements"
-        tools:ignore="SpUsage" />
+        app:layout_constraintTop_toTopOf="@+id/layout_info_elements" />
 
     <LinearLayout
         android:id="@+id/layout_info_elements"
@@ -86,9 +85,9 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:text="@string/activity_main_battery_optimization_disabled"
-            android:textSize="14dp"
+            android:textSize="16sp"
             android:visibility="gone"
-            tools:ignore="HardcodedText,SpUsage"
+            tools:ignore="HardcodedText"
             android:textAlignment="center"
             app:layout_constraintBottom_toTopOf="@+id/txtSourceInfo"
             app:layout_constraintEnd_toEndOf="parent"
@@ -100,8 +99,8 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:text="Source: -"
-            android:textSize="14dp"
-            tools:ignore="HardcodedText,SpUsage"
+            android:textSize="16sp"
+            tools:ignore="HardcodedText"
             android:textAlignment="center"
             app:layout_constraintBottom_toTopOf="@+id/txtWearInfo"
             app:layout_constraintEnd_toEndOf="parent"
@@ -113,8 +112,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:text="@string/activity_main_disconnected_label"
-            android:textSize="14dp"
-            tools:ignore="SpUsage"
+            android:textSize="16sp"
             android:textAlignment="center"
             app:layout_constraintBottom_toTopOf="@+id/txtCarInfo"
             app:layout_constraintEnd_toEndOf="parent"
@@ -130,8 +128,7 @@
             app:layout_constraintBottom_toTopOf="@+id/txtVersion"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:textSize="14dp"
-            tools:ignore="SpUsage" />
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/txtVersion"
@@ -142,8 +139,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:textSize="14dp"
-            tools:ignore="HardcodedText,SpUsage" />
+            android:textSize="16sp"
+            tools:ignore="HardcodedText" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/mobile/src/main/res/menu/menu_items.xml b/mobile/src/main/res/menu/menu_items.xml
index 1bb01c24..8b0e9be1 100644
--- a/mobile/src/main/res/menu/menu_items.xml
+++ b/mobile/src/main/res/menu/menu_items.xml
@@ -21,10 +21,6 @@
             android:id="@+id/group_github_title"
             android:title="@string/menu_group_github">
             <menu>
-                <item
-                    android:id="@+id/action_update"
-                    android:title="@string/menu_update"
-                    app:showAsAction="never" />
                 <item
                     android:id="@+id/action_support"
                     android:title="@string/menu_support"
diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile/src/main/res/mipmap-hdpi/ic_launcher.png
index 752717a5..82c88f2e 100644
Binary files a/mobile/src/main/res/mipmap-hdpi/ic_launcher.png and b/mobile/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/mobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index ec6c24a2..68f2877c 100644
Binary files a/mobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/mobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 84f54a7d..10474743 100644
Binary files a/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile/src/main/res/mipmap-mdpi/ic_launcher.png
index 32361c12..96a29a1b 100644
Binary files a/mobile/src/main/res/mipmap-mdpi/ic_launcher.png and b/mobile/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/mobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 47cfcd04..bbd7c020 100644
Binary files a/mobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/mobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 6a827d67..ed46fbb0 100644
Binary files a/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png
index 96575f27..a39a4d20 100644
Binary files a/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index d0789eb8..444ad907 100644
Binary files a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index e44fced1..7f8ce85e 100644
Binary files a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 09a9a2e3..7656797b 100644
Binary files a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index ab5f928d..94caae82 100644
Binary files a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index c4cb1a69..200e9402 100644
Binary files a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index d5756fc8..7ebe4b3d 100644
Binary files a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 88645658..f183f275 100644
Binary files a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index 4ed5cb14..be7d4717 100644
Binary files a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/values-night/themes.xml b/mobile/src/main/res/values-night/themes.xml
index debab0a1..ec58cb59 100644
--- a/mobile/src/main/res/values-night/themes.xml
+++ b/mobile/src/main/res/values-night/themes.xml
@@ -2,12 +2,12 @@
     <!-- Base application theme. -->
     <style name="Theme.GlucoDataHandler" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">#005CCC</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">#94C2FA</item>
+        <item name="colorPrimaryVariant">@color/teal_200</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">#0099FF</item>
-        <item name="colorSecondaryVariant">#4000FF</item>
+        <item name="colorSecondary">#94C2FA</item>
+        <item name="colorSecondaryVariant">#5EC3F1</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">#005CCC</item>
diff --git a/mobile/src/main/res/xml/preferences.xml b/mobile/src/main/res/xml/preferences.xml
index 4a1d30f3..96d79d79 100644
--- a/mobile/src/main/res/xml/preferences.xml
+++ b/mobile/src/main/res/xml/preferences.xml
@@ -30,7 +30,7 @@
         app:iconSpaceReserved="false"
         app:initialExpandedChildrenCount="0">
         <de.michelinside.glucodatahandler.preferences.GlucoseEditPreference
-            android:defaultValue="0"
+            android:defaultValue="240"
             android:inputType="numberDecimal"
             android:key="high_glucose"
             android:selectAllOnFocus="true"
@@ -57,7 +57,7 @@
             android:summary="@string/pref_target_min_value_summary"
             app:iconSpaceReserved="false" />
         <de.michelinside.glucodatahandler.preferences.GlucoseEditPreference
-            android:defaultValue="0"
+            android:defaultValue="70"
             android:inputType="numberDecimal"
             android:key="low_glucose"
             android:selectAllOnFocus="true"
@@ -190,25 +190,18 @@
         android:title="@string/pref_cat_android_auto"
         app:iconSpaceReserved="false"
         app:initialExpandedChildrenCount="0">
-        <androidx.preference.SwitchPreferenceCompat
-            android:defaultValue="true"
-            android:key="car_media"
-            android:summary="@string/pref_switch_car_media_summary"
-            android:title="@string/pref_switch_car_media"
+        <Preference
+            android:key="no_gda_info"
+            android:summary="@string/pref_no_gda_info_summary"
+            android:title="@string/pref_no_gda_info"
+            app:isPreferenceVisible="false"
             app:iconSpaceReserved="false" />
         <androidx.preference.SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:key="car_notification"
-            android:summary="@string/pref_switch_car_notification_summary"
-            android:title="@string/pref_switch_car_notification"
-            app:iconSpaceReserved="false" />
-        <androidx.preference.ListPreference
-            android:defaultValue="1"
-            android:entries="@array/car_notification_interval_labels"
-            android:entryValues="@array/car_notification_interval_values"
-            android:key="car_notification_interval"
-            android:title="@string/pref_car_notification_interval"
-            android:summary="@string/pref_car_notification_interval_summary"
+            android:defaultValue="true"
+            android:key="send_to_glucodataauto"
+            app:isPreferenceVisible="false"
+            android:summary="@string/pref_send_to_glucodataauto_summary"
+            android:title="@string/pref_send_to_glucodataauto"
             app:iconSpaceReserved="false" />
     </PreferenceCategory>
 
diff --git a/settings.gradle b/settings.gradle
index 89770193..39e8d61e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,3 +16,4 @@ rootProject.name = "GlucoDataHandler"
 include ':mobile'
 include ':wear'
 include ':common'
+include ':auto'
diff --git a/wear/build.gradle b/wear/build.gradle
index dba3bbb9..79bb59b9 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -11,7 +11,7 @@ android {
         applicationId "de.michelinside.glucodatahandler"
         minSdk rootProject.minSdk
         targetSdk rootProject.targetSdk
-        versionCode rootProject.versionCode
+        versionCode 2000 + rootProject.versionCode
         versionName rootProject.versionName
     }
 
@@ -24,8 +24,7 @@ android {
         }
         debug {
             applicationIdSuffix '.debug'
-            versionNameSuffix '-DEBUG'
-            resValue "string", "app_name", "GDH Debug"
+            resValue "string", "app_name", "GlucoDataHandler"
         }
         second {
             applicationIdSuffix '.second'
@@ -71,14 +70,24 @@ dependencies {
     implementation 'androidx.wear:wear:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation project(path: ':common')
-    implementation 'androidx.wear.watchface:watchface-complications-data-source-ktx:1.1.1'
-    implementation 'androidx.wear.watchface:watchface-complications-rendering:1.1.1'
+    implementation 'androidx.wear.watchface:watchface-complications-data-source-ktx:1.2.0'
+    implementation 'androidx.wear.watchface:watchface-complications-rendering:1.2.0'
     implementation 'androidx.appcompat:appcompat-resources:1.6.1'
     implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
 }
 
 afterEvaluate {
+    //noinspection ConfigurationAvoidance
+    def bundleRelease = tasks.getByPath(':wear:bundleRelease')
+    def copyAndroidBundlePostBuild = tasks.register('copyAndroidBundlePostBuild', Copy) {
+        dependsOn bundleRelease
+        from "${projectDir}/release"
+        include '**/*.aab'
+        into rootProject.releasePath + "/Playstore" + "/" + versionName
+    }
+    bundleRelease.finalizedBy(copyAndroidBundlePostBuild)
+
     //noinspection ConfigurationAvoidance
     def assembleRelease = tasks.getByPath(':wear:assembleRelease')
     def copyAndroidApksPostBuild = tasks.register('copyAndroidApksPostBuild', Copy) {
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index c818ba23..b714ec93 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -5,10 +5,13 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-feature android:name="android.hardware.type.watch" />
 
@@ -33,7 +36,8 @@
 
         <activity
             android:name=".WaerActivity"
-            android:exported="true">
+            android:exported="true"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/wear/src/main/ic_launcher-playstore.png b/wear/src/main/ic_launcher-playstore.png
index 3eb84323..e3e7bf30 100644
Binary files a/wear/src/main/ic_launcher-playstore.png and b/wear/src/main/ic_launcher-playstore.png differ
diff --git a/wear/src/main/java/de/michelinside/glucodatahandler/GlucoDataServiceWear.kt b/wear/src/main/java/de/michelinside/glucodatahandler/GlucoDataServiceWear.kt
index e3008959..271b8461 100644
--- a/wear/src/main/java/de/michelinside/glucodatahandler/GlucoDataServiceWear.kt
+++ b/wear/src/main/java/de/michelinside/glucodatahandler/GlucoDataServiceWear.kt
@@ -3,9 +3,7 @@ package de.michelinside.glucodatahandler
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import de.michelinside.glucodatahandler.common.*
@@ -17,7 +15,7 @@ class GlucoDataServiceWear: GlucoDataService(AppSource.WEAR_APP) {
     private val LOG_ID = "GDH.GlucoDataServiceWear"
     init {
         Log.d(LOG_ID, "init called")
-        InternalNotifier.addNotifier(
+        InternalNotifier.addNotifier( this,
             ActiveComplicationHandler, mutableSetOf(
                 NotifySource.MESSAGECLIENT,
                 NotifySource.BROADCAST,
@@ -25,7 +23,7 @@ class GlucoDataServiceWear: GlucoDataService(AppSource.WEAR_APP) {
                 NotifySource.TIME_VALUE
             )
         )
-        InternalNotifier.addNotifier(
+        InternalNotifier.addNotifier( this,
             BatteryLevelComplicationUpdater,
             mutableSetOf(
                 NotifySource.CAPILITY_INFO,
@@ -62,24 +60,23 @@ class GlucoDataServiceWear: GlucoDataService(AppSource.WEAR_APP) {
         val channel = NotificationChannel(
             channelId,
             "Foregorund GlucoDataService",
-            NotificationManager.IMPORTANCE_MIN
+            NotificationManager.IMPORTANCE_HIGH
         )
         (getSystemService(NOTIFICATION_SERVICE) as NotificationManager).createNotificationChannel(
             channel
         )
-        val notificationIntent = Intent(this, WaerActivity::class.java)
 
-        val pendingIntent = PendingIntent.getActivity(
-            this, 1,
-            notificationIntent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-        )
+        val pendingIntent = Utils.getAppIntent(this, WaerActivity::class.java, 11, false)
 
         return Notification.Builder(this, channelId)
             .setContentTitle(getString(CR.string.forground_notification_descr))
             .setSmallIcon(R.mipmap.ic_launcher)
             .setContentIntent(pendingIntent)
-            .setAutoCancel(true)
+            .setOngoing(true)
             .setOnlyAlertOnce(true)
+            .setAutoCancel(false)
+            .setCategory(Notification.CATEGORY_STATUS)
+            .setVisibility(Notification.VISIBILITY_PUBLIC)
             .build()
     }
 }
\ No newline at end of file
diff --git a/wear/src/main/java/de/michelinside/glucodatahandler/WaerActivity.kt b/wear/src/main/java/de/michelinside/glucodatahandler/WaerActivity.kt
index a1936120..6f172386 100644
--- a/wear/src/main/java/de/michelinside/glucodatahandler/WaerActivity.kt
+++ b/wear/src/main/java/de/michelinside/glucodatahandler/WaerActivity.kt
@@ -1,10 +1,12 @@
 package de.michelinside.glucodatahandler
 
+import android.app.AlarmManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Paint
 import android.os.*
+import android.provider.Settings
 import android.util.Log
 import android.widget.ImageView
 import android.widget.TextView
@@ -34,6 +36,7 @@ class WaerActivity : AppCompatActivity(), NotifierInterface {
     private lateinit var switchLibreSource: SwitchCompat
     private lateinit var switchNightscoutSource: SwitchCompat
     private lateinit var sharedPref: SharedPreferences
+    private var requestNotificationPermission = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         try {
@@ -164,7 +167,8 @@ class WaerActivity : AppCompatActivity(), NotifierInterface {
                 }
             }
 
-            GlucoDataServiceWear.start(this, true)
+            if(requestPermission())
+                GlucoDataServiceWear.start(this, true)
         } catch( exc: Exception ) {
             Log.e(LOG_ID, exc.message + "\n" + exc.stackTraceToString())
         }
@@ -173,7 +177,7 @@ class WaerActivity : AppCompatActivity(), NotifierInterface {
     override fun onPause() {
         try {
             super.onPause()
-            InternalNotifier.remNotifier(this)
+            InternalNotifier.remNotifier(this, this)
             Log.d(LOG_ID, "onPause called")
         } catch( exc: Exception ) {
             Log.e(LOG_ID, exc.message + "\n" + exc.stackTraceToString())
@@ -185,7 +189,7 @@ class WaerActivity : AppCompatActivity(), NotifierInterface {
             super.onResume()
             Log.d(LOG_ID, "onResume called")
             update()
-            InternalNotifier.addNotifier(this, mutableSetOf(
+            InternalNotifier.addNotifier(this, this, mutableSetOf(
                 NotifySource.BROADCAST,
                 NotifySource.MESSAGECLIENT,
                 NotifySource.CAPILITY_INFO,
@@ -194,11 +198,37 @@ class WaerActivity : AppCompatActivity(), NotifierInterface {
                 NotifySource.OBSOLETE_VALUE,
                 NotifySource.SOURCE_SETTINGS,
                 NotifySource.SOURCE_STATE_CHANGE))
+
+            if (requestNotificationPermission && Utils.checkPermission(this, android.Manifest.permission.POST_NOTIFICATIONS, Build.VERSION_CODES.TIRAMISU)) {
+                Log.i(LOG_ID, "Notification permission granted")
+                requestNotificationPermission = false
+                GlucoDataServiceWear.start(this, true)
+            }
         } catch( exc: Exception ) {
             Log.e(LOG_ID, exc.message + "\n" + exc.stackTraceToString())
         }
     }
 
+    fun requestPermission() : Boolean {
+        requestNotificationPermission = false
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (!Utils.checkPermission(this, android.Manifest.permission.POST_NOTIFICATIONS, Build.VERSION_CODES.TIRAMISU)) {
+                Log.i(LOG_ID, "Request notification permission...")
+                requestNotificationPermission = true
+                this.requestPermissions(arrayOf(android.Manifest.permission.POST_NOTIFICATIONS), 3)
+                return false
+            }
+        }
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            val alarmManager = this.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+            if (!alarmManager.canScheduleExactAlarms()) {
+                Log.i(LOG_ID, "Request exact alarm permission...")
+                startActivity(Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM))
+            }
+        }
+        return true
+    }
+
     private fun update() {
         try {
             if(ReceiveData.time > 0) {
@@ -219,13 +249,15 @@ class WaerActivity : AppCompatActivity(), NotifierInterface {
 
             val user = sharedPref.getString(Constants.SHARED_PREF_LIBRE_USER, "")!!.trim()
             val password = sharedPref.getString(Constants.SHARED_PREF_LIBRE_PASSWORD, "")!!.trim()
-            switchLibreSource.isEnabled = user.isNotEmpty() && password.isNotEmpty()
+            if (!BuildConfig.DEBUG)
+                switchLibreSource.isEnabled = user.isNotEmpty() && password.isNotEmpty()
             if(!switchLibreSource.isEnabled) {
                 switchLibreSource.isChecked = false
             }
 
             val url = sharedPref.getString(Constants.SHARED_PREF_NIGHTSCOUT_URL, "")!!.trim()
-            switchNightscoutSource.isEnabled = url.isNotEmpty()
+            if (!BuildConfig.DEBUG)
+                switchNightscoutSource.isEnabled = url.isNotEmpty()
             if(!switchNightscoutSource.isEnabled) {
                 switchNightscoutSource.isChecked = false
             }
diff --git a/wear/src/main/res/drawable/ic_launcher_background.xml b/wear/src/main/res/drawable/ic_launcher_background.xml
index cec2dc08..e009ebe7 100644
--- a/wear/src/main/res/drawable/ic_launcher_background.xml
+++ b/wear/src/main/res/drawable/ic_launcher_background.xml
@@ -4,10 +4,10 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.02"
-      android:scaleY="0.02"
-      android:translateX="52.92"
-      android:translateY="52.92">
+  <group android:scaleX="0"
+      android:scaleY="0"
+      android:translateX="54"
+      android:translateY="54">
       <path android:fillColor="#3DDC84"
             android:pathData="M0,0h108v108h-108z"/>
       <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
diff --git a/wear/src/main/res/layout/activity_waer.xml b/wear/src/main/res/layout/activity_waer.xml
index 314a7fc7..aa210842 100644
--- a/wear/src/main/res/layout/activity_waer.xml
+++ b/wear/src/main/res/layout/activity_waer.xml
@@ -12,8 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fillViewport="true"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:padding="10dp">
-    <LinearLayout
+        <requestFocus/>
+        <LinearLayout
         android:id="@+id/frameLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher.png b/wear/src/main/res/mipmap-hdpi/ic_launcher.png
index 752717a5..82c88f2e 100644
Binary files a/wear/src/main/res/mipmap-hdpi/ic_launcher.png and b/wear/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index ec6c24a2..68f2877c 100644
Binary files a/wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 84f54a7d..10474743 100644
Binary files a/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher.png b/wear/src/main/res/mipmap-mdpi/ic_launcher.png
index 32361c12..96a29a1b 100644
Binary files a/wear/src/main/res/mipmap-mdpi/ic_launcher.png and b/wear/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 47cfcd04..bbd7c020 100644
Binary files a/wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 6a827d67..ed46fbb0 100644
Binary files a/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png
index 96575f27..a39a4d20 100644
Binary files a/wear/src/main/res/mipmap-xhdpi/ic_launcher.png and b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index d0789eb8..444ad907 100644
Binary files a/wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index e44fced1..7f8ce85e 100644
Binary files a/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 09a9a2e3..7656797b 100644
Binary files a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index ab5f928d..94caae82 100644
Binary files a/wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index c4cb1a69..200e9402 100644
Binary files a/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index d5756fc8..7ebe4b3d 100644
Binary files a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 88645658..f183f275 100644
Binary files a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index 4ed5cb14..be7d4717 100644
Binary files a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ