diff --git a/src/en/overlay/arduino-spi.md b/src/en/overlay/arduino-spi.md
index 49aefdd..2131735 100644
--- a/src/en/overlay/arduino-spi.md
+++ b/src/en/overlay/arduino-spi.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: content
+class: guide
+type: info
 name: Arduino SPI
 description: Program Arduino with Raspberry Pi SPI
 pincount: 4
diff --git a/src/en/overlay/cirruslogicaudiocard.md b/src/en/overlay/cirruslogicaudiocard.md
index db62778..aa8812b 100644
--- a/src/en/overlay/cirruslogicaudiocard.md
+++ b/src/en/overlay/cirruslogicaudiocard.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: audio
 name: Cirrus Logic Audio Card
 manufacturer: Cirrus Logic and element14
 description: Audio Card with unprecedented level of features and performance for Raspberry Pi.
diff --git a/src/en/overlay/discohat.md b/src/en/overlay/discohat.md
index fd3d064..3cef6e7 100644
--- a/src/en/overlay/discohat.md
+++ b/src/en/overlay/discohat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: audio
 name: DiscoHAT
 manufacturer: Kertatuote
 description: Computer controlled DMX lights, sounds and special effects.
diff --git a/src/en/overlay/display-o-tron-hat.md b/src/en/overlay/display-o-tron-hat.md
index e9017e1..00c14bb 100644
--- a/src/en/overlay/display-o-tron-hat.md
+++ b/src/en/overlay/display-o-tron-hat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: lcd
 name: Display-o-Tron HAT
 manufacturer: Pimoroni
 description: A 3-line character LCD with a 6-zone RGB backlight and 6 touch buttons
@@ -35,7 +36,7 @@ pin:
 -->
 #Display-o-Tron HAT
 
-Display-o-Tron HAT uses both SPI and I2c to drive the LCD display, backlight and touch. 
+Display-o-Tron HAT uses both SPI and I2c to drive the LCD display, backlight and touch.
 However both of these busses can be shared with other devices.
 
 To get the HAT set up and ready to go you can use the one-line product installer:
diff --git a/src/en/overlay/display-o-tron.md b/src/en/overlay/display-o-tron.md
index c930a83..e7cd100 100644
--- a/src/en/overlay/display-o-tron.md
+++ b/src/en/overlay/display-o-tron.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: lcd
 name: Display-o-Tron 3000
 manufacturer: Pimoroni
 description: A 3-line character LCD with an RGB backlight and joystick
diff --git a/src/en/overlay/dots.md b/src/en/overlay/dots.md
index 35913bf..b82636d 100644
--- a/src/en/overlay/dots.md
+++ b/src/en/overlay/dots.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: other
 name: Raspberry Pi Dots
 manufacturer: Raspberry Pi Foundation
 description: Join the dots to make a circuit
diff --git a/src/en/overlay/drum-hat.md b/src/en/overlay/drum-hat.md
index 3c489bd..19791d7 100644
--- a/src/en/overlay/drum-hat.md
+++ b/src/en/overlay/drum-hat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: instrument
 name: Drum HAT
 manufacturer: Pimoroni
 description: An 8 pad finger Drum HAT for your Raspberry Pi
diff --git a/src/en/overlay/explorer-hat-pro.md b/src/en/overlay/explorer-hat-pro.md
index 84da6cf..40b07f2 100644
--- a/src/en/overlay/explorer-hat-pro.md
+++ b/src/en/overlay/explorer-hat-pro.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: multi
 name: Explorer HAT Pro
 manufacturer: Pimoroni
 description: An all-in-one light, input, motor, touch and output add-on board.
diff --git a/src/en/overlay/explorer-hat.md b/src/en/overlay/explorer-hat.md
index 1b91ae3..14a67e0 100644
--- a/src/en/overlay/explorer-hat.md
+++ b/src/en/overlay/explorer-hat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: multi
 name: Explorer HAT
 manufacturer: Pimoroni
 description: An all-in-one light, input, touch and output add-on board.
diff --git a/src/en/overlay/explorer-phat.md b/src/en/overlay/explorer-phat.md
index be8c17e..762806e 100644
--- a/src/en/overlay/explorer-phat.md
+++ b/src/en/overlay/explorer-phat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: multi
 name: Explorer pHAT
 manufacturer: Pimoroni
 description: An all-in-one input, output and motor add-on board.
diff --git a/src/en/overlay/ground.md b/src/en/overlay/ground.md
index 05261ef..ca48261 100644
--- a/src/en/overlay/ground.md
+++ b/src/en/overlay/ground.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: info
+class: interface
+type: pinout
 name: Ground
 description: Raspberry Pi Ground Pins
 pincount: 1
