diff --git a/gapps.mk b/gapps.mk
index efbed6d..12c704e 100644
--- a/gapps.mk
+++ b/gapps.mk
@@ -1,3 +1,13 @@
+BUILD_GMS := yes
+ifneq ($(wildcard vendor/google),)
+-include vendor/google/products/gms_eea_type1.mk
+PRODUCT_SHIPPING_API_LEVEL :=
+PRODUCT_PACKAGES += \
+	phh-gapps-overrides \
+
+FILTER_OUT = $(foreach v,$(2),$(if $(findstring $(1),$(v)),,$(v)))
+endif
+
 ifneq ($(wildcard vendor/opengapps),)
 PRODUCT_COPY_FILES += \
 	device/phh/treble/empty-permission.xml:system/etc/permissions/com.google.android.camera2.xml \
diff --git a/overrides/Android.mk b/overrides/Android.mk
index efb203f..9585185 100644
--- a/overrides/Android.mk
+++ b/overrides/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := phh-gapps-go-overrides
-PACKAGES.phh-gapps-go-overrides.OVERRIDES := \
+PACKAGES.$(LOCAL_MODULE).OVERRIDES := \
 	Wellbeing \
 	GMailGo \
 	YouTubeGo \
@@ -18,13 +18,18 @@ include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := phh-gapps-overrides
-PACKAGES.phh-gapps-go-overrides.OVERRIDES := \
+PACKAGES.$(LOCAL_MODULE).OVERRIDES := \
 	Drive \
 	YTMusic \
 	Videos \
 	Duo \
 	Traceur \
-	Weelbeing \
+	Wellbeing \
+	YouTube \
+	Photos \
+	Maps \
+	Gmail2 \
+	GoogleContacts \
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
diff --git a/rw-system.sh b/rw-system.sh
index 9e8a4c6..cb55c4c 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -730,3 +730,5 @@ if getprop ro.build.overlay.deviceid |grep -iq -e RMX1941 -e RMX1945 -e RMX1943
     setprop persist.sys.qcom-brightness "$(cat /sys/class/leds/lcd-backlight/max_brightness)"
     setprop persist.sys.phh.mainkeys 0
 fi
+
+resetprop ro.bluetooth.library_name libbluetooth.so