diff --git a/audio_effects.xml b/audio_effects.xml
index ea4a900..a681c70 100644
--- a/audio_effects.xml
+++ b/audio_effects.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0">
     <libraries>
+        <library name="gamedap" path="libswgamedap.so"/>
+        <library name="vqe" path="libswvqe.so"/>
+        <library name="dap" path="libswdap.so"/>
         <library name="bundle" path="libbundlewrapper.so"/>
         <library name="reverb" path="libreverbwrapper.so"/>
         <library name="visualizer_sw" path="libvisualizer.so"/>
@@ -57,22 +60,22 @@
         <effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/>
         <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
         <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
+        <effect name="gamedap" library="gamedap" uuid="3783c334-d3a0-4d13-874f-0032e5fb80e2"/>
+        <effect name="vqe" library="vqe" uuid="64a0f614-7fa4-48b8-b081-d59dc954616f"/>
+        <effect name="dap" library="dap" uuid="9d4921da-8225-4f29-aefa-39537a04bcaa"/>
     </effects>
     <postprocess>
+        <stream type="system">
+        </stream>
         <stream type="music">
-            <apply effect="music_helper"/>
         </stream>
         <stream type="ring">
-            <apply effect="ring_helper"/>
         </stream>
         <stream type="alarm">
-            <apply effect="alarm_helper"/>
         </stream>
         <stream type="voice_call">
-            <apply effect="voice_helper"/>
         </stream>
         <stream type="notification">
-            <apply effect="notification_helper"/>
         </stream>
     </postprocess>
     <preprocess>
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 2bef298..6eb59c0 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -767,3 +767,27 @@ vendor/bin/pm-proxy|bc4e972e3fe595b973197efe5114da8ff4339a59
 vendor/bin/pm-service|ea63802cf0483ee4ed2a6611ba7f1d0f36970c06
 vendor/lib/libperipheral_client.so|836411f7b88afe296b3f3090aab70fc5700ba434
 vendor/lib64/libperipheral_client.so|a0dd574c8af3135adae10ef49065fa765906db7a
+
+# Dolby - from rhode
+vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service|8215768638794162db3bb76e43045926fcbb4b0b
+vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc|29296ebfe89b2697fec573be73cc3757fd97bed6
+vendor/lib/soundfx/libswdap.so|810d0e266e4a77f06cba72fe8bdde2e1ede4f9f9
+vendor/lib/soundfx/libswgamedap.so|c7d35eb932ecffb384ec62628404df3406b63919
+vendor/lib/soundfx/libswvqe.so|3009202dcdd5b8fadb9c43a8cf5f0fe1c28311a6
+vendor/lib/libdapparamstorage.so|ce5f2fadc1e7d3811d73d49f64254b7054a57259
+vendor/lib/libdeccfg.so|050de5edb5fb7dabba9b59bfafcb5a1366285d3c
+vendor/lib/libstagefright_soft_ac4dec.so|c0fdd6101abf5dbc162c6eee815db40131b94d6c
+vendor/lib/libstagefright_soft_ddpdec.so|9718a2040fba0ad28bd7f55caa849bd9b983f6ca
+vendor/lib/libstagefrightdolby.so|7dcbe2a14024579b2cd657d266ce3ad35faeeed6
+vendor/lib/vendor.dolby.hardware.dms@2.0.so|aaf98796bfa8b384e2b5e162214ca46f6eca5dbc
+vendor/lib64/soundfx/libswdap.so|e996ee1d421b3b2cf74f3f3ed93bff067d83dddb
+vendor/lib64/soundfx/libswgamedap.so|c898fd5b51312c5fafa693ca037423c5bae23101
+vendor/lib64/soundfx/libswvqe.so|08394e1ac285479213604c35cb144147fdac68c0
+vendor/lib64/libdapparamstorage.so|7549aeba2b7041b472ffc1f5fd39a56e4be64a2b
+vendor/lib64/libdeccfg.so|3a63582be7dea50ae10c0543f68e3bce592a3877
+vendor/lib64/libdlbdsservice.so|ccae69075705a71358e363eee973f32d76288696
+vendor/lib64/libstagefright_soft_ac4dec.so|45b4a08175e6b5226b34e7275ce60d4b76033041
+vendor/lib64/libstagefright_soft_ddpdec.so|7f1ee1710cdb5d4334613a765e04bec5d807fea2
+vendor/lib64/libstagefrightdolby.so|884abf462a46d0e0281c8157418c513cd4dc003a
+vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so|92eb0a2b730810881288119fc4d038f52870acd1
+vendor/lib64/vendor.dolby.hardware.dms@2.0.so|a93b5cf33ae57387a2d32686520a0d1dd5d10dcc
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 97153c6..b26fe47 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -207,3 +207,28 @@ system_ext/etc/permissions/privapp-permissions-google-se.xml
 system_ext/framework/RadioConfigLib.jar
 system_ext/framework/com.android.hotwordenrollment.common.util.jar
 system_ext/priv-app/CarrierSetup/CarrierSetup.apk
