diff --git a/docs/images/screenshots/pbs-gui-datastore-content.png b/docs/images/screenshots/pbs-gui-datastore-content.png
index 162f9772..88071b3e 100644
Binary files a/docs/images/screenshots/pbs-gui-datastore-content.png and b/docs/images/screenshots/pbs-gui-datastore-content.png differ
diff --git a/docs/images/screenshots/pbs-gui-datastore-create-general.png b/docs/images/screenshots/pbs-gui-datastore-create-general.png
deleted file mode 100644
index e946a9ed..00000000
Binary files a/docs/images/screenshots/pbs-gui-datastore-create-general.png and /dev/null differ
diff --git a/docs/images/screenshots/pbs-gui-datastore-create.png b/docs/images/screenshots/pbs-gui-datastore-create.png
new file mode 100644
index 00000000..c90748db
Binary files /dev/null and b/docs/images/screenshots/pbs-gui-datastore-create.png differ
diff --git a/docs/images/screenshots/pbs-gui-datastore-options.png b/docs/images/screenshots/pbs-gui-datastore-options.png
new file mode 100644
index 00000000..af169bb9
Binary files /dev/null and b/docs/images/screenshots/pbs-gui-datastore-options.png differ
diff --git a/docs/images/screenshots/pbs-gui-datastore-summary.png b/docs/images/screenshots/pbs-gui-datastore-summary.png
index ea41229f..7c6a80a9 100644
Binary files a/docs/images/screenshots/pbs-gui-datastore-summary.png and b/docs/images/screenshots/pbs-gui-datastore-summary.png differ
diff --git a/docs/images/screenshots/pbs-gui-remote.png b/docs/images/screenshots/pbs-gui-remote.png
new file mode 100644
index 00000000..f922bff3
Binary files /dev/null and b/docs/images/screenshots/pbs-gui-remote.png differ
diff --git a/docs/images/screenshots/pbs-gui-syncjob-add.png b/docs/images/screenshots/pbs-gui-syncjob-add.png
index 442afb5b..6bae2add 100644
Binary files a/docs/images/screenshots/pbs-gui-syncjob-add.png and b/docs/images/screenshots/pbs-gui-syncjob-add.png differ
diff --git a/docs/images/screenshots/pbs-gui-syncjob.png b/docs/images/screenshots/pbs-gui-syncjob.png
new file mode 100644
index 00000000..e009dba1
Binary files /dev/null and b/docs/images/screenshots/pbs-gui-syncjob.png differ
diff --git a/docs/images/screenshots/pbs-gui-system-config.png b/docs/images/screenshots/pbs-gui-system-config.png
new file mode 100644
index 00000000..075eae14
Binary files /dev/null and b/docs/images/screenshots/pbs-gui-system-config.png differ
diff --git a/docs/storage.rst b/docs/storage.rst
index f9a20cef..a1b2b0d4 100644
--- a/docs/storage.rst
+++ b/docs/storage.rst
@@ -116,7 +116,7 @@ Datastore Configuration
 
 .. image:: images/screenshots/pbs-gui-datastore-content.png
   :align: right
-  :alt: Datastore Overview
+  :alt: Datastore Content Overview
 
 You can configure multiple datastores. A minimum of one datastore needs to be
 configured. The datastore is identified by a simple *name* and points to a
@@ -133,7 +133,7 @@ run periodically, based on a configured schedule (see
 
 Creating a Datastore
 ^^^^^^^^^^^^^^^^^^^^
-.. image:: images/screenshots/pbs-gui-datastore-create-general.png
+.. image:: images/screenshots/pbs-gui-datastore-create.png
   :align: right
   :alt: Create a datastore