diff --git a/config/packages.mk b/config/packages.mk
index 5183a55..6320d63 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -6,14 +6,14 @@
     OmniStyle \
     MatLog \
     OmniChange \
-    OpenDelta \
-    Turbo \
+    OmniOverlayStub \
+    omni-overlays \
     ThemePicker \
+    Turbo \
     SystemWebView
 
-PRODUCT_PACKAGES += \
-    OmniOverlayStub \
-    omni-overlays
+#PRODUCT_PACKAGES += \
+    OpenDelta \
 
 ifneq ($(PRODUCT_EXCLUDE_EXTRA_PACKAGES),true)
 PRODUCT_PACKAGES += \
@@ -63,8 +63,8 @@
 endif
 
 # Telephony extension
-PRODUCT_PACKAGES += telephony-ext
-PRODUCT_BOOT_JARS += telephony-ext
+#PRODUCT_PACKAGES += telephony-ext
+#PRODUCT_BOOT_JARS += telephony-ext
 
 # for fun
 #PRODUCT_PACKAGES += \
diff --git a/themes/overlays/AccentColorBlueMondayOverlay/Android.mk b/themes/overlays/AccentColorBlueMondayOverlay/Android.mk
index c66ab24..724067f 100644
--- a/themes/overlays/AccentColorBlueMondayOverlay/Android.mk
+++ b/themes/overlays/AccentColorBlueMondayOverlay/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := AccentColorBlueMonday
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk b/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk
index d30f556..ac8c82a 100644
--- a/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk
+++ b/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := AccentColorGoldenShower
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlays/AccentColorOmniOverlay/Android.mk b/themes/overlays/AccentColorOmniOverlay/Android.mk
index 5f9fb3f..d30d2ab 100644
--- a/themes/overlays/AccentColorOmniOverlay/Android.mk
+++ b/themes/overlays/AccentColorOmniOverlay/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := AccentColorOmni
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlays/AccentColorRedDevilOverlay/Android.mk b/themes/overlays/AccentColorRedDevilOverlay/Android.mk
index 7478696..c5e6587 100644
--- a/themes/overlays/AccentColorRedDevilOverlay/Android.mk
+++ b/themes/overlays/AccentColorRedDevilOverlay/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := AccentColorRedDevil
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk b/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk
index 47381a5..db72564 100644
--- a/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk
+++ b/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := AccentColorSluttyPink
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlays/Android.mk b/themes/overlays/Android.mk
index fde498e..0d82de8 100644
--- a/themes/overlays/Android.mk
+++ b/themes/overlays/Android.mk
@@ -21,15 +21,18 @@
 	AccentColorBlueMondayOverlay \
 	AccentColorOmniOverlay \
 	AccentColorGoldenShowerOverlay \
-	PrimaryColorOmniBlackOverlay \
-	PrimaryColorDarkBlueOverlay \
-	PrimaryColorDeepBlueOverlay \
-	PrimaryColorDarkGreenOverlay \
 	AccentColorRedDevilOverlay \
 	FontLatoSourceOverlay \
 	FontMuliSourceOverlay \
+	EmptyProductOverlay \
+	IconShapeCircleOverlay
+
+#LOCAL_REQUIRED_MODULES += \
 	EmptyOverlay \
-	EmptyProductOverlay
+	PrimaryColorOmniBlackOverlay \
+	PrimaryColorDarkBlueOverlay \
+	PrimaryColorDeepBlueOverlay \
+	PrimaryColorDarkGreenOverlay
 
 include $(BUILD_PHONY_PACKAGE)
 include $(CLEAR_VARS)
