diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 09f3395..6dbdad3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -94,10 +94,10 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
     hardware/qcom-caf/common/vendor_framework_compatibility_matrix_legacy.xml \
     hardware/samsung/vintf/samsung_framework_compatibility_matrix.xml \
 
-DEVICE_MANIFEST_FILE := \
+DEVICE_MANIFEST_FILE += \
     $(COMMON_PATH)/manifest.xml
 
-DEVICE_MATRIX_FILE := \
+DEVICE_MATRIX_FILE += \
     hardware/qcom-caf/common/compatibility_matrix.xml
 
 # HWUI
@@ -251,4 +251,4 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 WPA_SUPPLICANT_VERSION := $(HOSTAPD_VERSION)
 
 # Get non-open-source specific aspects
-include vendor/samsung/a71-common/BoardConfigVendor.mk
+include vendor/samsung/a71-common/BoardConfigVendor.mk
\ No newline at end of file
diff --git a/common.mk b/common.mk
index 7a161bd..311b697 100644
--- a/common.mk
+++ b/common.mk
@@ -96,14 +96,13 @@ TARGET_SCREEN_WIDTH := 1080
 PRODUCT_PACKAGES += \
     AdvancedDisplay \
 
-# SamsungDAP
-PRODUCT_PACKAGES += \
-    SamsungDAP \
-
 # SamsungDoze
 PRODUCT_PACKAGES += \
     SamsungDoze \
 
+# Dolby
+$(call inherit-product, hardware/dolby/dolby.mk)
+
 # DRM
 PRODUCT_PACKAGES += \
     android.hardware.drm-service.clearkey \
diff --git a/configs/audio/audio_effects.xml b/configs/audio/audio_effects.xml
index e70b645..2d3c25d 100755
--- a/configs/audio/audio_effects.xml
+++ b/configs/audio/audio_effects.xml
@@ -42,6 +42,16 @@
         <library name="audiosphere" path="libasphere.so"/>
         <library name="shoebox" path="libshoebox.so"/>
         <library name="dap" path="libswdap.so"/>
+	<!--DOLBY DAP-->
+        <library name="dap" path="libswdap.so"/>
+        <library name="dvl" path="libdlbvol.so"/>
+        <!--DOLBY END-->
+        <!--DOLBY GAME-->
+        <library name="gamedap" path="libswgamedap.so"/>
+        <!--DOLBY END-->
+        <!--DOLBY VQE-->
+        <library name="vqe" path="libswvqe.so"/>
+        <!--DOLBY END-->
     </libraries>
     <effects>
         <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
@@ -91,22 +101,44 @@
         <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
         <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>
         <effect name="dap" library="dap" uuid="6ab06da4-c516-4611-8166-452799218539"/>
+	<!--DOLBY DAP-->
+        <effect name="dap" library="dap" uuid="9d4921da-8225-4f29-aefa-39537a04bcaa"/>
+        <effect name="dlb_music_listener" library="dvl" uuid="40f66c8b-5aa5-4345-8919-53ec431aaa98"/>
+        <effect name="dlb_ring_listener" library="dvl" uuid="21d14087-558a-4f21-94a9-5002dce64bce"/>
+        <effect name="dlb_alarm_listener" library="dvl" uuid="6aff229c-30c6-4cc8-9957-dbfe5c1bd7f6"/>
+        <effect name="dlb_system_listener" library="dvl" uuid="874db4d8-051d-4b7b-bd95-a3bebc837e9e"/>
+        <effect name="dlb_notification_listener" library="dvl" uuid="1f0091e3-6ad8-40fe-9b09-5948f9a26e7e"/>
+        <effect name="dlb_voice_call_listener" library="dvl" uuid="58d13383-b41d-05df-d94e-bb23db293260"/>
+        <!--DOLBY END-->
+        <!--DOLBY GAME-->
+        <effect name="gamedap" library="gamedap" uuid="3783c334-d3a0-4d13-874f-0032e5fb80e2"/>
+        <!--DOLBY END-->
+        <!--DOLBY VQE-->
+        <effect name="vqe" library="vqe" uuid="64a0f614-7fa4-48b8-b081-d59dc954616f"/>
+        <!--DOLBY END-->
     </effects>
     <postprocess>
         <stream type="music">
