diff --git a/Android.bp b/Android.bp
index 36923ab74fc494719c1d5ebeab490de1505af003..617d9cdc7910478fc756474ddc5d52e7c6651f96 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,7 @@ android_app {
         "com.android.vcard",
         "guava",
         "libphonenumber",
+        "elib",
     ],
 
     certificate: "shared",
diff --git a/res/drawable-anydpi-v26/fab_pink.xml b/res/drawable-anydpi-v26/fab_pink.xml
new file mode 100644
index 0000000000000000000000000000000000000000..deea9902974157bd0c23442f6e5a5da8a10c1f15
--- /dev/null
+++ b/res/drawable-anydpi-v26/fab_pink.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022  E FOUNDATION
+  ~
+  ~ 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/>.
+  -->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="@color/e_accent"/>
+
+    <size
+        android:width="24dp"
+        android:height="24dp"/>
+</shape>
diff --git a/res/drawable-hdpi/person_white_540dp.png b/res/drawable-hdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-hdpi/person_white_540dp.png
rename to res/drawable-hdpi/ic_person_white_base.png
diff --git a/res/drawable-mdpi/person_white_540dp.png b/res/drawable-mdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-mdpi/person_white_540dp.png
rename to res/drawable-mdpi/ic_person_white_base.png
diff --git a/res/drawable-xhdpi/person_white_540dp.png b/res/drawable-xhdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-xhdpi/person_white_540dp.png
rename to res/drawable-xhdpi/ic_person_white_base.png
diff --git a/res/drawable-xxhdpi/person_white_540dp.png b/res/drawable-xxhdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-xxhdpi/person_white_540dp.png
rename to res/drawable-xxhdpi/ic_person_white_base.png
diff --git a/res/drawable-xxxhdpi/person_white_540dp.png b/res/drawable-xxxhdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-xxxhdpi/person_white_540dp.png
rename to res/drawable-xxxhdpi/ic_person_white_base.png
diff --git a/res/drawable/dialog_background.xml b/res/drawable/dialog_background.xml
index 119b08b5d58c517478c2c8c6eeeb7eac7ce2c222..b974abcf371b98ab860a5d70dc90af7f8b134dea 100644
--- a/res/drawable/dialog_background.xml
+++ b/res/drawable/dialog_background.xml
@@ -17,6 +17,6 @@
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="?android:attr/colorBackgroundFloating"/>
+    <solid android:color="@color/e_floating_background"/>
     <corners android:radius="16dp"/>
 </shape>
diff --git a/res/drawable/person_white_540dp.xml b/res/drawable/person_white_540dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..479c55cbb915fed9c5fe6833f065f0af5ed6c598
--- /dev/null
+++ b/res/drawable/person_white_540dp.xml
@@ -0,0 +1,19 @@
+<?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/>.
+  -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_person_white_base"
+    android:tint="@color/e_background"/>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_drawer_my_info_32.xml b/res/drawable/quantum_ic_drawer_my_info_32.xml
index 4e310cb4a1a86f4fc715a6365d83f7ec35cf7845..b0b0f16afef5a854e1c9e64b39c4b83b0fe3323c 100644
--- a/res/drawable/quantum_ic_drawer_my_info_32.xml
+++ b/res/drawable/quantum_ic_drawer_my_info_32.xml
@@ -5,15 +5,11 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M15.8,1C7.5,1 0.9,7.7 1,16c0.1,8.3 6.9,15 15.2,15S31.1,24.3 31,16C30.9,7.7 24.1,1 15.8,1z"
-        android:fillColor="#4185F3"/>
+        android:fillColor="@color/e_accent"/>
     <path
         android:pathData="M16,12.3m-3.8,0a3.8,3.8 0,1 1,7.6 0a3.8,3.8 0,1 1,-7.6 0"
-        android:fillAlpha="0.2"
-        android:fillColor="#FFFFFF"
-        android:strokeAlpha="0.2"/>
+        android:fillColor="@color/e_background" />
     <path
         android:pathData="M23.5,23.5h-15v-1.9c0,-2.5 5,-3.8 7.5,-3.8s7.5,1.3 7.5,3.8V23.5z"
