diff --git a/content/hardware/01.mkr/02.shields/mkr-485-shield/tutorials/mkr-485-communication/mkr-485-communication.md b/content/hardware/01.mkr/02.shields/mkr-485-shield/tutorials/mkr-485-communication/mkr-485-communication.md
index ac1cbc7e7f..6607e50abb 100644
--- a/content/hardware/01.mkr/02.shields/mkr-485-shield/tutorials/mkr-485-communication/mkr-485-communication.md
+++ b/content/hardware/01.mkr/02.shields/mkr-485-shield/tutorials/mkr-485-communication/mkr-485-communication.md
@@ -11,8 +11,8 @@ libraries:
   - name: Arduino RS485
     url: https://www.arduino.cc/en/Reference/ArduinoRS485
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-485-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - _snippets/hardware/jumper-wires
 software:
   - ide-v1
diff --git a/content/hardware/01.mkr/02.shields/mkr-can-shield/tutorials/mkr-can-communication/mkr-can-communication.md b/content/hardware/01.mkr/02.shields/mkr-can-shield/tutorials/mkr-can-communication/mkr-can-communication.md
index 1dda5b1871..fe36c73ab4 100644
--- a/content/hardware/01.mkr/02.shields/mkr-can-shield/tutorials/mkr-can-communication/mkr-can-communication.md
+++ b/content/hardware/01.mkr/02.shields/mkr-can-shield/tutorials/mkr-can-communication/mkr-can-communication.md
@@ -10,8 +10,8 @@ libraries:
   - name: CAN
     url: https://github.com/sandeepmistry/arduino-CAN
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-can-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - _snippets/hardware/jumper-wires
 software:
   - ide-v1
diff --git a/content/hardware/01.mkr/02.shields/mkr-env-shield/tutorials/mkr-env-shield-basic/mkr-env-shield-basic.md b/content/hardware/01.mkr/02.shields/mkr-env-shield/tutorials/mkr-env-shield-basic/mkr-env-shield-basic.md
index 55b2e3a661..1a287cffc4 100644
--- a/content/hardware/01.mkr/02.shields/mkr-env-shield/tutorials/mkr-env-shield-basic/mkr-env-shield-basic.md
+++ b/content/hardware/01.mkr/02.shields/mkr-env-shield/tutorials/mkr-env-shield-basic/mkr-env-shield-basic.md
@@ -11,8 +11,8 @@ libraries:
   - name: Arduino_MKRENV
     url: https://www.arduino.cc/en/Reference/ArduinoMKRENV
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-env-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/02.shields/mkr-eth-shield/tutorials/mkr-eth-shield-webserver/mkr-eth-shield-webserver.md b/content/hardware/01.mkr/02.shields/mkr-eth-shield/tutorials/mkr-eth-shield-webserver/mkr-eth-shield-webserver.md
index 0965f8a606..70a232e44e 100644
--- a/content/hardware/01.mkr/02.shields/mkr-eth-shield/tutorials/mkr-eth-shield-webserver/mkr-eth-shield-webserver.md
+++ b/content/hardware/01.mkr/02.shields/mkr-eth-shield/tutorials/mkr-eth-shield-webserver/mkr-eth-shield-webserver.md
@@ -11,8 +11,8 @@ libraries:
   - name: Ethernet
     url: https://www.arduino.cc/reference/en/libraries/ethernet/
 hardware:
-  - hardware/01.mkr/01.boards/mkr-zero
   - hardware/01.mkr/02.shields/mkr-eth-shield