-            <apply effect="music_helper"/>
+        <apply effect="music_helper"/>
+        <apply effect="dlb_music_listener"/>
         </stream>
         <stream type="ring">
             <apply effect="ring_helper"/>
+			<apply effect="dlb_ring_listener"/>
         </stream>
         <stream type="alarm">
             <apply effect="alarm_helper"/>
+			<apply effect="dlb_alarm_listener"/>
         </stream>
         <stream type="voice_call">
             <apply effect="voice_helper"/>
+		<stream type="system">
+            <apply effect="dlb_system_listener"/>
+        </stream>
         </stream>
         <stream type="notification">
             <apply effect="notification_helper"/>
+			<apply effect="dlb_notification_listener"/>
         </stream>
     </postprocess>
     <preprocess>
@@ -115,4 +147,4 @@
             <apply effect="ns"/>
         </stream>
     </preprocess>
-</audio_effects_conf>
+</audio_effects_conf>
\ No newline at end of file
diff --git a/crdroid.dependencies b/crdroid.dependencies
new file mode 100644
index 0000000..c0d4aa6
--- /dev/null
+++ b/crdroid.dependencies
@@ -0,0 +1,22 @@
+[
+  {
+    "repository": "crdroidandroid/android_kernel_samsung_a71",
+    "target_path": "kernel/samsung/a71",
+    "branch": "15.0"
+  },
+  {
+    "repository": "crdroidandroid/android_hardware_samsung",
+    "target_path": "hardware/samsung",
+    "branch": "15.0"
+  },
+  {
+    "repository": "crdroidandroid/proprietary_vendor_samsung_a71-common",
+    "target_path": "vendor/samsung/a71-common",
+    "branch": "15.0"
+  },
+  {
+    "repository": "crdroidandroid/android_hardware_dolby",
+    "target_path": "hardware/dolby",
+    "branch": "15.0"
+  }
+]
\ No newline at end of file
diff --git a/init/init.target.rc b/init/init.target.rc
index c8516a8..23557c1 100755
--- a/init/init.target.rc
+++ b/init/init.target.rc
@@ -89,6 +89,10 @@ on post-fs-data
     mkdir /persist/qti_fp 0700 system system
     mkdir /data/vendor/nnhal 0700 system system
 
+# Dolby
+    mkdir /data/vendor/dolby 0770 media media
+    mkdir /data/vendor/multimedia 0775 system system
+
 # For cpusets initialize for Silver Only first and then Silver + Gold
 # Silver Only configuration cannot work with 0-7
 on boot
@@ -236,3 +240,4 @@ service vendor.contexthub-hal-1-0 /vendor/bin/hw/android.hardware.contexthub@1.0
     user system
     group system
     disabled
+
diff --git a/vendor.prop b/vendor.prop
index 0edad84..66d7721 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -19,8 +19,6 @@ ro.vendor.audio.sdk.fluencetype=none
 ro.vendor.audio.sdk.ssr=false
 use.voice.path.for.pcm.voip=true
 vendor.audio.adm.buffering.ms=2
-vendor.audio.dolby.ds2.enabled=false
-vendor.audio.dolby.ds2.hardbypass=false
 vendor.audio.feature.a2dp_offload.enable=false
 vendor.audio.feature.audiozoom.enable=false
 vendor.audio.feature.compress_meta_data.enable=true
@@ -285,4 +283,4 @@ ro.zram.mark_idle_delay_mins=60
 ro.zram.periodic_wb_delay_hours=24
 
 # Zygote
-zygote.critical_window.minute=10
+zygote.critical_window.minute=10
\ No newline at end of file