From c8d2c002c21fed780bab070a58f0fb50bc36a14b Mon Sep 17 00:00:00 2001
From: x1y <23239177+x1y@users.noreply.github.com>
Date: Sat, 5 Oct 2024 00:25:04 +0200
Subject: [PATCH] Replaced device pages with md

---
 config/_default/config.toml                   |   7 +-
 content/devices/{_index.adoc => _index.md}    |  26 +--
 content/devices/{ox64.adoc => ox64.md}        |  16 +-
 content/devices/{oz64.adoc => oz64.md}        |  13 +-
 .../{pine_a64-lts.adoc => pine_a64-lts.md}    |  83 ++------
 content/devices/pine_a64.adoc                 |  87 --------
 content/devices/pine_a64.md                   |  45 +++++
 ...e_h64_model_a.adoc => pine_h64_model_a.md} |  15 +-
 ...e_h64_model_b.adoc => pine_h64_model_b.md} |  77 ++------
 .../devices/{pinebook.adoc => pinebook.md}    |  90 +++------
 content/devices/pinebook_pro.adoc             | 113 -----------
 content/devices/pinebook_pro.md               |  59 ++++++
 .../{pinebuds_pro.adoc => pinebuds_pro.md}    |  16 +-
 content/devices/pinecil.adoc                  |  67 -------
 content/devices/pinecil.md                    |  62 ++++++
 content/devices/pinecone.adoc                 |  23 ---
 content/devices/pinecone.md                   |  20 ++
 .../devices/{pinecube.adoc => pinecube.md}    |  69 +++----
 content/devices/pinedio.adoc                  |  24 ---
 content/devices/pinedio.md                    |  20 ++
 .../devices/{pinenote.adoc => pinenote.md}    |  69 ++-----
 content/devices/{pinenut.adoc => pinenut.md}  |  50 +++--
 .../devices/{pinephone.adoc => pinephone.md}  | 122 +++++-------
 .../{pinephone_pro.adoc => pinephone_pro.md}  | 185 +++++-------------
 .../devices/{pinepower.adoc => pinepower.md}  |  49 +++--
 content/devices/pinepower_desktop.adoc        |  65 ------
 content/devices/pinepower_desktop.md          |  58 ++++++
 .../devices/{pinetab-v.adoc => pinetab-v.md}  |  16 +-
 content/devices/{pinetab.adoc => pinetab.md}  |  95 +++------
 .../devices/{pinetab2.adoc => pinetab2.md}    |  22 +--
 content/devices/pinetime.adoc                 | 106 ----------
 content/devices/pinetime.md                   |  59 ++++++
 content/devices/{pinevox.adoc => pinevox.md}  |  13 +-
 .../{quartz64-zero.adoc => quartz64-zero.md}  |  55 ++----
 ...rtz64_model_a.adoc => quartz64_model_a.md} |  87 ++------
 ...rtz64_model_b.adoc => quartz64_model_b.md} |  79 ++------
 .../{quartzpro64.adoc => quartzpro64.md}      |  14 +-
 content/devices/{rock64.adoc => rock64.md}    |  77 ++------
 .../devices/{rockpro64.adoc => rockpro64.md}  |  95 ++-------
 content/devices/soedge.adoc                   |  85 --------
 content/devices/soedge.md                     |  45 +++++
 content/devices/soedge_baseboard.adoc         |  45 -----
 content/devices/soedge_baseboard.md           |  41 ++++
 content/devices/{sopine.adoc => sopine.md}    |  54 ++---
 content/devices/sopine_baseboard.adoc         |  82 --------
 content/devices/sopine_baseboard.md           |  44 +++++
 ...usterboard.adoc => sopine_clusterboard.md} |  50 +++--
 .../devices/{soquartz.adoc => soquartz.md}    |  16 +-
 content/devices/star64.adoc                   |  25 ---
 content/devices/star64.md                     |  22 +++
 .../devices/{template.adoc => template.md}    |  39 +---
 themes/pinetheme/assets/css/style.css         |   1 +
 52 files changed, 963 insertions(+), 1834 deletions(-)
 rename content/devices/{_index.adoc => _index.md} (93%)
 rename content/devices/{ox64.adoc => ox64.md} (63%)
 rename content/devices/{oz64.adoc => oz64.md} (87%)
 rename content/devices/{pine_a64-lts.adoc => pine_a64-lts.md} (50%)
 delete mode 100644 content/devices/pine_a64.adoc
 create mode 100644 content/devices/pine_a64.md
 rename content/devices/{pine_h64_model_a.adoc => pine_h64_model_a.md} (57%)
 rename content/devices/{pine_h64_model_b.adoc => pine_h64_model_b.md} (52%)
 rename content/devices/{pinebook.adoc => pinebook.md} (57%)
 delete mode 100644 content/devices/pinebook_pro.adoc
 create mode 100644 content/devices/pinebook_pro.md
 rename content/devices/{pinebuds_pro.adoc => pinebuds_pro.md} (71%)
 delete mode 100644 content/devices/pinecil.adoc
 create mode 100644 content/devices/pinecil.md
 delete mode 100644 content/devices/pinecone.adoc
 create mode 100644 content/devices/pinecone.md
 rename content/devices/{pinecube.adoc => pinecube.md} (57%)
 delete mode 100644 content/devices/pinedio.adoc
 create mode 100644 content/devices/pinedio.md
 rename content/devices/{pinenote.adoc => pinenote.md} (57%)
 rename content/devices/{pinenut.adoc => pinenut.md} (57%)
 rename content/devices/{pinephone.adoc => pinephone.md} (60%)
 rename content/devices/{pinephone_pro.adoc => pinephone_pro.md} (77%)
 rename content/devices/{pinepower.adoc => pinepower.md} (57%)
 delete mode 100644 content/devices/pinepower_desktop.adoc
 create mode 100644 content/devices/pinepower_desktop.md
 rename content/devices/{pinetab-v.adoc => pinetab-v.md} (57%)
 rename content/devices/{pinetab.adoc => pinetab.md} (52%)
 rename content/devices/{pinetab2.adoc => pinetab2.md} (68%)
 delete mode 100644 content/devices/pinetime.adoc
 create mode 100644 content/devices/pinetime.md
 rename content/devices/{pinevox.adoc => pinevox.md} (77%)
 rename content/devices/{quartz64-zero.adoc => quartz64-zero.md} (55%)
 rename content/devices/{quartz64_model_a.adoc => quartz64_model_a.md} (52%)
 rename content/devices/{quartz64_model_b.adoc => quartz64_model_b.md} (54%)
 rename content/devices/{quartzpro64.adoc => quartzpro64.md} (61%)
 rename content/devices/{rock64.adoc => rock64.md} (56%)
 rename content/devices/{rockpro64.adoc => rockpro64.md} (53%)
 delete mode 100644 content/devices/soedge.adoc
 create mode 100644 content/devices/soedge.md
 delete mode 100644 content/devices/soedge_baseboard.adoc
 create mode 100644 content/devices/soedge_baseboard.md
 rename content/devices/{sopine.adoc => sopine.md} (65%)
 delete mode 100644 content/devices/sopine_baseboard.adoc
 create mode 100644 content/devices/sopine_baseboard.md
 rename content/devices/{clusterboard.adoc => sopine_clusterboard.md} (66%)
 rename content/devices/{soquartz.adoc => soquartz.md} (53%)
 delete mode 100644 content/devices/star64.adoc
 create mode 100644 content/devices/star64.md
 rename content/devices/{template.adoc => template.md} (50%)

diff --git a/config/_default/config.toml b/config/_default/config.toml
index b3347f45..31ba960a 100644
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -67,12 +67,13 @@ paginate = 9
   [params.social]
     twitter = 'thepine64'
 
-
-
-
 [security.exec]
   allow = ["^asciidoctor$"]
 
+# Allow HTML inside markdown (e. g. for br in tables)
+[markup.goldmark]
+    [markup.goldmark.renderer]
+    unsafe = true 
 
 # Docs menu
 [menu]
diff --git a/content/devices/_index.adoc b/content/devices/_index.md
similarity index 93%
rename from content/devices/_index.adoc
rename to content/devices/_index.md
index 805efa4a..1ee41f12 100644
--- a/content/devices/_index.adoc
+++ b/content/devices/_index.md
@@ -5,7 +5,7 @@ draft: false
 description: "PINE64 has a variety of different devices. Find out more!"
 ---
 
-== Single Board Computers
+## Single Board Computers
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/ox64/" img="/img/start/ox64.png" title="Ox64" text="" >}}
@@ -19,18 +19,18 @@ description: "PINE64 has a variety of different devices. Find out more!"
     {{< devices/device_box link="/devices/pine_h64_model_b" img="/devices/images/pine_h64_ver_b.jpg" title="PINE H64 Model B" text="" >}}
     {{< devices/device_box link="/devices/quartz64_model_a" img="/devices/images/quartz64_model_a.jpg" title="Quartz64 Model A" text="" >}}
     {{< devices/device_box link="/devices/quartz64_model_b" img="/devices/images/quartz64_model_b.png" title="Quartz64 Model B" text="" >}}
-    {{< devices/device_box link="/devices/quartz64-zero" img="/devices/images/Quartz64-Zero.jpg" title="Quartz64-Zero" text="" >}}
+    {{< devices/device_box link="/devices/quartz64_zero" img="/devices/images/Quartz64-Zero.jpg" title="Quartz64 Zero" text="" >}}
     {{< devices/device_box link="/devices/quartzpro64" img="/documentation/images/Quartzpro64_whole_board_top_resized.jpeg" title="QuartzPro64" text="" >}}
 {{</ flexbox >}}
 
-== Laptops
+## Laptops
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/pinebook" img="/devices/images/pinebook.jpg" title="Pinebook" text="" >}}
     {{< devices/device_box link="/devices/pinebook_pro" img="/devices/images/pinebook_pro.png" title="Pinebook Pro" text="" >}}
 {{</ flexbox >}}
 
-== Phones and Tablets
+## Phones and Tablets
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/pinephone_pro" img="/devices/images/pinephone_pro.png" title="PinePhone Pro" text="" >}}
@@ -41,14 +41,14 @@ description: "PINE64 has a variety of different devices. Find out more!"
     {{< devices/device_box link="/devices/pinetab-v" img="/documentation/PineTab-V/images/Pinetabv_1.jpg" title="PineTab-V" text="" >}}
 {{</ flexbox >}}
 
-== Wearables
+## Wearables
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/pinetime" img="/devices/images/pinetime.png" title="PineTime" text="" >}}
     {{< devices/device_box link="/devices/pinebuds_pro" img="/devices/images/pinebudspro.jpg" title="PineBuds Pro" text="" >}}
 {{</ flexbox >}}
 
-== Clusters and Compute Modules
+## Clusters and Compute Modules
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/sopine" img="/devices/images/sopine.jpg" title="SOPINE" text="" >}}
@@ -59,39 +59,39 @@ description: "PINE64 has a variety of different devices. Find out more!"
     {{< devices/device_box link="/devices/soquartz" img="/documentation/SOQuartz/images/SOQuartz_module-1s.jpg" title="SOQuartz" text="" >}}
 {{</ flexbox >}}
 
-== IP Cameras
+## IP Cameras
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/pinecube" img="/devices/images/pinecube.jpg" title="PineCube" text="" >}}
 {{</ flexbox >}}
 
-== Soldering Irons
+## Soldering Irons
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/pinecil" img="/devices/images/pinecil.png" title="Pinecil" text="" >}}
 {{</ flexbox >}}
 
-== Makerspace
+## Makerspace
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/pinecone" img="/documentation/images/Pine64_BL602_EVB_photo-3-small.jpg" title="PineCone" text="" >}}
     {{< devices/device_box link="/devices/pinedio" img="" title="Pinedio" text="" >}}
 {{</ flexbox >}}
 
-== Power Supplies
+## Power Supplies
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/pinepower" img="/devices/images/pinepower.jpg" title="PinePower" text="" >}}
     {{< devices/device_box link="/devices/pinepower_desktop" img="/devices/images/pinepower_desktop.jpg" title="PinePower Desktop" text="" >}}
 {{</ flexbox >}}
 
-== IoT
+## IoT
 
 {{< flexbox >}}
     {{< devices/device_box link="/devices/pinenut" img="/devices/images/pinenut.jpg" title="PineNut" text="" >}}
 {{</ flexbox >}}
 
-== Smart home
+## Smart home
 {{< flexbox >}}
     {{< devices/device_box link="/devices/pinevox" img="/documentation/PineVox/images/pinevox.jpg" title="PineVox" text="" >}}
-{{</ flexbox >}}
\ No newline at end of file
+{{</ flexbox >}}
diff --git a/content/devices/ox64.adoc b/content/devices/ox64.md
similarity index 63%
rename from content/devices/ox64.adoc
rename to content/devices/ox64.md
index 54abdbd8..1560c865 100644
--- a/content/devices/ox64.adoc
+++ b/content/devices/ox64.md
@@ -8,17 +8,13 @@ images:
   - "/devices/images/ox64.png"
 ---
 
-== An Ox, no bull
+## An Ox, no bull
 
 The Ox64 Single Board Computer features a Bouffalo Lab BL808 RISC-V SoC with single 64-bit 480MHz RV64 C906 core and two 32-bit 320MHz RV32 E907 + 150MHz E902 cores, 728KB internal SRAM and 64MB internal PSRAM.
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Ox64/[Ox64]
-
-| link:/documentation/Ox64/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
+|     |
+| --- |
+| [Ox64](/documentation/Ox64/) |
+| [Schematics and certifications](/documentation/Ox64/Further_information/Schematics_and_certifications/) |
\ No newline at end of file
diff --git a/content/devices/oz64.adoc b/content/devices/oz64.md
similarity index 87%
rename from content/devices/oz64.adoc
rename to content/devices/oz64.md
index 2fee95e0..44f9acaf 100644
--- a/content/devices/oz64.adoc
+++ b/content/devices/oz64.md
@@ -8,17 +8,14 @@ images:
   - "/devices/images/oz64.jpg"
 ---
 
-== The Oz64
+## The Oz64
 
 The Oz64 is a low cost single-board computer based on the Sophgo SG2000 SoC with dual T-Head C906 64-bit RISC-V cores, an ARM Cortex A53 64-bit RISC CPU core and an 8051 8-bit core supported by 512 MB of embedded DRAM memory, with WiFi and Bluetooth radio interfaces. 
 
 The Oz64 SBC comes in a model-B form-factor, has a microSD card slot, an eMMC plugin connector, an USB 2.0 Type-A host port, and many other peripheral interfaces for makers to integrate with sensors and other devices.
 
-== Documentation
+## Documentation
 
-[cols="1"]
-|===
-
-| link:/documentation/Oz64/[Oz64]
-
-|===
+|     |
+| --- |
+| [Oz64](/documentation/Oz64/) |
diff --git a/content/devices/pine_a64-lts.adoc b/content/devices/pine_a64-lts.md
similarity index 50%
rename from content/devices/pine_a64-lts.adoc
rename to content/devices/pine_a64-lts.md
index cc2ebc73..643709ee 100644
--- a/content/devices/pine_a64-lts.adoc
+++ b/content/devices/pine_a64-lts.md
@@ -8,83 +8,38 @@ images:
   - "/devices/images/pine_a64-lts.jpg"
 ---
 
-== The Long Term Supply Version of the PINE A64 (+)
+## The Long Term Supply Version of the PINE A64 (+)
 
 The PINE64-LTS is the Long Term Supply version of the PINE A64 (+), our first Single Board Computer, powered by Allwinner’s A64 quad-core ARM Cortex A53 64-Bit SoC. There are many Operating Systems available for the PINE A64-LTS created by the open source community and various partner projects. Currently the majority of Linux distributions for the PINE A64-LTS are using mainline Linux but there are a number of BSP-based distribution and / or legacy systems that you can download too.
 
 Apart from Linux, you also have a choice of a selection of *BSD and Android. The PINE A64-LTS is guaranteed to be supplied for 5 years until year 2022 at the very least.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A53 cores @ 1.152 GHz
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.152 GHz |
+| GPU | ARM Mali 400 MP2 GPU |
+| Memory | DDR3 RAM (up to 2GB) |
+| Networking | Gigabit Ethernet |
+| Flash Memory | Micro SD |
+| Connections | HD digital video out <br> 2x USB 2.0 Host <br> Euler bus <br> Expansion bus <br> PI-2 bus <br> Touch Panel (TP) port <br> Display Serial Interface (DSI) port <br> IR R/X port <br> Real Time Clock port (RTC) <br> Lithium battery port <br> CMOS Sensor Interface port <br> Optional WiFi 802.11 b/g/n with Bluetooth 4.0 expansion module <br> 3.5mm headphone jack <br> 3.5mm barrel power (5V 2A) port |
 
-| GPU
-| ARM Mali 400 MP2 GPU
-
-| Memory
-| DDR3 RAM (up to 2GB)
-
-| Networking
-| Gigabit Ethernet
-
-| Flash Memory
-| Micro SD
-
-| Connections
-| eMMC module slot
-
-HD digital video out
-
-2x USB 2.0 Host
-
-Euler bus
-
-Expansion bus
-
-PI-2 bus
-
-Touch Panel (TP) port
-
-Display Serial Interface (DSI) port
-
-IR R/X port
-
-Real Time Clock port (RTC)
-
-Lithium battery port
-
-CMOS Sensor Interface port
-
-Optional WiFi 802.11 b/g/n with Bluetooth 4.0 expansion module
-
-3.5mm headphone jack
-
-3.5mm barrel power (5V 2A) port
-
-|===
-
-
-=== Quad-Core A64 SoC 
+### Quad-Core A64 SoC 
 First broadly avaliable quad-core ARM64 platform
 
-=== 2GB DDR3 RAM
+### 2GB DDR3 RAM
 Up to 2GB DDR3 RAM
 
-=== Gigabit Ethernet
+### Gigabit Ethernet
 Built-in Ethernet port allows for fast internet access
 
-=== WiFi And Bluetooth 
+### WiFi And Bluetooth 
 Optional 802.11 b/g/n WiFi and Bluetooth 4.0 module
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Pine_A64-LTS/[PINE A64-LTS]
+## Documentation
 