+
+# Dolby - from rhode
+odm/bin/hw/vendor.dolby_v3_6.hardware.dms360@2.0-service|da39a3ee5e6b4b0d3255bfef95601890afd80709
+system_ext/app/MotoSignatureApp/MotoSignatureApp.apk|98027bccd4ec14cb7887cde068e35f6b0ecd0a44
+system_ext/etc/permissions/com.motorola.frameworks.core.addon.xml|b98f53235c8d4c1962d3b279840e2a074d0ddd10
+system_ext/etc/permissions/com.motorola.motosignature.xml|e94cdcfd1b92b6bd1d0b53c3c2ed8bffe362e6ac
+system_ext/etc/permissions/com.motorola.software.dolbyui.xml|d5c25b2522094346257a5ff0f4317c992b54d1fc
+system_ext/etc/permissions/moto-checkin.xml|373f75676a0ac7915f5bc49ec43fd99c38dd9c1b
+system_ext/etc/permissions/moto-settings.xml|f2a2703b62777c88e3a161a0d2a75d72f90d5007
+system_ext/etc/permissions/moto.xml|5521a530e243f6e5e928018320d4e9b819134fbb
+system_ext/etc/permissions/privapp-com.dolby.daxservice.xml|7e83188fe32e6210de8d943b328893a32531c98d
+system_ext/etc/permissions/privapp-com.motorola.android.providers.settings.xml|44bd70f7309ad6407d43391bcdb5b7e05ae8c363
+system_ext/etc/permissions/privapp-com.motorola.dolby.dolbyui.xml|d7f762731e3302ce553bf22a99aaeec312f65c0a
+system_ext/etc/sysconfig/config-com.dolby.daxservice.xml|f2955d9e3d5f75b40fdc8229243828f0c1c163de
+system_ext/etc/sysconfig/config-com.motorola.android.providers.settings.xml|1f804d789dd7c8b7657a6f07e23bcac1ce5c701c
+system_ext/etc/sysconfig/config-com.motorola.dolby.dolbyui.xml|0131f1a5a5c2d2fc09a6bc75ff4e25b74785ec2a
+system_ext/etc/sysconfig/config-com.motorola.motosignature.app.xml|5b2c138d4be962f052700fb3ca00d822bbf836da
+system_ext/framework/com.motorola.frameworks.core.addon.jar|8431ff519b0a3e02411a0096898ee8acb372b9b7
+system_ext/framework/com.motorola.motosignature.jar|1607b24909a030ddec7f05b91356e6b2d76c0b6b
+system_ext/framework/moto-checkin.jar|989119b230c01ba95341d29de45e38120a68f394
+system_ext/framework/moto-settings.jar|0ebdf871ededa1eb9c5186bdb4a9055d89594779
+system_ext/framework/moto.jar|6c797a7f205f2ce5d939c000f21c6625daf0c33f
+system_ext/priv-app/MotoDolbyDax3/MotoDolbyDax3.apk;OVERRIDES=MusicFX|e0e37f0179bee14e29467bbd716aed00c59b542a
+system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk|25deb5bdb18d55dee1b9bd1de2ba46e353c62780
+system_ext/priv-app/daxService/daxService.apk|239f110bc4578c789491a5174998cc87c0a5b7ad