diff --git a/README.md b/README.md
index e1c4752..f12f607 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 #Octowatch2 ![Octowatch2 logo](https://github.com/schlotzz/octowatch2/blob/master/resources/images/icon_menu.png "Octowatch2 logo")
 Use your Pebble watch to monitor and control 3D printers that use the excellent [Octoprint](http://octoprint.org/) host software.
 
-![Octowatch2 screenshot](https://github.com/schlotzz/octowatch2/blob/master/screenshots/octowatch2-main-window.png "Screenshot Octowatch2 main window") ![Octowatch2 screenshot](https://github.com/schlotzz/octowatch2/blob/master/screenshots/octowatch2-appmenu.png "Screenshot Pebble app menu")
+![Octowatch2 screenshot](https://github.com/schlotzz/octowatch2/blob/master/screenshots/basalt/octowatch2-basalt-main-window.png "Screenshot Octowatch2 main window") ![Octowatch2 screenshot](https://github.com/schlotzz/octowatch2/blob/master/screenshots/basalt/octowatch2-basalt-commands.png "Screenshot Octowatch2 commands") ![Octowatch2 screenshot](https://github.com/schlotzz/octowatch2/blob/master/screenshots/basalt/octowatch2-basalt-abort-printjob.png "Screenshot Octowatch2 abort printjob") ![Octowatch2 screenshot](https://github.com/schlotzz/octowatch2/blob/master/screenshots/basalt/octowatch2-basalt-confirmation.png "Screenshot Octowatch2 preheat bed") ![Octowatch2 screenshot](https://github.com/schlotzz/octowatch2/blob/master/screenshots/basalt/octowatch2-basalt-appmenu.png "Screenshot Pebble app menu")
 
 ##Features
 Octowatch2 is heavily inspired by [Octowatch](https://github.com/jjg/octowatch), but completely rewritten from scratch to consider current Pebble SDK4 developments.
diff --git a/screenshots/aplite/octowatch2-aplite-abort-printjob.png b/screenshots/aplite/octowatch2-aplite-abort-printjob.png
new file mode 100644
index 0000000..a277083
Binary files /dev/null and b/screenshots/aplite/octowatch2-aplite-abort-printjob.png differ
diff --git a/screenshots/aplite/octowatch2-aplite-commands-confirmation.png b/screenshots/aplite/octowatch2-aplite-commands-confirmation.png
new file mode 100644
index 0000000..bdea06c
Binary files /dev/null and b/screenshots/aplite/octowatch2-aplite-commands-confirmation.png differ
diff --git a/screenshots/aplite/octowatch2-aplite-commands.png b/screenshots/aplite/octowatch2-aplite-commands.png
new file mode 100644
index 0000000..480f894
Binary files /dev/null and b/screenshots/aplite/octowatch2-aplite-commands.png differ
diff --git a/screenshots/aplite/octowatch2-aplite-main-window.png b/screenshots/aplite/octowatch2-aplite-main-window.png
new file mode 100644
index 0000000..e50fe53
Binary files /dev/null and b/screenshots/aplite/octowatch2-aplite-main-window.png differ
diff --git a/screenshots/basalt/octowatch2-basalt-abort-printjob.png b/screenshots/basalt/octowatch2-basalt-abort-printjob.png
new file mode 100644
index 0000000..f7a8469
Binary files /dev/null and b/screenshots/basalt/octowatch2-basalt-abort-printjob.png differ
diff --git a/screenshots/octowatch2-appmenu.png b/screenshots/basalt/octowatch2-basalt-appmenu.png
similarity index 100%
rename from screenshots/octowatch2-appmenu.png
rename to screenshots/basalt/octowatch2-basalt-appmenu.png
diff --git a/screenshots/basalt/octowatch2-basalt-commands.png b/screenshots/basalt/octowatch2-basalt-commands.png
new file mode 100644
index 0000000..eb32b32
Binary files /dev/null and b/screenshots/basalt/octowatch2-basalt-commands.png differ
diff --git a/screenshots/basalt/octowatch2-basalt-confirmation.png b/screenshots/basalt/octowatch2-basalt-confirmation.png
new file mode 100644
index 0000000..973539d
Binary files /dev/null and b/screenshots/basalt/octowatch2-basalt-confirmation.png differ
diff --git a/screenshots/basalt/octowatch2-basalt-main-window.png b/screenshots/basalt/octowatch2-basalt-main-window.png
new file mode 100644
index 0000000..afc1dd7
Binary files /dev/null and b/screenshots/basalt/octowatch2-basalt-main-window.png differ
diff --git a/screenshots/diorite/octowatch2-diorite-abort-printjob.png b/screenshots/diorite/octowatch2-diorite-abort-printjob.png
new file mode 100644
index 0000000..a277083
Binary files /dev/null and b/screenshots/diorite/octowatch2-diorite-abort-printjob.png differ
diff --git a/screenshots/diorite/octowatch2-diorite-appmenu.png b/screenshots/diorite/octowatch2-diorite-appmenu.png
new file mode 100644
index 0000000..536c28d
Binary files /dev/null and b/screenshots/diorite/octowatch2-diorite-appmenu.png differ
diff --git a/screenshots/diorite/octowatch2-diorite-commands.png b/screenshots/diorite/octowatch2-diorite-commands.png
new file mode 100644
index 0000000..480f894
Binary files /dev/null and b/screenshots/diorite/octowatch2-diorite-commands.png differ
diff --git a/screenshots/diorite/octowatch2-diorite-confirmation.png b/screenshots/diorite/octowatch2-diorite-confirmation.png
new file mode 100644
index 0000000..cf8a3db
Binary files /dev/null and b/screenshots/diorite/octowatch2-diorite-confirmation.png differ
diff --git a/screenshots/diorite/octowatch2-diorite-main-window.png b/screenshots/diorite/octowatch2-diorite-main-window.png
new file mode 100644
index 0000000..a0eb015
Binary files /dev/null and b/screenshots/diorite/octowatch2-diorite-main-window.png differ
diff --git a/screenshots/octowatch2-main-window.png b/screenshots/octowatch2-main-window.png
deleted file mode 100644
index 6f0231d..0000000
Binary files a/screenshots/octowatch2-main-window.png and /dev/null differ