diff --git a/config/packages.mk b/config/packages.mk
index b5980bc..432143b 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -45,8 +45,7 @@
 
 # Themes
 PRODUCT_PACKAGES += \
-    PixelTheme \
-    Stock
+    PixelTheme
 
 # for fun
 PRODUCT_PACKAGES += EggGame
diff --git a/google/themes/Pixel/Android.mk b/google/themes/Pixel/Android.mk
index 7c260ae..37bd941 100644
--- a/google/themes/Pixel/Android.mk
+++ b/google/themes/Pixel/Android.mk
@@ -1,11 +1,11 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := optional
-
 LOCAL_PACKAGE_NAME := PixelTheme
-LOCAL_SDK_VERSION := current
+LOCAL_RRO_THEME := PixelTheme
 LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-include $(BUILD_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/Stock/Android.mk b/google/themes/Stock/Android.mk
deleted file mode 100644
index 70322d8..0000000
--- a/google/themes/Stock/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := Stock
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
-
diff --git a/google/themes/Stock/AndroidManifest.xml b/google/themes/Stock/AndroidManifest.xml
deleted file mode 100644
index 1a8a18d..0000000
--- a/google/themes/Stock/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.theme.stock"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-    <application android:hasCode="false"
-                 android:label="Stock" />
-</manifest>
-
diff --git a/google/themes/Stock/res/values/colors.xml b/google/themes/Stock/res/values/colors.xml
deleted file mode 100644
index a078444..0000000
--- a/google/themes/Stock/res/values/colors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ff00bcd4</color>
-    <color name="user_icon_2">#ff3f51b5</color>
-    <color name="user_icon_3">#ff4285f4</color>
-    <color name="user_icon_4">#ffe91e63</color>
-    <color name="user_icon_5">#ff0f9d58</color>
-    <color name="user_icon_6">#ff8bc34a</color>
-    <color name="user_icon_7">#ffff9800</color>
-    <color name="user_icon_8">#ffff5722</color>
-    <color name="system_error">#ffea4335</color>
-    <color name="primary_device_default_dark">#ff212121</color>
-    <color name="primary_device_default_settings">#ff263238</color>
-    <color name="primary_dark_device_default_dark">#ff000000</color>
-    <color name="primary_dark_device_default_settings">#ff212121</color>
-    <color name="secondary_device_default_settings">#ff37474f</color>
-    <color name="tertiary_device_default_settings">#ff455a64</color>
-    <color name="quaternary_device_default_settings">#ffb0bec5</color>
-    <color name="accent_device_default_700">#ff00796b</color>
-    <color name="accent_device_default_light">#ff009688</color>
-    <color name="accent_device_default_dark">#ff80cbc4</color>
-    <color name="accent_device_default_50">#ffe0f2f1</color>
-</resources>