diff --git a/build.gradle b/build.gradle
index 456eb54f43fcc1572c27ac8919544934766ac3fe..4230247bf2544e937c1459adcfdeb03ec4115edf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,6 +27,7 @@ allprojects {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
+        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index d87befd02fba590bc1c5bb790a8408868a38482b..e32164be7ca8e4a04128d3233e6c7e7dc5153f28 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 COMPILE_SDK_VERSION=29
-MIN_SDK_VERSION=19
+MIN_SDK_VERSION=21
 TARGET_SDK_VERSION=29
 VERSION_OVERRIDE=0
 android.enableJetifier=true
diff --git a/opentasks/build.gradle b/opentasks/build.gradle
index c92d48fe6c3d59737f57e7431ffba1f1707ea97c..fb22e9898bcb772f294c2ffac3017bd3ebc5832a 100644
--- a/opentasks/build.gradle
+++ b/opentasks/build.gradle
@@ -60,9 +60,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    aaptOptions{
-        additionalParameters '-I', 'opentasks/e-ui-sdk.jar'
-    }
 }
 
 dependencies {
@@ -95,7 +92,7 @@ dependencies {
     androidTestImplementation deps.support_test_runner
     androidTestImplementation deps.support_test_rules
     implementation project(path: ':opentaskspal')
-    compileOnly files("e-ui-sdk.jar")
+    implementation 'foundation.e:elib:0.0.1-alpha11'
 
 }
 
diff --git a/opentasks/e-ui-sdk.jar b/opentasks/e-ui-sdk.jar
deleted file mode 100644
index 4fe4cb0cb7123d5d3e771f29886f0d295b0388a4..0000000000000000000000000000000000000000
Binary files a/opentasks/e-ui-sdk.jar and /dev/null differ
diff --git a/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java b/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java
index 86310566ca4dea4f4f3e8cbf6edbf3a2ce821351..d7a846f664e324cb85a69c7a022549c91b944f50 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java
@@ -369,7 +369,6 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
         }
 
         ACCENT_COLOR = fetchAccentColor(this);
-        mFloatingActionButton.setBackgroundTintList(ColorStateList.valueOf(color_default_primary));
 
     }
 
@@ -841,8 +840,7 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
         //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent));
         getSupportActionBar().getThemedContext();
         toolbar.setTitleTextColor(color_default_primary_text);
-        setOverflowButtonColor(toolbar, ACCENT_COLOR);
-
+        toolbar.setOverflowIcon(ContextCompat.getDrawable(context, R.drawable.e_ic_more));
         return ACCENT_COLOR;
     }
 
diff --git a/opentasks/src/main/res/drawable/ic_add.xml b/opentasks/src/main/res/drawable/ic_add.xml
index cf705b076e774874fe16effeb045002986e92db1..c22a42c4a00e54e934e11eb119811e9b8686c3fe 100644
--- a/opentasks/src/main/res/drawable/ic_add.xml
+++ b/opentasks/src/main/res/drawable/ic_add.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="@color/color_default_blue1">
+    android:tint="@color/e_icon_color">
   <path
-      android:fillColor="@color/translucent_black"
+      android:fillColor="#FFFFFF"
       android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/opentasks/src/main/res/drawable/ic_settings.xml b/opentasks/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e1cfdfc8d9ca3d8152ae1a55d34e95eb588e5f04
--- /dev/null
+++ b/opentasks/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,21 @@
+<?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 android:height="24dp" android:tint="@color/e_icon_color"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>
diff --git a/opentasks/src/main/res/layout/activity_task_list.xml b/opentasks/src/main/res/layout/activity_task_list.xml
index 6528adecc57d6ed38a66cdd46b9149a2963d9f02..021149402111e9f9a93e277ef4e2c03d2918ad8f 100644
--- a/opentasks/src/main/res/layout/activity_task_list.xml
+++ b/opentasks/src/main/res/layout/activity_task_list.xml
@@ -42,7 +42,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_margin="16dp"
-            android:tint="@color/accent"
+            android:tint="@color/e_background"
+            app:backgroundTint="@color/e_accent"
             app:layout_anchor="@id/pager"
             app:layout_anchorGravity="bottom|right|end"
             android:src="@drawable/ic_action_add"/>
