diff --git a/config/boards/aw-som-a20.wip b/config/boards/aw-som-a20.wip
index 8bffeef906..cd655c5ce0 100644
--- a/config/boards/aw-som-a20.wip
+++ b/config/boards/aw-som-a20.wip
@@ -1,7 +1,8 @@
 # A20 dual core SoM
 BOARD_NAME="AW-SoM"
-KERNEL_TARGET=""
 LINUXFAMILY=sun7i
 BOOTCONFIG=Awsom_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET=""
diff --git a/config/boards/bananapi.conf b/config/boards/bananapi.conf
index c8099519fc..4a9a39ee1e 100644
--- a/config/boards/bananapi.conf
+++ b/config/boards/bananapi.conf
@@ -4,11 +4,12 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="Bananapi_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp #ap6211"
 MODULES_NEXT="brcmfmac bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
-#
-CLI_BETA_TARGET="xenial:next"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
diff --git a/config/boards/bananapim2plus.conf b/config/boards/bananapim2plus.conf
index ec3c55b9a6..c6978a07ef 100644
--- a/config/boards/bananapim2plus.conf
+++ b/config/boards/bananapim2plus.conf
@@ -10,8 +10,9 @@ CPUMAX="1200000"
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
diff --git a/config/boards/bananapim2ultra.wip b/config/boards/bananapim2ultra.wip
index 2dbb0586e9..fc7e21a31a 100644
--- a/config/boards/bananapim2ultra.wip
+++ b/config/boards/bananapim2ultra.wip
@@ -4,10 +4,11 @@ LINUXFAMILY="sun8i-r40"
 BOOTCONFIG="Bananapi_M2_Ultra_defconfig"
 MODULES=""
 MODULES_NEXT=""
+OVERLAY_PREFIX=""
+#
+KERNEL_TARGET="dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET="dev"
-OVERLAY_PREFIX=""
 #
 BOARDRATING=""
 HARDWARE="https://linux-sunxi.org/Banana_Pi_M2_Ultra"
diff --git a/config/boards/bananapim3.wip b/config/boards/bananapim3.wip
index 3a2efe1f88..9993da30fe 100644
--- a/config/boards/bananapim3.wip
+++ b/config/boards/bananapim3.wip
@@ -4,10 +4,11 @@ LINUXFAMILY="sun8i"
 BOOTCONFIG="Sinovoip_BPI_M3_defconfig"
 MODULES=""
 MODULES_NEXT=""
+OVERLAY_PREFIX="sun8i-a83t"
+#
+KERNEL_TARGET="dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET="dev"
-OVERLAY_PREFIX="sun8i-a83t"
 #
 BOARDRATING=""
 HARDWARE="https://linux-sunxi.org/Banana_Pi_M3"
diff --git a/config/boards/bananapipro.conf b/config/boards/bananapipro.conf
index 1c77f80b50..4e366627fb 100644
--- a/config/boards/bananapipro.conf
+++ b/config/boards/bananapipro.conf
@@ -4,9 +4,10 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="Bananapro_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp ap6211"
 MODULES_NEXT="brcmfmac bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
diff --git a/config/boards/beelinkx2.conf b/config/boards/beelinkx2.conf
index 9e91bc2856..2ce0e2b5a4 100644
--- a/config/boards/beelinkx2.conf
+++ b/config/boards/beelinkx2.conf
@@ -11,7 +11,8 @@ CPUMAX="1200000"
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
 DESKTOP_TARGET="xenial:default"
-DESKTOP_BETA_TARGET="xenial:default"
+
+DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
 #
diff --git a/config/boards/clearfogbase.conf b/config/boards/clearfogbase.conf
index 58042688f9..3835e42efb 100644
--- a/config/boards/clearfogbase.conf
+++ b/config/boards/clearfogbase.conf
@@ -4,12 +4,12 @@ LINUXFAMILY="mvebu"
 BOOTCONFIG="armada_38x_clearfog_config"
 MODULES="mv_cesa"
 MODULES_NEXT="mv_cesa"
-#
 BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="default,next"
 CLI_TARGET="jessie,xenial:default,next"
