diff --git a/config/themes.mk b/config/themes.mk
index 23ec5af..d42c58c 100644
--- a/config/themes.mk
+++ b/config/themes.mk
@@ -2,4 +2,11 @@
 PRODUCT_PACKAGES += \
     SettingsDark \
     SettingsIntelligenceDark \
-    SystemDark
+    SystemDark \
+    UserOne \
+    UserTwo \
+    UserThree \
+    UserFour \
+    UserFive \
+    UserSix \
+    UserSeven
diff --git a/themes/accents/user-five/Android.mk b/themes/accents/user-five/Android.mk
new file mode 100644
index 0000000..2c02945
--- /dev/null
+++ b/themes/accents/user-five/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := UserFive
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+
+include $(BUILD_PACKAGE)
diff --git a/themes/accents/user-five/AndroidManifest.xml b/themes/accents/user-five/AndroidManifest.xml
new file mode 100644
index 0000000..1f0925f
--- /dev/null
+++ b/themes/accents/user-five/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.accents.userfive"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android" android:priority="1"/>
+
+    <application android:label="UserFive" android:hasCode="false"/>
+</manifest>
diff --git a/themes/accents/user-five/res/values/colors.xml b/themes/accents/user-five/res/values/colors.xml
new file mode 100644
index 0000000..94251c5
--- /dev/null
+++ b/themes/accents/user-five/res/values/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>
+
+    <!-- Accent -->
+    <color name="accent_device_default_700">#FF0EE898</color>
+    <color name="accent_device_default_light">#FF0EE898</color>
+    <color name="accent_device_default_dark">#FF0EE898</color>
+
+</resources>
diff --git a/themes/accents/user-four/Android.mk b/themes/accents/user-four/Android.mk
new file mode 100644
index 0000000..df82608
--- /dev/null
+++ b/themes/accents/user-four/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := UserFour
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+
+include $(BUILD_PACKAGE)
diff --git a/themes/accents/user-four/AndroidManifest.xml b/themes/accents/user-four/AndroidManifest.xml
new file mode 100644
index 0000000..256e686
--- /dev/null
+++ b/themes/accents/user-four/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.accents.userfour"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android" android:priority="1"/>
+
+    <application android:label="UserFour" android:hasCode="false"/>
+</manifest>
diff --git a/themes/accents/user-four/res/values/colors.xml b/themes/accents/user-four/res/values/colors.xml
new file mode 100644
index 0000000..6967193
--- /dev/null
+++ b/themes/accents/user-four/res/values/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>
+
+    <!-- Accent -->
+    <color name="accent_device_default_700">#FF42f4aa</color>
+    <color name="accent_device_default_light">#FF42f4aa</color>
+    <color name="accent_device_default_dark">#FF42f4aa</color>
+
+</resources>
diff --git a/themes/accents/user-one/Android.mk b/themes/accents/user-one/Android.mk
new file mode 100644
index 0000000..5a2a897
--- /dev/null
+++ b/themes/accents/user-one/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := UserOne
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+
+include $(BUILD_PACKAGE)
diff --git a/themes/accents/user-one/AndroidManifest.xml b/themes/accents/user-one/AndroidManifest.xml
new file mode 100644
index 0000000..732c64e
--- /dev/null
+++ b/themes/accents/user-one/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.accents.userone"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android" android:priority="1"/>
+
+    <application android:label="UserOne" android:hasCode="false"/>
+</manifest>
diff --git a/themes/accents/user-one/res/values/colors.xml b/themes/accents/user-one/res/values/colors.xml
new file mode 100644
index 0000000..3c65c0f
--- /dev/null
+++ b/themes/accents/user-one/res/values/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>
+
+    <!-- Accent -->
+    <color name="accent_device_default_700">#FF900000</color>
+    <color name="accent_device_default_light">#FF900000</color>
+    <color name="accent_device_default_dark">#FF900000</color>
+
+</resources>
diff --git a/themes/accents/user-seven/Android.mk b/themes/accents/user-seven/Android.mk
new file mode 100644
index 0000000..b08286e
--- /dev/null
+++ b/themes/accents/user-seven/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := UserSeven
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+
+include $(BUILD_PACKAGE)
diff --git a/themes/accents/user-seven/AndroidManifest.xml b/themes/accents/user-seven/AndroidManifest.xml
new file mode 100644
index 0000000..d2bdee8
--- /dev/null
+++ b/themes/accents/user-seven/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.accents.userseven"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android" android:priority="1"/>
+
+    <application android:label="UserSeven" android:hasCode="false"/>
+</manifest>
diff --git a/themes/accents/user-seven/res/values/colors.xml b/themes/accents/user-seven/res/values/colors.xml
new file mode 100644
index 0000000..bf556e1
--- /dev/null
+++ b/themes/accents/user-seven/res/values/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>
+
+    <!-- Accent -->
+    <color name="accent_device_default_700">#FFFFCC00</color>
+    <color name="accent_device_default_light">#FFFFCC00</color>
+    <color name="accent_device_default_dark">#FFFFCC00</color>
+
+</resources>
diff --git a/themes/accents/user-six/Android.mk b/themes/accents/user-six/Android.mk
new file mode 100644
index 0000000..d7adcb6
--- /dev/null
+++ b/themes/accents/user-six/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := UserSix
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+
+include $(BUILD_PACKAGE)
diff --git a/themes/accents/user-six/AndroidManifest.xml b/themes/accents/user-six/AndroidManifest.xml
new file mode 100644
index 0000000..8ebba22
--- /dev/null
+++ b/themes/accents/user-six/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.accents.usersix"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android" android:priority="1"/>
+
+    <application android:label="UserSix" android:hasCode="false"/>
+</manifest>
diff --git a/themes/accents/user-six/res/values/colors.xml b/themes/accents/user-six/res/values/colors.xml
new file mode 100644
index 0000000..96ad87e
--- /dev/null
+++ b/themes/accents/user-six/res/values/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>
+
+    <!-- Accent -->
+    <color name="accent_device_default_700">#FFFFC27B</color>
+    <color name="accent_device_default_light">#FFFFC27B</color>
+    <color name="accent_device_default_dark">#FFFFC27B</color>
+
+</resources>
diff --git a/themes/accents/user-three/Android.mk b/themes/accents/user-three/Android.mk
new file mode 100644
index 0000000..8f438b5
--- /dev/null
+++ b/themes/accents/user-three/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := UserThree
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+
+include $(BUILD_PACKAGE)
diff --git a/themes/accents/user-three/AndroidManifest.xml b/themes/accents/user-three/AndroidManifest.xml
new file mode 100644
index 0000000..83253ef
--- /dev/null
+++ b/themes/accents/user-three/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.accents.userthree"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android" android:priority="1"/>
+
+    <application android:label="UserThree" android:hasCode="false"/>
+</manifest>
diff --git a/themes/accents/user-three/res/values/colors.xml b/themes/accents/user-three/res/values/colors.xml
new file mode 100644
index 0000000..7d75070
--- /dev/null
+++ b/themes/accents/user-three/res/values/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>
+
+    <!-- Accent -->
+    <color name="accent_device_default_700">#FF1976D2</color>
+    <color name="accent_device_default_light">#FF1976D2</color>
+    <color name="accent_device_default_dark">#FF1976D2</color>
+
+</resources>
diff --git a/themes/accents/user-two/Android.mk b/themes/accents/user-two/Android.mk
new file mode 100644
index 0000000..46c3d07
--- /dev/null
+++ b/themes/accents/user-two/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := UserTwo
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+
+include $(BUILD_PACKAGE)
diff --git a/themes/accents/user-two/AndroidManifest.xml b/themes/accents/user-two/AndroidManifest.xml
new file mode 100644
index 0000000..86b50ec
--- /dev/null
+++ b/themes/accents/user-two/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.accents.usertwo"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android" android:priority="1"/>
+
+    <application android:label="UserTwo" android:hasCode="false"/>
+</manifest>
diff --git a/themes/accents/user-two/res/values/colors.xml b/themes/accents/user-two/res/values/colors.xml
new file mode 100644
index 0000000..4e6ed9b
--- /dev/null
+++ b/themes/accents/user-two/res/values/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>
+
+    <!-- Accent -->
+    <color name="accent_device_default_700">#FF42069a</color>
+    <color name="accent_device_default_light">#FF42069a</color>
+    <color name="accent_device_default_dark">#FF42069a</color>
+
+</resources>