diff --git a/device.mk b/device.mk
index 16ed337..fcd49fd 100644
--- a/device.mk
+++ b/device.mk
@@ -1,21 +1,20 @@
 #Inherit from vendor
-$(call inherit-product, vendor/samsung/gprimelte/gprimelte-vendor.mk)
+$(call inherit-product, vendor/samsung/j53gxx/j53gxx-vendor.mk)
 
 # Inherit from common
-$(call inherit-product, device/samsung/gprimelte-common/device-common.mk)
+$(call inherit-product, device/samsung/j5-common/device-common.mk)
 
-LOCAL_PATH := device/samsung/gprimelte
+LOCAL_PATH := device/samsung/j53gxx
 
 # System properties
 -include $(LOCAL_PATH)/system_prop.mk
 
 # Common overlay
-DEVICE_PACKAGE_OVERLAYS += device/samsung/gprimelte/overlay
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
 # Audio configuration
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/audio/base/mixer_paths.xml:system/etc/mixer_paths.xml \
-	$(LOCAL_PATH)/audio/spr/mixer_paths.xml:system/blobs/spr/etc/mixer_paths.xml
+	$(LOCAL_PATH)/audio/mixer_paths.xml:system/etc/mixer_paths.xml
 
 # Media configurations
 PRODUCT_COPY_FILES += \
@@ -23,8 +22,3 @@
 	$(LOCAL_PATH)/media/media_codecs_8939.xml:system/etc/media_codecs_8939.xml \
 	$(LOCAL_PATH)/media/media_codecs.xml:system/etc/media_codecs.xml \
 	$(LOCAL_PATH)/media/media_profiles.xml:system/etc/media_profiles.xml
-
-# Copy baseband firmware
-$(call inherit-product-if-exists, vendor/samsung/radio/G530T1UVS2AQA2/baseband.mk)
-$(call inherit-product-if-exists, vendor/samsung/radio/G530TUVS2AQA2/baseband.mk)
-$(call inherit-product-if-exists, vendor/samsung/radio/G530WVLS2AQB2/baseband.mk)