diff --git a/hwpack/omap3-beagle-dt.conf b/hwpack/omap3-beagle-dt.conf
new file mode 100644
index 0000000..842ecc3
--- /dev/null
+++ b/hwpack/omap3-beagle-dt.conf
@@ -0,0 +1,64 @@
+#!/bin/bash
+#        --dtb omap3-beagle-dt (BeagleBoard (Device Tree):experimental)
+
+#Bootloader:
+conf_board="omap3_beagle"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest"
+conf_bl_listfile="bootloader-ng"
+
+#Bootloader Partition:
+conf_boot_fstype="fat"
+conf_boot_startmb="1"
+conf_boot_endmb="96"
+
+bootloader_location="fatfs_boot"
+spl_name="MLO"
+boot_name="u-boot.img"
+
+#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-armv7
+kernel_subarch="armv7"
+kernel_repo="TESTING"
+
+usbnet_mem="8192"
+
+#Kernel: Bootloader Settings:
+conf_zreladdr="0x80008000"
+conf_loadaddr="0x80300000"
+conf_fdtaddr="0x815f0000"
+conf_initrdaddr="0x81600000"
+conf_fdtfile="omap3-beagle.dtb"
+need_dtbs=1
+#need_ti_connectivity_firmware=1
+
+#SYSTEM="video"
+#SYSTEM="serial"
+
+SYSTEM="beagleboard"
+
+SERIAL="ttyO2"
+SERIAL_CONSOLE="${SERIAL},115200n8"
+
+USE_KMS=1
+SERIAL_MODE=1
diff --git a/hwpack/omap3-beagle-xm-dt.conf b/hwpack/omap3-beagle-xm-dt.conf
index 2808835..288c228 100644
--- a/hwpack/omap3-beagle-xm-dt.conf
+++ b/hwpack/omap3-beagle-xm-dt.conf
@@ -2,7 +2,7 @@
 #        --dtb omap3-beagle-xm-dt (BeagleBoard xM (Device Tree):experimental)
 
 #Bootloader:
-conf_board="BEAGLEBOARD"
+conf_board="omap3_beagle"
 conf_bl_http="http://rcn-ee.net/deb/tools/latest"
 conf_bl_listfile="bootloader-ng"
 
@@ -39,7 +39,7 @@ conf_uboot_use_uenvcmd=1
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
-kernel_repo="STABLE"
+kernel_repo="TESTING"
 
 usbnet_mem="16384"
 
@@ -55,18 +55,10 @@ need_ti_connectivity_firmware=1
 #SYSTEM="video"
 #SYSTEM="serial"
 
-SYSTEM="beagle_xm"
+SYSTEM="beagleboard"
 
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-SERIAL_MODE=1
 USE_KMS=1
-
-#Has Old DSS2 omapfb framebuffer driver:
-#VIDEO_CONSOLE="console=tty0"
-#HAS_OMAPFB_DSS2=1
-#VIDEO_DRV="omapfb.mode=dvi"
-#VIDEO_OMAP_RAM="12MB"
-#VIDEO_OMAPFB_MODE="dvi"
-#VIDEO_TIMING="1280x720MR-16@60"
+SERIAL_MODE=1
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 091dee8..2eb91b2 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -1,9 +1,8 @@
 #!/bin/bash
-#Reference: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.7
 #        --dtb omap3-beagle-xm (BeagleBoard xM:supported)
 
 #Bootloader:
-conf_board="BEAGLEBOARD"
+conf_board="omap3_beagle"
 conf_bl_http="http://rcn-ee.net/deb/tools/latest"
 conf_bl_listfile="bootloader-ng"
 
@@ -56,7 +55,7 @@ need_ti_connectivity_firmware=1
 #SYSTEM="video"
 #SYSTEM="serial"
 
-SYSTEM="beagle_xm"
+SYSTEM="beagleboard"
 
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/hwpack/omap3-beagle.conf b/hwpack/omap3-beagle.conf
new file mode 100644
index 0000000..fd63977
--- /dev/null
+++ b/hwpack/omap3-beagle.conf
@@ -0,0 +1,69 @@
+#!/bin/bash
+#        --dtb omap3-beagle (BeagleBoard:supported)
+
+#Bootloader:
+conf_board="omap3_beagle"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest"
+conf_bl_listfile="bootloader-ng"
+
+#Bootloader Partition:
+conf_boot_fstype="fat"
+conf_boot_startmb="1"
+conf_boot_endmb="96"
+
+bootloader_location="fatfs_boot"
+spl_name="MLO"
+boot_name="u-boot.img"
+
+#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-omap
+kernel_subarch="omap"
+kernel_repo="STABLE"
+
+usbnet_mem="8192"
+
+#Kernel: Bootloader Settings:
+conf_zreladdr="0x80008000"
+conf_loadaddr="0x80300000"
+conf_fdtaddr="0x815f0000"
+conf_initrdaddr="0x81600000"
+#conf_fdtfile="omap3-beagle.dtb"
+#need_dtbs=1
+#need_ti_connectivity_firmware=1
+
+#SYSTEM="video"
+#SYSTEM="serial"
+
+SYSTEM="beagleboard"
+
+SERIAL="ttyO2"
+SERIAL_CONSOLE="${SERIAL},115200n8"
+
+#Has Old DSS2 omapfb framebuffer driver:
+VIDEO_CONSOLE="console=tty0"
+HAS_OMAPFB_DSS2=1
+VIDEO_DRV="omapfb.mode=dvi"
+VIDEO_OMAP_RAM="12MB"
+VIDEO_OMAPFB_MODE="dvi"
+VIDEO_TIMING="1280x720MR-16@60"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 02b2419..2158ae1 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -417,7 +417,7 @@ boot_uenv_txt_template () {
 	__EOF__
 
 	case "${SYSTEM}" in
-	beagle_bx|beagle_cx|beagle_xm)
+	beagleboard)
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			optargs=VIDEO_CONSOLE
 			expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} camera=\${camera} \${musb}
@@ -1611,16 +1611,14 @@ check_uboot_type () {
 
 	case "${UBOOT_TYPE}" in
 	beagle_bx)
-		. "${DIR}"/hwpack/omap3-beagle-xm.conf
+		echo "Note: [--dtb omap3-beagle] now replaces [--uboot beagle_bx]"
+		. "${DIR}"/hwpack/omap3-beagle.conf
 		convert_uboot_to_dtb_board
-		SYSTEM="beagle_bx"
-		usbnet_mem="8192"
 		;;
 	beagle_cx)
-		. "${DIR}"/hwpack/omap3-beagle-xm.conf
+		echo "Note: [--dtb omap3-beagle] now replaces [--uboot beagle_cx]"
+		. "${DIR}"/hwpack/omap3-beagle.conf
 		convert_uboot_to_dtb_board
-		SYSTEM="beagle_cx"
-		usbnet_mem="8192"
 		;;
 	beagle_xm)
 		echo "Note: [--dtb omap3-beagle-xm] now replaces [--uboot beagle_xm]"