+  - hardware/01.mkr/01.boards/mkr-zero
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/02.shields/mkr-gps-shield/tutorials/mkr-gps-basic/mkr-gps-basic.md b/content/hardware/01.mkr/02.shields/mkr-gps-shield/tutorials/mkr-gps-basic/mkr-gps-basic.md
index aa28ad52cb..919e782508 100644
--- a/content/hardware/01.mkr/02.shields/mkr-gps-shield/tutorials/mkr-gps-basic/mkr-gps-basic.md
+++ b/content/hardware/01.mkr/02.shields/mkr-gps-shield/tutorials/mkr-gps-basic/mkr-gps-basic.md
@@ -10,8 +10,8 @@ libraries:
   - name: Arduino_MKRGPS
     url: https://www.arduino.cc/en/Reference/ArduinoMKRGPS
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-gps-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/02.shields/mkr-imu-shield/tutorials/mkr-imu-shield-basics/mkr-imu-shield-basics.md b/content/hardware/01.mkr/02.shields/mkr-imu-shield/tutorials/mkr-imu-shield-basics/mkr-imu-shield-basics.md
index a7bc015ed5..f1632f79cc 100644
--- a/content/hardware/01.mkr/02.shields/mkr-imu-shield/tutorials/mkr-imu-shield-basics/mkr-imu-shield-basics.md
+++ b/content/hardware/01.mkr/02.shields/mkr-imu-shield/tutorials/mkr-imu-shield-basics/mkr-imu-shield-basics.md
@@ -12,8 +12,8 @@ libraries:
   - name: MKRIMU
     url: https://www.arduino.cc/reference/en/libraries/mkrimu/
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-imu-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/02.shields/mkr-mem-shield/tutorials/mkr-mem-shield/mkr-mem-shield-data-logger/mkr-mem-shield-data-logger.md b/content/hardware/01.mkr/02.shields/mkr-mem-shield/tutorials/mkr-mem-shield/mkr-mem-shield-data-logger/mkr-mem-shield-data-logger.md
index 36ec6dd74b..c0749b2399 100644
--- a/content/hardware/01.mkr/02.shields/mkr-mem-shield/tutorials/mkr-mem-shield/mkr-mem-shield-data-logger/mkr-mem-shield-data-logger.md
+++ b/content/hardware/01.mkr/02.shields/mkr-mem-shield/tutorials/mkr-mem-shield/mkr-mem-shield-data-logger/mkr-mem-shield-data-logger.md
@@ -11,8 +11,8 @@ libraries:
   - name: SD
     url: https://www.arduino.cc/en/Reference/SD
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-mem-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/02.shields/mkr-relay-proto-shield/tutorials/mkr-relay-shield-basic/mkr-relay-basic.md b/content/hardware/01.mkr/02.shields/mkr-relay-proto-shield/tutorials/mkr-relay-shield-basic/mkr-relay-basic.md
index daa67cadd4..4b0ac3b01d 100644
--- a/content/hardware/01.mkr/02.shields/mkr-relay-proto-shield/tutorials/mkr-relay-shield-basic/mkr-relay-basic.md
+++ b/content/hardware/01.mkr/02.shields/mkr-relay-proto-shield/tutorials/mkr-relay-shield-basic/mkr-relay-basic.md
@@ -8,8 +8,9 @@ tags:
   - LEDs
 author: 'Karl Söderby'
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-relay-proto-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
+
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/02.shields/mkr-rgb-shield/tutorials/mkr-rgb-fade/mkr-rgb-fade.md b/content/hardware/01.mkr/02.shields/mkr-rgb-shield/tutorials/mkr-rgb-fade/mkr-rgb-fade.md
index 41b112fd7c..9a2bf8a602 100644
--- a/content/hardware/01.mkr/02.shields/mkr-rgb-shield/tutorials/mkr-rgb-fade/mkr-rgb-fade.md
+++ b/content/hardware/01.mkr/02.shields/mkr-rgb-shield/tutorials/mkr-rgb-fade/mkr-rgb-fade.md
@@ -13,8 +13,8 @@ libraries:
   - name: ArduinoGraphics
     url: https://www.arduino.cc/en/Reference/ArduinoGraphics
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-rgb-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/02.shields/mkr-rgb-shield/tutorials/mkr-rgb-fill-stroke/mkr-rgb-fill-stroke.md b/content/hardware/01.mkr/02.shields/mkr-rgb-shield/tutorials/mkr-rgb-fill-stroke/mkr-rgb-fill-stroke.md
index f43cdad800..c3896530fb 100644
--- a/content/hardware/01.mkr/02.shields/mkr-rgb-shield/tutorials/mkr-rgb-fill-stroke/mkr-rgb-fill-stroke.md
+++ b/content/hardware/01.mkr/02.shields/mkr-rgb-shield/tutorials/mkr-rgb-fill-stroke/mkr-rgb-fill-stroke.md
@@ -13,8 +13,9 @@ libraries:
   - name: ArduinoGraphics
     url: https://www.arduino.cc/en/Reference/ArduinoGraphics
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-rgb-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
+
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/02.shields/mkr-sd-proto-shield/tutorials/mkr-sd-proto-shield-data-logger/mkr-sd-proto-shield-data-logger.md b/content/hardware/01.mkr/02.shields/mkr-sd-proto-shield/tutorials/mkr-sd-proto-shield-data-logger/mkr-sd-proto-shield-data-logger.md
index be9c7f0928..65268c308f 100644
--- a/content/hardware/01.mkr/02.shields/mkr-sd-proto-shield/tutorials/mkr-sd-proto-shield-data-logger/mkr-sd-proto-shield-data-logger.md
+++ b/content/hardware/01.mkr/02.shields/mkr-sd-proto-shield/tutorials/mkr-sd-proto-shield-data-logger/mkr-sd-proto-shield-data-logger.md
@@ -11,8 +11,8 @@ libraries:
   - name: SD
     url: https://www.arduino.cc/en/Reference/SD
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-sd-proto-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/02.shields/mkr-therm-shield/tutorials/mkr-therm-shield-basic/mkr-therm-shield-basic.md b/content/hardware/01.mkr/02.shields/mkr-therm-shield/tutorials/mkr-therm-shield-basic/mkr-therm-shield-basic.md
index 89df43e29f..f02f16f85c 100644
--- a/content/hardware/01.mkr/02.shields/mkr-therm-shield/tutorials/mkr-therm-shield-basic/mkr-therm-shield-basic.md
+++ b/content/hardware/01.mkr/02.shields/mkr-therm-shield/tutorials/mkr-therm-shield-basic/mkr-therm-shield-basic.md
@@ -11,8 +11,8 @@ libraries:
   - name: Arduino_MKRTHERM
     url: https://www.arduino.cc/en/Reference/ArduinoMKRTHERM
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/02.shields/mkr-therm-shield
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/01.mkr/03.carriers/mkr-motor-carrier/tutorials/mkr-motor-carrier-battery/mkr-motor-carrier-battery.md b/content/hardware/01.mkr/03.carriers/mkr-motor-carrier/tutorials/mkr-motor-carrier-battery/mkr-motor-carrier-battery.md
index b17ba2402a..6ac6a01d2f 100644
--- a/content/hardware/01.mkr/03.carriers/mkr-motor-carrier/tutorials/mkr-motor-carrier-battery/mkr-motor-carrier-battery.md
+++ b/content/hardware/01.mkr/03.carriers/mkr-motor-carrier/tutorials/mkr-motor-carrier-battery/mkr-motor-carrier-battery.md
@@ -10,8 +10,8 @@ libraries:
   - name: ArduinoMotorCarrier
     url: https://github.com/arduino-libraries/ArduinoMotorCarrier
 hardware:
-  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - hardware/01.mkr/03.carriers/mkr-motor-carrier
+  - hardware/01.mkr/01.boards/mkr-wifi-1010
   - _snippets/hardware/dc-motor
 software:
   - ide-v1
diff --git a/content/hardware/02.hero/shields/4-relays-shield/tutorials/4-relay-shield-basics/4-relay-shield-basics.md b/content/hardware/02.hero/shields/4-relays-shield/tutorials/4-relay-shield-basics/4-relay-shield-basics.md
index c09680b60a..dcdb04ac48 100644
--- a/content/hardware/02.hero/shields/4-relays-shield/tutorials/4-relay-shield-basics/4-relay-shield-basics.md
+++ b/content/hardware/02.hero/shields/4-relays-shield/tutorials/4-relay-shield-basics/4-relay-shield-basics.md
@@ -7,8 +7,8 @@ tags:
   - Relays
 author: 'Karl Söderby'
 hardware:
-  - hardware/02.hero/boards/uno-rev3
   - hardware/02.hero/shields/4-relays-shield
+  - hardware/02.hero/boards/uno-rev3
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/02.hero/shields/motor-shield-rev3/tutorials/msr3-controlling-dc-motor/msr3-controlling-dc-motor.md b/content/hardware/02.hero/shields/motor-shield-rev3/tutorials/msr3-controlling-dc-motor/msr3-controlling-dc-motor.md
index 6e17e4ff31..9a8c5e0a9c 100644
--- a/content/hardware/02.hero/shields/motor-shield-rev3/tutorials/msr3-controlling-dc-motor/msr3-controlling-dc-motor.md
+++ b/content/hardware/02.hero/shields/motor-shield-rev3/tutorials/msr3-controlling-dc-motor/msr3-controlling-dc-motor.md
@@ -8,8 +8,8 @@ tags:
   - PWM
 author: 'Karl Söderby'
 hardware:
