diff --git a/docs/_boards/a10_olinuxino_lime.md b/docs/_boards/a10_olinuxino_lime.md
index e19cd4b..70df0cc 100644
--- a/docs/_boards/a10_olinuxino_lime.md
+++ b/docs/_boards/a10_olinuxino_lime.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: A10-OLinuXino-Lime SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A10-OLinuXino-Lime by Olimex, SoC: Allwinner A10, CPU ISA: armv7"
+title: A10-OLinuXino-LIME SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A10-OLinuXino-LIME by Olimex, SoC: Allwinner A10, CPU ISA: armv7"
 board_id: a10_olinuxino_lime
 board_dtb_name: sun4i-a10-olinuxino-lime
-board_name: A10-OLinuXino-Lime
+board_name: A10-OLinuXino-LIME
 board_maker_name: Olimex
 board_soc_name: Allwinner A10
 board_cpu_name: ARM Cortex A8 (armv7)
diff --git a/docs/_boards/a10s_olinuxino_micro.md b/docs/_boards/a10s_olinuxino_micro.md
index a2fe732..3f158e1 100644
--- a/docs/_boards/a10s_olinuxino_micro.md
+++ b/docs/_boards/a10s_olinuxino_micro.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: A10s OLinuXino MICRO SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A10s OLinuXino MICRO by Olimex, SoC: Allwinner A10s, CPU ISA: armv7"
+title: A10s-OLinuXino MICRO SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A10s-OLinuXino MICRO by Olimex, SoC: Allwinner A10s, CPU ISA: armv7"
 board_id: a10s_olinuxino_micro
 board_dtb_name: sun5i-a10s-olinuxino-micro
-board_name: A10s OLinuXino MICRO
+board_name: A10s-OLinuXino MICRO
 board_maker_name: Olimex
 board_soc_name: Allwinner A10s
 board_cpu_name: ARM Cortex A8 (armv7)
diff --git a/docs/_boards/a13_olinuxino.md b/docs/_boards/a13_olinuxino.md
index bbbdc6e..3acacb8 100644
--- a/docs/_boards/a13_olinuxino.md
+++ b/docs/_boards/a13_olinuxino.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: A13 OLinuXino SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A13 OLinuXino by Olimex, SoC: Allwinner A13, CPU ISA: armv7"
+title: A13-OLinuXino SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A13-OLinuXino by Olimex, SoC: Allwinner A13, CPU ISA: armv7"
 board_id: a13_olinuxino
 board_dtb_name: sun5i-a13-olinuxino
-board_name: A13 OLinuXino
+board_name: A13-OLinuXino
 board_maker_name: Olimex
 board_soc_name: Allwinner A13
 board_cpu_name: ARM Cortex A8 (armv7)
diff --git a/docs/_boards/a13_olinuxino_micro.md b/docs/_boards/a13_olinuxino_micro.md
index b9a74a0..67e8e88 100644
--- a/docs/_boards/a13_olinuxino_micro.md
+++ b/docs/_boards/a13_olinuxino_micro.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: A13 OLinuXino MICRO SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A13 OLinuXino MICRO by Olimex, SoC: Allwinner A13, CPU ISA: armv7"
+title: A13-OLinuXino MICRO SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A13-OLinuXino MICRO by Olimex, SoC: Allwinner A13, CPU ISA: armv7"
 board_id: a13_olinuxino_micro
 board_dtb_name: sun5i-a13-olinuxino-micro
-board_name: A13 OLinuXino MICRO
+board_name: A13-OLinuXino MICRO
 board_maker_name: Olimex
 board_soc_name: Allwinner A13
 board_cpu_name: ARM Cortex A8 (armv7)
diff --git a/docs/_boards/a20_olinuxino_micro.md b/docs/_boards/a20_olinuxino_micro.md
index 444cc08..475a941 100644
--- a/docs/_boards/a20_olinuxino_micro.md
+++ b/docs/_boards/a20_olinuxino_micro.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: OLinuXino MICRO SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for OLinuXino MICRO by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
+title: A20-OLinuXino-MICRO SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A20-OLinuXino-MICRO by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
 board_id: a20_olinuxino_micro
 board_dtb_name: sun7i-a20-olinuxino-micro
-board_name: OLinuXino MICRO
+board_name: A20-OLinuXino-MICRO
 board_maker_name: Olimex
 board_soc_name: Allwinner A20
 board_cpu_name: ARM Cortex A7 (armv7)
diff --git a/docs/_boards/a20_olinuxino_micro_emmc.md b/docs/_boards/a20_olinuxino_micro_emmc.md
index 0f6ead9..fc55a4f 100644
--- a/docs/_boards/a20_olinuxino_micro_emmc.md
+++ b/docs/_boards/a20_olinuxino_micro_emmc.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: OLinuXino MICRO w/ eMMC SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for OLinuXino MICRO w/ eMMC by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
+title: A20-OLinuXino-MICRO w/ eMMC SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A20-OLinuXino-MICRO w/ eMMC by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
 board_id: a20_olinuxino_micro_emmc
 board_dtb_name: sun7i-a20-olinuxino-micro-emmc
-board_name: OLinuXino MICRO w/ eMMC
+board_name: A20-OLinuXino-MICRO w/ eMMC
 board_maker_name: Olimex
 board_soc_name: Allwinner A20
 board_cpu_name: ARM Cortex A7 (armv7)
diff --git a/docs/_boards/a33_olinuxino.md b/docs/_boards/a33_olinuxino.md
index 8183589..cb6a7ce 100644
--- a/docs/_boards/a33_olinuxino.md
+++ b/docs/_boards/a33_olinuxino.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: A33 OLinuXino SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A33 OLinuXino by Olimex, SoC: Allwinner A23, CPU ISA: armv7"
+title: A33-OLinuXino SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A33-OLinuXino by Olimex, SoC: Allwinner A23, CPU ISA: armv7"
 board_id: a33_olinuxino
 board_dtb_name: sun8i-a33-olinuxino
