diff --git a/config/packages.mk b/config/packages.mk
index 3731b3a..32cc997 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -46,21 +46,16 @@
 PRODUCT_PACKAGES += telephony-ext
 PRODUCT_BOOT_JARS += telephony-ext
 
-# OMS support
-#PRODUCT_PACKAGES += ThemeInterfacer \
-    OmniTheme \
-    OmniSubs
-
 # Themes
 #PRODUCT_PACKAGES += \
     GboardOmniTheme
 
-#PRODUCT_PACKAGES += \
+PRODUCT_PACKAGES += \
     NotificationsDark \
     NotificationsLight \
     NotificationsPrimary
 
-#PRODUCT_PACKAGES += \
+PRODUCT_PACKAGES += \
     AccentSluttyPink \
     AccentPixel \
     AccentGoldenShower \
@@ -75,7 +70,7 @@
     AccentRottenOrange \
     AccentDeepPurple
 
-#PRODUCT_PACKAGES += \
+PRODUCT_PACKAGES += \
     PrimaryAlmostBlack \
     PrimaryBlack \
     PrimaryOmni \
diff --git a/google/Android.mk b/google/Android.mk
index 389e8be..20bfbaf 100644
--- a/google/Android.mk
+++ b/google/Android.mk
@@ -25,4 +25,4 @@
 # if some modules are built directly from this directory (not subdirectories),
 # their rules should be written here.
 