-  - hardware/02.hero/boards/uno-rev3
   - hardware/02.hero/shields/motor-shield-rev3
+  - hardware/02.hero/boards/uno-rev3
   - _snippets/hardware/dc-motor
   - _snippets/hardware/power-source
 software:
diff --git a/content/hardware/04.pro/boards/portenta-h7/tutorials/over-the-air-update/content.md b/content/hardware/04.pro/boards/portenta-h7/tutorials/over-the-air-update/content.md
index ef563101cb..8cffa6d751 100644
--- a/content/hardware/04.pro/boards/portenta-h7/tutorials/over-the-air-update/content.md
+++ b/content/hardware/04.pro/boards/portenta-h7/tutorials/over-the-air-update/content.md
@@ -14,7 +14,7 @@ libraries:
     url: https://github.com/arduino-libraries/Arduino_Portenta_OTA
 hardware:
   - hardware/04.pro/boards/portenta-h7
-  - hardware/04.pro/boards/portenta-h7-lite-connected 
+  - hardware/04.pro/boards/portenta-h7-lite-connected
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/catm1-and-nbiot/content.md b/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/catm1-and-nbiot/content.md
index 3ae080bfbf..9fe81b7502 100644
--- a/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/catm1-and-nbiot/content.md
+++ b/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/catm1-and-nbiot/content.md
@@ -8,8 +8,8 @@ tags:
   - NBIOT
 author: 'Benjamin Dannegård'
 hardware:
+  - hardware/04.pro/carriers/portenta-max-carrier
   - hardware/04.pro/boards/portenta-h7
-  - hardware/04pro/carriers/portenta-max-carrier
   - _snippets/hardware/sim-card
 software:
   - ide-v1
diff --git a/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/connecting-to-ttn/content.md b/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/connecting-to-ttn/content.md
index 6dc8ac0dd1..fffb213b8d 100644
--- a/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/connecting-to-ttn/content.md
+++ b/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/connecting-to-ttn/content.md
@@ -9,6 +9,7 @@ author: Taddy Chung, José Bagur
 libraries:
   - name: MKRWAN
 hardware:
+  - hardware/04.pro/carriers/portenta-max-carrier
   - hardware/04.pro/boards/portenta-h7
 software:
   - ide-v1
diff --git a/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/getting-started/content.md b/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/getting-started/content.md
index 0dafd6a423..9127263dcd 100644
--- a/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/getting-started/content.md
+++ b/content/hardware/04.pro/carriers/portenta-max-carrier/tutorials/getting-started/content.md
@@ -6,8 +6,8 @@ tags:
   - Getting Started
 author: José Bagur, Taddy Chung
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/carriers/portenta-max-carrier
+  - hardware/04.pro/boards/portenta-h7
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/04.pro/shields/portenta-cat-m1-nb-iot-gnss-shield/tutorials/getting-started/getting-started.md b/content/hardware/04.pro/shields/portenta-cat-m1-nb-iot-gnss-shield/tutorials/getting-started/getting-started.md
index 202fa0cd53..18ee6e79b8 100644
--- a/content/hardware/04.pro/shields/portenta-cat-m1-nb-iot-gnss-shield/tutorials/getting-started/getting-started.md
+++ b/content/hardware/04.pro/shields/portenta-cat-m1-nb-iot-gnss-shield/tutorials/getting-started/getting-started.md
@@ -9,8 +9,8 @@ tags:
   - NBIOT
 author: 'Benjamin Dannegård'
 hardware:
