diff --git a/draft/boards/uugear-witty-pi-2.png b/draft/boards/uugear-witty-pi-2.png
new file mode 100644
index 0000000..93609aa
Binary files /dev/null and b/draft/boards/uugear-witty-pi-2.png differ
diff --git a/draft/boards/witty-pi-2.png b/draft/boards/witty-pi-2.png
deleted file mode 100644
index e3e95ed..0000000
Binary files a/draft/boards/witty-pi-2.png and /dev/null differ
diff --git a/draft/overlay/witty-pi-2.md b/draft/overlay/uugear-witty-pi-2.md
similarity index 51%
rename from draft/overlay/witty-pi-2.md
rename to draft/overlay/uugear-witty-pi-2.md
index f78ada1..c5f77c2 100644
--- a/draft/overlay/witty-pi-2.md
+++ b/draft/overlay/uugear-witty-pi-2.md
@@ -2,10 +2,10 @@
 ---
 name: Witty Pi 2
 class: board
-type: rtc,switch,power
+type: power,rtc
 formfactor: HAT
 image: 'witty-pi-2.png'
-manufacturer: UUGear s.r.o.
+manufacturer: UUGear
 description: Realtime clock and power management for Raspberry Pi
 url: http://www.uugear.com/product/wittypi2/
 github: https://github.com/uugear/Witty-Pi-2
@@ -31,9 +31,17 @@ i2c:
     name: DS3231
     device: DS3231
 -->
-# Witty-Pi-2
+# Witty Pi 2
 
-Witty Pi 2 is the second generation of Witty Pi, which adds realtime clock and power management to your Raspberry Pi. You can turn on/off your Raspberry Pi with a single tap on the button on Witty Pi 2, and the power supply for Raspberry Pi and all its USB peripherals will get fully cut after the shutdown. Witty Pi 2 has a CR2032 backed realtime clock (DS3231) on board, and can accurately keep time for Raspberry Pi. The built-in temperature sensor can tell the temperature around your Raspberry Pi too. You can schedule next shutdown/startup of your Pi via the software. Complex ON/OFF sequence for Raspberry Pi can be achieved by applying a user-defined schedule script. If you are using power bank as power supply, the new dummy load feature can keep power bank alive with low current consumption. The newly added 6-pin female header breaks out some important signals for integration/extension.
+Witty Pi 2 is the second generation of Witty Pi, which adds realtime clock and power management to your Raspberry Pi.
+
+You can turn on/off your Raspberry Pi with a single tap on the button on Witty Pi 2, and the power supply for Raspberry Pi and all its USB peripherals will get fully cut after the shutdown.
+
+Witty Pi 2 has a CR2032 backed realtime clock (DS3231) on board, and can accurately keep time for Raspberry Pi. The built-in temperature sensor can tell the temperature around your Raspberry Pi too.
+
+You can schedule next shutdown/startup of your Pi via the software. Complex ON/OFF sequence for Raspberry Pi can be achieved by applying a user-defined schedule script.
+
+If you are using power bank as power supply, the new dummy load feature can keep power bank alive with low current consumption. The newly added 6-pin female header breaks out some important signals for integration/extension.
 
 You can use the two commands below to install software for Witty Pi 2: