diff --git a/config/common.mk b/config/common.mk
index 11e733ec..4f6282e7 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -1,4 +1,5 @@
 # Allow vendor/extra to override any property by setting it first
+$(call inherit-product, vendor/extras/config.mk)
 $(call inherit-product-if-exists, vendor/extra/product.mk)
 
 PRODUCT_BRAND ?= MistOS
@@ -131,13 +132,17 @@ ifneq ($(TARGET_DISABLE_EPPE),true)
 $(call enforce-product-packages-exist-internal,$(wildcard device/*/$(LINEAGE_BUILD)/$(TARGET_PRODUCT).mk),product_manifest.xml rild Calendar android.hidl.memory@1.0-impl.vendor vndk_apex_snapshot_package)
 endif
 
-# Bootanimation
-$(call inherit-product, vendor/lineage/bootanimation/Android.mk)
-
 # Build Manifest
 PRODUCT_PACKAGES += \
     build-manifest
 
+# Pixel additions
+WITH_GMS := true
+ifeq ($(WITH_GMS),true)
+$(call inherit-product, vendor/google/overlays/ThemeIcons/config.mk)
+$(call inherit-product, vendor/gms/products/gms.mk)
+endif
+
 # Lineage packages
 ifeq ($(PRODUCT_IS_ATV),)
 PRODUCT_PACKAGES += \
@@ -159,7 +164,6 @@ PRODUCT_COPY_FILES += \
 
 # Config
 PRODUCT_PACKAGES += \
-    SimpleDeviceConfig \
     SimpleSettingsConfig
 
 # Disable default frame rate limit for games
@@ -209,8 +213,10 @@ PRODUCT_COPY_FILES += \
     vendor/lineage/prebuilt/common/etc/init/init.openssh.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.openssh.rc
 
 # Storage manager
-PRODUCT_SYSTEM_PROPERTIES += \
+ifeq ($(WITH_GMS),false)
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.storage_manager.enabled=true
+endif
 
 # Default wifi country code
 PRODUCT_SYSTEM_PROPERTIES += \
@@ -254,9 +260,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 endif
 
 # SetupWizard
+ifeq ($(WITH_GMS),false)
 PRODUCT_PRODUCT_PROPERTIES += \
     setupwizard.theme=glif_v4 \
     setupwizard.feature.day_night_mode_enabled=true
+endif
 
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/no-rro
 PRODUCT_PACKAGE_OVERLAYS += \
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 62aa9e90..cdee1f21 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -9,9 +9,9 @@ include vendor/lineage/config/aosp_audio.mk
 include vendor/lineage/config/lineage_audio.mk
 
 # Default notification/alarm sounds
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.config.notification_sound=Argon.ogg \
-    ro.config.alarm_alert=Hassium.ogg
+#PRODUCT_PRODUCT_PROPERTIES += \
+#    ro.config.notification_sound=Argon.ogg \
+#    ro.config.alarm_alert=Hassium.ogg
 
 # Apps
 PRODUCT_PACKAGES += \
@@ -21,11 +21,11 @@ PRODUCT_PACKAGES += \
     LatinIME
 
 # Temp build
-PRODUCT_PACKAGES += \
-    Launcher3QuickStep
+#PRODUCT_PACKAGES += \
+#    Launcher3QuickStep
 
-PRODUCT_DEXPREOPT_SPEED_APPS += \
-    Launcher3QuickStep
+#PRODUCT_DEXPREOPT_SPEED_APPS += \
+#    Launcher3QuickStep
 
 # Charger
 PRODUCT_PACKAGES += \
diff --git a/config/telephony.mk b/config/telephony.mk
index 0c6ebba8..55e54381 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -17,8 +17,8 @@ PRODUCT_PACKAGES += \
     Stk
 
 # Default ringtone
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.config.ringtone=Orion.ogg
+#PRODUCT_PRODUCT_PROPERTIES += \
+#    ro.config.ringtone=Orion.ogg
 
 # Tethering - allow without requiring a provisioning app
 # (for devices that check this)
diff --git a/overlay/common/packages/apps/Settings/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/config.xml
index 78637129..c228dc70 100644
--- a/overlay/common/packages/apps/Settings/res/values/config.xml
+++ b/overlay/common/packages/apps/Settings/res/values/config.xml
@@ -31,7 +31,7 @@
     <bool name="config_show_wallpaper_attribution">false</bool>
 
     <!-- Package name and fully-qualified class name for the wallpaper picker activity. -->
-    <string name="config_wallpaper_picker_package" translatable="false">com.android.wallpaper</string>
+    <string name="config_wallpaper_picker_package" translatable="false">com.google.android.apps.wallpaper</string>
     <!-- Fully-qualified class name for the styles & wallpaper picker activity. -->
     <string name="config_styles_and_wallpaper_picker_class" translatable="false">com.android.customization.picker.CustomizationPickerActivity</string>
     <!-- Action name for the styles & wallpaper picker activity. -->
diff --git a/prebuilt/common/etc/lineage-component-overrides.xml b/prebuilt/common/etc/lineage-component-overrides.xml
index be67c171..188da743 100644
--- a/prebuilt/common/etc/lineage-component-overrides.xml
+++ b/prebuilt/common/etc/lineage-component-overrides.xml
@@ -15,22 +15,31 @@
 -->
 <config>
     <component-override package="com.android.vending">
-        <component class=".systemupdateactivity.SettingsSecurityEntryPoint" enabled="false" />
-        <component class=".systemupdateactivity.SystemUpdateActivity" enabled="false" />
-        <component class=".systemupdate.SystemUpdateSettingsContentProvider" enabled="false" />
-    </component-override>
-
-    <component-override package="com.google.android.gms">
+        <component class=".chimera.GmsIntentOperationService$GmsExternalReceiver" enabled="false" />
+        <component class=".stats.service.DropBoxEntryAddedReceiver" enabled="false" />
         <component class=".update.OtaSuggestionActivity" enabled="false" />
         <component class=".update.OtaSuggestionSummaryProvider" enabled="false" />
         <component class=".update.phone.PopupDialog" enabled="false" />
         <component class=".update.SystemUpdateActivity" enabled="false" />
+        <component class=".update.SystemUpdateV2Activity" enabled="false" />
         <component class=".update.SystemUpdateGcmTaskService" enabled="false" />
         <component class=".update.SystemUpdatePersistentListenerService" enabled="false" />
         <component class=".update.SystemUpdateService" enabled="false" />
+        <component class=".update.SystemUpdateService.ActiveReceiver" enabled="false" />
+        <component class=".update.SystemUpdateService.Receiver" enabled="false" />
+        <component class=".update.SystemUpdateService.SecretCodeReceiver" enabled="false" />
+        <component class=".update.control.NotificationControl" enabled="false" />
     </component-override>
 
     <component-override package="com.google.android.setupwizard">
         <component class=".update.OtaUpdateActivity" enabled="false" />
     </component-override>
+
+    <component-override package="com.google.android.dialer">
+        <component class=".rtt.settings.impl.gateway.RttSettingsDeepLink" enabled="false" />
+    </component-override>
+
+        <!-- Hide Live Translate settings TO DO -->
+    <component-override package="com.google.android.as">
+    </component-override>
 </config>