-        android:fillAlpha="0.2"
-        android:fillColor="#FFFFFF"
-        android:strokeAlpha="0.2"/>
+        android:fillColor="@color/e_background" />
 </vector>
diff --git a/res/layout-land/people_activity_toolbar.xml b/res/layout-land/people_activity_toolbar.xml
index 15f12f67189c5773114210e09f1d62b684f31a74..eb33d395780322b1ca2a65bf24c4e29f17e8e51e 100644
--- a/res/layout-land/people_activity_toolbar.xml
+++ b/res/layout-land/people_activity_toolbar.xml
@@ -29,7 +29,7 @@
         android:id="@+id/toolbar_frame"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary">
+        android:background="@color/actionbar_background_color">
 
         <!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->
         <androidx.appcompat.widget.Toolbar
diff --git a/res/layout/contact_editor_activity.xml b/res/layout/contact_editor_activity.xml
index 5843a58cddd8aff568636d4894cdf7252dae8c4c..e7eb9c91c8ec7cccecec52b92ed22a43427422a5 100644
--- a/res/layout/contact_editor_activity.xml
+++ b/res/layout/contact_editor_activity.xml
@@ -27,7 +27,7 @@
         style="@style/EditorActionBarStyle"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
-        android:background="?android:attr/colorPrimary"
+        android:background="@color/actionbar_background_color"
         android:elevation="4dp"
         app:navigationContentDescription="@string/cancel_button_content_description"
         app:navigationIcon="@drawable/quantum_ic_close_vd_theme_24"
diff --git a/res/layout/contact_editor_fields.xml b/res/layout/contact_editor_fields.xml
index dd4e49982b5080608f41b222aebc18e4b85a3816..79d028c763bc64b3b70a022602e04cb4d451c68d 100644
--- a/res/layout/contact_editor_fields.xml
+++ b/res/layout/contact_editor_fields.xml
@@ -43,7 +43,7 @@
                 android:gravity="center_vertical"
                 android:text="@string/editor_more_fields"
                 android:textAlignment="viewStart"
-                android:textColor="?android:attr/colorAccent"
+                android:textColor="@color/e_primary_text_color"
                 android:textSize="@dimen/expanding_entry_card_title_text_size"/>
 
     </LinearLayout>
diff --git a/res/layout/people_activity_toolbar.xml b/res/layout/people_activity_toolbar.xml
index 4e8ea2f7e139305b78578826ca9544dc8ac6726b..1bc4652dd1a3b6edd47c28528e4061ef23300690 100644
--- a/res/layout/people_activity_toolbar.xml
+++ b/res/layout/people_activity_toolbar.xml
@@ -25,7 +25,7 @@
         android:id="@+id/toolbar_frame"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary">
+        android:background="@color/actionbar_background_color">
 
         <!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->
         <androidx.appcompat.widget.Toolbar
diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml
index 9f90bc7d09167b31edee4da587fc80538a86e0d8..8f9c6089bf08795aa3811681252ccd5928c84cc8 100644
--- a/res/layout/search_bar_expanded.xml
+++ b/res/layout/search_bar_expanded.xml
@@ -30,7 +30,7 @@
         android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_search"
-        android:tint="@color/actionbar_background_color" />
+        android:tint="@color/e_primary_text_color" />
 
     <android.widget.AutoCompleteTextView
         android:id="@+id/search_view"
@@ -54,7 +54,7 @@
         android:layout_width="@dimen/search_box_close_icon_size"
         android:padding="@dimen/search_box_close_icon_padding"
         android:src="@drawable/quantum_ic_close_vd_theme_24"
-        android:tint="@color/quantum_black_secondary_text"
+        android:tint="@color/e_secondary_text_color"
         android:clickable="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/description_clear_search" />
diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml
index 272a2fcf9d6b241c5fa30444190ae2291c00faeb..0d9f8a8ef4ee7fbdd740872e47ee99c482eb3c72 100644
--- a/res/layout/selection_bar.xml
+++ b/res/layout/selection_bar.xml
@@ -51,7 +51,7 @@
         android:paddingEnd="16dp"
         android:paddingStart="16dp"
         android:text="@string/menu_add_contacts"
-        android:textColor="@color/primary_color"
+        android:textColor="@color/actionbar_text_color"
         android:textStyle="bold"
         android:visibility="gone"/>
 
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index fc5bb301708cd0bc5668f3dc6753419ef60ff50e..a242b5e9c2bd4997502dc0dbca83e46ed75c21fd 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -5,14 +5,8 @@
 -->
 <resources>
     <!-- Background color of pinned header items. -->
-    <color name="list_item_pinned_header_color">@*android:color/system_neutral1_900</color>
+    <color name="list_item_pinned_header_color">@color/background_primary</color>
 
     <!-- Color of contact name in list. -->
     <color name="contact_list_name_text_color">#dadada</color>
-
-    <!-- Color of the background of the contact detail and editor pages -->
-    <color name="background_primary">@*android:color/system_neutral1_900</color>
-    <color name="contact_all_list_background_color">@*android:color/system_neutral1_900</color>
-
-    <color name="fab_color">@android:color/system_accent1_100</color>
 </resources>
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
index e821cc1570095ac1bc85b2026cc30a0db2bfef1d..0187a5cabcdc155d5323a594dd0fd82bb687a702 100644
--- a/res/values-v27/styles.xml
+++ b/res/values-v27/styles.xml
@@ -12,8 +12,8 @@
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:windowBackground">@color/background_primary</item>
         <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorPrimary">@color/e_accent</item>
+        <item name="android:colorAccent">@color/e_accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
         <item name="list_section_header_height">24dip</item>
@@ -51,10 +51,11 @@
         <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
         <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
         <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:forceDarkAllowed">true</item>
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
@@ -73,8 +74,8 @@
         <item name="android:windowBackground">@color/background_primary</item>
         <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="colorPrimary">@color/primary_color</item>
+        <item name="android:colorPrimary">@color/e_accent</item>
+        <item name="colorPrimary">@color/e_accent</item>
         <item name="android:colorAccent">@color/primary_color</item>
         <item name="colorAccent">@color/primary_color</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
@@ -120,7 +121,8 @@
         <item name="popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
         <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
         <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
     </style>
 
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f1f6effdb8682f38b685fe9c5ecc6c3a91b931f5..0bc92157842a31c5adc1d984824f71ca6c91d060 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,40 +17,40 @@
     <color name="ic_add_contact_shortcut_background">#F5F5F5</color>
 
     <!-- 87% black -->
-    <color name="quantum_black_text">#dd000000</color>
+    <color name="quantum_black_text">@color/e_primary_text_color</color>
 
     <!-- 54% black -->
-    <color name="quantum_black_secondary_text">#89000000</color>
+    <color name="quantum_black_secondary_text">@color/e_secondary_text_color</color>
 
     <!-- 38% black -->
-    <color name="quantum_black_hint_text">#61000000</color>
+    <color name="quantum_black_hint_text">@color/e_disabled_color</color>
 
-    <color name="quickcontact_entry_sub_header_text_color">#737373</color>
+    <color name="quickcontact_entry_sub_header_text_color">@color/e_secondary_text_color</color>
     <color name="quickcontact_entry_header_text_color">#202020</color>
 
     <color name="action_bar_background">@color/primary_color</color>
 
     <color name="nav_item_selected_background">#0f000000</color>
 
-    <color name="action_bar_button_text_color">#FFFFFF</color>
+    <color name="action_bar_button_text_color">@color/e_primary_text_color</color>
 
-    <color name="actionbar_background_color">@color/primary_color</color>
+    <color name="actionbar_background_color">@color/e_action_bar</color>
 
