diff --git a/scripts/inc.aromadata.sh b/scripts/inc.aromadata.sh
index 40548d8..722fefd 100644
--- a/scripts/inc.aromadata.sh
+++ b/scripts/inc.aromadata.sh
@@ -194,6 +194,7 @@ form(
       "WebViewGoogle",     "<b>Android System WebView</b>",       "Requires Android 5.1 or later, WebViewStub is installed on Android 7.0+ instead when Google Chrome is selected",                      "check",
       "Wellbeing",     "<b>Digital Wellbeing</b>",       "Requires Android 9.0 or later",                      "check",
       "YouTube",     "<b>YouTube</b>",       "",                      "check",
+      "YTMusic",     "<b>YouTube Music</b>",       "",                      "check",
       "Zhuyin",     "<b>Google Zhuyin Input</b>",       "",                      "check"
 );
 # Duplicate aromagapps.prop and rename it to gapps.prop - this is useful because the selections won't be erased by the complete installation (menu.prop selected ==2)
@@ -738,6 +739,12 @@ then
   appendvar("gapps", "YouTube\n");
 endif;
 
+if
+  prop("gapps.prop", "YTMusic")=="1"
+then
+  appendvar("gapps", "YTMusic\n");
+endif;
+
 if
   prop("gapps.prop", "Zhuyin")=="1"
 then
diff --git a/scripts/inc.buildtarget.sh b/scripts/inc.buildtarget.sh
index f225b68..64f2f48 100755
--- a/scripts/inc.buildtarget.sh
+++ b/scripts/inc.buildtarget.sh
@@ -56,7 +56,6 @@ chrome
 drive
 keep
 movies
-music
 newsstand
 playgames
 talkback"
@@ -381,6 +380,7 @@ get_package_info(){
                                 packagegappsremove="product/overlay/WellbeingOverlay.apk vendor/overlay/WellbeingOverlay.apk"
                               fi;;
     youtube)                  packagetype="GApps"; packagename="com.google.android.youtube"; packagetarget="app/YouTube";;
+    ytmusic)                  packagetype="GApps"; packagename="com.google.android.apps.youtube.music"; packagetarget="app/YouTubeMusicPrebuilt";;
     zhuyin)                   packagetype="GApps"; packagename="com.google.android.apps.inputmethod.zhuyin"; packagetarget="app/GoogleZhuyinIME";;  # ZhuyinIME exists in some ROMs
 
     # TV GApps
diff --git a/scripts/inc.compatibility.sh b/scripts/inc.compatibility.sh
index beb030d..ed78258 100755
--- a/scripts/inc.compatibility.sh
+++ b/scripts/inc.compatibility.sh
@@ -501,7 +501,10 @@ setupwizardtablet"
 }
 
 api21hack(){
-  if [ "$API" -ge "21" ]; then
+  if [ "$API" -le "21" ]; then
+    gappsfull="$gappsfull
+music"
+  else
     if [ "$API" -eq "21" ]; then
       gappscore="$gappscore
 gmssetup
@@ -516,6 +519,8 @@ wallpapers"
     gappsstock="$gappsstock
 androidauto
 contactsgoogle"
+    gappsfull="$gappsfull
+ytmusic"
     miniremove="$miniremove
 clockstock
 tagstock"
diff --git a/sources/all b/sources/all
index 986b728..bc33f0f 160000
--- a/sources/all
+++ b/sources/all
@@ -1 +1 @@
-Subproject commit 986b728c2fa185d3dc678f0870a9c200aff5c722
+Subproject commit bc33f0f935b4a73a688f3ae67989ccc85af0b359
diff --git a/sources/arm b/sources/arm
index 703bd6f..249e67b 160000
--- a/sources/arm
+++ b/sources/arm
@@ -1 +1 @@
-Subproject commit 703bd6fd1188f93adfd89d6439f29acb82fbc4ae
+Subproject commit 249e67b27fce8afb230d1dcdde5451cafbb36c76
diff --git a/sources/arm64 b/sources/arm64
index 958bbed..b2e88a0 160000
--- a/sources/arm64
+++ b/sources/arm64
@@ -1 +1 @@
-Subproject commit 958bbedc5e84ad4133becca4c8381e58e0ab3531
+Subproject commit b2e88a0a16aeb4b3c80fbadab7c4838432cd1a11
diff --git a/sources/x86 b/sources/x86
index f866366..ba6f8c2 160000
--- a/sources/x86
+++ b/sources/x86
@@ -1 +1 @@
-Subproject commit f866366a2ef12fa8e0f920ced39bac5d94a20db8
+Subproject commit ba6f8c2271b7df7dc4d351a3254b6fcf2fe9fe05
diff --git a/sources/x86_64 b/sources/x86_64
index f1a91e1..18d1dbc 160000
--- a/sources/x86_64
+++ b/sources/x86_64
@@ -1 +1 @@
-Subproject commit f1a91e154930a3e35b3a71c31e22e71ba26aaa18
+Subproject commit 18d1dbccbd6aa4cc45776611f3a02d5253e38e3c