-#include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/google/themes/AccentBlueMonday/Android.mk b/google/themes/AccentBlueMonday/Android.mk
index 17bfe4c..469a6ca 100644
--- a/google/themes/AccentBlueMonday/Android.mk
+++ b/google/themes/AccentBlueMonday/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentBlueMonday
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentDeadRed/Android.mk b/google/themes/AccentDeadRed/Android.mk
index 6631fbf..c84ac2d 100644
--- a/google/themes/AccentDeadRed/Android.mk
+++ b/google/themes/AccentDeadRed/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentDeadRed
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentDeepOrange/Android.mk b/google/themes/AccentDeepOrange/Android.mk
index bfd7d86..a6fc926 100644
--- a/google/themes/AccentDeepOrange/Android.mk
+++ b/google/themes/AccentDeepOrange/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentDeepOrange
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentDeepPurple/Android.mk b/google/themes/AccentDeepPurple/Android.mk
index 7a24302..c49407d 100644
--- a/google/themes/AccentDeepPurple/Android.mk
+++ b/google/themes/AccentDeepPurple/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentDeepPurple
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentFromHell/Android.mk b/google/themes/AccentFromHell/Android.mk
index 78dd8aa..799fd1d 100644
--- a/google/themes/AccentFromHell/Android.mk
+++ b/google/themes/AccentFromHell/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentFromHell
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentGoldenShower/Android.mk b/google/themes/AccentGoldenShower/Android.mk
index bac13c5..4865cf5 100644
--- a/google/themes/AccentGoldenShower/Android.mk
+++ b/google/themes/AccentGoldenShower/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccnetGoldenShower
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentOmni/Android.mk b/google/themes/AccentOmni/Android.mk
index 6764eeb..6be3e94 100644
--- a/google/themes/AccentOmni/Android.mk
+++ b/google/themes/AccentOmni/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentOmni
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentPixel/Android.mk b/google/themes/AccentPixel/Android.mk
index 44f046b..c438026 100644
--- a/google/themes/AccentPixel/Android.mk
+++ b/google/themes/AccentPixel/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentPixel
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentRottenOrange/Android.mk b/google/themes/AccentRottenOrange/Android.mk
index e929d22..9a54e4a 100644
--- a/google/themes/AccentRottenOrange/Android.mk
+++ b/google/themes/AccentRottenOrange/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentRottenOrange
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentSluttyPink/Android.mk b/google/themes/AccentSluttyPink/Android.mk
index 5ea096a..f5dd363 100644
--- a/google/themes/AccentSluttyPink/Android.mk
+++ b/google/themes/AccentSluttyPink/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentSluttyPink
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentSmokingGreen/Android.mk b/google/themes/AccentSmokingGreen/Android.mk
index a01a363..94c29f2 100644
--- a/google/themes/AccentSmokingGreen/Android.mk
+++ b/google/themes/AccentSmokingGreen/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentSmokingGreen
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentTeal/Android.mk b/google/themes/AccentTeal/Android.mk
index e107415..e5b5e43 100644
--- a/google/themes/AccentTeal/Android.mk
+++ b/google/themes/AccentTeal/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentTeal
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/AccentWhite/Android.mk b/google/themes/AccentWhite/Android.mk
index 6fdd2ce..feb74a5 100644
--- a/google/themes/AccentWhite/Android.mk
+++ b/google/themes/AccentWhite/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := AccentWhite
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/Bl4ckAndYell0/Android.mk b/google/themes/Bl4ckAndYell0/Android.mk
index 2bbab0a..e10d3f6 100644
--- a/google/themes/Bl4ckAndYell0/Android.mk
+++ b/google/themes/Bl4ckAndYell0/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := Bl4ckAndYell0Theme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/DarknessMeister/Android.mk b/google/themes/DarknessMeister/Android.mk
index 7a76473..22b5bf3 100644
--- a/google/themes/DarknessMeister/Android.mk
+++ b/google/themes/DarknessMeister/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := DarknessMeisterTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/FromHell/Android.mk b/google/themes/FromHell/Android.mk
index 0b814b2..0e1c5da 100644
--- a/google/themes/FromHell/Android.mk
+++ b/google/themes/FromHell/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := FromHellTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/GboardOmniTheme/Android.mk b/google/themes/GboardOmniTheme/Android.mk
index 4e60248..8555645 100644
--- a/google/themes/GboardOmniTheme/Android.mk
+++ b/google/themes/GboardOmniTheme/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := GboardOmniTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/NotificationsDark/Android.mk b/google/themes/NotificationsDark/Android.mk
index c2995c8..0882b35 100644
--- a/google/themes/NotificationsDark/Android.mk
+++ b/google/themes/NotificationsDark/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := NotificationsDark
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/NotificationsLight/Android.mk b/google/themes/NotificationsLight/Android.mk
index efc7840..7923bde 100644
--- a/google/themes/NotificationsLight/Android.mk
+++ b/google/themes/NotificationsLight/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := NotificationsLight
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/NotificationsPrimary/Android.mk b/google/themes/NotificationsPrimary/Android.mk
index dcced9e..1a80347 100644
--- a/google/themes/NotificationsPrimary/Android.mk
+++ b/google/themes/NotificationsPrimary/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := NotificationsPrimary
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/OmniTheme/Android.mk b/google/themes/OmniTheme/Android.mk
index 4aeda03..518f2d9 100644
--- a/google/themes/OmniTheme/Android.mk
+++ b/google/themes/OmniTheme/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := OmniTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/Pixel/Android.mk b/google/themes/Pixel/Android.mk
index 741798f..b9a1a5a 100644
--- a/google/themes/Pixel/Android.mk
+++ b/google/themes/Pixel/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := PixelTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/PrimaryAlmostBlack/Android.mk b/google/themes/PrimaryAlmostBlack/Android.mk
index ceceec3..b4b158a 100644
--- a/google/themes/PrimaryAlmostBlack/Android.mk
+++ b/google/themes/PrimaryAlmostBlack/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := PrimaryAlmostBlack
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/PrimaryBlack/Android.mk b/google/themes/PrimaryBlack/Android.mk
index a00b3c9..f260903 100644
--- a/google/themes/PrimaryBlack/Android.mk
+++ b/google/themes/PrimaryBlack/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := PrimaryBlack
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/PrimaryColdWhite/Android.mk b/google/themes/PrimaryColdWhite/Android.mk
index 952177c..2077d6c 100644
--- a/google/themes/PrimaryColdWhite/Android.mk
+++ b/google/themes/PrimaryColdWhite/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := PrimaryColdWhite
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/PrimaryDarkBlue/Android.mk b/google/themes/PrimaryDarkBlue/Android.mk
index 0b566e1..ff5a276 100644
--- a/google/themes/PrimaryDarkBlue/Android.mk
+++ b/google/themes/PrimaryDarkBlue/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := PrimaryDarkBlue
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/PrimaryOmni/Android.mk b/google/themes/PrimaryOmni/Android.mk
index f98ae60..342f75b 100644
--- a/google/themes/PrimaryOmni/Android.mk
+++ b/google/themes/PrimaryOmni/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := PrimaryOmni
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/PrimaryWarmWhite/Android.mk b/google/themes/PrimaryWarmWhite/Android.mk
index 7c5f0a1..da7ca6d 100644
--- a/google/themes/PrimaryWarmWhite/Android.mk
+++ b/google/themes/PrimaryWarmWhite/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := PrimaryWarmWhite
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/PrimaryWhite/Android.mk b/google/themes/PrimaryWhite/Android.mk
index 4bc1d5b..fac17ff 100644
--- a/google/themes/PrimaryWhite/Android.mk
+++ b/google/themes/PrimaryWhite/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := PrimaryWhite
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/SluttyPink/Android.mk b/google/themes/SluttyPink/Android.mk
index fc5754d..31977a3 100644
--- a/google/themes/SluttyPink/Android.mk
+++ b/google/themes/SluttyPink/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := SluttyPinkTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/SmokedGreen/Android.mk b/google/themes/SmokedGreen/Android.mk
index acd63dd..bdf8f5c 100644
--- a/google/themes/SmokedGreen/Android.mk
+++ b/google/themes/SmokedGreen/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := SmokedGreenTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/google/themes/ZeroZero/Android.mk b/google/themes/ZeroZero/Android.mk
index a6e91d0..7daac2e 100644
--- a/google/themes/ZeroZero/Android.mk
+++ b/google/themes/ZeroZero/Android.mk
@@ -5,7 +5,7 @@
 LOCAL_RRO_THEME := ZeroZeroTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 28
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
diff --git a/utils/emulator/packages.mk b/utils/emulator/packages.mk
index 40b699d..d8844ed 100644
--- a/utils/emulator/packages.mk
+++ b/utils/emulator/packages.mk
@@ -35,3 +35,32 @@
     mkfs.ntfs \
     mount.ntfs \
     fsck.ntfs
+
+PRODUCT_PACKAGES += \
+    NotificationsDark \
+    NotificationsLight \
+    NotificationsPrimary
+
+PRODUCT_PACKAGES += \
+    AccentSluttyPink \
+    AccentPixel \
+    AccentGoldenShower \
+    AccentDeepOrange \
+    AccentOmni \
+    AccentWhite \
+    AccentTeal \
+    AccentFromHell \
+    AccentBlueMonday \
+    AccentSmokingGreen \
+    AccentDeadRed \
+    AccentRottenOrange \
+    AccentDeepPurple
+
+PRODUCT_PACKAGES += \
+    PrimaryAlmostBlack \
+    PrimaryBlack \
+    PrimaryOmni \
+    PrimaryWhite \
+    PrimaryColdWhite \
+    PrimaryWarmWhite \
+    PrimaryDarkBlue