-CLI_BETA_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
 #
 RECOMMENDED="Debian_jessie_default:90,Debian_jessie_next:75"
 #
diff --git a/config/boards/clearfogpro.conf b/config/boards/clearfogpro.conf
index 850148a0b4..11e5762e1f 100644
--- a/config/boards/clearfogpro.conf
+++ b/config/boards/clearfogpro.conf
@@ -4,12 +4,12 @@ LINUXFAMILY="mvebu"
 BOOTCONFIG="armada_38x_clearfog_config"
 MODULES="mv_cesa"
 MODULES_NEXT="#mv88e6xxx_drv mv_cesa"
-#
 BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="default,next"
 CLI_TARGET="jessie,xenial:default,next"
-CLI_BETA_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
 #
 RECOMMENDED="Debian_jessie_default:90,Debian_jessie_next:75"
 #
diff --git a/config/boards/cubieboard.eos b/config/boards/cubieboard.eos
index 67d832622c..23c6644bad 100644
--- a/config/boards/cubieboard.eos
+++ b/config/boards/cubieboard.eos
@@ -6,9 +6,9 @@ BOOTCONFIG="Cubieboard_config"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sunxi"
 MODULES_NEXT="bonding"
 #
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
diff --git a/config/boards/cubieboard2.conf b/config/boards/cubieboard2.conf
index ec50b5c44f..bbd45a5abe 100644
--- a/config/boards/cubieboard2.conf
+++ b/config/boards/cubieboard2.conf
@@ -4,10 +4,12 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="Cubieboard2_config"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
-DESKTOP_BETA_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
+
+DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
diff --git a/config/boards/cubieboard4.wip b/config/boards/cubieboard4.wip
index fa6b3c66f2..4026f81c78 100644
--- a/config/boards/cubieboard4.wip
+++ b/config/boards/cubieboard4.wip
@@ -5,7 +5,8 @@ LINUXFAMILY=sun9i
 BOOTCONFIG=Cubieboard4_defconfig
 MODULES=""
 MODULES_NEXT=""
+BUILD_DESKTOP="no"
+#
+KERNEL_TARGET="dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET="dev"
-BUILD_DESKTOP="no"
\ No newline at end of file
diff --git a/config/boards/cubietruck.conf b/config/boards/cubietruck.conf
index cffbbad124..480b9d8d00 100644
--- a/config/boards/cubietruck.conf
+++ b/config/boards/cubietruck.conf
@@ -4,11 +4,12 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="Cubietruck_config"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i ap6210"
 MODULES_NEXT="brcmfmac rfcomm hidp bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
-#
-CLI_BETA_TARGET="xenial:next"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
diff --git a/config/boards/cubox-i.conf b/config/boards/cubox-i.conf
index d973f35994..38f9a17333 100644
--- a/config/boards/cubox-i.conf
+++ b/config/boards/cubox-i.conf
@@ -8,9 +8,10 @@ MODULES_NEXT="bonding"
 #
 KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:default,next"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET="xenial:default,next"
-DESKTOP_BETA_TARGET="xenial:next"
+
+CLI_BETA_TARGET=""
+DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_next:90,Ubuntu_xenial_next_desktop:90"
 #
diff --git a/config/boards/espressobin.wip b/config/boards/espressobin.wip
index c517a64d70..2cab4d765c 100644
--- a/config/boards/espressobin.wip
+++ b/config/boards/espressobin.wip
@@ -4,9 +4,11 @@ LINUXFAMILY="mvebu64"
 BOOTCONFIG="mvebu_espressobin-88f3720_defconfig"
 MODULES="mv_cesa"
 MODULES_NEXT="mv_cesa"
-CLI_TARGET="jessie,xenial:default,next"
-KERNEL_TARGET="default,next"
 BUILD_DESKTOP="no"
+#
+KERNEL_TARGET="default,next"
+CLI_TARGET="jessie,xenial:default,next"
+#
 BOARDRATING=""
 CHIP="http://docs.armbian.com/Hardware_Other/#marvel-armada-espressobin"
 REVIEW="http://forum.armbian.com/index.php/topic/TBD/"