-    <color name="contextual_selection_bar_color">#f6f6f6</color>
+    <color name="contextual_selection_bar_color">@color/e_action_bar</color>
     <!-- Color of the status bar above the contextual selection bar. -->
-    <color name="contextual_selection_bar_status_bar_color">#bababa</color>
+    <color name="contextual_selection_bar_status_bar_color">@color/e_action_bar</color>
 
-    <color name="primary_color_dark">@*android:color/system_accent1_700</color>
-    <color name="primary_color">@*android:color/system_accent1_600</color>
+    <color name="primary_color_dark">@color/e_action_bar</color>
+    <color name="primary_color">@color/e_accent</color>
 
-    <color name="group_primary_color_dark">@*android:color/system_neutral1_900</color>
-    <color name="group_primary_color">@*android:color/system_neutral1_800</color>
+    <color name="group_primary_color_dark">@color/e_action_bar</color>
+    <color name="group_primary_color">@color/e_action_bar</color>
 
     <!-- Color of the selected tab underline -->
     <color name="contacts_accent_color">@*android:color/system_neutral1_0</color>
 
-    <color name="floating_action_button_icon_color">@color/contacts_accent_color</color>
-    <color name="fab_color">@android:color/system_accent1_600</color>
+    <color name="floating_action_button_icon_color">@color/e_background</color>
+    <color name="fab_color">@color/e_accent</color>
 
     <!-- Horizontal separator line should be 12% dark in the light theme. -->
     <color name="divider_line_color_light">@*android:color/transparent</color>
@@ -62,7 +62,7 @@
     <color name="expanding_entry_card_background_color">#ffffff</color>
 
     <!-- Color of the margin for cards -->
-    <color name="card_margin_color">#f4f4f4</color>
+    <color name="card_margin_color">@color/e_background</color>
 
     <color name="call_arrow_green">#2aad6f</color>
     <color name="call_arrow_red">#ff2e58</color>
@@ -74,7 +74,7 @@
     <color name="editor_icon_color">#7f7f7f</color>
 
     <!-- Color of disabled text and unfocused hint text inside the contact editor. 25% black. -->
-    <color name="editor_disabled_text_color">#40000000</color>
+    <color name="editor_disabled_text_color">@color/e_disabled_color</color>
 
     <!-- Color of text on disabled link contacts button, 25% black. -->
     <color name="disabled_button_text">#40000000</color>
@@ -86,18 +86,18 @@
     <color name="disabled_contact_list_name_text">#4D000000</color>
 
     <!-- Color of background of all empty states. -->
-    <color name="empty_state_background">#efefef</color>
+    <color name="empty_state_background">@color/e_background</color>
 
     <!-- Color of ripples used for views with dark backgrounds -->
     <color name="ripple_material_dark">#a0ffffff</color>
 
     <!-- Divider color for header separator -->
-    <color name="primary_text_color">#363636</color>
+    <color name="primary_text_color">@color/e_primary_text_color</color>
 
-    <color name="secondary_text_color">@color/dialtacts_secondary_text_color</color>
+    <color name="secondary_text_color">@color/e_secondary_text_color</color>
 
     <!-- Text color for section header. -->
-    <color name="section_header_text_color">@color/dialtacts_theme_color</color>
+    <color name="section_header_text_color">@color/e_primary_text_color</color>
 
     <!-- Color of the theme of the People app -->
     <color name="people_app_theme_color">@*android:color/system_neutral1_800</color>
@@ -112,7 +112,7 @@
     <color name="dialtacts_primary_text_color">#333333</color>
 
     <!-- Secondary text color in the Phone app -->
-    <color name="dialtacts_secondary_text_color">#737373</color>
+    <color name="dialtacts_secondary_text_color">@color/e_secondary_text_color</color>
 
     <color name="shortcut_overlay_text_background">#7f000000</color>
 
@@ -127,35 +127,35 @@
         These colors are also used by MaterialColorMapUtils to generate primary activity colors.
     -->
     <array name="letter_tile_colors">
