diff --git a/device_j8y18lte.mk b/device_j8y18lte.mk
index 52b1ee2..06a395f 100644
--- a/device_j8y18lte.mk
+++ b/device_j8y18lte.mk
@@ -1,7 +1,5 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
-# The gps config appropriate for this device
-$(call inherit-product, device/common/gps/gps_us_supl.mk)
 
 $(call inherit-product-if-exists, vendor/samsung/j8y18lte/j8y18lte-vendor.mk)
 
diff --git a/lineage_j8y18lte.mk b/lineage_j8y18lte.mk
index 183f8b3..5d07abb 100644
--- a/lineage_j8y18lte.mk
+++ b/lineage_j8y18lte.mk
@@ -5,8 +5,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Release name
 PRODUCT_RELEASE_NAME := j8y18lte
 
-# Inherit some common lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+# Inherit some common omni stuff.
+$(call inherit-product, vendor/omni/config/common.mk)
 $(call inherit-product, build/target/product/embedded.mk)
 
 # Inherit device configuration
diff --git a/twrp.mk b/twrp.mk
index 0f3bf00..9395711 100644
--- a/twrp.mk
+++ b/twrp.mk
@@ -2,7 +2,7 @@
 #TARGET_RECOVERY_DEVICE_DIRS := $(DEVICE_PATH)/twrp
 TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/soc/7000000.ssusb/7000000.dwc3/gadget/lun%d/file"
 TARGET_HW_DISK_ENCRYPTION := true
-TARGET_CRYPTFS_HW_PATH := "vendor/qcom/opensource/cryptfs_hw"
+TARGET_CRYPTFS_HW_PATH := "vendor/qcom/opensource/commonsys/cryptfs_hw"
 
 RECOVERY_VARIANT := twrp
 TW_THEME := portrait_hdpi
@@ -24,8 +24,23 @@ TARGET_RECOVERY_QCOM_RTC_FIX := true
 BOARD_SUPPRESS_SECURE_ERASE := true
 TW_INPUT_BLACKLIST := "hbtp_vm"
 TW_USE_TOOLBOX := true
-TW_DEVICE_VERSION := goldfish07(Ayush Bisht)
+TW_DEVICE_VERSION := goldfish07
 TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID := true
+# NOTE - Dont use '-' or blank spaces in flag values , otherwise it will create build errors or other bugs in recovery (Excluding SHRP_PATH,SHRP_REC). 
+# Path of your SHRP Tree
+SHRP_PATH := device/samsung/j8y18lte
+# Maintainer name *
+SHRP_MAINTAINER := goldfish07
+# Device codename *
+SHRP_DEVICE_CODE := j8y18lte
+# Recovery Type (It can be treble,normal,SAR) [Only for About Section] *
+SHRP_REC_TYPE := Treble
+# Recovery Type (It can be A/B or A_only) [Only for About Section] *
+SHRP_DEVICE_TYPE := A/B
+
+SHRP_FLASH := 0
+
+SHRP_REC := /dev/block/bootdevice/by-name/recovery
 #TW_EXCLUDE_DEFAULT_USB_INIT := true
 
 #TW_HAS_MTP := true