diff --git a/.gitmodules b/.gitmodules
index 89af1b0..4f8b3aa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "themes/PaperMod"]
 	path = themes/PaperMod
 	url = https://github.com/adityatelange/hugo-PaperMod.git
+[submodule "themes/hugo-notice"]
+	path = themes/hugo-notice
+	url = https://github.com/martignoni/hugo-notice.git
diff --git a/config.toml b/config.toml
index a0febe2..7b7ede7 100644
--- a/config.toml
+++ b/config.toml
@@ -2,7 +2,7 @@ baseURL = 'https://mainline4lumia.github.io'
 languageCode = 'en-us'
 title = 'Mainline4Lumia'
 description = 'Bringing Mainline Linux to your Lumias!'
-theme = "PaperMod"
+theme = ["hugo-notice", "PaperMod"]
 paginate = 5
 
 [params]
diff --git a/content/devices/cityman.md b/content/devices/cityman.md
new file mode 100644
index 0000000..9f73b91
--- /dev/null
+++ b/content/devices/cityman.md
@@ -0,0 +1,85 @@
+---
+title: "Microsoft Lumia 950 XL"
+summary: "(cityman)"
+---
+
+![Microsoft Lumia 950 XL front](/img/cityman.png)
+
+| Informations |   |
+| ------------ | - |
+| Release | November 2015 |
+| Dimensions | 151.9 x 78.4 x 8.1mm |
+| Weight | 165g |
+| Original OS | Windows 10 Mobile |
+| SoC | Qualcomm MSM8994 Snapdragon 810, 64-bit |
+| CPU | 4x ARM Cortex-A57 @ 1.96 GHz, 4x ARM Cortex-A53 @ 1.56 GHz |
+| GPU | Qualcomm Adreno 430 |
+| RAM | 3 GB |
+| Storage | 32 GB, SD card support |
+| Display | 1440 x 2560 pixels, 5.7" AMOLED |
+| Battery | 3340 mAh, removable |
+| USB | USB-C |
+| Wireless charging | Yes |
+| Touchscreen | Synaptics RMI4 |
+| Wi-Fi | Qualcomm Atheros QCA6174, 802.11 a/b/g/n/ac |
+| Bluetooth | Qualcomm Atheros QCA6174, 4.1 |
+| Connectivity | Single and Dual SIM SKUs, GSM / WCDMA / LTE / TD LTE |
+| Audio | Speaker, earpiece, 3.5mm jack |
+| GPS | Yes |
+| NFC | NXP Semiconductors PN547 |
+| FM radio | Silicon Labs Si4705 |
+| Rear camera | 20 MP, OIS, triple LED flash |
+| Front camera | 5 MP, wide-angle |
+| Accelerometer sensor | TDK InvenSense MPU-6500 |
+| Ambient light sensor | Avago QPDS-T900 |
+| Barometer sensor | Murata Manufacturing Inc. ZPA2326 |
+| Grip sensor | Analog Devices Inc. AD7147 |
+| Gyroscope sensor | Unknown |
+| Hall sensor | GPIO |
+| Magnetometer sensor | Asahi Kasei Microdevices AK09912 |
+| Proximity sensor | Avago QPDS-T900 |
+
+# Current status
+
+{{< notice info >}}
+This device has been upstreamed to the mainline kernel thanks to Gustave Monce (gus33000) and Konrad Dybcio (konradybcio). This page exists mostly to track the progress of the device since it's used as a reference device for other related projects like Android.
+{{< /notice >}}
+
+{{< notice info >}}
+This device share its platform (octagon) with [Microsoft Lumia 950 XL (cityman)](/devices/cityman).
+{{< /notice >}}
+
+| Feature | Supported |
+| ------- | --------- |
+| Booting | Yes |
+| GPU | No |
+| eMMC | Yes |
+| SD card | Yes |
+| Display | Yes |
+| Battery statistics | No |
+| USB | No |
+| Charging | No |
+| Wireless charging | No |
+| Touchscreen | Yes |
+| Wi-Fi | No |
+| Bluetooth | Yes |
+| Calls | No |
+| Mobile data | No |
+| SMS | No |
+| Audio | No |
+| GPS | No |
+| NFC | Yes |
+| FM radio | No |
+| Camera | No |
+| Accelerometer sensor | Yes |
+| Ambient light sensor | Yes |
+| Barometer sensor | Yes |
+| Grip sensor | Yes |
+| Gyroscope sensor | No |
+| Hall sensor | Yes |
+| Magnetometer sensor | Yes |
+| Proximity sensor | Yes |
+
+# Installation
+
+See [Install](/install)
diff --git a/content/devices/talkman.md b/content/devices/talkman.md
new file mode 100644
index 0000000..216bd15
--- /dev/null
+++ b/content/devices/talkman.md
@@ -0,0 +1,85 @@
+---
+title: "Microsoft Lumia 950"
+summary: "(talkman)"
+---
+
+![Microsoft Lumia 950 front](/img/talkman.png)
+
+| Informations |   |
+| ------------ | - |
+| Release | November 2015 |
+| Dimensions | 145 x 73.2 x 8.25mm |
+| Weight | 150g |
+| Original OS | Windows 10 Mobile |
+| SoC | Qualcomm MSM8992 Snapdragon 808, 64-bit |
+| CPU | 2x ARM Cortex-A57 @ 1.82 GHz, 4x ARM Cortex-A53 @ 1.44 GHz |
+| GPU | Qualcomm Adreno 418 |
+| RAM | 3 GB |
+| Storage | 32 GB, SD card support |
+| Display | 1440 x 2560 pixels, 5.2" AMOLED |
+| Battery | 3000 mAh, removable |
+| USB | USB-C |
+| Wireless charging | Yes |
+| Touchscreen | Synaptics RMI4 |
+| Wi-Fi | Qualcomm Atheros QCA6174, 802.11 a/b/g/n/ac |
+| Bluetooth | Qualcomm Atheros QCA6174, 4.1 |
+| Connectivity | Single and Dual SIM SKUs, GSM / WCDMA / LTE / TD LTE |
+| Audio | Speaker, earpiece, 3.5mm jack |
+| GPS | Yes |
+| NFC | NXP Semiconductors PN547 |
+| FM radio | Silicon Labs Si4705 |
+| Rear camera | 20 MP, OIS, triple LED flash |
+| Front camera | 5 MP, wide-angle |
+| Accelerometer sensor | TDK InvenSense MPU-6500 |
+| Ambient light sensor | Avago QPDS-T900 |
+| Barometer sensor | Murata Manufacturing Inc. ZPA2326 |
+| Grip sensor | Analog Devices Inc. AD7147 |
+| Gyroscope sensor | Unknown |
+| Hall sensor | GPIO |
+| Magnetometer sensor | Asahi Kasei Microdevices AK09912 |
+| Proximity sensor | Avago QPDS-T900 |
+
+# Current status
+
+{{< notice info >}}
+This device has been upstreamed to the mainline kernel thanks to Gustave Monce (gus33000) and Konrad Dybcio (konradybcio). This page exists mostly to track the progress of the device since it's used as a reference device for other related projects like Android.
+{{< /notice >}}
+
+{{< notice info >}}
+This device share its platform (octagon) with [Microsoft Lumia 950 XL (cityman)](/devices/cityman).
+{{< /notice >}}
+
+| Feature | Supported |
+| ------- | --------- |
+| Booting | Yes |
+| GPU | No |
+| eMMC | Yes |
+| SD card | Yes |
+| Display | Yes |
+| Battery statistics | No |
+| USB | No |
+| Charging | No |
+| Wireless charging | No |
+| Touchscreen | Yes |
+| Wi-Fi | No |
+| Bluetooth | Yes |
+| Calls | No |
+| Mobile data | No |
+| SMS | No |
+| Audio | No |
+| GPS | No |
+| NFC | Yes |
+| FM radio | No |
+| Camera | No |
+| Accelerometer sensor | Yes |
+| Ambient light sensor | Yes |
+| Barometer sensor | Yes |
+| Grip sensor | Yes |
+| Gyroscope sensor | No |
+| Hall sensor | Yes |
+| Magnetometer sensor | Yes |
+| Proximity sensor | Yes |
+
+# Installation
+
+See [Install](/install)
diff --git a/static/img/cityman.png b/static/img/cityman.png
new file mode 100644
index 0000000..7391b78
Binary files /dev/null and b/static/img/cityman.png differ
diff --git a/static/img/talkman.png b/static/img/talkman.png
new file mode 100644
index 0000000..b82cdda
Binary files /dev/null and b/static/img/talkman.png differ
diff --git a/themes/hugo-notice b/themes/hugo-notice
new file mode 160000
index 0000000..2d7d746
--- /dev/null
+++ b/themes/hugo-notice
@@ -0,0 +1 @@
+Subproject commit 2d7d7460bc60a6801e648f1cf95b53dd6741a665