diff --git a/opentasks/src/main/res/layout/activity_task_twopane.xml b/opentasks/src/main/res/layout/activity_task_twopane.xml
index cdbf9c5d2924ef703b6e57b2179bbee360cbf0b6..7df402d0e8d7a8d2047d4592e45bf4cdf8228abd 100644
--- a/opentasks/src/main/res/layout/activity_task_twopane.xml
+++ b/opentasks/src/main/res/layout/activity_task_twopane.xml
@@ -55,7 +55,8 @@
             android:layout_gravity="center"
             android:layout_margin="16dp"
             app:layout_anchor="@id/appbar"
-            android:tint="@color/accent"
+            app:backgroundTint="@color/e_accent"
+            android:tint="@color/e_background"
             app:layout_anchorGravity="bottom|right|end"
             android:src="@drawable/ic_action_add"/>
 
diff --git a/opentasks/src/main/res/layout/fragment_task_view_detail.xml b/opentasks/src/main/res/layout/fragment_task_view_detail.xml
index 9b1664d82de952de71badb240c3205157c716a4d..2210f79bfccbda8c65a6a6ec97fc6fc1409433f9 100644
--- a/opentasks/src/main/res/layout/fragment_task_view_detail.xml
+++ b/opentasks/src/main/res/layout/fragment_task_view_detail.xml
@@ -141,6 +141,8 @@
             android:layout_gravity="center"
             android:layout_margin="16dp"
             android:src="@drawable/ic_action_complete"
+            android:tint="@color/e_background"
+            app:backgroundTint="@color/e_accent"
             app:layout_anchor="@id/appbar"
             app:layout_anchorGravity="bottom|right|end" />
 
diff --git a/opentasks/src/main/res/layout/fragment_visiblelist_list.xml b/opentasks/src/main/res/layout/fragment_visiblelist_list.xml
index c5f4d636115a2341b000f0f2716f426288194087..0ea60963119abb36f06f18ae3b01268e62b660ef 100644
--- a/opentasks/src/main/res/layout/fragment_visiblelist_list.xml
+++ b/opentasks/src/main/res/layout/fragment_visiblelist_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical"
@@ -22,6 +23,8 @@
             android:onClick="showSyncedList"
             android:paddingLeft="24dip"
             android:paddingRight="24dip"
+            app:backgroundTint="@color/e_accent"
+            android:textColor="@color/e_background"
             android:text="@string/synced_task_lists"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/visible_task_list_item.xml b/opentasks/src/main/res/layout/visible_task_list_item.xml
index 862b570d8722a640cb4a835cd2a4ea868e7dc04f..49fcb13b5963990d7768a0045503ceaf997daab7 100644
--- a/opentasks/src/main/res/layout/visible_task_list_item.xml
+++ b/opentasks/src/main/res/layout/visible_task_list_item.xml
@@ -33,11 +33,9 @@
             android:layout_centerVertical="true"
             android:layout_marginEnd="12dp"
             android:layout_marginRight="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:padding="12dp"
-            android:src="@drawable/ic_24_settings_black50"
-            android:tint="@color/accent"/>
+            android:src="@drawable/ic_settings"/>
 
     <TextView
             android:id="@android:id/text1"
diff --git a/opentasks/src/main/res/values/colors.xml b/opentasks/src/main/res/values/colors.xml
index b1d1e84c9d7210b19ab4f8ae944b7162b0ce3b9f..734b4f5cdceccf3df2cadb7e72e144672021b243 100644
--- a/opentasks/src/main/res/values/colors.xml
+++ b/opentasks/src/main/res/values/colors.xml
@@ -9,8 +9,8 @@
     <color name="translucent_white">#22FFFFFF</color>
     <color name="translucent_bg">@color/color_default_background</color>
     <color name="holo_blue">#CC33B5E5</color>
