diff --git a/app/build.gradle b/app/build.gradle
index c65ab1518b256e0726a4908cb5be53cb0ec8e2c9..53c170180f673bc0f2ba856ffa05d1e87d110489 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,6 +36,10 @@ android {
     androidExtensions {
         experimental = true
     }
+    aaptOptions{
+        additionalParameters '-I', 'app/e-ui-sdk.jar'
+    }
+
 }
 
 dependencies {
@@ -84,4 +88,6 @@ dependencies {
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1"
 
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
+
+    compileOnly files("e-ui-sdk.jar")
 }
diff --git a/app/e-ui-sdk.jar b/app/e-ui-sdk.jar
new file mode 100644
index 0000000000000000000000000000000000000000..222953d20421211ecc08ca2e2f16e735263d2f58
Binary files /dev/null and b/app/e-ui-sdk.jar differ
diff --git a/app/src/main/java/foundation/e/apps/MainActivity.kt b/app/src/main/java/foundation/e/apps/MainActivity.kt
index 558fa17549e59ed6b9389ee15783d687a52f5838..92ae33b26b735c9a7bbda2be6434137b165a972e 100644
--- a/app/src/main/java/foundation/e/apps/MainActivity.kt
+++ b/app/src/main/java/foundation/e/apps/MainActivity.kt
@@ -318,13 +318,10 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
     *  */
     private fun getAccentColor() {
 
-        val typedValue = TypedValue()
-        val contextThemeWrapper = ContextThemeWrapper(this,
-                android.R.style.Theme_DeviceDefault)
-        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
-                typedValue, true)
-        @ColorInt val color = typedValue.data
-        accentColorOS=color;
+        accentColorOS=this.resources.getColor(R.color.colorAccent);
+
+
+
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt b/app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt
index 5a4a15c39ea2092877b2a5a2555b189487060635..f1c94cacde0be2630c3611eeef884bfff8469102 100644
--- a/app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt
+++ b/app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt
@@ -762,12 +762,6 @@ class ApplicationActivity :
     }
 
     private fun getAccentColor() {
-        val typedValue = TypedValue()
-        val contextThemeWrapper = ContextThemeWrapper(this,
-                android.R.style.Theme_DeviceDefault)
-        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
-                typedValue, true)
-        @ColorInt val color = typedValue.data
-        accentColorOS=color;
+        accentColorOS=this.resources.getColor(R.color.colorAccent);
     }
 }
diff --git a/app/src/main/java/foundation/e/apps/application/model/Application.kt b/app/src/main/java/foundation/e/apps/application/model/Application.kt
index 740d4e5b1e755dd061bfea5b342e972d90f344d8..67e6dbc8efb9447a38a51a429b27016bb45f6e59 100644
--- a/app/src/main/java/foundation/e/apps/application/model/Application.kt
+++ b/app/src/main/java/foundation/e/apps/application/model/Application.kt
@@ -451,12 +451,8 @@ class Application(val packageName: String, private val applicationManager: Appli
    *
    */
     fun getAccentColor(context: Context): Int {
-        val typedValue = TypedValue()
-        val contextThemeWrapper = ContextThemeWrapper(context,
-                R.style.Theme_DeviceDefault)
-        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
-                typedValue, true)
-        @ColorInt val color = typedValue.data
+
+        val color =context.resources.getColor(foundation.e.apps.R.color.colorAccent);
         return color;
 
     }
diff --git a/app/src/main/java/foundation/e/apps/categories/CategoriesFragment.kt b/app/src/main/java/foundation/e/apps/categories/CategoriesFragment.kt
index 2ad9d324e57c4a844f70264162fcbf6af86e75d0..d202b2b2bb85a7f17027dace549ff567994848c8 100644
--- a/app/src/main/java/foundation/e/apps/categories/CategoriesFragment.kt
+++ b/app/src/main/java/foundation/e/apps/categories/CategoriesFragment.kt
@@ -72,12 +72,10 @@ class CategoriesFragment : Fragment() {
   *
   */
     fun getAccentColor(context: Context): Int {
-        val typedValue = TypedValue()
-        val contextThemeWrapper = ContextThemeWrapper(context,
-                android.R.style.Theme_DeviceDefault)
-        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
-                typedValue, true)
-        @ColorInt val color = typedValue.data
+
+        val color =context.resources.getColor(R.color.colorAccent);
+
+
         return color;
 
     }
diff --git a/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt b/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt
index 88ea41fd8dd89ac60ed11367bba89e5ac396cad0..5a3745fffeda03b3e33a3f089220d09236db4549 100644
--- a/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt
+++ b/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt
@@ -201,12 +201,6 @@ class CategoryActivity : AppCompatActivity(), ApplicationManagerServiceConnectio
    *  */
     private fun getAccentColor() {
 
-        val typedValue = TypedValue()
-        val contextThemeWrapper = ContextThemeWrapper(this,
-                android.R.style.Theme_DeviceDefault)
-        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
-                typedValue, true)
-        @ColorInt val color = typedValue.data
-        accentColorOS=color;
+        accentColorOS=this.resources.getColor(R.color.colorAccent);
     }
 }
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cb06e01fb4bc041e82f75765181dbda980260d87..95ca94f0992a84aa445b4b58fc8ddd4eaf1c4077 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,7 +20,14 @@
 <resources>
     <color name="colorPrimary">#FAFAFA</color>
     <color name="colorPrimaryDark">#FAFAFA</color>
-    <color name="colorAccent">#000000</color>
+<!--    <color name="colorAccent">#000000</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="color_default_background">@lineageos.platform:color/color_default_background</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="colorDivider">#CFD8DC</color>
     <color name="color_category_icon">#78909C</color>
@@ -37,4 +44,8 @@
     <color name="colorRatingGood">#4CAF50</color>
     <color name="colorRatingNeutral">#FFEB3B</color>
     <color name="colorRatingBad">#F44336</color>
+
+
+
+
 </resources>