diff --git a/site/docs/hardware/d510mo.md b/site/docs/hardware/d510mo.md
index 3a72509..e5bcefb 100644
--- a/site/docs/hardware/d510mo.md
+++ b/site/docs/hardware/d510mo.md
@@ -2,6 +2,51 @@
title: Intel D510MO and D410PT desktop boards
...
+
+
+![Intel D510MO]()
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Intel |
+| **Name** | D510MO/D410PT |
+| **Released** | 2010 |
+| **Chipset** | Intel NM10 Express (Mount Olive) |
+| **CPU** | Intel Atom |
+| **Graphics** | Integrated |
+| **Display** | None. |
+| **Memory** | Up to 4GB |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | Intel BIOS |
+| **Intel ME/AMD PSP** | Not present. |
+| **Flash chip** | ? |
+
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | |
+|----------------|---------------------------------------|
+| **Internal flashing with original boot firmware** | N |
+| **Display** | - |
+| **Audio** | W+ |
+| **RAM Init** | P+ |
+| **External output** | P+ |
+| **Display brightness** | - |
+
+| ***Payloads supported*** | |
+|---------------------------|-------|
+| **GNU GRUB** | Works |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Works |
+
This is a desktop board using intel hardware (circa \~2009, ICH7
southbridge, similar performance-wise to the ThinkPad X200. It can make
for quite a nifty desktop. Powered by libreboot.
diff --git a/site/docs/hardware/d945gclf.md b/site/docs/hardware/d945gclf.md
index a8d0d76..c52387e 100644
--- a/site/docs/hardware/d945gclf.md
+++ b/site/docs/hardware/d945gclf.md
@@ -3,6 +3,51 @@ title: Intel D945GCLF desktop board
x-toc-enable: true
...
+
+
+{width=200px}
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Intel |
+| **Name** | D945GCLF/D945GCLF2D |
+| **Released** | 2008 |
+| **Chipset** | Intel Calistoga 945GC |
+| **CPU** | Intel Atom |
+| **Graphics** | ? |
+| **Display** | None. |
+| **Memory** | Up to 2GB |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | Intel BIOS |
+| **Intel ME/AMD PSP** | Not present. |
+| **Flash chip** | SOIC-8 512KiB |
+
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | | Notes |
+|----------------|---------------------------------------|-------|
+| **Internal flashing with original boot firmware** | N | |
+| **Display** | - | |
+| **Audio** | W+ | |
+| **RAM Init** | W+ | |
+| **External output** | W+ | |
+| **Display brightness** | - | |
+
+| ***Payloads supported*** | |
+|---------------------------|--------------|
+| **GNU GRUB** | Doesn't work |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Doesn't work |
+
If you just want flashing instructions, go to
[../install/d945gclf.md](../install/d945gclf.md)
diff --git a/site/docs/hardware/ga-g41m-es2l.md b/site/docs/hardware/ga-g41m-es2l.md
index c252da1..4418433 100644
--- a/site/docs/hardware/ga-g41m-es2l.md
+++ b/site/docs/hardware/ga-g41m-es2l.md
@@ -2,6 +2,52 @@
title: Gigabyte GA-G41M-ES2L desktop board
...
+
+
+![GA-G41M-ES2L]()
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Gigabyte |
+| **Name** | GA-G41M-ES2L |
+| **Released** | 2009 |
+| **Chipset** | Intel G41 |
+| **CPU** | Intel Core 2 Extreme/Quad/Duo,
+ Pentium Extreme/D/4 Extreme/4/Celeron |
+| **Graphics** | Integrated |
+| **Display** | None. |
+| **Memory** | Up to 16GB |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | AWARD BIOS |
+| **Intel ME/AMD PSP** | Present. Can be disabled |
+| **Flash chip** | 2x8Mbit |
+
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | |
+|----------------|---------------------------------------|
+| **Internal flashing with original boot firmware** | W+ |
+| **Display** | - |
+| **Audio** | W+ |
+| **RAM Init** | P+ |
+| **External output** | P+ |
+| **Display brightness** | - |
+
+| ***Payloads supported*** | |
+|---------------------------|-------|
+| **GNU GRUB** | Works |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Works |
+
This is a desktop board using intel hardware (circa \~2009, ICH7
southbridge, similar performance-wise to the ThinkPad X200. It can make
for quite a nifty desktop. Powered by libreboot.
diff --git a/site/docs/hardware/imac52.md b/site/docs/hardware/imac52.md
index 5d1ad87..add91fb 100644
--- a/site/docs/hardware/imac52.md
+++ b/site/docs/hardware/imac52.md
@@ -2,6 +2,53 @@
title: Apple iMac 5,2
...
+
+
+![iMac5,2]()
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Apple |
+| **Name** | iMac 17-inch "Core 2 Duo" 1.83 |
+| **Released** | 2006 |
+| **Chipset** | Intel Calistoga 945GM |
+| **CPU** | Intel Core 2 Duo T5600 |
+| **Graphics** | Intel GMA 950 |
+| **Display** | 1440x900 TFT |
+| **Memory** | 512MB, 1GB (upgradable to 2GB) |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | Apple EFI |
+| **Intel ME/AMD PSP** | Not present. |
+| **Flash chip** | SOIC-8 2MiB (Probably upgradable to 16MiB) |
+
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | |
+|----------------|---------------------------------------|
+| **Internal flashing with original boot firmware** | U |
+| **Display** | U |
+| **Audio** | U |
+| **RAM Init** | U |
+| **External output** | U |
+| **Display brightness** | U |
+
+| ***Payloads supported*** | |
+|---------------------------|-----------|
+| **GNU GRUB** | Works |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Works |
+
Information to be written soon, but this board is merged in libreboot.
+This board is very similar to the [MacBook2,1](./macbook21.md).
+
Just refer back to the [hardware section](./) and [install guides](../install/)
diff --git a/site/docs/hardware/kfsn4-dre.md b/site/docs/hardware/kfsn4-dre.md
index 6d5371b..c97a46d 100644
--- a/site/docs/hardware/kfsn4-dre.md
+++ b/site/docs/hardware/kfsn4-dre.md
@@ -3,11 +3,57 @@ title: ASUS KFSN4-DRE server/workstation board
x-toc-enable: true
...
+
+
+![ASUS KFSN4-DRE]()
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | ASUS |
+| **Name** | KFSN4-DRE |
+| **Released** | ? |
+| **Chipset** | nVIDIA nForce Professional 2200 |
+| **CPU** | AMD Opteron 2000 series (Barcelona Family) |
+| **Graphics** | XGI Z9s VGA Controller |
+| **Display** | None. |
+| **Memory** | 512MB, 1GB, 2GB, 4GB |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | AMIBIOS |
+| **Intel ME/AMD PSP** | Not present. |
+| **Flash chip** | PLCC 1MiB (Upgradable to 2MiB) |
+
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | |
+|----------------|---------------------------------------|
+| **Internal flashing with original boot firmware** | W+ |
+| **Display** | - |
+| **Audio** | W+ |
+| **RAM Init** | W+ |
+| **External output** | W+ |
+| **Display brightness** | - |
+
+| ***Payloads supported*** | |
+|---------------------------|-----------------|
+| **GNU GRUB** | Partially works |
+| **SeaBIOS** | Partially works |
+| **SeaBIOS with GNU GRUB** | Partially works |
+
+
This is a server board using AMD hardware (Fam10h). It can also be used
for building a high-powered workstation. Powered by libreboot.
Flashing instructions can be found at
-[../install/\#flashrom](../install/#flashrom)
+[../install/\#flashrom](../install/)
Form factor {#formfactor}
===========
diff --git a/site/docs/hardware/macbook21.md b/site/docs/hardware/macbook21.md
index 6b9afda..e11dabd 100644
--- a/site/docs/hardware/macbook21.md
+++ b/site/docs/hardware/macbook21.md
@@ -3,6 +3,56 @@ title: MacBook2,1 and MacBook1,1
x-toc-enable: true
...
+
+
+![MacBook2,1]()
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Apple |
+| **Name** | Late 2006/Mid 2007 MacBook "Core 2 Duo" / Early
+ 2006 MacBook "Core Duo" |
+| **Released** | 2006/2007 |
+| **Chipset** | Intel Calistoga 945GM |
+| **CPU** | Intel Core 2 Duo or Intel Core Duo on
+ original MacBooks |
+| **Graphics** | Intel GMA 950 |
+| **Display** | 1280x800 TFT |
+| **Memory** | 512MB, 1GB (upgradable to 4GB with 3GB usable) |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | Apple EFI |
+| **Intel ME/AMD PSP** | Not present. |
+| **Flash chip** | SOIC-8 2MiB (Upgradable to 16MiB) |
+
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | | Notes |
+|----------------|---------------------------------------|-------|
+| **Internal flashing with original boot firmware** | W+ | MacBook1,1 does
+ not support this |
+| **Display** | W+ | |
+| **Audio** | W+ | Audio quality is
+ better when using Libreboot |
+| **RAM Init** | W+ | |
+| **External output** | W+ | |
+| **Display brightness** | P+ | [Finetune backlight
+control](../misc/#finetune-backlight-control-on-intel-gpus) |
+
+| ***Payloads supported*** | |
+|---------------------------|-----------|
+| **GNU GRUB** | Works |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Works |
+
There is an Apple laptop called the macbook1,1 from 2006 which uses the
same i945 chipset as the ThinkPad X60/T60. A developer (Mono Moosbart) ported
the Macbook2,1 to coreboot, working alongside Vladimir Serbinenko. The ROM
@@ -62,7 +112,7 @@ External flashing
=================
macbook1,1 requires external flashing, if running the default Apple firmware.
-macbook2,1 can be flased internally, regardless.
+macbook2,1 can be flashed internally, regardless.
If running coreboot or libreboot you can already internally re-flash.
[This page shows disassembly
@@ -72,7 +122,7 @@ Locate the flash. It'll be a SOIC8, which looks like this:

-motherboard. [How to remove the
+The chip is located under the motherboard. [How to remove the
motherboard](https://www.ifixit.com/Guide/MacBook+Core+2+Duo+PRAM+Battery+Replacement/529).
Refer to the following guide:\
diff --git a/site/docs/hardware/r400.md b/site/docs/hardware/r400.md
index 0ef781a..da34919 100644
--- a/site/docs/hardware/r400.md
+++ b/site/docs/hardware/r400.md
@@ -3,6 +3,54 @@ title: ThinkPad R400
x-toc-enable: true
...
+
+
+![ThinkPad R400]()
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Lenovo |
+| **Name** | ThinkPad R400 |
+| **Released** | 2009 |
+| **Chipset** | Intel Cantiga GM45 |
+| **CPU** | Intel Core 2 Duo (Penryn/Merom family) or
+ Celeron M (Merom L family) |
+| **Graphics** | Intel GMA 4500MHD (and ATI Mobility Radeon HD
+ 3470 or nVIDIA
+ GeForce 9300M on some models) |
+| **Display** | 1280x800/1440x900 TFT |
+| **Memory** | Up to 8GB |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | LenovoBIOS |
+| **Intel ME/AMD PSP** | Present. Can be completly disabled. |
+| **Flash chip** | SOIC-8/SOIC-16 4MiB/8MiB (Upgradable to 16MiB) |
+
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | |
+|----------------|---------------------------------------|
+| **Internal flashing with original boot firmware** | N |
+| **Display** | W+ |
+| **Audio** | W+ |
+| **RAM Init** | W+ |
+| **External output** | W+ |
+| **Display brightness** | P+ |
+
+| ***Payloads supported*** | |
+|---------------------------|-----------|
+| **GNU GRUB** | Works |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Works |
+
It is believed that all or most R400 laptops are compatible. See notes
about [CPU
compatibility](../install/r400_external.html#cpu_compatibility) for
diff --git a/site/docs/hardware/r500.md b/site/docs/hardware/r500.md
index 2235327..e195e44 100644
--- a/site/docs/hardware/r500.md
+++ b/site/docs/hardware/r500.md
@@ -3,6 +3,53 @@ title: ThinkPad R500
x-toc-enable: true
...
+
+
+![ThinkPad R500]()
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Lenovo |
+| **Name** | ThinkPad R500 |
+| **Released** | 2009 |
+| **Chipset** | Intel Cantiga GM45 |
+| **CPU** | Intel Core 2 Duo (Penryn/Merom family) or
+ Celeron M (Merom L family) |
+| **Graphics** | Intel GMA 4500MHD (or ATI Mobility Radeon HD
+ 3470 on some models) |
+| **Display** | 1280x800/1680x1050 TFT |
+| **Memory** | 512MB, 2GB or 4GB (Upgradable to 8GB) |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | LenovoBIOS |
+| **Intel ME/AMD PSP** | Present. Can be completly disabled. |
+| **Flash chip** | SOIC-8/SOIC-16/WSON-8 4MiB/8MiB (Upgradable
+ to 16MiB) |
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | |
+|----------------|---------------------------------------|
+| **Internal flashing with original boot firmware** | N |
+| **Display** | W+ |
+| **Audio** | W+ |
+| **RAM Init** | W+ |
+| **External output** | W+ |
+| **Display brightness** | P+ |
+
+| ***Payloads supported*** | |
+|---------------------------|-----------|
+| **GNU GRUB** | Works |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Works |
+
This board as basically identical to the T500, and has very similar disassembly.
You must take it apart and flash the chip externally.
diff --git a/site/docs/hardware/t400.md b/site/docs/hardware/t400.md
index 8a828fa..45f2f00 100644
--- a/site/docs/hardware/t400.md
+++ b/site/docs/hardware/t400.md
@@ -3,6 +3,53 @@ title: ThinkPad T400
x-toc-enable: true
...
+
+
+{width=200px}
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Lenovo |
+| **Name** | ThinkPad T400 |
+| **Released** | 2009 |
+| **Chipset** | Intel Cantiga GM45 |
+| **CPU** | Intel Core 2 Duo (Penryn family). A Quad-core
+ mod exists, replacing the Core 2 Duo with a Core Quad |
+| **Graphics** | Intel GMA 4500MHD (and ATI Mobility Radeon HD
+ 3650 on some models) |
+| **Display** | 1280x800/1440x900 TFT |
+| **Memory** | 2 or 4GB (Upgradable to 8GB) |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | LenovoBIOS |
+| **Intel ME/AMD PSP** | Present. Can be completly disabled. |
+| **Flash chip** | SOIC-8/SOIC-16/WSON-8 4MiB/8MiB (Upgradable
+ to 16MiB) |
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | |
+|----------------|---------------------------------------|
+| **Internal flashing with original boot firmware** | N |
+| **Display** | W+ |
+| **Audio** | W+ |
+| **RAM Init** | W+ |
+| **External output** | W+ |
+| **Display brightness** | P+ |
+
+| ***Payloads supported*** | |
+|---------------------------|-----------|
+| **GNU GRUB** | Works |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Works |
+
Introduction
============
diff --git a/site/docs/hardware/t500.md b/site/docs/hardware/t500.md
index deed8a0..0163e09 100644
--- a/site/docs/hardware/t500.md
+++ b/site/docs/hardware/t500.md
@@ -3,6 +3,53 @@ title: ThinkPad T500
x-toc-enable: true
...
+
+
+{width=200px}
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Lenovo |
+| **Name** | ThinkPad T500 |
+| **Released** | 2009 |
+| **Chipset** | Intel Cantiga GM45 |
+| **CPU** | Intel Core 2 Duo (Penryn family). A Quad-core
+ mod exists, replacing the Core 2 Duo with a Core Quad |
+| **Graphics** | Intel GMA 4500MHD (and ATI Mobility Radeon HD
+ 3650 on some models) |
+| **Display** | 1280x800/1680x1050/1920x1200 TFT |
+| **Memory** | 2 or 4GB (Upgradable to 8GB) |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | LenovoBIOS |
+| **Intel ME/AMD PSP** | Present. Can be completly disabled. |
+| **Flash chip** | SOIC-8/SOIC-16/WSON-8 4MiB/8MiB (Upgradable
+ to 16MiB) |
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | |
+|----------------|---------------------------------------|
+| **Internal flashing with original boot firmware** | N |
+| **Display** | W+ |
+| **Audio** | W+ |
+| **RAM Init** | W+ |
+| **External output** | W+ |
+| **Display brightness** | P+ |
+
+| ***Payloads supported*** | |
+|---------------------------|-----------|
+| **GNU GRUB** | Works |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Works |
+
Introduction
============
diff --git a/site/docs/hardware/x200.md b/site/docs/hardware/x200.md
index ae44917..5ad7b82 100644
--- a/site/docs/hardware/x200.md
+++ b/site/docs/hardware/x200.md
@@ -3,6 +3,52 @@ title: ThinkPad X200
x-toc-enable: true
...
+
+
+{width=200px}
+
+
+| ***Specifications*** | |
+|----------------------------|------------------------------------------------|
+| **Manufacturer** | Lenovo |
+| **Name** | ThinkPad X200/X200S/X200 Tablet |
+| **Released** | July/September 2009 |
+| **Chipset** | Intel Cantiga GM45 |
+| **CPU** | Intel Core 2 Duo (Penryn family) |
+| **Graphics** | Intel GMA X4500MHD |
+| **Display** | 1280x800/1440x900 TFT |
+| **Memory** | 1,2,3 or 4GB (Upgradable to 8GB, unofficially) |
+| **Architecture** | x86_64 |
+| **EC** | Proprietary |
+| **Original boot firmware** | LenovoBIOS |
+| **Intel ME/AMD PSP** | Present. Can be completly disabled. |
+| **Flash chip** | SOIC-8/SOIC-16/WSON-8 4MiB/8MiB (Upgradable
+ to 16MiB) |
+```
+W+: Works without blobs;
+N: Doesn't work;
+W*: Works with blobs;
+U: Untested;
+P+: Partially works;
+P*: Partially works with blobs
+```
+
+| ***Features*** | |
+|----------------|---------------------------------------|
+| **Internal flashing with original boot firmware** | N |
+| **Display** | W+ |
+| **Audio** | W+ |
+| **RAM Init** | W+ |
+| **External output** | W+ |
+| **Display brightness** | P+ |
+
+| ***Payloads supported*** | |
+|---------------------------|-----------|
+| **GNU GRUB** | Works |
+| **SeaBIOS** | Works |
+| **SeaBIOS with GNU GRUB** | Works |
+
+
Introduction
============
@@ -47,7 +93,8 @@ Updated EC firmware has several advantages e.g. better battery
handling.
Battery Recall {#batteryrecall}
-=========
+==============
+
[On 21 April 2015, Lenovo expanded a recall on Lenovo batteries found in some ThinkPad models, which includes the X200 and X200S.](https://pcsupport.lenovo.com/cr/en/solutions/hf004122)
To find out if you are affected, use [this Lenovo tool.](https://lenovobattery2014.orderz.com/)
Lenovo advises that owners of the recalled models "should turn off the system, remove the battery,
diff --git a/site/template.include b/site/template.include
index eb4f14f..bbf378f 100644
--- a/site/template.include
+++ b/site/template.include
@@ -28,7 +28,7 @@ $endif$