-    <color name="priority_green">@lineageos.platform:color/color_default_green1</color>
-    <color name="priority_red">@lineageos.platform:color/color_default_red1</color>
+    <color name="priority_green">#38D874</color>
+    <color name="priority_red">#FB3846</color>
     <color name="priority_yellow">#ffc107</color>
     <color name="list_background_pressed">#11000000</color>
     <color name="list_background_activated">#33000000</color>
@@ -26,28 +26,27 @@
     <!-- A dark Holo shade of green -->
     <color name="holo_green_dark">#ff669900</color>
     <!-- A dark Holo shade of red -->
-    <color name="holo_red_dark">@lineageos.platform:color/color_default_red1</color>
+    <color name="holo_red_dark">@color/priority_red</color>
     <!-- A Holo shade of purple -->
     <color name="holo_purple">#ffaa66cc</color>
     <!-- A light Holo shade of orange -->
     <color name="holo_orange_light">#ffffbb33</color>
     <!-- A dark Holo shade of orange -->
-    <color name="holo_orange_dark">@lineageos.platform:color/color_default_orange1</color>
+    <color name="holo_orange_dark">#FC7222</color>
     <!-- A really bright Holo shade of blue -->
-    <color name="holo_blue_bright">@lineageos.platform:color/color_default_blue1</color>
-    <color name="material_red">@lineageos.platform:color/color_default_red1</color>
+    <color name="holo_blue_bright">@color/e_accent</color>
+    <color name="material_red">@color/priority_red</color>
     <color name="task_progress_start_color">#1f808080</color>
 
     <!--     Our primary color - a nice shade of teal-->
 
-    <color name="primary">@lineageos.platform:color/color_default_primary</color>
-    <color name="primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
-    <color name="accent">@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="color_default_background">@lineageos.platform:color/color_default_background</color>
-    <color name="color_default_blue1">@lineageos.platform:color/color_default_accent</color>
-    <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
-    <color name="color_default_green1">@lineageos.platform:color/color_default_green1</color>
-    <color name="color_divider">@lineageos.platform:color/color_default_divider</color>
+    <color name="primary">@color/e_action_bar</color>
+    <color name="primary_dark">@color/e_action_bar</color>
+    <color name="accent">@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="color_default_background">@color/e_background</color>
+    <color name="color_default_blue1">@color/e_accent</color>
+    <color name="color_default_green1">@color/priority_green</color>
+    <color name="color_divider">@color/e_divider_color</color>
 </resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values/styles.xml b/opentasks/src/main/res/values/styles.xml
index 6a65b0df765d4b416175ffc81b4e99dbd3d2d642..39033c649e29284a5ff5a9e219ed6edf6de4e3ad 100644
--- a/opentasks/src/main/res/values/styles.xml
+++ b/opentasks/src/main/res/values/styles.xml
@@ -20,9 +20,9 @@
         <item name="windowNoTitle">true</item>
         <item name="android:navigationBarColor">@color/primary_dark</item>
         <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_accent</item>
-        <item name="actionOverflowButtonStyle">@style/actionWhiteOverflowButtonStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
         <item name="android:timePickerDialogTheme">@style/MyAppTheme_datePicker</item>
+        <item name="android:itemBackground">@color/e_floating_background</item>
     </style>
 
 
@@ -41,8 +41,7 @@
         <item name="android:textColorSecondary">@color/color_default_primary_text</item>
         <item name="android:navigationBarColor">@color/primary_dark</item>
         <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_accent</item>
-        <item name="actionOverflowButtonStyle">@style/actionOverflowButtonStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
     </style>
 
     <!-- ActionBar styles -->
@@ -182,7 +181,7 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="actionMenuTextColor">@color/accent</item>
+        <item name="actionMenuTextColor">@color/e_secondary_text_color</item>
         <item name="android:textColorPrimary">@color/accent</item>
         <item name="colorAccent">@color/accent</item>
     </style>
