diff --git a/config/packages.mk b/config/packages.mk
index 9fa27bd..a880c21 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -16,6 +16,9 @@
     ThemePicker \
     webview
 
+PRODUCT_PACKAGES += \
+     StatixOverlayStub
+
 # Additional tools
 PRODUCT_PACKAGES += \
     e2fsck \
@@ -57,64 +60,6 @@
 PRODUCT_PACKAGES += telephony-ext
 PRODUCT_BOOT_JARS += telephony-ext
 
-# Themes
-#PRODUCT_PACKAGES += \
-    GboardOmniTheme
-
-#PRODUCT_PACKAGES += \
-    ContactsTheme \
-    DocumentsUITheme \
-    DialerTheme \
-    MessagesTheme \
-    MusicFXTheme \
-    TelecommTheme \
-    PhonographTheme
-
-#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 \
-    PrimaryViolator \
-    PrimaryTealMeal
-
-# Textclassifiers
-#PRODUCT_PACKAGES += \
-    textclassifier.langid.model \
-    textclassifier.smartselection.bundle1 \
-    textclassifier.smartselection.ar.model \
-    textclassifier.smartselection.it.model \
-    textclassifier.smartselection.nl.model \
-    textclassifier.smartselection.pl.model \
-    textclassifier.smartselection.pt.model \
-    textclassifier.smartselection.ru.model \
-    textclassifier.smartselection.tr.model \
-    textclassifier.smartselection.zh.model \
-    textclassifier.smartselection.zh-Hant.model
-
 # for fun
 PRODUCT_PACKAGES += \
     EggGame