diff --git a/src/en/overlay/i2c.md b/src/en/overlay/i2c.md
index 492b71b..40e24fb 100644
--- a/src/en/overlay/i2c.md
+++ b/src/en/overlay/i2c.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: info
+class: interface
+type: pinout
 name: I2C
 description: Raspberry Pi i2c pins
 pincount: 2
diff --git a/src/en/overlay/iqaudio-pi-dac.md b/src/en/overlay/iqaudio-pi-dac.md
index 9e469b3..f9ef841 100644
--- a/src/en/overlay/iqaudio-pi-dac.md
+++ b/src/en/overlay/iqaudio-pi-dac.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: audio
 name: "Pi-DAC+"
 manufacturer: IQaudIO
 description: An I2S digital to analog audio converter HAT for the Pi
@@ -17,16 +18,16 @@ pin:
     name: I2S
   '15':
     name: Mute/Unmute
-    description: Pi-AMP+ only (optional) 
+    description: Pi-AMP+ only (optional)
   '16':
     name: Rotary Encoder
-    description: (optional) 
+    description: (optional)
   '18':
     name: Rotary Encoder
     description: (optional)
   '22':
     name: IR Sensor
-    description: (optional) 
+    description: (optional)
   '35':
     name: I2S
   '38':
diff --git a/src/en/overlay/phat-dac.md b/src/en/overlay/phat-dac.md
index 198cac0..665a520 100644
--- a/src/en/overlay/phat-dac.md
+++ b/src/en/overlay/phat-dac.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: audio
 name: "pHAT DAC"
 manufacturer: Pimoroni
 description: An I2S digital to analog audio converter
@@ -11,7 +12,7 @@ eeprom: no
 power: 3v3,5v
 pin:
   '12':
-    name: I2S 
+    name: I2S
   '35':
     name: I2S
   '40':
diff --git a/src/en/overlay/piano-hat.md b/src/en/overlay/piano-hat.md
index fd2c749..a986289 100644
--- a/src/en/overlay/piano-hat.md
+++ b/src/en/overlay/piano-hat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: instrument
 name: Piano HAT
 manufacturer: Pimoroni
 description: A tiny Pi piano with 16 touch-sensitive buttons
diff --git a/src/en/overlay/piborg-ledborg.md b/src/en/overlay/piborg-ledborg.md
index a9a4084..39df011 100644
--- a/src/en/overlay/piborg-ledborg.md
+++ b/src/en/overlay/piborg-ledborg.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: led
 name: PiBorg LEDBorg
 manufacturer: PiBorg
 description: A single RGB LED for your Raspberry Pi
@@ -50,4 +51,4 @@ wiringpi.softPwmCreate(3,0,100)
 wiringpi.softPwmWrite(3,100) # Full Blue
 wiringpi.softPwmWrite(0,100) # Full Red
 wiringpi.softPWMWrite(2,0)	 # No Green
-```
\ No newline at end of file
+```
diff --git a/src/en/overlay/pibrella.md b/src/en/overlay/pibrella.md
index c2e4ef5..0376a01 100644
--- a/src/en/overlay/pibrella.md
+++ b/src/en/overlay/pibrella.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: multi
 name: Pibrella
 manufacturer: Pimoroni Vs Cyntech
 description: An all-in-one light, sound, input and output add-on board.
diff --git a/src/en/overlay/piglow.md b/src/en/overlay/piglow.md
index b0beee3..f5c47ab 100644
--- a/src/en/overlay/piglow.md
+++ b/src/en/overlay/piglow.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: led
 name: PiGlow
 manufacturer: Pimoroni
 description: Simply 18 LEDs in a spiral pattern controllable in Python.
diff --git a/src/en/overlay/rtk-000-001.md b/src/en/overlay/rtk-000-001.md
index fb90418..0204892 100644
--- a/src/en/overlay/rtk-000-001.md
+++ b/src/en/overlay/rtk-000-001.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: motor
 name: Ryanteck Motor Controller Board
 manufacturer: Ryanteck
 description: A quick and easy way to start driving motors on your Raspberry Pi
@@ -58,4 +59,4 @@ while (True):
 	#And loop back around
 #And final cleanup
 GPIO.cleanup()
-```
\ No newline at end of file
+```
diff --git a/src/en/overlay/scroll-phat.md b/src/en/overlay/scroll-phat.md
index 85aae0e..1133e7b 100644
--- a/src/en/overlay/scroll-phat.md
+++ b/src/en/overlay/scroll-phat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: led
 name: Scroll pHAT
 manufacturer: Pimoroni
 description: A 11 x 5 LED matrix.
