diff --git a/app/build.gradle b/app/build.gradle
index 82808285cacc7a70f5ed3261c2f42a81044eac01..cb191fdc6ebbf19fef9cef2217bc2eafcad2f24f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,14 +30,9 @@ android {
         enabled = true
     }
 
-    aaptOptions {
-        additionalParameters '-I', 'e-ui-sdk.jar'
-    }
-
 }
 
 dependencies {
-    compileOnly files("../e-ui-sdk.jar")
 
     implementation project(':cert4android')
 
@@ -60,4 +55,5 @@ dependencies {
     implementation "com.google.android.material:material:1.0.0"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'foundation.e:elib:0.0.1-alpha11'
 }
diff --git a/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java
index 771991ba4198a0bca0b0fd3a0dca52e5710094b2..43ae92a39b64378e9f4d5582ec63ea82875be97e 100644
--- a/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java
@@ -339,10 +339,10 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
         drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.action_drawer_open, R.string.action_drawer_close);
         drawerToggle.setDrawerIndicatorEnabled(false);
         drawerLayout.addDrawerListener(drawerToggle);
-        drawerToggle.setHomeAsUpIndicator(lineageos.platform.R.drawable.ic_hamburger);
+        drawerToggle.setHomeAsUpIndicator(R.drawable.e_ic_hamburger);
 
         if (toolbar.getNavigationIcon() != null)