@@ -275,23 +274,22 @@
 
     <style name="OpenTasksAppThemeWhiteBackButton" parent="OpenTasksAppTheme">
         <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted.White</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
     </style>
 
     <style name="AppTheme.ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
         <!-- THIS is where you can color the arrow and the overflow button! -->
         <!--splash_title-->
         <item name="colorControlNormal">@color/color_default_primary_text</item> <!-- sets the color for the back arrow -->
-        <item name="actionOverflowButtonStyle">@style/actionOverflowButtonStyle</item> <!-- sets the style for the overflow button -->
     </style>
 
     <!-- This style is where you define the tint color of your overflow menu button -->
     <style name="actionOverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/accent</item>
+        <item name="android:tint">@color/e_icon_color</item>
     </style>
 
     <style name="actionWhiteOverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@android:color/white</item>
+        <item name="android:tint">@color/e_icon_color</item>
     </style>
 
 
@@ -313,8 +311,7 @@
         <item name="android:textColorSecondary">@color/color_default_primary_text</item>
         <item name="android:navigationBarColor">@color/primary_dark</item>
         <item name="android:navigationBarDividerColor">@color/primary_dark</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_accent</item>
-        <item name="actionOverflowButtonStyle">@style/actionOverflowButtonStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
     </style>
 
     <style name="AboutTheme" parent="AboutBaseTheme" />
@@ -453,7 +450,7 @@
 
     <style name="settingToolbarTheme">
         <!-- Used to tint the back arrow, menu and spinner arrow -->
-        <item name="colorControlNormal">@color/accent</item>
+        <item name="colorControlNormal">@color/e_icon_color</item>
     </style>
 
     <style name="actionBarPopUpTheme" parent="ThemeOverlay.AppCompat.Light" />
@@ -473,10 +470,10 @@
     </style>
 
     <style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
-        <item name="tint">@color/accent</item>
+        <item name="tint">@color/e_primary_text_color</item>
     </style>
 
     <style name="Toolbar.Button.Navigation.Tinted.White" parent="Widget.AppCompat.Toolbar.Button.Navigation">
-        <item name="tint">@android:color/white</item>
+        <item name="tint">@color/e_primary_text_color</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/xml/listview_tabs.xml b/opentasks/src/main/res/xml/listview_tabs.xml
index 037ac6cb74aa652918db7c219f8d0880be406a21..4397eeb2771ee0a86bb667f983bf249827ceeff0 100644
--- a/opentasks/src/main/res/xml/listview_tabs.xml
+++ b/opentasks/src/main/res/xml/listview_tabs.xml
@@ -1,22 +1,22 @@
 <tabconfig xmlns="http://schema.dmfs.org/tasks">
 
     <tab id="@+id/task_group_by_list"
-            icon="@lineageos.platform:drawable/ic_list"
+            icon="@drawable/ic_tab_list"
             title="@string/task_group_all_title"/>
     <tab id="@+id/task_group_by_due"
-            icon="@lineageos.platform:drawable/ic_clock_due"
+            icon="@drawable/ic_tab_due"
             title="@string/task_group_due_title"/>
     <tab id="@+id/task_group_by_start"
-            icon="@lineageos.platform:drawable/ic_ongoing"
+            icon="@drawable/ic_tab_start"
             title="@string/task_group_start_title"/>
     <tab id="@+id/task_group_by_priority"
-            icon="@lineageos.platform:drawable/ic_info"
+            icon="@drawable/ic_tab_priority"
             title="@string/task_group_priority_title"/>
     <tab id="@+id/task_group_by_progress"
-            icon="@lineageos.platform:drawable/ic_task_progress"
+            icon="@drawable/ic_tab_progress"
             title="@string/task_group_progress_title"/>
     <tab id="@+id/task_group_search"
-            icon="@lineageos.platform:drawable/ic_search"
+            icon="@drawable/ic_tab_search"
             title="@string/task_group_search_title"
             visible="true"/>