+  - hardware/04.pro/shields/portenta-cat-m1-nb-iot-gnss-shield
   - hardware/04.pro/boards/portenta-h7
-  - hardware/04pro/shields/portenta-cat-m1-nb-iot-gnss-shield
   - _snippets/hardware/dipole-antenna
   - _snippets/hardware/sim-card
 software:
diff --git a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/blob-detection/content.md b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/blob-detection/content.md
index f5ae63ee1e..e0be94fafa 100644
--- a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/blob-detection/content.md
+++ b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/blob-detection/content.md
@@ -6,8 +6,8 @@ tags: [OpenMV, Blob Detection, Machine Vision, Machine Learning]
 description: This tutorial will show you how to use the Portenta Vision Shield to detect the presence and the position of objects in a camera image.
 author: Sebastian Romero
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/shields/portenta-vision-shield
+  - hardware/04.pro/boards/portenta-h7
 software:
   - openmv
 ---
diff --git a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/camera-to-bitmap-sd-card/content.md b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/camera-to-bitmap-sd-card/content.md
index be608a6c7e..dfb196b35f 100644
--- a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/camera-to-bitmap-sd-card/content.md
+++ b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/camera-to-bitmap-sd-card/content.md
@@ -8,8 +8,8 @@ libraries:
   - name: Arduino_Pro_Tutorials
     url: https://github.com/arduino-libraries/Arduino_Pro_Tutorials
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/shields/portenta-vision-shield
+  - hardware/04.pro/boards/portenta-h7
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/connecting-to-ttn/content.md b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/connecting-to-ttn/content.md
index a98d9ee7e9..c428484fdc 100644
--- a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/connecting-to-ttn/content.md
+++ b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/connecting-to-ttn/content.md
@@ -6,8 +6,8 @@ tags: [Things Network, LoRa, Vision Shield]
 description: This tutorial explains how to connect your Portenta H7 to The Things Network (TTN) using the the Vision Shield's LoRa® Connectivity feature.
 author: Lenard George, Ignacio Herrera
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/shields/portenta-vision-shield
+  - hardware/04.pro/boards/portenta-h7
 ---
 
 ## Overview 
diff --git a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/creating-basic-face-filter/content.md b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/creating-basic-face-filter/content.md
index fd1d7cd7a2..a6d73b69e6 100644
--- a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/creating-basic-face-filter/content.md
+++ b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/creating-basic-face-filter/content.md
@@ -6,8 +6,8 @@ tags: [OpenMV, Face Detection, Haar Cascade, Machine Vision, Machine Learning]
 description: In this tutorial you will build a MicroPython application with OpenMV, to use the Portenta Vision Shield to detect faces and overlay them with a custom bitmap image.
 author: Sebastian Romero, Lenard George
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/shields/portenta-vision-shield
+  - hardware/04.pro/boards/portenta-h7
 software:
   - openmv
 ---
diff --git a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/custom-machine-learning-model/content.md b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/custom-machine-learning-model/content.md
index d6f526d99a..ae030609e5 100644
--- a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/custom-machine-learning-model/content.md
+++ b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/custom-machine-learning-model/content.md
@@ -6,8 +6,8 @@ tags: [Machine Learning, Edge Impulse, TinyML, Tensorflow]
 description: This tutorial teaches you how to train a custom machine learning model with Edge Impulse and to run it using the Portenta Vision Shield.
 author: Sebastian Romero
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/shields/portenta-vision-shield
+  - hardware/04.pro/boards/portenta-h7
 software:
   - EdgeImpulse
 ---
