diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index dd0bf54db17b3267dcc8f1fc27bfd0ebb9d1f95e..f1bcc112c2a647dcbfef01708d0078dce314bf3b 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -6,7 +6,6 @@ if (rootProject.testCoverage) {
 }
 
 dependencies {
-    compileOnly files("../../e-ui-sdk.jar")
     implementation project(":app:ui:legacy")
     implementation project(":app:core")
     implementation project(":app:storage")
@@ -39,6 +38,8 @@ dependencies {
     testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
     testImplementation "io.insert-koin:koin-test:${versions.koin}"
     testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
+
+    implementation 'foundation.e:elib:0.0.1-alpha11'
 }
 
 android {
@@ -150,10 +151,6 @@ android {
             includeAndroidResources = true
         }
     }
-
-    aaptOptions {
-        additionalParameters '-I', 'e-ui-sdk.jar'
-    }
 }
 
 if (project.hasProperty('keyAlias')) {
diff --git a/app/k9mail/src/main/res/values-night/colors.xml b/app/k9mail/src/main/res/values-night/colors.xml
deleted file mode 100644
index 9eb56540ccb004a434df2a03f233e15f0d7c6673..0000000000000000000000000000000000000000
--- a/app/k9mail/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022  E FOUNDATION
-     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>
-    <color name="color_default_background">#121212</color>
-    <color name="color_message_list_unread_background">#2F2F2F</color>
-    <color name="color_message_list_thread_count_background">#1FFFFFFF</color>
-    <color name="color_default_primary_text">#DEFFFFFF</color>
-    <color name="color_default_secondary_text">#99FFFFFF</color>
-    <color name="color_default_ternary_text">#61FFFFFF</color>
-
-    <color name="color_dialog_backgronund">#383838</color>
-    <color name="color_contact_token_background">#4b4b4b</color>
-</resources>
\ No newline at end of file
diff --git a/app/k9mail/src/main/res/values/colors.xml b/app/k9mail/src/main/res/values/colors.xml
deleted file mode 100644
index 2ae4f8e80400c94284aeb0b0d0b2f3e9aff0f7b6..0000000000000000000000000000000000000000
--- a/app/k9mail/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022  E FOUNDATION
-     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>
-    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
-    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
-    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
-    <color name="color_default_background">@android:color/white</color>
-    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
-    <color name="color_default_primary_text">#DE000000</color>
-    <color name="color_default_secondary_text">#99000000</color>
-    <color name="color_default_ternary_text">#61000000</color>
-    <color name="color_default_divider">#14212121</color>
-    <color name="color_default_gray1">@lineageos.platform:color/color_default_gray1</color>
-    <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
-
-    <color name="color_message_list_selected_background">@lineageos.platform:color/color_default_selector_background</color>
-    <color name="color_message_list_unread_background">#DCDCDC</color>
-    <color name="color_message_list_thread_count_background">#14212121</color>
-    <color name="color_dialog_backgronund">@android:color/white</color>
-
-    <color name="color_contact_token_background">#ededed</color>
-</resources>
\ No newline at end of file
diff --git a/app/ui/base/src/main/res/color/star_color.xml b/app/ui/base/src/main/res/color/star_color.xml
deleted file mode 100644
index 9a9b7155b546a7550541648d41e6e768b3a1e50b..0000000000000000000000000000000000000000
--- a/app/ui/base/src/main/res/color/star_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="@lineageos.platform:color/color_default_orange1" />
-    <item android:state_checked="false" android:color="@lineageos.platform:color/color_default_secondary_text" />
-</selector>
diff --git a/app/ui/base/src/main/res/values-night/colors.xml b/app/ui/base/src/main/res/values-night/colors.xml
deleted file mode 100644
index 8d024604c58cfa1c70b06ce68002c2ee6bd86cf9..0000000000000000000000000000000000000000
--- a/app/ui/base/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022  E FOUNDATION
-     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>
-    <color name="color_default_background">#121212</color>
-    <color name="color_default_primary_text">#DEFFFFFF</color>
-    <color name="color_default_secondary_text">#99FFFFFF</color>
-    <color name="color_default_ternary_text">#61FFFFFF</color>
-    <color name="color_avatar_background">#474747</color>
-    <color name="color_avatar_foreground">#cfcfcf</color>
-</resources>
\ No newline at end of file
diff --git a/app/ui/base/src/main/res/values/colors.xml b/app/ui/base/src/main/res/values/colors.xml
deleted file mode 100644
index c0877b8880e65ec2097009a2a6fa832ea3d7f784..0000000000000000000000000000000000000000
--- a/app/ui/base/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022  E FOUNDATION
-     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>
-    <color name="default_icon_color">@color/color_default_secondary_text</color>
-
-    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
-    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
-    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
-    <color name="color_default_background">@android:color/white</color>
-    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
-    <color name="color_default_primary_text">#DE000000</color>
-    <color name="color_default_secondary_text">#99000000</color>
-    <color name="color_default_ternary_text">#61000000</color>
-
-    <color name="color_avatar_background">#ededed</color>
-    <color name="color_avatar_foreground">#3e3e3e</color>
-
-    <color name="color_star_fill">#FFC300</color>
-</resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-night/colors.xml b/app/ui/legacy/src/main/res/values-night/colors.xml
index 7450b9070bc1ace968dbe05237a4ebc9c27e5c78..dbdfd3d5261e06a8802e97721cfa20181869ed91 100644
--- a/app/ui/legacy/src/main/res/values-night/colors.xml
+++ b/app/ui/legacy/src/main/res/values-night/colors.xml
@@ -15,19 +15,14 @@
 -->
 
 <resources>
-    <color name="color_default_background">#121212</color>
-    <color name="color_default_primary_text">#DEFFFFFF</color>
-    <color name="color_default_secondary_text">#99FFFFFF</color>
-    <color name="color_default_ternary_text">#61FFFFFF</color>
-
     <color name="color_compose_divider">#6BFFFFFF</color>
     <color name="color_selected_divider">#470086FF</color>
     <color name="color_message_compose_common_divider">#14FFFFFF</color>
     <color name="color_quote_background">#2e2e2e</color>
-
-    <color name="color_drawer_background">#363636</color>
     <color name="color_drawer_header_background">#2e2e2e</color>
-
-    <color name="color_message_list_thread_count_background">#1FFFFFFF</color>
-    <color name="color_choose_account_divider">#99FFFFFF</color>
+    <color name="color_choose_account_divider">@color/e_secondary_text_color</color>
+    <color name="color_message_list_unread_background">#2F2F2F</color>
+    <color name="color_contact_token_background">#4b4b4b</color>
+    <color name="color_avatar_background">#474747</color>
+    <color name="color_avatar_foreground">#cfcfcf</color>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/app/ui/legacy/src/main/res/values/colors.xml
index 0538558a905eac1fa3acd2b6aa4b80a4a15042d1..352033c65c5c674a8c68c109d1ce94e48e530d1f 100644
--- a/app/ui/legacy/src/main/res/values/colors.xml
+++ b/app/ui/legacy/src/main/res/values/colors.xml
@@ -29,28 +29,38 @@
 
     <color name="material_drawer_profile_icon">#F9F9F9</color>
 
-    <color name="color_selected_background">@lineageos.platform:color/color_default_selector_background</color>
-
-    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
-    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
-    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
-    <color name="color_default_background">@android:color/white</color>
-    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
-    <color name="color_default_primary_text">#DE000000</color>
-    <color name="color_default_secondary_text">#99000000</color>
-    <color name="color_default_ternary_text">#61000000</color>
-    <color name="color_default_divider">#14212121</color>
+    <color name="color_selected_background">@color/e_alpha_accent</color>
+
+    <color name="color_default_primary">@color/e_action_bar</color>
+    <color name="color_default_primary_dark">@color/e_action_bar</color>
+    <color name="color_default_accent">@color/e_accent</color>
+    <color name="color_default_background">@color/e_background</color>
+    <color name="color_default_foreground">@color/e_floating_background</color>
+    <color name="color_default_primary_text">@color/e_primary_text_color</color>
+    <color name="color_default_secondary_text">@color/e_secondary_text_color</color>
+    <color name="color_default_ternary_text">@color/e_disabled_color</color>
+    <color name="color_default_divider">@color/e_background_overlay</color>
     <color name="color_selected_divider">#470086FF</color>
-    <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
 
     <color name="color_compose_divider">#6B212121</color>
     <color name="color_message_compose_common_divider">#14212121</color>
     <color name="color_quote_background">#f5f5f5</color>
 
-    <color name="color_drawer_background">#fafafa</color>
+    <color name="color_drawer_background">@color/e_drawer_background</color>
     <color name="color_drawer_selected_background">#145DB2FF</color>
     <color name="color_drawer_header_background">@android:color/white</color>
 
-    <color name="color_message_list_thread_count_background">#14212121</color>
+    <color name="color_message_list_thread_count_background">@color/e_background_overlay</color>
     <color name="color_choose_account_divider">#D9D9D9</color>
+    <color name="default_icon_color">@color/color_default_secondary_text</color>
+    <color name="color_message_list_selected_background">@color/e_alpha_accent</color>
+    <color name="color_message_list_unread_background">#DCDCDC</color>
+
+    <color name="color_dialog_backgronund">@color/e_floating_background</color>
+
+    <color name="color_contact_token_background">#ededed</color>
+    <color name="color_avatar_background">#ededed</color>
+    <color name="color_avatar_foreground">#3e3e3e</color>
+
+    <color name="color_star_fill">#FFC300</color>
 </resources>
diff --git a/build.gradle b/build.gradle
index 2a02b88fc35b201df4e0f09f35066425c0ae4c4e..3395b7f0e9b29696590bb78247189f3b5b61969f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         buildConfig = [
                 'compileSdk': 33,
                 'targetSdk': 31,
-                'minSdk': 21,
+                'minSdk': 24,
                 'buildTools': '32.0.0',
                 'robolectricSdk': 31
         ]
@@ -87,6 +87,7 @@ subprojects {
         mavenCentral()
         google()
         maven { url 'https://jitpack.io' }
+        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
     }
 
     configurations.all {
diff --git a/e-ui-sdk.jar b/e-ui-sdk.jar
deleted file mode 100644
index aabc9df7dba4a49b4ab2716fd0dcaf617a636b0c..0000000000000000000000000000000000000000
Binary files a/e-ui-sdk.jar and /dev/null differ