diff --git a/external/config/sources/families/sun50iw6.conf b/external/config/sources/families/sun50iw6.conf
index 4c33590..ec1b24f 100644
--- a/external/config/sources/families/sun50iw6.conf
+++ b/external/config/sources/families/sun50iw6.conf
@@ -58,24 +58,34 @@ family_tweaks_s()
                 chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6255-bluetooth.service >/dev/null 2>&1"
                 [[ $BRANCH == legacy ]] && chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6255-wifi.service >/dev/null 2>&1"
         fi
+
+        #if [[ $BUILD_DESKTOP == yes ]]; then
+
+        #        sed -i "s/auto-profiles = yes/auto-profiles = no/" ${SDCARD}/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf
+
+        #        if [[ $BRANCH == legacy ]]; then
+        #                echo "load-module module-alsa-sink device=hw:1,0 sink_name=AudioCodec-Playback sink_properties=\"device.description='Audio Codec'\"" >> ${SDCARD}/etc/pulse/default.pa
+        #                echo "load-module module-alsa-sink device=hw:0,0 sink_name=HDMI-Playback sink_properties=\"device.description='HDMI Audio'\"" >> ${SDCARD}/etc/pulse/default.pa
+        #        fi
+        #fi
 }
 
 family_tweaks_bsp()
 {
 
-        if [[ $BOARD == orangepi3 ]]; then
+	if [[ $BOARD == orangepi3 ]]; then
 
-                install -m 755 $EXTER/packages/blobs/bt/brcm_patchram_plus/brcm_patchram_plus_$ARCH $destination/usr/bin/brcm_patchram_plus
-                cp $EXTER/packages/bsp/sunxi/ap6256-bluetooth.service $destination/lib/systemd/system/
-                [[ $BRANCH == legacy ]] && cp $EXTER/packages/bsp/sunxi/ap6256-wifi.service $destination/lib/systemd/system/
-        fi
+		install -m 755 $EXTER/packages/blobs/bt/brcm_patchram_plus/brcm_patchram_plus_$ARCH $destination/usr/bin/brcm_patchram_plus
+		cp $EXTER/packages/bsp/sunxi/ap6256-bluetooth.service $destination/lib/systemd/system/
+		[[ $BRANCH == legacy ]] && cp $EXTER/packages/bsp/sunxi/ap6256-wifi.service $destination/lib/systemd/system/
+	fi
 
-        if [[ $BOARD == orangepilite2 ]]; then
+	if [[ $BOARD == orangepilite2 ]]; then
 
-                install -m 755 $EXTER/packages/blobs/bt/brcm_patchram_plus/brcm_patchram_plus_$ARCH $destination/usr/bin/brcm_patchram_plus
-                cp $EXTER/packages/bsp/sunxi/ap6255-bluetooth.service $destination/lib/systemd/system/
-                [[ $BRANCH == legacy ]] && cp $EXTER/packages/bsp/sunxi/ap6255-wifi.service $destination/lib/systemd/system/
-        fi
+		install -m 755 $EXTER/packages/blobs/bt/brcm_patchram_plus/brcm_patchram_plus_$ARCH $destination/usr/bin/brcm_patchram_plus
+		cp $EXTER/packages/bsp/sunxi/ap6255-bluetooth.service $destination/lib/systemd/system/
+		[[ $BRANCH == legacy ]] && cp $EXTER/packages/bsp/sunxi/ap6255-wifi.service $destination/lib/systemd/system/
+	fi
 
-        install -m 755 $EXTER/packages/blobs/bt/hciattach/hciattach_opi_$ARCH $destination/usr/bin/hciattach_opi
+	install -m 755 $EXTER/packages/blobs/bt/hciattach/hciattach_opi_${ARCH}_${BRANCH} $destination/usr/bin/hciattach_opi
 }
diff --git a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
index 8cfc14b..07a8afa 100755
--- a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
+++ b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
@@ -88,7 +88,14 @@ prepare_board() {
 	# IRQ distribution based on $BOARDFAMILY and/or $BOARD_NAME
 	case ${BOARD} in
 
-		orangepizero2|orangepi3-lts|orangepizero2-lts|orangepizero2-b)
+		orangepi3-lts)
+
+			#aplay /usr/share/sounds/alsa/audio.wav -D hw:0,0 > /dev/null 2>&1
+
+			rfkill unblock all
+			/usr/bin/hciattach_opi -n -s 1500000 /dev/ttyBT0 sprd &
+			;;
+		orangepizero2|orangepizero2-lts|orangepizero2-b)
 			if [[ $BRANCH == current ]]; then
 				# Initial hdmi audio
 				aplay /usr/share/sounds/alsa/audio.wav -D hw:0,0 > /dev/null 2>&1
diff --git a/scripts/main.sh b/scripts/main.sh
index f6dfa6e..1e9598b 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -156,8 +156,8 @@ if [[ -z $BOARD ]]; then
 	options+=("orangepilite2"		"Allwinner H6 quad core 1GB RAM WiFi/BT USB3")
 	options+=("orangepioneplus"		"Allwinner H6 quad core 1GB RAM GBE")
 	options+=("orangepizero2"		"Allwinner H616 quad core 512MB/1GB RAM WiFi/BT GBE SPI")
-	options+=("orangepizero2-b"		"Allwinner H616 quad core 1GB RAM WiFi/BT GBE SPI")
-	options+=("orangepizero2-lts"		"Allwinner H616 quad core 1.5GB RAM WiFi/BT GBE SPI")
+	#options+=("orangepizero2-b"		"Allwinner H616 quad core 1GB RAM WiFi/BT GBE SPI")
+	#options+=("orangepizero2-lts"		"Allwinner H616 quad core 1.5GB RAM WiFi/BT GBE SPI")
 	options+=("orangepi4"                   "Rockchip  RK3399 hexa core 4GB RAM GBE eMMc USB3 USB-C WiFi/BT")
 	options+=("orangepir1plus"              "Rockchip  RK3328 quad core 1GB RAM 2xGBE 8211E USB2 SPI")
 	options+=("orangepir1plus-lts"          "Rockchip  RK3328 quad core 1GB RAM 2xGBE YT8531C USB2 SPI")