diff --git a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/ethernet-with-ide/content.md b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/ethernet-with-ide/content.md
index 4893c93f91..ffbc0af415 100644
--- a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/ethernet-with-ide/content.md
+++ b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/ethernet-with-ide/content.md
@@ -12,8 +12,8 @@ libraries:
   - name: Ethernet
     url: https://www.arduino.cc/en/Reference/Ethernet
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/shields/portenta-vision-shield
+  - hardware/04.pro/boards/portenta-h7
 software:
   - ide-v1
   - ide-v2
diff --git a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/ethernet-with-openmv/content.md b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/ethernet-with-openmv/content.md
index a2cad5d95a..c162a67a37 100644
--- a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/ethernet-with-openmv/content.md
+++ b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/ethernet-with-openmv/content.md
@@ -12,8 +12,8 @@ libraries:
   - name: Ethernet
     url: https://www.arduino.cc/en/Reference/Ethernet
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/shields/portenta-vision-shield
+  - hardware/04.pro/boards/portenta-h7
 software:
   - openmv
 ---
diff --git a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/getting-started-camera/content.md b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/getting-started-camera/content.md
index eee8e76988..42947d0426 100644
--- a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/getting-started-camera/content.md
+++ b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/getting-started-camera/content.md
@@ -6,8 +6,8 @@ tags: [Getting Started, Camera, Processing, Serial]
 description: This tutorial shows you how to capture frames from the Portenta Vision Shield Camera module and visualize the video output through a Processing sketch.
 author: Lenard George, Sebastian Romero
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/shields/portenta-vision-shield
+  - hardware/04.pro/boards/portenta-h7
 ---
 
 ## Overview
diff --git a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/things-network-openmv/content.md b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/things-network-openmv/content.md
index 859745a4c6..b41dfcb98d 100644
--- a/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/things-network-openmv/content.md
+++ b/content/hardware/04.pro/shields/portenta-vision-shield/tutorials/things-network-openmv/content.md
@@ -6,8 +6,8 @@ tags: [Getting Started, OpenMV, IDE, Setup, TTN, LoRa]
 description: This tutorial explains how to connect your Portenta H7 to The Things Network (TTN) using the Vision Shield's LoRa® Connectivity feature.
 author: Lenard George, Ignacio Herrera, Benjamin Dannegård
 hardware:
-  - hardware/04.pro/boards/portenta-h7
   - hardware/04.pro/shields/portenta-vision-shield
+  - hardware/04.pro/boards/portenta-h7
 software:
   - openmv
 ---
diff --git a/content/hardware/05.pro-solutions/solutions-and-kits/enclosure-kit/tutorials/assembly-instructions/content.md b/content/hardware/05.pro-solutions/solutions-and-kits/enclosure-kit/tutorials/assembly-instructions/content.md
index 147ad1d069..ec9b5931a2 100644
--- a/content/hardware/05.pro-solutions/solutions-and-kits/enclosure-kit/tutorials/assembly-instructions/content.md
+++ b/content/hardware/05.pro-solutions/solutions-and-kits/enclosure-kit/tutorials/assembly-instructions/content.md
@@ -7,8 +7,8 @@ tags:
   - Getting started
 author: 'Benjamin Dannegård'
 hardware:
-  - hardware/04.pro/carriers/edge-control
   - hardware/05.pro-solutions/solutions-and-kits/enclosure-kit
+  - hardware/05.pro-solutions/solutions-and-kits/edge-control
 ---
 
 ## Introduction 
diff --git a/content/tutorials/generic/amplitude-serial-plotter/amplitude-serial-plotter.md b/content/tutorials/generic/amplitude-serial-plotter/amplitude-serial-plotter.md
index 32cbdc0135..d9d261da96 100644
--- a/content/tutorials/generic/amplitude-serial-plotter/amplitude-serial-plotter.md
+++ b/content/tutorials/generic/amplitude-serial-plotter/amplitude-serial-plotter.md
@@ -12,11 +12,12 @@ libraries:
 hardware:
   - hardware/01.mkr/01.boards/mkr-zero
   - hardware/01.mkr/01.boards/mkr-1000-wifi
-  - hardware/02.hero/boards/zero  
+  - hardware/02.hero/boards/zero
 software:
   - ide-v1
   - ide-v2
   - web-editor
+contributeURL: content/tutorials/generic
 ---
 
 ## Introduction
diff --git a/content/tutorials/generic/clap-detector/clap-detector.md b/content/tutorials/generic/clap-detector/clap-detector.md
index b1f6dc2e2f..7c8bb86693 100644
--- a/content/tutorials/generic/clap-detector/clap-detector.md
+++ b/content/tutorials/generic/clap-detector/clap-detector.md
@@ -18,6 +18,7 @@ software:
   - ide-v2
   - web-editor
 author: "Arduino"
+contributeURL: content/tutorials/generic
 ---
 ## Introduction
 This example reads audio data from an Invensense's ICS43432I2S microphone breakout board, and uses the input to detect clapping sounds. The built-in LED is toggled when a clap is detected.
diff --git a/content/tutorials/generic/dns-web-client/dns-web-client.md b/content/tutorials/generic/dns-web-client/dns-web-client.md
index 47c578e0ab..15ea68dac2 100644
--- a/content/tutorials/generic/dns-web-client/dns-web-client.md
+++ b/content/tutorials/generic/dns-web-client/dns-web-client.md
@@ -8,11 +8,12 @@ libraries:
   - name: Ethernet Library
     url: https://www.arduino.cc/en/Reference/Ethernet
 hardware:
-  - hardware/02.hero/boards/uno-rev3    
+  - hardware/02.hero/boards/uno-rev3
 software:
   - ide-v1
   - ide-v2
   - web-editor
+contributeURL: content/tutorials/generic
 ---
 
 
diff --git a/content/tutorials/generic/firmware-updater/firmware-updater.md b/content/tutorials/generic/firmware-updater/firmware-updater.md
index 64649fc0e9..555587aacc 100644
--- a/content/tutorials/generic/firmware-updater/firmware-updater.md
+++ b/content/tutorials/generic/firmware-updater/firmware-updater.md
@@ -12,6 +12,7 @@ software:
   - ide-v2
   - web-editor
 author: "Arduino"
+contributeURL: content/tutorials/generic
 ---
 
 
diff --git a/content/tutorials/generic/micropython-installation/micropython-installation.md b/content/tutorials/generic/micropython-installation/micropython-installation.md
index 1c2b934785..6b61d7feeb 100644
--- a/content/tutorials/generic/micropython-installation/micropython-installation.md
+++ b/content/tutorials/generic/micropython-installation/micropython-installation.md
@@ -11,7 +11,7 @@ hardware:
   - hardware/04.pro/boards/portenta-h7
 software:
   - ide-v2
-
+contributeURL: "content/tutorials/generic"
 author: "Jacob Hylén"
 ---
 ## Introduction
diff --git a/content/tutorials/generic/midi-device/midi-device.md b/content/tutorials/generic/midi-device/midi-device.md
index d9e1415f47..e04351f16f 100644
--- a/content/tutorials/generic/midi-device/midi-device.md
+++ b/content/tutorials/generic/midi-device/midi-device.md
@@ -16,6 +16,7 @@ software:
   - ide-v2
   - web-editor
 author: "Arduino"
+contributeURL: content/tutorials/generic
 ---
 
 ## Introduction
diff --git a/content/tutorials/generic/multiple-blinks/multiple-blinks.md b/content/tutorials/generic/multiple-blinks/multiple-blinks.md
index c3307b5925..ec06c84b68 100644
--- a/content/tutorials/generic/multiple-blinks/multiple-blinks.md
+++ b/content/tutorials/generic/multiple-blinks/multiple-blinks.md
@@ -18,6 +18,7 @@ software:
   - ide-v2
   - web-editor
 author: "Arduino"
