diff --git a/.gitignore b/.gitignore
index 2b816b58b9e16e3a4ebf11d664b91409b55db869..3a8dd966d4fad09deafcdd478542f0472821d21c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 # Ignore the samples directory, since they should be separate git projects
 samples/
+e-ui-sdk.jar
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ec2279a1cd21bf8df575059425288951aa549d1..2c7db0f156ce6176e3fd2b8a445f8d826eca6b43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,21 @@
 stages:
   - update-from-upstream
+  - build-sdk
 
 include:
   - project: 'e/priv/os/build'
     ref: master
     file: '/templates/.gitlab-ci-update-from-upstream.yml'
+
+image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest"
+
+before_script:
+- chmod a+x buildSdk.sh
+
+build-sdk:
+  stage: build-sdk
+  script:
+  - ./buildSdk.sh
+  artifacts:
+    paths:
+    - e-ui-sdk.jar
\ No newline at end of file
diff --git a/buildSdk.sh b/buildSdk.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ae2640696db1bbf4d750efa996677b98aa15f543
--- /dev/null
+++ b/buildSdk.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+echo "Clearing intermediates"
+rm -rf intermediates
+mkdir intermediates
+
+if [[ -z "${ANDROID_HOME}" ]]; then
+	echo "{ANDROID_HOME} path variable is not set. Set it to point Android SDK."
+	exit 1
+else
+	build_tools_dir=$ANDROID_HOME/build-tools/29.0.2/
+fi
+
+aapt2="${build_tools_dir}/aapt2"
+
+echo "Compiling resources"
+$aapt2 compile --dir lineage/res/res -o intermediates/resources.zip
+
+platform_dir=$ANDROID_HOME/platforms/android-28
+
+echo "Linking resources"
+$aapt2 link intermediates/resources.zip -I $platform_dir/android.jar \
+ --private-symbols org.lineageos.platform.internal \
+ --allow-reserved-package-id \
+ --package-id 63 \
+ --manifest lineage/res/AndroidManifest.xml \
+ --java intermediates \
+ -o intermediates/res.apk
+
+echo "Unzipping temporary apk"
+unzip -qo intermediates/res.apk -d intermediates/
+
+# Creating obj directory
+rm -rf obj
+mkdir obj
+
+# Compiling R.java
+echo "Compiling R.java"
+javac -source 1.8 -target 1.8 $(find intermediates/lineageos -type f -name 'R.java') -d obj
+
+jar cvf e-ui-sdk.jar -C obj . -C intermediates resources.arsc
+
+echo "Clearing intermediate sources"
+rm -rf intermediates
+rm -rf obj
+echo "e-ui-sdk.jar generated successully."
\ No newline at end of file
diff --git a/lineage/res/Android.mk b/lineage/res/Android.mk
index 6baba6b93caa95977ddd44858bc1c5b7a6a07e8e..a13d9fcc43bf4b58c527d2d53e4ba7a98e78d153 100644
--- a/lineage/res/Android.mk
+++ b/lineage/res/Android.mk
@@ -22,6 +22,7 @@ LOCAL_CERTIFICATE := platform
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --private-symbols org.lineageos.platform.internal
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)
+LOCAL_RESOURCE_DIR += $(addprefix $(LOCAL_PATH)/, res-symbol)
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../../sdk/res/res
 
 # Tell aapt to create "extending (non-application)" resource IDs,
diff --git a/lineage/res/res/values/symbols.xml b/lineage/res/res-symbol/values/symbols.xml
similarity index 100%
rename from lineage/res/res/values/symbols.xml
rename to lineage/res/res-symbol/values/symbols.xml
diff --git a/lineage/res/res/drawable/ic_menu.xml b/lineage/res/res/drawable/ic_menu.xml
new file mode 100644
index 0000000000000000000000000000000000000000..afc1652b009b43cb2b9db3bd173167f78f0d89b1
--- /dev/null
+++ b/lineage/res/res/drawable/ic_menu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="35dp"
+    android:height="28dp"
+    android:viewportWidth="35"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M33.5731,2.7921C33.6451,2.7921 33.7238,2.7921 33.8745,2.6401C33.9478,2.5681 34.0265,2.4894 34.0265,2.3388V0.5214C34.0265,0.4428 33.9478,0.3695 33.8745,0.2188C33.7238,0.1401 33.6451,0.0681 33.5731,0.0681H0.5106C0.3599,0.0681 0.2865,0.1401 0.2078,0.2188C0.0572,0.3695 0.0571,0.4428 0.0571,0.5214V2.3388C0.0571,2.4894 0.0572,2.5681 0.2078,2.6401C0.2865,2.7921 0.3599,2.7921 0.5106,2.7921H33.5731ZM33.5731,14.9215C33.6451,14.9215 33.7238,14.9215 33.8745,14.7708C33.9478,14.6975 34.0265,14.6201 34.0265,14.4694V12.6508C34.0265,12.5735 33.9478,12.5001 33.8745,12.3494C33.7238,12.2708 33.6451,12.1975 33.5731,12.1975H0.5106C0.3599,12.1975 0.2865,12.2708 0.2078,12.3494C0.0572,12.5001 0.0571,12.5735 0.0571,12.6508V14.4694C0.0571,14.6201 0.0572,14.6975 0.2078,14.7708C0.2865,14.9215 0.3599,14.9215 0.5106,14.9215H33.5731ZM33.5731,27.0575C33.6451,27.0575 33.7238,27.0574 33.8745,26.9068C33.9478,26.8281 34.0265,26.7548 34.0265,26.6041V24.7815C34.0265,24.7081 33.9478,24.6308 33.8745,24.4788C33.7238,24.4068 33.6451,24.3281 33.5731,24.3281H0.5106C0.3599,24.3281 0.2865,24.4068 0.2078,24.4788C0.0572,24.6308 0.0571,24.7081 0.0571,24.7815V26.6041C0.0571,26.7548 0.0572,26.8281 0.2078,26.9068C0.2865,27.0574 0.3599,27.0575 0.5106,27.0575H33.5731Z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/lineage/res/res/drawable/ic_search.xml b/lineage/res/res/drawable/ic_search.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c055d95fa1e95808b4369075e8d1cc75b63ec787
--- /dev/null
+++ b/lineage/res/res/drawable/ic_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M25.1253,21.776L19.2972,16.276C19.1559,16.188 19.0103,16.0934 18.8636,16.0934H18.2399C19.7346,14.4588 20.6969,12.276 20.6969,9.9173C20.6969,4.7347 16.1661,0.4639 10.6768,0.4639C5.1394,0.4639 0.6611,4.7347 0.6611,9.9173C0.6611,15.14 5.1394,19.3695 10.6768,19.3695C13.1821,19.3695 15.4475,18.5054 17.2288,17.0934V17.6882C17.2288,17.8228 17.2755,17.9588 17.3688,18.0934L23.1969,23.5934C23.4369,23.8228 23.8226,23.8228 24.0159,23.5934L25.1253,22.5465C25.364,22.3639 25.364,22.0054 25.1253,21.776ZM10.6768,17.1882C6.3901,17.1882 2.973,13.9586 2.973,9.9173C2.973,5.9173 6.3901,2.6452 10.6768,2.6452C14.9168,2.6452 18.3851,5.9173 18.3851,9.9173C18.3851,13.9586 14.9168,17.1882 10.6768,17.1882Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/lineage/res/res/drawable/ic_star.xml b/lineage/res/res/drawable/ic_star.xml
new file mode 100644
index 0000000000000000000000000000000000000000..52abd72281817ce46c39a99728e256de2358a61b
--- /dev/null
+++ b/lineage/res/res/drawable/ic_star.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="33dp"
+    android:height="32dp"
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M31.1306,11.0214L22.3491,9.76L18.3799,1.7601C17.7186,0.38 15.6718,0.3174 14.9531,1.7601L11.0412,9.76L2.2025,11.0214C0.6398,11.2601 0.0411,13.1881 1.1825,14.3281L7.4945,20.5214L5.9945,29.2399C5.7491,30.8065 7.4372,32.0107 8.8172,31.2867L16.6971,27.136L24.5158,31.2867C25.8958,32.0107 27.5786,30.8065 27.3386,29.2399L25.8386,20.5214L32.1506,14.3281C33.2919,13.1881 32.6932,11.2601 31.1306,11.0214ZM22.7079,19.5L24.1506,27.7972L16.6971,23.8906L9.1773,27.7972L10.6252,19.5L4.5466,13.6093L12.9066,12.4065L16.6971,4.8281L20.4212,12.4065L28.7813,13.6093L22.7079,19.5Z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/lineage/res/res/drawable/ic_star_filled.xml b/lineage/res/res/drawable/ic_star_filled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4ddac91348adc3798618e3058647c57d3f4d0914
--- /dev/null
+++ b/lineage/res/res/drawable/ic_star_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="33dp"
+    android:height="32dp"
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M16.6878,0.656C16.0052,0.656 15.3118,0.9948 14.9531,1.7188L11.0412,9.7133L2.2025,10.9786C0.6398,11.2186 0.0411,13.1455 1.1825,14.2869L7.4945,20.4786L5.9891,29.1973C5.7491,30.76 7.4372,31.964 8.8172,31.24L16.6932,27.0935L24.5158,31.24C25.8958,31.964 27.5786,30.76 27.3386,29.1973L25.8332,20.4786L32.1506,14.2869C33.2919,13.1455 32.6932,11.2186 31.1252,10.9786L22.3491,9.7133L18.3799,1.7188C18.0466,1.0268 17.3745,0.6667 16.6878,0.656Z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/lineage/res/res/values-night/colors.xml b/lineage/res/res/values-night/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4a7b6192abc1deea6a57feb349a1f0eaedfc0a0b
--- /dev/null
+++ b/lineage/res/res/values-night/colors.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+
+    <color name="color_error">#FF5630</color>
+
+    <!-- Default /e/ themes color for dark theme
+         These colors are the ones which will be overridden by RRO packages to change the theme across the device.
+     -->
+    <color name="color_default_primary">#333333</color>
+    <color name="color_default_primary_dark">#4D4D4D</color>
+    <color name="color_default_accent">@color/color_default_blue1</color>
+    <color name="color_default_primary_text">#FFFFFF</color>
+    <color name="color_default_secondary_text">#CCFFFFFF</color>
+    <color name="color_default_background">#000000</color>
+    <color name="color_default_foreground">#666666</color>
+</resources>
diff --git a/lineage/res/res/values/colors.xml b/lineage/res/res/values/colors.xml
index 8ff675b2d98612c8bf34f3a877bb81db55278e56..df6179030461d0b165c96e1767192d62a96d9374 100644
--- a/lineage/res/res/values/colors.xml
+++ b/lineage/res/res/values/colors.xml
@@ -17,4 +17,26 @@
 <resources>
 
     <color name="color_error">#FF5630</color>
+
+    <!-- Default /e/ themes color -->
+
+    <color name="color_default_red1">#FB3846</color>
+    <color name="color_default_blue1">#007FFF</color>
+    <color name="color_default_blue2">#24527E</color>
+    <color name="color_default_orange1">#FC7222</color>
+    <color name="color_default_gray1">#C8CED0</color>
+    <color name="color_default_gray2">#848484</color>
+    <color name="color_default_green1">#38D874</color>
+
+    <!-- Default /e/ themes color for light theme
+         These colors are the ones which will be overridden by RRO packages to change the theme across the device.
+     -->
+    <color name="color_default_primary">#FFFFFF</color>
+    <color name="color_default_primary_dark">#FFFFFF</color>
+    <color name="color_default_accent">@color/color_default_blue1</color>
+    <color name="color_default_primary_text">#CC000000</color>
+    <color name="color_default_secondary_text">#8C000000</color>
+    <color name="color_default_background">#FAFAFA</color>
+    <color name="color_default_foreground">#FFFFFF</color>
+
 </resources>
diff --git a/lineage/res/res/values/public.xml b/lineage/res/res/values/public.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d7745ebffc5eb7ddd420237fe82a1ed5fbb8d07
--- /dev/null
+++ b/lineage/res/res/values/public.xml
@@ -0,0 +1,31 @@
+<resources>
+
+	<!-- 
+		====== WARNING ====
+		These ids should never be changed and if these have to be changed, 
+		take utmost care as it may break already running apps on device 
+	-->
+	<eat-comment />
+
+
+	<public type="color" name="color_default_red1" id="0x3f060001" />
+	<public type="color" name="color_default_blue1" id="0x3f060002" />
+	<public type="color" name="color_default_blue2" id="0x3f060003" />
+	<public type="color" name="color_default_orange1" id="0x3f060004" />
+	<public type="color" name="color_default_gray1" id="0x3f060005" />
+	<public type="color" name="color_default_gray2" id="0x3f060006" />
+	<public type="color" name="color_default_green1" id="0x3f060007" />
+
+	<public type="color" name="color_default_primary" id="0x3f061001" />
+	<public type="color" name="color_default_primary_dark" id="0x3f061002" />
+	<public type="color" name="color_default_accent" id="0x3f061003" />
+	<public type="color" name="color_default_primary_text" id="0x3f061004" />
+	<public type="color" name="color_default_secondary_text" id="0x3f061005" />
+	<public type="color" name="color_default_background" id="0x3f061006" />
+	<public type="color" name="color_default_foreground" id="0x3f061007" />
+
+	<public type="drawable" name="ic_menu" id="0x3f080001" />
+	<public type="drawable" name="ic_search" id="0x3f080002" />
+	<public type="drawable" name="ic_star" id="0x3f080003" />
+	<public type="drawable" name="ic_star_filled" id="0x3f080004" />
+</resources>
diff --git a/sdk/res/res/values/public.xml b/sdk/res/res/values/public.xml
index d300492a37d04515dae8122e9ef8ce2d4edce20f..9bd75bedde9e603f80817680e42601467e01fba1 100644
--- a/sdk/res/res/values/public.xml
+++ b/sdk/res/res/values/public.xml
@@ -10,5 +10,4 @@
   <public type="attr" name="requiresAction" id="0x3f010008" />
   <public type="attr" name="replacesKey" id="0x3f010009" />
   <public type="attr" name="minSummaryLines" id="0x3f01000a" />
-
 </resources>