diff --git a/config/boards/guitar.eos b/config/boards/guitar.eos
index d32e4420a0..72db9e7e98 100644
--- a/config/boards/guitar.eos
+++ b/config/boards/guitar.eos
@@ -4,9 +4,10 @@ LINUXFAMILY="s500"
 BOOTCONFIG="s500_defconfig"
 MODULES="ethernet wlan_8723bs"
 MODULES_NEXT=""
+#
+KERNEL_TARGET="default"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET="default"
 #
 RECOMMENDED="Debian_jessie_default:80,Ubuntu_xenial_default_desktop:80"
 #
diff --git a/config/boards/hummingbird.wip b/config/boards/hummingbird.wip
index 59acbe3c72..13699fc22f 100644
--- a/config/boards/hummingbird.wip
+++ b/config/boards/hummingbird.wip
@@ -4,10 +4,11 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="Merrii_Hummingbird_A20_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i ap6210"
 MODULES_NEXT="brcmfmac rfcomm hidp bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET="default,next,dev"
-#
+
 CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
diff --git a/config/boards/lamobo-r1.eos b/config/boards/lamobo-r1.eos
index 0bbc233647..7019f9945d 100644
--- a/config/boards/lamobo-r1.eos
+++ b/config/boards/lamobo-r1.eos
@@ -3,11 +3,11 @@ BOARD_NAME="Lamobo R1"
 LINUXFAMILY="sun7i"
 BOOTCONFIG="Lamobo_R1_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q"
-CLI_TARGET="jessie,xenial:next,default"
-KERNEL_TARGET="default,next,dev"
 #
+KERNEL_TARGET="default,next,dev"
+CLI_TARGET="jessie,xenial:next,default"
+
 CLI_BETA_TARGET="xenial:next"
-DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Debian_jessie_next:100"
 #
diff --git a/config/boards/lime-a10.eos b/config/boards/lime-a10.eos
index 21ed464078..07a93370a9 100644
--- a/config/boards/lime-a10.eos
+++ b/config/boards/lime-a10.eos
@@ -4,9 +4,10 @@ LINUXFAMILY="sun4i"
 BOOTCONFIG="A10-OLinuXino-Lime_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
diff --git a/config/boards/lime-a33.conf b/config/boards/lime-a33.conf
index 4e5df1bcb8..8d0c140a88 100644
--- a/config/boards/lime-a33.conf
+++ b/config/boards/lime-a33.conf
@@ -4,10 +4,11 @@ LINUXFAMILY="sun8i"
 BOOTCONFIG="A33-OLinuXino_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT=""
+OVERLAY_PREFIX="sun8i-a33"
 #
 KERNEL_TARGET="next"
 CLI_TARGET="jessie:next"
-OVERLAY_PREFIX="sun8i-a33"
+DESKTOP_TARGET=""
 #
 RECOMMENDED="Debian_jessie_next:75"
 #
diff --git a/config/boards/lime.conf b/config/boards/lime.conf
index fc4e9ee0dc..894388dfc0 100644
--- a/config/boards/lime.conf
+++ b/config/boards/lime.conf
@@ -6,9 +6,9 @@ BOOTCONFIG="A20-OLinuXino-Lime_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
 #
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
diff --git a/config/boards/lime2-emmc.conf b/config/boards/lime2-emmc.conf
index d8bc001a2f..d50b254d15 100644
--- a/config/boards/lime2-emmc.conf
+++ b/config/boards/lime2-emmc.conf
@@ -4,10 +4,11 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="A20-OLinuXino-Lime2-eMMC_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET="default,next,dev"
-#
+
 CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
diff --git a/config/boards/lime2.conf b/config/boards/lime2.conf
index 7544a0ff75..7e2f70d17d 100644
--- a/config/boards/lime2.conf
+++ b/config/boards/lime2.conf
@@ -4,11 +4,12 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="A20-OLinuXino-Lime2_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
-#
-CLI_BETA_TARGET="xenial:next"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
diff --git a/config/boards/micro.conf b/config/boards/micro.conf
index d99a94d152..b74bff8a54 100644
--- a/config/boards/micro.conf
+++ b/config/boards/micro.conf
@@ -4,9 +4,10 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="A20-OLinuXino_MICRO_config"
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
diff --git a/config/boards/miqi.conf b/config/boards/miqi.conf
index 6fd66423dc..b43d0ca363 100644
--- a/config/boards/miqi.conf
+++ b/config/boards/miqi.conf
@@ -8,8 +8,9 @@ MODULES_NEXT=""
 #
 KERNEL_TARGET="default,next,dev"
 CLI_TARGET="xenial:default,next"