diff --git a/overlay/common/packages/apps/ThemePicker/res/values/override.xml b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
new file mode 100644
index 0000000..c6cd1c0
--- /dev/null
+++ b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
@@ -0,0 +1,31 @@
+<?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>
+    <string name="themes_stub_package" translatable="false">com.statix.overlaystub</string>
+
+    <!-- List of packages whose icons are used to preview the icon shape for a theme. These are
+        typically GMS apps so they should be available in GMS devices. -->
+    <array name="icon_shape_preview_packages">
+        <item>com.android.settings</item>
+        <item>com.google.android.deskclock</item>
+        <item>com.google.android.dialer</item>
+        <item>com.android.chrome</item>
+        <item>com.android.launcher3</item>
+    </array>
+</resources>
+
diff --git a/overlaystub/Android.mk b/overlaystub/Android.mk
new file mode 100644
index 0000000..a201e08
--- /dev/null
+++ b/overlaystub/Android.mk
@@ -0,0 +1,10 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := StatixOverlayStub
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+include $(BUILD_PACKAGE)
diff --git a/overlaystub/AndroidManifest.xml b/overlaystub/AndroidManifest.xml
new file mode 100644
index 0000000..0d89a14
--- /dev/null
+++ b/overlaystub/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.statix.overlaystub"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <application android:label="Overlays" android:hasCode="false" />
+</manifest>
diff --git a/overlaystub/res/drawable/electrigreen_bg.png b/overlaystub/res/drawable/electrigreen_bg.png
new file mode 100644
index 0000000..4539cec
--- /dev/null
+++ b/overlaystub/res/drawable/electrigreen_bg.png
Binary files differ
diff --git a/overlaystub/res/drawable/electrigreen_bg_prev.png b/overlaystub/res/drawable/electrigreen_bg_prev.png
new file mode 100644
index 0000000..4539cec
--- /dev/null
+++ b/overlaystub/res/drawable/electrigreen_bg_prev.png
Binary files differ
diff --git a/overlaystub/res/drawable/generic_bg.png b/overlaystub/res/drawable/generic_bg.png
new file mode 100644
index 0000000..3beaf38
--- /dev/null
+++ b/overlaystub/res/drawable/generic_bg.png
Binary files differ
diff --git a/overlaystub/res/drawable/generic_bg_prev.png b/overlaystub/res/drawable/generic_bg_prev.png
new file mode 100644
index 0000000..3beaf38
--- /dev/null
+++ b/overlaystub/res/drawable/generic_bg_prev.png
Binary files differ
diff --git a/overlaystub/res/drawable/throwback_bg.png b/overlaystub/res/drawable/throwback_bg.png
new file mode 100644
index 0000000..b64e350
--- /dev/null
+++ b/overlaystub/res/drawable/throwback_bg.png
Binary files differ
diff --git a/overlaystub/res/drawable/throwback_bg_prev.png b/overlaystub/res/drawable/throwback_bg_prev.png
new file mode 100644
index 0000000..b64e350
--- /dev/null
+++ b/overlaystub/res/drawable/throwback_bg_prev.png
Binary files differ
diff --git a/overlaystub/res/values/arrays.xml b/overlaystub/res/values/arrays.xml
new file mode 100644
index 0000000..4d7b961
--- /dev/null
+++ b/overlaystub/res/values/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="themes">
+        <item>default</item>
+        <item>electrigreen</item>
+        <item>throwback</item>
+    </string-array>
+</resources>
diff --git a/overlaystub/res/values/strings.xml b/overlaystub/res/values/strings.xml
new file mode 100644
index 0000000..aba0247
--- /dev/null
+++ b/overlaystub/res/values/strings.xml
@@ -0,0 +1,62 @@
+<!--
+/**
+ * Copyright (c) 2019, The Android Open Source Project
+ *                     Bootleggers ROM
+ *
+ * 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">
+
+	<!-- DEFAULT VALUES HAHA YES, maybe switch to an actual overlay later? -->
+	<string name="theme_name_default">Default</string>
+	<string name="theme_title_default">@string/theme_name_default</string>
+	<string name="theme_overlay_color_default">android.auto_generated_rro_vendor__</string>
+	<string name="theme_overlay_font_default">android.auto_generated_rro_vendor__</string>
+	<string name="theme_wallpaper_default">@drawable/generic_bg</string>
+	<string name="theme_wallpaper_thumbnail_default">@drawable/generic_bg_prev</string>
+	<string name="theme_wallpaper_title_default">Random StatiX Wallpaper</string>
+	<string name="theme_wallpaper_attribution_default">edited by MCIJ7</string>
+
+	<!-- Values to declare accents, there aren't themes. -->
+        <string name="theme_name_electrigreen">ElectriGreen</string>
+	<string name="theme_title_electrigreen">@string/theme_name_electrigreen</string>
+	<string name="theme_overlay_color_electrigreen">com.accents.mint</string>
+	<string name="theme_overlay_font_electrigreen">com.android.theme.font.default</string>
+	<string name="theme_overlay_icon_android_electrigreen">com.android.theme.icon_pack.filled.android</string>
+	<string name="theme_overlay_icon_launcher_electrigreen">com.android.theme.icon_pack.filled.launcher</string>
+	<string name="theme_overlay_icon_settings_electrigreen">com.android.theme.icon_pack.filled.settings</string>
+	<string name="theme_overlay_icon_sysui_electrigreen">com.android.theme.icon_pack.filled.systemui</string>
+	<string name="theme_overlay_icon_themepicker_electrigreen">com.android.theme.icon_pack.filled.themepicker</string>
+	<string name="theme_overlay_shape_electrigreen">com.android.theme.icon.square</string>
+        <string name="theme_wallpaper_electrigreen">@drawable/electrigreen_bg</string>
+	<string name="theme_wallpaper_thumbnail_electrigreen">@drawable/electrigreen_bg_prev</string>
+	<string name="theme_wallpaper_title_electrigreen">Random StatiX Wallpaper</string>
+        <string name="theme_wallpaper_attribution_electrigreen">edited by MCIJ7</string>
+
+	<string name="theme_name_throwback">Throwback Orange</string>
+	<string name="theme_title_throwback">@string/theme_name_throwback</string>
+	<string name="theme_overlay_color_throwback">com.accents.orange</string>
+	<string name="theme_overlay_font_throwback">com.android.theme.font.default</string>
+	<string name="theme_overlay_icon_android_throwback">com.android.theme.icon_pack.squircle.android</string>
+	<string name="theme_overlay_icon_launcher_throwback">com.android.theme.icon_pack.squircle.launcher</string>
+	<string name="theme_overlay_icon_settings_throwback">com.android.theme.icon_pack.squircle.settings</string>
+	<string name="theme_overlay_icon_sysui_throwback">com.android.theme.icon_pack.squircle.systemui</string>
+	<string name="theme_overlay_icon_themepicker_throwback">com.android.theme.icon_pack.squircle.themepicker</string>
+	<string name="theme_overlay_shape_throwback">com.android.theme.icon.squircle</string>
+        <string name="theme_wallpaper_throwback">@drawable/throwback_bg</string>
+	<string name="theme_wallpaper_thumbnail_throwback">@drawable/throwback_bg_prev</string>
+	<string name="theme_wallpaper_title_throwback">Random StatiX Wallpaper</string>
+        <string name="theme_wallpaper_attribution_throwback">edited by MCIJ7</string>
+
+</resources>