-            toolbar.getNavigationIcon().setTint(ContextCompat.getColor(this, lineageos.platform.R.color.color_default_accent));
+            toolbar.getNavigationIcon().setTint(ContextCompat.getColor(this, R.color.e_primary_text_color));
 
         drawerToggle.setToolbarNavigationClickListener(new View.OnClickListener() {
             @Override
@@ -389,8 +389,8 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
     }
 
     private void setupNavigationList(final String selectedItem) {
-        itemRecent = new NavigationAdapter.NavigationItem(ADAPTER_KEY_RECENT, getString(R.string.label_all_notes), null, lineageos.platform.R.drawable.ic_recent);
-        itemFavorites = new NavigationAdapter.NavigationItem(ADAPTER_KEY_STARRED, getString(R.string.label_favorites), null, lineageos.platform.R.drawable.ic_star_filled);
+        itemRecent = new NavigationAdapter.NavigationItem(ADAPTER_KEY_RECENT, getString(R.string.label_all_notes), null, R.drawable.ic_access_time_grey600_24dp);
+        itemFavorites = new NavigationAdapter.NavigationItem(ADAPTER_KEY_STARRED, getString(R.string.label_favorites), null, R.drawable.ic_star_yellow_24dp);
         adapterCategories = new NavigationAdapter(new NavigationAdapter.ClickListener() {
             @Override
             public void onItemClick(NavigationAdapter.NavigationItem item) {
@@ -524,9 +524,9 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
     }
 
     private void setupNavigationMenu() {
-        final NavigationAdapter.NavigationItem itemTrashbin = new NavigationAdapter.NavigationItem("trashbin", getString(R.string.action_trashbin), null, lineageos.platform.R.drawable.ic_bin);
-        final NavigationAdapter.NavigationItem itemSettings = new NavigationAdapter.NavigationItem("settings", getString(R.string.action_settings), null, lineageos.platform.R.drawable.ic_settings);
-        final NavigationAdapter.NavigationItem itemAbout = new NavigationAdapter.NavigationItem("about", getString(R.string.simple_about), null, lineageos.platform.R.drawable.ic_info);
+        final NavigationAdapter.NavigationItem itemTrashbin = new NavigationAdapter.NavigationItem("trashbin", getString(R.string.action_trashbin), null, R.drawable.ic_delete_grey600_24dp);
+        final NavigationAdapter.NavigationItem itemSettings = new NavigationAdapter.NavigationItem("settings", getString(R.string.action_settings), null, R.drawable.ic_settings_grey600_24dp);
+        final NavigationAdapter.NavigationItem itemAbout = new NavigationAdapter.NavigationItem("about", getString(R.string.simple_about), null, R.drawable.ic_info_outline_grey600_24dp);
 
         ArrayList<NavigationAdapter.NavigationItem> itemsMenu = new ArrayList<>();
         itemsMenu.add(itemTrashbin);
diff --git a/app/src/main/java/foundation/e/notes/model/ItemAdapter.java b/app/src/main/java/foundation/e/notes/model/ItemAdapter.java
index 9bc79e12c26160fc4e1cce3b6f6391298883d1c7..15963a9e906a7a084ae1fe330a24f46a20781401 100644
--- a/app/src/main/java/foundation/e/notes/model/ItemAdapter.java
+++ b/app/src/main/java/foundation/e/notes/model/ItemAdapter.java
@@ -105,7 +105,7 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
             nvHolder.noteCategory.setText(Html.fromHtml(note.getCategory()));
             nvHolder.noteExcerpt.setText(Html.fromHtml(note.getExcerpt()));
             nvHolder.noteStatus.setVisibility(DBStatus.VOID.equals(note.getStatus()) ? View.INVISIBLE : View.VISIBLE);
-            nvHolder.noteFavorite.setImageResource(note.isFavorite() ? lineageos.platform.R.drawable.ic_star_filled : lineageos.platform.R.drawable.ic_star);
+            nvHolder.noteFavorite.setImageResource(note.isFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_grey_ccc_24dp);
             nvHolder.noteFavorite.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
diff --git a/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java b/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java
index a652e49470967e6732f1c8c9a78fc42cde47b115..cd8e05be5cce3405c438c7dfbe1a730ec0b106d7 100644
--- a/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java
+++ b/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java
@@ -25,7 +25,7 @@ import foundation.e.notes.util.NoteUtil;
 public class NavigationAdapter extends RecyclerView.Adapter<NavigationAdapter.ViewHolder> {
 
     @DrawableRes
-    public static final int ICON_FOLDER = lineageos.platform.R.drawable.ic_folder;
+    public static final int ICON_FOLDER = R.drawable.ic_folder_grey600_24dp;
     @DrawableRes
     public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_grey600_24dp;
     @DrawableRes
diff --git a/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml b/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml
index 1c7ebd95791e0ae8c49be719f5bb2e737fb89f9e..ed6b7ece936773437a590250dcdaab0dfe780f64 100644
--- a/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml
+++ b/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml
@@ -1,11 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ 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/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="#cccccc"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:tint="@color/e_icon_color"
+    android:viewportWidth="48.0"
+    android:viewportHeight="48.0">
     <path
-        android:fillColor="#FFcccccc"
-        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
-</vector>
+        android:fillColor="@android:color/white"
+        android:pathData="M16.15,37.75 L24,33.05 31.85,37.8 29.75,28.9 36.65,22.9 27.55,22.1 24,13.7 20.45,22.05 11.35,22.85 18.25,28.85ZM11.65,44 L14.9,29.95 4,20.5 18.4,19.25 24,6 29.6,19.25 44,20.5 33.1,29.95 36.35,44 24,36.55ZM24,26.25Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 34b86389c59a17297591a25e4b5e9fd62bfb0582..a3877db90b667dc5b060bca9c0b8d38bb38dd03e 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -36,7 +36,7 @@
                 android:background="@color/accent_color"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_with_e_account"
-                android:textColor="@android:color/white" />
+                android:textColor="@color/e_background" />
 
             <Button
                 android:id="@+id/manual_account_login_button"
@@ -47,7 +47,7 @@
                 android:background="@color/accent_color"
                 android:layout_marginTop="16dp"
                 android:text="@string/Other"
-                android:textColor="@android:color/white" />
+                android:textColor="@color/e_background" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_exception.xml b/app/src/main/res/layout/activity_exception.xml
index 256951d10b587c5c8d89ed2dfbb2578b95143444..d6b69f19f86067f9011ba566fefa8d2f9075f6e7 100644
--- a/app/src/main/res/layout/activity_exception.xml
+++ b/app/src/main/res/layout/activity_exception.xml
@@ -46,7 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_weight=".5"
             android:background="@color/accent_color"
-            android:textColor="@color/color_default_primary_text"
+            android:textColor="@color/e_background"
             android:text="@string/simple_close" />
 
         <Space
@@ -59,7 +59,7 @@
             android:layout_height="wrap_content"
             android:layout_weight=".5"
             android:background="@color/accent_color"
-            android:textColor="@color/color_default_primary_text"
+            android:textColor="@color/e_background"
             android:text="@string/simple_copy" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml
index bac644df0a491d08b1c8e89d5f1f26bf0f36de33..1445913c37ac73173a1c6565cf30e130253c8bcb 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -40,9 +40,9 @@
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_create"
         style="@style/fab"
-        android:src="@lineageos.platform:drawable/ic_add"
+        android:src="@drawable/ic_add_white_24dp"
         android:title="@string/action_create"
-        app:backgroundTint="@color/primary"
+        app:backgroundTint="@color/e_accent"
         app:rippleColor="@color/primary_dark"
-        app:tint="@color/accent_color"/>
+        app:tint="@color/e_background"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_notes_list_note_item.xml b/app/src/main/res/layout/fragment_notes_list_note_item.xml
index 7f96adb78437a861011d004359cb7b38411a21d4..270427f6e24ec1db648afe9d12e6f3b87e5d7d8d 100644
--- a/app/src/main/res/layout/fragment_notes_list_note_item.xml
+++ b/app/src/main/res/layout/fragment_notes_list_note_item.xml
@@ -42,8 +42,7 @@
                 android:contentDescription="@string/menu_favorite"
                 android:padding="16dp"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:tint="@color/accent_color"/>
+                android:layout_height="match_parent" />
 
 
             <ImageView
diff --git a/app/src/main/res/menu/menu_list_context_multiple.xml b/app/src/main/res/menu/menu_list_context_multiple.xml
index 4450818ed17f226312393c315fa0ce81e11ba74b..2d9a0f6730a15cec4e526f18e2b0b0f2a7e9c07b 100644
--- a/app/src/main/res/menu/menu_list_context_multiple.xml
+++ b/app/src/main/res/menu/menu_list_context_multiple.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/menu_delete"
         android:icon="@drawable/ic_delete_white_24dp"
-        app:iconTint="@color/accent_color"
+        app:iconTint="@color/e_icon_color"
         android:orderInCategory="100"
         android:title="@string/menu_delete"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_list_view.xml b/app/src/main/res/menu/menu_list_view.xml
index d414bc22d6caa266233e9d144bd48958f6a23355..abce369170d65735067b6ca152a0acc9af61010c 100644
--- a/app/src/main/res/menu/menu_list_view.xml
+++ b/app/src/main/res/menu/menu_list_view.xml
@@ -5,10 +5,10 @@
     tools:context="com.example.owncloudnotes.NotesListViewActivity">
     <item
         android:id="@+id/search"
-        android:icon="@lineageos.platform:drawable/ic_search"
+        android:icon="@drawable/ic_search_white_24dp"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="@color/accent_color"
-        android:searchIcon="@lineageos.platform:drawable/ic_search"
+        app:iconTint="@color/e_icon_color"
+        android:searchIcon="@drawable/ic_search_white_24dp"
         app:showAsAction="collapseActionView|always" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_note_activity.xml b/app/src/main/res/menu/menu_note_activity.xml
index 41f729a58eed62dbcc3187a080dba276bb3aeec0..8a8054b39a7d8c9a25d28f51ed659720003daff3 100644
--- a/app/src/main/res/menu/menu_note_activity.xml
+++ b/app/src/main/res/menu/menu_note_activity.xml
@@ -6,13 +6,13 @@
         android:icon="@drawable/ic_eye_white_24dp"
         android:orderInCategory="60"
         android:title="@string/menu_preview"
-        app:iconTint="@color/accent_color"
+        app:iconTint="@color/e_icon_color"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_edit"
         android:icon="@drawable/ic_edit_white_24dp"
         android:orderInCategory="60"
         android:title="@string/simple_edit"
-        app:iconTint="@color/accent_color"
+        app:iconTint="@color/e_icon_color"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_note_fragment.xml b/app/src/main/res/menu/menu_note_fragment.xml
index 3f87596aec0e646fff119e4ed0f9558a439df5d5..6ded16b222cfc51922540e967853c0715394c927 100644
--- a/app/src/main/res/menu/menu_note_fragment.xml
+++ b/app/src/main/res/menu/menu_note_fragment.xml
@@ -4,11 +4,11 @@
 
     <item
         android:id="@+id/search"
-        android:icon="@lineageos.platform:drawable/ic_search"
+        android:icon="@drawable/ic_search_white_24dp"
         android:orderInCategory="50"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="@color/accent_color"
+        app:iconTint="@color/e_icon_color"
         app:showAsAction="ifRoom|collapseActionView" />
 
     <item
@@ -22,7 +22,7 @@
         android:icon="@drawable/ic_folder_white_24dp"
         android:orderInCategory="100"
         android:title="@string/menu_change_category"
-        app:iconTint="@color/accent_color"
+        app:iconTint="@color/e_icon_color"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_share"
@@ -30,21 +30,21 @@
         android:orderInCategory="100"
         android:title="@string/menu_share"
         app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider"
-        app:iconTint="@color/accent_color"
+        app:iconTint="@color/e_icon_color"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_cancel"
         android:icon="@drawable/ic_clear_white_24dp"
         android:orderInCategory="120"
         android:title="@string/simple_cancel"
-        app:iconTint="@color/accent_color"
+        app:iconTint="@color/e_icon_color"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_delete"
         android:icon="@drawable/ic_delete_white_24dp"
         android:orderInCategory="130"
         android:title="@string/menu_delete"
-        app:iconTint="@color/accent_color"
+        app:iconTint="@color/e_icon_color"
         app:showAsAction="never" />
 
 </menu>
\ 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 1bca2836db09459e915b07e619bf87be03a9c0b6..2ad36c7f637c09d04e0fac7318df26a809220e74 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,27 +2,27 @@
 <resources>
     <!-- Colors -->
 
-    <color name="primary">@lineageos.platform:color/color_default_primary</color>
-    <color name="primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="primary">@color/e_action_bar</color>
+    <color name="primary_dark">@color/e_action_bar</color>
 
-    <color name="accent_color">@lineageos.platform:color/color_default_accent</color>
-    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
-    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="accent_color">@color/e_accent</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="separator">@lineageos.platform:color/color_default_divider</color>
+    <color name="separator">@color/e_divider_color</color>
 
     <color name="bg_transparent">#aa000000</color>
     <color name="bg_highlighted">@android:color/white</color>
-    <color name="bg_selected_item">@lineageos.platform:color/color_default_foreground</color>
-    <color name="bg_normal">@lineageos.platform:color/color_default_background</color>
+    <color name="bg_selected_item">@color/e_floating_background</color>
+    <color name="bg_normal">@color/e_background</color>
     <color name="bg_attention">#d40000</color>
     <color name="bg_warning">#ffcc00</color>
-    <color name="fg_default">@lineageos.platform:color/color_default_foreground</color>
-    <color name="fg_default_selection">@lineageos.platform:color/color_default_selector</color>
-    <color name="fg_default_low">@lineageos.platform:color/color_default_foreground</color>
-    <color name="fg_default_high">@lineageos.platform:color/color_default_foreground</color>
+    <color name="fg_default">@color/e_floating_background</color>
+    <color name="fg_default_selection">@color/e_alpha_accent</color>
+    <color name="fg_default_low">@color/e_floating_background</color>
+    <color name="fg_default_high">@color/e_floating_background</color>
     <color name="light_grey">#f4757575</color>
-    <color name="navigation_bar_background_color">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="navigation_bar_background_color">@color/e_action_bar</color>
 
     <color name="widget_background">#DFFFFFFF</color>
     <color name="widget_fg_default">#000000</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5acc0961eca104fd5ac705b9907dbd5cc964917b..bafeafcefdd4fb40ca4f8e63510d4ebca20120e5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
         <item name="android:windowBackground">@color/bg_normal</item>
-        <item name="colorControlNormal">@color/accent_color</item>
+        <item name="colorControlNormal">@color/e_icon_color</item>
         <item name="android:navigationBarColor">@color/navigation_bar_background_color</item>
         <item name="android:statusBarColor">@color/navigation_bar_background_color</item>
         <!-- toolbar back button color -->
@@ -26,7 +26,7 @@
 
     <style name="AppTheme.OverFlow">
         <item name="android:src">@drawable/ic_more_24</item>
-        <item name="tint">@color/accent_color</item>
+        <item name="tint">@color/e_icon_color</item>
     </style>
 
     <style name="AppTheme.ActionModeStyle" parent="Base.Widget.AppCompat.ActionMode">
@@ -35,7 +35,7 @@
     </style>
 
     <style name="AppTheme.ActionModeCloseButtonStyle" parent="Widget.AppCompat.Light.ActionButton.CloseMode">
-        <item name="tint">@color/accent_color</item>
+        <item name="tint">@color/e_primary_text_color</item>
     </style>
 
     <style name="AppTheme" parent="AppBaseTheme">
@@ -54,7 +54,7 @@
     </style>
 
     <style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
-        <item name="tint">@color/accent_color</item>
+        <item name="tint">@color/e_primary_text_color</item>
     </style>
 
     <!--
diff --git a/build.gradle b/build.gradle
index 129f07648ff3a607ef6b8e3ed9f6bae5a97e3a84..d812daf2785195aadff29973832bbb5a1e9fd28a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        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 0395ffbdfe015ff21c747bd566800f69f2439fcb..0000000000000000000000000000000000000000
Binary files a/e-ui-sdk.jar and /dev/null differ