diff --git a/device.mk b/device.mk
index 1e4cc2f..080cf80 100644
--- a/device.mk
+++ b/device.mk
@@ -14,7 +14,7 @@
 DEVICE_PACKAGE_OVERLAYS += device/samsung/gprimeltecan/overlay
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/dt.img:dt.img
+	$(LOCAL_PATH)/dt.img:dt.img
 
 #Android EGL implementation
 PRODUCT_PACKAGES += libGLES_android
@@ -23,77 +23,74 @@
 
 # ANT+
 PRODUCT_PACKAGES += \
-    AntHalService \
-    antradio_app \
-    com.dsi.ant.antradio_library \
-    libantradio
+	AntHalService \
+	antradio_app \
+	com.dsi.ant.antradio_library \
+	libantradio
 
 #NFC
 PRODUCT_PACKAGES += \
-    Tag \
-    com.android.nfc_extras \
-    com.android.nfc.helper
-
-#    NfcNci \
-#    libnfc-nci \
-#    libnfc_nci_jni \
-#    nfc_nci.msm8916 \
+	Tag \
+	com.android.nfc_extras \
+	com.android.nfc.helper \
+	Nfc \
+	NfcNci
 
 # Audio
 PRODUCT_PACKAGES += \
-    audio.a2dp.default \
-    audio.primary.msm8916 \
-    audio.primary.default \
-    audio_policy.msm8916 \
-    audio.r_submix.default \
-    audio.usb.default \
-    audiod \
-    libaudio-resampler \
-    libqcompostprocbundle \
-    libqcomvisualizer \
-    libqcomvoiceprocessing \
-    tinymix \
-    tinyplay \
-    tinycap \
+	audio.a2dp.default \
+	audio.primary.msm8916 \
+	audio.primary.default \
+	audio_policy.msm8916 \
+	audio.r_submix.default \
+	audio.usb.default \
+	audiod \
+	libaudio-resampler \
+	libqcompostprocbundle \
+	libqcomvisualizer \
+	libqcomvoiceprocessing \
+	tinymix \
+	tinyplay \
+	tinycap \
 	tinypcminfo
 
 #VoLTE calling support
 PRODUCT_PACKAGES += \