diff --git a/src/en/overlay/sense-hat.md b/src/en/overlay/sense-hat.md
index 23f666b..82e6757 100644
--- a/src/en/overlay/sense-hat.md
+++ b/src/en/overlay/sense-hat.md
@@ -1,9 +1,10 @@
 <!--
 ---
-type: board
+class: board
+type: multi
 name: "Sense HAT"
 manufacturer: Raspberry Pi Foundation
-description: Add-on board that includes an 8×8 RGB LED matrix, 5-button joystick as well as IMU and environmental sensors 
+description: Add-on board that includes an 8×8 RGB LED matrix, 5-button joystick as well as IMU and environmental sensors
 url: https://www.raspberrypi.org/products/sense-hat/
 formfactor: 'HAT'
 pincount: 40
@@ -47,4 +48,4 @@ The sensors themselves operate (mostly) over the i2c bus:
 
 The IMU (Gyroscope, Accelerometer, Magnetometer) through a LSM9DS1 found at i2c address 0x1c(0x1e),0x6a(0x6b), with Interrupts on the ATTINY88.
 
-Environemental sensors are represented by a LPS25H Pressure+Temperature sensor at address 0x5c and by a HTS221 Humidity+Temp sensor at 0x5f on the i2c bus.
\ No newline at end of file
+Environemental sensors are represented by a LPS25H Pressure+Temperature sensor at address 0x5c and by a HTS221 Humidity+Temp sensor at 0x5f on the i2c bus.
diff --git a/src/en/overlay/skywriter-hat.md b/src/en/overlay/skywriter-hat.md
index b03ca33..ad71e16 100644
--- a/src/en/overlay/skywriter-hat.md
+++ b/src/en/overlay/skywriter-hat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: gesture
 name: Skywriter HAT
 manufacturer: Pimoroni
 description: A 3D positional and gesture sensor.
diff --git a/src/en/overlay/spi.md b/src/en/overlay/spi.md
index 901bb03..46062da 100644
--- a/src/en/overlay/spi.md
+++ b/src/en/overlay/spi.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: info
+class: interface
+type: pinout
 name: SPI
 description: Raspberry Pi SPI pins
 pincount: 5
@@ -64,4 +65,4 @@ You can also use the SPI port to "Bit-Bang" an ATmega 328, loading Arduino sketc
 
 Hook up you Pi's SPI port to that of your ATmega, and power the ATmega from the 3.3v pin on the Pi. Make sure you're not running any SPI device drivers, and run "avrdude -p m328p -c gpio" to verify the connection.
 
-See the individual pins to learn how to connect up your ATmega.
\ No newline at end of file
+See the individual pins to learn how to connect up your ATmega.
diff --git a/src/en/overlay/traffic-hat.md b/src/en/overlay/traffic-hat.md
index dc1fcce..6b49dc3 100644
--- a/src/en/overlay/traffic-hat.md
+++ b/src/en/overlay/traffic-hat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: multi
 name: Traffic HAT
 manufacturer: Ryanteck LTD.
 description: A quick and easy way to learn the basics of GPIO on a budget. All in a nice HAT.
@@ -51,4 +52,4 @@ IO.setup(5,IO.OUT)
 
 #Button
 IO.setup(25,IO.IN,pull_up_down=IO.PUD_UP)
-```
\ No newline at end of file
+```
diff --git a/src/en/overlay/uart.md b/src/en/overlay/uart.md
index ec24f19..1b24242 100644
--- a/src/en/overlay/uart.md
+++ b/src/en/overlay/uart.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: info
+class: interface
+type: pinout
 name: UART
 description: Raspberry Pi UART pins
 pincount: 2
@@ -29,4 +30,4 @@ import wiringpi2 as wiringpi
 wiringpi.wiringPiSetup()
 serial = wiringpi.serialOpen('/dev/ttyAMA0',9600)
 wiringpi.serialPuts(serial,'hello world!')
-```
\ No newline at end of file
+```
diff --git a/src/en/overlay/unicorn-hat.md b/src/en/overlay/unicorn-hat.md
index becc839..61200a1 100644
--- a/src/en/overlay/unicorn-hat.md
+++ b/src/en/overlay/unicorn-hat.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: board
+class: board
+type: led
 name: Unicorn HAT
 manufacturer: Pimoroni
 description: 64 blindingly bright RGB LEDs on a single HAT
diff --git a/src/en/overlay/wiringpi.md b/src/en/overlay/wiringpi.md
index a51273e..dacb6d4 100644
--- a/src/en/overlay/wiringpi.md
+++ b/src/en/overlay/wiringpi.md
@@ -1,6 +1,7 @@
 <!--
 ---
-type: content
+class: interface
+type: pinout
 name: WiringPi GPIO Pinout
 url: http://wiringpi.com
 github: https://github.com/WiringPi/WiringPi2-Python