+contributeURL: content/tutorials/generic
 ---
 
 
diff --git a/content/tutorials/generic/scheduled-wifi-ssl-web-client/scheduled-wifi-ssl-web-client.md b/content/tutorials/generic/scheduled-wifi-ssl-web-client/scheduled-wifi-ssl-web-client.md
index ce1d837591..328ad517dd 100644
--- a/content/tutorials/generic/scheduled-wifi-ssl-web-client/scheduled-wifi-ssl-web-client.md
+++ b/content/tutorials/generic/scheduled-wifi-ssl-web-client/scheduled-wifi-ssl-web-client.md
@@ -23,6 +23,7 @@ software:
   - ide-v2
   - web-editor
 author: "Arduino"
+contributeURL: content/tutorials/generic
 ---
 
 ## Introduction
diff --git a/content/tutorials/generic/simple-audio-player/simple-audio-player.md b/content/tutorials/generic/simple-audio-player/simple-audio-player.md
index 629703c7a2..bea686dc32 100644
--- a/content/tutorials/generic/simple-audio-player/simple-audio-player.md
+++ b/content/tutorials/generic/simple-audio-player/simple-audio-player.md
@@ -18,6 +18,7 @@ software:
   - ide-v2
   - web-editor
 author: "Arduino"
+contributeURL: content/tutorials/generic
 ---
 
 ## Introduction
diff --git a/content/tutorials/generic/wave-playback/wave-playback.md b/content/tutorials/generic/wave-playback/wave-playback.md
index 99cfe48329..f32b4ca766 100644
--- a/content/tutorials/generic/wave-playback/wave-playback.md
+++ b/content/tutorials/generic/wave-playback/wave-playback.md
@@ -17,6 +17,7 @@ software:
   - ide-v2
   - web-editor
 author: "Arduino"
+contributeURL: content/tutorials/generic
 ---
 
 ## Introduction
diff --git a/content/tutorials/generic/whistle-detector/whistle-detector.md b/content/tutorials/generic/whistle-detector/whistle-detector.md
index 8a594e9a56..fca8514d9e 100644
--- a/content/tutorials/generic/whistle-detector/whistle-detector.md
+++ b/content/tutorials/generic/whistle-detector/whistle-detector.md
@@ -18,6 +18,7 @@ software:
   - ide-v2
   - web-editor
 author: "Arduino"
+contributeURL: content/tutorials/generic
 ---
 
 ## Introduction
diff --git a/package-lock.json b/package-lock.json
index 4dad13dbb8..fbfe25be05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25102,9 +25102,9 @@
       }
     },
     "@arduino/docs-arduino-cc": {
-      "version": "1.7.83",
-      "resolved": "https://npm.pkg.github.com/download/@arduino/docs-arduino-cc/1.7.83/0028e5a4abc6286671d35f91ea47cea74ec349fc",
-      "integrity": "sha512-v8f6iP8Qmu9F5XZ61ZKeI+tVe9jRMScvalQZeT0FtX1kQ1gbikvjhJSGA2KTXsYmvKO9AsQPknJ1SHpga6VtyQ==",
+      "version": "1.7.84",
+      "resolved": "https://npm.pkg.github.com/download/@arduino/docs-arduino-cc/1.7.84/0f22bc184e4b76e10f83deb6f664b70a8536a018",
+      "integrity": "sha512-FHkXy1aClc55EioZykxkRv/Eln1munGXgAgByKrhHpBcRP96sTTR2RoWKFdtAqXFIPi8/aQ2IONbbG8GAO62NA==",
       "requires": {
         "@algolia/autocomplete-core": "^1.5.3",
         "@algolia/autocomplete-preset-algolia": "^1.5.3",
diff --git a/package.json b/package.json
index 1393d73dcb..644c6aaec6 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/arduino/docs-content#readme",
   "dependencies": {
-    "@arduino/docs-arduino-cc": "^1.7.83",
+    "@arduino/docs-arduino-cc": "^1.7.84",
     "gatsby": "^4.9.2"
   },
   "volta": {