diff --git a/app/build.gradle b/app/build.gradle
index bbfdd10baa729e4548d80e399bdf8c3ff8c05d97..329a9db91ff7313b48641db1c0594cc47fdedac4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,10 +13,6 @@ android {
     compileSdkVersion 32
     buildToolsVersion '32.0.0'
 
-    aaptOptions {
-        additionalParameters '-I', 'e-ui-sdk.jar'
-    }
-
     defaultConfig {
         applicationId "foundation.e.accountmanager"
 
@@ -106,7 +102,6 @@ android {
 }
 
 dependencies {
-    compileOnly files("../e-ui-sdk.jar")
 
     implementation project(':cert4android')
     implementation project(':ical4android')
@@ -161,6 +156,7 @@ dependencies {
     implementation "org.apache.commons:commons-text:${versions.commonsText}"
     implementation 'net.openid:appauth:0.11.1'
     implementation 'junit:junit:4.13.2'
+    implementation 'foundation.e:elib:0.0.1-alpha11'
 
     // for tests
     androidTestImplementation "com.google.dagger:hilt-android-testing:${versions.hilt}"
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d90bc237e5883e9863f466b2609a1b1bbad1539..a375cc26bf1f3090439b0845bf6edabc3c39b0c4 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -12,6 +12,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#99000000"
+        android:fillColor="@color/e_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-2h2v2zm0,-4h-2V7h2v6z"/>
 </vector>
diff --git a/app/src/main/res/layout/account_carddav_item.xml b/app/src/main/res/layout/account_carddav_item.xml
index 570ae7039b3676b9b936130fd0a2d2eea9818a08..889b9df53398e4fc6bff70dd9514fbed89b8bf1e 100644
--- a/app/src/main/res/layout/account_carddav_item.xml
+++ b/app/src/main/res/layout/account_carddav_item.xml
@@ -54,7 +54,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingEnd="0dp"
-        app:tint="@color/accentColor"
-        android:src="@lineageos.platform:drawable/ic_menu" />
+        android:src="@drawable/e_ic_more" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_eelo_authenticator.xml b/app/src/main/res/layout/fragment_eelo_authenticator.xml
index b831702fff14fb799363c789d278a3427f607232..7be63935bec2090f5b9aa9f92840fb0c0090622d 100644
--- a/app/src/main/res/layout/fragment_eelo_authenticator.xml
+++ b/app/src/main/res/layout/fragment_eelo_authenticator.xml
@@ -111,7 +111,7 @@
                     android:layout_marginTop="24dp"
                     android:layout_marginEnd="16dp"
                     android:text="@string/sign_in"
-                    android:textColor="@android:color/white"
+                    android:textColor="@color/backgroundColor"
                     app:backgroundTint="@color/accentColor" />
 
                 <Button
diff --git a/app/src/main/res/layout/fragment_invite_successful.xml b/app/src/main/res/layout/fragment_invite_successful.xml
index 7b1cf224828500e9df99aed4c3d52d6bc00e5fd4..1d0c0ee40c12030ae9f4a163703bc39cbe449dc4 100644
--- a/app/src/main/res/layout/fragment_invite_successful.xml
+++ b/app/src/main/res/layout/fragment_invite_successful.xml
@@ -79,7 +79,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         app:backgroundTint="@color/accentColor"
-        android:textColor="@android:color/white"
+        android:textColor="@color/backgroundColor"
         android:text="@string/sign_in_button"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_send_invite.xml b/app/src/main/res/layout/fragment_send_invite.xml
index 9cc5ae2bdd6e94559f431317b9f9874806f8354f..2645fe52f0342bafd57314f3df5e18422131c59c 100644
--- a/app/src/main/res/layout/fragment_send_invite.xml
+++ b/app/src/main/res/layout/fragment_send_invite.xml
@@ -57,7 +57,7 @@
         app:backgroundTint="@color/create_account_button_disabled_color"
         android:enabled="false"
         android:text="@string/send_button"
-        android:textColor="@android:color/white"
+        android:textColor="@color/backgroundColor"
         android:layout_marginTop="17dp"
         android:layout_marginEnd="16dp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index 3eecf201626fa7cab371acb56d7f31a567662163..0000000000000000000000000000000000000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="edit_text_disabled_color">#61ffffff</color>
-    <color name="button_text">#BDFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 78233173d756d63d301c297fba55aec8d75fe711..15ca08d703e773b373455245ce9ddbbebf9e1451 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,11 +8,11 @@
 
 <resources>
     <color name="create_account_button_enabled_color">@color/accentColor</color>
-    <color name="create_account_button_disabled_color">#61000000</color>
+    <color name="create_account_button_disabled_color">@color/e_disabled_color</color>
     <color name="create_account_input_enabled_color">@color/accentColor</color>
-    <color name="create_account_input_disabled_color">#61000000</color>
-    <color name="instructions_text">#BD000000</color>
+    <color name="create_account_input_disabled_color">@color/e_disabled_color</color>
+    <color name="instructions_text">@color/secondaryTextColor</color>
     <color name="actionbar_back">@color/primaryTextColor</color>
-    <color name="edit_text_disabled_color">#61000000</color>
-    <color name="button_text">#BD000000</color>
+    <color name="edit_text_disabled_color">@color/e_disabled_color</color>
+    <color name="button_text">@color/secondaryTextColor</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5ad37553c1afb51a7d0e070b3a7f912289b6de0d..a0fa99b1319bed2db86734418547e18abf2c59f7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,7 +9,7 @@
 <resources>
 
     <!-- colors -->
-    <color name="lightGrey">@lineageos.platform:color/color_default_gray1</color>
+
 
     <color name="grey100">#f5f5f5</color>
     <color name="grey200">#eeeeee</color>
@@ -23,15 +23,15 @@
     <color name="colorOnPrimary">@color/accentColor</color>
     <color name="colorOnSecondary">@color/secondaryTextColor</color>
 
-    <color name="primaryColor">@lineageos.platform:color/color_default_primary</color>
-    <color name="primaryDarkColor">@lineageos.platform:color/color_default_primary_dark</color>
-    <color name="accentColor">@lineageos.platform:color/color_default_accent</color>
-    <color name="viewOnAccentColor">@lineageos.platform:color/color_default_view_on_accent</color>
-    <color name="primaryTextColor">@lineageos.platform:color/color_default_primary_text</color>
-    <color name="secondaryTextColor">@lineageos.platform:color/color_default_secondary_text</color>
-    <color name="backgroundColor">@lineageos.platform:color/color_default_background</color>
-    <color name="foregroundColor">@lineageos.platform:color/color_default_foreground</color>
-    <color name="dividerColor">@lineageos.platform:color/color_default_divider</color>
+    <color name="primaryColor">@color/e_action_bar</color>
+    <color name="primaryDarkColor">@color/e_action_bar</color>
+    <color name="accentColor">@color/e_accent</color>
+    <color name="viewOnAccentColor">@color/e_background</color>
+    <color name="primaryTextColor">@color/e_primary_text_color</color>
+    <color name="secondaryTextColor">@color/e_secondary_text_color</color>
+    <color name="backgroundColor">@color/e_background</color>
+    <color name="foregroundColor">@color/e_floating_background</color>
+    <color name="dividerColor">@color/e_divider_color</color>
 
     <color name="cardview_background">@color/accentColor</color>
     <color name="errorColor">@color/red700</color>
@@ -49,7 +49,7 @@
         <item name="colorOnSecondary">@color/viewOnAccentColor</item>
         <item name="colorAccent">@color/accentColor</item>
         <item name="android:colorAccent">@color/accentColor</item>
-        <item name="colorSurface">@color/lightGrey</item>
+        <item name="colorSurface">@color/backgroundColor</item>
         <item name="colorError">@color/errorColor</item>
         <item name="android:textColorPrimary">@color/primaryTextColor</item>
         <item name="android:textColorSecondary">@color/secondaryTextColor</item>
@@ -118,7 +118,7 @@
     </style>
 
     <style name="ActionOverFlowButton" parent="@style/Widget.AppCompat.ActionButton">
-        <item name="android:src">@lineageos.platform:drawable/ic_menu</item>
+        <item name="android:src">@drawable/e_ic_more</item>
         <item name="tint">@color/accentColor</item>
         <item name="android:minWidth">0dip</item>
         <item name="android:paddingLeft">8dip</item>
diff --git a/build.gradle b/build.gradle
index 9ca95659bf440ea717fac9d26bc7a5a269942952..4e891735277a08adcf6a81d3dbd537100ea4affd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,5 +43,6 @@ allprojects {
 
         // AppIntro, dav4jvm
         maven { url "https://jitpack.io" }
+        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