-    com.android.ims \
-    com.android.ims.internal \
-    ims-common \
-    voip-common
+	com.android.ims \
+	com.android.ims.internal \
+	ims-common \
+	voip-common
 
 # Configuration
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/Diag.cfg:system/etc/Diag.cfg \
-    $(LOCAL_PATH)/configs/Diag_audio.cfg:system/etc/Diag_audio.cfg \
-    $(LOCAL_PATH)/configs/Diag_volte.cfg:system/etc/Diag_volte.cfg \
-    $(LOCAL_PATH)/configs/Diag_zero.cfg:system/etc/Diag_zero.cfg
-    
+	$(LOCAL_PATH)/configs/Diag.cfg:system/etc/Diag.cfg \
+	$(LOCAL_PATH)/configs/Diag_audio.cfg:system/etc/Diag_audio.cfg \
+	$(LOCAL_PATH)/configs/Diag_volte.cfg:system/etc/Diag_volte.cfg \
+	$(LOCAL_PATH)/configs/Diag_zero.cfg:system/etc/Diag_zero.cfg
+	
 # Audio configuration
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/audio/Bluetooth_cal.acdb:system/etc/Bluetooth_cal.acdb \
-    $(LOCAL_PATH)/audio/General_cal.acdb:system/etc/General_cal.acdb \
-    $(LOCAL_PATH)/audio/Global_cal.acdb:system/etc/Global_cal.acdb \
-    $(LOCAL_PATH)/audio/Handset_cal.acdb:system/etc/Handset_cal.acdb \
-    $(LOCAL_PATH)/audio/Hdmi_cal.acdb:system/etc/Hdmi_cal.acdb \
-    $(LOCAL_PATH)/audio/Headset_cal.acdb:system/etc/Headset_cal.acdb \
-    $(LOCAL_PATH)/audio/Speaker_cal.acdb:system/etc/Speaker_cal.acdb \
-    $(LOCAL_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \
-    $(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \
-    $(LOCAL_PATH)/audio/mixer_paths.xml:system/etc/mixer_paths.xml
+	$(LOCAL_PATH)/audio/Bluetooth_cal.acdb:system/etc/Bluetooth_cal.acdb \
+	$(LOCAL_PATH)/audio/General_cal.acdb:system/etc/General_cal.acdb \
+	$(LOCAL_PATH)/audio/Global_cal.acdb:system/etc/Global_cal.acdb \
+	$(LOCAL_PATH)/audio/Handset_cal.acdb:system/etc/Handset_cal.acdb \
+	$(LOCAL_PATH)/audio/Hdmi_cal.acdb:system/etc/Hdmi_cal.acdb \
+	$(LOCAL_PATH)/audio/Headset_cal.acdb:system/etc/Headset_cal.acdb \
+	$(LOCAL_PATH)/audio/Speaker_cal.acdb:system/etc/Speaker_cal.acdb \
+	$(LOCAL_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \
+	$(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \
+	$(LOCAL_PATH)/audio/mixer_paths.xml:system/etc/mixer_paths.xml
 
 # Boot jars
 PRODUCT_BOOT_JARS += \
-    tcmiface \
-    qcom.fmradio \
-    qcmediaplayer
-#    oem-services \
+	tcmiface \
+	qcom.fmradio \
+	qcmediaplayer
+#	oem-services \
 
 # Connectivity Engine support
 PRODUCT_PACKAGES += \
-    libcnefeatureconfig
+	libcnefeatureconfig
 
 #Location, WiDi
 PRODUCT_PACKAGES += \
@@ -109,60 +106,60 @@
 	
 # Doze
 PRODUCT_PACKAGES += \
-    SamsungDoze
+	SamsungDoze
 	
 # Touch issue workaround
 PRODUCT_PACKAGES += \
-    InputDisabler
+	InputDisabler
 	
 # Display
 PRODUCT_PACKAGES += \
-    copybit.msm8916 \
-    gralloc.msm8916 \
-    hwcomposer.msm8916 \
-    libtinyxml \
-    memtrack.msm8916
+	copybit.msm8916 \
+	gralloc.msm8916 \
+	hwcomposer.msm8916 \
+	libtinyxml \
+	memtrack.msm8916
 
 # Ebtables
 PRODUCT_PACKAGES += \
-    ebtables \
-    ethertypes \
-    libebtc
+	ebtables \
+	ethertypes \
+	libebtc
 
 # FM
 PRODUCT_PACKAGES += \
-    FM2 \
-    FMRecord \
-    libqcomfm_jni \
-    qcom.fmradio
+	FM2 \
+	FMRecord \
+	libqcomfm_jni \
+	qcom.fmradio
 
 # INIT
 PRODUCT_PACKAGES += \
-    fstab.qcom \
-    init.carrier.rc \
-    init.class_main.sh \
-    init.mdm.sh \
-    init.qcom.audio.sh \
-    init.qcom.bms.sh \
-    init.qcom.bt.sh \
-    init.qcom.uicc.sh \
-    init.qcom.wifi.sh \
-    init.qcom.post_boot.sh \
-    init.qcom.class_core.sh \
-    init.qcom.early_boot.sh \
-    init.qcom.factory.sh \
-    init.qcom.syspart_fixup.sh \
-    init.qcom.usb.rc \
-    init.qcom.usb.sh \
-    init.qcom.rc \
-    init.qcom.fm.sh \
-    init.qcom.sh \
-    init.target.rc \
-    ueventd.qcom.rc \
-    init.qcom.zram.sh \
-    init.rilchip.rc \
-    init.rilcommon.rc \
-    twrp.fstab
+	fstab.qcom \
+	init.carrier.rc \
+	init.class_main.sh \
+	init.mdm.sh \
+	init.qcom.audio.sh \
+	init.qcom.bms.sh \
+	init.qcom.bt.sh \
+	init.qcom.uicc.sh \
+	init.qcom.wifi.sh \
+	init.qcom.post_boot.sh \
+	init.qcom.class_core.sh \
+	init.qcom.early_boot.sh \
+	init.qcom.factory.sh \
+	init.qcom.syspart_fixup.sh \
+	init.qcom.usb.rc \
+	init.qcom.usb.sh \
+	init.qcom.rc \
+	init.qcom.fm.sh \
+	init.qcom.sh \
+	init.target.rc \
+	ueventd.qcom.rc \
+	init.qcom.zram.sh \
+	init.rilchip.rc \
+	init.rilcommon.rc \
+	twrp.fstab
 
 # Keylayout
 PRODUCT_COPY_FILES += \
@@ -176,20 +173,20 @@
 
 # Keystore
 PRODUCT_PACKAGES += \
-    keystore.msm8916
+	keystore.msm8916
 
 # libhealthd.qcom
 PRODUCT_PACKAGES += \
 	libhealthd.qcom \
-    libhealthd
+	libhealthd
 
 # Lights
 PRODUCT_PACKAGES += \
-    lights.msm8916
+	lights.msm8916
 
 # Live Wallpapers
 PRODUCT_PACKAGES += \
-    librs_jni
+	librs_jni
 
 # Default Property Overrides
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
@@ -202,47 +199,46 @@
 	persist.radio.lte_vrte_ltd=1 \
 	persist.radio.add_power_save=1 \
 	camera2.portability.force_api=1 \
-    ro.secure=0 \
-    ro.adb.secure=0 \
-    ro.debuggable=1 \
-    persist.service.adb.enable=1 \
-    ro.telephony.ril_class=SamsungQcomRIL
+	ro.secure=0 \
+	ro.adb.secure=0 \
+	ro.debuggable=1 \
+	persist.service.adb.enable=1
 
 # GPS
 #PRODUCT_PACKAGES += \
-#    gps.default \
-#    libloc_core \
-#    libgps.utils \
-#    libloc_eng \
-#    libloc_api_v02
+#	gps.default \
+#	libloc_core \
+#	libgps.utils \
+#	libloc_eng \
+#	libloc_api_v02
 
 #Sensors
 PRODUCT_PACKAGES += \
-    sensors.default
+	sensors.default
 
 #GPS Configurations
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/gps/flp.conf:system/etc/flp.conf \
-    $(LOCAL_PATH)/gps/gps.conf:system/etc/gps.conf \
-    $(LOCAL_PATH)/gps/izat.conf:system/etc/izat.conf \
-    $(LOCAL_PATH)/gps/sap.conf:system/etc/sap.conf
+	$(LOCAL_PATH)/gps/flp.conf:system/etc/flp.conf \
+	$(LOCAL_PATH)/gps/gps.conf:system/etc/gps.conf \
+	$(LOCAL_PATH)/gps/izat.conf:system/etc/izat.conf \
+	$(LOCAL_PATH)/gps/sap.conf:system/etc/sap.conf
 
 # macloader
 PRODUCT_PACKAGES += macloader
 
 # Media configurations
 PRODUCT_COPY_FILES += \
-    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
-    $(LOCAL_PATH)/media/media_codecs_8929.xml:system/etc/media_codecs_8929.xml \
-    $(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
+	frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
+	frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
+	frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
+	$(LOCAL_PATH)/media/media_codecs_8929.xml:system/etc/media_codecs_8929.xml \
+	$(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
 
 # MSM IRQ Balancer configuration file
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/msm_irqbalance.conf:system/vendor/etc/msm_irqbalance.conf
+	$(LOCAL_PATH)/configs/msm_irqbalance.conf:system/vendor/etc/msm_irqbalance.conf
 
 # Misc
 PRODUCT_PACKAGES += \
@@ -258,78 +254,78 @@
 
 # OMX
 PRODUCT_PACKAGES += \
-    libdashplayer \
-    libdivxdrmdecrypt \
-    libmm-omxcore \
-    libOmxAacEnc \
-    libOmxAmrEnc \
-    libOmxCore \
-    libOmxEvrcEnc \
-    libOmxQcelp13Enc \
-    libOmxSwVencMpeg4 \
-    libOmxVdec \
-    libOmxVdecHevc \
-    libOmxVenc \
-    libOmxVidEnc \
-    libOmxVdpp \
-    libstagefrighthw \
-    qcmediaplayer
+	libdashplayer \
+	libdivxdrmdecrypt \
+	libmm-omxcore \
+	libOmxAacEnc \
+	libOmxAmrEnc \
+	libOmxCore \
+	libOmxEvrcEnc \
+	libOmxQcelp13Enc \
+	libOmxSwVencMpeg4 \
+	libOmxVdec \
+	libOmxVdecHevc \
+	libOmxVenc \
+	libOmxVidEnc \
+	libOmxVdpp \
+	libstagefrighthw \
+	qcmediaplayer
 
 # Permissions
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
-    frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
-    frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
-    frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
-    frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
-    frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
-    frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
-    frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
-    frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
-    frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
-    frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
-    frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
-    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
-    frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
-    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
-    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
-    frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
-    frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
-    frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
-    frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
-    frameworks/native/data/etc/android.software.print.xml:system/etc/permissions/android.software.print.xml \
-    frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
-    frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
+	frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
+	frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
+	frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
+	frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
+	frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
+	frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
+	frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
+	frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
+	frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
+	frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
+	frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
+	frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
+	frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
+	frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
+	frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
+	frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
+	frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
+	frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
+	frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
+	frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+	frameworks/native/data/etc/android.software.print.xml:system/etc/permissions/android.software.print.xml \
+	frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
+	frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
 
 # Power HAL
 PRODUCT_PACKAGES += \
-    power.msm8916
+	power.msm8916
 
 # Prebuilt
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/prebuilt/dsi_config.xml:system/etc/data/dsi_config.xml \
-    $(LOCAL_PATH)/prebuilt/netmgr_config.xml:system/etc/data/netmgr_config.xml \
-    $(LOCAL_PATH)/prebuilt/qmi_config.xml:system/etc/data/qmi_config.xml
+	$(LOCAL_PATH)/prebuilt/dsi_config.xml:system/etc/data/dsi_config.xml \
+	$(LOCAL_PATH)/prebuilt/netmgr_config.xml:system/etc/data/netmgr_config.xml \
+	$(LOCAL_PATH)/prebuilt/qmi_config.xml:system/etc/data/qmi_config.xml
 
 # Properties
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.use_data_netmgrd=false \
-    dalvik.vm.heapgrowthlimit=128m \
-    ro.security.icd.flagmode=single \
-    ro.vendor.extension_library=libqti-perfd-client.so \
-    persist.radio.apm_sim_not_pwdn=1 \
-    persist.gps.qc_nlp_in_use=1 \
-    persist.loc.nlp_name=com.qualcomm.location \
-    ro.gps.agps_provider=1 \
-    ro.pip.gated=0 \
-    ro.product.model=SM-G530W \
-    ro.product.device=gprimeltecan \
-    cm.updater.uri=http://grandprime.ddns.net/api \
-    ro.telephony.ril_class=SamsungQcomRIL
+	ro.use_data_netmgrd=false \
+	dalvik.vm.heapgrowthlimit=128m \
+	ro.security.icd.flagmode=single \
+	ro.vendor.extension_library=libqti-perfd-client.so \
+	persist.radio.apm_sim_not_pwdn=1 \
+	persist.gps.qc_nlp_in_use=1 \
+	persist.loc.nlp_name=com.qualcomm.location \
+	ro.gps.agps_provider=1 \
+	ro.pip.gated=0 \
+	ro.product.model=SM-G530W \
+	ro.product.device=gprimeltecan \
+	cm.updater.uri=http://grandprime.ddns.net/api \
+	ro.telephony.ril_class=SamsungQcomRIL
 
 # Ril
 PRODUCT_PACKAGES += \
-    libxml2
+	libxml2
 
 # Screen density
 PRODUCT_AAPT_CONFIG := normal hdpi xhdpi
@@ -337,39 +333,39 @@
 
 # security config
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/sec_config:system/etc/sec_config
+	$(LOCAL_PATH)/configs/sec_config:system/etc/sec_config
 
 # Terminal
 PRODUCT_PACKAGES += Terminal
 
 # USB
 PRODUCT_PACKAGES += \
-    com.android.future.usb.accessory
+	com.android.future.usb.accessory
 
 # Wifi configuration files
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/wifi/cred.conf:system/etc/wifi/cred.conf \
-    $(LOCAL_PATH)/wifi/hostapd.accept:system/etc/hostapd/hostapd.accept \
-    $(LOCAL_PATH)/wifi/hostapd_default.conf:system/etc/hostapd/hostapd_default.conf \
-    $(LOCAL_PATH)/wifi/hostapd.deny:system/etc/hostapd/hostapd.deny \
-    $(LOCAL_PATH)/wifi/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
-    $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf \
-    $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
-    $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \
-    $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini \
-    $(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv.bin:system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
+	$(LOCAL_PATH)/wifi/cred.conf:system/etc/wifi/cred.conf \
+	$(LOCAL_PATH)/wifi/hostapd.accept:system/etc/hostapd/hostapd.accept \
+	$(LOCAL_PATH)/wifi/hostapd_default.conf:system/etc/hostapd/hostapd_default.conf \
+	$(LOCAL_PATH)/wifi/hostapd.deny:system/etc/hostapd/hostapd.deny \
+	$(LOCAL_PATH)/wifi/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
+	$(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf \
+	$(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
+	$(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \
+	$(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini \
+	$(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv.bin:system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
 
 #WLAN
 PRODUCT_PACKAGES += \
-    hostapd \
-    iwconfig \
-    hostapd_cli \
-    libQWiFiSoftApCfg \
-    libqsap_sdk \
-    libwpa_client \
-    libwcnss_qmi \
-    wcnss_service \
-    wpa_supplicant
+	hostapd \
+	iwconfig \
+	hostapd_cli \
+	libQWiFiSoftApCfg \
+	libqsap_sdk \
+	libwpa_client \
+	libwcnss_qmi \
+	wcnss_service \
+	wpa_supplicant
 
 # Inhert dalvik heap values from aosp
 $(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)