-CLI_BETA_TARGET=""
 DESKTOP_TARGET="xenial:default,next"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET="xenial:dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Ubuntu_xenial_next_desktop:90"
diff --git a/config/boards/nanopiair.conf b/config/boards/nanopiair.conf
index 9403aa3981..63a02db682 100644
--- a/config/boards/nanopiair.conf
+++ b/config/boards/nanopiair.conf
@@ -12,7 +12,8 @@ BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
+
+CLI_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev_nightly:33"
 #
diff --git a/config/boards/nanopim1.conf b/config/boards/nanopim1.conf
index 4d3258b3af..cf1f14c8fc 100644
--- a/config/boards/nanopim1.conf
+++ b/config/boards/nanopim1.conf
@@ -8,9 +8,9 @@ MODULES_NEXT=""
 CPUMIN="240000"
 CPUMAX="1200000"
 #
+KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
 DESKTOP_TARGET="xenial:default"
-KERNEL_TARGET="default,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
 #
diff --git a/config/boards/nanopim1plus2.wip b/config/boards/nanopim1plus2.wip
index 039b90f5aa..cbdc2c3f3b 100644
--- a/config/boards/nanopim1plus2.wip
+++ b/config/boards/nanopim1plus2.wip
@@ -7,10 +7,10 @@ MODULES_NEXT=""
 CPUMIN="480000"
 CPUMAX="1296000"
 #
+KERNEL_TARGET="dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET="dev"
-#
+
 CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
diff --git a/config/boards/nanopineo.conf b/config/boards/nanopineo.conf
index 879b0a3416..91c27b121f 100644
--- a/config/boards/nanopineo.conf
+++ b/config/boards/nanopineo.conf
@@ -12,7 +12,8 @@ BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
+
+CLI_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev_nightly:33";
 #
diff --git a/config/boards/nanopineo2.wip b/config/boards/nanopineo2.wip
index 095e0a65de..e7871e4ea9 100644
--- a/config/boards/nanopineo2.wip
+++ b/config/boards/nanopineo2.wip
@@ -12,6 +12,7 @@ BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="dev"
 CLI_TARGET=""
+
 CLI_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_dev_nightly:33"
diff --git a/config/boards/odroidc1.conf b/config/boards/odroidc1.conf
index 849114d46d..222c6d29ee 100644
--- a/config/boards/odroidc1.conf
+++ b/config/boards/odroidc1.conf
@@ -8,9 +8,10 @@ MODULES_NEXT=""
 #
 KERNEL_TARGET="default"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET=""
 DESKTOP_TARGET="xenial:default"
-DESKTOP_BETA_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
+DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_default:90"
 #
diff --git a/config/boards/odroidc2.conf b/config/boards/odroidc2.conf
index c2b8244033..c927564462 100644
--- a/config/boards/odroidc2.conf
+++ b/config/boards/odroidc2.conf
@@ -8,9 +8,10 @@ MODULES_NEXT=""
 #
 KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:next"
 DESKTOP_TARGET="xenial:default"
-DESKTOP_BETA_TARGET="xenial:next"
+
+CLI_BETA_TARGET=""
+DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_default:90"
 #
diff --git a/config/boards/odroidxu4.conf b/config/boards/odroidxu4.conf
index 948fd4b87f..1b02c2508d 100644
--- a/config/boards/odroidxu4.conf
+++ b/config/boards/odroidxu4.conf
@@ -5,12 +5,13 @@ BOOTCONFIG="odroid_config"
 #
 MODULES="bonding"
 MODULES_NEXT=""
+#
+KERNEL_TARGET="default,next"
 CLI_TARGET="jessie,xenial:default,next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next"