-| link:/documentation/Pine_A64-LTS/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
\ No newline at end of file
+|     |
+| --- |
+| [PINE A64-LTS](/documentation/Pine_A64-LTS/) |
+| [Schematics and certifications](/documentation/Pine_A64-LTS/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/pine_a64.adoc b/content/devices/pine_a64.adoc
deleted file mode 100644
index 19168c4a..00000000
--- a/content/devices/pine_a64.adoc
+++ /dev/null
@@ -1,87 +0,0 @@
----
-title: "PINE A64 and PINE A64+"
-categories: 
-  - "SBCs"
-cover: 
-  image: "/devices/images/pine_a64.jpg"
-images:
-  - "/devices/images/pine_a64.jpg"
----
-
-== Our First 64-bit Single Board Computer
-
-This is where our journey began. The PINE A64 (\+) is our first Single Board Computer powered by Allwinner’s A64 quad-core ARM Cortex A53 64-Bit SoC. There are many Operating Systems available for the PINE A64 (+) created by the open source community and various partner projects. Currently the majority of Linux distributions for the PINE A64 are using mainline Linux but there are a number of BSP-based distribution and / or legacy systems that you can download too.
-
-Apart from Linux, you also have a choice of a selection of *BSD, Android, Remix OS and Windows IoT.
-
-== Features and Specifications
-
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A53 cores @ 1.152 GHz
-
-| GPU
-| ARM Mali 400 MP2 GPU
-
-| Memory
-| DDR3 RAM (up to 2GB)
-
-| Networking
-| Gigabit Ethernet
-
-| Flash Memory
-| Micro SD
-
-| Connections
-| HD digital video out
-
-2x USB 2.0 Host
-
-Euler bus
-
-Expansion bus
-
-PI-2 bus
-
-Touch Panel (TP) port
-
-Display Serial Interface (DSI) port
-
-IR R/X port
-
-Real Time Clock Port (RTC)
-
-Lithium battery port
-
-CMOS Sensor Interface port
-
-Optional expansion module with 802.11 b/g/n WiFI and Bluetooth 4.0
-
-3.5mm headphone jack
-
-Micro USB power (5V 2A) port
-|===
-
-
-=== Quad-Core A64 SoC 
-First broadly avaliable quad-core ARM64 platform
-
-=== 2GB DDR3 RAM
-Up to 2GB DDR3 RAM
-
-=== Gigabit Ethernet
-Built-in Ethernet port allows for fast internet access
-
-=== WiFi And Bluetooth 
-Optional 802.11 b/g/n WiFi and Bluetooth 4.0 module
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Pine_A64/[PINE A64]
-
-| link:/documentation/Pine_A64/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
\ No newline at end of file
diff --git a/content/devices/pine_a64.md b/content/devices/pine_a64.md
new file mode 100644
index 00000000..00d218cb
--- /dev/null
+++ b/content/devices/pine_a64.md
@@ -0,0 +1,45 @@
+---
+title: "PINE A64 and PINE A64+"
+categories: 
+  - "SBCs"
+cover: 
+  image: "/devices/images/pine_a64.jpg"
+images:
+  - "/devices/images/pine_a64.jpg"
+---
+
+## Our First 64-bit Single Board Computer
+
+This is where our journey began. The PINE A64 (\+) is our first Single Board Computer powered by Allwinner’s A64 quad-core ARM Cortex A53 64-Bit SoC. There are many Operating Systems available for the PINE A64 (+) created by the open source community and various partner projects. Currently the majority of Linux distributions for the PINE A64 are using mainline Linux but there are a number of BSP-based distribution and / or legacy systems that you can download too.
+
+Apart from Linux, you also have a choice of a selection of *BSD, Android, Remix OS and Windows IoT.
+
+## Features and Specifications
+
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.152 GHz |
+| GPU | ARM Mali 400 MP2 GPU |
+| Memory | DDR3 RAM (up to 2GB) |
+| Networking | Gigabit Ethernet |
+| Flash Memory | Micro SD |
+| Connections | HD digital video out <br> 2x USB 2.0 Host <br> Euler bus <br> Expansion bus <br> PI-2 bus <br> Touch Panel (TP) port <br> Display Serial Interface (DSI) port <br> IR R/X port <br> Real Time Clock Port (RTC) <br> Lithium battery port <br> CMOS Sensor Interface port <br> Optional expansion module with 802.11 b/g/n WiFI and Bluetooth 4.0 <br> 3.5mm headphone jack <br> Micro USB power (5V 2A) port |
+
+### Quad-Core A64 SoC 
+First broadly avaliable quad-core ARM64 platform
+
+### 2GB DDR3 RAM
+Up to 2GB DDR3 RAM
+
+### Gigabit Ethernet
+Built-in Ethernet port allows for fast internet access
+
+### WiFi And Bluetooth 
+Optional 802.11 b/g/n WiFi and Bluetooth 4.0 module
+
+## Documentation
+
+|     |
+| --- |
+| [PINE A64](/documentation/Pine_A64/) |
+| [Schematics and certifications](/documentation/Pine_A64/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/pine_h64_model_a.adoc b/content/devices/pine_h64_model_a.md
similarity index 57%
rename from content/devices/pine_h64_model_a.adoc
rename to content/devices/pine_h64_model_a.md
index 81dadcd0..3b03f869 100644
--- a/content/devices/pine_h64_model_a.adoc
+++ b/content/devices/pine_h64_model_a.md
@@ -8,16 +8,13 @@ images:
   - "/devices/images/pine_h64_model_a.jpg"
 ---
 
-== The PINE H64 Model A
+## The PINE H64 Model A
 
 The PINE H64 Model A is Single Board Computer by PINE64. It is powered by an Allwinner “H6” Quad-Core ARM Cortex A53 64-Bit Processor with a MALI T-722 GPU.
 
-== Documentation
+## Documentation
 
-[cols="1"]
-|===
-
-| link:/documentation/PINE_H64_Model_A/[PINE H64 Model A]
-
-| link:/documentation/PINE_H64_Model_A/Further_information/Schematics_and_Certifications/[Schematics and Certifications]
-|===
+|     |
+| --- |
+| [PINE H64 Model A](/documentation/PINE_H64_Model_A/) |
+| [Schematics and Certifications](/documentation/PINE_H64_Model_A/Further_information/Schematics_and_Certifications/) |
diff --git a/content/devices/pine_h64_model_b.adoc b/content/devices/pine_h64_model_b.md
similarity index 52%
rename from content/devices/pine_h64_model_b.adoc
rename to content/devices/pine_h64_model_b.md
index 2fe88c8a..f266d4b7 100644
--- a/content/devices/pine_h64_model_b.adoc
+++ b/content/devices/pine_h64_model_b.md
@@ -10,75 +10,36 @@ aliases:
   - /pine-h64-ver-b
 ---
 
-== PINE H64 Model B Single Board Computer Featuring USB 3.0 and Gigabit Ethernet
+## PINE H64 Model B Single Board Computer Featuring USB 3.0 and Gigabit Ethernet
 
 The PINE H64 Model B is powered by an Allwinner “H6” quad-core ARM Cortex A53 64-Bit Processor with a Mali T-722 GPU. The PINE H64 is equipped with up-to 3GB LPDDR3 PC-1600 system memory and 128Mb SPI boot Flash. There is also an optional eMMC module (up to 128GB) and microSD slot for booting. The board is also equipped with onboard built-in 802.11n Wifi and Bluetooth 4.0, 1x USB 3.0 Host, 2x USB 2.0 Host, Gigabit Ethernet, PI-2 GPIO Bus, and a Euler GPIO bus as well other peripheral device interfaces such as UART, SPI, and I2C for makers to integrate with sensors and other peripherals.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A53 cores @ 1.488 GHz
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.488 GHz |
+| GPU | ARM Mali-T720 MP2 GPU |
+| Memory | LPDDR3 RAM (up to 3GB) |
+| Networking | Gigabit Ethernet |
+| Storage | Micro SD slot <br> eMMC module slot <br> SPI Flash 128Mbit |
+| Connections | 4K digital video out <br> 2x USB 2.0 Host <br> 1x USB 3.0 Host <br> PI-2 bus <br> IR R/X port <br> Real Time Clock (RTC) port <br> A/V jack <br> Built-in 802.11ac WiFi with Bluetooth 4.1 <br> Power, Reset and Recovery buttons <br> 3.5mm barrel power (5V 3A) port |
 
-| GPU
-| ARM Mali-T720 MP2 GPU
-
-| Memory
-| LPDDR3 RAM (up to 3GB)
-
-| Networking
-| Gigabit Ethernet
-
-| Storage
-| Micro SD slot
-
-eMMC module slot
-
-SPI Flash 128Mbit
-
-| Connections
-| 4K digital video out
-
-2x USB 2.0 Host
-
-1x USB 3.0 Host
-
-PI-2 bus
-
-IR R/X port
-
-Real Time Clock (RTC) port
-
-A/V jack
-
-Built-in 802.11ac WiFi with Bluetooth 4.1
-
-Power, Reset and Recovery buttons
-
-3.5mm barrel power (5V 3A) port
-
-|===
-
-
-=== Allwinner H6
+### Allwinner H6
 Quad ARM Cortex A53 cores @ 1.48 GHz and a powerful ARM Mali-T720 MP2 GPU
 
-=== 3GB LPDDR3 RAM
+### 3GB LPDDR3 RAM
 Up to 3GB of LPDDR3 RAM
 
-=== Gigabit Ethernet
+### Gigabit Ethernet
 Built-in Ethernet port allows for fast internet access
 
-=== WiFi And Bluetooth
+### WiFi And Bluetooth
 Built-in 802.11ac WiFi and Bluetooth 4.1
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PINE_H64_Model_B/[PINE H64 Model B]
+## Documentation
 
-| link:/documentation/PINE_H64_Model_B/Further_information/Schematics_and_Certifications/[Schematics and Certifications]
-|===
\ No newline at end of file
+|     |
+| --- |
+| [PINE H64 Model B](/documentation/PINE_H64_Model_B/) |
+| [Schematics and Certifications](/documentation/PINE_H64_Model_B/Further_information/Schematics_and_Certifications/) |
diff --git a/content/devices/pinebook.adoc b/content/devices/pinebook.md
similarity index 57%
rename from content/devices/pinebook.adoc
rename to content/devices/pinebook.md
index 23936d35..7a9a9f7c 100644
--- a/content/devices/pinebook.adoc
+++ b/content/devices/pinebook.md
@@ -10,91 +10,51 @@ aliases:
   - /pinebook
 ---
 
-== A Thin and Light Open Source ARM 64-bit Notebook for Tinkering
+## A Thin and Light Open Source ARM 64-bit Notebook for Tinkering
 
 The PINEBOOK is an 11.6″ notebook powered by the same quad-core ARM Cortex A53 64-Bit Processor used in our popular PINE A64 Single Board Computer. It is very lightweight, hackable and comes equipped with a full-sized keyboard and large multi-touch trackpad. It runs numerous mainline Linux distributions as well as *BSD and Android. The most recent iteration has received an upgrade in the form of a 1080p IPS panel. 
 
 As a new open source platform, Pinebook development is an ongoing process and represents a great opportunity to get involved with computing on a different level, to customize and personalize the portable computer experience, to understand what is going on beneath the surface. If you are looking for a device in a convenient laptop form-factor that you wish to tinker with, then it is safe to say the Pinebook is the right device for you. We do no wish to discourage anyone from getting the Pinebook, but it is not a daily driver, so if you are looking to replace your current work or school laptop it may be wise to look elsewhere. 
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A53 cores @ 1.152 GHz
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.152 GHz |
+| GPU | ARM Mali 400 MP2 GPU |
+| Memory | 2GB LPDDR3 RAM |
+| Display | 1080p IPS panel |
+| Storage | Bootable Micro SD slot <br> 16GB of eMMC (upgradable) |
+| Connections | HD digital video out <br> 2x USB 2.0 Host <br> Lithium polymer battery (10000mAH) <br> Stereo speakers <br> 802.11 b/g/n WiFi with Bluetooth 4.0 <br> 3.5mm headphone jack <br> Microphone <br> 0.3 MP front-facing camera <br> Full-sized keyboard <br> Large trackpad <br> 3.5mm OD/1.35mm ID (5V 3A) port |
 
-| GPU
-| ARM Mali 400 MP2 GPU
-
-| Memory
-| 2GB LPDDR3 RAM
-
-| Display
-| 1080p IPS panel
-
-| Storage
-| Bootable Micro SD slot
-
-16GB of eMMC (upgradable)
-
-| Connections
-| HD digital video out
-
-2x USB 2.0 Host
-
-Lithium polymer battery (10000mAH)
-
-Stereo speakers
-
-802.11 b/g/n WiFi with Bluetooth 4.0
-
-3.5mm headphone jack
-
-Microphone
-
-0.3 MP front-facing camera
-
-Full-sized keyboard
-
-Large trackpad
-
-3.5mm OD/1.35mm ID (5V 3A) port
-
-|===
-
-
-===  Large 10,000 mAh Battery
+### Large 10,000 mAh Battery
 Large 10,000 mAh battery to give all day battery life
 
-===  1080p IPS panel
+### 1080p IPS panel
 11.6" 1080p IPS display 
 
-=== Repairability
+### Repairability
 You can find parts for the Pinebook on the store to fully repair the device
 
-=== Portable
-The Pinebook's light weight and small size make it a extremely portable machine
-
-== Documentation
+### Portable
+The Pinebook’s light weight and small size make it a extremely portable machine
 
-[cols="1"]
-|===
+## Documentation
 
-| link:/documentation/Pinebook/[Pinebook]
+|     |
+| --- |
+| [Pinebook](/documentation/Pinebook/) |
+| [Schematics and certifications](/documentation/Pinebook/Further_information/Schematics_and_certifications/) |
 
-| link:/documentation/Pinebook/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
-
-== Accessories
+## Accessories
 {{< flexbox >}}
 
     {{< devices/device_box link="https://pine64.com/product/pinebook-pinephone-pinetab-serial-console/" img="/devices/images/serial_cable.png" title="Serial Cable" text="Serial console powered by CH340 chipset enables USB-to-Serial-communication through the earphone jack for development.">}}
 
 {{</ flexbox >}}
 
+## Resources
 
-== Resources
-
-* link:https://www.youtube.com/watch?v=tJOc2ZbRB_0[YouTube: Pinebook review showcasing Q4OS]
-* link:https://www.youtube.com/watch?v=t_6AFCg4lRw[YouTube: Seytonic’s review of the Pinebook]
-* link:https://www.youtube.com/watch?v=k1hHRMIod0A[YouTube: MUO review of the Pinebook]
\ No newline at end of file
+* [YouTube: Pinebook review showcasing Q4OS](https://www.youtube.com/watch?v=tJOc2ZbRB_0)
+* [YouTube: Seytonic’s review of the Pinebook](https://www.youtube.com/watch?v=t_6AFCg4lRw)
+* [YouTube: MUO review of the Pinebook](https://www.youtube.com/watch?v=k1hHRMIod0A)
diff --git a/content/devices/pinebook_pro.adoc b/content/devices/pinebook_pro.adoc
deleted file mode 100644
index 58d04b1f..00000000
--- a/content/devices/pinebook_pro.adoc
+++ /dev/null
@@ -1,113 +0,0 @@
----
-title: "Pinebook Pro"
-categories: 
-  - "Laptops"
-cover: 
-  image: "/devices/images/pinebook_pro.png"
-images:
-  - "/devices/images/pinebook_pro.png"
-aliases:
-  - /pinebook-pro
----
-
-== A Powerful, Metal and Open Source ARM 64-Bit Laptop for Work, School or Fun
-
-The Pinebook Pro is meant to deliver solid day-to-day Linux or \*BSD experience and to be a compelling alternative to mid-ranged Chromebooks that people convert into Linux laptops. In contrast to most mid-ranged Chromebooks however, the Pinebook Pro comes with an IPS 1080p 14″ LCD panel, a premium magnesium alloy shell, 64/128GB of eMMC storage* (more on this later – see asterisk below), a 10,000 mAh capacity battery and the modularity / hackability that only an open source project can deliver – such as the unpopulated PCIe m.2 NVMe slot (an optional feature which requires an optional adapter). The USB-C port on the Pinebook Pro, apart from being able to transmit data and charge the unit, is also capable of digital video output up-to 4K at 60hz.
-
-== Features and Specifications
-
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A53 cores @ 1.4GHz  +  2 x ARM Cortex A72 cores @ 1.8 GHz 
-
-| GPU
-| ARM Mali T860 MP4 GPU
-
-| Memory
-| 4GB LPDDR4 RAM
-
-| Display
-| 1080p IPS Panel
-
-| Body
-| Magnesium Alloy Shell body
-
-| Storage
-| Bootable Micro SD Slot
-
-64GB of eMMC (Upgradable)
-
-M.2 NVMe SSD slot (requires optional adapter)
-
-SPI Flash 128Mbit
-
-| Connections
-| HD Digital Video Out via USB-C
-
-USB 2.0 Host
-
-USB 3.0 Host
-
-USB-C (Data, Power and Video out)
-
-Lithium Polymer Battery (10000mAH)
-
-Stereo Speakers
-
-Built-in 802.11ac WiFi with Bluetooth 5.0
-
-Headphone Jack
-
-Microphone
-
-Front-Facing Camera (1080p)
-
-ISO & ANSI Keyboard Variants
-
-Privacy Switches for Camera, Microphones and BT/WiFi
-
-Large Trackpad
-
-UART Access via Audio Jack
-
-Barrel Power (5V 3A) Port
-
-|===
-
-
-=== NVMe SSD Expansion Option
-With a optional adapter it is possible to install a M.2 NVMe SSD into the Pinebook Pro
-
-=== 1080p IPS Panel
-Bright 14" 1080p IPS display gives you a excellent viewing experience
-
-=== Repairability
-You can find parts for the Pinebook Pro on the store to fully repair the device
-
-=== Privacy
-The Pinebook Pro's keyboard firmware includes key combinations to disable the Camera, Microphones, and Bluetooth and WiFi
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Pinebook_Pro/[Pinebook Pro]
-
-| link:/documentation/Pinebook_Pro/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
-
-== Accessories
-{{< flexbox >}}
-
-    {{< devices/device_box link="https://pine64.com/product/pinebook-pinephone-pinetab-serial-console/" img="/devices/images/serial_cable.png" title="Serial Cable" text="Serial console powered by CH340 chipset enables USB-to-Serial-communication through the earphone jack for development.">}}
-
-{{</ flexbox >}}
-
-
-== Resources
-
-* link:https://www.youtube.com/watch?v=l6dGeRUt4dg[YouTube: DistroTube unboxing and review of the Pinebook Pro]
-* link:https://www.youtube.com/watch?v=omhmO6a8NJ0[YouTube: Pinebook Pro teardown]
-* link:https://www.youtube.com/watch?v=cJJBJ4XqpOI[YouTube: Sabrent NVMe drive installation in the Pinebook Pro]
\ No newline at end of file
diff --git a/content/devices/pinebook_pro.md b/content/devices/pinebook_pro.md
new file mode 100644
index 00000000..6fc0381d
--- /dev/null
+++ b/content/devices/pinebook_pro.md
@@ -0,0 +1,59 @@
+---
+title: "Pinebook Pro"
+categories: 
+  - "Laptops"
+cover: 
+  image: "/devices/images/pinebook_pro.png"
+images:
+  - "/devices/images/pinebook_pro.png"
+aliases:
+  - /pinebook-pro
+---
+
+## A Powerful, Metal and Open Source ARM 64-Bit Laptop for Work, School or Fun
+
+The Pinebook Pro is meant to deliver solid day-to-day Linux or \*BSD experience and to be a compelling alternative to mid-ranged Chromebooks that people convert into Linux laptops. In contrast to most mid-ranged Chromebooks however, the Pinebook Pro comes with an IPS 1080p 14″ LCD panel, a premium magnesium alloy shell, 64/128GB of eMMC storage* (more on this later – see asterisk below), a 10,000 mAh capacity battery and the modularity / hackability that only an open source project can deliver – such as the unpopulated PCIe m.2 NVMe slot (an optional feature which requires an optional adapter). The USB-C port on the Pinebook Pro, apart from being able to transmit data and charge the unit, is also capable of digital video output up-to 4K at 60hz.
+
+## Features and Specifications
+
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.4GHz  +  2 x ARM Cortex A72 cores @ 1.8 GHz  |
+| GPU | ARM Mali T860 MP4 GPU |
+| Memory | 4GB LPDDR4 RAM |
+| Display | 1080p IPS Panel |
+| Body | Magnesium alloy shell body |
+| Storage | Bootable microSD slot <br> 64GB of eMMC (upgradable) <br> M.2 NVMe SSD slot (requires optional adapter) <br> SPI flash 128Mbit |
+| Connections | HD Digital Video Out via USB-C <br> USB 2.0 Host <br> USB 3.0 Host <br> USB-C (Data, Power and Video out) <br> Lithium Polymer Battery (10000mAH) <br> Stereo Speakers <br> Built-in 802.11ac WiFi with Bluetooth 5.0 <br> Headphone Jack <br> Microphone <br> Front-Facing Camera (1080p) <br> ISO & ANSI Keyboard Variants <br> Privacy Switches for Camera, Microphones and BT/WiFi <br> Large Trackpad <br> UART Access via Audio Jack <br> Barrel Power (5V 3A) Port |
+
+### NVMe SSD Expansion Option
+With a optional adapter it is possible to install a M.2 NVMe SSD into the Pinebook Pro
+
+### 1080p IPS Panel
+Bright 14" 1080p IPS display gives you a excellent viewing experience
+
+### Repairability
+You can find parts for the Pinebook Pro on the store to fully repair the device
+
+### Privacy
+The Pinebook Pro’s keyboard firmware includes key combinations to disable the Camera, Microphones, and Bluetooth and WiFi
+
+## Documentation
+
+|     |
+| --- |
+| [Pinebook Pro](/documentation/Pinebook_Pro/) |
+| [Schematics and certifications](/documentation/Pinebook_Pro/Further_information/Schematics_and_certifications/) |
+
+## Accessories
+{{< flexbox >}}
+
+    {{< devices/device_box link="https://pine64.com/product/pinebook-pinephone-pinetab-serial-console/" img="/devices/images/serial_cable.png" title="Serial Cable" text="Serial console powered by CH340 chipset enables USB-to-Serial-communication through the earphone jack for development.">}}
+
+{{</ flexbox >}}
+
+## Resources
+
+* [YouTube: DistroTube unboxing and review of the Pinebook Pro](https://www.youtube.com/watch?v=l6dGeRUt4dg)
+* [YouTube: Pinebook Pro teardown](https://www.youtube.com/watch?v=omhmO6a8NJ0)
+* [YouTube: Sabrent NVMe drive installation in the Pinebook Pro](https://www.youtube.com/watch?v=cJJBJ4XqpOI)
diff --git a/content/devices/pinebuds_pro.adoc b/content/devices/pinebuds_pro.md
similarity index 71%
rename from content/devices/pinebuds_pro.adoc
rename to content/devices/pinebuds_pro.md
index 37db0dc3..fb0f282c 100644
--- a/content/devices/pinebuds_pro.adoc
+++ b/content/devices/pinebuds_pro.md
@@ -8,17 +8,13 @@ images:
   - "/devices/images/pinebudspro.jpg"
 ---
 
-== The PineBuds Pro
+## The PineBuds Pro
 
 The PineBuds Pro are open firmware capable ANC wireless earbuds. Some of the notable features include their light weight, 3 Microphones, ANC (Active Noise Cancellation), ENC (Environment Noise Cancellation) and high fidelity 6mm speaker. It is a fully community-driven side-project which anyone can contribute to, allowing you to keep control of your device even though hardware is proprietary.
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PineBuds_Pro/[PineBuds Pro]
-
-| link:/documentation/PineBuds_Pro/Further_information/Schematics_and_Certifications[Schematics and Certifications]
-|===
\ No newline at end of file
+|     |
+| --- |
+| [PineBuds Pro](/documentation/PineBuds_Pro/) |
+| [Schematics and Certifications](/documentation/PineBuds_Pro/Further_information/Schematics_and_Certifications) |
diff --git a/content/devices/pinecil.adoc b/content/devices/pinecil.adoc
deleted file mode 100644
index 55f1822c..00000000
--- a/content/devices/pinecil.adoc
+++ /dev/null
@@ -1,67 +0,0 @@
----
-title: "Pinecil"
-categories: 
-  - "Soldering irons"
-cover: 
-  image: "/devices/images/pinecil.png"
-images:
-  - "/devices/images/pinecil.png"
----
-
-== RISC-V Soldering Iron Running an Open Firmware
-
-The Pinecil is a smart mini portable soldering iron with a 32-bit RISC-V SoC featuring a sleek design, auto standby and it heats up to an operating temperature in just 12 seconds when paired with a sufficiently powerful power supply unit – such as the PinePower. It runs a community built firmware that is simple to update and altered to your use-case need. We offer a wide selection of tips for the Pinecil in the Pine Store, so the soldering iron is ready to aid you in whatever projects you’re about to undertake.
-
-== Features and Specifications
-
-[cols="1"]
-|===
-| 17cm x 12cm x 2.3cm
-| 88 gram weight
-| 170mm (98mm without the solder tip)  x 12.8mm x 16.2mm
-| 30g weight with solder tip (20g weight without solder tip)
-| Black plastic build with metal clip (handle)
-| Ralim’s IronOS operating system
-| GigaDevice GD32VF103TB chipset
-| 32-bit RV32IMAC RISC-V “Bumblebee Core” @ 108 MHz
-| 0.69″ OLED white color monochrome display with 96x16p resolution
-| 128KB Flash
-| 32KB SRAM
-| USB-C PD and QC 3.0 12V-20V 3A
-| DC5525, 12V-21V DC 3A barrel jack
-| Capable of receiving power from either USB-C port or barrel jack
-| GPIO break-out through USB-C port
-| Type B2 soldering tip as default
-|===
-
-
-=== USB-C Power Delivery
-
-USB-C PD for delivering optimal power
-
-=== OLED
-
-Built-in white color monochrome display
-
-=== GPIO Break-Out
-
-Optional GPIO breakout for development purposes
-
-=== 32 Bit RISC-V Processor
-
-32-bit RV32IMAC RISC-V processor running open firmware
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Pinecil/[Pinecil]
-
-| link:/documentation/Pinecil/Further_information/Certifications/[Certifications]
-|===
-
-== Resources
-
-* link:https://www.youtube.com/watch?v=-u_o-yNjpzs[YouTube: Pinecil soldering iron powered by a PinePower Desktop unit]
-* link:https://www.youtube.com/watch?v=CwvorvU5v4E[YouTube: Pinecil soldering iron review by Level1Techs]
diff --git a/content/devices/pinecil.md b/content/devices/pinecil.md
new file mode 100644
index 00000000..5e2cb588
--- /dev/null
+++ b/content/devices/pinecil.md
@@ -0,0 +1,62 @@
+---
+title: "Pinecil"
+categories: 
+  - "Soldering irons"
+cover: 
+  image: "/devices/images/pinecil.png"
+images:
+  - "/devices/images/pinecil.png"
+---
+
+## RISC-V Soldering Iron Running an Open Firmware
+
+The Pinecil is a smart mini portable soldering iron with a 32-bit RISC-V SoC featuring a sleek design, auto standby and it heats up to an operating temperature in just 12 seconds when paired with a sufficiently powerful power supply unit – such as the PinePower. It runs a community built firmware that is simple to update and altered to your use-case need. We offer a wide selection of tips for the Pinecil in the Pine Store, so the soldering iron is ready to aid you in whatever projects you’re about to undertake.
+
+## Features and Specifications
+
+|     |
+| --- |
+| 17cm x 12cm x 2.3cm |
+| 88 gram weight |
+| 170mm (98mm without the solder tip)  x 12.8mm x 16.2mm |
+| 30g weight with solder tip (20g weight without solder tip) |
+| Black plastic build with metal clip (handle) |
+| Ralim’s IronOS operating system |
+| GigaDevice GD32VF103TB chipset |
+| 32-bit RV32IMAC RISC-V “Bumblebee Core” @ 108 MHz |
+| 0.69″ OLED white color monochrome display with 96x16p resolution |
+| 128KB Flash |
+| 32KB SRAM |
+| USB-C PD and QC 3.0 12V-20V 3A |
+| DC5525, 12V-21V DC 3A barrel jack |
+| Capable of receiving power from either USB-C port or barrel jack |
+| GPIO break-out through USB-C port |
+| Type B2 soldering tip as default |
+
+### USB-C Power Delivery
+
+USB-C PD for delivering optimal power
+
+### OLED
+
+Built-in white color monochrome display
+
+### GPIO Break-Out
+
+Optional GPIO breakout for development purposes
+
+### 32 Bit RISC-V Processor
+
+32-bit RV32IMAC RISC-V processor running open firmware
+
+## Documentation
+
+|     |
+| --- |
+| [Pinecil](/documentation/Pinecil/) |
+| [Certifications](/documentation/Pinecil/Further_information/Certifications/) |
+
+## Resources
+
+* [YouTube: Pinecil soldering iron powered by a PinePower Desktop unit](https://www.youtube.com/watch?v=-u_o-yNjpzs)
+* [YouTube: Pinecil soldering iron review by Level1Techs](https://www.youtube.com/watch?v=CwvorvU5v4E)
diff --git a/content/devices/pinecone.adoc b/content/devices/pinecone.adoc
deleted file mode 100644
index a518198b..00000000
--- a/content/devices/pinecone.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: "PineCone"
-categories: 
-  - ""
-cover: 
-  image: "/devices/images/Pine64_BL602_EVB_photo-3-small.jpg"
-images:
-  - "/devices/images/Pine64_BL602_EVB_photo-3-small.jpg"
----
-
-== The PineCone: A board to blob-Free WiFi & BLE
-
-The PineCone is a BL602 evaluation board, which was developed with the goal to challenge the open source community to achieve blob-free and free and open source WiFi and Bluetooth, see the https://www.pine64.org/2020/10/28/nutcracker-challenge-blob-free-wifi-ble/[Nutcracker Challenge].
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PineCone/[PineCone]
-
-| link:/documentation/PineCone/Further_information/[Further information]
-|===
diff --git a/content/devices/pinecone.md b/content/devices/pinecone.md
new file mode 100644
index 00000000..6bcbae15
--- /dev/null
+++ b/content/devices/pinecone.md
@@ -0,0 +1,20 @@
+---
+title: "PineCone"
+categories: 
+  - ""
+cover: 
+  image: "/devices/images/Pine64_BL602_EVB_photo-3-small.jpg"
+images:
+  - "/devices/images/Pine64_BL602_EVB_photo-3-small.jpg"
+---
+
+## The PineCone: A board to blob-Free WiFi & BLE
+
+The PineCone is a BL602 evaluation board, which was developed with the goal to challenge the open source community to achieve blob-free and free and open source WiFi and Bluetooth, see the [Nutcracker Challenge](https://www.pine64.org/2020/10/28/nutcracker-challenge-blob-free-wifi-ble/).
+
+## Documentation
+
+|     |
+| --- |
+| [PineCone](/documentation/PineCone/) |
+| [Further information](/documentation/PineCone/Further_information/) |
diff --git a/content/devices/pinecube.adoc b/content/devices/pinecube.md
similarity index 57%
rename from content/devices/pinecube.adoc
rename to content/devices/pinecube.md
index 791acaae..73534a10 100644
--- a/content/devices/pinecube.adoc
+++ b/content/devices/pinecube.md
@@ -8,59 +8,52 @@ images:
   - "/devices/images/pinecube.jpg"
 ---
 
-== Who is Looking at You? The CUBE is an Open Source IP Cam Under Your Control
+## Who is Looking at You? The CUBE is an Open Source IP Cam Under Your Control
 
 The CUBE is a small, low-powered, open source IP camera. Whether you’re a parent looking for a FOSS baby-camera, a privacy oriented shop keeper, home owner looking for a security camera, or perhaps a tinkerer needing a camera for your drone – the CUBE can be the device for you. Featuring an 5MPx Omnivision sensor and IR LEDs for night vision, as well as Power Over Ethernet, and a microphone, the use-cases for this little camera are limitless.
 
 Being a FOSS device means that the CUBE remains under your, and only your, control at all times. This is a rather important factor for a device that has a camera and a microphone installed, wouldn’t you say?
 
-== Features and Specifications
-
-[cols="1"]
-|===
-| Allwinner S3 Cortex-A7
-| 128MB DDR3
-| 128Mb SPI Flash
-| mSD slot
-| 5 MPx OV5640 sensor
-| 10/100M Ethernet
-| 802.11 b/g/n WiFi
-| Bluetooth 4.1
-| USB 2.0
-| 26 pin GPIO header
-| Microphone
-| Passive Power Over Ethernet (PoE)
-| Interchangeable M12 lens type (wide, fisheye, zoom, etc.,)
-| IR LEDs for night vision
-| Optional 4.5″ RGB LCD screen
-| Battery support
-|===
-
-
-=== Power Over Ethernet
+## Features and Specifications
+
+|     |
+| --- |
+| Allwinner S3 Cortex-A7 |
+| 128MB DDR3 |
+| 128Mb SPI Flash |
+| mSD slot |
+| 5 MPx OV5640 sensor |
+| 10/100M Ethernet |
+| 802.11 b/g/n WiFi |
+| Bluetooth 4.1 |
+| USB 2.0 |
+| 26 pin GPIO header |
+| Microphone |
+| Passive Power Over Ethernet (PoE) |
+| Interchangeable M12 lens type (wide, fisheye, zoom, etc.,) |
+| IR LEDs for night vision |
+| Optional 4.5″ RGB LCD screen |
+| Battery support |
+
+### Power Over Ethernet
 
 Power the Pinecube using Power Over Ethernet
 
-=== Night Vision
+### Night Vision
 
 With built-in IR the Pinecube can see in the dark
 
-=== Bluetooth
+### Bluetooth
 
 Built-in Bluetooth and 802.11 b/g/n WiFi
 
-=== 26 GPIO Pins
+### 26 GPIO Pins
 
 GPIO pins to allow further functionality in your project
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PineCube/[PineCube]
-
-| link:/documentation/PineCube/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
-
+|     |
+| --- |
+| [PineCube](/documentation/PineCube/) |
+| [Schematics and certifications](/documentation/PineCube/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/pinedio.adoc b/content/devices/pinedio.adoc
deleted file mode 100644
index 74348335..00000000
--- a/content/devices/pinedio.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: "Pinedio"
-categories: 
-  - ""
-cover: 
-  image: ""
-images:
-  - ""
----
-
-== The Pinedio
-
-The Pinedio is a device utilizing LoRa. LoRa is a long range, low power wireless platform that is being used by a lot of Internet of Things (IoT) products. Using LoRa and LoRaWAN, devices can communicate across the world using the internet, using various decentralised networks such as https://www.thethingsnetwork.org/[The Things Network] or https://www.helium.com/[Helium]. Since, PINE64 believes in openness, the LoRa gateway can connect to any network, per the developer implementation. If Helium Spots open up for PINE64 gateway and developers have implemented the hook for Helium, then this is good thing. The PINE64 LoRa gateway also open connect to The Things Network if developers implement support. The choice is yours!
-
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Pinedio/[Pinedio]
-
-| link:/documentation/Pinedio/Datasheets_and_schematics/[Datasheets and schematics]
-|===
diff --git a/content/devices/pinedio.md b/content/devices/pinedio.md
new file mode 100644
index 00000000..f95f7e53
--- /dev/null
+++ b/content/devices/pinedio.md
@@ -0,0 +1,20 @@
+---
+title: "Pinedio"
+categories: 
+  - ""
+cover: 
+  image: ""
+images:
+  - ""
+---
+
+## The Pinedio
+
+The Pinedio is a device utilizing LoRa. LoRa is a long range, low power wireless platform that is being used by a lot of Internet of Things (IoT) products. Using LoRa and LoRaWAN, devices can communicate across the world using the internet, using various decentralised networks such as [The Things Network](https://www.thethingsnetwork.org/) or [Helium](https://www.helium.com/). Since, PINE64 believes in openness, the LoRa gateway can connect to any network, per the developer implementation. If Helium Spots open up for PINE64 gateway and developers have implemented the hook for Helium, then this is good thing. The PINE64 LoRa gateway also open connect to The Things Network if developers implement support. The choice is yours!
+
+## Documentation
+
+|     |
+| --- |
+| [Pinedio](/documentation/Pinedio/) |
+| [Datasheets and schematics](/documentation/Pinedio/Datasheets_and_schematics/) |
diff --git a/content/devices/pinenote.adoc b/content/devices/pinenote.md
similarity index 57%
rename from content/devices/pinenote.adoc
rename to content/devices/pinenote.md
index f5cd8849..7c27df38 100644
--- a/content/devices/pinenote.adoc
+++ b/content/devices/pinenote.md
@@ -8,71 +8,44 @@ images:
   - "/devices/images/pinenote.jpg"
 ---
 
-== One of the most powerful Linux-based Eink tablets
+## One of the most powerful Linux-based Eink tablets
 
 Introducing the PineNote – A new early adopter Linux Eink tablet. The 1404 x 1872 resolution Eink panel with a fast refresh rate has 16 levels of grayscale and is not only contained by a hardened scratch-resistant glass with an anti-glare coating and a wacom EMR layer, but it also contains a frontlight with white or amber illumination settings. Powered by a powerful and efficient RK3566 SoC with four A55 cores, and backed by 4GBs of RAM and 128GBs of eMMC storage this will be a powerful portable device capable of taking notes, writing and reading documents, reading books, terminal usage, and more.
 
 The first batch of the PineNote will be great to write software for, but not great to write notes on. Wait for a later batch with better preinstalled software if you just want to use the device as an e-reader, e-note, or your everyday computing device.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A55 cores @ 1.8 GHz
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A55 cores @ 1.8 GHz |
+| GPU | ARM Mali G52 MP2 GPU |
+| Memory | 4GB LPDDR4 RAM |
+| Networking | Built-in 802.11ac WiFi and Bluetooth 5 |
+| Storage | 128GB eMMC storage |
+| Display | 10.3″ 1404×1872 (227 DPI) 16 grayscale multi-touch Eink panel <br> 36 levels of cold and warm frontlighting <br> Scratch and glare resistant hardened glass <br> Optional Wacom EMR pen |
+| Power | 4,000mAh battery |
+| Connections | 4 x DMIC microphones <br> G-Sensor for rotation sensing <br> 1.3W stereo speaker<br> USB-C charging port (2.0) <br> Optional magnetic cover (hall sensor) |
 
-| GPU
-| ARM Mali G52 MP2 GPU
-
-| Memory
-| 4GB LPDDR4 RAM
-
-| Networking
-| Built-in 802.11ac WiFi and Bluetooth 5
-
-| Storage
-| 128GB eMMC storage
-
-| Display
-| 10.3″ 1404×1872 (227 DPI) 16 grayscale multi-touch Eink panel +
-36 levels of cold and warm frontlighting +
-Scratch and glare resistant hardened glass +
-Optional Wacom EMR pen
-
-| Power
-| 4,000mAh battery
-
-| Connections
-| 4 x DMIC microphones +
-G-Sensor for rotation sensing +
-1.3W stereo speaker +
-USB-C charging port (2.0) +
-Optional magnetic cover (hall sensor)
-|===
-
-=== 10.3" Anti-Glare Eink Display
+### 10.3" Anti-Glare Eink Display
 
 Take notes with the pen, read and write documents on the fly, or simply read a good book while relaxing.
 
-=== Quad-Core RK3566 SoC
+### Quad-Core RK3566 SoC
 
 Powered by a powerful and efficient RK3566 SoC with four A55 cores and a Mali G52 GPU
 
-=== Magnesium Alloy Case
+### Magnesium Alloy Case
 
 A premium-feeling 7mm thick Magnesium Alloy casing with a magnetic cover
 
-=== Wireless Connectivity
+### Wireless Connectivity
 
 Expand what you can do with the device thanks to onboard WiFi and Bluetooth
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PineNote/[PineNote]
-
-| link:/documentation/PineNote/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
+|     |
+| --- |
+| [PineNote](/documentation/PineNote/) |
+| [Schematics and certifications](/documentation/PineNote/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/pinenut.adoc b/content/devices/pinenut.md
similarity index 57%
rename from content/devices/pinenut.adoc
rename to content/devices/pinenut.md
index 51bd3b95..5320039e 100644
--- a/content/devices/pinenut.adoc
+++ b/content/devices/pinenut.md
@@ -8,49 +8,43 @@ images:
   - "/devices/images/pinenut.jpg"
 ---
 
-== PineNut, an Attempt to Open Source WiFi and BLE module for PINE64 devices
+## PineNut, an Attempt to Open Source WiFi and BLE module for PINE64 devices
 
 The Pinenut-01S module offers a complete and self-contained Wi-Fi and BLE networking solution, allowing it to either host the application or to offload all Wi-Fi and Bluetooth networking functions to another application processor. We are actively working together with the PINE64 community to open source as much as possible of the WiFi and BLE stack of the PineNut. In time, we hope to use the PineNut as base for open Wifi implementations in our flagship devices.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1"]
-|===
-| Built-in antenna
-| Powered by Pineseed BL602 SoC
-| 32-bit RV32IMAFC RISC-V “SiFive E24 Core”
-| 2MB Flash Size
-| Serial/UART baud rate: 115200 bps
-| Input power: 3.3V
-| I/O voltage tolerance: 3.6V Max
-| Eight pin interface, VCC-3V3, GND, RST TXD and RXD. Three extra GPIOs can be used for ADC, PWM, i2C, or UART functions
-| Three built-in LEDs for output and one push button input
-| Dimensions: 14.3 x 24.8mm
-|===
+|     |
+| --- |
+| Built-in antenna |
+| Powered by Pineseed BL602 SoC |
+| 32-bit RV32IMAFC RISC-V “SiFive E24 Core” |
+| 2MB Flash Size |
+| Serial/UART baud rate: 115200 bps |
+| Input power: 3.3V |
+| I/O voltage tolerance: 3.6V Max |
+| Eight pin interface, VCC-3V3, GND, RST TXD and RXD. Three extra GPIOs can be used for ADC, PWM, i2C, or UART functions |
+| Three built-in LEDs for output and one push button input |
+| Dimensions: 14.3 x 24.8mm |
 
-
-=== Built-In Antenna
+### Built-In Antenna
 
 Use the PineNut for a robotics project.
 
-=== Pineseed BL602 SoC
+### Pineseed BL602 SoC
 
 Powered by a Pineseed RISC-V BL602 SoC
 
-=== Power Tolerance
+### Power Tolerance
 
 Input power tolerance range of 3.3V-3.6V
 
-=== GPIO Interface
+### GPIO Interface
 
 Plenty of I/O to allow for greater functionality in your project
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PineCone/[PineCone]
-
-|===
+|     |
+| --- |
+| [PineCone](/documentation/PineCone/) |
diff --git a/content/devices/pinephone.adoc b/content/devices/pinephone.md
similarity index 60%
rename from content/devices/pinephone.adoc
rename to content/devices/pinephone.md
index 881d16de..5a453800 100644
--- a/content/devices/pinephone.adoc
+++ b/content/devices/pinephone.md
@@ -10,90 +10,64 @@ aliases:
   - /pinephone
 ---
 
-== An Open Source Smartphone Supported by All Major Linux Phone Projects
+## An Open Source Smartphone Supported by All Major Linux Phone Projects
 
-The *PinePhone* is a smartphone that empowers users with control over the device. It is capable of running mainline Linux, features hardware privacy switches, and is designed for open-source enthusiasts. Powered by the same quad-core ARM Cortex A53 64-Bit SoC used in our popular PINE A64 Single Board Computer, the PinePhone runs mainline Linux as well as anything else you’ll get it to run. 
+The **PinePhone** is a smartphone that empowers users with control over the device. It is capable of running mainline Linux, features hardware privacy switches, and is designed for open-source enthusiasts. Powered by the same quad-core ARM Cortex A53 64-Bit SoC used in our popular PINE A64 Single Board Computer, the PinePhone runs mainline Linux as well as anything else you’ll get it to run. 
 
 The purpose of the PinePhone isn’t only to deliver a functioning Linux phone to end-users, but also to actively create a market for such a device, as well as to support existing and well established Linux-on-Phone projects. All major Linux Phone-oriented projects, as well as other free and open source operating systems, are represented on the PinePhone and developers work together on our platform to bring support to this community-driven device.
 
-== Features and Specifications
-
-[cols="1,1"]
-|===
-| SoC
-| 
-
-| GPU
-| 
-
-| Memory
-| 
-
-| Networking
-| 
-
-| Storage
-| 
-
-| Connections
-
-    4 x ARM Cortex A53 cores @ 1.152 GHz
-    ARM Mali 400 MP2 GPU
-    2GB / 3GB LPDDR3 RAM
-    5.95″ LCD 1440×720, 18:9 aspect ratio (hardened glass)
-    Bootable Micro SD
-    16GB / 32GB eMMC
-    HD digital video out
-    USB Type C (Power, Data and Video Out)
-    Quectel EG25-G with worldwide bands
-    Built-in 802.11 b/g/n WiFi with Bluetooth: 4.0
-    GNSS: GPS, GPS-A, GLONASS
-    Vibration motor
-    RGB status LED
-    Selfie and Main camera (2/5Mpx respectively)
-    Main Camera: Single OV5640, 5MP, 1/4″, LED Flash
-    Selfie Camera: Single GC2035, 2MP, f/2.8, 1/5″
-    Sensors: accelerator, gyro, proximity, compass, ambient light
-    3 External Switches: volume up, volume down, and power
-    Hardware switches: LTE/GNSS, WiFi, Microphone, Speaker, Cameras
-    Six pogo pins allowing for custom hardware extensions such as a thermal camera, wireless charging, NFC, a extended battery case, or keyboard case
-    Samsung J7 form-factor 3000mAh battery
-    Case is matte black finished plastic
-    Headphone jack
-
-
-|===
-
-
-=== Extensibility
-
-You can use the PinePhone's six pogo pins to add a variety of attachments such as a keyboard or wireless charging case
-
-=== Convergence
+## Features and Specifications
+
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.152 GHz |
+| GPU | ARM Mali 400 MP2 GPU |
+| Memory | 2GB / 3GB LPDDR3 RAM |
+| Display | 5.95″ LCD 1440×720, 18:9 aspect ratio (hardened glass) |
+| Storage | Bootable microSD <br> 16GB / 32GB eMMC |
+| Modem | Quectel EG25-G with worldwide bands |
+| Wi-Fi | Built-in 802.11 b/g/n WiFi |
+| Bluetooth | Bluetooth 4.0 |
+| Navigation | GNSS: GPS, GPS-A, GLONASS |
+| Cameras | Selfie and Main camera (2/5Mpx respectively) |
+| Main Camera | Single OV5640, 5MP, 1/4″, LED Flash |
+| Selfie Camera | Single GC2035, 2MP, f/2.8, 1/5″ |
+| Sensors | Accelerator, gyro, proximity, compass, ambient light |
+| 3 External Switches | volume up, volume down, and power |
+| Privacy switches | LTE/GNSS, WiFi, Microphone, Speaker, Cameras |
+| Video | HD digital video out |
+| USB | USB Type C (Power, Data and Video Out) |
+| Vibration motor |
+| Light | RGB status LED |
+| Extensibility | Six pogo pins allowing for custom hardware extensions such as a thermal camera, wireless charging, NFC, a extended battery case, or keyboard case |
+| Battery | Samsung J7 form-factor 3000mAh battery |
+| Case | Case is matte black finished plastic |
+| Headphone jack |
+
+### Extensibility
+
+You can use the PinePhone’s six pogo pins to add a variety of attachments such as a keyboard or wireless charging case
+
+### Convergence
 
 Hooked up to a external monitor the PinePhone can used as a small low-powered portable computer
 
-=== Repairability
+### Repairability
 
 You can find parts for the PinePhone on the store to fully repair or upgrade your device
 
-=== Privacy
+### Privacy
 
 Five hardware switches allow you to disable the cameras, microphone, WiFi and Bluetooth, and the LTE modem
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PinePhone/[PinePhone]
+|     |
+| --- |
+| [PinePhone](/documentation/PinePhone/) |
+| [Schematics and certifications](/documentation/PinePhone/Further_information/Schematics_and_certifications/) |
 
-| link:/documentation/PinePhone/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
-
-
-== Accessories
+## Accessories
 {{< flexbox >}}
 
     {{< devices/device_box link="/documentation/Phone_Accessories/Keyboard/" img="/documentation/images/PP_KB_Front-1024x576.jpg" title="PinePhone (Pro) Keyboard" text="The keyboard add-on for the PinePhone and PinePhone Pro adds a physical keyboard and a large battery.">}}
@@ -118,10 +92,8 @@ Five hardware switches allow you to disable the cameras, microphone, WiFi and Bl
 
 {{</ flexbox >}}
 
-== Resources
-
-* link:https://www.youtube.com/watch?v=fCKMxzz9cjs[YouTube: ShortCircuit review of the PinePhone]
-
-* link:https://www.youtube.com/watch?v=6TKpJsXDDng[YouTube: PinePhone Beta edition quickstart guide]
+## Resources
 
-* link:https://www.youtube.com/watch?v=7sxmGxuCM4g[YouTube: A showcase of a early developer unit of PinePhone keyboards which interfaces with the pogo pins]
+* [YouTube: ShortCircuit review of the PinePhone](https://www.youtube.com/watch?v=fCKMxzz9cjs)
+* [YouTube: PinePhone Beta edition quickstart guide](https://www.youtube.com/watch?v=6TKpJsXDDng)
+* [YouTube: A showcase of a early developer unit of PinePhone keyboards which interfaces with the pogo pins](https://www.youtube.com/watch?v=7sxmGxuCM4g)
diff --git a/content/devices/pinephone_pro.adoc b/content/devices/pinephone_pro.md
similarity index 77%
rename from content/devices/pinephone_pro.adoc
rename to content/devices/pinephone_pro.md
index a98bb54b..403006e1 100644
--- a/content/devices/pinephone_pro.adoc
+++ b/content/devices/pinephone_pro.md
@@ -12,118 +12,37 @@ aliases:
 
 Meet the PinePhone Pro, our flagship smartphone and the best way to experience mainline Linux on a mobile device.
 
-//== Introduction video
-
-//< youtube id="wP2-6Z74W44" >
-
-== Features and Specifications
-
-[cols="1,1"]
-|===
-| System on Chip (SoC)
-| Rockchip RK3399S 64bit SoC – 2x A72 and 4x A53 CPU cores @ 1.5GHz
-
-| GPU
-| ARM Mali T860 4x core GPU @ 500MHz
-
-| RAM
-| 4GB LPDDR4 @ 800MHz
-
-| Storage
-| 128GB eMMC flash storage
-
-Optional micro SD card (SDXC up-to 2TB)
-
-| LCD panel
-| 6″ 1440 x 720 in-cell IPS with Gorilla Glass 4™ 
-
-| Cameras
-| 13MP Sony IMX258 main camera with Gorilla Glass 4™  protective layer
-
-8MP OmniVision OV8858 front-facing camera
-
-| Modem & GPS
-| Quectel EG25-G – global GSM and CDMA bands
-
-GPS, GPS-A, GLONASS
-
-| WiFi & Bluetooth
-| AMPAK AP6255 WiFi 11ac + Bluetooth V4.1
-
-| I/O
-| Micro SD slot
-
-Pogo-pins (OG PinePhone compatible)
-
-USB-C- power, data (USB 3.0), and DP alt-mode video out
-
-| Sensors
-| Accelerator
-
-Gyroscope
-
-Proximity
-
-Compass
-
-Ambient light
-
-| Privacy hardware switches
-| Cameras
-
-Microphone
-
-WiFi and Bluetooth
-
-LTE modem (including GPS)
-
-Headphones (to enable UART output)
-
-| External buttons
-| Volume up / down rocker
-
-Power ON/ OFF
-
-| Audio Out
-| Headset speaker
-
-Audio jack
-
-Loud Speaker
-
-| Other
-| Flash / Torch
-
-Vibration motor
-
-Status LED
-
-UART via audio jack
-
-| Battery
-| Samsung J7 form-factor 3000mAh
-
-| Charging
-| 5V 3A (15W) Quick Charge – USB Power Delivery specification
-
-| Dimensions
-| 160.8 x 76.6 x 11.1mm
-
-| Weight
-| Approx. 215g
-|===
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PinePhone_Pro/[PinePhone Pro]
-
-| link:/documentation/PinePhone_Pro/Further_information/Datasheets_schematics_and_certifications/[Datasheets, schematics and certifications]
-|===
-
-== What’s inside?
+## Features and Specifications
+
+|     |     |
+| --- | --- |
+| System on Chip (SoC) | Rockchip RK3399S 64bit SoC – 2x A72 and 4x A53 CPU cores @ 1.5GHz |
+| GPU | ARM Mali T860 4x core GPU @ 500MHz |
+| RAM | 4GB LPDDR4 @ 800MHz |
+| Storage | 128GB eMMC flash storage <br> Optional micro SD card (SDXC up-to 2TB) |
+| LCD panel | 6″ 1440 x 720 in-cell IPS with Gorilla Glass 4™  |
+| Cameras | 13MP Sony IMX258 main camera with Gorilla Glass 4™  protective layer <br> 8MP OmniVision OV8858 front-facing camera |
+| Modem & GPS | Quectel EG25-G – global GSM and CDMA bands <br> GPS, GPS-A, GLONASS |
+| WiFi & Bluetooth | AMPAK AP6255 WiFi 11ac + Bluetooth V4.1 |
+| I/O | MicroSD slot <br> Pogo-pins (compatible with the original PinePhone) <br> USB-C power, data (USB 3.0) and DP alt-mode video out |
+| Sensors | Accelerator <br> Gyroscope <br> Proximity <br> Compass <br> Ambient light |
+| Privacy hardware switches | Cameras <br> Microphone <br> WiFi and Bluetooth <br> LTE modem (including GPS) <br> Headphones (to enable UART output) |
+| External buttons | Volume up / down rocker <br> Power ON/ OFF |
+| Audio Out | Headset speaker <br> Audio jack <br> Loud Speaker |
+| Other | Flash / Torch <br> Vibration motor <br> Status LED <br> UART via audio jack |
+| Battery | Samsung J7 form-factor 3000mAh |
+| Charging | 5V 3A (15W) Quick Charge – USB Power Delivery specification |
+| Dimensions | 160.8 x 76.6 x 11.1mm |
+| Weight | Approx. 215g |
+
+## Documentation
+
+|     |
+| --- |
+| [PinePhone Pro](/documentation/PinePhone_Pro/) |
+| [Datasheets, schematics and certifications](/documentation/PinePhone_Pro/Further_information/Datasheets_schematics_and_certifications/) |
+
+## What’s inside?
 
 We learned a lot from working on the original PinePhone. Over the past two years we painstakingly collected and analyzed your feedback and explored all avenues for hardware improvements. The PinePhone Pro is the end result of this journey. It is powered by a Rockchip hexa-core SoC operating at 1.5GHz, and ships paired with 4GB of dual-channel LPDDR4 RAM as well as 128GB of internal eMMC flash storage. It features a high-fidelity 13MP main camera sensor and a 5MP front-facing camera.
 
@@ -131,8 +50,7 @@ We worked closely with Rockchip’s engineering team to fine-tune the SoC’s pe
 
 Hardware privacy dip switches for the cameras, the microphone, WiFi & BT, headphone jack (enabling UART) and the LTE modem (including GPS) are accessible under the back cover, just as on the original PinePhone.
 
-
-== What’s the outside like?
+## What’s the outside like?
 
 We wanted the PinePhone Pro to reflect its status as a pro-grade device while maintaining perfect compatibility with all existing PinePhone peripherals. The PinePhone Pro uses the same pogo-pin systems and back cover attachment as the original PinePhone, making it compatible with all existing add-ons. The keyboard, PineDio LoRa, fingerprint reader and wireless charging cases will all work with the PinePhone Pro. 
 
@@ -140,40 +58,27 @@ The PinePhone Pro features a vibrant in-cell IPS display covered with Corning Go
 
 The chassis is slightly thicker (~2mm) than the original PinePhone’s. Proportions of the original design were altered to accommodate the new display and to allow for improved heat dissipation. The coating on the back of the PinePhone Pro has been given a premium feel and engineered to minimize oily fingerprints. We think you’ll be pleased with the end-result. 
 
-
-== Who is it for?
+## Who is it for?
 
 Contemporary mobile Linux operating systems have a way to go before they can be considered true alternatives to Android or iOS. While mobile Linux isn’t in a state that could satisfy most mainstream electronics consumers, we recognize that a sizable portion of our community is ready to make the jump to a Linux-only smartphone today. The PinePhone Pro has the raw horsepower to be your daily driver, granted you’re ready to accept the current software limitations. 
 
 In a nutshell: if you are an existing PinePhone owner and your only wish is for the device to be more powerful and refined, then the PinePhone Pro is for you
 
-
-== Who isn’t it for?
+## Who isn’t it for?
 
 We’re not in the business of selling empty promises – a much faster mainline Linux smartphone won’t make the existing operating systems more refined, nor will it magically spawn software replacements for your iOS or Android applications. There is a long road ahead of us, all of us, and it will require time and effort for the software to reach a degree of maturity that would satisfy mainstream users.
 
 If you depend on proprietary mainstream mobile messenger applications, banking applications, use loyalty or travel apps, consume DRM media, or play mobile video games on your fruit or Android smartphone, then the PinePhone Pro is likely not for you.
 
-////
-// TODO: This section to be reworked as its language is too marketing-like
-
-== How’s the performance?
-
-Tasks such as opening applications, browsing the internet, interacting with the user interface or watching videos are on par with recent mid-range Android smartphones. Many of you will also be happy to hear that native Linux games as well as popular retro game emulators work great on the PinePhone Pro – be it SuperTuxKart, PSP, or Dreamcast emulation, you’ll be in for a treat. 
-
-When docked and connected to an external monitor and keyboard and mouse, the PinePhone Pro performs well when surfing the web, using the terminal or an office suite, watching 1080p videos, and even in light photo editing. The perfect pocketable Linux computer on the go.
-////
-
-== What does it run? 
+## What does it run? 
 
 Openness means privacy and security as well as software choice. Just as the original PinePhone, the PinePhone Pro runs mainline Linux (with patches, which are being upstreamed) with open source drivers. 
 
-
-== Where do I learn more?
+## Where do I learn more?
 
 More information about the PinePhone Pro will be available in the days and weeks to come. We encourage you to read the October Community Update featuring an explanation of the rationale behind bringing the PinePhone Pro to the market and an account of our team’s decision-making process.
 
-== Accessories
+## Accessories
 {{< flexbox >}}
 
     {{< devices/device_box link="/documentation/Phone_Accessories/Keyboard/" img="/documentation/images/PP_KB_Front-1024x576.jpg" title="PinePhone (Pro) Keyboard" text="The keyboard add-on for the PinePhone and PinePhone Pro adds a physical keyboard and a large battery.">}}
@@ -198,26 +103,26 @@ More information about the PinePhone Pro will be available in the days and weeks
 
 {{</ flexbox >}}
 
-== FAQ
-=== I am a PinePhone owner – will I be able to upgrade it by installing a PinePhone Pro mainboard?
+## FAQ
+### I am a PinePhone owner – will I be able to upgrade it by installing a PinePhone Pro mainboard?
 
 Probably not. While the PinePhone Pro’s mainboard will fit the PinePhone, the chassis, IPS display panel, cameras, the daughterboard, and thermal dissipation systems are all different. For instance, the PinePhone Pro’s cameras will not fit into the PinePhone chassis and are electrically incompatible with the PinePhone’s mainboard. Software enablement would also be required to drive the original PinePhone’s components (such as the LCD) using the PinePhone Pro’s mainboard. Thermal dissipation is another important consideration, as the higher heat output may not be trivial to overcome in the original PinePhone’s chassis.
 
-=== Will you keep on producing and selling the original PinePhone?
+### Will you keep on producing and selling the original PinePhone?
 
 Absolutely! There are many people who either need a less expensive option or simply aren’t ready to make the commitment to switch to a Linux smartphone just yet. The PinePhone will keep on catering to this crowd for the foreseeable future.
 
 Moreover, we believe that the PinePhone will retain its position as the most popular mobile Linux development platform on the market due to its price point and broad adoption. We know that the development community depends on the PinePhone’s continued availability, so we will produce it for as long as there is demand and available components.
 
-=== Can I use the PinePhone keyboard and other add-on back cases with the PinePhone Pro?
+### Can I use the PinePhone keyboard and other add-on back cases with the PinePhone Pro?
 
 Yes, we designed the midframe and pogo pin layout of the PinePhone Pro to be compatible with the original PinePhone. You can expect all PinePhone accessories, bar the original PinePhone’s soft and hard protective covers, to work with the PinePhone Pro. Future accessories will strive to be compatible with both smartphones.
 
-=== How does the PinePhone Pro compare to the Pinebook Pro performance-wise?
+### How does the PinePhone Pro compare to the Pinebook Pro performance-wise?
 
 Although both devices use a similar SoC, due to the thermal constraints imposed by the chassis, the PinePhone Pro is around 20% slower than a Pinebook Pro. The RK3399S chips used in the PinePhone Pro are binned and voltage locked for optimal performance with sustainable power and thermal limits. That said, the perceived performance of the two devices ought to be comparable due to the PinePhone Pro’s lower screen resolution and better optimization.
 
-=== Does the PinePhone Pro have fewer blobs and more open firmware than the original?
+### Does the PinePhone Pro have fewer blobs and more open firmware than the original?
 
 The PinePhone Pro is as open as the original PinePhone. Read more here.
  
@@ -225,8 +130,8 @@ The PinePhone Pro is as open as the original PinePhone. Read more here.
 
 It is highly likely that production will be affected by global component shortages at some stage, but it is very difficult for us to determine the degree, given how hard it is to foresee how the situation will unfold in the coming months. Our website features an inventory availability, stock and shipping status page updated on a regular basis. 
 
-=== How repairable is the PinePhone Pro?
+### How repairable is the PinePhone Pro?
 
 Just as the original PinePhone, the PinePhone Pro is built to be user repairable and we will offer spare parts in the Pine Store. The store’s selection will include all parts that frequently break if the device is dropped (the screen, back case and mid section) as well as all electronic components, including the mainboard.
 
-The PinePhone Pro is held together by standard Phillips screws – all you need to repair it is a suitable screwdriver and some spare time.
\ No newline at end of file
+The PinePhone Pro is held together by standard Phillips screws – all you need to repair it is a suitable screwdriver and some spare time.
diff --git a/content/devices/pinepower.adoc b/content/devices/pinepower.md
similarity index 57%
rename from content/devices/pinepower.adoc
rename to content/devices/pinepower.md
index edf7644a..4814b7f8 100644
--- a/content/devices/pinepower.adoc
+++ b/content/devices/pinepower.md
@@ -8,47 +8,42 @@ images:
   - "/devices/images/pinepower.jpg"
 ---
 
-== PinePower, A 65W GaN Power Supply
+## PinePower, A 65W GaN Power Supply
 
 The portable PinePower packs plenty of power in a very compact design. It is capable of powering or charging multiple PINE64 devices; such as the Pinebook Pro, PinePhone and the PineTime simultaneously. If you’re interested in getting the Pinecil, our soldering iron, then we highly recommend the PinePower to ensure optimal power delivery.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1"]
-|===
-| 74.8mm x 36.6mm x 32mm
-| 130 gram weight
-| Black plastic case
-| 100-240V 50/60Hz max input
-| 65W output
-| Power switch
-| 240Vac input US plug, adapters for AU, EU, and UK
-| 1 x USB-A
-| 2 x USB-C
-|===
+|     |
+| --- |
+| 74.8mm x 36.6mm x 32mm |
+| 130 gram weight |
+| Black plastic case |
+| 100-240V 50/60Hz max input |
+| 65W output |
+| Power switch |
+| 240Vac input US plug, adapters for AU, EU, and UK |
+| 1 x USB-A |
+| 2 x USB-C |
 
-
-=== 65W
+### 65W
 
 65W combined output with two USB-C ports and one USB-A port
 
-=== Power Switch
+### Power Switch
 
-The PinePower comes with a power switch to turn it off when it's not needed
+The PinePower comes with a power switch to turn it off when it’s not needed
 
-=== Adapters
+### Adapters
 
 Default US style plug with adapters for the EU, UK, AU
 
-=== Small And Compact
+### Small And Compact
 
 Weighing only 130 grams the PinePower is a sleek and lightweight portable charger
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PinePower/[PinePower]
+## Documentation
 
-|===
+|     |
+| --- |
+| [PinePower](/documentation/PinePower/) |
diff --git a/content/devices/pinepower_desktop.adoc b/content/devices/pinepower_desktop.adoc
deleted file mode 100644
index e2c90a16..00000000
--- a/content/devices/pinepower_desktop.adoc
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: "PinePower Desktop"
-categories: 
-  - "Power supplies"
-cover: 
-  image: "/devices/images/pinepower_desktop.jpg"
-images:
-  - "/devices/images/pinepower_desktop.jpg"
----
-
-== PinePower: A 120W Desktop Power Supply
-
-The desktop PinePower is a 120W switching power supply capable of powering all your PINE64 devices. The desktop PinePower can charge the Pinebook Pro, PinePhone, PineTab and the PineTime simultaneously with plenty of headroom to spare.
-
-== Features and Specifications
-
-[cols="1"]
-|===
-| 123mm x 115mm x 48mm
-| Weight of 543 grams
-| Black plastic case
-| AC 100-240V 50/60Hz input
-| Combined output of 120W
-| Individual port voltage status display
-| Individual port current status display
-| Display on/off switch
-| Power switch
-| Qi wireless charging technology
-| 1 x USB-A @ up to 18W
-| 3 x USB-A ports @ 15W 
-| 1 x USB-C port @ up to 65
-|===
-
-
-=== 120W
-
-120W total output with up to 65W through USB-C
-
-=== Plenty of I/O
-
-4 USB-A ports and 1 USB-C port
-
-=== Wireless Charging
-
-The PinePower comes with built-in wireless charging pad on top
-
-=== Status Display
-
-Individual voltage and status displays for each port
-
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PinePower/[PinePower]
-
-|===
-
-
-== Resources
-
-* link:https://www.youtube.com/watch?v=60IG0XmHtcY[YouTube: Gary Explains reviews the PinePower]
-* link:https://www.youtube.com/watch?v=ZZcqUMGPl7A[YouTube: Desktop PinePower being used to power a Pinecil]
\ No newline at end of file
diff --git a/content/devices/pinepower_desktop.md b/content/devices/pinepower_desktop.md
new file mode 100644
index 00000000..231c574f
--- /dev/null
+++ b/content/devices/pinepower_desktop.md
@@ -0,0 +1,58 @@
+---
+title: "PinePower Desktop"
+categories: 
+  - "Power supplies"
+cover: 
+  image: "/devices/images/pinepower_desktop.jpg"
+images:
+  - "/devices/images/pinepower_desktop.jpg"
+---
+
+## PinePower: A 120W Desktop Power Supply
+
+The desktop PinePower is a 120W switching power supply capable of powering all your PINE64 devices. The desktop PinePower can charge the Pinebook Pro, PinePhone, PineTab and the PineTime simultaneously with plenty of headroom to spare.
+
+## Features and Specifications
+
+|     |
+| --- |
+| 123mm x 115mm x 48mm |
+| Weight of 543 grams |
+| Black plastic case |
+| AC 100-240V 50/60Hz input |
+| Combined output of 120W |
+| Individual port voltage status display |
+| Individual port current status display |
+| Display on/off switch |
+| Power switch |
+| Qi wireless charging technology |
+| 1 x USB-A @ up to 18W |
+| 3 x USB-A ports @ 15W  |
+| 1 x USB-C port @ up to 65 |
+
+### 120W
+
+120W total output with up to 65W through USB-C
+
+### Plenty of I/O
+
+4 USB-A ports and 1 USB-C port
+
+### Wireless Charging
+
+The PinePower comes with built-in wireless charging pad on top
+
+### Status Display
+
+Individual voltage and status displays for each port
+
+## Documentation
+
+|     |
+| --- |
+| [PinePower](/documentation/PinePower/) |
+
+## Resources
+
+* [YouTube: Gary Explains reviews the PinePower](https://www.youtube.com/watch?v=60IG0XmHtcY)
+* [YouTube: Desktop PinePower being used to power a Pinecil](https://www.youtube.com/watch?v=ZZcqUMGPl7A)
diff --git a/content/devices/pinetab-v.adoc b/content/devices/pinetab-v.md
similarity index 57%
rename from content/devices/pinetab-v.adoc
rename to content/devices/pinetab-v.md
index 783fa075..5dd8e0f8 100644
--- a/content/devices/pinetab-v.adoc
+++ b/content/devices/pinetab-v.md
@@ -8,17 +8,13 @@ images:
   - "/devices/images/Pinetabv_1.jpg"
 ---
 
-== The PineTab-V: PINE64's first RISC-V tablet
+## The PineTab-V: PINE64's first RISC-V tablet
 
 The PineTab-V is PINE64’s first RISC-V tablet. It is based on the JH7110 64-bit RISC-V SoC. The packaging is very similar to ARM-based .
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PineTab-V/[PineTab-V]
-
-| link:/documentation/PineTab-V/Further_information/[Schematics and certifications]
-|===
+|     |
+| --- |
+| [PineTab-V](/documentation/PineTab-V/) |
+| [Schematics and certifications](/documentation/PineTab-V/Further_information/) |
diff --git a/content/devices/pinetab.adoc b/content/devices/pinetab.md
similarity index 52%
rename from content/devices/pinetab.adoc
rename to content/devices/pinetab.md
index 19fcfe18..2ee09c90 100644
--- a/content/devices/pinetab.adoc
+++ b/content/devices/pinetab.md
@@ -8,102 +8,55 @@ images:
   - "/devices/images/pinetab.jpg"
 ---
 
-== PineTab: The Open Source ARM 64-bit Tablet
+## PineTab: The Open Source ARM 64-bit Tablet
 
 The PineTab is similar in both form, function and underlying ARM64 architecture to the original 11.6″ Pinebook. It is powered by the same quad-core ARM Cortex A53 64-Bit Processor used in our popular PINE A64 Single Board Computer. The optional keyboard and trackpad – which doubles-up as a screen cover – effectively converts the PineTab into a petite on-the-go laptop with a touch screen functionality. It runs numerous mainline Linux distributions as well as *BSD and Android. 
 
 As a new open source platform, the PineTab development is an ongoing process and represents a great opportunity to get involved with computing on a different level, to customise and personalise the portable computer experience, to understand what is going on beneath the surface.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A53 cores @ 1.152GHz
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.152GHz |
+| GPU | ARM Mali 400 MP2 GPU |
+| Memory | 2GB LPDDR3 RAM |
+| Display | 10″ MiPi 720p capacitive LCD |
+| Storage | Bootable Micro SD slot <br> 64GB of eMMC |
+| Connections | Micro HD digital video out port <br> USB 2.0 A Host <br> Micro USB 2.0 OTG <br> 2Mpx front-facing camera <br> 5Mpx rear camera <br> Optional M.2 slot <br> Speakers and microphone <br> 3.5mm headphone jack with mic input <br> Volume rocker <br> Magnetically attached keyboard (optional) <br> Built-in 802.11 b/g/n WiFi with Bluetooth: 4.0 <br> 6000mAh battery <br> 2.5mm barrel power (5V 3A) port <br> Multiple expansion boards for LTE, LoRa and SATA SSD |
 
-| GPU
-| ARM Mali 400 MP2 GPU
-
-| Memory
-| 2GB LPDDR3 RAM
-
-| Display
-| 10″ MiPi 720p capacitive LCD
-
-| Storage
-| Bootable Micro SD slot
-
-64GB of eMMC
-
-| Connections
-| Micro HD digital video out port
-
-USB 2.0 A Host
-
-Micro USB 2.0 OTG
-
-2Mpx front-facing camera
-
-5Mpx rear camera
-
-Optional M.2 slot
-
-Speakers and microphone
-
-3.5mm headphone jack with mic input
-
-Volume rocker
-
-Magnetically attached keyboard (optional)
-
-Built-in 802.11 b/g/n WiFi with Bluetooth: 4.0
-
-6000mAh battery
-
-2.5mm barrel power (5V 3A) port
-
-Multiple expansion boards for LTE, LoRa and SATA SSD
-
-|===
-
-
-=== Detachable Keyboard
+### Detachable Keyboard
 
 Optional magnetic detachable keyboard that acts as a case for the tablet when not in use
 
-=== Storage Expansion
+### Storage Expansion
 
 Add a SATA SSD using a optional expansion board
 
-=== Expansion Modules
+### Expansion Modules
 
 Expansion modules for LTE modem and LoRa
 
-=== Micro HD Video Out
+### Micro HD Video Out
 
 Micro digital HD video out port allows for displaying content on an external monitor
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PineTab/[PineTab]
-
-| link:/documentation/PineTab/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
-
+|     |
+| --- |
+| [PineTab](/documentation/PineTab/) |
+| [Schematics and certifications](/documentation/PineTab/Further_information/Schematics_and_certifications/) |
 
-== Accessories
+## Accessories
 {{< flexbox >}}
 
     {{< devices/device_box link="https://pine64.com/product/pinebook-pinephone-pinetab-serial-console/" img="/devices/images/serial_cable.png" title="Serial Cable" text="Serial console powered by CH340 chipset enables USB-to-Serial-communication through the earphone jack for development.">}}
 
 {{</ flexbox >}}
 
-== Resources
+## Resources
 
-* link:https://www.youtube.com/watch?v=9zisqhlUrXI[YouTube: Switched to Linux unboxing of the PineTab]
-* link:https://www.youtube.com/watch?v=1RzX1exKdKk[YouTube: Another PineTab unboxing by Linux Lounge]
-* link:https://www.youtube.com/watch?v=clmsrEQgKpc[YouTube: First impressions of the PineTab by Privacy & Tech Tips]
\ No newline at end of file
+* [YouTube: Switched to Linux unboxing of the PineTab](https://www.youtube.com/watch?v=9zisqhlUrXI)
+* [YouTube: Another PineTab unboxing by Linux Lounge](https://www.youtube.com/watch?v=1RzX1exKdKk)
+* [YouTube: First impressions of the PineTab by Privacy & Tech Tips](https://www.youtube.com/watch?v=clmsrEQgKpc)
diff --git a/content/devices/pinetab2.adoc b/content/devices/pinetab2.md
similarity index 68%
rename from content/devices/pinetab2.adoc
rename to content/devices/pinetab2.md
index ff92583d..627d3d54 100644
--- a/content/devices/pinetab2.adoc
+++ b/content/devices/pinetab2.md
@@ -8,23 +8,17 @@ images:
   - "/devices/images/PineTab2_Front.jpg"
 ---
 
-== The PineTab2
+## The PineTab2
 
 The PineTab2 is PINE64’s successor to the original PineTab Linux tablet computer, featuring a faster processor and better availability. The tablet is available in two configurations, 4GB of RAM and 64GB of internal storage or 8GB of RAM and 128GB of internal storage. The tablet ships with a detachable keyboard that doubles as a protective cover.
 
 The tablet is designed around the Rockchip RK3566 processor, which features 4 energy-efficient Cortex-A55 64-bit ARM cores and enjoys good mainline Linux support. A similarly packaged RISC-V tablet is the PineTab-V.
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PineTab2/[PineTab2]
-
-| link:/documentation/PineTab2/Further_information/Certifications/[Certifications]
-
-| link:/documentation/PineTab2/Further_information/Schematics/[Schematics]
-
-| link:/documentation/PineTab2/Further_information/Specifications/[Specifications]
-|===
+|     |
+| --- |
+| [PineTab2](/documentation/PineTab2/) |
+| [Certifications](/documentation/PineTab2/Further_information/Certifications/) |
+| [Schematics](/documentation/PineTab2/Further_information/Schematics/) |
+| [Specifications](/documentation/PineTab2/Further_information/Specifications/) |
diff --git a/content/devices/pinetime.adoc b/content/devices/pinetime.adoc
deleted file mode 100644
index 1a5dd708..00000000
--- a/content/devices/pinetime.adoc
+++ /dev/null
@@ -1,106 +0,0 @@
----
-title: "PineTime"
-categories: 
-  - "Smartwatches"
-cover: 
-  image: "/devices/images/pinetime.png"
-images:
-  - "/devices/images/pinetime.png"
-aliases:
-  - /pinetime
----
-
-== An Open Source Smartwatch For Your Favorite Devices. Low Cost, High Fidelity.
-
-The PineTime is a free and open source smartwatch capable of running custom-built open operating systems. Some of the notable features include a heart rate monitor, a week-long battery, and a capacitive touch IPS display that is legible in direct sunlight. It is a fully community driven side-project which anyone can contribute to, allowing you to keep control of your device.
-
-We envision the PineTime as a companion for not only your PinePhone but also for your favorite devices — any phone, tablet, or even PC. In its current state the PineTime ships with a community firmware called Infinitime, which works with Linux computers and phones, Windows machines, and Android devices. IOS support is currently being looked into for Infinitime.
-
-== Features and Specifications
-
-[cols="1,1"]
-|===
-
-| Display
-| Square 1.3-inch 240×240 IPS capacitive touch display
-
-| SoC
-| Low-power Nordic Semiconductor nRF52832
-
-64 MHz + Floating Point
-
-| Software
-| Any open-source operating systems built on top of numerous RTOSes
-
-| Body
-| Dimensions: 37.5mm x 40mm x 11mm
-
-Weight: 38 grams
-
-Made with Zinc Alloy and Plastic
-
-Dustproof and water-resistant up to 1m (Rated at IP67)
-
-| Health Tracking
-| Step Counting (with Accelerometer)
-
-Heart Rate Detection
-
-| Notification features
-| Notification access
-
-Wrist vibration
-
-Quick glance via lift-to-wake.
-
-| Connectivity
-| Bluetooth 5 and Bluetooth Low Energy
-
-Compatible with almost any device
-
-Over-the-air update
-
-| Storage
-| 4 MB of User Storage
-
-0.5 MB of OS Storage
-
-| Battery
-| All-week 180 mAh battery
-
-2-pin USB charging dock
-|===
-
-
-=== IPS touch display
-
-The PineTime includes a color IPS capacitive touch display
-
-=== Dustproof And Water Resistant
-
-The PineTime comes with a IP67 rating, meaning that it can handle up to one meter of water and is fully dust proof
-
-=== Bluetooth 5
-
-With Bluetooth 5 and Bluetooth Low Energy, the PineTime can pair to other devices
-
-=== Heartrate And Step Counting
-
-With a built-in accelerometer and heart-rate sensor, the PineTime can help you keep track of your health
-
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/PineTime/[PineTime]
-
-| link:/documentation/PineTime/Further_information/Datasheets_schematics_and_certifications/[Datasheets, schematics and certifications]
-|===
-
-
-== Resources
-* link:https://www.youtube.com/watch?v=1AmsDaFMEF0[YouTube: WaspOS with a custom star trek theme]
-* link:https://www.youtube.com/watch?v=CvT5D0kxoiQ[YouTube: Elatronion’s review of the PineTime]
-* link:https://www.youtube.com/watch?v=uE-0xoHAyjs[YouTube: A review of Infinitime version 1.0.0 on the PineTime]
diff --git a/content/devices/pinetime.md b/content/devices/pinetime.md
new file mode 100644
index 00000000..1595cea8
--- /dev/null
+++ b/content/devices/pinetime.md
@@ -0,0 +1,59 @@
+---
+title: "PineTime"
+categories: 
+  - "Smartwatches"
+cover: 
+  image: "/devices/images/pinetime.png"
+images:
+  - "/devices/images/pinetime.png"
+aliases:
+  - /pinetime
+---
+
+## An Open Source Smartwatch For Your Favorite Devices. Low Cost, High Fidelity.
+
+The PineTime is a free and open source smartwatch capable of running custom-built open operating systems. Some of the notable features include a heart rate monitor, a week-long battery, and a capacitive touch IPS display that is legible in direct sunlight. It is a fully community driven side-project which anyone can contribute to, allowing you to keep control of your device.
+
+We envision the PineTime as a companion for not only your PinePhone but also for your favorite devices — any phone, tablet, or even PC. In its current state the PineTime ships with a community firmware called Infinitime, which works with Linux computers and phones, Windows machines, and Android devices. IOS support is currently being looked into for Infinitime.
+
+## Features and Specifications
+
+|     |     |
+| --- | --- |
+| Display | Square 1.3-inch 240×240 IPS capacitive touch display |
+| SoC | Low-power Nordic Semiconductor nRF52832 <br> 64 MHz + Floating Point |
+| Software | Any open-source operating systems built on top of numerous RTOSes |
+| Body | Dimensions: 37.5mm x 40mm x 11mm <br> Weight: 38 grams <br> Made with Zinc alloy and plastic <br> Dustproof and water-resistant up to 1m (rated at IP67) |
+| Health Tracking | Step Counting (with Accelerometer) <br> Heart rate detection |
+| Notification features | Notification access <br> Wrist vibration <br> Quick glance via lift-to-wake. |
+| Connectivity | Bluetooth 5 and Bluetooth Low Energy <br> Compatible with almost any device <br> Over-the-air update |
+| Storage | 4 MB of User Storage 0.5 MB of OS Storage |
+| Battery | All-week 180 mAh battery <br> 2-pin USB charging dock |
+
+### IPS touch display
+
+The PineTime includes a color IPS capacitive touch display
+
+### Dustproof And Water Resistant
+
+The PineTime comes with a IP67 rating, meaning that it can handle up to one meter of water and is fully dust proof
+
+### Bluetooth 5
+
+With Bluetooth 5 and Bluetooth Low Energy, the PineTime can pair to other devices
+
+### Heartrate And Step Counting
+
+With a built-in accelerometer and heart-rate sensor, the PineTime can help you keep track of your health
+
+## Documentation
+
+|     |
+| --- |
+| [PineTime](/documentation/PineTime/) |
+| [Datasheets, schematics and certifications](/documentation/PineTime/Further_information/Datasheets_schematics_and_certifications/) |
+
+## Resources
+* [YouTube: WaspOS with a custom star trek theme](https://www.youtube.com/watch?v=1AmsDaFMEF0)
+* [YouTube: Elatronion’s review of the PineTime](https://www.youtube.com/watch?v=CvT5D0kxoiQ)
+* [YouTube: A review of Infinitime version 1.0.0 on the PineTime](https://www.youtube.com/watch?v=uE-0xoHAyjs)
diff --git a/content/devices/pinevox.adoc b/content/devices/pinevox.md
similarity index 77%
rename from content/devices/pinevox.adoc
rename to content/devices/pinevox.md
index f2d2ea86..99e4ae5b 100644
--- a/content/devices/pinevox.adoc
+++ b/content/devices/pinevox.md
@@ -8,15 +8,12 @@ images:
   - "/documentation/PineVox/images/pinevox.jpg"
 ---
 
-== A Smart Home
+## A Smart Home
 
 The PineVox is a BL606P-based home assistant smart speaker. Designed to help build a good community option for voice interactions with software such as _Home Assistant_.
 
-== Documentation
+## Documentation
 
-[cols="1"]
-|===
-
-| link:/documentation/PineVox/[PineVox]
-
-|===
+|     |
+| --- |
+| [PineVox](/documentation/PineVox/) |
diff --git a/content/devices/quartz64-zero.adoc b/content/devices/quartz64-zero.md
similarity index 55%
rename from content/devices/quartz64-zero.adoc
rename to content/devices/quartz64-zero.md
index 56fd5b00..a92f30b9 100644
--- a/content/devices/quartz64-zero.adoc
+++ b/content/devices/quartz64-zero.md
@@ -8,49 +8,28 @@ images:
   - "/devices/images/Quartz64-Zero.jpg"
 ---
 
-== Quartz64-Zero
+## Quartz64-Zero
 
 The Quartz64-Zero SBC is featuring the Rockchip RK3566T SoC in a smaller PCB form factor. This SoC combines a quad-core, ARM Cortex-A55 1.6GHz CPU with a Mali-G52-2EE GPU. It is capable of driving a single 4K display at 60fps and the GPU uses the open source Panfrost driver. It also has the benefit of running very cool, even without a heatsink and under a sustained load. This SBC is equipped with 1GB LPDDR4 system memory, an optional eMMC module (up to 128GB) and microSD slot for booting. The board is equipped with a Wifi/BT with flex antenna, a custom PCIe connector, an USB 3.0 type A host port, as well as many other peripheral device interfaces such as UART, SPI, I2C, for makers to integrate with sensors and other peripherals.
 
-The Quartz64 Zero is a low cost board suitable for various commercial project application and guarantee supply at least until year 2028. Commercial order can customize the Quartz64 Zero board (without PCB change request) per their requirement (such as different DRAM Capacity, on-board eMMC, staff Ethernet Port) and MoQ:2000 apply.
+The Quartz64-Zero is a low cost board suitable for various commercial project application and guarantee supply at least until year 2028. Commercial order can customize the Quartz64-Zero board (without PCB change request) per their requirement (such as different DRAM Capacity, on-board eMMC, staff Ethernet Port) and MoQ:2000 apply.
 
-Note: Power adapter requirement: 5V 3A type H 3.5mm OD/1.35mm ID barrel type DC jack power supply.
+Note: Power Adapter requirement: 5V 3A type H 3.5mm OD/1.35mm ID barrel type DC Jack Power Supply
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| CPU
-| QUAD 64-bit ARM Cortex-A55 CPU +
-Embedded 32-bit RISC-V CPU
+|     |     |
+| --- | --- |
+| CPU | QUAD 64-bit ARM Cortex-A55 CPU <br> Embedded 32-bit RISC-V CPU |
+| Memory | 1GB LPDDR4 System Memory <br> optional eMMC module (up to 128GB) <br> microSD slot |
+| Display interface | 4Kp60 10 bit Digital Video port |
+| Communication | 802.11 B/G/N/AX Wi-Fi <br> Bluetooth 5.4 |
+| Expansion | 1x native USB 3.0 Host Port <br> Custom PCIe Connector |
+| GPIO bus | 40 pins including i2c, SPI and UART |
 
-| Memory
-| 1GB LPDDR4 System Memory +
-optional eMMC module (up to 128GB) +
-microSD slot
+## Documentation
 
-| Display interface
-| 4Kp60 10 bit Digital Video port
-
-| Communication
-| 802.11 B/G/N/AX Wifi +
-BlueTooth 5.4
-
-| Expansion
-| 1x native USB 3.0 Host Port +
-Custom PCIe Connector
-
-| GPIO bus
-| 40 pins include i2c, SPI, and UART
-
-|===
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Quartz64/[Quartz64]
-
-| link:/documentation/Quartz64/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
+|     |
+| --- |
+| [Quartz64](/documentation/Quartz64/) |
+| [Schematics and certifications](/documentation/Quartz64/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/quartz64_model_a.adoc b/content/devices/quartz64_model_a.md
similarity index 52%
rename from content/devices/quartz64_model_a.adoc
rename to content/devices/quartz64_model_a.md
index 5aec8d89..6f20f157 100644
--- a/content/devices/quartz64_model_a.adoc
+++ b/content/devices/quartz64_model_a.md
@@ -10,85 +10,36 @@ aliases:
   - /quartz64a
 ---
 
-== Quartz64 Model A: A 64-bit Quad Core SBC with USB 3.0, Gigabit Ethernet, PCIe x4, and up to 8GBs of LPDD4 RAM
+## Quartz64 Model A: A 64-bit Quad Core SBC with USB 3.0, Gigabit Ethernet, PCIe x4, and up to 8GBs of LPDD4 RAM
 
 The Quartz64 Model A is powered by a Rockchip RK3566 quad-core ARM Cortex A55 64-Bit Processor with a Mali G-52 GPU. It comes equipped with 2GB, 4GB or 8GB LPDDR4 system memory, and a 128Mb SPI boot flash. There is also an optional eMMC module (up to 128GB) and a microSD slot for booting. The board is also equipped with 1x USB 3.0 type A Host, 3x USB 2.0 Host, Gigabit Ethernet, Sata, PCIe, an E-ink interface, touch panel interface, a 40 pin GPIO bus, MiPi DSI interface, MiPi CSI interface, optional 802.11 b/g/n/ac Wifi and Bluetooth 5.0, eDP interface, and other interfaces such as UART, SPI, and I2C are also available for makers to integrate sensors and other peripherals. Many different operating systems are freely available from the open source community, such as Linux (Ubuntu, Debian, Arch, etc), *BSD, and Android.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A55 cores @ 2.0GHz
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A55 cores @ 2.0GHz |
+| GPU | ARM Mali G52 MP2 GPU |
+| Memory | LPDDR4 RAM (up to 8GB) |
+| Networking | Gigabit Ethernet |
+| Storage | Micro SD slot <br> eMMC module slot <br> SPI Flash 128Mbit |
+| Connections | 4K digital video out <br> 2x USB 2.0 Host <br> 1x USB 3.0 Host <br> PCIe 4x Open-Ended slot (PCIe 2.0 1x electrically) <br> 2×10 GPIO pins <br> Optional WiFi 802.11ac with Bluetooth 5.0 expansion module <br> Touch Panel (TP) port <br> Display Serial Interface (DSI) port <br> eDP port <br> E-ink interface <br> Camera Serial Interface (CSI) port (supports 8MP sensor) <br> Real Time Clock (RTC) port <br> Lithium battery port <br> 3.5mm headphone jack with mic input <br> 12V 3A or 5A (M 5.5mm OD/2.1mm ID) barrel port |
 
-| GPU
-| ARM Mali G52 MP2 GPU
-
-| Memory
-| LPDDR4 RAM (up to 8GB)
-
-| Networking
-| Gigabit Ethernet
-
-| Storage
-| Micro SD slot
-
-eMMC module slot
-
-SPI Flash 128Mbit
-
-| Connections
-| 4K digital video out
-
-2x USB 2.0 Host
-
-1x USB 3.0 Host
-
-PCIe 4x Open-Ended slot (PCIe 2.0 1x electrically)
-
-2×10 GPIO pins
-
-Optional WiFi 802.11ac with Bluetooth 5.0 expansion module
-
-Touch Panel (TP) port
-
-Display Serial Interface (DSI) port
-
-eDP port
-
-E-ink interface
-
-Camera Serial Interface (CSI) port (supports 8MP sensor)
-
-Real Time Clock (RTC) port
-
-Lithium battery port
-
-3.5mm headphone jack with mic input
-
-12V 3A or 5A (M 5.5mm OD/2.1mm ID) barrel port
-
-|===
-
-
-=== Efficient and Powerful
+### Efficient and Powerful
 Powerful Mali G52 GPU and efficient quad A55 cores
 
-=== PCIe 4x slot
+### PCIe 4x slot
 A built-in PCIe slot allowing for a variety of accessories
 
-=== E-ink interface
+### E-ink interface
 The Quartz64 A comes with a built-in E-ink interface
 
-=== Plenty of RAM
+### Plenty of RAM
 The Quartz64 A comes with up to 8GB of LPDDR4 RAM
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Quartz64/[Quartz64]
+## Documentation
 
-| link:/documentation/Quartz64/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
+|     |
+| --- |
+| [Quartz64](/documentation/Quartz64/) |
+| [Schematics and certifications](/documentation/Quartz64/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/quartz64_model_b.adoc b/content/devices/quartz64_model_b.md
similarity index 54%
rename from content/devices/quartz64_model_b.adoc
rename to content/devices/quartz64_model_b.md
index f491ef93..8afcf9e3 100644
--- a/content/devices/quartz64_model_b.adoc
+++ b/content/devices/quartz64_model_b.md
@@ -10,77 +10,36 @@ aliases:
   - /quartz64b
 ---
 
-== Quartz64 Model B: A 64-bit Quad Core SBC with M.2, USB 3.0, Gigabit Ethernet, Integrated Wi-Fi/BT, and up to 8GB of LPDDR4 RAM
+## Quartz64 Model B: A 64-bit Quad Core SBC with M.2, USB 3.0, Gigabit Ethernet, Integrated Wi-Fi/BT, and up to 8GB of LPDDR4 RAM
 
 The Quartz64 Model B is the most recent Single Board Computer offering from PINE64. It is powered by a Rockchip RK3566 quad-core ARM Cortex A55 64-Bit Processor with a Mali G-52 GPU. It comes equipped with 2GB, 4GB or 8GB LPDDR4 system memory, and a 128Mb SPI boot flash. There is also an optional eMMC module (up to 128GB) and a microSD slot for booting. The board is equipped with 1x USB 3.0 type A Host, 2x USB 2.0 Host, Gigabit Ethernet, a 40 pin GPIO bus, MiPi DSI interface, MiPi CSI interface, integrated 802.11 b/g/n/ac Wi-Fi and Bluetooth 5.0, as well as a single lane M.2 PCIe Gen2 slot. Many different operating systems are freely available from the open source community, such as Linux (Ubuntu, Debian, Arch, etc), *BSD, and Android.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A55 cores @ 2.0GHz
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A55 cores @ 2.0GHz |
+| GPU | ARM Mali G52 MP2 GPU |
+| Memory | LPDDR4 RAM (up to 8GB) |
+| Networking | Gigabit Ethernet |
+| Storage | Micro SD slot <br> eMMC module slot <br> SPI Flash 128Mbit |
+| Connections | 4K digital video out <br> 2x USB 2.0 Host <br> 1x USB 3.0 Host <br> M.2 slot (1x PCIe Gen2) <br> 40 GPIO pins <br> Built-in 802.11ac WiFi with Bluetooth 5.0 <br> Display Serial Interface (DSI) port <br> Camera Serial Interface (CSI) port (supports 5MP sensor) <br> Real Time Clock Port (RTC) <br> 3.5mm headphone jack with mic input <br> 3.5mm barrel power (5V 3A) port |
 
-| GPU
-| ARM Mali G52 MP2 GPU
-
-| Memory
-| LPDDR4 RAM (up to 8GB)
-
-| Networking
-| Gigabit Ethernet
-
-| Storage
-| Micro SD slot
-
-eMMC module slot
-
-SPI Flash 128Mbit
-
-| Connections
-| 4K digital video out
-
-2x USB 2.0 Host
-
-1x USB 3.0 Host
-
-M.2 slot (1x PCIe Gen2)
-
-40 GPIO pins
-
-Built-in 802.11ac WiFi with Bluetooth 5.0
-
-Display Serial Interface (DSI) port
-
-Camera Serial Interface (CSI) port (supports 5MP sensor)
-
-Real Time Clock Port (RTC)
-
-3.5mm headphone jack with mic input
-
-3.5mm barrel power (5V 3A) port
-
-|===
-
-
-=== Efficient And Powerful
+### Efficient And Powerful
 Powerful Mali G52 GPU and efficient quad A55 cores
 
-=== M.2 Slot
+### M.2 Slot
 A built-in M.2 slot allowing for additional fast storage
 
-=== Built-In Wireless
+### Built-In Wireless
 Built-in 802.11ac Wi-Fi and Bluetooth 5
 
-=== Plenty Of RAM
+### Plenty Of RAM
 The Quartz64 B comes with up to 8GB of LPDDR4 RAM
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Quartz64/[Quartz64]
+## Documentation
 
-| link:/documentation/Quartz64/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
+|     |
+| --- |
+| [Quartz64](/documentation/Quartz64/) |
+| [Schematics and certifications](/documentation/Quartz64/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/quartzpro64.adoc b/content/devices/quartzpro64.md
similarity index 61%
rename from content/devices/quartzpro64.adoc
rename to content/devices/quartzpro64.md
index c121ca97..4135bd5a 100644
--- a/content/devices/quartzpro64.adoc
+++ b/content/devices/quartzpro64.md
@@ -8,16 +8,12 @@ images:
   - "/devices/images/Quartzpro64_whole_board_top_resized.jpeg"
 ---
 
-== A QuartzPro64 Development page before a QuartzPro64 page? 
+## A QuartzPro64 Development page before a QuartzPro64 page? 
 
 It’s more likely than you think!
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/QuartzPro64/[QuartzPro64]
-
-|===
+|     |
+| --- |
+| [QuartzPro64](/documentation/QuartzPro64/) |
diff --git a/content/devices/rock64.adoc b/content/devices/rock64.md
similarity index 56%
rename from content/devices/rock64.adoc
rename to content/devices/rock64.md
index 8f253ab6..12d8e72f 100644
--- a/content/devices/rock64.adoc
+++ b/content/devices/rock64.md
@@ -8,7 +8,7 @@ images:
   - "/devices/images/rock64.jpg"
 ---
 
-== A Small Form-Factor Single Board Computer Capable of 4K playback
+## A Small Form-Factor Single Board Computer Capable of 4K playback
 
 ROCK64 is a credit card sized Single Board Computer powered by Rockchip RK3328 quad-core ARM Cortex A53 64-Bit Processor and support up to 4GB 1600MHz LPDDR3 memory. It provides an eMMC module socket, MicroSD Card slot, Pi-2 bus, Pi-P5+ bus, USB 3.0 and many others peripheral devices interface for makers to integrate with sensors and devices.
 
@@ -16,72 +16,31 @@ Various operating systems are made available by open source community and partne
 
 The ROCK64 4GB board is designated as LTS (Long Term Supply), which means that PINE64 is committed to supply it for at least 5 years – up until 2022 and possibly beyond.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A53 cores @ 1.5 GHz
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.5 GHz |
+| GPU | ARM Mali 450 MP2 GPU |
+| Memory | LPDDR3 RAM (up to 4GB) |
+| Networking | Gigabit Ethernet |
+| Storage | Micro SD Slot <br> eMMC module slot <br> SPI Flash 128Mbit |
+| Connections | 4K digital video out <br> 2x USB 2.0 Host <br> 1x USB 3.0 Host <br> PI-2 bus <br> PI-P5+ bus <br> IR R/X port <br> Real Time Clock (RTC) port <br> Power Over Ethernet (POE) (when using optional HAT module) <br> A/V jack <br> Power, Reset and Recovery buttons <br> 3.5mm barrel power (5V 3A) port |
 
-| GPU
-| ARM Mali 450 MP2 GPU
-
-| Memory
-| LPDDR3 RAM (up to 4GB)
-
-| Networking
-| Gigabit Ethernet
-
-| Storage
-| Micro SD Slot
-
-eMMC module slot
-
-SPI Flash 128Mbit
-
-| Connections
-| 4K digital video out
-
-2x USB 2.0 Host
-
-1x USB 3.0 Host
-
-PI-2 bus
-
-PI-P5+ bus
-
-IR R/X port
-
-Real Time Clock (RTC) port
-
-Power Over Ethernet (POE) (when using optional HAT module)
-
-A/V jack
-
-Power, Reset and Recovery buttons
-
-3.5mm barrel power (5V 3A) port
-
-|===
-
-
-=== Quad-Core RK3328 SoC
+### Quad-Core RK3328 SoC
 Quad ARM Cortex A53 cores @ 1.5 GHz and a ARM Mali 450 MP2 GPU which is well supported by Lima
 
-=== Gigabit Ethernet
+### Gigabit Ethernet
 Built-in Ethernet port allows for fast internet access
 
-=== Power Over Ethernet
+### Power Over Ethernet
 With an optional HAT module you can power the ROCK64 using POE
 
-=== 4GB LPDDR3 RAM
+### 4GB LPDDR3 RAM
 Up to 4GB of LPDDR3 RAM
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/ROCK64/[ROCK64]
+## Documentation
 
-|===
+|     |
+| --- |
+| [ROCK64](/documentation/ROCK64/) |
diff --git a/content/devices/rockpro64.adoc b/content/devices/rockpro64.md
similarity index 53%
rename from content/devices/rockpro64.adoc
rename to content/devices/rockpro64.md
index bebef34e..e46545bf 100644
--- a/content/devices/rockpro64.adoc
+++ b/content/devices/rockpro64.md
@@ -10,95 +10,38 @@ aliases:
   - /rockpro64
 ---
 
-== ROCKPro64: A 64-bit Hexa-Core SBC with PCIe, USB 3.0, USB-C and Gigabit Ethernet Featuring up-to 4GB of LDDDR4 RAM
+## ROCKPro64: A 64-bit Hexa-Core SBC with PCIe, USB 3.0, USB-C and Gigabit Ethernet Featuring up-to 4GB of LDDDR4 RAM
 
 The ROCKPro64 is the most powerful single board computer on offer from PINE64, featuring a Rockchip RK3399 hexa-core SoC as well as a quad-core Mali-T860 MP4 GPU and up-to 4GB of dual-channel LPDDR4 system memory. Moreover, the board comes packed with features, including an USB 3.0 and USB type C with DP1.2 port, a full PCIe x4 as well as eMMC module socket. You also get a 40pin header with I2C, SPI, UARTs and GPIOs. The board is backwards compatible with many of the existing PINE64 peripherals, including the Wifi/BT module, camera module and LCD panel but an array of new peripherals specific for the board is also available. All this in the exact same model “A” dimension as the original PINE A64.
 
 The ROCKPro64 4GB board is designated as LTS (long Term Supply) which means that PINE64 is committed to supply it for at least 5 years – until year 2023 and beyond.
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A53 cores @ 1.4GHz and 2 x ARM Cortex A72 cores @ 1.8 GHz 
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.4GHz and 2 x ARM Cortex A72 cores @ 1.8 GHz  |
+| GPU | ARM Mali T860 MP4 GPU |
+| Memory | LPDDR4 RAM (up to 4GB) |
+| Networking | Gigabit Ethernet |
+| Storage | Micro SD slot <br> eMMC module slot <br> SPI Flash 128Mbit |
+| Connections | 4K digital video out <br> 2x USB 2.0 Host <br> 1x USB 3.0 Host <br> 1x USB-C Host (With video out) <br> PCIe 4x open-ended slot <br> 40 GPIO pins <br> Expansion bus <br> PI-2 bus <br> Touch Panel (TP) port <br> Display Serial Interface (DSI) port <br> eDP port <br> Stereo MiPi-SCI port for 12MP cameras <br> IR R/X port <br> Real Time Clock (RTC) port <br> Lithium battery port <br> CMOS Sensor Interface port <br> Optional 802.11ac with Bluetooth 5.0 expansion module <br> 3.5mm headphone jack with mic input <br> 5.5mm barrel power (12V 3A/5A) port |
 
-| GPU
-| ARM Mali T860 MP4 GPU
-
-| Memory
-| LPDDR4 RAM (up to 4GB)
-
-| Networking
-| Gigabit Ethernet
-
-| Storage
-| Micro SD slot
-
-eMMC module slot
-
-SPI Flash 128Mbit
-
-| Connections
-| 4K digital video out
-
-2x USB 2.0 Host
-
-1x USB 3.0 Host
-
-1x USB-C Host (With video out)
-
-PCIe 4x open-ended slot
-
-40 GPIO pins
-
-Expansion bus
-
-PI-2 bus
-
-Touch Panel (TP) port
-
-Display Serial Interface (DSI) port
-
-eDP port
-
-Stereo MiPi-SCI port for 12MP cameras
-
-IR R/X port
-
-Real Time Clock (RTC) port
-
-Lithium battery port
-
-CMOS Sensor Interface port
-
-Optional 802.11ac with Bluetooth 5.0 expansion module
-
-3.5mm headphone jack with mic input
-
-5.5mm barrel power (12V 3A/5A) port
-
-|===
-
-
-=== Tons Of I/O
+### Tons Of I/O
 2xUSB 2.0 Host ports, 1xUSB 3.0 Host port, and 1xUSB-C Host with video out support
 
-=== 40 GPIO Pins
+### 40 GPIO Pins
 With 40 GPIO pins there is plenty for projects you may throw at the RockPro64
 
-=== PCIe 4x Slot
+### PCIe 4x Slot
 PCIe 4x open-ended slot for attaching devices and extra storage
 
-=== Powerful Rockchip SoC
+### Powerful Rockchip SoC
 The power RK3399 hexa-core SoC can handle most tasks you throw at it
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/ROCKPro64/[ROCKPro64]
+## Documentation
 
-| link:/documentation/ROCKPro64/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
+|     |
+| --- |
+| [ROCKPro64](/documentation/ROCKPro64/) |
+| [Schematics and certifications](/documentation/ROCKPro64/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/soedge.adoc b/content/devices/soedge.adoc
deleted file mode 100644
index f77f39ab..00000000
--- a/content/devices/soedge.adoc
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: "SOEDGE"
-categories: 
-  - "Computer modules"
-cover: 
-  image: "/devices/images/soedge.png"
-images:
-  - "/devices/images/soedge.png"
----
-
-== A Powerful AI Compute Module
-
-The SOEDGE is a 3TOPS compute module that can be paired with a dedicated baseboard or the SOEDGE Baseboard for development. It can also be connected to a SBC, such as the ROCKPro64, or a regular X86 PC using PCIe or USB 3.0 using special adapters. The SOEDGE is, at the time of writing, in early stages of development; if you are a developer interested in Neural Networks and open hardware, please contact us directly for a development unit. 
-
-
-== Features and Specifications
-
-[cols="1,1"]
-|===
-| SoC
-| 2 x ARM Cortex A35 Processor @ 2.0 GHz
-
-| Memory
-| DDR4 RAM (2GB)
-
-| Features
-| A power-efficient ARM 64-Bit Armv8-A architecture
-
-AArch32 for full backward compatibility with Armv7
-
-Supports NEON Advanced SIMD (Single Instruction Multiple Data) instruction for acceleration of media and signal processing function
-
-Support Large Physical Address Extensions(LPAE)
-
-VFPv4 Floating Point Unit
-
-32KB L1 Instruction cache and 32KB L1 Data cache
-
-AArch64 for 64-bit support and new architectural features
-
-TrustZone security technology
-
-Neon Advanced SIMD
-
-DSP and SIMD extensions
-
-VFPv4 Floating point
-
-Hardware virtualization support
-
-128KB L2 cache
-
-128Mb SPI Flash
-
-| Form factor
-| SODIMM form-factor
-|===
-
-
-=== SODIMM Form-Factor
-
-With the small SODIMM form-factor the SOEDGE is perfect for use as a embedded project
-
-=== 2GB DDR4 RAM
-
-Each SOEDGE modules includes 2GB DDR4 RAM
-
-=== Rockchip RK1808
-
-The RK1808 uses a power efficient Armv8-A archeitecture with dual ARM Cortex A35 cores at 2 GHz
-
-=== NPU
-
-The RK1808 SoC has a Verisilicon Vivante NPU
-
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/SOEDGE/[SOEDGE]
-
-| link:/documentation/SOEDGE/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
diff --git a/content/devices/soedge.md b/content/devices/soedge.md
new file mode 100644
index 00000000..a15bd781
--- /dev/null
+++ b/content/devices/soedge.md
@@ -0,0 +1,45 @@
+---
+title: "SOEDGE"
+categories: 
+  - "Computer modules"
+cover: 
+  image: "/devices/images/soedge.png"
+images:
+  - "/devices/images/soedge.png"
+---
+
+## A Powerful AI Compute Module
+
+The SOEDGE is a 3TOPS compute module that can be paired with a dedicated baseboard or the SOEDGE Baseboard for development. It can also be connected to a SBC, such as the ROCKPro64, or a regular X86 PC using PCIe or USB 3.0 using special adapters. The SOEDGE is, at the time of writing, in early stages of development; if you are a developer interested in Neural Networks and open hardware, please contact us directly for a development unit. 
+
+## Features and Specifications
+
+|     |     |
+| --- | --- |
+| SoC | 2 x ARM Cortex A35 Processor @ 2.0 GHz |
+| Memory | DDR4 RAM (2GB) |
+| Features | A power-efficient ARM 64-Bit Armv8-A architecture <br> AArch32 for full backward compatibility with Armv7 <br> Supports NEON Advanced SIMD (Single Instruction Multiple Data) instruction for acceleration of media and signal processing function <br> Support Large Physical Address Extensions(LPAE) <br> VFPv4 Floating Point Unit <br> 32KB L1 Instruction cache and 32KB L1 Data cache <br> AArch64 for 64-bit support and new architectural features <br> TrustZone security technology <br> Neon Advanced SIMD <br> DSP and SIMD extensions <br> VFPv4 Floating point <br> Hardware virtualization support <br> 128KB L2 cache <br> 128Mb SPI Flash |
+| Form factor | SODIMM form-factor |
+
+### SODIMM Form-Factor
+
+With the small SODIMM form-factor the SOEDGE is perfect for use as a embedded project
+
+### 2GB DDR4 RAM
+
+Each SOEDGE modules includes 2GB DDR4 RAM
+
+### Rockchip RK1808
+
+The RK1808 uses a power efficient Armv8-A archeitecture with dual ARM Cortex A35 cores at 2 GHz
+
+### NPU
+
+The RK1808 SoC has a Verisilicon Vivante NPU
+
+## Documentation
+
+|     |
+| --- |
+| [SOEDGE](/documentation/SOEDGE/) |
+| [Schematics and certifications](/documentation/SOEDGE/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/soedge_baseboard.adoc b/content/devices/soedge_baseboard.adoc
deleted file mode 100644
index 400f263f..00000000
--- a/content/devices/soedge_baseboard.adoc
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: "SOEDGE Baseboard"
-categories: 
-  - "Computer modules"
-cover: 
-  image: "/devices/images/soedge_baseboard.png"
-images:
-  - "/devices/images/soedge_baseboard.png"
----
-
-== SOEDGE Baseboard
-
-The SOEDGE Baseboard is a baseboard that hosts the SOEDGE compute module and turns it into a full single board computer. Makers can use this baseboard as reference to develop their own PCBs and for software development during early stages for custom hardware or PCB development.
-
-== Features and Specifications
-
-[cols="1"]
-|===
-| Gigabit Ethernet
-| HD Digital Video Out
-| 2x USB 3.0 Host
-| Euler Bus
-| Expansion Bus
-| PI-2 Bus
-| PCIe 4X open-ended header
-| Touch Panel Port (TP)
-| Display Serial Interface (DSI) Port
-| IR R/X Port
-| Real Time Clock Port (RTC)
-| Lithium Battery Port
-| SMOS Sensor Interface Port
-| Optional AC WiFi  + BT 5.0 module expansion module
-| Headphone Jack
-| 5.5″ Barrel Power (12V 3A/5A) Port
-|===
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/SOEDGE_Baseboard/[SOEDGE Baseboard]
-
-| link:/documentation/SOEDGE_Baseboard/Schematics_and_certifications/[Schematics and certifications]
-|===
diff --git a/content/devices/soedge_baseboard.md b/content/devices/soedge_baseboard.md
new file mode 100644
index 00000000..73dc2c15
--- /dev/null
+++ b/content/devices/soedge_baseboard.md
@@ -0,0 +1,41 @@
+---
+title: "SOEDGE Baseboard"
+categories: 
+  - "Computer modules"
+cover: 
+  image: "/devices/images/soedge_baseboard.png"
+images:
+  - "/devices/images/soedge_baseboard.png"
+---
+
+## SOEDGE Baseboard
+
+The SOEDGE Baseboard is a baseboard that hosts the SOEDGE compute module and turns it into a full single board computer. Makers can use this baseboard as reference to develop their own PCBs and for software development during early stages for custom hardware or PCB development.
+
+## Features and Specifications
+
+|     |
+| --- |
+| Gigabit Ethernet |
+| HD Digital Video Out |
+| 2x USB 3.0 Host |
+| Euler Bus |
+| Expansion Bus |
+| PI-2 Bus |
+| PCIe 4X open-ended header |
+| Touch Panel Port (TP) |
+| Display Serial Interface (DSI) Port |
+| IR R/X Port |
+| Real Time Clock Port (RTC) |
+| Lithium Battery Port |
+| SMOS Sensor Interface Port |
+| Optional AC WiFi  + BT 5.0 module expansion module |
+| Headphone Jack |
+| 5.5″ Barrel Power (12V 3A/5A) Port |
+
+## Documentation
+
+|     |
+| --- |
+| [SOEDGE Baseboard](/documentation/SOEDGE_Baseboard/) |
+| [Schematics and certifications](/documentation/SOEDGE_Baseboard/Schematics_and_certifications/) |
diff --git a/content/devices/sopine.adoc b/content/devices/sopine.md
similarity index 65%
rename from content/devices/sopine.adoc
rename to content/devices/sopine.md
index 117cec5b..c0b1a9ae 100644
--- a/content/devices/sopine.adoc
+++ b/content/devices/sopine.md
@@ -8,58 +8,42 @@ images:
   - "/devices/images/sopine.jpg"
 ---
 
-== Like the PINEA64-LTS, just much smaller
+## Like the PINEA64-LTS, just much smaller
 
 The SOPINE is a compute module powered by the same Quad-Core ARM Cortex A53 64-Bit Processor used in the PINE A64 with 2G LPDDR3 RAM memory, Power Management Unit, SPI Flash and integrated MicroSD Slot (for bootable OS images microSD card). The SOPINE module has a 5 years LTS (Long Term Supply) status, which means that it will be supplied to 2022 at the very least. There is a one year warranty period for the SOPINE module.
 
 This tiny compute module uses SODIMM-DDR3 form-factor and can be paired with either the Clusterboard, the Baseboard or a custom host PCB for industrial or other embedded applications. It is fully compatible with the PINE A64-LTS in terms of software support
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1,1"]
-|===
-| SoC
-| 4 x ARM Cortex A53 cores @ 1.152 GHz
+|     |     |
+| --- | --- |
+| SoC | 4 x ARM Cortex A53 cores @ 1.152 GHz |
+| GPU | ARM Mali 400 MP2 GPU |
+| Memory | LPDDR3 RAM (2GB) |
+| SPI | SPI Flash 128Mbit |
+| Connections | CMOS sensor interface port |
+| Form factor | SODIMM form-factor |
 
-| GPU
-| ARM Mali 400 MP2 GPU
-
-| Memory
-| LPDDR3 RAM (2GB)
-
-| SPI
-| SPI Flash 128Mbit
-
-| Connections
-| CMOS sensor interface port
-
-| Form factor
-| SODIMM form-factor
-|===
-
-=== Versatile A64 SoC
+### Versatile A64 SoC
 
 The A64 SoC is a versatile SoC perfect for compute functionality
 
-=== 2GB Of LPDDR3 RAM
+### 2GB Of LPDDR3 RAM
 
 Each module comes with 2GB of built-in LPDDR3 RAM
 
-=== Built-In SPI Flash
+### Built-In SPI Flash
 
 Each module comes with 128Mbit of SPI Flash memory
 
-=== SODIMM Form-Factor
+### SODIMM Form-Factor
 
 With the small SODIMM form-factor the SOPINE is perfect for use as a compute module or in a embedded project
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/SOPINE/[SOPINE]
-
-| link:/documentation/SOPINE/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
+|     |
+| --- |
+| [SOPINE](/documentation/SOPINE/) |
+| [Schematics and certifications](/documentation/SOPINE/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/sopine_baseboard.adoc b/content/devices/sopine_baseboard.adoc
deleted file mode 100644
index f5aa4e88..00000000
--- a/content/devices/sopine_baseboard.adoc
+++ /dev/null
@@ -1,82 +0,0 @@
----
-title: "SOPINE Baseboard"
-categories: 
-  - "Computer modules"
-cover: 
-  image: "/devices/images/sopine_baseboard.jpg"
-images:
-  - "/devices/images/sopine_baseboard.jpg"
----
-
-== SOPINE Baseboard
-
-The SOPINE Baseboard Model A is a hosts the SOPINE A64 Compute Module and turns it into a full single board computer. Makers can use this baseboard as reference to develop their own PCBs and for software development during early stages for custom hardware or PCB development.
-
-== Features and Specifications
-
-[cols="1,1"]
-|===
-| Networking
-| Gigabit Ethernet
-
-| Storage
-| eMMC module slot
-
-| Connections
-| HD Digital Video Out
-
-2x USB 2.0 Host
-
-Euler bus
-
-Expansion bus
-
-PI-2 bus
-
-Touch Panel Port (TP)
-
-Display Serial Interface (DSI) port
-
-IR R/X port
-
-Real Time Clock port (RTC)
-
-Lithium battery port
-
-SMOS sensor interface port
-
-Optional 802.11GBN + BT 4.0 module expansion module
-
-Headphone jack
-
-3.5mm Barrel Power (5V 3A) port
-
-|===
-
-
-=== Gigabit Ethernet
-
-The baseboard's Ethernet port allows for fast internet access
-
-=== USB 2.0
-
-Two USB 2.0 Host ports allow for connecting external accessories
-
-=== Battery Port
-
-Lithium battery port allows for running the board without being tethered to a outlet
-
-=== PI-2 GPIO
-
-The SOPINE baseboard comes with a 2x20 pin PI-2 GPIO heade
-
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/SOPINE_Baseboard/[SOPINE_Baseboard]
-
-| link:/documentation/SOPINE_Baseboard/Schematics_and_certifications/[Schematics and certifications]
-|===
diff --git a/content/devices/sopine_baseboard.md b/content/devices/sopine_baseboard.md
new file mode 100644
index 00000000..5d22db49
--- /dev/null
+++ b/content/devices/sopine_baseboard.md
@@ -0,0 +1,44 @@
+---
+title: "SOPINE Baseboard"
+categories: 
+  - "Computer modules"
+cover: 
+  image: "/devices/images/sopine_baseboard.jpg"
+images:
+  - "/devices/images/sopine_baseboard.jpg"
+---
+
+## SOPINE Baseboard
+
+The SOPINE Baseboard Model A is a hosts the SOPINE A64 Compute Module and turns it into a full single board computer. Makers can use this baseboard as reference to develop their own PCBs and for software development during early stages for custom hardware or PCB development.
+
+## Features and Specifications
+
+|     |     |
+| --- | --- |
+| Networking | Gigabit Ethernet |
+| Storage | eMMC module slot |
+| Connections | HD Digital Video Out <br> 2x USB 2.0 Host <br> Euler bus <br> Expansion bus <br> PI-2 bus <br> Touch Panel Port (TP) <br> Display Serial Interface (DSI) port <br> IR R/X port <br> Real Time Clock port (RTC) <br> Lithium battery port <br> SMOS sensor interface port <br> Optional 802.11GBN + BT 4.0 module expansion module <br> Headphone jack <br> 3.5mm Barrel Power (5V 3A) port|
+
+### Gigabit Ethernet
+
+The baseboard’s Ethernet port allows for fast internet access
+
+### USB 2.0
+
+Two USB 2.0 Host ports allow for connecting external accessories
+
+### Battery Port
+
+Lithium battery port allows for running the board without being tethered to a outlet
+
+### PI-2 GPIO
+
+The SOPINE baseboard comes with a 2x20 pin PI-2 GPIO heade
+
+## Documentation
+
+|     |
+| --- |
+| [SOPINE_Baseboard](/documentation/SOPINE_Baseboard/) |
+| [Schematics and certifications](/documentation/SOPINE_Baseboard/Schematics_and_certifications/) |
diff --git a/content/devices/clusterboard.adoc b/content/devices/sopine_clusterboard.md
similarity index 66%
rename from content/devices/clusterboard.adoc
rename to content/devices/sopine_clusterboard.md
index aeeef015..c1177ce7 100644
--- a/content/devices/clusterboard.adoc
+++ b/content/devices/sopine_clusterboard.md
@@ -11,51 +11,45 @@ aliases:
   - /clusterboard
 ---
 
-== Clusterboard
+## Clusterboard
 
 The Clusterboard is a gateway into the world of clusters in a tidy and compact package. The SOPINE Custerboard can host up-to 7 SOPINE modules. The Clusterboard can be powered either using a +5V 15A power supply with 6.3mm OD/3.0mm ID barrel type DC Jack or an ATX power supply*. Each of the SOPINE cluster nodes is able to interface with the entire system via the onboard Ethernet switch. Each node has a USB 2.0 host port and  20 GPIO pins exposed.
 
 *please note that some ATX power supplies may required load to power up the board
 
-== Features and Specifications
+## Features and Specifications
 
-[cols="1"]
-|===
-| Standard mITX form-factor
-| Built-In unmanned Gigabit Ethernet switch
-| eMMC module slot
-| 7x USB 2.0 (one for each module)
-| GPIO pins exposed for each module including UART
-| NIC LEDs for each SOPINE module
-| 2x 1.5V “AA” size battery holder for Real Time Clock port (RTC)
-| +5V 15A power supply with 6.3mm OD/3.0mm ID barrel type DC jack
-| ATX power supply header
-|===
+|     |
+| --- |
+| Standard mITX form-factor |
+| Built-In unmanned Gigabit Ethernet switch |
+| eMMC module slot |
+| 7x USB 2.0 (one for each module) |
+| GPIO pins exposed for each module including UART |
+| NIC LEDs for each SOPINE module |
+| 2x 1.5V “AA” size battery holder for Real Time Clock port (RTC) |
+| +5V 15A power supply with 6.3mm OD/3.0mm ID barrel type DC jack |
+| ATX power supply header |
 
-
-=== Micro ITX Form-Factor
+### Micro ITX Form-Factor
 
 The SOPINE Clusterboard uses a Micro ITX Form-Factor
 
-=== Plenty Of USB
+### Plenty Of USB
 
 Each module added to the Clusterboard exposes one USB 2.0 port
 
-=== ATX Power Header
+### ATX Power Header
 
 ATX power supply header
 
-=== GPIO Pins
+### GPIO Pins
 
 GPIO pins are exposed for each module including UART
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/Clusterboard/[Clusterboard]
-
-| link:/documentation/Clusterboard/Schematics/[Schematics]
-|===
+|     |
+| --- |
+| [Clusterboard](/documentation/Clusterboard/) |
+| [Schematics](/documentation/Clusterboard/Schematics/) |
diff --git a/content/devices/soquartz.adoc b/content/devices/soquartz.md
similarity index 53%
rename from content/devices/soquartz.adoc
rename to content/devices/soquartz.md
index ef12ca20..7b0ce1ef 100644
--- a/content/devices/soquartz.adoc
+++ b/content/devices/soquartz.md
@@ -8,17 +8,13 @@ images:
   - "/devices/images/SOQuartz_module-1s.jpg"
 ---
 
-== The SOQuartz
+## The SOQuartz
 
 The SOQuartz is a RK3566 based compute module and parts of Quartz64 series.
 
+## Documentation
 
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/SOQuartz/[SOQuartz]
-
-| link:/documentation/SOQuartz/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
\ No newline at end of file
+|     |
+| --- |
+| [SOQuartz](/documentation/SOQuartz/) |
+| [Schematics and certifications](/documentation/SOQuartz/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/star64.adoc b/content/devices/star64.adoc
deleted file mode 100644
index e98c9c0f..00000000
--- a/content/devices/star64.adoc
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: "STAR64"
-categories: 
-  - ""
-cover: 
-  image: "/devices/images/star64.png"
-images:
-  - "/devices/images/star64.png"
----
-
-== A star among the single-board computers
-
-The **STAR64** Model A single-board computer features the StarFive JH-7110 SoC. This SoC combines a quad-core SiFive U74 RISC-V 64bit CPU with an IM BXE-4-32-G52-2EE GPU. It is equipped with 8GB LPDDR4 system memory, onboard 128Mb QSPI NOR Flash, an optional eMMC module (up to 128 GB) and a microSD slot for booting. The board is equipped with a dual band Wi-Fi and Bluetooth with a flex antenna, a PCIe x1 open ended slot, 1x USB 3.0 type A Host, 3x USB 2.0 Host, dual Gigabit Ethernet port, MiPi DSI interface, touch Panel interface, MiPi CSI interface, as well as many other peripheral device interface such as UART, SPI, I2C, for makers to integrate with sensors and other peripherals.
-
-The Star64 is a new RISC-V platform that will serve PINE64 community for years to come.
-
-== Documentation
-
-[cols="1"]
-|===
-
-| link:/documentation/STAR64/[STAR64]
-
-| link:/documentation/STAR64/Further_information/Schematics_and_certifications/[Schematics and certifications]
-|===
diff --git a/content/devices/star64.md b/content/devices/star64.md
new file mode 100644
index 00000000..e7d2ae18
--- /dev/null
+++ b/content/devices/star64.md
@@ -0,0 +1,22 @@
+---
+title: "STAR64"
+categories: 
+  - ""
+cover: 
+  image: "/devices/images/star64.png"
+images:
+  - "/devices/images/star64.png"
+---
+
+## A star among the single-board computers
+
+The ***STAR64*** Model A single-board computer features the StarFive JH-7110 SoC. This SoC combines a quad-core SiFive U74 RISC-V 64bit CPU with an IM BXE-4-32-G52-2EE GPU. It is equipped with 8GB LPDDR4 system memory, onboard 128Mb QSPI NOR Flash, an optional eMMC module (up to 128 GB) and a microSD slot for booting. The board is equipped with a dual band Wi-Fi and Bluetooth with a flex antenna, a PCIe x1 open ended slot, 1x USB 3.0 type A Host, 3x USB 2.0 Host, dual Gigabit Ethernet port, MiPi DSI interface, touch Panel interface, MiPi CSI interface, as well as many other peripheral device interface such as UART, SPI, I2C, for makers to integrate with sensors and other peripherals.
+
+The Star64 is a new RISC-V platform that will serve PINE64 community for years to come.
+
+## Documentation
+
+|     |
+| --- |
+| [STAR64](/documentation/STAR64/) |
+| [Schematics and certifications](/documentation/STAR64/Further_information/Schematics_and_certifications/) |
diff --git a/content/devices/template.adoc b/content/devices/template.md
similarity index 50%
rename from content/devices/template.adoc
rename to content/devices/template.md
index 8f300e86..4bd67fa9 100644
--- a/content/devices/template.adoc
+++ b/content/devices/template.md
@@ -11,43 +11,22 @@ images:
 
 == 
 
+## Features and Specifications
 
-
-== Features and Specifications
-
-[cols="1,1"]
-|===
-| SoC
-| 
-
-| GPU
-| 
-
-| Memory
-| 
-
-| Networking
-| 
-
-| Storage
-| 
-
-| Connections
-
-
-|===
-
+|     |     |
+| --- | --- |
+| SoC |  |
+| GPU |  |
+| Memory |  |
+| Networking |  |
+| Storage |  |
 
 === 
 
-
 === 
 
-
 === 
 
-
 === 
 
-
-== Documentation
\ No newline at end of file
+## Documentation
diff --git a/themes/pinetheme/assets/css/style.css b/themes/pinetheme/assets/css/style.css
index 09f33445..77ec0ef7 100644
--- a/themes/pinetheme/assets/css/style.css
+++ b/themes/pinetheme/assets/css/style.css
@@ -736,6 +736,7 @@ div.credits {
 .devices table {
     border: none;
     border-spacing: 0;
+    line-height: 2;
 }
 .devices tbody {
     background-color: white;