diff --git a/config/boards/bananapim2.conf b/config/boards/bananapim2.conf
index d418fff73c..38650ccea4 100644
--- a/config/boards/bananapim2.conf
+++ b/config/boards/bananapim2.conf
@@ -2,12 +2,15 @@
 BOARD_NAME="Banana Pi M2"
 LINUXFAMILY="sun6i"
 BOOTCONFIG="Sinovoip_BPI_M2_defconfig"
+#
 MODULES_NEXT="brcmfmac bonding"
+#
+KERNEL_TARGET="next,dev"
 CLI_TARGET="jessie:next"
 DESKTOP_TARGET="xenial:next"
-KERNEL_TARGET="next,dev"
+#
+RECOMMENDED="Ubuntu_xenial_next:90,Ubuntu_xenial_next_desktop:90"
 #
 BOARDRATING=""
 HARDWARE="https://linux-sunxi.org/Banana_Pi_M2"
 FORUMS="http://forum.armbian.com/index.php/forum/11-other-boards/"
-#
diff --git a/config/boards/nanopiair.conf b/config/boards/nanopiair.conf
index 5d6201e84c..b0d3b446ba 100644
--- a/config/boards/nanopiair.conf
+++ b/config/boards/nanopiair.conf
@@ -1,17 +1,18 @@
-# H3 quad core 512MB SoC Headless WiFi/BT
+# H3 quad core 512MB SoC Headless WiFi/BT eMMC
 BOARD_NAME="NanoPi Air"
 LINUXFAMILY="sun8i"
 BOOTCONFIG="nanopi_air_defconfig"
+#
 MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial"
 MODULES_NEXT="brcmfmac g_serial"
 CPUMIN="240000"
 CPUMAX="912000"
-CLI_TARGET="jessie,xenial:default"
-KERNEL_TARGET="default,dev"
+#
 BUILD_DESKTOP="no"
 #
+KERNEL_TARGET="default,dev"
+CLI_TARGET="jessie,xenial:default"
 CLI_BETA_TARGET="xenial:dev"
-DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev:33"
 #
diff --git a/config/boards/nanopim1.conf b/config/boards/nanopim1.conf
index 2c8aaf4135..4d3258b3af 100644
--- a/config/boards/nanopim1.conf
+++ b/config/boards/nanopim1.conf
@@ -2,18 +2,19 @@
 BOARD_NAME="NanoPi M1"
 LINUXFAMILY="sun8i"
 BOOTCONFIG="nanopi_m1_defconfig"
+#
 MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir"
 MODULES_NEXT=""
 CPUMIN="240000"
 CPUMAX="1200000"
+#
 CLI_TARGET="jessie,xenial:default"
 DESKTOP_TARGET="xenial:default"
 KERNEL_TARGET="default,dev"
 #
-BOARDRATING=""
-#
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
 #
+BOARDRATING=""
 CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/"
 HARDWARE="http://wiki.friendlyarm.com/wiki/index.php/NanoPi_M1"
 FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3/"
\ No newline at end of file
diff --git a/config/boards/nanopim1plus.conf b/config/boards/nanopim1plus.conf
index 28f140f8a1..a834c411e2 100644
--- a/config/boards/nanopim1plus.conf
+++ b/config/boards/nanopim1plus.conf
@@ -2,13 +2,15 @@
 BOARD_NAME="NanoPi M1 Plus"
 LINUXFAMILY="sun8i"
 BOOTCONFIG="nanopi_m1plus_defconfig"
+#
 MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd"
 MODULES_NEXT="brcmfmac"
 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/nanopineo2.conf b/config/boards/nanopineo2.conf
index e09aa9d40e..82fff21c45 100644
--- a/config/boards/nanopineo2.conf
+++ b/config/boards/nanopineo2.conf
@@ -2,18 +2,17 @@
 BOARD_NAME="NanoPi Neo 2"
 LINUXFAMILY="sun50iw2"
 BOOTCONFIG="nanopi_neo2_defconfig"
+#
 MODULES=""
 MODULES_NEXT=""
 CPUMIN="480000"
 CPUMAX="912000"
+#
 BUILD_DESKTOP="no"
 #
-CLI_TARGET=""
-DESKTOP_TARGET=""
 KERNEL_TARGET="dev"
-#
+CLI_TARGET=""
 CLI_BETA_TARGET="xenial:dev"
-DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_dev_nightly:33"
 #
diff --git a/config/boards/orangepipcplus.conf b/config/boards/orangepipcplus.conf
index 64c93d6562..78982fab48 100644
--- a/config/boards/orangepipcplus.conf
+++ b/config/boards/orangepipcplus.conf
@@ -7,13 +7,14 @@ MODULES_NEXT="8189fs"
 CPUMIN="480000"
 CPUMAX="1296000"
 #
-CLI_TARGET="jessie,xenial:default"
-DESKTOP_TARGET="xenial:default"
 KERNEL_TARGET="default,dev"