-        <item>@*android:color/system_accent1_300</item>
-        <item>@*android:color/system_accent2_300</item>
-        <item>@*android:color/system_accent3_300</item>
-        <item>@*android:color/system_accent1_400</item>
-        <item>@*android:color/system_accent2_400</item>
-        <item>@*android:color/system_accent3_400</item>
-        <item>@*android:color/system_accent1_500</item>
-        <item>@*android:color/system_accent2_500</item>
-        <item>@*android:color/system_accent3_500</item>
-        <item>@*android:color/system_accent1_600</item>
-        <item>@*android:color/system_accent2_600</item>
-        <item>@*android:color/system_accent3_600</item>
+        <item>#0F94F6</item>
+        <item>#00B4B4</item>
+        <item>#008D96</item>
+        <item>#44B04C</item>
+        <item>#AFD83D</item>
+        <item>#FFED21</item>
+        <item>#FFC300</item>
+        <item>#FF7A00</item>
+        <item>#F8432E</item>
+        <item>#ED1C61</item>
+        <item>#ED1C61</item>
+        <item>#5754DC</item>
     </array>
 
     <!-- Darker versions of letter_tile_colors, two shades darker. These colors are used
         for settings secondary activity colors. -->
     <array name="letter_tile_colors_dark">
-        <item>@*android:color/system_accent1_500</item>
-        <item>@*android:color/system_accent2_500</item>
-        <item>@*android:color/system_accent3_500</item>
-        <item>@*android:color/system_accent1_600</item>
-        <item>@*android:color/system_accent2_600</item>
-        <item>@*android:color/system_accent3_600</item>
-        <item>@*android:color/system_accent1_700</item>
-        <item>@*android:color/system_accent2_700</item>
-        <item>@*android:color/system_accent3_700</item>
-        <item>@*android:color/system_accent1_800</item>
-        <item>@*android:color/system_accent2_800</item>
-        <item>@*android:color/system_accent3_800</item>
+        <item>#0F94F6</item>
+        <item>#00B4B4</item>
+        <item>#008D96</item>
+        <item>#44B04C</item>
+        <item>#AFD83D</item>
+        <item>#FFED21</item>
+        <item>#FFC300</item>
+        <item>#FF7A00</item>
+        <item>#F8432E</item>
+        <item>#ED1C61</item>
+        <item>#ED1C61</item>
+        <item>#5754DC</item>
     </array>
 
     <!-- The default color used for tinting photos when no color can be extracted via Palette,
@@ -168,36 +168,36 @@
 
     <color name="letter_tile_default_color">#cccccc</color>
 
-    <color name="letter_tile_font_color">#ffffff</color>
+    <color name="letter_tile_font_color">@android:color/white</color>
 
     <!-- Color for icons in the actionbar -->
-    <color name="actionbar_icon_color">#ffffff</color>
+    <color name="actionbar_icon_color">@color/e_primary_text_color</color>
 
     <!-- Color of the title to the Frequently Contacted section -->
     <color name="frequently_contacted_title_color">@color/actionbar_background_color</color>
 
     <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony
     phone_settings_actionbar_text_color-->
-    <color name="actionbar_text_color">#ffffff</color>
+    <color name="actionbar_text_color">@color/e_primary_text_color</color>
     <!-- 54% black for icons -->
     <color name="actionbar_icon_color_grey">#8C000000</color>
     <!-- 87% black for actionbar text -->
-    <color name="actionbar_text_color_black">#DF000000</color>
+    <color name="actionbar_text_color_black">@color/actionbar_text_color</color>
     <!-- Solid grey for status bar overlay-->
     <color name="actionbar_color_grey_solid">#777777</color>
 
     <!-- Text color of the search box text as entered by user  -->
-    <color name="searchbox_text_color">#000000</color>
+    <color name="searchbox_text_color">@color/e_primary_text_color</color>
     <!-- Background color of the search box -->
-    <color name="searchbox_background_color">#ffffff</color>
+    <color name="searchbox_background_color">@color/e_action_bar</color>
 
