diff --git a/screenshots/01_hdm_init.png b/screenshots/01_hdm_init.png
deleted file mode 100644
index 477efd09..00000000
Binary files a/screenshots/01_hdm_init.png and /dev/null differ
diff --git a/screenshots/02_hdm_create_admin.png b/screenshots/02_hdm_create_admin.png
deleted file mode 100644
index 1382d37b..00000000
Binary files a/screenshots/02_hdm_create_admin.png and /dev/null differ
diff --git a/screenshots/03_hdm_admin_created.png b/screenshots/03_hdm_admin_created.png
deleted file mode 100644
index b88758ab..00000000
Binary files a/screenshots/03_hdm_admin_created.png and /dev/null differ
diff --git a/screenshots/04_hdm_create_user.png b/screenshots/04_hdm_create_user.png
deleted file mode 100644
index 73ce2046..00000000
Binary files a/screenshots/04_hdm_create_user.png and /dev/null differ
diff --git a/screenshots/05_hdm_user_list.png b/screenshots/05_hdm_user_list.png
deleted file mode 100644
index bfe1dea7..00000000
Binary files a/screenshots/05_hdm_user_list.png and /dev/null differ
diff --git a/screenshots/06_hdm_user_login.png b/screenshots/06_hdm_user_login.png
deleted file mode 100644
index c6bef7b5..00000000
Binary files a/screenshots/06_hdm_user_login.png and /dev/null differ
diff --git a/screenshots/07_hdm_user_start_page.png b/screenshots/07_hdm_user_start_page.png
deleted file mode 100644
index af89f473..00000000
Binary files a/screenshots/07_hdm_user_start_page.png and /dev/null differ
diff --git a/screenshots/08_hdm_select_puppet_environment.png b/screenshots/08_hdm_select_puppet_environment.png
deleted file mode 100644
index 8427b0fd..00000000
Binary files a/screenshots/08_hdm_select_puppet_environment.png and /dev/null differ
diff --git a/screenshots/09_hdm_select_node.png.png b/screenshots/09_hdm_select_node.png.png
deleted file mode 100644
index f3a30c3d..00000000
Binary files a/screenshots/09_hdm_select_node.png.png and /dev/null differ
diff --git a/screenshots/10_hdm_selected_key_and_hierarchies.png b/screenshots/10_hdm_selected_key_and_hierarchies.png
deleted file mode 100644
index 7b8614cd..00000000
Binary files a/screenshots/10_hdm_selected_key_and_hierarchies.png and /dev/null differ
diff --git a/screenshots/11_hdm_read_data.png b/screenshots/11_hdm_read_data.png
deleted file mode 100644
index d4441a8e..00000000
Binary files a/screenshots/11_hdm_read_data.png and /dev/null differ
diff --git a/screenshots/HDM-01-login.png b/screenshots/HDM-01-login.png
new file mode 100644
index 00000000..ceb4758f
Binary files /dev/null and b/screenshots/HDM-01-login.png differ
diff --git a/screenshots/HDM-02-select-env.png b/screenshots/HDM-02-select-env.png
new file mode 100644
index 00000000..2b1a02dd
Binary files /dev/null and b/screenshots/HDM-02-select-env.png differ
diff --git a/screenshots/HDM-03-select-env2.png b/screenshots/HDM-03-select-env2.png
new file mode 100644
index 00000000..7aeb59b9
Binary files /dev/null and b/screenshots/HDM-03-select-env2.png differ
diff --git a/screenshots/HDM-04-select-node-or-key.png b/screenshots/HDM-04-select-node-or-key.png
new file mode 100644
index 00000000..e200b0cb
Binary files /dev/null and b/screenshots/HDM-04-select-node-or-key.png differ
diff --git a/screenshots/HDM-05-select-node.png b/screenshots/HDM-05-select-node.png
new file mode 100644
index 00000000..0e998d12
Binary files /dev/null and b/screenshots/HDM-05-select-node.png differ
diff --git a/screenshots/HDM-06-select-node-key-list.png b/screenshots/HDM-06-select-node-key-list.png
new file mode 100644
index 00000000..168f2dc7
Binary files /dev/null and b/screenshots/HDM-06-select-node-key-list.png differ
diff --git a/screenshots/HDM-07-select-node-select-key.png b/screenshots/HDM-07-select-node-select-key.png
new file mode 100644
index 00000000..47c077c1
Binary files /dev/null and b/screenshots/HDM-07-select-node-select-key.png differ
diff --git a/screenshots/HDM-08-select-node-select-key-overview.png b/screenshots/HDM-08-select-node-select-key-overview.png
new file mode 100644
index 00000000..e4fb9f15
Binary files /dev/null and b/screenshots/HDM-08-select-node-select-key-overview.png differ
diff --git a/screenshots/HDM-09-select-node-select-key-data.png b/screenshots/HDM-09-select-node-select-key-data.png
new file mode 100644
index 00000000..c9ce9dec
Binary files /dev/null and b/screenshots/HDM-09-select-node-select-key-data.png differ
diff --git a/screenshots/HDM-10-select-node-select-key-with-multiple-occurrence.png b/screenshots/HDM-10-select-node-select-key-with-multiple-occurrence.png
new file mode 100644
index 00000000..1469acb7
Binary files /dev/null and b/screenshots/HDM-10-select-node-select-key-with-multiple-occurrence.png differ
diff --git a/screenshots/HDM-11-select-key.png b/screenshots/HDM-11-select-key.png
new file mode 100644
index 00000000..e08731b6
Binary files /dev/null and b/screenshots/HDM-11-select-key.png differ
diff --git a/screenshots/HDM-12-select-key-result.png b/screenshots/HDM-12-select-key-result.png
new file mode 100644
index 00000000..441b9fca
Binary files /dev/null and b/screenshots/HDM-12-select-key-result.png differ
diff --git a/screenshots/HDM-13-select-key-result-data.png b/screenshots/HDM-13-select-key-result-data.png
new file mode 100644
index 00000000..700ccfa5
Binary files /dev/null and b/screenshots/HDM-13-select-key-result-data.png differ