diff --git a/extract-files.py b/extract-files.py
index 78d0e19..d203bb3 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -67,7 +67,7 @@ blob_fixups: blob_fixups_user_type = {
         .add_needed('libui_shim.so'),
     'vendor/etc/vintf/manifest/sec_c2_manifest_default0_1_2.xml': blob_fixup()
         .regex_replace('default0', 'software'),
-    ('vendor/etc/media_codecs_pineapple.xml', 'vendor/etc/media_codecs_pineapple_vendor.xml'): blob_fixup()
+    ('vendor/etc/media_codecs.xml', 'vendor/etc/media_codecs_pineapple.xml', 'vendor/etc/media_codecs_pineapple_vendor.xml'): blob_fixup()
         .regex_replace('.*media_codecs_(google_audio|google_c2|google_telephony|google_video|vendor_audio).*\n', ''),
 }  # fmt: skip
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 8f01b2c..2247500 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -155,13 +155,11 @@ vendor/lib64/vendor.samsung.hardware.bluetooth.audio-impl.so
 vendor/bin/hw/vendor.samsung.hardware.camera.provider-service_64
 vendor/etc/DsgpPolicy.csv
 vendor/etc/external_camera_config.xml
-vendor/etc/external_camera_config.xml
 vendor/etc/init/camera.unihal.rc
 vendor/etc/init/vendor.samsung.hardware.camera.provider-service_64.rc
 vendor/etc/portrait_data/SRIB_ClatNetLite_INT8_V003_sm8650_vendor.tvm.so
 vendor/etc/portrait_data/dual_portrait_product.json
 vendor/etc/portrait_data/single_bokeh_feature_vendor.json
-vendor/etc/portrait_data/single_bokeh_feature_vendor.json
 vendor/etc/str/str_preference_data.dat
 vendor/etc/vintf/manifest/vendor.qti.camera.aon-impl.xml
 vendor/etc/vintf/manifest/vendor.qti.camera.offlinecamera-impl.xml
@@ -805,6 +803,9 @@ vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_qsync_cmd_mode_dsi_visionox_p
 vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_qsync_video_mode_dsi_visionox_panel_with_DSC.json
 vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_video_mode_dsi_visionox_panel_with_DSC.json
 
+# Dolby
+vendor/etc/media_codecs_dolby_audio.xml
+
 # DSP
 vendor/bin/dspservice
 vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc
@@ -1121,16 +1122,14 @@ vendor/bin/hw/vendor.qti.media.c2@1.0-service
 vendor/bin/init.qti.media.sh
 vendor/etc/init/init.qti.media.rc
 vendor/etc/init/vendor.qti.media.c2@1.0-service.rc
+vendor/etc/media_codecs.xml
 vendor/etc/media_codecs_performance_pineapple.xml
 vendor/etc/media_codecs_performance_pineapple_vendor.xml
 vendor/etc/media_codecs_pineapple.xml
 vendor/etc/media_codecs_pineapple_vendor.xml
 vendor/etc/media_pineapple/video_system_specs.json
 vendor/etc/media_profiles.xml
-vendor/etc/media_profiles.xml
 vendor/etc/media_profiles_V1_0.xml
-vendor/etc/media_profiles_V1_0.xml
-vendor/etc/media_profiles_pineapple.xml
 vendor/etc/media_profiles_pineapple.xml
 vendor/etc/seccomp_policy/codec2.vendor.base-arm64.policy
 vendor/etc/seccomp_policy/codec2.vendor.ext-arm64.policy
@@ -1162,11 +1161,14 @@ vendor/lib64/libqcodec2_platform.so
 vendor/lib64/libqcodec2_streaminteg_filter.so
 vendor/lib64/libqcodec2_utils.so
 vendor/lib64/libqcodec2_v4l2codec.so
+vendor/lib64/libqtbase.so
+vendor/lib64/libqtnodes.so
 vendor/lib64/libsavscmn.so
 vendor/lib64/libsavsvc.so
 vendor/lib64/libsec2imageformatfilter.so
 vendor/lib64/libsimba.media.samsung.so
 vendor/lib64/libstagefright_foundation_vendor.so
+vendor/lib64/libstreamprocessor.so
 vendor/lib64/libvideotxr.so
 vendor/lib64/qti.video.utils.videobufferlayout.so
 
@@ -1339,6 +1341,23 @@ vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so
 product/etc/permissions/UimService.xml
 product/framework/uimservicelibrary.jar
 
+# seccomp policies
+vendor/etc/seccomp_policy/c2audio.vendor.base-arm.policy
+vendor/etc/seccomp_policy/c2audio.vendor.base-arm64.policy
+vendor/etc/seccomp_policy/c2audio.vendor.ext-arm.policy
+vendor/etc/seccomp_policy/c2audio.vendor.ext-arm64.policy
+vendor/etc/seccomp_policy/imsrtp.policy
+vendor/etc/seccomp_policy/mediacodec.policy
+vendor/etc/seccomp_policy/mediaextractor_sec.policy
+vendor/etc/seccomp_policy/qesdksec.policy
+vendor/etc/seccomp_policy/qsap_dcfd.policy
+vendor/etc/seccomp_policy/qsap_qapeservice.policy
+vendor/etc/seccomp_policy/qsap_sensors.policy
+vendor/etc/seccomp_policy/qsap_voiceui.policy
+vendor/etc/seccomp_policy/wfdhdcphalservice.policy
+vendor/etc/seccomp_policy/wfdvndservice.policy
+vendor/etc/seccomp_policy/wifidisplayhalservice.policy
+
 # Secure element
 vendor/bin/hw/android.hardware.secure_element-service.nxp
 vendor/bin/hw/vendor.samsung.hardware.security.sem@1.0-service
@@ -1521,6 +1540,13 @@ vendor/etc/init/vendor.samsung.hardware.vibrator-default.rc
 vendor/etc/vintf/manifest/vendor.samsung.hardware.vibrator-default.xml
 vendor/lib64/vendor.samsung.hardware.vibrator-V5-ndk.so
 
+# WFD
+vendor/lib64/libwfdcodecv4l2_proprietary.so
+vendor/lib64/libwfdcommonutils_proprietary.so
+vendor/lib64/libwfddisplayconfig_vendor.so
+vendor/lib64/libwfdmminterface_proprietary.so
+vendor/lib64/libwfdutils_proprietary.so
+
 # Wi-Fi
 vendor/bin/cnss-daemon
 vendor/bin/cnss_diag;DISABLE_DEPS
diff --git a/vendor.prop b/vendor.prop
index b7f776a..47b8541 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -176,10 +176,6 @@ persist.vendor.qfp=true
 # Gatekeeper
 vendor.gatekeeper.is_security_level_spu=0
 
-# Media
-debug.stagefright.ccodec=4
-debug.stagefright.omx_default_rank=0
-
 # Perf
 ro.vendor.extension_library=libqti-perfd-client.so