diff --git a/config/packages.mk b/config/packages.mk
index a880c21..4ea16f8 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -17,7 +17,7 @@
     webview
 
 PRODUCT_PACKAGES += \
-     StatixOverlayStub
+     OmniOverlayStub
 
 # Additional tools
 PRODUCT_PACKAGES += \
diff --git a/overlay/common/packages/apps/ThemePicker/res/values/override.xml b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
index c6cd1c0..b125016 100644
--- a/overlay/common/packages/apps/ThemePicker/res/values/override.xml
+++ b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
@@ -16,16 +16,14 @@
      limitations under the License.
 -->
 <resources>
-    <string name="themes_stub_package" translatable="false">com.statix.overlaystub</string>
+    <string name="themes_stub_package" translatable="false">org.omnirom.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. -->
+    <!-- List of packages whose icons are used to preview the icon shape for a theme. -->
     <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>
+        <item>com.android.dialer</item>
+        <item>com.android.contacts</item>
     </array>
 </resources>
 
diff --git a/overlaystub/Android.mk b/overlaystub/Android.mk
index a201e08..b17341e 100644
--- a/overlaystub/Android.mk
+++ b/overlaystub/Android.mk
@@ -3,7 +3,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := StatixOverlayStub
+LOCAL_PACKAGE_NAME := OmniOverlayStub
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/overlaystub/AndroidManifest.xml b/overlaystub/AndroidManifest.xml
index 0d89a14..66d9289 100644
--- a/overlaystub/AndroidManifest.xml
+++ b/overlaystub/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.statix.overlaystub"
+    package="org.omnirom.overlaystub"
     android:versionCode="1"
     android:versionName="1.0">
 
-    <application android:label="Overlays" android:hasCode="false" />
+    <application android:label="OmniOverlays" android:hasCode="false" />
 </manifest>
diff --git a/overlaystub/res/drawable/electrigreen_bg.png b/overlaystub/res/drawable/electrigreen_bg.png
deleted file mode 100644
index 4539cec..0000000
--- a/overlaystub/res/drawable/electrigreen_bg.png
+++ /dev/null
Binary files differ
diff --git a/overlaystub/res/drawable/electrigreen_bg_prev.png b/overlaystub/res/drawable/electrigreen_bg_prev.png
deleted file mode 100644
index 4539cec..0000000
--- a/overlaystub/res/drawable/electrigreen_bg_prev.png
+++ /dev/null
Binary files differ
diff --git a/overlaystub/res/drawable/generic_bg.png b/overlaystub/res/drawable/generic_bg.png
deleted file mode 100644
index 3beaf38..0000000
--- a/overlaystub/res/drawable/generic_bg.png
+++ /dev/null
Binary files differ
diff --git a/overlaystub/res/drawable/generic_bg_prev.png b/overlaystub/res/drawable/generic_bg_prev.png
deleted file mode 100644
index 3beaf38..0000000
--- a/overlaystub/res/drawable/generic_bg_prev.png
+++ /dev/null
Binary files differ
diff --git a/overlaystub/res/drawable/omni_wallpaper.png b/overlaystub/res/drawable/omni_wallpaper.png
new file mode 100644
index 0000000..ab821a2
--- /dev/null
+++ b/overlaystub/res/drawable/omni_wallpaper.png
Binary files differ
diff --git a/overlaystub/res/drawable/throwback_bg.png b/overlaystub/res/drawable/throwback_bg.png
deleted file mode 100644
index b64e350..0000000
--- a/overlaystub/res/drawable/throwback_bg.png
+++ /dev/null
Binary files differ
diff --git a/overlaystub/res/drawable/throwback_bg_prev.png b/overlaystub/res/drawable/throwback_bg_prev.png
deleted file mode 100644
index b64e350..0000000
--- a/overlaystub/res/drawable/throwback_bg_prev.png
+++ /dev/null
Binary files differ
diff --git a/overlaystub/res/values/arrays.xml b/overlaystub/res/values/arrays.xml
index 4d7b961..3286e6d 100644
--- a/overlaystub/res/values/arrays.xml
+++ b/overlaystub/res/values/arrays.xml
@@ -2,7 +2,6 @@
 <resources>
     <string-array name="themes">
         <item>default</item>
-        <item>electrigreen</item>
-        <item>throwback</item>
+        <item>omni</item>
     </string-array>
 </resources>
diff --git a/overlaystub/res/values/drawable.xml b/overlaystub/res/values/drawable.xml
new file mode 100644
index 0000000..4db2425
--- /dev/null
+++ b/overlaystub/res/values/drawable.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="drawable" name="theme_wallpaper_omni">@drawable/omni_wallpaper</item>
+    <item type="drawable" name="theme_wallpaper_thumbnail_omni">@drawable/omni_wallpaper</item>
+</resources>
+
diff --git a/overlaystub/res/values/strings.xml b/overlaystub/res/values/strings.xml
index aba0247..3989d6e 100644
--- a/overlaystub/res/values/strings.xml
+++ b/overlaystub/res/values/strings.xml
@@ -18,45 +18,20 @@
 -->
 <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>
+    <string name="theme_name_omni">Omni</string>
+    <string name="theme_title_omni">@string/theme_name_omni</string>
+    <string name="theme_overlay_color_omni">com.android.theme.color.omni</string>
+    <string name="theme_overlay_icon_android_omni">com.android.theme.icon_pack.circular.android</string>
+    <string name="theme_overlay_icon_launcher_omni">com.android.theme.icon_pack.circular.launcher</string>
+    <string name="theme_overlay_icon_settings_omni">com.android.theme.icon_pack.circular.settings</string>
+    <string name="theme_overlay_icon_sysui_omni">com.android.theme.icon_pack.circular.systemui</string>
+    <string name="theme_overlay_shape_omni">com.android.theme.icon.circle</string>
+    <string name="theme_wallpaper_title_omni">Omni</string>
+    <string name="theme_wallpaper_attribution_omni">OmniROM</string>
+    <string name="theme_wallpaper_action_omni">https://www.omnirom.org/</string>
 
 </resources>
diff --git a/utils/emulator/packages.mk b/utils/emulator/packages.mk
index 9da2041..765e603 100644
--- a/utils/emulator/packages.mk
+++ b/utils/emulator/packages.mk
@@ -2,7 +2,6 @@
 PRODUCT_PACKAGES += \
     MonthCalendarWidget \
     OmniSwitch \
-    Chromium \
     OmniJaws \
     OmniStyle \
     MusicFX \
@@ -17,6 +16,9 @@
     ThemePicker \
     webview
 
+PRODUCT_PACKAGES += \
+    OmniOverlayStub
+
 # Additional tools
 PRODUCT_PACKAGES += \
     bash \
@@ -35,38 +37,6 @@
     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
-
-#PRODUCT_PACKAGES += \
-    DocumentsUITheme
-
 # Telephony extension
 #PRODUCT_PACKAGES += telephony-ext
 #PRODUCT_BOOT_JARS += telephony-ext