-#
+
 CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET="xenial:next"
+DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Ubuntu_xenial_next_desktop:90"
 #
diff --git a/config/boards/olinux-som-a13.conf b/config/boards/olinux-som-a13.conf
index 0e39e03e15..c5d6b22c82 100644
--- a/config/boards/olinux-som-a13.conf
+++ b/config/boards/olinux-som-a13.conf
@@ -4,6 +4,8 @@ LINUXFAMILY="sun5i"
 BOOTCONFIG="A13-OLinuXino_defconfig"
 MODULES="gpio_sunxi spi_sunxi"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET="default,next,dev"
+#
diff --git a/config/boards/orangepi.eos b/config/boards/orangepi.eos
index 076a28c53e..4e5ed11f36 100644
--- a/config/boards/orangepi.eos
+++ b/config/boards/orangepi.eos
@@ -4,9 +4,10 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="Orangepi_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET="default,next,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
diff --git a/config/boards/orangepilite.conf b/config/boards/orangepilite.conf
index 26445fb9a6..23924ebbeb 100644
--- a/config/boards/orangepilite.conf
+++ b/config/boards/orangepilite.conf
@@ -10,8 +10,9 @@ CPUMAX="1200000"
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
diff --git a/config/boards/orangepimini.eos b/config/boards/orangepimini.eos
index f5e98052d8..82d2bbabed 100644
--- a/config/boards/orangepimini.eos
+++ b/config/boards/orangepimini.eos
@@ -4,9 +4,10 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="Orangepi_mini_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET=""
 CLI_TARGET=""
 DESKTOP_TARGET=""
-KERNEL_TARGET=""
 #
 BOARDRATING=""
 CHIP="http://docs.armbian.com/Hardware_Allwinner-A20/"
diff --git a/config/boards/orangepione.conf b/config/boards/orangepione.conf
index bbf4f1d6fe..bfdc335da2 100644
--- a/config/boards/orangepione.conf
+++ b/config/boards/orangepione.conf
@@ -10,8 +10,9 @@ CPUMAX="1200000"
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
diff --git a/config/boards/orangepipc.conf b/config/boards/orangepipc.conf
index 696050e11f..554963deb9 100644
--- a/config/boards/orangepipc.conf
+++ b/config/boards/orangepipc.conf
@@ -10,8 +10,9 @@ CPUMAX="1296000"
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
diff --git a/config/boards/orangepipc2.wip b/config/boards/orangepipc2.wip
index b5ef126ffc..b3a3682159 100644
--- a/config/boards/orangepipc2.wip
+++ b/config/boards/orangepipc2.wip
@@ -9,8 +9,9 @@ CPUMAX="1296000"
 #
 KERNEL_TARGET="dev"
 CLI_TARGET=""
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET=""
+
+CLI_BETA_TARGET="xenial:dev"
 DESKTOP_BETA_TARGET="xenial:dev"
 #
 RECOMMENDED="Ubuntu_xenial_dev_nightly:33,Ubuntu_xenial_dev_desktop_nightly:33"
diff --git a/config/boards/orangepipcplus.conf b/config/boards/orangepipcplus.conf
index 78982fab48..ed5c0ec458 100644
--- a/config/boards/orangepipcplus.conf
+++ b/config/boards/orangepipcplus.conf
@@ -9,8 +9,9 @@ CPUMAX="1296000"
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
diff --git a/config/boards/orangepiplus.conf b/config/boards/orangepiplus.conf
index 7698e25deb..fefdf17ab3 100644
--- a/config/boards/orangepiplus.conf
+++ b/config/boards/orangepiplus.conf
@@ -8,9 +8,9 @@ MODULES_NEXT="8189es"
 CPUMIN="480000"
 CPUMAX="1296000"
 #
+KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
 DESKTOP_TARGET="xenial:default"
-KERNEL_TARGET="default,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
 #