diff --git a/themes/overlays/FontLatoSourceOverlay/Android.mk b/themes/overlays/FontLatoSourceOverlay/Android.mk
index 6656b34..9cde9fc 100644
--- a/themes/overlays/FontLatoSourceOverlay/Android.mk
+++ b/themes/overlays/FontLatoSourceOverlay/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := FontLatoSource
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlays/FontMuliSourceOverlay/Android.mk b/themes/overlays/FontMuliSourceOverlay/Android.mk
index 4fe327f..b6162d4 100644
--- a/themes/overlays/FontMuliSourceOverlay/Android.mk
+++ b/themes/overlays/FontMuliSourceOverlay/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := FontMuliSource
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlays/IconShapeCircleOverlay/Android.mk b/themes/overlays/IconShapeCircleOverlay/Android.mk
new file mode 100644
index 0000000..8bf40c0
--- /dev/null
+++ b/themes/overlays/IconShapeCircleOverlay/Android.mk
@@ -0,0 +1,29 @@
+#
+#  Copyright 2018, 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.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_RRO_THEME := IconShapeCircle
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := IconShapeCircleOverlay
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/IconShapeCircleOverlay/AndroidManifest.xml b/themes/overlays/IconShapeCircleOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..2650891
--- /dev/null
+++ b/themes/overlays/IconShapeCircleOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<!--
+/**
+ * Copyright (c) 2018, 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.
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.theme.icon.circle"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android"
+        android:category="android.theme.customization.adaptive_icon_shape"
+        android:priority="1"/>
+
+    <application android:label="@string/icon_shape_circle_overlay" android:hasCode="false"/>
+</manifest>
diff --git a/themes/overlays/IconShapeCircleOverlay/res/values/config.xml b/themes/overlays/IconShapeCircleOverlay/res/values/config.xml
new file mode 100644
index 0000000..7783200
--- /dev/null
+++ b/themes/overlays/IconShapeCircleOverlay/res/values/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2018, 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">
+    <!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->
+    <string name="config_icon_mask" translatable="false">"M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0"</string>
+</resources>
+
diff --git a/themes/overlays/IconShapeCircleOverlay/res/values/strings.xml b/themes/overlays/IconShapeCircleOverlay/res/values/strings.xml
new file mode 100644
index 0000000..316329e
--- /dev/null
+++ b/themes/overlays/IconShapeCircleOverlay/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2018, 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">
+    <!-- Circle icon overlay -->
+    <string name="icon_shape_circle_overlay" translatable="false">Circle</string>
+
+</resources>
diff --git a/themes/overlays/PrimaryColorDarkBlue/Android.mk b/themes/overlays/PrimaryColorDarkBlue/Android.mk
index d9f169c..5816447 100644
--- a/themes/overlays/PrimaryColorDarkBlue/Android.mk
+++ b/themes/overlays/PrimaryColorDarkBlue/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := PrimaryColorDarkBlue
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlays/PrimaryColorDarkGreen/Android.mk b/themes/overlays/PrimaryColorDarkGreen/Android.mk
index e4c2b98..7901fed 100644
--- a/themes/overlays/PrimaryColorDarkGreen/Android.mk
+++ b/themes/overlays/PrimaryColorDarkGreen/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := PrimaryColorDarkGreen
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlays/PrimaryColorDeepBlue/Android.mk b/themes/overlays/PrimaryColorDeepBlue/Android.mk
index 66a057e..e5a0146 100644
--- a/themes/overlays/PrimaryColorDeepBlue/Android.mk
+++ b/themes/overlays/PrimaryColorDeepBlue/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_RRO_THEME := PrimaryColorDeepBlue
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/themes/overlaystub/res/values/strings.xml b/themes/overlaystub/res/values/strings.xml
index 9a60003..c7c8a3e 100644
--- a/themes/overlaystub/res/values/strings.xml
+++ b/themes/overlaystub/res/values/strings.xml
@@ -33,12 +33,12 @@
     <string name="theme_wallpaper_title_omni">Omni</string>
     <string name="theme_wallpaper_attribution_omni">OmniROM</string>
     <string name="theme_wallpaper_action_omni">https://www.omnirom.org/</string>
-    <string name="theme_header_omni">omni_header</string>
+    <!--<string name="theme_header_omni">omni_header</string>-->
 
     <string name="theme_name_space">Space</string>
     <string name="theme_title_space">@string/theme_name_space</string>
     <string name="theme_overlay_color_space">com.android.theme.color.space</string>
-    <string name="theme_overlay_primary_space">com.android.theme.color.primary.darkblue</string>
+    <!--<string name="theme_overlay_primary_space">com.android.theme.color.primary.darkblue</string>-->
     <string name="theme_overlay_icon_android_space">com.android.theme.icon_pack.circular.android</string>
     <string name="theme_overlay_icon_launcher_space">com.android.theme.icon_pack.circular.launcher</string>
     <string name="theme_overlay_icon_settings_space">com.android.theme.icon_pack.circular.settings</string>
@@ -47,12 +47,12 @@
     <string name="theme_wallpaper_title_space">Omni</string>
     <string name="theme_wallpaper_attribution_space">OmniROM</string>
     <string name="theme_wallpaper_action_space">https://www.omnirom.org/</string>
-    <string name="theme_header_space">space_header</string>
+    <!--<string name="theme_header_space">space_header</string>-->
 
     <string name="theme_name_red">Red</string>
     <string name="theme_title_red">@string/theme_name_red</string>
     <string name="theme_overlay_color_red">com.android.theme.color.reddevil</string>
-    <string name="theme_overlay_primary_red">com.android.theme.color.primary.omniblack</string>
+    <!--<string name="theme_overlay_primary_red">com.android.theme.color.primary.omniblack</string>-->
     <string name="theme_overlay_icon_android_red">com.android.theme.icon_pack.rounded.android</string>
     <string name="theme_overlay_icon_launcher_red">com.android.theme.icon_pack.rounded.launcher</string>
     <string name="theme_overlay_icon_settings_red">com.android.theme.icon_pack.rounded.settings</string>
@@ -61,12 +61,12 @@
     <string name="theme_wallpaper_title_red">Omni</string>
     <string name="theme_wallpaper_attribution_red">OmniROM</string>
     <string name="theme_wallpaper_action_red">https://www.omnirom.org/</string>
-    <string name="theme_header_red">red_header</string>
+    <!--<string name="theme_header_red">red_header</string>-->
 
     <string name="theme_name_nature">Nature</string>
     <string name="theme_title_nature">@string/theme_name_nature</string>
     <string name="theme_overlay_color_nature">com.android.theme.color.green</string>
-    <string name="theme_overlay_primary_nature">com.android.theme.color.primary.darkgreen</string>
+    <!--<string name="theme_overlay_primary_nature">com.android.theme.color.primary.darkgreen</string>-->
     <string name="theme_overlay_icon_android_nature">com.android.theme.icon_pack.rounded.android</string>
     <string name="theme_overlay_icon_launcher_nature">com.android.theme.icon_pack.rounded.launcher</string>
     <string name="theme_overlay_icon_settings_nature">com.android.theme.icon_pack.rounded.settings</string>
@@ -75,6 +75,6 @@
     <string name="theme_wallpaper_title_nature">Omni</string>
     <string name="theme_wallpaper_attribution_nature">OmniROM</string>
     <string name="theme_wallpaper_action_nature">https://www.omnirom.org/</string>
-    <string name="theme_header_nature">nature_header</string>
+    <!--<string name="theme_header_nature">nature_header</string>-->
 
 </resources>