-    <color name="searchbox_hint_text_color">#66000000</color>
+    <color name="searchbox_hint_text_color">@color/e_disabled_color</color>
 
     <color name="search_shortcut_icon_color">@color/dialtacts_theme_color</color>
 
     <!-- Color of the background of the contact detail and editor pages -->
-    <color name="background_primary">@*android:color/system_neutral1_50</color>
-    <color name="contact_all_list_background_color">@*android:color/system_neutral1_0</color>
+    <color name="background_primary">@color/e_background</color>
+    <color name="contact_all_list_background_color">@color/e_background</color>
 
     <!-- Text color used for character counter when the max limit has been exceeded -->
     <color name="call_subject_limit_exceeded">#d1041c</color>
@@ -224,7 +224,7 @@
     <color name="account_filter_text_color">@color/actionbar_text_color_black</color>
     <color name="custom_filter_divider">#dbdbdb</color>
 
-    <color name="material_star_pink">@color/primary_color</color>
+    <color name="material_star_pink">@color/e_accent</color>
 
     <!-- Primary text color in Contacts app -->
     <color name="contacts_text_color">#333333</color>
@@ -236,13 +236,13 @@
     <color name="alert_background">#e0e0e0</color>
 
     <!-- Divider color in navigation drawer -->
-    <color name="drawer_divider_color">#E5E5E5</color>
+    <color name="drawer_divider_color">@android:color/transparent</color>
 
     <!-- Background color for the navigation drawer -->
-    <color name="navigation_drawer_background_color">#FAFAFA</color>
+    <color name="navigation_drawer_background_color">@color/e_drawer_background</color>
 
     <!-- Background color for the current selected item in the navigation drawer -->
-    <color name="drawer_selected_color">#E8E8E8</color>
+    <color name="drawer_selected_color">@color/navigation_drawer_item_background</color>
 
     <!-- Highlight color used in places such as ripples -->
     <color name="control_highlight_color">#1A000000</color>
diff --git a/res/values/lineage_colors.xml b/res/values/lineage_colors.xml
index 6aee4d227e64eb119fedd830dd6af0037f8bc5a0..96b4c511d07bfbe7cb3edb746d168b360fb9aaaa 100644
--- a/res/values/lineage_colors.xml
+++ b/res/values/lineage_colors.xml
@@ -15,6 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <color name="navigation_bar_bg">@android:color/white</color>
-    <color name="navigation_bar_divider">#1f000000</color>
+    <color name="navigation_bar_bg">@color/e_action_bar</color>
+    <color name="navigation_bar_divider">@android:color/transparent</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 31e1239a9136367d98b8382e168844b439bcf0a5..7c6dfe54ce66aca31b4340af4367ac2ae3db5211 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -93,7 +93,7 @@
     <style name="LaunchScreenTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="colorPrimary">@color/primary_color</item>
+        <item name="colorPrimary">@color/e_accent</item>
     </style>
 
     <style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">
@@ -183,8 +183,8 @@
 
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
-        <item name="color">@android:color/white</item>
-        <item name="android:color">@android:color/white</item>
+        <item name="color">@color/e_primary_text_color</item>
+        <item name="android:color">@color/e_primary_text_color</item>
     </style>
 
     <!-- Use the non-light style so that the up button & icons aren't black. If we use the
@@ -279,11 +279,14 @@
 
     <style name="ContactsPreferencesTheme" parent="@style/PeopleThemeAppCompat">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
+        <item name="android:listDivider">@null</item>
+        <item name="android:divider">@null</item>
     </style>
 
     <style name="ContactListFilterTheme" parent="@style/PeopleTheme">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:actionButtonStyle">@style/FilterActionButtonStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
     </style>
 
     <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar">
@@ -301,11 +304,11 @@
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/e_accent</item>
     </style>
 
     <style name="SelectableItem" parent="@android:style/Theme.Material.Light">
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:background">@color/e_floating_background</item>
     </style>
 
     <style name="ExpandingEntryCardStyle">