diff --git a/config/boards/orangepiplus2e.conf b/config/boards/orangepiplus2e.conf
index 47e0a89ace..570b3cdce1 100644
--- a/config/boards/orangepiplus2e.conf
+++ b/config/boards/orangepiplus2e.conf
@@ -10,8 +10,9 @@ CPUMAX="1296000"
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET="xenial:default"
+
+CLI_BETA_TARGET="xenial:dev"
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
diff --git a/config/boards/orangepiprime.wip b/config/boards/orangepiprime.wip
index 94a4647f19..a7d42219d1 100644
--- a/config/boards/orangepiprime.wip
+++ b/config/boards/orangepiprime.wip
@@ -9,8 +9,9 @@ CPUMAX="1296000"
 #
 KERNEL_TARGET="dev"
 CLI_TARGET=""
-CLI_BETA_TARGET=""
 DESKTOP_TARGET=""
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_dev_nightly:33,Ubuntu_xenial_dev_desktop_nightly:33"
diff --git a/config/boards/orangepiwin.wip b/config/boards/orangepiwin.wip
index 1363bd71d6..906695890d 100644
--- a/config/boards/orangepiwin.wip
+++ b/config/boards/orangepiwin.wip
@@ -10,8 +10,9 @@ CPUMAX="1296000"
 #
 KERNEL_TARGET="dev"
 CLI_TARGET=""
-CLI_BETA_TARGET=""
 DESKTOP_TARGET=""
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_dev_nightly:33,Ubuntu_xenial_dev_desktop_nightly:33"
diff --git a/config/boards/orangepizero.conf b/config/boards/orangepizero.conf
index 34d343594d..d771d44db9 100644
--- a/config/boards/orangepizero.conf
+++ b/config/boards/orangepizero.conf
@@ -8,11 +8,12 @@ MODULES_NEXT="g_serial"
 MODULES_BLACKLIST="dhd"
 CPUMIN=240000
 CPUMAX=1200000
+BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default,dev"
+
 CLI_BETA_TARGET="xenial:dev"
-BUILD_DESKTOP="no"
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev_nightly:33"
 #
diff --git a/config/boards/orangepizeroplus2-h3.conf b/config/boards/orangepizeroplus2-h3.conf
index a738652e0f..00abb98f00 100644
--- a/config/boards/orangepizeroplus2-h3.conf
+++ b/config/boards/orangepizeroplus2-h3.conf
@@ -11,8 +11,9 @@ CPUMAX=1200000
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev_nightly:33";
diff --git a/config/boards/orangepizeroplus2-h5.wip b/config/boards/orangepizeroplus2-h5.wip
index 8bc0a39516..aeac119762 100644
--- a/config/boards/orangepizeroplus2-h5.wip
+++ b/config/boards/orangepizeroplus2-h5.wip
@@ -8,11 +8,12 @@ MODULES_NEXT="brcmfmac g_serial"
 MODULES_BLACKLIST=""
 CPUMIN=240000
 CPUMAX=1200000
+BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="dev"
 CLI_TARGET=""
+
 CLI_BETA_TARGET=""
-BUILD_DESKTOP="no"
 #
 RECOMMENDED="Ubuntu_xenial_dev:33,Ubuntu_xenial_dev_nightly:33"
 #
diff --git a/config/boards/pcduino2.conf b/config/boards/pcduino2.conf
index de261de54c..055c6a9e28 100644
--- a/config/boards/pcduino2.conf
+++ b/config/boards/pcduino2.conf
@@ -4,9 +4,10 @@ LINUXFAMILY="sun4i"
 BOOTCONFIG="Linksprite_pcDuino_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sunxi"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:90"
 #
diff --git a/config/boards/pcduino3.conf b/config/boards/pcduino3.conf
index 7c4cb6b937..b7f75cf3e9 100644
--- a/config/boards/pcduino3.conf
+++ b/config/boards/pcduino3.conf
@@ -4,9 +4,10 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="Linksprite_pcDuino3_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:90"
 #
diff --git a/config/boards/pcduino3nano.conf b/config/boards/pcduino3nano.conf
index 16eba3df6b..81aa344bd6 100644
--- a/config/boards/pcduino3nano.conf
+++ b/config/boards/pcduino3nano.conf
@@ -4,9 +4,10 @@ LINUXFAMILY="sun7i"
 BOOTCONFIG="Linksprite_pcDuino3_Nano_defconfig"
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i"
 MODULES_NEXT="bonding"
