diff --git a/.gitignore b/.gitignore
index 8db18dfeffa66be41038a61fff49ebae3827968e..082b1d9ec45c204d463476c458a0de3b0c926bd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,11 @@ bin/
 build/
 .gradle/
 .idea/
-user.gradle
 local.properties
 .directory
-
-.settings
-.classpath
+bin/
 .project
+.classpath
+.output/
+.settings/
+*keystore
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..47e7d8cf4e3db486ebe4f6bd29c9b9e22edb20f2
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,78 @@
+image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"
+
+stages:
+- build
+- publish
+
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+before_script:
+- if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi
+- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+- eval $(ssh-agent -s)
+- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+- mkdir -p ~/.ssh
+- chmod 700 ~/.ssh
+- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+- chmod 644 ~/.ssh/known_hosts
+- export GRADLE_USER_HOME=$(pwd)/.gradle
+- chmod +x ./gradlew
+
+.default_before_script: &default_before_script
+  - echo sdk.dir $ANDROID_HOME > local.properties
+  - echo mapbox.key $MAPBOX_KEY >> local.properties
+  - echo mapbox.enabled true >> local.properties
+  - echo ichnaea.key $ICHNAEA_KEY >> local.properties
+  - echo stadia.key $STADIA_KEY >> local.properties
+  - echo modules.hms false >> local.properties
+  - echo "${KEYSTORE}" | base64 -d > play-services-core/e.keystore
+  - export TERM=dumb
+  - export JAVA_OPTS="-XX:+HeapDumpOnOutOfMemoryError -Xmx4096m"
+
+cache:
+  key: ${CI_PROJECT_ID}
+  paths:
+  - .gradle/
+
+build:
+  stage: build
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"
+    - when: always
+  before_script:
+  - *default_before_script
+  - echo modules.nearby false >> local.properties
+  script:
+  - ./gradlew assembleDebug
+  - ./gradlew assembleRelease
+  artifacts:
+    paths:
+    - play-services-core/build/outputs/apk/
+    - vending-app/build/outputs/apk/
+
+build-nearby:
+  extends: build
+  stage: build
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"
+    - when: always
+  before_script:
+  - *default_before_script
+  - echo modules.nearby true >> local.properties
+  script:
+  - ./gradlew assembleDebug
+  - ./gradlew assembleRelease
+
+publish:
+  stage: publish
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"
+      when: manual
+  script:
+    - |
+      curl --fail --output "/dev/null" --silent --show-error \
+           --header 'Content-Type: application/json' --header "PRIVATE-TOKEN: ${PUBLICATION_TOKEN}" \
+           --data "{\"ref\":\"${CI_COMMIT_SHA}\",\"name\":\"${CI_COMMIT_TAG}\",\"tag_name\":\"${CI_COMMIT_TAG}\",\"description\":\"${CI_COMMIT_TITLE}\",\"assets\":{\"links\":[{\"name\":\"GmsCore-test.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseTest/play-services-core-withMapbox-withNearby-releaseTest.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-dev.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseDev/play-services-core-mapbox-default-releaseDev.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-stable.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseStable/play-services-core-mapbox-default-releaseStable.apk?job=build-nearby\",\"link_type\":\"package\"}]}}" \
+           --request POST https://gitlab.e.foundation/api/v4/projects/149/releases
+
diff --git a/Android.mk b/Android.mk
index 5cd016987f76a3eeb614521d24ea80140941c7ee..3c1a249dcdc01f725dd764830290ae1cd5524937 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,6 +19,10 @@ LOCAL_MODULE := GmsCore
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := GmsCore
 
+LOCAL_PRIVATE_PLATFORM_APIS := true
+
+LOCAL_STATIC_JAVA_LIBRARIES += org.lineageos.platform.sdk
+
 gmscore_root  := $(LOCAL_PATH)
 gmscore_dir   := play-services-core
 gmscore_out   := $(TARGET_COMMON_OUT_ROOT)/obj/APPS/$(LOCAL_MODULE)_intermediates
