diff --git a/build.gradle b/build.gradle
index 14c9f3d2e03bff7160e4446204536295ecdbd11c..c0736ee3c315b5623aaa73db3b7ca1f5f80f412f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,6 @@ buildscript {
     ext.rx_preferences_version = '2.0.0-RC3'
     ext.timber_version = '4.5.1'
 
-    ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2]
-
     repositories {
         maven { url 'https://maven.google.com' }
         jcenter()
@@ -55,6 +53,7 @@ allprojects {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
+        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
         maven { url 'https://maven.fabric.io/public' }
         maven { url 'https://maven.google.com' }
         maven {
diff --git a/e-ui-sdk.jar b/e-ui-sdk.jar
deleted file mode 100644
index 881b17e1d066e02d3a7a70d89c96df64d53b6187..0000000000000000000000000000000000000000
Binary files a/e-ui-sdk.jar and /dev/null differ
diff --git a/presentation/build.gradle b/presentation/build.gradle
index ab466569209d8f6f39630b4ad5f66565e9610168..2a12b53993f8a41e2849bc83f8960b08ae02d126 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -40,11 +40,6 @@ android {
     }
 
 
-    aaptOptions {
-        additionalParameters '-I', 'e-ui-sdk.jar'
-    }
-
-
     /* signingConfigs {
          release
      }*/
@@ -80,15 +75,6 @@ android {
         withAnalytics { dimension "analytics" }
         noAnalytics { dimension "analytics" }
     }
-
-    splits {
-        abi {
-            enable true
-            reset()
-            include 'armeabi-v7a', 'arm64-v8a'
-            universalApk true
-        }
-    }
     /*if (System.getenv("CI") == "true") {
         signingConfigs.release.storeFile = file("../keystore")
         signingConfigs.release.storePassword = System.getenv("keystore_password")
@@ -112,8 +98,6 @@ configurations {
 
 
 dependencies {
-    // e-ui sdk
-    compileOnly files("../e-ui-sdk.jar")
     // lifecycle
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
@@ -125,6 +109,7 @@ dependencies {
     implementation "androidx.emoji:emoji-appcompat:$androidx_emoji_version"
     implementation "androidx.viewpager2:viewpager2:$androidx_viewpager_version"
     implementation "com.google.android.material:material:$material_version"
+    implementation 'foundation.e:elib:0.0.1-alpha11'
 
     // conductor
     implementation "com.bluelinelabs:conductor:$conductor_version"
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt
index 4db4a8edf60db44ec266e411438355945b920ff7..dda65072e42420215ef8f07c3d11787ac3a5bcad 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt
@@ -80,7 +80,7 @@ class PreferenceView @JvmOverloads constructor(
         orientation = HORIZONTAL
         gravity = Gravity.CENTER_VERTICAL
 
-        icon.setColorFilter(context.getColor(R.color.color_default_icon))
+        icon.setColorFilter(context.getColor(R.color.icon_color))
 
         context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run {
             title = getString(R.styleable.PreferenceView_title)
@@ -95,7 +95,7 @@ class PreferenceView @JvmOverloads constructor(
             getResourceId(R.styleable.PreferenceView_icon, -1).takeIf { it != -1 }?.let { id ->
                 icon.setVisible(true)
                 icon.setImageResource(id)
-                icon.setTint(context.getColor(R.color.tools_theme))
+                icon.setTint(context.getColor(R.color.icon_color))
             }
 
             recycle()
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
index b3531c34de8a6f6b392ad9cb5bf4bc6775bdceaa..06ab61d5b1b18bc258a507d3f312589cd7802447 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
@@ -143,8 +143,8 @@ class MainActivity : QkThemedActivity(), MainView {
         }
 
         toggle.syncState()
-        toolbar.setNavigationIcon(lineageos.platform.R.drawable.ic_hamburger)
-        toolbar.navigationIcon?.setTint(resources.getColor(R.color.color_default_icon))
+        toolbar.setNavigationIcon(R.drawable.e_ic_hamburger)
+        toolbar.navigationIcon?.setTint(resources.getColor(R.color.e_primary_text_color))
         toolbar.setNavigationOnClickListener {
             dismissKeyboard()
             homeIntent.onNext(Unit)
@@ -160,19 +160,6 @@ class MainActivity : QkThemedActivity(), MainView {
         theme
                 .autoDisposable(scope())
                 .subscribe { theme ->
-                    // Set the color for the drawer icons
-                    val states = arrayOf(
-                            intArrayOf(android.R.attr.state_activated),
-                            intArrayOf(-android.R.attr.state_activated))
-
-                    resolveThemeColor(android.R.attr.textColorSecondary)
-                            .let { textSecondary -> ColorStateList(states, intArrayOf(getColor(R.color.tools_theme), textSecondary)) }
-                            .let { tintList ->
-                                inboxIcon.imageTintList = tintList
-                                inboxLabel.setTextColor(tintList)
-                                archivedIcon.imageTintList = tintList
-                                archivedLabel.setTextColor(tintList)
-                            }
 
                     // Miscellaneous views
                     listOf(plusBadge1, plusBadge2).forEach { badge ->
diff --git a/presentation/src/main/res/layout/drawer_view.xml b/presentation/src/main/res/layout/drawer_view.xml
index a3f12cbb6b0f48b30d93c157014c675e4cefed64..42f289747b655bab43f68b34a993401adf7885bd 100644
--- a/presentation/src/main/res/layout/drawer_view.xml
+++ b/presentation/src/main/res/layout/drawer_view.xml
@@ -38,8 +38,7 @@
             <ImageView
                 android:id="@+id/inboxIcon"
                 style="@style/DrawerIcon"
-                android:src="@lineageos.platform:drawable/ic_inbox"
-                android:tint="?android:attr/textColorSecondary"  />
+                android:src="@drawable/ic_inbox_black_24dp" />
 
             <com.moez.QKSMS.common.widget.QkTextView
                 android:id="@+id/inboxLabel"
@@ -55,8 +54,7 @@
             <ImageView
                 android:id="@+id/archivedIcon"
                 style="@style/DrawerIcon"
-                android:src="@lineageos.platform:drawable/ic_archive"
-                android:tint="?android:attr/textColorSecondary"
+                android:src="@drawable/ic_archive_white_24dp"
                 />
 
             <com.moez.QKSMS.common.widget.QkTextView
@@ -81,8 +79,7 @@
 
             <ImageView
                 style="@style/DrawerIcon"
-                android:src="@lineageos.platform:drawable/ic_backup_restore"
-                android:tint="?android:attr/textColorSecondary" />
+                android:src="@drawable/ic_import_export_black_24dp" />
 
             <com.moez.QKSMS.common.widget.QkTextView
                 style="@style/DrawerText"
@@ -108,8 +105,7 @@
 
             <ImageView
                 style="@style/DrawerIcon"
-                android:src="@lineageos.platform:drawable/ic_scheduled"
-                android:tint="?android:attr/textColorSecondary" />
+                android:src="@drawable/ic_event_black_24dp" />
 
             <com.moez.QKSMS.common.widget.QkTextView
                 style="@style/DrawerText"
@@ -135,8 +131,7 @@
 
             <ImageView
                 style="@style/DrawerIcon"
-                android:src="@lineageos.platform:drawable/ic_close"
-                android:tint="?android:attr/textColorSecondary" />
+                android:src="@drawable/ic_block_white_24dp" />
 
             <com.moez.QKSMS.common.widget.QkTextView
                 style="@style/DrawerText"
@@ -157,8 +152,7 @@
 
             <ImageView
                 style="@style/DrawerIcon"
-                android:src="@lineageos.platform:drawable/ic_settings"
-                android:tint="?android:attr/textColorSecondary" />
+                android:src="@drawable/ic_settings_black_24dp" />
 
             <com.moez.QKSMS.common.widget.QkTextView
                 style="@style/DrawerText"
diff --git a/presentation/src/main/res/layout/main_activity.xml b/presentation/src/main/res/layout/main_activity.xml
index 622811f9fd15e250b6c47c5c73ad769ad7131ba6..1f7ef9150c97238774b33f062f87a02189181e69 100644
--- a/presentation/src/main/res/layout/main_activity.xml
+++ b/presentation/src/main/res/layout/main_activity.xml
@@ -99,7 +99,7 @@
             android:contentDescription="@string/main_fab_cd"
             android:elevation="8dp"
             android:padding="16dp"
-            android:src="@lineageos.platform:drawable/ic_edit"
+            android:src="@drawable/ic_add_black_24dp"
             app:layout_constraintBottom_toTopOf="@id/bottom"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/presentation/src/main/res/layout/settings_controller.xml b/presentation/src/main/res/layout/settings_controller.xml
index 49bdec82258df5cc13d7e2977503bf82dee1e9ba..aeb5a2f636afa96933ca5907a598b173ff4710b7 100644
--- a/presentation/src/main/res/layout/settings_controller.xml
+++ b/presentation/src/main/res/layout/settings_controller.xml
@@ -42,7 +42,7 @@
             android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@lineageos.platform:drawable/ic_night_mode"
+            app:icon="@drawable/ic_invert_colors_black_24dp"
             app:title="@string/settings_night_title"
             tools:summary="Automatic" />
 
@@ -66,7 +66,7 @@
             android:id="@+id/textSize"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@lineageos.platform:drawable/ic_font_size"
+            app:icon="@drawable/ic_format_size_black_24dp"
             app:title="@string/settings_text_size_title" />
 
         <com.moez.QKSMS.common.widget.PreferenceView
@@ -81,7 +81,7 @@
             android:id="@+id/systemFont"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@lineageos.platform:drawable/ic_system_font"
+            app:icon="@drawable/ic_title_black_24dp"
             app:title="@string/settings_system_font_title"
             app:widget="@layout/settings_switch_widget" />
 
@@ -100,7 +100,7 @@
             android:id="@+id/notifications"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@lineageos.platform:drawable/ic_notifications"
+            app:icon="@drawable/ic_notifications_black_24dp"
             app:title="@string/settings_notifications_title" />
 
         <com.moez.QKSMS.common.widget.PreferenceView
@@ -115,7 +115,7 @@
             android:id="@+id/delayed"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@lineageos.platform:drawable/ic_recent"
+            app:icon="@drawable/ic_av_timer_black_24dp"
             app:title="@string/settings_delayed_title"
             tools:summary="No delay" />
 
@@ -124,7 +124,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="visible"
-            app:icon="@lineageos.platform:drawable/ic_swipe"
+            app:icon="@drawable/ic_clear_all_black_24dp"
             app:summary="@string/settings_swipe_actions_summary"
             app:title="@string/settings_swipe_actions" />
 
@@ -132,7 +132,7 @@
             android:id="@+id/delivery"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@lineageos.platform:drawable/ic_tick"
+            app:icon="@drawable/ic_check_white_24dp"
             app:summary="@string/settings_delivery_summary"
             app:title="@string/settings_delivery_title"
             app:widget="@layout/settings_switch_widget" />
@@ -157,7 +157,7 @@
             android:id="@+id/mobileOnly"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@lineageos.platform:drawable/ic_device_phone"
+            app:icon="@drawable/ic_smartphone_black_24dp"
             app:summary="@string/settings_mobile_summary"
             app:title="@string/settings_mobile_title"
             app:widget="@layout/settings_switch_widget" />
@@ -184,7 +184,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="visible"
-            app:icon="@lineageos.platform:drawable/ic_image_filled"
+            app:icon="@drawable/ic_photo_size_select_actual_black_24dp"
             app:title="@string/settings_mms_size_title"
             tools:summary="100KB" />
 
@@ -199,7 +199,7 @@
             android:id="@+id/sync"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@lineageos.platform:drawable/ic_backup_restore"
+            app:icon="@drawable/ic_sync_black_24dp"
             app:summary="@string/settings_sync_summary"
             app:title="@string/settings_sync_title" />
 
@@ -218,7 +218,7 @@
             android:id="@+id/about"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@lineageos.platform:drawable/ic_info"
+            app:icon="@drawable/ic_info_black_24dp"
             app:title="@string/settings_about_title"/>
 
     </LinearLayout>
diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml
index 3d0dac325800d33934acfdda00375a0b387c62a0..06b67f16d2e850bfc1481a033be30da00d60602c 100644
--- a/presentation/src/main/res/menu/compose.xml
+++ b/presentation/src/main/res/menu/compose.xml
@@ -51,7 +51,7 @@
 
     <item
         android:id="@+id/delete"
-        android:icon="@lineageos.platform:drawable/ic_bin"
+        android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/compose_menu_delete"
         android:visible="false"
         app:showAsAction="ifRoom" />
diff --git a/presentation/src/main/res/menu/main.xml b/presentation/src/main/res/menu/main.xml
index 58eaca6f20ce05b7d284c110817660defc17166d..f04c55950bf219869b80cdfd8639b5e6988b9e31 100644
--- a/presentation/src/main/res/menu/main.xml
+++ b/presentation/src/main/res/menu/main.xml
@@ -22,7 +22,7 @@
 
     <item
         android:id="@+id/archive"
-        android:icon="@lineageos.platform:drawable/ic_archive"
+        android:icon="@drawable/ic_archive_white_24dp"
         android:title="@string/main_menu_archive"
         android:visible="false"
         app:showAsAction="ifRoom" />
@@ -36,7 +36,7 @@
 
     <item
         android:id="@+id/delete"
-        android:icon="@lineageos.platform:drawable/ic_bin"
+        android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/main_menu_delete"
         android:visible="false"
         app:showAsAction="ifRoom" />
diff --git a/presentation/src/main/res/values-night/colors.xml b/presentation/src/main/res/values-night/colors.xml
index f1996c4205f257838ed43ebb5f5a4584b09c62f9..9de9fe9c74fe16bb212c17adbd199a675dec7317 100644
--- a/presentation/src/main/res/values-night/colors.xml
+++ b/presentation/src/main/res/values-night/colors.xml
@@ -4,4 +4,5 @@
     <color name="avatar_bg_color">#292929</color>
     <color name="avatar_icon_color">#DEFFFFFF</color>
     <color name="emphasis">#DEFFFFFF</color>
+    <color name="icon_color">#a0a0a0</color>
 </resources>
\ No newline at end of file
diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml
index 6bea0e8be6acaf3122138d06731ed1c200fa07db..2028a0043101aef96282e4780a9ba467e090b37c 100644
--- a/presentation/src/main/res/values-night/themes.xml
+++ b/presentation/src/main/res/values-night/themes.xml
@@ -42,7 +42,7 @@
         <item name="switchThumbDisabled">@color/switchThumbDisabledDark</item>
         <item name="switchTrackEnabled">@color/switchTrackEnabledDark</item>
         <item name="switchTrackDisabled">@color/switchTrackDisabledDark</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
         <item name="windowActionBar">false</item>
         <item name="android:textCursorDrawable">@drawable/cursor</item>
         <item name="alertDialogTheme">@style/customAlertDialog</item>
diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
index 5b448092724e276879ac55ada2095922fdd79ecc..81028e5df102f539bf1698e9646fceae5c1a68bc 100644
--- a/presentation/src/main/res/values/colors.xml
+++ b/presentation/src/main/res/values/colors.xml
@@ -30,30 +30,30 @@
     <color name="toolbarLight">@color/colorPrimaryDark</color>
     <color name="toolbarDark">@color/colorPrimaryDark</color>
     <color name="toolbarTranslucent">#88000000</color>
-    <color name="toolbarSearchBackgroundLight">#0D000000</color>
-    <color name="toolbarSearchBackgroundDark">#26000000</color>
+    <color name="toolbarSearchBackgroundLight">@color/e_background_overlay</color>
+    <color name="toolbarSearchBackgroundDark">@color/e_background_overlay</color>
 
-    <color name="backgroundLight">@lineageos.platform:color/color_default_background</color>
-    <color name="backgroundDark">@lineageos.platform:color/color_default_background</color>
+    <color name="backgroundLight">@color/e_background</color>
+    <color name="backgroundDark">@color/e_background</color>
 
-    <color name="textPrimary">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="textPrimary">@color/e_primary_text_color</color>
     <color name="textPrimaryDisabled">#4C49555F</color>
-    <color name="textSecondary">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="textSecondary">@color/e_secondary_text_color</color>
     <color name="textSecondaryDisabled">#4C70808D</color>
-    <color name="textTertiary">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="textTertiary">@color/e_secondary_text_color</color>
 
-    <color name="textPrimaryDark">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="textPrimaryDark">@color/e_primary_text_color</color>
     <color name="textPrimaryDisabledDark">#7FFFFFFF</color>
-    <color name="textSecondaryDark">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="textSecondaryDark">@color/e_secondary_text_color</color>
     <color name="textSecondaryDisabledDark">#67ffffff</color>
-    <color name="textTertiaryDark">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="textTertiaryDark">@color/e_secondary_text_color</color>
 
     <color name="bubbleBlack">#0F1113</color>
     <color name="bubbleLight">@color/colorPrimaryDark</color>
     <color name="bubbleDark">@color/colorPrimaryDark</color>
 
-    <color name="separatorLight">@lineageos.platform:color/color_default_divider</color>
-    <color name="separatorDark">@lineageos.platform:color/color_default_divider</color>
+    <color name="separatorLight">@color/e_divider_color</color>
+    <color name="separatorDark">@color/e_divider_color</color>
 
     <color name="switchThumbEnabledLight">#ECECEC</color>
     <color name="switchThumbEnabledDark">#B9B9B9</color>
@@ -68,14 +68,14 @@
     <color name="switchTrackDisabledDark">#383838</color>
 
     <!-- This colour should only ever be used for attrs with the tools tag -->
-    <color name="tools_theme">@lineageos.platform:color/color_default_accent</color>
-    <color name="colorPrimary">@lineageos.platform:color/color_default_primary</color>
-    <color name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</color>
-    <color name="colorAccent">@lineageos.platform:color/color_default_accent</color>
-    <color name="selection_color">@lineageos.platform:color/color_default_selector</color>
-    <color name="foreground_color">@lineageos.platform:color/color_default_foreground</color>
-    <color name="color_default_icon">@lineageos.platform:color/color_default_icon</color>
-
+    <color name="tools_theme">@color/e_accent</color>
+    <color name="colorPrimary">@color/e_action_bar</color>
+    <color name="colorPrimaryDark">@color/e_action_bar</color>
+    <color name="colorAccent">@color/e_accent</color>
+    <color name="selection_color">@color/e_alpha_accent</color>
+    <color name="foreground_color">@color/e_floating_background</color>
+    <color name="color_default_icon">@color/e_icon_color</color>
+    <color name="icon_color">#666666</color>
 
     <color name="red_draft">#FF5D5D</color>
     <color name="avatar_bg_color">#e0e0e0</color>
diff --git a/presentation/src/main/res/values/styles.xml b/presentation/src/main/res/values/styles.xml
index c86f7a7b3918da7c1598ac19c2fa1f72c4682f0d..4352d1542a020e5026a7c621cfbdffdf93480a0e 100644
--- a/presentation/src/main/res/values/styles.xml
+++ b/presentation/src/main/res/values/styles.xml
@@ -122,12 +122,14 @@
         <item name="android:layout_weight">1</item>
         <item name="android:lines">1</item>
         <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/navigation_drawer_selector</item>
     </style>
 
     <style name="DrawerIcon">
         <item name="android:layout_height">24dp</item>
         <item name="android:layout_width">24dp</item>
         <item name="android:layout_marginEnd">32dp</item>
+        <item name="tint">@color/navigation_drawer_selector</item>
     </style>
 
     <style name="customAlertDialog" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml
index c09f13a5113bdb4e5d73dc7eb8bdf9c43aab20a1..b17e1435605a3f0cc29905bc3ef49adc22a376a3 100644
--- a/presentation/src/main/res/values/themes.xml
+++ b/presentation/src/main/res/values/themes.xml
@@ -57,7 +57,7 @@
         <item name="switchThumbDisabled">@color/switchThumbDisabledLight</item>
         <item name="switchTrackEnabled">@color/switchTrackEnabledLight</item>
         <item name="switchTrackDisabled">@color/switchTrackDisabledLight</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
         <item name="windowActionBar">false</item>
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
         <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@color/colorPrimaryDark</item>