diff --git a/README b/README
index acbcf96..ec1de40 100644
--- a/README
+++ b/README
@@ -10,12 +10,14 @@ Required Options:
 --mmc </dev/sdX>
 
 --dtb <dev board>
-        Freescale:
+        Freescale based:
                 imx51-babbage
                 imx53-qsb
+                imx6dl-wandboard
                 imx6q-sabrelite
                 imx6q-sabresd
-        TI:
+                imx6q-wandboard
+        TI based:
                 am335x-bone-serial
                 am335x-bone-video
                 am335x-boneblack
@@ -26,8 +28,6 @@ Required Options:
                 omap4-panda-es
         Wandboard:
                 wandboard-solo
-                wandboard-dl
-                wandboard-quad
 
 Optional:
 --distro <distro>
diff --git a/hwpack/imx6dl-wandboard.conf b/hwpack/imx6dl-wandboard.conf
index 5323a7d..2faa533 100644
--- a/hwpack/imx6dl-wandboard.conf
+++ b/hwpack/imx6dl-wandboard.conf
@@ -60,9 +60,4 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-#SYSTEM="video"
-SERIAL_MODE=1
-
-VIDEO_CONSOLE="console=tty0"
-HAS_IMX_BLOB=1
-conf_imx_video="video=mxcfb0:dev=hdmi,1280x720@60,if=RGB565"
+USE_KMS=1
diff --git a/hwpack/imx6q-wandboard.conf b/hwpack/imx6q-wandboard.conf
index 44861c5..487b378 100644
--- a/hwpack/imx6q-wandboard.conf
+++ b/hwpack/imx6q-wandboard.conf
@@ -60,8 +60,4 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-SERIAL_MODE=1
-
-VIDEO_CONSOLE="console=tty0"
-HAS_IMX_BLOB=1
-conf_imx_video="video=mxcfb0:dev=hdmi,1280x720@60,if=RGB565"
+USE_KMS=1
diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf
deleted file mode 100644
index 4b4020e..0000000
--- a/hwpack/wandboard-dl.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-#        --dtb wandboard-dl (Freescale based i.MX6 Wandboard (Dual Core) WandBoard Tree:supported)
-
-#Bootloader:
-conf_board="wandboard_dl"
-conf_bl_http="http://rcn-ee.net/deb/tools/latest"
-conf_bl_listfile="bootloader-ng"
-
-#Bootloader Partition:
-conf_boot_fstype="ext2"
-conf_boot_startmb="1"
-conf_boot_endmb="96"
-
-bootloader_location="dd_uboot_boot"
-dd_uboot_bs="512"
-dd_uboot_seek="2"
-unset spl_name
-boot_name="u-boot.imx"
-
-#Bootloader: u-boot features:
-
-#CONFIG_CMD_BOOTZ
-#bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
-
-#CONFIG_SUPPORT_RAW_INITRD
-#allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
-
-#CONFIG_CMD_FS_GENERIC
-#allows using "load" over "fatload"/"ext2load"
-conf_uboot_CONFIG_CMD_FS_GENERIC=1
-
-#uenvcmd avaiable?
-conf_uboot_use_uenvcmd=1
-#conf_uboot_no_uenvcmd="loaduimage"
-
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
-#Kernel:
-#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
-kernel_subarch="wand"
-kernel_repo="STABLE"
-
-usbnet_mem=
-
-#Kernel: Bootloader Settings:
-conf_zreladdr="0x10008000"
-conf_loadaddr="0x12000000"
-conf_fdtaddr="0x11000000"
-#initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB)
-conf_initrdaddr="0x12A00000"
-#conf_fdtfile="imx6dl-wandboard.dtb"
-#need_dtbs=1
-need_wandboard_firmware=1
-
-SYSTEM="video"
-
-SERIAL="ttymxc0"
-SERIAL_CONSOLE="${SERIAL},115200n8"
-
-#SERIAL_MODE=1
-
-VIDEO_CONSOLE="console=tty0"
-HAS_IMX_BLOB=1
-conf_imx_video="video=mxcfb0:dev=hdmi,1280x720@60,if=RGB565"
diff --git a/hwpack/wandboard-quad.conf b/hwpack/wandboard-quad.conf
deleted file mode 100644
index 78262a9..0000000
--- a/hwpack/wandboard-quad.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-#        --dtb wandboard-quad (Freescale based i.MX6 Wandboard (Quad Core) WandBoard Tree:supported)
-
-#Bootloader:
-conf_board="wandboard_quad"
-conf_bl_http="http://rcn-ee.net/deb/tools/latest"
-conf_bl_listfile="bootloader-ng"
-
-#Bootloader Partition:
-conf_boot_fstype="ext2"
-conf_boot_startmb="1"
-conf_boot_endmb="96"
-
-bootloader_location="dd_uboot_boot"
-dd_uboot_bs="512"
-dd_uboot_seek="2"
-unset spl_name
-boot_name="u-boot.imx"
-
-#Bootloader: u-boot features:
-
-#CONFIG_CMD_BOOTZ
-#bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
-
-#CONFIG_SUPPORT_RAW_INITRD
-#allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
-
-#CONFIG_CMD_FS_GENERIC
-#allows using "load" over "fatload"/"ext2load"
-conf_uboot_CONFIG_CMD_FS_GENERIC=1
-
-#uenvcmd avaiable?
-conf_uboot_use_uenvcmd=1
-#conf_uboot_no_uenvcmd="loaduimage"
-
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
-#Kernel:
-#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
-kernel_subarch="wand"
-kernel_repo="STABLE"
-
-usbnet_mem=
-
-#Kernel: Bootloader Settings:
-conf_zreladdr="0x10008000"
-conf_loadaddr="0x12000000"
-conf_fdtaddr="0x11000000"
-#initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB)
-conf_initrdaddr="0x12A00000"
-#conf_fdtfile="imx6q-wandboard.dtb"
-#need_dtbs=1
-need_wandboard_firmware=1
-
-SYSTEM="video"
-
-SERIAL="ttymxc0"
-SERIAL_CONSOLE="${SERIAL},115200n8"
-
-#SERIAL_MODE=1
-
-VIDEO_CONSOLE="console=tty0"
-HAS_IMX_BLOB=1
-conf_imx_video="video=mxcfb0:dev=hdmi,1280x720@60,if=RGB565"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index b4edc4b..8252431 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1629,8 +1629,10 @@ usage () {
 			        Freescale:
 			                imx51-babbage
 			                imx53-qsb
+			                imx6dl-wandboard
 			                imx6q-sabrelite
 			                imx6q-sabresd
+			                imx6q-wandboard
 			        TI:
 			                am335x-bone-serial
 			                am335x-bone-video
@@ -1642,7 +1644,6 @@ usage () {
 			                omap4-panda-es
 			        Wandboard:
 			                wandboard-solo
-			                wandboard-dl
 
 			Optional:
 			--distro <distro>