+#
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie:next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next,dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:90"
 #
diff --git a/config/boards/pine64.conf b/config/boards/pine64.conf
index 7c6392be4f..562b547fa0 100644
--- a/config/boards/pine64.conf
+++ b/config/boards/pine64.conf
@@ -8,9 +8,10 @@ MODULES_NEXT=""
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET="xenial:default"
-DESKTOP_BETA_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
+DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Ubuntu_xenial_dev_nightly:33"
 #
diff --git a/config/boards/pine64so.conf b/config/boards/pine64so.conf
index 2b1d562a8c..c8dfee48d7 100644
--- a/config/boards/pine64so.conf
+++ b/config/boards/pine64so.conf
@@ -8,8 +8,9 @@ MODULES_NEXT=""
 #
 KERNEL_TARGET="default,dev"
 CLI_TARGET="xenial:default"
-CLI_BETA_TARGET="xenial:dev"
 DESKTOP_TARGET=""
+
+CLI_BETA_TARGET="xenial:dev"
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev_nightly:33"
diff --git a/config/boards/pinebook-a64.conf b/config/boards/pinebook-a64.conf
index 129a10f6fb..a0fcfb291f 100644
--- a/config/boards/pinebook-a64.conf
+++ b/config/boards/pinebook-a64.conf
@@ -8,8 +8,9 @@ MODULES_NEXT=""
 #
 KERNEL_TARGET="default"
 CLI_TARGET=""
-CLI_BETA_TARGET=""
 DESKTOP_TARGET="xenial:default"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET="xenial:default"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90"
diff --git a/config/boards/roseapple.eos b/config/boards/roseapple.eos
index 436cb75e45..95342055a7 100644
--- a/config/boards/roseapple.eos
+++ b/config/boards/roseapple.eos
@@ -4,6 +4,7 @@ LINUXFAMILY="s500"
 BOOTCONFIG="actduino_bubble_gum_v10_defconfig"
 MODULES="ethernet"
 MODULES_NEXT=""
+#
 KERNEL_TARGET="default"
 CLI_TARGET=""
 DESKTOP_TARGET=""
diff --git a/config/boards/tinkerboard.conf b/config/boards/tinkerboard.conf
index 76b95d8403..a75275dd6e 100644
--- a/config/boards/tinkerboard.conf
+++ b/config/boards/tinkerboard.conf
@@ -8,8 +8,9 @@ MODULES_NEXT=""
 #
 KERNEL_TARGET="default,next,dev"
 CLI_TARGET="xenial:default,next"
-CLI_BETA_TARGET=""
 DESKTOP_TARGET="xenial:default,next"
+
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET="xenial:dev"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Ubuntu_xenial_next_desktop:90"
diff --git a/config/boards/udoo-neo.conf b/config/boards/udoo-neo.conf
index 05f259146d..16f9afcc63 100644
--- a/config/boards/udoo-neo.conf
+++ b/config/boards/udoo-neo.conf
@@ -4,9 +4,10 @@ LINUXFAMILY="udoo-neo"
 BOOTCONFIG="udoo_neo_config"
 MODULES="bonding"
 MODULES_NEXT=""
+#
+KERNEL_TARGET="default"
 CLI_TARGET="xenial:default"
 DESKTOP_TARGET=""
-KERNEL_TARGET="default"
 #
 RECOMMENDED="Debian_jessie_default:80"
 #
diff --git a/config/boards/udoo.conf b/config/boards/udoo.conf
index f91af54476..b695d6e472 100644
--- a/config/boards/udoo.conf
+++ b/config/boards/udoo.conf
@@ -4,9 +4,10 @@ LINUXFAMILY="udoo"
 BOOTCONFIG="udoo_qdl_config"
 MODULES="bonding"
 MODULES_NEXT=""
+#
+KERNEL_TARGET="default,next"
 CLI_TARGET="jessie:default,next"
 DESKTOP_TARGET="xenial:default,next"
-KERNEL_TARGET="default,next"
 #
 RECOMMENDED="Ubuntu_xenial_next_desktop:90,Ubuntu_xenial_next:90"
 #