diff --git a/target/chroot/beagleboard.org-console-jessie.sh b/target/chroot/beagleboard.org-console-jessie.sh
index 8196a123fffea2fab15f09537d424ba8d1b0daf4..640094bb3ea95cf91d0e0e3c31189d936e46b88b 100755
--- a/target/chroot/beagleboard.org-console-jessie.sh
+++ b/target/chroot/beagleboard.org-console-jessie.sh
@@ -119,7 +119,7 @@ setup_desktop () {
 		echo "        Identifier      \"Builtin Default fbdev Screen 0\"" >> ${wfile}
 		echo "        Device          \"Builtin Default fbdev Device 0\"" >> ${wfile}
 		echo "        Monitor         \"Builtin Default Monitor\"" >> ${wfile}
-		echo "#        DefaultDepth    16" >> ${wfile}
+		echo "#DefaultDepth        DefaultDepth    16" >> ${wfile}
 		echo "EndSection" >> ${wfile}
 		echo "" >> ${wfile}
 		echo "Section \"ServerLayout\"" >> ${wfile}
diff --git a/target/chroot/beagleboard.org-jessie.sh b/target/chroot/beagleboard.org-jessie.sh
index 6800626f889940445aacfa1b976a6ce2aceef58c..ca8bad92cdf044461e150c991915cf189a39cdc1 100755
--- a/target/chroot/beagleboard.org-jessie.sh
+++ b/target/chroot/beagleboard.org-jessie.sh
@@ -119,7 +119,7 @@ setup_desktop () {
 		echo "        Identifier      \"Builtin Default fbdev Screen 0\"" >> ${wfile}
 		echo "        Device          \"Builtin Default fbdev Device 0\"" >> ${wfile}
 		echo "        Monitor         \"Builtin Default Monitor\"" >> ${wfile}
-		echo "#        DefaultDepth    16" >> ${wfile}
+		echo "#DefaultDepth        DefaultDepth    16" >> ${wfile}
 		echo "EndSection" >> ${wfile}
 		echo "" >> ${wfile}
 		echo "Section \"ServerLayout\"" >> ${wfile}
diff --git a/target/chroot/beagleboard.org-stretch.sh b/target/chroot/beagleboard.org-stretch.sh
index d130d3104b428cbb4771732a27c83e9cd36dca3f..f832dcae3e2e9c48d14fa77fb125703fe268c2ef 100755
--- a/target/chroot/beagleboard.org-stretch.sh
+++ b/target/chroot/beagleboard.org-stretch.sh
@@ -119,7 +119,7 @@ setup_desktop () {
 		echo "        Identifier      \"Builtin Default fbdev Screen 0\"" >> ${wfile}
 		echo "        Device          \"Builtin Default fbdev Device 0\"" >> ${wfile}
 		echo "        Monitor         \"Builtin Default Monitor\"" >> ${wfile}
-		echo "#        DefaultDepth    16" >> ${wfile}
+		echo "#DefaultDepth        DefaultDepth    16" >> ${wfile}
 		echo "EndSection" >> ${wfile}
 		echo "" >> ${wfile}
 		echo "Section \"ServerLayout\"" >> ${wfile}
diff --git a/target/chroot/machinekit-jessie.sh b/target/chroot/machinekit-jessie.sh
index 73ccb0cbe6c9d7a181c24ba6c5be1872df7ba89c..fb8e33aac11f095b6bb5bdc64f60cb36c83e12d7 100755
--- a/target/chroot/machinekit-jessie.sh
+++ b/target/chroot/machinekit-jessie.sh
@@ -131,7 +131,7 @@ setup_desktop () {
 		echo "        Identifier      \"Builtin Default fbdev Screen 0\"" >> ${wfile}
 		echo "        Device          \"Builtin Default fbdev Device 0\"" >> ${wfile}
 		echo "        Monitor         \"Builtin Default Monitor\"" >> ${wfile}
-		echo "#        DefaultDepth    16" >> ${wfile}
+		echo "#DefaultDepth        DefaultDepth    16" >> ${wfile}
 		echo "EndSection" >> ${wfile}
 		echo "" >> ${wfile}
 		echo "Section \"ServerLayout\"" >> ${wfile}
diff --git a/target/chroot/seeed-jessie.sh b/target/chroot/seeed-jessie.sh
index 392cca0f77d8975d4475cc8bef4418b7f86728dc..75ab2f7477360a65ac28d3b22012f38937720ca9 100755
--- a/target/chroot/seeed-jessie.sh
+++ b/target/chroot/seeed-jessie.sh
@@ -119,7 +119,7 @@ setup_desktop () {
 		echo "        Identifier      \"Builtin Default fbdev Screen 0\"" >> ${wfile}
 		echo "        Device          \"Builtin Default fbdev Device 0\"" >> ${wfile}
 		echo "        Monitor         \"Builtin Default Monitor\"" >> ${wfile}
-		echo "#        DefaultDepth    16" >> ${wfile}
+		echo "#DefaultDepth        DefaultDepth    16" >> ${wfile}
 		echo "EndSection" >> ${wfile}
 		echo "" >> ${wfile}
 		echo "Section \"ServerLayout\"" >> ${wfile}
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index c2764b43d78f25f602145100b08dca4fffb97521..f41fb68aa802b6b4b5aa4aabd4edd04d4d13615a 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -1520,9 +1520,9 @@ populate_rootfs () {
 
 			if [ "x${conf_board}" = "xomap3_beagle" ] ; then
 				sudo sed -i -e 's:#HWcursor_false::g' ${TEMPDIR}/disk${wfile}
+				sudo sed -i -e 's:#DefaultDepth::g' ${TEMPDIR}/disk${wfile}
 			else
 				sudo sed -i -e 's:#HWcursor_false::g' ${TEMPDIR}/disk${wfile}
-				sudo sed -i -e 's:16:24:g' ${TEMPDIR}/disk${wfile}
 			fi
 		fi
 	fi
@@ -1534,7 +1534,6 @@ populate_rootfs () {
 				sudo sed -i -e 's:modesetting:armada:g' ${TEMPDIR}/disk${wfile}
 				sudo sed -i -e 's:fbdev:armada:g' ${TEMPDIR}/disk${wfile}
 			fi
-			sudo sed -i -e 's:16:24:g' ${TEMPDIR}/disk${wfile}
 		fi
 	fi