diff --git a/build.gradle b/build.gradle
index 2c34fe34da5aa85d4d6bb27ca351deebf2c57147..86c51ea201db3a55496d7b22c6a304afcbb2a9bd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,13 +34,14 @@ buildscript {
 
     ext.androidBuildVersionTools = '33.0.0'
 
-    ext.androidMinSdk = 14
+    ext.androidMinSdk = 21
     ext.androidTargetSdk = 29
     ext.androidCompileSdk = 31
 
     repositories {
         mavenCentral()
         google()
+        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
     }
 
     dependencies {
@@ -99,5 +100,6 @@ subprojects {
     repositories {
         mavenCentral()
         google()
+        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
     }
 }
diff --git a/e-ui-sdk.jar b/e-ui-sdk.jar
deleted file mode 100644
index 5974432e9c6b33ca4a6473603e57cd3290d5bdaa..0000000000000000000000000000000000000000
Binary files a/e-ui-sdk.jar and /dev/null differ
diff --git a/play-services-base-core-ui/src/main/res/drawable/ic_info_outline.xml b/play-services-base-core-ui/src/main/res/drawable/ic_info_outline.xml
index 8e049cce5fcf000934438e0f560c10dec81be03b..f98d0ffe87bce0d2c2a0d3d5ea05bdbc4df3b7a1 100644
--- a/play-services-base-core-ui/src/main/res/drawable/ic_info_outline.xml
+++ b/play-services-base-core-ui/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/colorAccent"
+    android:tint="?android:attr/textColorSecondary"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 110678c9d28e77c9f32912910c088e5319ab75d8..2f88a08a0d38f41c1294989c620fde15cb111eed 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -15,7 +15,6 @@ configurations {
 }
 
 dependencies {
-    compileOnly files("../e-ui-sdk.jar")
     implementation "com.squareup.wire:wire-runtime:$wireVersion"
     implementation "de.hdodenhof:circleimageview:1.3.0"
     // TODO: Switch to upstream once raw requests are merged
@@ -80,6 +79,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 {
@@ -203,10 +203,6 @@ android {
             useLegacyPackaging false
         }
     }
-
-    aaptOptions {
-        additionalParameters '-I', 'e-ui-sdk.jar'
-    }
 }
 
 if (file('user.gradle').exists()) {
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/self_check.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/self_check.xml
index 714b5e11e54f8681d79076852cafb87e151de714..cde250a2a814c645b96ecd9b562dac2e10d12a06 100644
--- a/play-services-core/microg-ui-tools/src/main/res/drawable/self_check.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/drawable/self_check.xml
@@ -18,7 +18,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorAccent"
+    android:tint="?android:attr/textColorSecondary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 0ffe5ada5f461d59b1ea418cd52c90fa9028d833..6452c27c61e17d4d3ef9dfbb69131eda62d62bc6 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/colorAccent"
+    android:tint="@color/e_icon_color"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 a2a6a2adcb6f7c7d02aed045c77c4cd769f2c864..7fd0c11d1c945028d4568a2d96cb2e504b3f296c 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/colorAccent"
+    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 9457dd539a7b2d5c936aace978f8e8921e61856f..bec6bca677b1bd97f646025308773b8b9b001224 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/colorAccent"
+    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 60fe6bb02b2d1d01a6d62cdc016629fd30a07847..dab24949f99613a48eca0f9433b24301a844e979 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/colorAccent"
+    android:tint="@color/e_icon_color"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 70a96a493de640036b41319007a34884c8399936..2460c841df19b6af55cc3d4a71bf880d2d33cc89 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/colorAccent"
+    android:tint="@color/e_icon_color"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/play-services-core/src/main/res/values-v21/themes.xml b/play-services-core/src/main/res/values-v21/themes.xml
index 47e0e4cd85002d8a1043c57567dd137dd45d5203..b678428cb33169223bb6993f54ab8e25a7f5f373 100644
--- a/play-services-core/src/main/res/values-v21/themes.xml
+++ b/play-services-core/src/main/res/values-v21/themes.xml
@@ -19,7 +19,7 @@
         <item name="android:navigationBarColor">@color/settings_theme_primary_dark</item>
         <item name="android:statusBarColor">@color/settings_theme_primary_dark</item>
         <item name="android:colorControlActivated">@color/settings_theme_accent</item>
-        <item name="android:colorButtonNormal">@color/color_default_blue2</item>
-        <item name="android:colorControlHighlight">@color/color_default_gray2</item>
+        <item name="android:colorButtonNormal">@color/e_icon_color</item>
+        <item name="android:colorControlHighlight">@color/e_alpha_accent</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
index ed01c232cb8bc26430703522c7e83695dd6ba3a4..2d316ce3f440202b3fd2111bfec7b39c2ac48a2e 100644
--- a/play-services-core/src/main/res/values-v27/themes.xml
+++ b/play-services-core/src/main/res/values-v27/themes.xml
@@ -22,7 +22,7 @@
         <item name="android:windowLightNavigationBar">@bool/is_light_mode</item>
         <item name="android:windowLightStatusBar">@bool/is_light_mode</item>
         <item name="android:colorControlActivated">@color/settings_theme_accent</item>
-        <item name="android:colorButtonNormal">@color/color_default_blue2</item>
-        <item name="android:colorControlHighlight">@color/color_default_gray2</item>
+        <item name="android:colorButtonNormal">@color/e_icon_color</item>
+        <item name="android:colorControlHighlight">@color/e_alpha_accent</item>
     </style>
 </resources>
diff --git a/play-services-core/src/main/res/values/colors.xml b/play-services-core/src/main/res/values/colors.xml
index 333e5e458e5242faf99a646e597284d1e465304a..1dc789578ea20bf2635dd5fc998e0e36f4e2b780 100644
--- a/play-services-core/src/main/res/values/colors.xml
+++ b/play-services-core/src/main/res/values/colors.xml
@@ -15,23 +15,20 @@
   -->
 
 <resources>
-    <color name="login_blue_theme_primary">@lineageos.platform:color/color_default_primary</color>
-    <color name="login_blue_theme_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
-    <color name="login_blue_theme_accent">@lineageos.platform:color/color_default_accent</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="background_color">@lineageos.platform:color/color_default_background</color>
-    <color name="foreground_color">@lineageos.platform:color/color_default_foreground</color>
-    <color name="primary_text_color">@lineageos.platform:color/color_default_primary_text</color>
-    <color name="secondary_text_color">@lineageos.platform:color/color_default_secondary_text</color>
-    <color name="divider_color">@lineageos.platform:color/color_default_divider</color>
-    <color name="view_on_accent_color">@lineageos.platform:color/color_default_view_on_accent</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="color_default_blue2">@lineageos.platform:color/color_default_blue2</color>
-    <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
+    <color name="dialog_border_color">@color/e_divider_color</color>
+    <color name="material_error">@color/e_error</color>
 
-    <color name="dialog_border_color">@lineageos.platform:color/color_default_divider</color>
-    <color name="material_error">@lineageos.platform:color/color_default_red1</color>
-
-    <color name="settings_theme_accent">@lineageos.platform:color/color_default_accent</color>
-    <color name="settings_theme_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="settings_theme_accent">@color/e_accent</color>
+    <color name="settings_theme_primary_dark">@color/e_action_bar</color>
 </resources>
diff --git a/play-services-core/src/main/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml
index 71a327bd553cb95ae1f6f1dd46774b9a3755688b..b80b93ef1da7208d12c0128658c5b14d010112dd 100644
--- a/play-services-core/src/main/res/values/themes.xml
+++ b/play-services-core/src/main/res/values/themes.xml
@@ -16,8 +16,7 @@
 
 <resources>
     <style name="customOverFlow">
-        <item name="android:src">@lineageos.platform:drawable/ic_menu</item>
-        <item name="tint">@color/settings_theme_accent</item>
+        <item name="android:src">@drawable/e_ic_more</item>
         <item name="android:paddingRight">10dp</item>
         <item name="android:foreground">?android:attr/selectableItemBackground</item>
     </style>
@@ -34,18 +33,18 @@
         <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/color_default_blue2</item>
-        <item name="colorControlHighlight">@color/color_default_gray2</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/ic_arrow_back</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="homeAsUpIndicator">@drawable/e_ic_back</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
         <item name="actionBarTheme">@style/customToolbarTheme</item>
         <item name="android:popupBackground">@color/foreground_color</item>
         <item name="android:divider">@color/divider_color</item>
     </style>
 
     <style name="customToolbarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">@color/settings_theme_accent</item>
+        <item name="colorControlNormal">@color/e_icon_color</item>
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:popupBackground">?android:attr/popupBackground</item>