diff --git a/boot.img b/boot.img
index 9149e5f..6197688 100644
Binary files a/boot.img and b/boot.img differ
diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
new file mode 100644
index 0000000..f2af0a1
--- /dev/null
+++ b/configs/media_codecs.xml
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/configs/media_codecs_google_audio.xml b/configs/media_codecs_google_audio.xml
new file mode 100644
index 0000000..a06684b
--- /dev/null
+++ b/configs/media_codecs_google_audio.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/configs/media_codecs_google_telephony.xml b/configs/media_codecs_google_telephony.xml
new file mode 100644
index 0000000..5ad90d9
--- /dev/null
+++ b/configs/media_codecs_google_telephony.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/configs/media_codecs_google_video.xml b/configs/media_codecs_google_video.xml
new file mode 100644
index 0000000..3f6366d
--- /dev/null
+++ b/configs/media_codecs_google_video.xml
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
new file mode 100644
index 0000000..23aeaa3
--- /dev/null
+++ b/configs/media_profiles.xml
@@ -0,0 +1,449 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/configs/mtk_omx_core.cfg b/configs/mtk_omx_core.cfg
new file mode 100644
index 0000000..6b65d4c
--- /dev/null
+++ b/configs/mtk_omx_core.cfg
@@ -0,0 +1,21 @@
+OMX.MTK.VIDEO.DECODER.H263 video_decoder.h263 libMtkOmxVdec.so
+OMX.MTK.VIDEO.DECODER.MPEG4 video_decoder.mpeg4 libMtkOmxVdec.so
+OMX.MTK.VIDEO.DECODER.AVC video_decoder.avc libMtkOmxVdec.so
+OMX.MTK.VIDEO.DECODER.VPX video_decoder.vpx libMtkOmxVdec.so
+OMX.MTK.VIDEO.DECODER.AVC.secure video_decoder.avc libMtkOmxVdec.so
+OMX.MTK.VIDEO.ENCODER.AVC video_encoder.avc libMtkOmxVenc.so
+OMX.MTK.VIDEO.ENCODER.H263 video_encoder.h263 libMtkOmxVenc.so
+AIV.play AIV.play.101 libMtkOmxAIVPlayer.so
+AIV.play.avcddp play.avcddp libMtkOmxAIVPlayer.so
+AIV.play.generic AIV.play.role.generic libMtkOmxAIVPlayer.so
+OMX.MTK.AUDIO.DECODER.MP3 audio_decoder.mp3 libMtkOmxMp3Dec.so
+OMX.MTK.AUDIO.DECODER.AAC audio_decoder.aac libMtkOmxAacDec.so
+OMX.MTK.AUDIO.DECODER.G711 audio_decoder.g711 libMtkOmxG711Dec.so
+OMX.MTK.AUDIO.DECODER.RAW audio_decoder.raw libMtkOmxRawDec.so
+OMX.MTK.AUDIO.DECODER.AMR.NB audio_decoder.amrnb libMtkOmxAMRNBDec.so
+OMX.MTK.AUDIO.DECODER.AMR.WB audio_decoder.amrwb libMtkOmxAMRWBDec.so
+OMX.MTK.AUDIO.ENCODER.AMR audio_encoder.amrnb libMtkOmxAmrEnc.so
+OMX.MTK.AUDIO.ENCODER.AWB audio_encoder.amrwb libMtkOmxAwbEnc.so
+OMX.MTK.AUDIO.ENCODER.AAC audio_encoder.aac libMtkOmxAacEnc.so
+OMX.MTK.AUDIO.DECODER.VORBIS audio_decoder.vorbis libMtkOmxVorbisDec.so
+OMX.MTK.VIDEO.DECODER.HEVC video_decoder.hevc libMtkOmxVdec.so
\ No newline at end of file
diff --git a/device.mk b/device.mk
index 3eac4e9..0eb205c 100644
--- a/device.mk
+++ b/device.mk
@@ -44,6 +44,16 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
+# Config files
+PRODUCT_COPY_FILES += \
+ $(DEVICE_FOLDER)/configs/media_codecs.xml:system/etc/media_codecs.xml \
+ $(DEVICE_FOLDER)/configs/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
+ $(DEVICE_FOLDER)/configs/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
+ $(DEVICE_FOLDER)/configs/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
+ $(DEVICE_FOLDER)/configs/media_profiles.xml:system/etc/media_profiles.xml \
+ $(DEVICE_FOLDER)/configs/mtk_omx_core.cfg:system/etc/mtk_omx_core.cfg
+
+
$(call inherit-product-if-exists, vendor/amazon/ford/ford-vendor.mk)
# Audio
diff --git a/proprietary-files.txt b/proprietary-files.txt
index d165c48..1bb9477 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -50,13 +50,7 @@ etc/firmware/ROMv2_patch_1_0_hdr.bin
etc/firmware/ROMv2_patch_1_1_hdr.bin
etc/firmware/WIFI_RAM_CODE_8127
etc/firmware/WMT_SOC.cfg
-etc/media_codecs_google_audio.xml
-etc/media_codecs_google_telephony.xml
-etc/media_codecs_google_video.xml
-etc/media_codecs.xml
-etc/media_profiles.xml
etc/monitoring.conf
-etc/mtk_omx_core.cfg
etc/wifi/p2p_supplicant_overlay.conf
etc/wifi/wpa_supplicant_overlay.conf
etc/wifi/wpa_supplicant.conf