@@ -344,13 +347,13 @@
     <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
         since the Alert dialog is private. They are identical anyway. -->
     <style name="ContactsAlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/e_accent</item>
         <item name="android:windowBackground">@drawable/dialog_background</item>
     </style>
 
     <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
-        <item name="android:colorAccent">@color/primary_color</item>
-        <item name="colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/e_accent</item>
+        <item name="colorAccent">@color/e_accent</item>
         <item name="android:windowBackground">@drawable/dialog_background</item>
     </style>
 
@@ -395,8 +398,7 @@
     <!-- Text style for empty states (no account view, empty label). -->
     <style name="EmptyStateTextStyle">
         <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#000000</item>
-        <item name="android:alpha">0.54</item>
+        <item name="android:textColor">@color/e_primary_text_color</item>
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
@@ -462,6 +464,8 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
 
     <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">
         <item name="android:overScrollMode">always</item>
+        <item name="android:listDivider">@null</item>
+        <item name="android:divider">@null</item>
     </style>
 
     <!-- Adding padding to action button doesn't move it to left, we increase the button width to
@@ -577,12 +581,12 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
     </style>
 
     <style name="DrawerItemTextActiveStyle">
-        <item name="android:textColor">@color/primary_color</item>
+        <item name="android:textColor">@color/e_accent</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="DrawerItemTextInactiveStyle">
-        <item name="android:textColor">@color/quantum_black_text</item>
+        <item name="android:textColor">@color/e_icon_color</item>
         <item name="android:textStyle">bold</item>
     </style>
 
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index deaa1b13b5b73da94cdf8cd8963c0e40db390850..c25054c0323495692f56f9a886902466a8c4f5f4 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1074,8 +1074,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements
     // Reset toolbar and status bar color to Contacts theme color.
     private void resetToolBarStatusBarColor() {
         findViewById(R.id.toolbar_frame).setBackgroundColor(
-                ContextCompat.getColor(this, R.color.primary_color));
-        updateStatusBarBackground(ContextCompat.getColor(this, R.color.primary_color_dark));
+                ContextCompat.getColor(this, R.color.actionbar_background_color));
+        updateStatusBarBackground(ContextCompat.getColor(this, R.color.actionbar_background_color));
     }
 
     protected DefaultContactBrowseListFragment getListFragment() {
diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index f6898b54fac5da145f58ad231d8668418d42d995..5501faf113ccf9bebe1642890a92387d5258dce8 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -398,7 +398,7 @@ public class DrawerAdapter extends BaseAdapter {
         textView.setTextAppearance(mActivity, activated
                 ? TYPEFACE_STYLE_ACTIVATE : TYPEFACE_STYLE_INACTIVE);
         if (activated) {
-            imageView.setColorFilter(mActivity.getResources().getColor(R.color.primary_color),
+            imageView.setColorFilter(mActivity.getResources().getColor(R.color.navigation_drawer_selector),
                     PorterDuff.Mode.SRC_ATOP);
         } else {
             imageView.clearColorFilter();
diff --git a/src/com/android/contacts/util/MaterialColorMapUtils.java b/src/com/android/contacts/util/MaterialColorMapUtils.java
index c1616cec7db9c7e7a96bf8dd6d1e36ffb212d0b7..7182104545adec6fb2663f9c76d7ba2f74376ec7 100644
--- a/src/com/android/contacts/util/MaterialColorMapUtils.java
+++ b/src/com/android/contacts/util/MaterialColorMapUtils.java
@@ -199,7 +199,7 @@ public class MaterialColorMapUtils {
         final boolean isGroupView = activity instanceof PeopleActivity
                 && ((PeopleActivity) activity).isGroupView();
         return isGroupView
-                ? ContextCompat.getColor(activity, R.color.group_primary_color)
-                : ContextCompat.getColor(activity, R.color.primary_color);
+                ? ContextCompat.getColor(activity, R.color.actionbar_background_color)
+                : ContextCompat.getColor(activity, R.color.actionbar_background_color);
     }
 }