diff --git a/config/packages.mk b/config/packages.mk
index 8a6a8c4..13f7e21 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -17,7 +17,8 @@
     ExactCalculator
 
 PRODUCT_PACKAGES += \
-     OmniOverlayStub
+     OmniOverlayStub \
+     omni-overlays
 
 # Additional tools
 PRODUCT_PACKAGES += \
diff --git a/google/README.md b/google/README.md
new file mode 100644
index 0000000..ce24be2
--- /dev/null
+++ b/google/README.md
@@ -0,0 +1 @@
+Deprecated pre Q overlays - just kept for reference
diff --git a/themes/Android.mk b/themes/Android.mk
new file mode 100644
index 0000000..20bfbaf
--- /dev/null
+++ b/themes/Android.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2011 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.
+#
+
+# WARNING: Everything listed here will be built on ALL platforms,
+# including x86, the emulator, and the SDK.  Modules must be uniquely
+# named (liblights.panda), and must build everywhere, or limit themselves
+# to only building on ARM if they include assembly. Individual makefiles
+# are responsible for having their own logic, for fine-grained control.
+
+LOCAL_PATH := $(call my-dir)
+
+# if some modules are built directly from this directory (not subdirectories),
+# their rules should be written here.
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/themes/README.md b/themes/README.md
new file mode 100644
index 0000000..8db6a3e
--- /dev/null
+++ b/themes/README.md
@@ -0,0 +1 @@
+Android Q overlays and theme
diff --git a/themes/overlays/AccentColorBlueMondayOverlay/Android.mk b/themes/overlays/AccentColorBlueMondayOverlay/Android.mk
new file mode 100644
index 0000000..178b52d
--- /dev/null
+++ b/themes/overlays/AccentColorBlueMondayOverlay/Android.mk
@@ -0,0 +1,31 @@
+#
+#  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 := AccentColorBlueMonday
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := AccentColorBlueMondayOverlay
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/AccentColorBlueMondayOverlay/AndroidManifest.xml b/themes/overlays/AccentColorBlueMondayOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..35592f4
--- /dev/null
+++ b/themes/overlays/AccentColorBlueMondayOverlay/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<!--
+/**
+ * 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.color.bluemonday"
+          android:versionCode="1"
+          android:versionName="1.0">
+    <overlay android:targetPackage="android" android:category="android.theme.customization.accent_color" android:priority="1"/>
+
+    <application android:label="@string/accent_color_blue_monday" android:hasCode="false"/>
+</manifest>
diff --git a/themes/overlays/AccentColorBlueMondayOverlay/res/values/colors_device_defaults.xml b/themes/overlays/AccentColorBlueMondayOverlay/res/values/colors_device_defaults.xml
new file mode 100644
index 0000000..d150618
--- /dev/null
+++ b/themes/overlays/AccentColorBlueMondayOverlay/res/values/colors_device_defaults.xml
@@ -0,0 +1,22 @@
+<?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>
+    <color name="accent_device_default_light">#ff009ed8</color>
+    <color name="accent_device_default_dark">#ff009ed8</color>
+</resources>
diff --git a/themes/overlays/AccentColorBlueMondayOverlay/res/values/strings.xml b/themes/overlays/AccentColorBlueMondayOverlay/res/values/strings.xml
new file mode 100644
index 0000000..b3abb84
--- /dev/null
+++ b/themes/overlays/AccentColorBlueMondayOverlay/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">
+    <!-- Purple accent color name application label. [CHAR LIMIT=50] -->
+    <string name="accent_color_blue_monday" translatable="false">Blue Monday</string>
+</resources>
+
diff --git a/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk b/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk
new file mode 100644
index 0000000..1cd8825
--- /dev/null
+++ b/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk
@@ -0,0 +1,31 @@
+#
+#  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 := AccentColorGoldenShower
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := AccentColorGoldenShowerOverlay
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/AccentColorGoldenShowerOverlay/AndroidManifest.xml b/themes/overlays/AccentColorGoldenShowerOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..8dad4ed
--- /dev/null
+++ b/themes/overlays/AccentColorGoldenShowerOverlay/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<!--
+/**
+ * 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.color.golden"
+          android:versionCode="1"
+          android:versionName="1.0">
+    <overlay android:targetPackage="android" android:category="android.theme.customization.accent_color" android:priority="1"/>
+
+    <application android:label="@string/accent_color_golden_shower" android:hasCode="false"/>
+</manifest>
diff --git a/themes/overlays/AccentColorGoldenShowerOverlay/res/values/colors_device_defaults.xml b/themes/overlays/AccentColorGoldenShowerOverlay/res/values/colors_device_defaults.xml
new file mode 100644
index 0000000..99a00af
--- /dev/null
+++ b/themes/overlays/AccentColorGoldenShowerOverlay/res/values/colors_device_defaults.xml
@@ -0,0 +1,22 @@
+<?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>
+    <color name="accent_device_default_light">#ffd8a209</color>
+    <color name="accent_device_default_dark">#fff0b50b</color>
+</resources>
diff --git a/themes/overlays/AccentColorGoldenShowerOverlay/res/values/strings.xml b/themes/overlays/AccentColorGoldenShowerOverlay/res/values/strings.xml
new file mode 100644
index 0000000..d0c70b9
--- /dev/null
+++ b/themes/overlays/AccentColorGoldenShowerOverlay/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">
+    <!-- Purple accent color name application label. [CHAR LIMIT=50] -->
+    <string name="accent_color_golden_shower" translatable="false">Golden Shower</string>
+</resources>
+
diff --git a/themes/overlays/AccentColorOmniOverlay/Android.mk b/themes/overlays/AccentColorOmniOverlay/Android.mk
new file mode 100644
index 0000000..b35b1bf
--- /dev/null
+++ b/themes/overlays/AccentColorOmniOverlay/Android.mk
@@ -0,0 +1,31 @@
+#
+#  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 := AccentColorOmni
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := AccentColorOmniOverlay
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/AccentColorOmniOverlay/AndroidManifest.xml b/themes/overlays/AccentColorOmniOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..fd3e176
--- /dev/null
+++ b/themes/overlays/AccentColorOmniOverlay/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<!--
+/**
+ * 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.color.omni"
+          android:versionCode="1"
+          android:versionName="1.0">
+    <overlay android:targetPackage="android" android:category="android.theme.customization.accent_color" android:priority="1"/>
+
+    <application android:label="@string/accent_color_omni" android:hasCode="false"/>
+</manifest>
diff --git a/themes/overlays/AccentColorOmniOverlay/res/values/colors_device_defaults.xml b/themes/overlays/AccentColorOmniOverlay/res/values/colors_device_defaults.xml
new file mode 100644
index 0000000..377ec37
--- /dev/null
+++ b/themes/overlays/AccentColorOmniOverlay/res/values/colors_device_defaults.xml
@@ -0,0 +1,22 @@
+<?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>
+    <color name="accent_device_default_light">#ffa1c729</color>
+    <color name="accent_device_default_dark">#ff90b324</color>
+</resources>
diff --git a/themes/overlays/AccentColorOmniOverlay/res/values/strings.xml b/themes/overlays/AccentColorOmniOverlay/res/values/strings.xml
new file mode 100644
index 0000000..45979af
--- /dev/null
+++ b/themes/overlays/AccentColorOmniOverlay/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">
+    <!-- Purple accent color name application label. [CHAR LIMIT=50] -->
+    <string name="accent_color_omni" translatable="false">Omni</string>
+</resources>
+
diff --git a/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk b/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk
new file mode 100644
index 0000000..182efbf
--- /dev/null
+++ b/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk
@@ -0,0 +1,31 @@
+#
+#  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 := AccentColorSluttyPink
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := AccentColorSluttyPinkOverlay
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/AccentColorSluttyPinkOverlay/AndroidManifest.xml b/themes/overlays/AccentColorSluttyPinkOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..808f9a1
--- /dev/null
+++ b/themes/overlays/AccentColorSluttyPinkOverlay/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<!--
+/**
+ * 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.color.slut"
+          android:versionCode="1"
+          android:versionName="1.0">
+    <overlay android:targetPackage="android" android:category="android.theme.customization.accent_color" android:priority="1"/>
+
+    <application android:label="@string/accent_color_slutty_pink" android:hasCode="false"/>
+</manifest>
diff --git a/themes/overlays/AccentColorSluttyPinkOverlay/res/values/colors_device_defaults.xml b/themes/overlays/AccentColorSluttyPinkOverlay/res/values/colors_device_defaults.xml
new file mode 100644
index 0000000..94b3761
--- /dev/null
+++ b/themes/overlays/AccentColorSluttyPinkOverlay/res/values/colors_device_defaults.xml
@@ -0,0 +1,22 @@
+<?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>
+    <color name="accent_device_default_light">#ffff005a</color>
+    <color name="accent_device_default_dark">#ffe50051</color>
+</resources>
diff --git a/themes/overlays/AccentColorSluttyPinkOverlay/res/values/strings.xml b/themes/overlays/AccentColorSluttyPinkOverlay/res/values/strings.xml
new file mode 100644
index 0000000..4164f9e
--- /dev/null
+++ b/themes/overlays/AccentColorSluttyPinkOverlay/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">
+    <!-- Purple accent color name application label. [CHAR LIMIT=50] -->
+    <string name="accent_color_slutty_pink" translatable="false">Slutty pink</string>
+</resources>
+
diff --git a/themes/overlays/Android.mk b/themes/overlays/Android.mk
new file mode 100644
index 0000000..7e0e95f
--- /dev/null
+++ b/themes/overlays/Android.mk
@@ -0,0 +1,30 @@
+# Copyright (C) 2019 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_MODULE := omni-overlays
+LOCAL_REQUIRED_MODULES := \
+	AccentColorSluttyPinkOverlay \
+	AccentColorBlueMondayOverlay \
+	AccentColorOmniOverlay \
+	AccentColorGoldenShowerOverlay \
+	PrimaryColorOmniBlackOverlay \
+	PrimaryColorDarkBlueOverlay
+
+include $(BUILD_PHONY_PACKAGE)
+include $(CLEAR_VARS)
+
+include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/themes/overlays/PrimaryColorDarkBlue/Android.mk b/themes/overlays/PrimaryColorDarkBlue/Android.mk
new file mode 100644
index 0000000..aab4063
--- /dev/null
+++ b/themes/overlays/PrimaryColorDarkBlue/Android.mk
@@ -0,0 +1,31 @@
+#
+#  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 := PrimaryColorDarkBlue
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := PrimaryColorDarkBlueOverlay
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/PrimaryColorDarkBlue/AndroidManifest.xml b/themes/overlays/PrimaryColorDarkBlue/AndroidManifest.xml
new file mode 100644
index 0000000..80efa71
--- /dev/null
+++ b/themes/overlays/PrimaryColorDarkBlue/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<!--
+/**
+ * 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.color.primary.darkblue"
+          android:versionCode="1"
+          android:versionName="1.0">
+    <overlay android:targetPackage="android" android:category="android.theme.customization.primary_color" android:priority="2"/>
+
+    <application android:label="@string/primary_color_dark_blue" android:hasCode="false"/>
+</manifest>
diff --git a/themes/overlays/PrimaryColorDarkBlue/res/values-night/colors.xml b/themes/overlays/PrimaryColorDarkBlue/res/values-night/colors.xml
new file mode 100644
index 0000000..c9456d9
--- /dev/null
+++ b/themes/overlays/PrimaryColorDarkBlue/res/values-night/colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable
+     overlaying new theme colors. -->
+<resources>
+    <color name="primary_device_default_settings">#182a33</color> <!-- colorPrimary -->
+    <color name="primary_dark_device_default_settings">#0d2029</color> <!-- colorPrimaryDark-->
+    <color name="material_grey_800">#1b2e38</color> <!-- google elgoogleogoelo -->
+    <color name="material_grey_900">#182a33</color> <!-- google elgoogleogoelo -->
+    <color name="primary_device_default">@color/primary_dark_device_default_settings</color> <!-- only for ThemePicker! -->
+</resources>
+
diff --git a/themes/overlays/PrimaryColorDarkBlue/res/values/colors.xml b/themes/overlays/PrimaryColorDarkBlue/res/values/colors.xml
new file mode 100644
index 0000000..5f47403
--- /dev/null
+++ b/themes/overlays/PrimaryColorDarkBlue/res/values/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable
+     overlaying new theme colors. -->
+<resources>
+    <color name="primary_device_default">@*android:color/primary_device_default_settings_light</color> <!-- only for ThemePicker! -->
+</resources>
+
diff --git a/themes/overlays/PrimaryColorDarkBlue/res/values/strings.xml b/themes/overlays/PrimaryColorDarkBlue/res/values/strings.xml
new file mode 100644
index 0000000..2fffd85
--- /dev/null
+++ b/themes/overlays/PrimaryColorDarkBlue/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">
+    <!-- Purple accent color name application label. [CHAR LIMIT=50] -->
+    <string name="primary_color_dark_blue" translatable="false">Dark Blue</string>
+</resources>
+
diff --git a/themes/overlays/PrimaryColorOmniBlack/Android.mk b/themes/overlays/PrimaryColorOmniBlack/Android.mk
new file mode 100644
index 0000000..219c532
--- /dev/null
+++ b/themes/overlays/PrimaryColorOmniBlack/Android.mk
@@ -0,0 +1,31 @@
+#
+#  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 := PrimaryColorOmniBlack
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := PrimaryColorOmniBlackOverlay
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/PrimaryColorOmniBlack/AndroidManifest.xml b/themes/overlays/PrimaryColorOmniBlack/AndroidManifest.xml
new file mode 100644
index 0000000..2608f53
--- /dev/null
+++ b/themes/overlays/PrimaryColorOmniBlack/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<!--
+/**
+ * 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.color.primary.omniblack"
+          android:versionCode="1"
+          android:versionName="1.0">
+    <overlay android:targetPackage="android" android:category="android.theme.customization.primary_color" android:priority="2"/>
+
+    <application android:label="@string/primary_color_omni_black" android:hasCode="false"/>
+</manifest>
diff --git a/themes/overlays/PrimaryColorOmniBlack/res/values-night/colors.xml b/themes/overlays/PrimaryColorOmniBlack/res/values-night/colors.xml
new file mode 100644
index 0000000..35ff157
--- /dev/null
+++ b/themes/overlays/PrimaryColorOmniBlack/res/values-night/colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable
+     overlaying new theme colors. -->
+<resources>
+    <color name="primary_device_default_settings">#101010</color> <!-- colorPrimary -->
+    <color name="primary_dark_device_default_settings">#000000</color> <!-- colorPrimaryDark-->
+    <color name="material_grey_800">#121212</color> <!-- google elgoogleogoelo -->
+    <color name="material_grey_900">#101010</color> <!-- google elgoogleogoelo -->
+    <color name="primary_device_default">@color/primary_dark_device_default_settings</color> <!-- only for ThemePicker! -->
+</resources>
+
diff --git a/themes/overlays/PrimaryColorOmniBlack/res/values/colors.xml b/themes/overlays/PrimaryColorOmniBlack/res/values/colors.xml
new file mode 100644
index 0000000..5f47403
--- /dev/null
+++ b/themes/overlays/PrimaryColorOmniBlack/res/values/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable
+     overlaying new theme colors. -->
+<resources>
+    <color name="primary_device_default">@*android:color/primary_device_default_settings_light</color> <!-- only for ThemePicker! -->
+</resources>
+
diff --git a/themes/overlays/PrimaryColorOmniBlack/res/values/strings.xml b/themes/overlays/PrimaryColorOmniBlack/res/values/strings.xml
new file mode 100644
index 0000000..46960be
--- /dev/null
+++ b/themes/overlays/PrimaryColorOmniBlack/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">
+    <!-- Purple accent color name application label. [CHAR LIMIT=50] -->
+    <string name="primary_color_omni_black" translatable="false">Omni Black</string>
+</resources>
+
diff --git a/overlaystub/Android.mk b/themes/overlaystub/Android.mk
similarity index 100%
rename from overlaystub/Android.mk
rename to themes/overlaystub/Android.mk
diff --git a/overlaystub/AndroidManifest.xml b/themes/overlaystub/AndroidManifest.xml
similarity index 100%
rename from overlaystub/AndroidManifest.xml
rename to themes/overlaystub/AndroidManifest.xml
diff --git a/overlaystub/res/drawable/omni_wallpaper.png b/themes/overlaystub/res/drawable/omni_wallpaper.png
similarity index 100%
rename from overlaystub/res/drawable/omni_wallpaper.png
rename to themes/overlaystub/res/drawable/omni_wallpaper.png
Binary files differ
diff --git a/overlaystub/res/drawable/space_wallpaper.jpg b/themes/overlaystub/res/drawable/space_wallpaper.jpg
similarity index 100%
rename from overlaystub/res/drawable/space_wallpaper.jpg
rename to themes/overlaystub/res/drawable/space_wallpaper.jpg
Binary files differ
diff --git a/overlaystub/res/values/arrays.xml b/themes/overlaystub/res/values/arrays.xml
similarity index 100%
rename from overlaystub/res/values/arrays.xml
rename to themes/overlaystub/res/values/arrays.xml
diff --git a/overlaystub/res/values/drawable.xml b/themes/overlaystub/res/values/drawable.xml
similarity index 100%
rename from overlaystub/res/values/drawable.xml
rename to themes/overlaystub/res/values/drawable.xml
diff --git a/overlaystub/res/values/strings.xml b/themes/overlaystub/res/values/strings.xml
similarity index 100%
rename from overlaystub/res/values/strings.xml
rename to themes/overlaystub/res/values/strings.xml