@@ -38,4 +42,4 @@ LOCAL_SRC_FILES := $(gmscore_apk)
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 
-include $(BUILD_PREBUILT)
+include $(BUILD_PREBUILT)
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index f1f83dc9c8aabd9a4c8792bd3acde5e3e07ef976..24e0d8d9aabb67b937377b214b6cfb30f43f8e4d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ buildscript {
 
     ext.androidBuildVersionTools = '34.0.0'
 
-    ext.androidMinSdk = 19
+    ext.androidMinSdk = 21
     ext.androidTargetSdk = 29
     ext.androidCompileSdk = 34
 
@@ -54,6 +54,7 @@ buildscript {
     repositories {
         mavenCentral()
         google()
+        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
     }
 
     dependencies {
@@ -118,7 +119,7 @@ subprojects {
     repositories {
         mavenCentral()
         google()
+        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
         if (hasModule("hms", false)) maven {url 'https://developer.huawei.com/repo/'}
     }
 }
-
diff --git a/firebase-auth/core/src/main/AndroidManifest.xml b/firebase-auth/core/src/main/AndroidManifest.xml
index b684a0c298b13ad32491fe9a4b7ddb44e298b71f..4d28aa0376dc0565737131872cb949f473668e89 100644
--- a/firebase-auth/core/src/main/AndroidManifest.xml
+++ b/firebase-auth/core/src/main/AndroidManifest.xml
@@ -19,6 +19,6 @@
             android:name="org.microg.gms.firebase.auth.ReCaptchaActivity"
             android:exported="false"
             android:process=":ui"
-            android:theme="@style/Theme.AppCompat.Light.Dialog.Alert.NoActionBar" />
+            android:theme="@style/Theme.AppCompat.DayNight.Dialog.Alert.NoActionBar" />
     </application>
 </manifest>
diff --git a/gradle.properties b/gradle.properties
index c1cbc518a0cb4a1ed87d7e8ba589613986b2d31f..04b4aa3584830b1d9ed542321f5267ae864da234 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
diff --git a/play-services-base/core/src/main/res/drawable/ic_info_outline.xml b/play-services-base/core/src/main/res/drawable/ic_info_outline.xml
index 093c73f6f0430fc558a87e29ec38b001d0f2c46b..0850eaa3a91b5e0f0245b66a9069a5a7963be9ef 100644
--- a/play-services-base/core/src/main/res/drawable/ic_info_outline.xml
+++ b/play-services-base/core/src/main/res/drawable/ic_info_outline.xml
@@ -8,7 +8,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="?android:attr/textColorSecondary"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/play-services-base/core/src/main/res/values/themes.xml b/play-services-base/core/src/main/res/values/themes.xml
index a125f9cfa31e8032d35f1d7343b2180cb6a70709..d19e7949046e28afea940e8f9346fe40336d4c7f 100644
--- a/play-services-base/core/src/main/res/values/themes.xml
+++ b/play-services-base/core/src/main/res/values/themes.xml
@@ -44,12 +44,16 @@
     <style name="Theme.App.Light.Dialog.Alert.NoActionBar" parent="Theme.Base.Light.Dialog.Alert.NoActionBar" />
 
     <!-- compatibility -->
-
     <style name="Theme.AppCompat.Light.Dialog.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="Theme.AppCompat.DayNight.Dialog.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <style name="Theme.AppCompat.Light.Dialog.Alert.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -72,7 +76,6 @@
     </style>
 
     <!-- Switch Bar -->
-
     <declare-styleable name="PreferenceTheme">
         <attr format="reference" name="switchBarPreferenceStyle"/>
     </declare-styleable>
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index a2bdcd4a8d3b3300c33f8ffe1140c2cde2b5c36d..de0e9f540b979956279cf8e550d2412acc2436b0 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -90,6 +90,7 @@ dependencies {
 
     implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation 'foundation.e:elib:0.0.1-alpha11'
 }
 
 android {
@@ -138,11 +139,57 @@ android {
         disable 'MissingTranslation', 'GetLocales', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'UniquePermission'
     }
 
+    signingConfigs {
+
+        def keystore_password = System.getenv('KEYSTORE_PASSWORD')
+
+        releaseTest {
+            storeFile file("e.keystore")
+            storePassword keystore_password
+            keyAlias 'platform.test'
+            keyPassword keystore_password
+        }
+
+        releaseDev {
+            storeFile file("e.keystore")
+            storePassword keystore_password
+            keyAlias 'platform.dev'
+            keyPassword keystore_password
+        }
+
+        releaseStable {
+            storeFile file("e.keystore")
+            storePassword keystore_password
+            keyAlias 'platform.stable'
+            keyPassword keystore_password
+        }
+    }
+
+
     buildTypes {
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        releaseTest {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.releaseTest
+        }
+
+        releaseDev {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.releaseDev
+        }
+
+        releaseStable {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.releaseStable
+        }
     }
 
     flavorDimensions = ['maps', 'target']
diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle
index 05126d0abbc4c60f00f3a22e81cd2942ce5e2264..9f04d075ff17abbc8ed9279208677e44b781650e 100644
--- a/play-services-core/microg-ui-tools/build.gradle
+++ b/play-services-core/microg-ui-tools/build.gradle
@@ -42,5 +42,6 @@ android {
 dependencies {
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation "androidx.preference:preference:$preferenceVersion"
+    implementation "foundation.e:elib:0.0.1-alpha11"
 }
 
diff --git a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java
index 5450a7e215993f12c0672edc19829d650f7d67f6..b056e697cc58679f6535bedb7cbd108501178c4f 100644
--- a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java
+++ b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java
@@ -24,11 +24,15 @@ public abstract class AbstractSettingsActivity extends AppCompatActivity {
 
         if (showHomeAsUp) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setHomeButtonEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+
+            getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_arrow_back);
         }
 
-        switchBar = (SwitchBar) findViewById(R.id.switch_bar);
+        switchBar = findViewById(R.id.switch_bar);
 
-        customBarContainer = (ViewGroup) findViewById(R.id.custom_bar);
+        customBarContainer = findViewById(R.id.custom_bar);
         if (customBarLayout != 0) {
             customBarContainer.addView(getLayoutInflater().inflate(customBarLayout, customBarContainer, false));
         }
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml b/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml
index 20909c3aab40214f1cc3d1aade7507d4b6c395d0..c900528a04234efb4059ae63c1e16ab710656903 100644
--- a/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
         android:color="@color/ripple_material_dark">
-    <item android:drawable="@color/switchbar_background_color"/>
+    <item android:drawable="?attr/colorPrimaryDark"/>
 </ripple>
 
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_arrow_back.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1af4469d95395b2fae17b0d7e0bb141c83f74a43
--- /dev/null
+++ b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2019, The Android Open Source Project
+  ~ SPDX-FileCopyrightText: 2020, microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorAccent"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#000"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
index 62ff063e39cd1262dafc46caa433e3da232fc20d..ad5667f929808d8ed87d09a1e058e486e8eceb15 100644
--- a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
@@ -19,7 +19,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="?attr/colorControlNormal"
+        android:tint="?attr/colorAccent"
         android:viewportHeight="24"
         android:viewportWidth="24">
 
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
index 871f6575eb044d7f49f0588e8d32f4101a947f7f..7a0f48df3ecd7b3a3f7d86a5ec8735a3a4c791d0 100644
--- a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
@@ -19,7 +19,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="?attr/colorControlNormal"
+        android:tint="?attr/colorAccent"
         android:viewportHeight="24"
         android:viewportWidth="24">
 
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml
index 9c5aba9c546b7c0cbe4395843204785261325e1f..c70518bb435b392f5213a59b5de547362af1b2cd 100644
--- a/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml
@@ -16,5 +16,5 @@
   -->
 
 <color xmlns:android="http://schemas.android.com/apk/res/android"
-       android:color="@color/switchbar_background_color"/>
+       android:color="?attr/colorPrimaryDark"/>
 
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml b/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml
index 1834310636ba3dddd999190e80b6a3e949983021..d0e3bad4d651c661c5bfe114b7653a92932aeba4 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,17 +35,17 @@
         android:gravity="center_horizontal"
         android:text="@string/about_root_title"
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-        android:textColor="?attr/colorAccent"/>
+        android:textColor="?attr/colorAccent" />
 
     <TextView
         android:id="@android:id/summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:visibility="gone"
         android:text="@string/about_root_summary"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-        android:textColor="?attr/colorAccent"/>
+        android:textColor="?attr/colorAccent"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/about_version"
@@ -62,11 +61,11 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dip"
         android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?attr/listPreferredItemPaddingRight"
         android:paddingTop="16dip"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+        android:paddingRight="?attr/listPreferredItemPaddingRight"
         android:text="@string/about_root_libraries"
-        android:textColor="?attr/colorAccent"/>
+        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+        android:textColor="?attr/colorAccent" />
 
     <LinearLayout
         android:orientation="vertical"
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/app_bar.xml b/play-services-core/microg-ui-tools/src/main/res/layout/app_bar.xml
index f2b071a620825933bc1a09815fe2913c5b703d3e..46fa249ac14206f9a26698ebe1ec36d6498bc183 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/app_bar.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/app_bar.xml
@@ -44,7 +44,8 @@
         android:layout_marginStart="72dp"
         android:gravity="start"
         android:textAlignment="viewStart"
-        android:textColor="?android:attr/textColorPrimaryInverse"/>
+        android:textColor="?android:attr/textColorPrimary"
+        android:theme="@style/TextAppearance.AppCompat.Title.Inverse"/>
 
 </RelativeLayout>
 
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml b/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml
index 8fa73e6446f63e2752e5569db1202c93ad4d3fca..28b6641c5c94687b5dfc42e879bed7393122514c 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml
@@ -50,7 +50,7 @@
                 android:layout_marginEnd="36dp"
                 android:layout_marginRight="36dp"
                 android:src="@android:drawable/ic_dialog_alert"
-                app:tint="?android:attr/textColorPrimaryInverse" />
+                app:tint="?attr/colorAccent" />
 
             <TextView
                 android:id="@android:id/title"
@@ -59,7 +59,7 @@
                 android:layout_weight="1"
                 android:text="Test Condition"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimaryInverse" />
+                android:textColor="?android:attr/textColorPrimary" />
 
             <ImageView
                 android:id="@+id/expand_indicator"
@@ -70,7 +70,7 @@
                 android:focusable="true"
                 android:padding="16dp"
                 android:src="@drawable/ic_expand_more"
-                app:tint="?android:attr/textColorPrimaryInverse" />
+                app:tint="?attr/colorAccent" />
 
         </LinearLayout>
 
@@ -93,13 +93,13 @@
                 android:paddingBottom="16dp"
                 android:text="This condition just exists for testing. This is a summary describing it."
                 android:textAppearance="?attr/textAppearanceListItemSmall"
-                android:textColor="?android:attr/textColorPrimaryInverse" />
+                android:textColor="?android:attr/textColorPrimary" />
 
             <View
                 android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="0.25dp"
-                android:background="@android:color/white" />
+                android:background="?android:attr/divider" />
 
             <androidx.appcompat.widget.ButtonBarLayout
                 android:id="@+id/buttonBar"
@@ -120,7 +120,7 @@
                     android:paddingStart="0dp"
                     android:paddingLeft="0dp"
                     android:text="Fix it!"
-                    android:textColor="?android:attr/textColorPrimaryInverse" />
+                    android:textColor="?attr/colorAccent" />
 
                 <Button
                     android:id="@+id/second_action"
@@ -128,7 +128,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:alpha="0.8"
-                    android:textColor="?android:attr/textColorPrimaryInverse"
+                    android:textColor="?attr/colorAccent"
                     android:visibility="gone" />
 
             </androidx.appcompat.widget.ButtonBarLayout>
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml b/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml
index da3d743ceea09d6eabb1bf162ecc1a5566453c03..36aee84ec6219880168b73f658d225841681e15b 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml
@@ -52,6 +52,7 @@
         android:id="@+id/self_check_result"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:buttonTint="@color/e_alpha_accent"
         android:focusable="false"
         android:gravity="right|center_vertical"
         android:paddingTop="5dp"/>
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/settings_activity.xml b/play-services-core/microg-ui-tools/src/main/res/layout/settings_activity.xml
index acc78dc5e6807d494d11640748693d4271aeed3c..25e65c1014c4bb243b4efccfb750715519984908 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/settings_activity.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/settings_activity.xml
@@ -30,7 +30,7 @@
         android:id="@+id/switch_bar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@color/switchbar_background_color"
+        android:background="?attr/colorPrimaryDark"
         android:visibility="gone"/>
 
     <FrameLayout
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/switch_bar.xml b/play-services-core/microg-ui-tools/src/main/res/layout/switch_bar.xml
index 224fdf66b0c01ce60cc6755fee2609e2df3730fa..7b3e6295a7653315c89a1c1d66aec139f3d52243 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/switch_bar.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/switch_bar.xml
@@ -29,7 +29,8 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:text="@string/v7_preference_on"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title.Inverse"/>
+        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:theme="@style/TextAppearance.AppCompat.Title.Inverse"/>
 
     <org.microg.tools.ui.ToggleSwitch
         android:id="@+id/switch_widget"
diff --git a/play-services-core/microg-ui-tools/src/main/res/values/colors.xml b/play-services-core/microg-ui-tools/src/main/res/values/colors.xml
index 418f017cddc5080c8f45fdf5bad83e9931bebcf1..5214b61bf324cb67c59a55d8662a2e416a733247 100644
--- a/play-services-core/microg-ui-tools/src/main/res/values/colors.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2024 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,10 +15,69 @@
   -->
 
 <resources>
-    <color name="settings_theme_primary">#ff263238</color>
-    <color name="settings_theme_primary_dark">#ff21272b</color>
-    <color name="settings_theme_accent">#ff009688</color>
+    <color name="login_blue_theme_primary">@color/e_action_bar</color>
+    <color name="login_blue_theme_primary_dark">@color/e_action_bar</color>
+    <color name="login_blue_theme_accent">@color/e_accent</color>
 
-    <color name="switchbar_background_color">#ff37474f</color>
-    <color name="switch_accent_color">#ff7fcac3</color>
+    <color name="background_color">@color/e_background</color>
+    <color name="foreground_color">@color/e_floating_background</color>
+    <color name="primary_text_color">@color/e_primary_text_color</color>
+    <color name="secondary_text_color">@color/e_secondary_text_color</color>
+    <color name="divider_color">@color/e_divider_color</color>
+    <color name="view_on_accent_color">@color/e_background</color>
+
+    <color name="dialog_border_color">@color/e_divider_color</color>
+    <color name="material_error">@color/e_error</color>
+
+    <color name="settings_theme_accent">@color/e_accent</color>
+    <color name="settings_theme_primary_dark">@color/e_action_bar</color>
+
+    <color name="gm3_ref_palette_error10">#ff410e0b</color>
+    <color name="gm3_ref_palette_error100">#ffffffff</color>
+    <color name="gm3_ref_palette_error20">#ff601410</color>
+    <color name="gm3_ref_palette_error30">#ff8c1d18</color>
+    <color name="gm3_ref_palette_error40">#ffb3261e</color>
+    <color name="gm3_ref_palette_error60">#ffe46962</color>
+    <color name="gm3_ref_palette_error80">#fff2b8b5</color>
+    <color name="gm3_ref_palette_error90">#fff9dedc</color>
+    <color name="gm3_ref_palette_grey30">#ff474747</color>
+    <color name="gm3_ref_palette_grey50">#ff757575</color>
+    <color name="gm3_ref_palette_neutral10">#ff1f1f1f</color>
+    <color name="gm3_ref_palette_neutral100">#ffffffff</color>
+    <color name="gm3_ref_palette_neutral20">#ff303030</color>
+    <color name="gm3_ref_palette_neutral6">#ff131314</color>
+    <color name="gm3_ref_palette_neutral90">#ffe3e3e3</color>
+    <color name="gm3_ref_palette_neutral95">#fff2f2f2</color>
+    <color name="gm3_ref_palette_neutral_variant20">#ff2d312f</color>
+    <color name="gm3_ref_palette_neutral_variant30">#ff444746</color>
+    <color name="gm3_ref_palette_neutral_variant40">#ff5c5f5e</color>
+    <color name="gm3_ref_palette_neutral_variant50">#ff747775</color>
+    <color name="gm3_ref_palette_neutral_variant60">#ff8e918f</color>
+    <color name="gm3_ref_palette_neutral_variant70">#ffa9acaa</color>
+    <color name="gm3_ref_palette_neutral_variant80">#ffc4c7c5</color>
+    <color name="gm3_ref_palette_neutral_variant90">#ffe1e3e1</color>
+    <color name="gm3_ref_palette_primary10">#ff041e49</color>
+    <color name="gm3_ref_palette_primary100">#ffffffff</color>
+    <color name="gm3_ref_palette_primary20">#ff062e6f</color>
+    <color name="gm3_ref_palette_primary30">#ff0842a0</color>
+    <color name="gm3_ref_palette_primary40">#ff0b57d0</color>
+    <color name="gm3_ref_palette_primary70">#ff7cacf8</color>
+    <color name="gm3_ref_palette_primary80">#ffa8c7fa</color>
+    <color name="gm3_ref_palette_primary90">#ffd3e3fd</color>
+    <color name="gm3_ref_palette_secondary10">#ff001d35</color>
+    <color name="gm3_ref_palette_secondary100">#ffffffff</color>
+    <color name="gm3_ref_palette_secondary20">#ff003355</color>
+    <color name="gm3_ref_palette_secondary30">#ff004a77</color>
+    <color name="gm3_ref_palette_secondary40">#ff00639b</color>
+    <color name="gm3_ref_palette_secondary70">#ff5ab3f0</color>
+    <color name="gm3_ref_palette_secondary80">#ff7fcfff</color>
+    <color name="gm3_ref_palette_secondary90">#ffc2e7ff</color>
+    <color name="gm3_ref_palette_tertiary10">#ff072711</color>
+    <color name="gm3_ref_palette_tertiary100">#ffffffff</color>
+    <color name="gm3_ref_palette_tertiary20">#ff0a3818</color>
+    <color name="gm3_ref_palette_tertiary30">#ff0f5223</color>
+    <color name="gm3_ref_palette_tertiary40">#ff146c2e</color>
+    <color name="gm3_ref_palette_tertiary80">#ff6dd58c</color>
+    <color name="gm3_ref_palette_tertiary90">#ffc4eed0</color>
+    <color name="gm3_ref_palette_white">#ffffffff</color>
 </resources>
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 24455235f8cf358a1c387742f6899bfd8329914c..9072ad990ef7b8338c2248e8bddb4dda6ce0026a 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -167,7 +167,7 @@
         android:label="@string/gms_app_name"
         android:multiArch="true"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:theme="@style/Theme.App">
+        android:theme="@style/AppTheme">
 
         <library android:name="com.google.android.gms" />
 
@@ -185,7 +185,7 @@
             android:exported="true"
             android:label="@string/pick_place_title"
             android:process=":ui"
-            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="com.google.android.gms.location.places.ui.PICK_PLACE" />
 
@@ -411,8 +411,7 @@
             android:name="org.microg.gms.auth.login.LoginActivity"
             android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
             android:exported="true"
-            android:process=":ui"
-            android:theme="@style/Theme.LoginBlue">
+            android:process=":ui">
             <intent-filter>
                 <action android:name="com.google.android.gms.auth.login.LOGIN" />
 
@@ -571,6 +570,7 @@
         <!-- microG Settings activity -->
         <activity
             android:name="org.microg.gms.ui.MainSettingsActivity"
+            android:theme="@style/AppTheme"
             android:icon="@mipmap/ic_app_settings"
             android:label="@string/gms_settings_name"
             android:process=":ui"
@@ -620,28 +620,6 @@
             android:roundIcon="@mipmap/ic_app_settings"
             android:taskAffinity="org.microg.gms.settings" />
 
-        <!-- microG Settings embedded in System Settings on SDK 23 and newer -->
-        <activity-alias
-            android:name="org.microg.gms.ui.SettingsActivityLink"
-            android:icon="@mipmap/ic_app_settings"
-            android:label="@string/gms_settings_name"
-            android:process=":ui"
-            android:targetActivity="org.microg.gms.ui.MainSettingsActivity"
-            android:taskAffinity="org.microg.gms.settings">
-            <intent-filter>
-                <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
-            </intent-filter>
-
-            <meta-data
-                android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
-            <meta-data
-                android:name="com.android.settings.icon"
-                android:resource="@drawable/ic_app_settings_system" />
-            <meta-data
-                android:name="com.android.settings.summary"
-                android:resource="@string/gms_settings_summary" />
-        </activity-alias>
 
         <!-- microG Settings activity-alias for Google settings compatibility -->
         <activity-alias
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
index 451cd2bc7517801c0fc34b7b1a8bff67b85c43c2..1ef5a45615f81e61b1b2cb3456f952d2a233ddc6 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
@@ -83,7 +83,7 @@ PlacePickerActivity extends AppCompatActivity /*implements Map.UpdateListener*/
 
         setContentView(R.layout.pick_place);
 
-        Toolbar toolbar = (Toolbar) findViewById(org.microg.tools.ui.R.id.toolbar);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setDisplayShowHomeEnabled(true);
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt
index 529e10371babadfdadbcf5a55ec9f910846c3c92..cb5ad7b1b9f92ecc194c8010d55428fbee0ec3c3 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt
@@ -20,6 +20,10 @@ import org.microg.gms.safetynet.SafetyNetPreferences
 import org.microg.gms.ui.settings.SettingsProvider
 import org.microg.gms.ui.settings.getAllSettingsProviders
 import org.microg.tools.ui.ResourceSettingsFragment
+import android.content.Intent
+import android.net.Uri
+import com.google.android.gms.BuildConfig
+import java.util.Locale
 
 class SettingsFragment : ResourceSettingsFragment() {
     private val createdPreferences = mutableListOf<Preference>()
@@ -99,6 +103,12 @@ class SettingsFragment : ResourceSettingsFragment() {
         return this
     }
 
+    private fun openBrowserAt(url: String) {
+        val intent = Intent(Intent.ACTION_VIEW)
+        intent.data = Uri.parse(url)
+        startActivity(intent)
+    }
+
     override fun onResume() {
         super.onResume()
         val context = requireContext()
diff --git a/play-services-core/src/main/res/drawable/ic_add_account.xml b/play-services-core/src/main/res/drawable/ic_add_account.xml
index 0056e68bbb23ad0cdd850d4f2206e6cffb794549..456ca65517a6d2dba4de7fa28a883bf4946fe0b7 100644
--- a/play-services-core/src/main/res/drawable/ic_add_account.xml
+++ b/play-services-core/src/main/res/drawable/ic_add_account.xml
@@ -7,7 +7,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/e_icon_color"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/play-services-core/src/main/res/drawable/ic_arrow_back.xml b/play-services-core/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1af4469d95395b2fae17b0d7e0bb141c83f74a43
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2019, The Android Open Source Project
+  ~ SPDX-FileCopyrightText: 2020, microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorAccent"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#000"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
diff --git a/play-services-core/src/main/res/drawable/ic_certificate.xml b/play-services-core/src/main/res/drawable/ic_certificate.xml
index 6b17fdd5731924558b0d6fb033421a6c4bb5216f..a6d3c87eb4fc8b902e841317a671bb4b2f53dd67 100644
--- a/play-services-core/src/main/res/drawable/ic_certificate.xml
+++ b/play-services-core/src/main/res/drawable/ic_certificate.xml
@@ -7,7 +7,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/e_icon_color"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/play-services-core/src/main/res/drawable/ic_cloud_bell.xml b/play-services-core/src/main/res/drawable/ic_cloud_bell.xml
index f447825975171d1e403210de10a8f9ffa2541af9..69be4d166f734dee36ee298b196a8df51b40ea99 100644
--- a/play-services-core/src/main/res/drawable/ic_cloud_bell.xml
+++ b/play-services-core/src/main/res/drawable/ic_cloud_bell.xml
@@ -7,7 +7,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/e_icon_color"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/play-services-core/src/main/res/drawable/ic_device_login.xml b/play-services-core/src/main/res/drawable/ic_device_login.xml
index f6eef50836dcbd8389d09cbfa9add6cc98c6959b..67796d953e8b18f3b494719f127459708711c417 100644
--- a/play-services-core/src/main/res/drawable/ic_device_login.xml
+++ b/play-services-core/src/main/res/drawable/ic_device_login.xml
@@ -7,7 +7,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/e_icon_color"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/play-services-core/src/main/res/drawable/ic_manage_accounts.xml b/play-services-core/src/main/res/drawable/ic_manage_accounts.xml
index 249a49ca97a0b6b640c9aed9d279b689980d292d..6cf2c4e5ff9d4def4ddc7d6919ce2a0f4ea57c11 100644
--- a/play-services-core/src/main/res/drawable/ic_manage_accounts.xml
+++ b/play-services-core/src/main/res/drawable/ic_manage_accounts.xml
@@ -5,7 +5,7 @@
   -->
 
 <vector android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/e_icon_color"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
diff --git a/play-services-core/src/main/res/drawable/ic_map_marker.xml b/play-services-core/src/main/res/drawable/ic_map_marker.xml
index 14f6d93b89ac3c2577462d28ddff6ba6513828ba..2bcbdcf96d61392bdf2ce8782fa9c5ea8faa822c 100644
--- a/play-services-core/src/main/res/drawable/ic_map_marker.xml
+++ b/play-services-core/src/main/res/drawable/ic_map_marker.xml
@@ -7,7 +7,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/e_icon_color"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/play-services-core/src/main/res/drawable/ic_shop.xml b/play-services-core/src/main/res/drawable/ic_shop.xml
index cbbbcaeeb8920382a91f2160dc893ce427c39dfd..5fc868dc8fa674f63d60c1b9155ad853a9402a4d 100644
--- a/play-services-core/src/main/res/drawable/ic_shop.xml
+++ b/play-services-core/src/main/res/drawable/ic_shop.xml
@@ -10,7 +10,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="@color/e_icon_color">
   <path
       android:fillColor="#000"
       android:pathData="M16,6L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L2,6v13c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6h-6zM10,4h4v2h-4L10,4zM9,18L9,9l7.5,4L9,18z"/>
diff --git a/play-services-core/src/main/res/layout/ask_gcm.xml b/play-services-core/src/main/res/layout/ask_gcm.xml
index 975afa7b942d5de4e478c02f881a9ce8181da75d..8359a4635cb73188025f7c292e77d1f18a53bfc1 100644
--- a/play-services-core/src/main/res/layout/ask_gcm.xml
+++ b/play-services-core/src/main/res/layout/ask_gcm.xml
@@ -24,7 +24,7 @@
         android:id="@+id/dialog_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/colorBackground"
+        android:background="@color/background_color"
         android:divider="?attr/dividerHorizontal"
         android:orientation="vertical"
         android:showDividers="middle">
@@ -74,6 +74,7 @@
                 android:background="?android:attr/selectableItemBackground"
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
+                android:textColor="@color/settings_theme_accent"
                 android:text="@string/allow">
             </Button>
 
@@ -84,6 +85,7 @@
                 android:background="?android:attr/selectableItemBackground"
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
+                android:textColor="@color/settings_theme_accent"
                 android:text="@string/deny">
             </Button>
 
diff --git a/play-services-core/src/main/res/layout/ask_permission.xml b/play-services-core/src/main/res/layout/ask_permission.xml
index 7795e13fc9c1a7f045eff7dd21cc90077f9e395d..a30c74eeb9ae9e6b4f0ec4ad070f2899b14a6dad 100644
--- a/play-services-core/src/main/res/layout/ask_permission.xml
+++ b/play-services-core/src/main/res/layout/ask_permission.xml
@@ -24,7 +24,7 @@
         android:gravity="center_horizontal"
         android:paddingTop="10dp"
         android:text="@string/account_manager_title"
-        android:textColor="?attr/colorPrimary"
+        android:textColor="@color/primary_text_color"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
@@ -62,6 +62,7 @@
 
             <de.hdodenhof.circleimageview.CircleImageView
                 android:src="@drawable/ic_generic_man"
+                android:tint="@color/settings_theme_accent"
                 android:id="@+id/account_photo"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
@@ -102,7 +103,7 @@
 
     <TextView
         android:padding="10dp"
-        android:textColor="?attr/colorPrimary"
+        android:textColor="@color/primary_text_color"
         android:textSize="12sp"
         android:text="@string/ask_permission_tos"
         android:layout_width="match_parent"
@@ -121,6 +122,7 @@
             android:id="@android:id/button2"
             style="?attr/buttonBarButtonStyle"
             android:text="@string/deny"
+            android:textColor="@color/settings_theme_accent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
@@ -128,6 +130,7 @@
             android:id="@android:id/button1"
             style="?attr/buttonBarButtonStyle"
             android:text="@string/allow"
+            android:textColor="@color/settings_theme_accent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </LinearLayout>
diff --git a/play-services-core/src/main/res/layout/ask_permission_list_entry.xml b/play-services-core/src/main/res/layout/ask_permission_list_entry.xml
index dbc58106a3f974caa69dd8610b4a0a399119a343..e687698dc12ae45383a8a194f0598df779201f2b 100644
--- a/play-services-core/src/main/res/layout/ask_permission_list_entry.xml
+++ b/play-services-core/src/main/res/layout/ask_permission_list_entry.xml
@@ -15,6 +15,7 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:padding="5dp"
     android:layout_width="match_parent"
@@ -22,6 +23,7 @@
 
     <ImageView
         android:src="@drawable/proprietary_auth_ic_scope_icon_default"
+        app:tint="@color/settings_theme_accent"
         android:id="@android:id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
@@ -35,6 +37,7 @@
         <TextView
             android:textSize="16sp"
             android:id="@android:id/text1"
+            android:textColor="@color/primary_text_color"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
@@ -42,6 +45,7 @@
             android:textSize="12sp"
             android:visibility="gone"
             android:id="@android:id/text2"
+            android:textColor="@color/secondary_text_color"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </LinearLayout>
diff --git a/play-services-core/src/main/res/layout/games_info.xml b/play-services-core/src/main/res/layout/games_info.xml
index 29b5e794a7de14c939ee7ff4ca28b72b3686c48d..65978db8c469423466a632bfb28832abe22d9734 100644
--- a/play-services-core/src/main/res/layout/games_info.xml
+++ b/play-services-core/src/main/res/layout/games_info.xml
@@ -27,7 +27,7 @@
         android:gravity="center_horizontal"
         android:paddingTop="10dp"
         android:text="@string/games_title"
-        android:textColor="?attr/colorPrimary"/>
+        android:textColor="@color/primary_text_color"/>
 
     <View
         android:id="@+id/no_progress_bar"
@@ -103,6 +103,7 @@
             style="?attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textColor="@color/settings_theme_accent"
             android:text="@android:string/ok"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/login_assistant.xml b/play-services-core/src/main/res/layout/login_assistant.xml
index d59a1b1a57ccd7e020090f89f5c55bbecfaf6f9f..de69686beaa06ebe2e42ce86723f7e636d3b5ddb 100644
--- a/play-services-core/src/main/res/layout/login_assistant.xml
+++ b/play-services-core/src/main/res/layout/login_assistant.xml
@@ -29,7 +29,7 @@
             android:id="@+id/title_container"
             android:layout_width="match_parent"
             android:layout_height="64dp"
-            android:background="?attr/colorPrimary">
+            android:background="?attr/colorPrimaryDark">
 
             <TextView
                 android:id="@+id/title"
@@ -40,8 +40,7 @@
                 android:layout_marginRight="20dp"
                 android:text="@string/just_a_sec"
                 android:textColor="@color/primary_text_default_material_dark"
-                android:textSize="24sp"
-                android:paddingLeft="18dp" />
+                android:textSize="24sp"/>
         </RelativeLayout>
 
         <FrameLayout
@@ -63,7 +62,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="54dip"
-            android:background="#e4e7e9">
+            android:background="@color/settings_theme_primary_dark">
 
             <Button
                 android:id="@+id/back_button"
@@ -76,6 +75,7 @@
                 android:paddingLeft="38dp"
                 android:paddingRight="38dp"
                 android:textAllCaps="true"
+                android:textColor="@color/settings_theme_accent"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textSize="16sp"/>
 
@@ -90,9 +90,10 @@
                 android:paddingLeft="38dp"
                 android:paddingRight="38dp"
                 android:textAllCaps="true"
+                android:textColor="@color/settings_theme_accent"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textSize="16sp"/>
         </RelativeLayout>
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/play-services-core/src/main/res/layout/login_assistant_loading.xml b/play-services-core/src/main/res/layout/login_assistant_loading.xml
index 697f91a858005bd90d7f1df09d14c5bb36bd9488..28232a7279757f40f25ee990993302b6261c671d 100644
--- a/play-services-core/src/main/res/layout/login_assistant_loading.xml
+++ b/play-services-core/src/main/res/layout/login_assistant_loading.xml
@@ -34,5 +34,6 @@
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:id="@+id/description_text"
+        android:textColor="@color/primary_text_color"
         style="?attr/textAppearanceListItem" />
 </LinearLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/pick_place.xml b/play-services-core/src/main/res/layout/pick_place.xml
index 5c74e847a3c4d260c7a183817f0a44e3d8e36aaa..d80112763eb0e5922c9a7103e2f265eebe283988 100644
--- a/play-services-core/src/main/res/layout/pick_place.xml
+++ b/play-services-core/src/main/res/layout/pick_place.xml
@@ -96,7 +96,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="#fff1f1f1"
+        android:background="@color/foreground_color"
         android:focusable="false"
         android:orientation="vertical"
         android:paddingLeft="8.0dip"
@@ -111,7 +111,7 @@
             android:text="@string/place_picker_nearby_places"
             android:textAllCaps="true"
             android:textAppearance="?android:textAppearanceSmall"
-            android:textColor="#ff7f7f7f"
+            android:textColor="@color/primary_text_color"
             android:textStyle="bold"/>
 
         <RelativeLayout
@@ -126,7 +126,7 @@
                 android:padding="16.0dip"
                 android:text="Can't load nearby places."
                 android:textAppearance="?android:textAppearanceLarge"
-                android:textColor="#ff7f7f7f"/>
+                android:textColor="@color/secondary_text_color"/>
         </RelativeLayout>
     </LinearLayout>
 
diff --git a/play-services-core/src/main/res/layout/settings_root_activity.xml b/play-services-core/src/main/res/layout/settings_root_activity.xml
index 6f6a2d295be11c34f4155c94023b22e1f5b7159a..986585664b4be389a0f059d95d3e225e2d3abb5d 100644
--- a/play-services-core/src/main/res/layout/settings_root_activity.xml
+++ b/play-services-core/src/main/res/layout/settings_root_activity.xml
@@ -17,12 +17,14 @@
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             style="?attr/collapsingToolbarLayoutLargeStyle"
+            android:background="@color/e_background"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
+                android:background="@color/e_background"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 app:layout_collapseMode="pin" />
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/toolbar.xml b/play-services-core/src/main/res/layout/toolbar.xml
similarity index 85%
rename from play-services-core/microg-ui-tools/src/main/res/layout/toolbar.xml
rename to play-services-core/src/main/res/layout/toolbar.xml
index 768f2c351df6897face29981d57dbd965af1c574..97dfb726e670081259afa5e17eaa2529cb39649b 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/toolbar.xml
+++ b/play-services-core/src/main/res/layout/toolbar.xml
@@ -19,6 +19,5 @@
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary"
-    android:minHeight="?attr/actionBarSize"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+    android:background="?attr/colorPrimaryDark" 
+    android:minHeight="?attr/actionBarSize" />
diff --git a/play-services-core/src/main/res/values-night-v23/themes.xml b/play-services-core/src/main/res/values-night-v23/themes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cc91f204681585e2b70cc4a9b34c7c5e7c92ea82
--- /dev/null
+++ b/play-services-core/src/main/res/values-night-v23/themes.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/login_blue_theme_primary</item>
+        <item name="colorPrimaryDark">@color/login_blue_theme_primary_dark
+        </item>
+        <item name="colorAccent">@color/login_blue_theme_accent</item>
+        <item name="android:textColorPrimary">@color/primary_text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="android:textColorPrimaryInverse">@color/view_on_accent_color</item>
+        <item name="android:windowBackground">@color/background_color</item>
+        <item name="colorControlActivated">@color/settings_theme_accent</item>
+        <item name="colorButtonNormal">@color/e_icon_color</item>
+        <item name="colorControlHighlight">@color/e_alpha_accent</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="homeAsUpIndicator">@drawable/e_ic_back</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
+        <item name="android:popupBackground">@color/foreground_color</item>
+        <item name="android:divider">@color/divider_color</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/background_color</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/values-night-v31/themes.xml b/play-services-core/src/main/res/values-night-v31/themes.xml
index 96ab184f334ddb3c3cff0f07586b6d756f6b857d..5b3bee486b35449240d3cbeffc5e4f3f57dcde32 100644
--- a/play-services-core/src/main/res/values-night-v31/themes.xml
+++ b/play-services-core/src/main/res/values-night-v31/themes.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.App" parent="Theme.Base.DayNight.NoActionBar" />
+    <style name="Theme.App" parent="Theme.Material3.DayNight.NoActionBar" />
 </resources>
diff --git a/play-services-core/src/main/res/values-night-v8/themes.xml b/play-services-core/src/main/res/values-night-v8/themes.xml
deleted file mode 100644
index 8a6ebbe9feca7179ca54e2602ca404ef9477ee9c..0000000000000000000000000000000000000000
--- a/play-services-core/src/main/res/values-night-v8/themes.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ SPDX-FileCopyrightText: 2024 microG Project Team
-  ~ SPDX-License-Identifier: Apache-2.0
-  -->
-
-<resources>
-    <style name="Theme.Base.DayNight" parent="Theme.Base.Dark" />
-    <style name="Theme.Base.DayNight.NoActionBar" parent="Theme.Base.Dark.NoActionBar" />
-
-    <style name="Theme.App" parent="Theme.Base.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/gm3_ref_palette_primary80</item>
-        <item name="colorOnPrimary">@color/gm3_ref_palette_primary20</item>
-        <item name="colorPrimaryContainer">@color/gm3_ref_palette_primary30</item>
-        <item name="colorOnPrimaryContainer">@color/gm3_ref_palette_primary90</item>
-        <item name="colorPrimaryInverse">@color/gm3_ref_palette_primary40</item>
-        <item name="colorPrimaryFixed">@color/gm3_ref_palette_primary90</item>
-        <item name="colorPrimaryFixedDim">@color/gm3_ref_palette_primary80</item>
-        <item name="colorOnPrimaryFixed">@color/gm3_ref_palette_primary10</item>
-        <item name="colorOnPrimaryFixedVariant">@color/gm3_ref_palette_primary30</item>
-        <item name="colorSecondary">@color/gm3_ref_palette_secondary80</item>
-        <item name="colorOnSecondary">@color/gm3_ref_palette_secondary20</item>
-        <item name="colorSecondaryContainer">@color/gm3_ref_palette_secondary30</item>
-        <item name="colorOnSecondaryContainer">@color/gm3_ref_palette_secondary90</item>
-        <item name="colorSecondaryFixed">@color/gm3_ref_palette_secondary90</item>
-        <item name="colorSecondaryFixedDim">@color/gm3_ref_palette_secondary80</item>
-        <item name="colorOnSecondaryFixed">@color/gm3_ref_palette_secondary10</item>
-        <item name="colorOnSecondaryFixedVariant">@color/gm3_ref_palette_secondary30</item>
-        <item name="colorTertiary">@color/gm3_ref_palette_tertiary80</item>
-        <item name="colorOnTertiary">@color/gm3_ref_palette_tertiary20</item>
-        <item name="colorTertiaryContainer">@color/gm3_ref_palette_tertiary30</item>
-        <item name="colorOnTertiaryContainer">@color/gm3_ref_palette_tertiary90</item>
-        <item name="colorTertiaryFixed">@color/gm3_ref_palette_tertiary90</item>
-        <item name="colorTertiaryFixedDim">@color/gm3_ref_palette_tertiary80</item>
-        <item name="colorOnTertiaryFixed">@color/gm3_ref_palette_tertiary10</item>
-        <item name="colorOnTertiaryFixedVariant">@color/gm3_ref_palette_tertiary30</item>
-
-        <item name="colorError">@color/gm3_ref_palette_error80</item>
-        <item name="colorOnError">@color/gm3_ref_palette_error20</item>
-        <item name="colorErrorContainer">@color/gm3_ref_palette_error30</item>
-        <item name="colorOnErrorContainer">@color/gm3_ref_palette_error90</item>
-        <item name="colorOutline">@color/gm3_ref_palette_neutral_variant60</item>
-        <item name="colorOutlineVariant">@color/gm3_ref_palette_neutral_variant30</item>
-        <item name="android:colorBackground">@color/gm3_ref_palette_neutral6</item>
-        <item name="colorOnBackground">@color/gm3_ref_palette_neutral90</item>
-        <item name="colorSurface">@color/gm3_ref_palette_neutral6</item>
-        <item name="colorOnSurface">@color/gm3_ref_palette_neutral90</item>
-        <item name="colorSurfaceVariant">@color/gm3_ref_palette_neutral_variant30</item>
-        <item name="colorOnSurfaceVariant">@color/gm3_ref_palette_neutral_variant80</item>
-        <item name="colorSurfaceInverse">@color/gm3_ref_palette_neutral90</item>
-        <item name="colorOnSurfaceInverse">@color/gm3_ref_palette_neutral20</item>
-        <item name="colorSurfaceBright">#ff37393b</item>
-        <item name="colorSurfaceDim">@color/gm3_ref_palette_neutral6</item>
-        <item name="colorSurfaceContainer">#ff1e1f20</item>
-        <item name="colorSurfaceContainerLow">#ff1b1b1b</item>
-        <item name="colorSurfaceContainerLowest">#ff0e0e0e</item>
-        <item name="colorSurfaceContainerHigh">#ff282a2c</item>
-        <item name="colorSurfaceContainerHighest">#ff333537</item>
-    </style>
-
-    <!-- TODO: Heavy duplication -->
-    <style name="Theme.App.Translucent" parent="Theme.Base.Translucent">
-        <item name="colorPrimary">@color/gm3_ref_palette_primary80</item>
-        <item name="colorOnPrimary">@color/gm3_ref_palette_primary20</item>
-        <item name="colorPrimaryContainer">@color/gm3_ref_palette_primary30</item>
-        <item name="colorOnPrimaryContainer">@color/gm3_ref_palette_primary90</item>
-        <item name="colorPrimaryInverse">@color/gm3_ref_palette_primary40</item>
-        <item name="colorPrimaryFixed">@color/gm3_ref_palette_primary90</item>
-        <item name="colorPrimaryFixedDim">@color/gm3_ref_palette_primary80</item>
-        <item name="colorOnPrimaryFixed">@color/gm3_ref_palette_primary10</item>
-        <item name="colorOnPrimaryFixedVariant">@color/gm3_ref_palette_primary30</item>
-        <item name="colorSecondary">@color/gm3_ref_palette_secondary80</item>
-        <item name="colorOnSecondary">@color/gm3_ref_palette_secondary20</item>
-        <item name="colorSecondaryContainer">@color/gm3_ref_palette_secondary30</item>
-        <item name="colorOnSecondaryContainer">@color/gm3_ref_palette_secondary90</item>
-        <item name="colorSecondaryFixed">@color/gm3_ref_palette_secondary90</item>
-        <item name="colorSecondaryFixedDim">@color/gm3_ref_palette_secondary80</item>
-        <item name="colorOnSecondaryFixed">@color/gm3_ref_palette_secondary10</item>
-        <item name="colorOnSecondaryFixedVariant">@color/gm3_ref_palette_secondary30</item>
-        <item name="colorTertiary">@color/gm3_ref_palette_tertiary80</item>
-        <item name="colorOnTertiary">@color/gm3_ref_palette_tertiary20</item>
-        <item name="colorTertiaryContainer">@color/gm3_ref_palette_tertiary30</item>
-        <item name="colorOnTertiaryContainer">@color/gm3_ref_palette_tertiary90</item>
-        <item name="colorTertiaryFixed">@color/gm3_ref_palette_tertiary90</item>
-        <item name="colorTertiaryFixedDim">@color/gm3_ref_palette_tertiary80</item>
-        <item name="colorOnTertiaryFixed">@color/gm3_ref_palette_tertiary10</item>
-        <item name="colorOnTertiaryFixedVariant">@color/gm3_ref_palette_tertiary30</item>
-
-        <item name="colorError">@color/gm3_ref_palette_error80</item>
-        <item name="colorOnError">@color/gm3_ref_palette_error20</item>
-        <item name="colorErrorContainer">@color/gm3_ref_palette_error30</item>
-        <item name="colorOnErrorContainer">@color/gm3_ref_palette_error90</item>
-        <item name="colorOutline">@color/gm3_ref_palette_neutral_variant60</item>
-        <item name="colorOutlineVariant">@color/gm3_ref_palette_neutral_variant30</item>
-        <item name="android:colorBackground">@color/gm3_ref_palette_neutral6</item>
-        <item name="colorOnBackground">@color/gm3_ref_palette_neutral90</item>
-        <item name="colorSurface">@color/gm3_ref_palette_neutral6</item>
-        <item name="colorOnSurface">@color/gm3_ref_palette_neutral90</item>
-        <item name="colorSurfaceVariant">@color/gm3_ref_palette_neutral_variant30</item>
-        <item name="colorOnSurfaceVariant">@color/gm3_ref_palette_neutral_variant80</item>
-        <item name="colorSurfaceInverse">@color/gm3_ref_palette_neutral90</item>
-        <item name="colorOnSurfaceInverse">@color/gm3_ref_palette_neutral20</item>
-        <item name="colorSurfaceBright">#ff37393b</item>
-        <item name="colorSurfaceDim">@color/gm3_ref_palette_neutral6</item>
-        <item name="colorSurfaceContainer">#ff1e1f20</item>
-        <item name="colorSurfaceContainerLow">#ff1b1b1b</item>
-        <item name="colorSurfaceContainerLowest">#ff0e0e0e</item>
-        <item name="colorSurfaceContainerHigh">#ff282a2c</item>
-        <item name="colorSurfaceContainerHighest">#ff333537</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/values-v23/themes.xml b/play-services-core/src/main/res/values-v23/themes.xml
index f2f19460c4083366e8a7ad1b031a1c710bd6c71d..514b214851257aa85a33389ed88e804f6a2834a3 100644
--- a/play-services-core/src/main/res/values-v23/themes.xml
+++ b/play-services-core/src/main/res/values-v23/themes.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.Base.Light">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
-    <style name="Theme.Base.Dark">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
 
-    <!-- Preference theme -->
-    <style name="Theme.Base.PreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
-        <item name="switchPreferenceCompatStyle">@style/Theme.Base.Preference.SwitchPreferenceCompat</item>
-        <item name="switchBarPreferenceStyle">@style/Theme.Base.Preference.SwitchBarPreference</item>
+    <style name="AppTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/login_blue_theme_primary</item>
+        <item name="colorPrimaryDark">@color/login_blue_theme_primary_dark
+        </item>
+        <item name="colorAccent">@color/login_blue_theme_accent</item>
+        <item name="android:textColorPrimary">@color/primary_text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="android:textColorPrimaryInverse">@color/view_on_accent_color</item>
+        <item name="android:windowBackground">@color/background_color</item>
+        <item name="colorControlActivated">@color/settings_theme_accent</item>
+        <item name="colorButtonNormal">@color/e_icon_color</item>
+        <item name="colorControlHighlight">@color/e_alpha_accent</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="homeAsUpIndicator">@drawable/e_ic_back</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
+        <item name="android:popupBackground">@color/foreground_color</item>
+        <item name="android:divider">@color/divider_color</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/background_color</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="Theme.Base.Preference.SwitchBarPreference" parent="@style/Preference.SwitchBar">
-        <item name="layout">@layout/preference_material_switch_bar</item>
-        <item name="switchBarFrameId">@id/frame</item>
-        <item name="switchBarFrameBackgroundOn">@drawable/material_switch_bar_background</item>
-        <item name="switchBarFrameBackgroundOff">@drawable/material_switch_bar_background</item>
-        <item name="switchBarFrameBackgroundDisabled">@drawable/material_switch_bar_background_disabled</item>
-    </style>
 </resources>
diff --git a/play-services-core/src/main/res/values-v27/themes.xml b/play-services-core/src/main/res/values-v27/themes.xml
deleted file mode 100644
index 485fce23bb7c8f8ee7cd67e95cd745c2ff2e9b74..0000000000000000000000000000000000000000
--- a/play-services-core/src/main/res/values-v27/themes.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.Base.Light">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowLightNavigationBar">true</item>
-    </style>
-    <style name="Theme.Base.Dark">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowLightNavigationBar">false</item>
-    </style>
-</resources>
diff --git a/play-services-core/src/main/res/values-v31/themes.xml b/play-services-core/src/main/res/values-v31/themes.xml
deleted file mode 100644
index 96ab184f334ddb3c3cff0f07586b6d756f6b857d..0000000000000000000000000000000000000000
--- a/play-services-core/src/main/res/values-v31/themes.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.App" parent="Theme.Base.DayNight.NoActionBar" />
-</resources>
diff --git a/play-services-core/src/main/res/values/bools.xml b/play-services-core/src/main/res/values/bools.xml
index ef602beb61b185f6d57880d7f9b3a4aa19106bc6..f38e2c4c75ee1d44ae63ec556226741c6a1da4ec 100644
--- a/play-services-core/src/main/res/values/bools.xml
+++ b/play-services-core/src/main/res/values/bools.xml
@@ -17,4 +17,5 @@
 
 <resources>
     <bool name="is_gmscore">true</bool>
+    <bool name="is_light_mode">true</bool>
 </resources>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/values/colors.xml b/play-services-core/src/main/res/values/colors.xml
index 5f3632ccd53fb07406d97145de67f5c7f37c8ecd..2b31a3d2c398dba8c5561bbfba192a1e0470ee39 100644
--- a/play-services-core/src/main/res/values/colors.xml
+++ b/play-services-core/src/main/res/values/colors.xml
@@ -15,12 +15,22 @@
   -->
 
 <resources>
-    <color name="login_blue_theme_primary">#ff4285f4</color>
-    <color name="login_blue_theme_primary_dark">#ff3367d6</color>
-    <color name="login_blue_theme_accent">#ffFFAB40</color>
+    <color name="login_blue_theme_primary">@color/e_action_bar</color>
+    <color name="login_blue_theme_primary_dark">@color/e_action_bar</color>
+    <color name="login_blue_theme_accent">@color/e_accent</color>
 
-    <color name="dialog_border_color">#88CCCCCC</color>
-    <color name="material_error">#fff44336</color>
+    <color name="background_color">@color/e_background</color>
+    <color name="foreground_color">@color/e_floating_background</color>
+    <color name="primary_text_color">@color/e_primary_text_color</color>
+    <color name="secondary_text_color">@color/e_secondary_text_color</color>
+    <color name="divider_color">@color/e_divider_color</color>
+    <color name="view_on_accent_color">@color/e_background</color>
+
+    <color name="dialog_border_color">@color/e_divider_color</color>
+    <color name="material_error">@color/e_error</color>
+
+    <color name="settings_theme_accent">@color/e_accent</color>
+    <color name="settings_theme_primary_dark">@color/e_action_bar</color>
 
     <color name="gm3_ref_palette_error10">#ff410e0b</color>
     <color name="gm3_ref_palette_error100">#ffffffff</color>
diff --git a/play-services-core/src/main/res/values/e_strings.xml b/play-services-core/src/main/res/values/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..655cf66d8ef2dc706117831f78a1ea7deb57da43
--- /dev/null
+++ b/play-services-core/src/main/res/values/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_google_account_label" translatable="false">Google microG</string>
+    <string name="service_name_play">Play Store services</string>
+    <string name="allow_connecting_google_servers">Allow connecting to Google servers</string>
+    <string name="connecting_google_servers_summary">If disabled, all connections to Google servers usually done by microG will be denied. This overrides service specific settings.</string>
+    <string name="connect_google_via_tor_network">Connect to Google via Tor network</string>
+    <string name="connect_google_via_tor_network_summary">Requires Orbot to be installed\nNot yet supported</string>
+    <string name="pref_play_summary_licensing_off">Licensing off</string>
+    <string name="pref_play_summary_licensing_on">Licensing on</string>
+    <string name="pref_play_licensing_enable_switch">Answer license verification requests</string>
+    <string name="pref_play_license_enable_summary">Some apps require verification that you have purchased them on Google Play. When requested by an app, microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored.</string>
+</resources>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml
index d8fa90405e0af23ddaf81436cb793baa93083294..9b64e9935d0164e3b8c91e881cfbf7b650d8b77b 100644
--- a/play-services-core/src/main/res/values/themes.xml
+++ b/play-services-core/src/main/res/values/themes.xml
@@ -4,148 +4,32 @@
   -->
 
 <resources>
-
-    <!-- Base application theme -->
-    <style name="Theme.Base" parent="Theme.Material3.DynamicColors.DayNight">
-        <item name="preferenceTheme">@style/Theme.Base.PreferenceThemeOverlay</item>
-    </style>
-
-    <style name="Theme.Base.DayNight" parent="Theme.Base.Light" />
-
-    <style name="Theme.Base.DayNight.NoActionBar" parent="Theme.Base.Light.NoActionBar" />
-
-    <style name="Theme.Base.Dark" />
-
-    <style name="Theme.Base.Dark.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="Theme.Base.Light" />
-
-    <style name="Theme.Base.Light.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="Theme.Base.DayNight.Dialog.Alert" parent="Theme.Material3.DayNight.Dialog.Alert" />
-
-    <!-- Preference theme -->
-    <style name="Theme.Base.PreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
-        <item name="switchPreferenceCompatStyle">@style/Theme.Base.Preference.SwitchPreferenceCompat</item>
-    </style>
-
-    <style name="Theme.Base.Preference.SwitchPreferenceCompat" parent="@style/Preference.SwitchPreferenceCompat.Material">
-        <item name="widgetLayout">@layout/preference_material_switch</item>
-    </style>
-
-    <!-- Application theme (< API23) -->
-    <style name="Theme.App" parent="Theme.Base.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/gm3_ref_palette_primary40</item>
-        <item name="colorOnPrimary">@color/gm3_ref_palette_primary100</item>
-        <item name="colorPrimaryContainer">@color/gm3_ref_palette_primary90</item>
-        <item name="colorOnPrimaryContainer">@color/gm3_ref_palette_primary10</item>
-        <item name="colorPrimaryInverse">@color/gm3_ref_palette_primary80</item>
-        <item name="colorPrimaryFixed">@color/gm3_ref_palette_primary90</item>
-        <item name="colorPrimaryFixedDim">@color/gm3_ref_palette_primary80</item>
-        <item name="colorOnPrimaryFixed">@color/gm3_ref_palette_primary10</item>
-        <item name="colorOnPrimaryFixedVariant">@color/gm3_ref_palette_primary30</item>
-        <item name="colorSecondary">@color/gm3_ref_palette_secondary40</item>
-        <item name="colorOnSecondary">@color/gm3_ref_palette_secondary100</item>
-        <item name="colorSecondaryContainer">@color/gm3_ref_palette_secondary90</item>
-        <item name="colorOnSecondaryContainer">@color/gm3_ref_palette_secondary10</item>
-        <item name="colorSecondaryFixed">@color/gm3_ref_palette_secondary90</item>
-        <item name="colorSecondaryFixedDim">@color/gm3_ref_palette_secondary80</item>
-        <item name="colorOnSecondaryFixed">@color/gm3_ref_palette_secondary10</item>
-        <item name="colorOnSecondaryFixedVariant">@color/gm3_ref_palette_secondary30</item>
-        <item name="colorTertiary">@color/gm3_ref_palette_tertiary40</item>
-        <item name="colorOnTertiary">@color/gm3_ref_palette_tertiary100</item>
-        <item name="colorTertiaryContainer">@color/gm3_ref_palette_tertiary90</item>
-        <item name="colorOnTertiaryContainer">@color/gm3_ref_palette_tertiary10</item>
-        <item name="colorTertiaryFixed">@color/gm3_ref_palette_tertiary90</item>
-        <item name="colorTertiaryFixedDim">@color/gm3_ref_palette_tertiary80</item>
-        <item name="colorOnTertiaryFixed">@color/gm3_ref_palette_tertiary10</item>
-        <item name="colorOnTertiaryFixedVariant">@color/gm3_ref_palette_tertiary30</item>
-
-        <item name="colorError">@color/gm3_ref_palette_error40</item>
-        <item name="colorOnError">@color/gm3_ref_palette_error100</item>
-        <item name="colorErrorContainer">@color/gm3_ref_palette_error90</item>
-        <item name="colorOnErrorContainer">@color/gm3_ref_palette_error10</item>
-        <item name="colorOutline">@color/gm3_ref_palette_neutral_variant50</item>
-        <item name="colorOutlineVariant">@color/gm3_ref_palette_neutral_variant80</item>
-        <item name="android:colorBackground">@color/gm3_ref_palette_neutral100</item>
-        <item name="colorOnBackground">@color/gm3_ref_palette_neutral10</item>
-        <item name="colorSurface">@color/gm3_ref_palette_neutral100</item>
-        <item name="colorOnSurface">@color/gm3_ref_palette_neutral10</item>
-        <item name="colorSurfaceVariant">@color/gm3_ref_palette_neutral_variant90</item>
-        <item name="colorOnSurfaceVariant">@color/gm3_ref_palette_neutral_variant30</item>
-        <item name="colorSurfaceInverse">@color/gm3_ref_palette_neutral20</item>
-        <item name="colorOnSurfaceInverse">@color/gm3_ref_palette_neutral90</item>
-        <item name="colorSurfaceBright">@color/gm3_ref_palette_neutral100</item>
-        <item name="colorSurfaceDim">#ffd3dbe5</item>
-        <item name="colorSurfaceContainer">#fff0f4f9</item>
-        <item name="colorSurfaceContainerLow">#fff8fafd</item>
-        <item name="colorSurfaceContainerLowest">@color/gm3_ref_palette_primary100</item>
-        <item name="colorSurfaceContainerHigh">#ffe9eef6</item>
-        <item name="colorSurfaceContainerHighest">#ffdde3ea</item>
-    </style>
-
-    <!-- TODO: Heavy duplication -->
-    <style name="Theme.App.Translucent" parent="Theme.Base.Translucent">
-        <item name="colorPrimary">@color/gm3_ref_palette_primary40</item>
-        <item name="colorOnPrimary">@color/gm3_ref_palette_primary100</item>
-        <item name="colorPrimaryContainer">@color/gm3_ref_palette_primary90</item>
-        <item name="colorOnPrimaryContainer">@color/gm3_ref_palette_primary10</item>
-        <item name="colorPrimaryInverse">@color/gm3_ref_palette_primary80</item>
-        <item name="colorPrimaryFixed">@color/gm3_ref_palette_primary90</item>
-        <item name="colorPrimaryFixedDim">@color/gm3_ref_palette_primary80</item>
-        <item name="colorOnPrimaryFixed">@color/gm3_ref_palette_primary10</item>
-        <item name="colorOnPrimaryFixedVariant">@color/gm3_ref_palette_primary30</item>
-        <item name="colorSecondary">@color/gm3_ref_palette_secondary40</item>
-        <item name="colorOnSecondary">@color/gm3_ref_palette_secondary100</item>
-        <item name="colorSecondaryContainer">@color/gm3_ref_palette_secondary90</item>
-        <item name="colorOnSecondaryContainer">@color/gm3_ref_palette_secondary10</item>
-        <item name="colorSecondaryFixed">@color/gm3_ref_palette_secondary90</item>
-        <item name="colorSecondaryFixedDim">@color/gm3_ref_palette_secondary80</item>
-        <item name="colorOnSecondaryFixed">@color/gm3_ref_palette_secondary10</item>
-        <item name="colorOnSecondaryFixedVariant">@color/gm3_ref_palette_secondary30</item>
-        <item name="colorTertiary">@color/gm3_ref_palette_tertiary40</item>
-        <item name="colorOnTertiary">@color/gm3_ref_palette_tertiary100</item>
-        <item name="colorTertiaryContainer">@color/gm3_ref_palette_tertiary90</item>
-        <item name="colorOnTertiaryContainer">@color/gm3_ref_palette_tertiary10</item>
-        <item name="colorTertiaryFixed">@color/gm3_ref_palette_tertiary90</item>
-        <item name="colorTertiaryFixedDim">@color/gm3_ref_palette_tertiary80</item>
-        <item name="colorOnTertiaryFixed">@color/gm3_ref_palette_tertiary10</item>
-        <item name="colorOnTertiaryFixedVariant">@color/gm3_ref_palette_tertiary30</item>
-
-        <item name="colorError">@color/gm3_ref_palette_error40</item>
-        <item name="colorOnError">@color/gm3_ref_palette_error100</item>
-        <item name="colorErrorContainer">@color/gm3_ref_palette_error90</item>
-        <item name="colorOnErrorContainer">@color/gm3_ref_palette_error10</item>
-        <item name="colorOutline">@color/gm3_ref_palette_neutral_variant50</item>
-        <item name="colorOutlineVariant">@color/gm3_ref_palette_neutral_variant80</item>
-        <item name="android:colorBackground">@color/gm3_ref_palette_neutral100</item>
-        <item name="colorOnBackground">@color/gm3_ref_palette_neutral10</item>
-        <item name="colorSurface">@color/gm3_ref_palette_neutral100</item>
-        <item name="colorOnSurface">@color/gm3_ref_palette_neutral10</item>
-        <item name="colorSurfaceVariant">@color/gm3_ref_palette_neutral_variant90</item>
-        <item name="colorOnSurfaceVariant">@color/gm3_ref_palette_neutral_variant30</item>
-        <item name="colorSurfaceInverse">@color/gm3_ref_palette_neutral20</item>
-        <item name="colorOnSurfaceInverse">@color/gm3_ref_palette_neutral90</item>
-        <item name="colorSurfaceBright">@color/gm3_ref_palette_neutral100</item>
-        <item name="colorSurfaceDim">#ffd3dbe5</item>
-        <item name="colorSurfaceContainer">#fff0f4f9</item>
-        <item name="colorSurfaceContainerLow">#fff8fafd</item>
-        <item name="colorSurfaceContainerLowest">@color/gm3_ref_palette_primary100</item>
-        <item name="colorSurfaceContainerHigh">#ffe9eef6</item>
-        <item name="colorSurfaceContainerHighest">#ffdde3ea</item>
+    <style name="customOverFlow">
+        <item name="android:src">@drawable/e_ic_more</item>
+        <item name="android:paddingRight">10dp</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
     </style>
 
-    <style name="Theme.LoginBlue" parent="Theme.LoginBlue.Base" />
+    <style name="AppTheme" parent="AppTheme.Base"/>
 
-    <style name="Theme.LoginBlue.Base" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/login_blue_theme_primary</item>
         <item name="colorPrimaryDark">@color/login_blue_theme_primary_dark</item>
         <item name="colorAccent">@color/login_blue_theme_accent</item>
+        <item name="android:textColorPrimary">@color/primary_text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="android:textColorPrimaryInverse">@color/view_on_accent_color</item>
+        <item name="android:windowBackground">@color/background_color</item>
+        <item name="colorControlActivated">@color/settings_theme_accent</item>
+        <item name="colorButtonNormal">@color/e_icon_color</item>
+        <item name="colorControlHighlight">@color/e_icon_color</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="homeAsUpIndicator">@drawable/e_ic_back</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
+        <item name="android:popupBackground">@color/foreground_color</item>
+        <item name="android:divider">@color/divider_color</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/background_color</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 </resources>
diff --git a/play-services-core/src/main/res/xml/authenticator.xml b/play-services-core/src/main/res/xml/authenticator.xml
index 16c7aea522c31868e15be83977ee3bc81c47156a..aa7700b39957aaaa8016a11de48d3eba4f5d0002 100644
--- a/play-services-core/src/main/res/xml/authenticator.xml
+++ b/play-services-core/src/main/res/xml/authenticator.xml
@@ -20,4 +20,4 @@
     android:customTokens="true"
     android:icon="@drawable/proprietary_auth_gls_ic_google_selected"
     android:smallIcon="@drawable/proprietary_auth_gls_ic_google_minitab_selected"
-    android:label="@string/google_account_label" />
+    android:label="@string/e_google_account_label" />
diff --git a/play-services-core/src/main/res/xml/network_security_config.xml b/play-services-core/src/main/res/xml/network_security_config.xml
index 66c225a1fce77a7fc0ff84a2fb7d3ea2b163009a..62cbbf80fd088d325f4fce58e0fa41cabd8ddaec 100644
--- a/play-services-core/src/main/res/xml/network_security_config.xml
+++ b/play-services-core/src/main/res/xml/network_security_config.xml
@@ -9,5 +9,6 @@
         <domain includeSubdomains="true">portal.mav.hu</domain>
         <domain includeSubdomains="true">cdwifi.cz</domain>
         <domain includeSubdomains="true">hsp.hotsplots.net</domain>
+        <domain includeSubdomains="true">192.168.1.65</domain>
     </domain-config>
 </network-security-config>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/xml/preferences_accounts.xml b/play-services-core/src/main/res/xml/preferences_accounts.xml
index 1ea220169fe7aa9541fc6e60bf2a823cafaa70d1..90f0a9f0c2c7f8363f184ef1b35638393d3c1a0a 100644
--- a/play-services-core/src/main/res/xml/preferences_accounts.xml
+++ b/play-services-core/src/main/res/xml/preferences_accounts.xml
@@ -24,25 +24,25 @@
         android:key="prefcat_account_settings"
         android:title="@string/prefcat_accounts_settings_title"
         app:iconSpaceReserved="false">
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:persistent="false"
             android:key="auth_manager_trust_google"
             android:summary="@string/pref_auth_trust_google_summary"
             android:title="@string/pref_auth_trust_google_title"
             app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:persistent="false"
             android:key="auth_manager_visible"
             android:summary="@string/pref_auth_visible_summary"
             android:title="@string/pref_auth_visible_title"
             app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:persistent="false"
             android:key="auth_include_android_id"
             android:summary="@string/pref_auth_include_android_id_summary"
             android:title="@string/pref_auth_include_android_id_title"
             app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:persistent="false"
             android:key="auth_strip_device_name"
             android:summary="@string/pref_auth_strip_device_name_summary"
diff --git a/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml b/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
index bf523ad55c6712a2987b72352e6ead13b66c0d2c..db2ffd93aed79bb5c78b4deb01e12d96346ce1ef 100644
--- a/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
+++ b/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
@@ -7,7 +7,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <SwitchPreferenceCompat
+    <SwitchPreference
         android:defaultValue="false"
         android:persistent="false"
         android:key="gcm_confirm_new_apps"
diff --git a/play-services-core/src/main/res/xml/preferences_google_more.xml b/play-services-core/src/main/res/xml/preferences_google_more.xml
index 988fa5e5c48f32a4c192e29bdb9251bd6c5a3a65..cf91a6f67d622b8d3dd9680fb1c5160beaf1bcd6 100644
--- a/play-services-core/src/main/res/xml/preferences_google_more.xml
+++ b/play-services-core/src/main/res/xml/preferences_google_more.xml
@@ -16,17 +16,17 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreferenceCompat
+    <SwitchPreference
         android:defaultValue="true"
         android:enabled="false"
         android:key="network_google_enabled"
-        android:summary="If disabled, all connections to Google servers usually done by microG will be denied. This overrides service specific settings."
-        android:title="Allow connecting to Google servers"/>
-    <SwitchPreferenceCompat
+        android:summary="@string/connecting_google_servers_summary"
+        android:title="@string/allow_connecting_google_servers"/>
+    <SwitchPreference
         android:defaultValue="false"
         android:dependency="network_google_enabled"
         android:enabled="false"
         android:key="network_google_use_tor"
-        android:summary="Requires Orbot to be installed\nNot yet supported"
-        android:title="Connect to Google via Tor network"/>
-</PreferenceScreen>
\ No newline at end of file
+        android:summary="@string/connect_google_via_tor_network_summary"
+        android:title="@string/connect_google_via_tor_network"/>
+</PreferenceScreen>
diff --git a/play-services-core/src/main/res/xml/preferences_push_notifications_app.xml b/play-services-core/src/main/res/xml/preferences_push_notifications_app.xml
index b81901c42b663a524a638054a4f8cd6a38806f1e..13acf78bb11ed61b4cc647947539c95d973f5d42 100644
--- a/play-services-core/src/main/res/xml/preferences_push_notifications_app.xml
+++ b/play-services-core/src/main/res/xml/preferences_push_notifications_app.xml
@@ -17,7 +17,7 @@
         android:layout="@layout/preference_category_no_label"
         app:iconSpaceReserved="false">
 
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:defaultValue="true"
             android:key="pref_push_app_allow_register"
             android:persistent="false"
@@ -25,7 +25,7 @@
             android:title="@string/pref_push_app_allow_register_title"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:defaultValue="true"
             android:key="pref_push_app_wake_for_delivery"
             android:persistent="false"
diff --git a/play-services-core/src/main/res/xml/preferences_vending.xml b/play-services-core/src/main/res/xml/preferences_vending.xml
index bcee541849b6920d6d295caf681abc9b77df5883..bafdf84be1097ce543b4c04266b85588449f2f38 100644
--- a/play-services-core/src/main/res/xml/preferences_vending.xml
+++ b/play-services-core/src/main/res/xml/preferences_vending.xml
@@ -13,7 +13,7 @@
             android:selectable="false"
             android:summary="@string/pref_vending_license_enable_summary"
             app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:title="@string/pref_vending_licensing_enable_switch"
             android:key="vending_licensing"
             android:persistent="false"
@@ -31,7 +31,7 @@
             android:icon="@drawable/ic_circle_warn"
             android:selectable="false"
             android:summary="@string/pref_vending_billing_note_experimental" />
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:title="@string/pref_vending_billing_enable_switch"
             android:key="vending_iap"
             android:persistent="false"
diff --git a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/GeolocateResponse.kt b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/GeolocateResponse.kt
index b4fc835d3aadf7aa40d936379554d40f6e8d8932..94f9b54701173dbe1f582aabfabfe1b02cc9f727 100644
--- a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/GeolocateResponse.kt
+++ b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/GeolocateResponse.kt
@@ -9,5 +9,6 @@ data class GeolocateResponse(
     val location: ResponseLocation? = null,
     val accuracy: Double? = null,
     val fallback: String? = null,
-    val error: ResponseError? = null
+    val error: ResponseError? = null,
+    val redirectionUrl: String? = null
 )
\ No newline at end of file
diff --git a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt
index e8773cfbac2304ffb29caa65b7d4d741c94967c1..501d858fdff554261a857a28a64bcee943c8f91c 100644
--- a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt
+++ b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt
@@ -10,7 +10,7 @@ import android.location.Location
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
-import com.android.volley.Request.Method
+import com.android.volley.NetworkResponse
 import com.android.volley.VolleyError
 import com.android.volley.toolbox.JsonObjectRequest
 import com.android.volley.toolbox.Volley
@@ -22,6 +22,7 @@ import org.microg.gms.location.network.wifi.WifiDetails
 import org.microg.gms.location.network.wifi.isMoving
 import org.microg.gms.location.provider.BuildConfig
 import org.microg.gms.utils.singleInstanceOf
+import java.net.HttpURLConnection
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -58,19 +59,41 @@ class IchnaeaServiceClient(private val context: Context) {
         val response = rawGeoLocate(request)
         Log.d(TAG, "$request -> $response")
         if (response.location != null) {
-            return Location("ichnaea").apply {
-                latitude = response.location.lat
-                longitude = response.location.lng
-                if (response.accuracy != null) accuracy = response.accuracy.toFloat()
-                if (response.fallback != null) extras = Bundle().apply { putString(LOCATION_EXTRA_FALLBACK, response.fallback) }
+            return buildLocation(response)
+        } else if (response.error?.code == HttpURLConnection.HTTP_MOVED_PERM) {
+            val redirection = rawGeoLocate(request, response.redirectionUrl)
+            if (redirection.location != null) {
+                return buildLocation(redirection)
             }
-        } else if (response.error != null) {
-            throw ServiceException(response.error)
+            throw ServiceException(redirection.error!!)
         } else {
             throw RuntimeException("Invalid response JSON")
         }
     }
 
+    private fun buildLocation(response: GeolocateResponse) : Location {
+        return Location("ichnaea").apply {
+            if (response.location == null) {
+                throw RuntimeException("location is empty")
+            }
+
+            latitude = response.location.lat
+            longitude = response.location.lng
+            if (response.accuracy != null) {
+                accuracy = response.accuracy.toFloat()
+            }
+
+            if (response.fallback != null) {
+                extras = Bundle().apply {
+                    putString(
+                        LOCATION_EXTRA_FALLBACK,
+                        response.fallback
+                    )
+                }
+            }
+        }
+    }
+
     private fun getRequestHeaders(): Map<String, String> = buildMap {
         set("User-Agent", "${BuildConfig.ICHNAEA_USER_AGENT} (Linux; Android ${android.os.Build.VERSION.RELEASE}; ${context.packageName})")
         if (settings.ichnaeaContribute) {
@@ -91,15 +114,38 @@ class IchnaeaServiceClient(private val context: Context) {
             }
         } catch (_: Exception) {
         }
-        if (error.networkResponse != null) {
-            continuation.resume(GeolocateResponse(error = ResponseError(error.networkResponse.statusCode, error.message)))
+
+        if (error.networkResponse == null) {
+            continuation.resumeWithException(error)
             return
         }
-        continuation.resumeWithException(error)
+
+        val redirectionUrl = if (error.networkResponse.statusCode == HttpURLConnection.HTTP_MOVED_PERM) {
+            readRedirectionUrl(error.networkResponse)
+        } else {
+            ""
+        }
+
+        continuation.resume(
+            GeolocateResponse(
+                redirectionUrl = redirectionUrl,
+                error = ResponseError(
+                    error.networkResponse.statusCode,
+                    error.message
+                )
+            )
+        )
+    }
+
+    private fun readRedirectionUrl(response: NetworkResponse): String? {
+        return response.allHeaders?.find { header ->
+            header.name.equals("Location", ignoreCase = true)
+        }?.value
     }
 
-    private suspend fun rawGeoLocate(request: GeolocateRequest): GeolocateResponse = suspendCoroutine { continuation ->
-        val url = Uri.parse(settings.ichneaeEndpoint).buildUpon().appendPath("v1").appendPath("geolocate").build().toString()
+    private suspend fun rawGeoLocate(request: GeolocateRequest, address: String? = null): GeolocateResponse = suspendCoroutine { continuation ->
+        val endpoint = address ?: settings.ichneaeEndpoint
+        val url = Uri.parse(endpoint).buildUpon().appendPath("v1").appendPath("geolocate").build().toString()
         queue.add(object : JsonObjectRequest(Method.POST, url, request.toJson(), {
             continuation.resume(it.toGeolocateResponse())
         }, {
diff --git a/play-services-location/core/src/main/kotlin/org/microg/gms/location/ui/LocationPreferencesFragment.kt b/play-services-location/core/src/main/kotlin/org/microg/gms/location/ui/LocationPreferencesFragment.kt
index 008bbe146ff03324cdfff2353094ddd932e30b1f..02a82963fc21b3d92339d228cfb5555a405e5291 100644
--- a/play-services-location/core/src/main/kotlin/org/microg/gms/location/ui/LocationPreferencesFragment.kt
+++ b/play-services-location/core/src/main/kotlin/org/microg/gms/location/ui/LocationPreferencesFragment.kt
@@ -67,7 +67,7 @@ class LocationPreferencesFragment : PreferenceFragmentCompat() {
         if (item.itemId == MENU_ICHNAEA_URL) {
             val view = layoutInflater.inflate(R.layout.preference_location_custom_url, null)
             view.findViewById<EditText>(android.R.id.edit).setText(LocationSettings(requireContext()).ichneaeEndpoint)
-            requireContext().buildAlertDialog()
+            MaterialAlertDialogBuilder(requireContext(), R.style.AlertDialog)
                 .setTitle(R.string.pref_location_custom_url_title)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     LocationSettings(requireContext()).ichneaeEndpoint = view.findViewById<EditText>(android.R.id.edit).text.toString()
diff --git a/play-services-location/core/src/main/res/values/themes.xml b/play-services-location/core/src/main/res/values/themes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8dd788b3bb4c56a4257be677091ca038bd7ef9c0
--- /dev/null
+++ b/play-services-location/core/src/main/res/values/themes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2024, microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<resources>
+    <style name="AlertDialog" parent="Theme.AppCompat.DayNight.Dialog">
+        <item name="buttonBarButtonStyle">@style/Button</item>
+    </style>
+
+    <style name="Button" parent="Widget.MaterialComponents.Button.TextButton">
+    </style>
+</resources>
diff --git a/play-services-location/core/src/main/res/xml/preferences_location.xml b/play-services-location/core/src/main/res/xml/preferences_location.xml
index bee0dbdf756d7472967641bcd7b634a57e0fc427..cf36dca2a59193cf501b9ab8803f6af8e043dfbd 100644
--- a/play-services-location/core/src/main/res/xml/preferences_location.xml
+++ b/play-services-location/core/src/main/res/xml/preferences_location.xml
@@ -28,21 +28,21 @@
             android:key="prefcat_location_wifi"
             android:title="@string/prefcat_location_wifi_title"
             app:iconSpaceReserved="false">
-            <SwitchPreferenceCompat
+            <SwitchPreference
                 android:defaultValue="true"
                 android:persistent="false"
                 android:key="pref_location_wifi_mls_enabled"
                 android:title="@string/pref_location_wifi_mls_enabled_title"
                 android:summary="@string/pref_location_wifi_mls_enabled_summary"
                 app:iconSpaceReserved="false" />
-            <SwitchPreferenceCompat
+            <SwitchPreference
                 android:defaultValue="true"
                 android:persistent="false"
                 android:key="pref_location_wifi_moving_enabled"
                 android:title="@string/pref_location_wifi_moving_enabled_title"
                 android:summary="@string/pref_location_wifi_moving_enabled_summary"
                 app:iconSpaceReserved="false" />
-            <SwitchPreferenceCompat
+            <SwitchPreference
                 android:defaultValue="true"
                 android:persistent="false"
                 android:key="pref_location_wifi_learning_enabled"
@@ -54,14 +54,14 @@
             android:key="prefcat_location_cells"
             android:title="@string/prefcat_location_cell_title"
             app:iconSpaceReserved="false">
-            <SwitchPreferenceCompat
+            <SwitchPreference
                 android:defaultValue="true"
                 android:persistent="false"
                 android:key="pref_location_cell_mls_enabled"
                 android:title="@string/pref_location_cell_mls_enabled_title"
                 android:summary="@string/pref_location_cell_mls_enabled_summary"
                 app:iconSpaceReserved="false" />
-            <SwitchPreferenceCompat
+            <SwitchPreference
                 android:defaultValue="true"
                 android:persistent="false"
                 android:key="pref_location_cell_learning_enabled"
@@ -73,7 +73,7 @@
             android:key="prefcat_geocoder"
             android:title="@string/prefcat_geocoder_title"
             app:iconSpaceReserved="false">
-            <SwitchPreferenceCompat
+            <SwitchPreference
                 android:defaultValue="true"
                 android:persistent="false"
                 android:key="pref_geocoder_nominatim_enabled"
@@ -82,4 +82,4 @@
                 app:iconSpaceReserved="false" />
         </PreferenceCategory>
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/play-services-location/core/src/main/res/xml/preferences_location_app_details.xml b/play-services-location/core/src/main/res/xml/preferences_location_app_details.xml
index a6a527454442db63622453ede5adb7a235d0081e..0a9d46c795bbca8078ed7e9080f23af6bf0e19d0 100644
--- a/play-services-location/core/src/main/res/xml/preferences_location_app_details.xml
+++ b/play-services-location/core/src/main/res/xml/preferences_location_app_details.xml
@@ -12,7 +12,7 @@
         tools:title="@tools:sample/lorem"
         app:allowDividerBelow="false" />
     <PreferenceCategory android:layout="@layout/preference_category_no_label">
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:key="pref_location_app_force_coarse"
             android:title="@string/pref_location_app_force_coarse_title"
             android:summary="@string/pref_location_app_force_coarse_summary"
@@ -31,4 +31,4 @@
             android:selectable="false"
             android:persistent="false" />
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/play-services-maps/core/mapbox/build.gradle b/play-services-maps/core/mapbox/build.gradle
index 409f465abc45315aa8ec45517721b91b9c284d98..561eaf24b37eaec4b5ad7aeacea879c67a84c854 100644
--- a/play-services-maps/core/mapbox/build.gradle
+++ b/play-services-maps/core/mapbox/build.gradle
@@ -39,6 +39,19 @@ def execResult(...args) {
     return stdout.toString().trim()
 }
 
+def mapboxKey() {
+    String environmentKey = System.getenv('MAPBOX_VECTOR_TILES_KEY')
+    if (environmentKey != null) return environmentKey
+
+    Properties properties = new Properties()
+    try {
+        properties.load(project.rootProject.file('local.properties').newDataInputStream())
+    } catch (ignored) {
+        // Ignore
+    }
+    return properties.getProperty("mapbox.key", "invalid")
+}
+
 android {
     namespace "org.microg.gms.maps.mapbox"
 
diff --git a/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
index 2f81c8af48dca3be92a344616999811b2e1d3ade..d8c5de237ebb7fb631ba2bcf7011b25d8dfb3cf8 100644
--- a/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
+++ b/play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
@@ -598,6 +598,7 @@ class GoogleMapImpl(context: Context, var options: GoogleMapOptions) : AbstractG
         map.addOnCameraMoveListener {
             try {
                 cameraMoveListener?.onCameraMove()
+                currentInfoWindow?.update()
             } catch (e: Exception) {
                 Log.w(TAG, e)
             }
diff --git a/play-services-maps/core/vtm/build.gradle b/play-services-maps/core/vtm/build.gradle
index 1e45d66f133e89553ce87ca0bb5f5c6f6a9d4bdc..ce66fa9a3513e6760446f3d36066e756e6baa129 100644
--- a/play-services-maps/core/vtm/build.gradle
+++ b/play-services-maps/core/vtm/build.gradle
@@ -66,6 +66,21 @@ android {
         release {
             minifyEnabled true
         }
+
+        releaseTest {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+
+        releaseDev {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+
+        releaseStable {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
 
     compileOptions {
diff --git a/play-services-nearby/core/src/main/res/layout/exposure_notifications_confirm_activity.xml b/play-services-nearby/core/src/main/res/layout/exposure_notifications_confirm_activity.xml
index f13888d95c4f0cfc088ee436dc6734bdbbf6da46..405e384d009839081b26e81b598993e8a478d8f4 100644
--- a/play-services-nearby/core/src/main/res/layout/exposure_notifications_confirm_activity.xml
+++ b/play-services-nearby/core/src/main/res/layout/exposure_notifications_confirm_activity.xml
@@ -87,7 +87,7 @@
                     android:layout_alignLeft="@id/grant_permission_summary"
                     android:layout_marginLeft="-16dp"
                     android:text="@string/exposure_confirm_permission_button"
-                    android:textColor="?android:attr/textColorPrimaryInverse" />
+                    android:textColor="?attr/colorAccent" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -183,7 +183,7 @@
                     android:layout_alignLeft="@id/enable_bluetooth_summary"
                     android:layout_marginLeft="-16dp"
                     android:text="@string/exposure_confirm_button"
-                    android:textColor="?android:attr/textColorPrimaryInverse" />
+                    android:textColor="?attr/colorAccent" />
 
                 <ProgressBar
                     android:id="@+id/enable_bluetooth_spinner"
@@ -222,7 +222,7 @@
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
                     android:src="@drawable/ic_location_off"
-                    app:tint="?attr/colorPrimary" />
+                    app:tint="?attr/colorAccent" />
 
                 <TextView
                     android:id="@+id/enable_location_summary"
@@ -244,7 +244,7 @@
                     android:layout_alignLeft="@id/enable_location_summary"
                     android:layout_marginLeft="-16dp"
                     android:text="@string/exposure_confirm_button"
-                    android:textColor="?android:attr/textColorPrimaryInverse" />
+                    android:textColor="?attr/colorAccent" />
             </RelativeLayout>
 
             <LinearLayout
diff --git a/settings.gradle b/settings.gradle
index 0c2ee077ef88db376ff19e3ee5f8f587d97f5095..473b9ed6c723ba5475975e8daa87aedf5f4548d2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -113,3 +113,6 @@ sublude ':firebase-auth:core'
 
 include ':play-services-core:microg-ui-tools' // Legacy
 include ':play-services-core'
+
+include ':play-services-base-core-package'
+project(':play-services-base-core-package').projectDir = file('play-services-base/core/package')
diff --git a/vending-app/build.gradle b/vending-app/build.gradle
index c8281eef7666cda2cd2e35a3df3121813154a05c..63a5fad730c1e8f2babc0693ef43fd09a0497f0c 100644
--- a/vending-app/build.gradle
+++ b/vending-app/build.gradle
@@ -6,6 +6,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.squareup.wire'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
     namespace "com.android.vending"
@@ -119,6 +120,7 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
     implementation "androidx.preference:preference-ktx:$preferenceVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 }
 
 wire {
diff --git a/vending-app/src/main/AndroidManifest.xml b/vending-app/src/main/AndroidManifest.xml
index 10adb52dc47cb858b5eb1a60aa0f946bb93b8136..537078580ee13347ffbe8484c5e1b6cf174b6bc8 100644
--- a/vending-app/src/main/AndroidManifest.xml
+++ b/vending-app/src/main/AndroidManifest.xml
@@ -86,6 +86,14 @@
             </intent-filter>
         </service>
 
+        <service
+          android:name="com.android.vending.SplitInstallService"
+          android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.android.play.core.splitinstall.BIND_SPLIT_INSTALL_SERVICE" />
+            </intent-filter>
+        </service>
+
         <activity
             android:name="org.microg.vending.ui.MainActivity"
             android:theme="@style/Theme.Dialog.NoActionBar"
diff --git a/vending-app/src/main/aidl/com/google/android/play/core/splitinstall/protocol/ISplitInstallService.aidl b/vending-app/src/main/aidl/com/google/android/play/core/splitinstall/protocol/ISplitInstallService.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..3a9c33741d918bd0b3cf7c66e3a0d65e39e58c7e
--- /dev/null
+++ b/vending-app/src/main/aidl/com/google/android/play/core/splitinstall/protocol/ISplitInstallService.aidl
@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: 2016 microG Project Team
+ * SPDX-FileCopyrightText: 2023 E FOUNDATION
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.play.core.splitinstall.protocol;
+
+import com.google.android.play.core.splitinstall.protocol.ISplitInstallServiceCallback;
+
+interface ISplitInstallService {
+
+    // Method not identified yet
+    void a();
+
+    void startInstall(String str, in List<Bundle> list, in Bundle bundle, in ISplitInstallServiceCallback callback);
+
+    // Method not identified yet
+    void c(String str);
+
+    // Method not identified yet
+    void d(String str);
+
+    // Method not identified yet
+    void e(String str);
+
+    void getSessionStates(String str, in ISplitInstallServiceCallback callback);
+
+}
\ No newline at end of file
diff --git a/vending-app/src/main/aidl/com/google/android/play/core/splitinstall/protocol/ISplitInstallServiceCallback.aidl b/vending-app/src/main/aidl/com/google/android/play/core/splitinstall/protocol/ISplitInstallServiceCallback.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..371ab555fad4c02bf4f348265b08ecd6c98f159c
--- /dev/null
+++ b/vending-app/src/main/aidl/com/google/android/play/core/splitinstall/protocol/ISplitInstallServiceCallback.aidl
@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: 2016 microG Project Team
+ * SPDX-FileCopyrightText: 2023 E FOUNDATION
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.play.core.splitinstall.protocol;
+
+import android.os.Bundle;
+
+interface ISplitInstallServiceCallback {
+
+    // Method not identified yet
+    void a();
+
+    void onStartInstall(int i);
+
+    void onCompleteInstall(int i);
+
+    void onCancelInstall(int i);
+
+    void onGetSession(int i);
+
+    void onError(int i);
+
+    void onGetSessionStates(in List<Bundle> list);
+
+    void onDeferredUninstall(in Bundle bundle);
+
+    void onDeferredInstall(in Bundle bundle);
+
+    void onGetSplitsForAppUpdate(int i, in Bundle bundle);
+
+    void onCompleteInstallForAppUpdate();
+
+    void onDeferredLanguageInstall(int i);
+}
\ No newline at end of file
diff --git a/vending-app/src/main/aidl/foundation/e/apps/ISplitInstallService.aidl b/vending-app/src/main/aidl/foundation/e/apps/ISplitInstallService.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..dd57f65d20e22cb57fd47c98ae5bcc465672020a
--- /dev/null
+++ b/vending-app/src/main/aidl/foundation/e/apps/ISplitInstallService.aidl
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2016 microG Project Team
+ * SPDX-FileCopyrightText: 2023 E FOUNDATION
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package foundation.e.apps;
+
+interface ISplitInstallService {
+    void installSplitModule(String packageName, String moduleName);
+}
diff --git a/vending-app/src/main/java/com/android/vending/SplitInstallService.kt b/vending-app/src/main/java/com/android/vending/SplitInstallService.kt
new file mode 100644
index 0000000000000000000000000000000000000000..74fcb97eabd8ae173ff54ee8bb439c073f505787
--- /dev/null
+++ b/vending-app/src/main/java/com/android/vending/SplitInstallService.kt
@@ -0,0 +1,99 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-FileCopyrightText: 2023 E FOUNDATION
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.vending
+
+import android.app.Service
+import android.content.Intent
+import android.os.Bundle
+import android.os.IBinder
+import android.os.Parcel
+import android.util.Log
+import com.android.vending.splitinstall.SplitInstaller
+import com.android.vending.splitinstall.SplitInstallerFactory
+import com.android.vending.splitinstall.SplitInstallerType
+import com.google.android.play.core.splitinstall.protocol.ISplitInstallService
+import com.google.android.play.core.splitinstall.protocol.ISplitInstallServiceCallback
+
+class SplitInstallService : Service() {
+
+    companion object {
+        const val TAG = "SplitInstallService"
+    }
+
+    private lateinit var mSplitInstaller: SplitInstaller
+
+    override fun onCreate() {
+        super.onCreate()
+
+        mSplitInstaller = SplitInstallerFactory.createSplitInstaller(
+            applicationContext,
+            SplitInstallerType.AppLoungeSplitInstaller
+        )
+
+        mSplitInstaller.initialize()
+    }
+
+    override fun onBind(p0: Intent?): IBinder {
+        return mServiceInterface
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        mSplitInstaller.destroy()
+    }
+
+    private var mServiceInterface = object : ISplitInstallService.Stub() {
+
+        override fun a() {
+            Log.d(TAG, "a")
+        }
+
+        override fun startInstall(
+            packageName: String,
+            list: List<Bundle>,
+            bundle: Bundle,
+            callback: ISplitInstallServiceCallback
+        ) {
+            for (element in list) {
+
+                val apk = element.getString("module_name") ?: element.getString("language")
+                apk?.let {
+                    mSplitInstaller.install(packageName, apk)
+                } ?: logBundleError(element)
+            }
+        }
+
+        private fun logBundleError(bundle: Bundle) {
+            for (entry in bundle.keySet()) {
+                Log.e(TAG, "Unknown bundle entry: $entry. Value is ${bundle.get(entry)}")
+            }
+        }
+
+        override fun c(str: String?) {
+            Log.d(TAG, "c")
+        }
+
+        override fun d(str: String?) {
+            Log.d(TAG, "d")
+        }
+
+        override fun e(str: String?) {
+            Log.d(TAG, "e")
+        }
+
+        override fun getSessionStates(str: String, callback: ISplitInstallServiceCallback) {
+            Log.d(TAG, "onGetSessionStates")
+            callback.onGetSessionStates(arrayListOf<Bundle>())
+        }
+
+        override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean {
+            if (super.onTransact(code, data, reply, flags)) return true
+            Log.d(TAG, "onTransact [unknown]: $code, $data, $flags")
+            return false
+        }
+    }
+}
diff --git a/vending-app/src/main/java/com/android/vending/splitinstall/SplitInstallErrorCode.kt b/vending-app/src/main/java/com/android/vending/splitinstall/SplitInstallErrorCode.kt
new file mode 100644
index 0000000000000000000000000000000000000000..24edcda6b6da170439d87a3611bae74000d3aa56
--- /dev/null
+++ b/vending-app/src/main/java/com/android/vending/splitinstall/SplitInstallErrorCode.kt
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-FileCopyrightText: 2023 E FOUNDATION
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.vending.splitinstall
+
+interface SplitInstallErrorCode {
+    companion object {
+        const val API_NOT_AVAILABLE = -5
+    }
+}
diff --git a/vending-app/src/main/java/com/android/vending/splitinstall/SplitInstaller.kt b/vending-app/src/main/java/com/android/vending/splitinstall/SplitInstaller.kt
new file mode 100644
index 0000000000000000000000000000000000000000..91c531db2852fb129150377451d8ca61c4f90b67
--- /dev/null
+++ b/vending-app/src/main/java/com/android/vending/splitinstall/SplitInstaller.kt
@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-FileCopyrightText: 2023 E FOUNDATION
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.vending.splitinstall
+
+import android.content.Context
+import com.android.vending.splitinstall.installer.AppLoungeSplitInstaller
+
+interface SplitInstaller {
+    fun initialize()
+    fun install(packageName: String, moduleName: String)
+    fun destroy()
+}
+
+enum class SplitInstallerType {
+    AppLoungeSplitInstaller
+}
+
+object SplitInstallerFactory {
+    fun createSplitInstaller(context: Context, type: SplitInstallerType): SplitInstaller {
+        when (type) {
+            SplitInstallerType.AppLoungeSplitInstaller ->
+                return AppLoungeSplitInstaller(context)
+            else -> throw IllegalArgumentException("Unknown SplitInstallerType")
+        }
+    }
+}
diff --git a/vending-app/src/main/java/com/android/vending/splitinstall/installer/AppLoungeSplitInstaller.kt b/vending-app/src/main/java/com/android/vending/splitinstall/installer/AppLoungeSplitInstaller.kt
new file mode 100644
index 0000000000000000000000000000000000000000..1c01af1ee276266713e956888d6b2af4b0d66141
--- /dev/null
+++ b/vending-app/src/main/java/com/android/vending/splitinstall/installer/AppLoungeSplitInstaller.kt
@@ -0,0 +1,73 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-FileCopyrightText: 2023 E FOUNDATION
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.vending.splitinstall.installer
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import com.android.vending.splitinstall.SplitInstaller
+import foundation.e.apps.ISplitInstallService
+
+class AppLoungeSplitInstaller(
+    private val context: Context
+) : SplitInstaller {
+
+    companion object {
+        private val ON_DEMAND_DELIVERY_SERVICE_COMPONENT =
+            ComponentName(
+                "foundation.e.apps",
+                "foundation.e.apps.install.splitinstall.SplitInstallService"
+            )
+    }
+
+    private var service: ISplitInstallService? = null
+    private val moduleList = ArrayList<InstallModule>()
+
+    private val serviceConnection = object : ServiceConnection {
+        override fun onServiceConnected(componentName: ComponentName, binder: IBinder) {
+            service = ISplitInstallService.Stub.asInterface(binder)
+            installWaitingModules()
+        }
+
+        override fun onServiceDisconnected(componentName: ComponentName) {
+            service = null
+        }
+    }
+
+    override fun initialize() {
+        val intent = Intent().apply {
+            component = ON_DEMAND_DELIVERY_SERVICE_COMPONENT
+        }
+
+        context.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE)
+    }
+
+    override fun destroy() {
+        context.unbindService(serviceConnection)
+    }
+
+    override fun install(packageName: String, moduleName: String) {
+        if (service == null) {
+            moduleList.add(InstallModule(packageName, moduleName))
+        }
+
+        service?.installSplitModule(packageName, moduleName)
+    }
+
+    private fun installWaitingModules() {
+        val iterator = moduleList.iterator()
+        while (iterator.hasNext()) {
+            val module = iterator.next()
+            service?.installSplitModule(module.packageName, module.moduleName)
+            iterator.remove()
+        }
+    }
+
+    private data class InstallModule(val packageName: String, val moduleName: String)
+}
diff --git a/vending-app/src/main/res/values-de/strings.xml b/vending-app/src/main/res/values-de/strings.xml
index 3734f4119d0baee7f5b969a61c9aa2c1d085b689..80dfa3fa5ee5aee2b5acf308f96ad2a689ea9745 100644
--- a/vending-app/src/main/res/values-de/strings.xml
+++ b/vending-app/src/main/res/values-de/strings.xml
@@ -19,4 +19,4 @@
     <string name="license_notification_body">Wenn die App nicht ordnungsgemäß funktioniert, melden Sie sich mit einem Google-Konto an, mit dem Sie die App gekauft haben.</string>
     <string name="license_notification_sign_in">Anmelden</string>
     <string name="license_notification_ignore">Ignorieren</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vending-app/src/main/res/values-es/strings.xml b/vending-app/src/main/res/values-es/strings.xml
index 51e1307215e125a697feb6f8416e03f42b191959..6161caccd1803e0f1facecd633800391460929ec 100644
--- a/vending-app/src/main/res/values-es/strings.xml
+++ b/vending-app/src/main/res/values-es/strings.xml
@@ -19,4 +19,4 @@
     <string name="tips_input_passwd">Ingresa tu contraseña</string>
     <string name="tips_remember_login_info">Recordar el inicio de sesión en este dispositivo</string>
     <string name="text_verify_button">Verificar</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vending-app/src/main/res/values-fr/strings.xml b/vending-app/src/main/res/values-fr/strings.xml
index 2b73eac077b07be527e8d2f5284bd8edbd72edac..2e9e3ba7f2230548062c67794c82b692520da391 100644
--- a/vending-app/src/main/res/values-fr/strings.xml
+++ b/vending-app/src/main/res/values-fr/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="license_notification_channel_name">Notifications de licence</string>
     <string name="license_notification_channel_description">Signale lorsqu\'une application tente de valider sa licence, mais que vous n\'êtes connecté(e) à aucun compte Google.</string>
     <string name="license_notification_title">%1$s n\'a pas pu vérifier la licence</string>
     <string name="license_notification_body">Si l\'application ne fonctionne pas correctement, connectez-vous au compte Google avec lequel vous avez acheté l\'application.</string>
     <string name="license_notification_sign_in">S\'identifier</string>
-    <string name="license_notification_channel_name">Notifications de licence</string>
     <string name="license_notification_ignore">Ignorer</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vending-app/src/main/res/values-it/strings.xml b/vending-app/src/main/res/values-it/strings.xml
index 01cf27535bbc48392ebf58591d9f08ecf767cf26..d1cfbdbc9d2a4f53e765772110ea3ef6a3286a89 100644
--- a/vending-app/src/main/res/values-it/strings.xml
+++ b/vending-app/src/main/res/values-it/strings.xml
@@ -10,4 +10,4 @@
     <string name="license_notification_body">Se l\'app non funziona correttamente, accedi con un account Google con cui hai acquistato l\'app.</string>
     <string name="license_notification_sign_in">Accedi</string>
     <string name="license_notification_ignore">Ignora</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vending-app/src/main/res/values-sv/strings.xml b/vending-app/src/main/res/values-sv/strings.xml
index 73a949bb1f762ad88cdb426c1e829b4361a7a2f4..c2e4249b23d16b1b3b7c59c211c9d5a97fe34504 100644
--- a/vending-app/src/main/res/values-sv/strings.xml
+++ b/vending-app/src/main/res/values-sv/strings.xml
@@ -9,4 +9,4 @@
     <string name="license_notification_body">Om appen inte beter sig illa, logga in på det Google-konto som du har köpt appen med.</string>
     <string name="license_notification_sign_in">Logga in</string>
     <string name="license_notification_ignore">Ignorera</string>
-</resources>
\ No newline at end of file
+</resources>