-board_name: A33 OLinuXino
+board_name: A33-OLinuXino
 board_maker_name: Olimex
 board_soc_name: Allwinner A23
 board_cpu_name: ARM Cortex A7 (armv7)
diff --git a/docs/_boards/a64_olinuxino.md b/docs/_boards/a64_olinuxino.md
index d75a370..13f16bc 100644
--- a/docs/_boards/a64_olinuxino.md
+++ b/docs/_boards/a64_olinuxino.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: A64 OLinuXino SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu arm64 SD card images for A64 OLinuXino by Olimex, SoC: Allwinner A64, CPU ISA: armv8"
+title: A64-OLinuXino SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu arm64 SD card images for A64-OLinuXino by Olimex, SoC: Allwinner A64, CPU ISA: armv8"
 board_id: a64_olinuxino
 board_dtb_name: sun50i-a64-olinuxino
-board_name: A64 OLinuXino
+board_name: A64-OLinuXino
 board_maker_name: Olimex
 board_soc_name: Allwinner A64
 board_cpu_name: ARM Cortex A53 (armv8)
diff --git a/docs/_boards/a64_olinuxino_emmc.md b/docs/_boards/a64_olinuxino_emmc.md
index 5676380..a7d88b2 100644
--- a/docs/_boards/a64_olinuxino_emmc.md
+++ b/docs/_boards/a64_olinuxino_emmc.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: A64 OLinuXino w/ eMMC SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu arm64 SD card images for A64 OLinuXino w/ eMMC by Olimex, SoC: Allwinner A64, CPU ISA: armv8"
+title: A64-OLinuXino w/ eMMC SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu arm64 SD card images for A64-OLinuXino w/ eMMC by Olimex, SoC: Allwinner A64, CPU ISA: armv8"
 board_id: a64_olinuxino_emmc
 board_dtb_name: sun50i-a64-olinuxino-emmc
-board_name: A64 OLinuXino w/ eMMC
+board_name: A64-OLinuXino w/ eMMC
 board_maker_name: Olimex
 board_soc_name: Allwinner A64
 board_cpu_name: ARM Cortex A53 (armv8)
diff --git a/docs/_boards/olinuxino_lime.md b/docs/_boards/olinuxino_lime.md
index 62890c9..015150e 100644
--- a/docs/_boards/olinuxino_lime.md
+++ b/docs/_boards/olinuxino_lime.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: OLinuXino Lime SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for OLinuXino Lime by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
+title: A20-OLinuXino-LIME SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A20-OLinuXino-LIME by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
 board_id: olinuxino_lime
 board_dtb_name: sun7i-a20-olinuxino-lime
-board_name: OLinuXino Lime
+board_name: A20-OLinuXino-LIME
 board_maker_name: Olimex
 board_soc_name: Allwinner A20
 board_cpu_name: ARM Cortex A7 (armv7)
diff --git a/docs/_boards/olinuxino_lime2.md b/docs/_boards/olinuxino_lime2.md
index 0491d07..dd5f877 100644
--- a/docs/_boards/olinuxino_lime2.md
+++ b/docs/_boards/olinuxino_lime2.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: OLinuXino Lime 2 SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for OLinuXino Lime 2 by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
+title: A20-OLinuXino-LIME2 SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A20-OLinuXino-LIME2 by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
 board_id: olinuxino_lime2
 board_dtb_name: sun7i-a20-olinuxino-lime2
-board_name: OLinuXino Lime 2
+board_name: A20-OLinuXino-LIME2
 board_maker_name: Olimex
 board_soc_name: Allwinner A20
 board_cpu_name: ARM Cortex A7 (armv7)
diff --git a/docs/_boards/olinuxino_lime_emmc.md b/docs/_boards/olinuxino_lime_emmc.md
index cebc9d3..0b155d3 100644
--- a/docs/_boards/olinuxino_lime_emmc.md
+++ b/docs/_boards/olinuxino_lime_emmc.md
@@ -1,10 +1,10 @@
 ---
 layout: board
-title: OLinuXino Lime w/ eMMC SD card images
-description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for OLinuXino Lime w/ eMMC by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
+title: A20-OLinuXino-LIME w/ eMMC SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu armhf SD card images for A20-OLinuXino-LIME w/ eMMC by Olimex, SoC: Allwinner A20, CPU ISA: armv7"
 board_id: olinuxino_lime_emmc
 board_dtb_name: sun7i-a20-olinuxino-lime2-emmc
-board_name: OLinuXino Lime w/ eMMC
+board_name: A20-OLinuXino-LIME w/ eMMC
 board_maker_name: Olimex
 board_soc_name: Allwinner A20
 board_cpu_name: ARM Cortex A7 (armv7)
diff --git a/docs/_boards/tanix_tx6.md b/docs/_boards/tanix_tx6.md
new file mode 100644
index 0000000..3d498c9
--- /dev/null
+++ b/docs/_boards/tanix_tx6.md
@@ -0,0 +1,13 @@
+---
+layout: board
+title: TX6 SD card images
+description: "Minimal, pure and up-to-date vanilla Debian/Ubuntu arm64 SD card images for TX6 by Tanix, SoC: Allwinner H6, CPU ISA: armv8"
+board_id: tanix_tx6
+board_dtb_name: sun50i-h6-tanix-tx6
+board_name: TX6
+board_maker_name: Tanix
+board_soc_name: Allwinner H6
+board_cpu_name: ARM Cortex A53 (armv8)
+board_cpu_arch_isa: armv8
+board_cpu_arch_debian: arm64
+---