diff --git a/config/packages.mk b/config/packages.mk
index 4df7e01..767d184 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -49,7 +49,9 @@
     GboardOmniTheme
 
 PRODUCT_PACKAGES += \
-    DocumentsUITheme
+    DocumentsUITheme \
+    DialerTheme \
+    TelecommTheme
 
 PRODUCT_PACKAGES += \
     NotificationsDark \
diff --git a/google/themes/DialerTheme/Android.mk b/google/themes/DialerTheme/Android.mk
new file mode 100644
index 0000000..f351426
--- /dev/null
+++ b/google/themes/DialerTheme/Android.mk
@@ -0,0 +1,18 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := DialerTheme
+LOCAL_RRO_THEME := DialerTheme
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_USE_AAPT2 := true
+LOCAL_AAPT_FLAGS += \
+        --auto-add-overlay \
+
+RES_DIRS := $(call all-subdir-named-dirs,res,.)
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(RES_DIRS))
+ 
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/DialerTheme/AndroidManifest.xml b/google/themes/DialerTheme/AndroidManifest.xml
new file mode 100644
index 0000000..0b46971
--- /dev/null
+++ b/google/themes/DialerTheme/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.app.dialertheme"
+    platformBuildVersionCode="28"
+    platformBuildVersionName="9.0.0">
+
+    <overlay android:priority="2" android:targetPackage="com.android.dialer" />
+
+
+    <application android:hasCode="false"
+                 android:label="Dialer Theme" />
+</manifest>
diff --git a/google/themes/DialerTheme/assets/thumbnail.png b/google/themes/DialerTheme/assets/thumbnail.png
new file mode 100644
index 0000000..9841324
--- /dev/null
+++ b/google/themes/DialerTheme/assets/thumbnail.png
Binary files differ
diff --git a/google/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml b/google/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml
new file mode 100644
index 0000000..eff136c
--- /dev/null
+++ b/google/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml
@@ -0,0 +1,91 @@
+<!--
+  ~ Copyright (C) 2012 The Android Open Source 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 of ripples used for views with dark backgrounds -->
+  <color name="dialer_ripple_material_dark">#a0ffffff</color>
+
+  <!-- Color of ripples used for views with light backgrounds -->
+  <color name="dialer_ripple_material_light">#30ffffff</color>
+
+  <!-- Divider color for header separator -->
+  <color name="primary_text_color">@*android:color/omni_text1</color>
+
+  <color name="secondary_text_color">@*android:color/omni_text2</color>
+
+  <!-- Text color for section header. -->
+  <color name="section_header_text_color">@*android:color/omni_color3</color>
+
+  <!-- Color of the theme of the People app -->
+  <color name="people_app_theme_color">@*android:color/omni_color4</color>
+
+  <!-- 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>#C53929</item>
+    <item>#C2185B</item>
+    <item>#7B1FA2</item>
+    <item>#512DA8</item>
+    <item>#303F9F</item>
+    <item>#3367D6</item>
+    <item>#0277BD</item>
+    <item>#006064</item>
+    <item>#00796B</item>
+    <item>#0B8043</item>
+    <item>#33691E</item>
+    <item>#E65100</item>
+    <item>#E64A19</item>
+    <item>#424242</item>
+  </array>
+
+  <color name="tab_ripple_color">#ffffff</color>
+  <color name="tab_selected_underline_color">#ffffff</color>
+  <color name="tab_unread_count_background_color">@*android:color/omni_color2</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_unselected_text_color">#a6f5f5f5</color>
+
+  <!-- Text color of the search box text as entered by user  -->
+  <color name="searchbox_text_color">@*android:color/omni_text1</color>
+  <!-- Background color of the search box -->
+  <color name="searchbox_background_color">@*android:color/omni_color2</color>
+
+  <color name="searchbox_hint_text_color">@*android:color/omni_text3</color>
+  <color name="searchbox_icon_tint">@*android:color/omni_text1</color>
+
+  <color name="search_shortcut_icon_color">@*android:color/omni_text1</color>
+
+  <!-- Color of the background of the contact detail and editor pages -->
+  <color name="background_primary">@*android:color/omni_color2</color>
+  <color name="contact_all_list_background_color">@*android:color/omni_color1</color>
+
+  <!-- Text color used for character counter when the max limit has been exceeded -->
+  <color name="call_subject_limit_exceeded">#d1041c</color>
+
+  <!-- Tint color for the call subject history icon. -->
+  <color name="call_subject_history_icon">#ffffff</color>
+
+  <!-- Divider line on the call subject dialog. -->
+  <color name="call_subject_divider">#d8d8d8</color>
+
+  <!-- Text color for the SEND & CALL button on the call subject dialog. -->
+  <color name="call_subject_button">#00c853</color>
+
+  <!-- Background color for the call subject history view. -->
+  <color name="call_subject_history_background">@*android:color/omni_color1</color>
+</resources>
diff --git a/google/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml b/google/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml
new file mode 100644
index 0000000..6b7b758
--- /dev/null
+++ b/google/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml
@@ -0,0 +1,70 @@
+<!--
+  ~ Copyright (C) 2012 The Android Open Source 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="setting_disabled_color">@*android:color/omni_color2</color>
+  <color name="setting_background_color">@*android:color/omni_color1</color>
+
+  <!-- 54% black -->
+  <color name="call_log_icon_tint">#8affffff</color>
+  <!-- 87% black -->
+  <color name="call_log_primary_color">#deffffff</color>
+  <!-- 54% black -->
+  <color name="call_log_detail_color">#8affffff</color>
+  <!-- 87% black -->
+  <color name="call_log_voicemail_transcript_color">#deffffff</color>
+  <!-- 54% black -->
+  <color name="call_log_voicemail_transcript_branding_color">#8affffff</color>
+  <!-- 100% blue -->
+  <color name="call_log_voicemail_transcript_rating_color">#ff2a56c6</color>
+  <!-- 70% black -->
+  <color name="call_log_action_color">#b3ffffff</color>
+  <!-- 54% black -->
+  <color name="call_log_day_group_heading_color">#8affffff</color>
+  <!-- 87% black-->
+  <color name="call_log_unread_text_color">#deffffff</color>
+
+  <color name="voicemail_icon_disabled_tint">#80ffffff</color>
+
+  <!-- Background color for search results and call details -->
+  <color name="background_dialer_results">@*android:color/omni_color1</color>
+
+  <!-- Color of the contact name in favorite tiles -->
+  <color name="contact_tile_name_color">#ffffff</color>
+
+  <color name="remove_text_color">#ffffff</color>
+
+  <!-- Text color for the "Remove" text when a contact is dragged on top of the remove view -->
+  <color name="remove_highlighted_text_color">#FF3F3B</color>
+
+  <color name="call_log_action_divider">@*android:color/omni_color7</color>
+  <color name="divider_line_color">#D8D8D8</color>
+
+  <!--  Colors for blocked numbers list -->
+  <color name="blocked_number_primary_text_color">@*android:color/omni_text1</color>
+  <color name="blocked_number_secondary_text_color">@*android:color/omni_text2</color>
+  <color name="blocked_number_icon_tint">#616161</color>
+  <color name="blocked_number_background">#FFFFFF</color>
+  <color name="blocked_number_block_color">#F44336</color>
+  <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color>
+  <color name="add_blocked_number_icon_color">#bdbdbd</color>
+
+  <color name="voicemail_donation_promo_positive_button_text_color">#FF2A56C6</color>
+  <color name="voicemail_donation_promo_negative_button_text_color">#FF757575</color>
+
+  <color name="settings_text_color_primary">@*android:color/omni_text1</color>
+  <color name="settings_text_color_secondary">@*android:color/omni_text2</color>
+</resources>
diff --git a/google/themes/DialerTheme/java/com/android/dialer/app/res/values/style.xml b/google/themes/DialerTheme/java/com/android/dialer/app/res/values/style.xml
new file mode 100644
index 0000000..9208b86
--- /dev/null
+++ b/google/themes/DialerTheme/java/com/android/dialer/app/res/values/style.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 The Android Open Source 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>
+
+</resources>
diff --git a/google/themes/DialerTheme/java/com/android/dialer/dialpadview/res/values/colors.xml b/google/themes/DialerTheme/java/com/android/dialer/dialpadview/res/values/colors.xml
new file mode 100644
index 0000000..da66af9
--- /dev/null
+++ b/google/themes/DialerTheme/java/com/android/dialer/dialpadview/res/values/colors.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2012 The Android Open Source 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>
+  <!-- Colors for the dialpad -->
+  <color name="background_dialpad">@*android:color/omni_color2</color>
+  <color name="dialpad_secondary_text_color">@*android:color/omni_text2</color>
+  <color name="dialpad_digits_text_color">#fff</color>
+  <color name="dialpad_icon_tint">#89ffffff</color>
+  <color name="dialpad_voicemail_tint">#919191</color>
+</resources>
+
diff --git a/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml b/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml
new file mode 100644
index 0000000..a69262c
--- /dev/null
+++ b/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml
@@ -0,0 +1,71 @@
+<!--
+  ~ Copyright (C) 2012 The Android Open Source 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="dialer_theme_color">@*android:color/omni_color4</color>
+  <color name="dialer_theme_color_dark">@*android:color/omni_color1</color>
+
+  <color name="dialer_snackbar_action_text_color">@*android:color/omni_color8</color>
+  <color name="dialer_theme_color_20pct">@*android:color/omni_color3</color>
+
+<!--  <color name="dialpad_fab_green">@*android:color/omni_color5</color> -->
+
+  <color name="dialer_secondary_color">@*android:color/omni_color4</color>
+
+  <!-- Primary text color in the Phone app -->
+  <color name="dialer_primary_text_color">@*android:color/omni_text1</color>
+  <color name="dialer_primary_text_color_white">@*android:color/omni_text1</color>
+  <color name="dialer_edit_text_hint_color">@*android:color/omni_text2</color>
+
+  <!-- Secondary text color in the Phone app -->
+  <color name="dialer_secondary_text_color">@*android:color/omni_text2</color>
+  <!-- 38% opacity -->
+  <color name="dialer_secondary_text_color_hiden">@*android:color/omni_text3</color>
+
+  <!-- Color of the theme of the Dialer app -->
+  <color name="dialtacts_theme_color">@*android:color/omni_color2</color>
+
+  <!-- Background color of new dialer activity -->
+  <color name="background_dialer_light">@*android:color/omni_color1</color>
+  <!-- White background for dialer -->
+  <color name="background_dialer_white">@*android:color/omni_color1</color>
+  <color name="background_dialer_call_log_list_item">@*android:color/omni_color2</color>
+
+  <!-- Colors for the notification actions -->
+  <color name="notification_action_accept">#097138</color>
+  <color name="notification_action_dismiss">#A52714</color>
+  <color name="notification_action_answer_video">#097138</color>
+
+  <!-- Background color of action bars -->
+  <color name="actionbar_background_color">@*android:color/omni_color2</color>
+
+  <!-- Background color of title bars in recents -->
+  <color name="titlebar_in_recents_background_color">@*android:color/omni_color4</color>
+
+  <color name="blue_grey_100">@*android:color/omni_color1</color>
+
+  <!-- 54% opacity -->
+  <color name="icon_color_grey">@*android:color/omni_color9</color>
+
+  <!-- Color for bubble -->
+  <color name="dialer_end_call_button_color">#BD2A2A</color>
+
+  <color name="omni_subheader">@*android:color/omni_text2</color>
+  <color name="omni_secondary_text">@*android:color/omni_text2</color>
+  <color name="omni_primary_text">@*android:color/omni_text1</color>
+  <color name="popupBackground">@*android:color/omni_color7</color>
+</resources>
+
diff --git a/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/strings.xml b/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/strings.xml
new file mode 100644
index 0000000..7b67f0a
--- /dev/null
+++ b/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/strings.xml
@@ -0,0 +1,20 @@
+<!--
+  ~ Copyright (C) 2016 The Android Open Source 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="omni_true">false</string>
+</resources>
+
diff --git a/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/styles.xml b/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/styles.xml
new file mode 100644
index 0000000..6f57ea1
--- /dev/null
+++ b/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/styles.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (C) 2012 The Android Open Source 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>
+  <style name="AlertDialogTheme" parent="@*android:style/Theme.Material.Dialog">
+    <item name="android:colorAccent">@*android:color/omni_color4</item>
+  </style>
+
+</resources>
+
diff --git a/google/themes/TelecommTheme/Android.mk b/google/themes/TelecommTheme/Android.mk
new file mode 100644
index 0000000..24336a5
--- /dev/null
+++ b/google/themes/TelecommTheme/Android.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := TelecommTheme
+LOCAL_RRO_THEME := TelecommTheme
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/TelecommTheme/AndroidManifest.xml b/google/themes/TelecommTheme/AndroidManifest.xml
new file mode 100644
index 0000000..c4d88cb
--- /dev/null
+++ b/google/themes/TelecommTheme/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.app.telecommtheme"
+    platformBuildVersionCode="28"
+    platformBuildVersionName="9.0.0">
+
+    <overlay android:priority="2" android:targetPackage="com.android.server.telecom" />
+
+
+    <application android:hasCode="false"
+                 android:label="Telecomm Theme" />
+</manifest>
diff --git a/google/themes/TelecommTheme/assets/thumbnail.png b/google/themes/TelecommTheme/assets/thumbnail.png
new file mode 100644
index 0000000..9841324
--- /dev/null
+++ b/google/themes/TelecommTheme/assets/thumbnail.png
Binary files differ
diff --git a/google/themes/TelecommTheme/res/values/colors.xml b/google/themes/TelecommTheme/res/values/colors.xml
new file mode 100644
index 0000000..9b729b3
--- /dev/null
+++ b/google/themes/TelecommTheme/res/values/colors.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (C) 2014 The Android Open Source 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="theme_color">@*android:color/omni_color4</color>
+
+    <color name="dialer_settings_actionbar_text_color">#ffffff</color>
+    <color name="dialer_settings_actionbar_background_color">@*android:color/omni_color1</color>
+    <color name="dialer_settings_color_dark">@*android:color/omni_color2</color>
+
+    <color name="blocked_numbers_divider_color">#e5e5e5</color>
+    <color name="blocked_numbers_butter_bar_color">#f5f5f5</color>
+    <color name="blocked_numbers_title_text_color">#baffffff</color>
+    <color name="blocked_numbers_secondary_text_color">#89ffffff</color>
+
+    <color name="notification_action_answer">#097138</color>
+    <color name="notification_action_decline">#A52714</color>
+</resources>
+
diff --git a/google/themes/TelecommTheme/res/values/styles.xml b/google/themes/TelecommTheme/res/values/styles.xml
new file mode 100644
index 0000000..b408e54
--- /dev/null
+++ b/google/themes/TelecommTheme/res/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source 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>
+    <style name="Theme.Telecomm.Transparent" parent="@*android:style/Theme.Material">
+    </style>
+
+    <style name="Theme.Telecom.DialerSettings" parent="@*android:style/Theme.Material">
+    </style>
+
+    <style name="Theme.Telecom.BlockedNumbers" parent="@*android:style/Theme.Material">
+    </style>
+
+</resources>