-#
+CLI_TARGET="jessie,xenial:default"
 CLI_BETA_TARGET="xenial:dev"
+DESKTOP_TARGET="xenial:default"
 DESKTOP_BETA_TARGET=""
 #
+RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
+#
 BOARDRATING=""
 CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/"
 HARDWARE="https://linux-sunxi.org/Orange_Pi_PC"
diff --git a/config/boards/orangepiplus2e.conf b/config/boards/orangepiplus2e.conf
index 214b8a6452..47e0a89ace 100644
--- a/config/boards/orangepiplus2e.conf
+++ b/config/boards/orangepiplus2e.conf
@@ -2,17 +2,20 @@
 BOARD_NAME="Orange Pi+ 2E"
 LINUXFAMILY="sun8i"
 BOOTCONFIG="orangepi_plus2e_defconfig"
+#
 MODULES="8189fs #w1-sunxi #w1-gpio #w1-therm #gc2035 #vfe_v4l2 #sunxi-cir"
 MODULES_NEXT="8189fs"
 CPUMIN="480000"
 CPUMAX="1296000"
-CLI_TARGET="jessie,xenial:default"
-DESKTOP_TARGET="xenial:default"
-KERNEL_TARGET="default,dev"
 #
+KERNEL_TARGET="default,dev"
+CLI_TARGET="jessie,xenial:default"
 CLI_BETA_TARGET="xenial:dev"
+DESKTOP_TARGET="xenial:default"
 DESKTOP_BETA_TARGET=""
 #
+RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
+#
 BOARDRATING=""
 CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/"
 HARDWARE="https://linux-sunxi.org/Orange_Pi_Plus_2E"
diff --git a/config/boards/orangepiprime.conf b/config/boards/orangepiprime.conf
index 2d4d7ab9dd..99d7e169e7 100644
--- a/config/boards/orangepiprime.conf
+++ b/config/boards/orangepiprime.conf
@@ -7,13 +7,14 @@ MODULES_NEXT=""
 CPUMIN="480000"
 CPUMAX="1296000"
 #
-CLI_TARGET=""
-DESKTOP_TARGET=""
 KERNEL_TARGET="dev"
-#
+CLI_TARGET=""
 CLI_BETA_TARGET="xenial:dev"
+DESKTOP_TARGET=""
 DESKTOP_BETA_TARGET="xenial:dev"
 #
+RECOMMENDED="Ubuntu_xenial_dev_nightly:33,Ubuntu_xenial_dev_desktop_nightly:33"
+#
 BOARDRATING=""
 CHIP="https://docs.armbian.com/Hardware_Allwinner-H5-A64/"
 HARDWARE="https://linux-sunxi.org/Orange_Pi_PC_2"
diff --git a/config/boards/orangepiwin.conf b/config/boards/orangepiwin.conf
index 28eff5a81a..c876be40fc 100644
--- a/config/boards/orangepiwin.conf
+++ b/config/boards/orangepiwin.conf
@@ -1,17 +1,17 @@
-# A64 1GB RAM
+# A64 quad core 1GB SoC GBE WiFi
 BOARD_NAME="Orange Pi Win"
 LINUXFAMILY="sun50iw2"
 BOOTCONFIG="orangepi_win_defconfig"
+#
 MODULES=""
 MODULES_NEXT=""
 CPUMIN="480000"
 CPUMAX="1296000"
 #
-CLI_TARGET=""
-DESKTOP_TARGET=""
 KERNEL_TARGET="dev"
-#
+CLI_TARGET=""
 CLI_BETA_TARGET="xenial:dev"
+DESKTOP_TARGET=""
 DESKTOP_BETA_TARGET="xenial:dev"
 #
 RECOMMENDED="Ubuntu_xenial_dev_nightly:33,Ubuntu_xenial_dev_desktop_nightly:33"
diff --git a/config/boards/orangepizeroplus2-h3.conf b/config/boards/orangepizeroplus2-h3.conf
index 7b6fafa9ac..30d6a9b4eb 100644
--- a/config/boards/orangepizeroplus2-h3.conf
+++ b/config/boards/orangepizeroplus2-h3.conf
@@ -2,19 +2,21 @@
 BOARD_NAME="Orange Pi Zero Plus 2"
 LINUXFAMILY="sun8i"
 BOOTCONFIG="nanopi_air_defconfig"
+#
 MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial"
 MODULES_NEXT="brcmfmac g_serial"
 MODULES_BLACKLIST=""
 CPUMIN=240000
 CPUMAX=1200000
-CLI_TARGET="jessie,xenial:default"
-DESKTOP_TARGET="xenial:default"
-KERNEL_TARGET="default,dev"
-RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev_nightly:33";
 #
+KERNEL_TARGET="default,dev"
+CLI_TARGET="jessie,xenial:default"
 CLI_BETA_TARGET="xenial:dev"
+DESKTOP_TARGET="xenial:default"
 DESKTOP_BETA_TARGET=""
 #
+RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev_nightly:33";
+#
 BOARDRATING=""
 CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/"
 HARDWARE="http://linux-sunxi.org/Xunlong_Orange_Pi_Zero"
diff --git a/config/boards/orangepizeroplus2-h5.conf b/config/boards/orangepizeroplus2-h5.conf
index 8a0a0ab1f7..24e44545b8 100644
--- a/config/boards/orangepizeroplus2-h5.conf
+++ b/config/boards/orangepizeroplus2-h5.conf
@@ -2,18 +2,21 @@
 BOARD_NAME="Orange Pi Zero Plus 2"
 LINUXFAMILY="sun50iw2"
 BOOTCONFIG="orangepi_zeroplus_defconfig"
+#
 MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial"
 MODULES_NEXT="brcmfmac g_serial"
 MODULES_BLACKLIST=""
 CPUMIN=240000
 CPUMAX=1200000
-CLI_TARGET="jessie,xenial:default"
-DESKTOP_TARGET="xenial:default"
-KERNEL_TARGET="dev"
 #
+KERNEL_TARGET="dev"
+CLI_TARGET=""
 CLI_BETA_TARGET="xenial:dev"
+DESKTOP_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
+RECOMMENDED="Ubuntu_xenial_dev_nightly:33"
+#
 BOARDRATING=""
 CHIP="http://docs.armbian.com/Hardware_Allwinner-H5/"
 HARDWARE="http://linux-sunxi.org/Xunlong_Orange_Pi_Zero"
diff --git a/config/boards/pine64.conf b/config/boards/pine64.conf
index fe059eef76..eb69b536b2 100644
--- a/config/boards/pine64.conf
+++ b/config/boards/pine64.conf
@@ -1,14 +1,15 @@
-# A64 512MB-2GB RAM
+# A64 quad core 512MB-2GB SoC GBE
 BOARD_NAME="Pine64"
-KERNEL_TARGET="default,dev"
 LINUXFAMILY="pine64"
 BOOTCONFIG="pine64_plus_defconfig"
+#
 MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723bs"
 MODULES_NEXT=""
-CLI_TARGET="jessie,xenial:default"
-DESKTOP_TARGET="xenial:default"
 #
+KERNEL_TARGET="default,dev"
+CLI_TARGET="jessie,xenial:default"
 CLI_BETA_TARGET="xenial:dev"
+DESKTOP_TARGET="xenial:default"
 DESKTOP_BETA_TARGET="xenial:default"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Ubuntu_xenial_dev_nightly:33"
diff --git a/config/boards/pine64so.conf b/config/boards/pine64so.conf
index 0eade240c7..63bba268fd 100644
--- a/config/boards/pine64so.conf
+++ b/config/boards/pine64so.conf
@@ -1,22 +1,22 @@
-# A64 2GB RAM
-BOARD_NAME="SoPine A64"
-KERNEL_TARGET="default,dev"
+# A64 quad core 2GB SoC GBE
+BOARD_NAME="SoPine64"
 LINUXFAMILY="pine64"
 BOOTCONFIG="pine64_so_defconfig"
+#
 MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723bs"
 MODULES_NEXT=""
 GOVERNOR="userspace"
-CLI_TARGET="xenial:default"
-DESKTOP_TARGET=""
 #
+KERNEL_TARGET="default,dev"
+CLI_TARGET="xenial:default"
 CLI_BETA_TARGET="xenial:dev"
+DESKTOP_TARGET=""
 DESKTOP_BETA_TARGET=""
 #
-RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev:33"
+RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev_nightly:33"
 #
 BOARDRATING=""
 CHIP="http://docs.armbian.com/Hardware_Allwinner-H5-A64/"
 HARDWARE="https://linux-sunxi.org/Pine64"
 REVIEW="http://forum.armbian.com/index.php/topic/1917-armbian-running-on-pine64-and-other-a64h5-devices/#entry14642"
-FORUMS="http://forum.armbian.com/index.php/forum/11-other-boards/"
-INCLUDE1="Hardware info|docs/board_details/pine64.md"
+FORUMS="http://forum.armbian.com/index.php/forum/11-other-boards/"
\ No newline at end of file
diff --git a/config/boards/tinkerboard.conf b/config/boards/tinkerboard.conf
index 31b745687d..ed65fc5708 100644
--- a/config/boards/tinkerboard.conf
+++ b/config/boards/tinkerboard.conf
@@ -2,14 +2,14 @@
 BOARD_NAME="Tinkerboard"
 LINUXFAMILY="rockchip"
 BOOTCONFIG="tinker-rk3288_defconfig"
+#
 MODULES="hci_uart rfcomm hidp 8723bs"
 MODULES_NEXT=""
 #
-CLI_TARGET="xenial:default"
-DESKTOP_TARGET="xenial:default"
 KERNEL_TARGET="default,dev"
-#
+CLI_TARGET="xenial:default"
 CLI_BETA_TARGET=""
+DESKTOP_TARGET="xenial:default"
 DESKTOP_BETA_TARGET="xenial:default"
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop_nightly:75"