diff --git a/config/packages.mk b/config/packages.mk
index 84e28cc..e10201e 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -5,7 +5,6 @@
     Chromium \
     OmniJaws \
     OmniStyle \
-    OmniClockOSS \
     MusicFX \
     Phonograph \
     MatLog \
@@ -13,8 +12,12 @@
     OpenDelta \
     Turbo \
     OmniRecord \
-    WallpaperPicker2 \
-    ThemePicker
+    ThemePicker \
+    webview \
+    ExactCalculator
+
+PRODUCT_PACKAGES += \
+     OmniOverlayStub
 
 # Additional tools
 PRODUCT_PACKAGES += \
@@ -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/config/version.mk b/config/version.mk
index c5583fa..07a68f2 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -8,8 +8,12 @@
 TARGET_PRODUCT_SHORT := $(subst omni_,,$(TARGET_PRODUCT_SHORT))
 
 # Build the final version string
-ifdef BUILDTYPE_RELEASE
-    ROM_VERSION := $(PLATFORM_VERSION)-$(TARGET_PRODUCT_SHORT)
+ifeq ($(ROM_BUILDTYPE),GAPPS)
+include vendor/gapps/config.mk
+    VENDOR_EXCEPTION_PATHS += \
+    gapps
+
+    ROM_VERSION := $(PLATFORM_VERSION)-$(shell date +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
 else
 ifeq ($(ROM_BUILDTIME_UTC),y)
     ROM_VERSION := $(PLATFORM_VERSION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
diff --git a/overlay/common/frameworks/base/core/res/res/values/dimen.xml b/overlay/common/frameworks/base/core/res/res/values/dimen.xml
index 352744a..9cff526 100644
--- a/overlay/common/frameworks/base/core/res/res/values/dimen.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/dimen.xml
@@ -25,8 +25,8 @@
     <dimen name="quick_qs_total_height">168dp</dimen>
 
     <!-- Corner radius of system dialogs -->
-    <dimen name="config_dialogCornerRadius">16.0dip</dimen> <!-- default: 2dp -->
-    <dimen name="config_buttonCornerRadius">8.0dip</dimen> <!-- default: 2dp -->
+    <dimen name="config_dialogCornerRadius">8.0dip</dimen> <!-- default: 2dp -->
+    <dimen name="config_buttonCornerRadius">4.0dip</dimen> <!-- default: 2dp -->
     <dimen name="config_progressBarCornerRadius">1000.0dip</dimen> <!-- default: 0 -->
 
     <!-- influences if we can split screen onloy by half or third -->
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 3c5576f..867eccd 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,18 +21,32 @@
 
     <!-- The height of the quick settings footer that holds the user switcher, settings icon,
     etc. -->
-    <!-- 56dp -->
-    <dimen name="qs_footer_height">48dp</dimen>
+    <!-- 48dp -->
+    <dimen name="qs_footer_height">36dp</dimen>
+
+    <!-- 14dp -->
+    <!-- -6 to match the reduced qs_footer_bar_height -->
+    <dimen name="qs_footer_icon_padding">8dp</dimen>
+
+    <!-- Margins on each side of QS Footer -->
+    <dimen name="qs_footer_margin">5dp</dimen>
+
+    <!-- security footer side margin -->
+    <!-- 16dp -->
+    <dimen name="qs_footer_padding_start">6dp</dimen>
+    <dimen name="qs_footer_padding_end">0dp</dimen>
+    <!-- 36 - 2*8 -->
+    <dimen name="qs_footer_icon_size">20dp</dimen>
 
     <!-- End padding for left-aligned status bar clock -->
     <!-- 7dp -->
     <dimen name="status_bar_left_clock_end_padding">4dp</dimen>
 
-    <!-- 18dp -->
-    <dimen name="qs_tile_margin_top">10dp</dimen>
+    <!-- 8/12dp -->
+    <dimen name="qs_tile_margin_top">8dp</dimen>
 
     <!-- 30dp -->
-    <dimen name="qs_panel_padding_top">20dp</dimen>
+    <dimen name="qs_panel_padding_top">24dp</dimen>
 
     <!-- 106dp -->
     <dimen name="qs_tile_height">96dp</dimen>
@@ -40,19 +54,19 @@
     <!-- 24dp -->
     <dimen name="qs_tile_margin_vertical">16dp</dimen>
 
-    <!-- 24dp -->
-    <dimen name="qs_paged_tile_layout_padding_bottom">14dp</dimen>
-
-    <!-- 48dp -->
-    <dimen name="qs_brightness_slider_height">40dp</dimen>
+    <!-- 4/13dp -->
+    <dimen name="qs_header_tile_margin_horizontal">13dp</dimen>
 
     <!-- 0dp -->
-    <dimen name="qs_header_tile_margin_horizontal">13dp</dimen>
+    <dimen name="qs_paged_tile_layout_padding_bottom">8dp</dimen>
+
+    <!-- 14dp -->
+    <dimen name="qs_tile_padding_top">8dp</dimen>
 
     <!-- power menu + volume dialog -->
     <!-- 8dp -->
     <!-- ALWAYS set to same as config_dialogCornerRadius -->
-    <dimen name="corner_size">16dp</dimen>
-    <dimen name="edge_margin">16dp</dimen>
+    <dimen name="corner_size">8dp</dimen>
+    <dimen name="edge_margin">8dp</dimen>
 
 </resources>
diff --git a/overlay/common/packages/apps/Settings/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/config.xml
index efabdb4..dcc490c 100644
--- a/overlay/common/packages/apps/Settings/res/values/config.xml
+++ b/overlay/common/packages/apps/Settings/res/values/config.xml
@@ -16,4 +16,17 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <bool name="config_gesture_settings_enabled">true</bool>
+
+    <!-- Whether or not to show the night light suggestion. -->
+    <bool name="config_night_light_suggestion_enabled">false</bool>
+
+    <!--
+        Whether or not the homepage should be powered by legacy suggestion (versus contextual cards)
+        Default to true as not all devices support contextual cards.
+    -->
+    <bool name="config_use_legacy_suggestion">false</bool>
+
+    <!-- Whether memory from app_info_settings is available or not. -->
+    <bool name="config_show_app_info_settings_memory">true</bool>
+
 </resources>
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..b125016
--- /dev/null
+++ b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
@@ -0,0 +1,29 @@
+<?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">org.omnirom.overlaystub</string>
+
+    <!-- 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.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
new file mode 100644
index 0000000..b17341e
--- /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 := OmniOverlayStub
+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..66d9289
--- /dev/null
+++ b/overlaystub/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.overlaystub"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <application android:label="OmniOverlays" android:hasCode="false" />
+</manifest>
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/values/arrays.xml b/overlaystub/res/values/arrays.xml
new file mode 100644
index 0000000..3286e6d
--- /dev/null
+++ b/overlaystub/res/values/arrays.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="themes">
+        <item>default</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
new file mode 100644
index 0000000..3989d6e
--- /dev/null
+++ b/overlaystub/res/values/strings.xml
@@ -0,0 +1,37 @@
+<!--
+/**
+ * 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">
+
+	<string name="theme_name_default">Default</string>
+	<string name="theme_title_default">@string/theme_name_default</string>
+
+	<!-- Values to declare accents, there aren't themes. -->
+    <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/aosp-forked-list b/utils/aosp-forked-list
index 7475989..257c781 100644
--- a/utils/aosp-forked-list
+++ b/utils/aosp-forked-list
@@ -2,21 +2,16 @@
 bionic
 build
 build/soong
-development
 external/e2fsprogs
 external/f2fs-tools
-external/mksh
-external/tinycompress
 external/toybox
 external/selinux
-external/skia
 frameworks/av
 frameworks/base
 frameworks/native
 frameworks/opt/telephony
 frameworks/opt/net/wifi
 frameworks/opt/net/ims
-hardware/invensense
 hardware/interfaces
 hardware/libhardware
 hardware/libhardware_legacy
@@ -34,25 +29,21 @@
 packages/apps/CellBroadcastReceiver
 packages/apps/Dialer
 packages/apps/DocumentsUI
-packages/apps/EmergencyInfo
 packages/apps/Messaging
 packages/apps/Nfc
 packages/apps/PhoneCommon
 packages/apps/Settings
 packages/apps/SettingsIntelligence
-packages/apps/Stk
 packages/providers/DownloadProvider
 packages/services/Telephony
 packages/services/Telecomm
 packages/inputmethods/LatinIME
-prebuilts/build-tools
 system/bt
-system/core
 system/libhidl
 system/media
 system/nfc
-system/netd
 system/sepolicy
 system/update_engine
 system/vold
 system/hardware/interfaces
+
diff --git a/utils/emulator/packages.mk b/utils/emulator/packages.mk
index 0d77903..ed1e211 100644
--- a/utils/emulator/packages.mk
+++ b/utils/emulator/packages.mk
@@ -2,10 +2,8 @@
 PRODUCT_PACKAGES += \
     MonthCalendarWidget \
     OmniSwitch \
-    Chromium \
     OmniJaws \
     OmniStyle \
-    OmniClockOSS \
     MusicFX \
     Phonograph \
     MatLog \
@@ -14,8 +12,12 @@
     OpenDelta \
     Turbo \
     OmniRecord \
-    WallpaperPicker2 \
-    ThemePicker
+    ThemePicker \
+    webview \
+    ExactCalculator
+
+PRODUCT_PACKAGES += \
+    OmniOverlayStub
 
 # Additional tools
 PRODUCT_PACKAGES += \
@@ -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