diff --git a/needles/gnome/apps/apps_run_seahorse.json b/needles/gnome/apps/apps_run_seahorse.json
new file mode 100644
index 00000000..f0b5f69b
--- /dev/null
+++ b/needles/gnome/apps/apps_run_seahorse.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 271,
+      "ypos": 113,
+      "width": 142,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "apps_run_seahorse"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/apps_run_seahorse.png b/needles/gnome/apps/apps_run_seahorse.png
new file mode 100644
index 00000000..fbd4b371
Binary files /dev/null and b/needles/gnome/apps/apps_run_seahorse.png differ
diff --git a/needles/gnome/apps/keyring/keyring_add_network_folder.json b/needles/gnome/apps/keyring/keyring_add_network_folder.json
new file mode 100644
index 00000000..53b40cde
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_add_network_folder.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 746,
+      "ypos": 41,
+      "width": 126,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_add_network_folder"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_add_network_folder.png b/needles/gnome/apps/keyring/keyring_add_network_folder.png
new file mode 100644
index 00000000..b33147a5
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_add_network_folder.png differ
diff --git a/needles/gnome/apps/keyring/keyring_button_connect-blue.json b/needles/gnome/apps/keyring/keyring_button_connect-blue.json
new file mode 100644
index 00000000..82bc499d
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_button_connect-blue.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 599,
+      "ypos": 201,
+      "width": 66,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_button_connect"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_button_connect-blue.png b/needles/gnome/apps/keyring/keyring_button_connect-blue.png
new file mode 100644
index 00000000..227c204b
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_button_connect-blue.png differ
diff --git a/needles/gnome/apps/keyring/keyring_button_connect.json b/needles/gnome/apps/keyring/keyring_button_connect.json
new file mode 100644
index 00000000..6388fec9
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_button_connect.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 607,
+      "ypos": 734,
+      "width": 66,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_button_connect"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_button_connect.png b/needles/gnome/apps/keyring/keyring_button_connect.png
new file mode 100644
index 00000000..2253d211
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_button_connect.png differ
diff --git a/needles/gnome/apps/keyring/keyring_ftp_localhost.json b/needles/gnome/apps/keyring/keyring_ftp_localhost.json
new file mode 100644
index 00000000..69dfd319
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_ftp_localhost.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 60,
+      "ypos": 331,
+      "width": 131,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_ftp_localhost"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_ftp_localhost.png b/needles/gnome/apps/keyring/keyring_ftp_localhost.png
new file mode 100644
index 00000000..7f7dea58
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_ftp_localhost.png differ
diff --git a/needles/gnome/apps/keyring/keyring_initiate-keyring_test_file-gnome.json b/needles/gnome/apps/keyring/keyring_initiate-keyring_test_file-gnome.json
new file mode 100644
index 00000000..f72c19a7
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_initiate-keyring_test_file-gnome.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 253,
+      "ypos": 163,
+      "width": 87,
+      "height": 67,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_test_file"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_initiate-keyring_test_file-gnome.png b/needles/gnome/apps/keyring/keyring_initiate-keyring_test_file-gnome.png
new file mode 100644
index 00000000..a3b31a6e
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_initiate-keyring_test_file-gnome.png differ
diff --git a/needles/gnome/apps/keyring/keyring_keys_values.json b/needles/gnome/apps/keyring/keyring_keys_values.json
new file mode 100644
index 00000000..5e201b3c
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_keys_values.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 521,
+      "ypos": 304,
+      "width": 195,
+      "height": 47,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_keys_values"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_keys_values.png b/needles/gnome/apps/keyring/keyring_keys_values.png
new file mode 100644
index 00000000..4cb7a5b4
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_keys_values.png differ
diff --git a/needles/gnome/apps/keyring/keyring_location_line.json b/needles/gnome/apps/keyring/keyring_location_line.json
new file mode 100644
index 00000000..bdcae87b
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_location_line.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 217,
+      "ypos": 736,
+      "width": 82,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_location_line"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_location_line.png b/needles/gnome/apps/keyring/keyring_location_line.png
new file mode 100644
index 00000000..49c585d1
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_location_line.png differ
diff --git a/needles/gnome/apps/keyring/keyring_maps_unfold.json b/needles/gnome/apps/keyring/keyring_maps_unfold.json
new file mode 100644
index 00000000..da54b6b4
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_maps_unfold.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 39,
+      "ypos": 307,
+      "width": 40,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_maps_unfold"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_maps_unfold.png b/needles/gnome/apps/keyring/keyring_maps_unfold.png
new file mode 100644
index 00000000..1da0c352
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_maps_unfold.png differ
diff --git a/needles/gnome/apps/keyring/keyring_open_location-20240408.json b/needles/gnome/apps/keyring/keyring_open_location-20240408.json
new file mode 100644
index 00000000..adcb6a5d
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_open_location-20240408.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 106,
+      "height": 61,
+      "type": "match",
+      "width": 71,
+      "xpos": 572
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_open_location"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_open_location-20240408.png b/needles/gnome/apps/keyring/keyring_open_location-20240408.png
new file mode 100644
index 00000000..1b322573
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_open_location-20240408.png differ
diff --git a/needles/gnome/apps/keyring/keyring_open_location.json b/needles/gnome/apps/keyring/keyring_open_location.json
new file mode 100644
index 00000000..2938704d
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_open_location.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 605,
+      "ypos": 106,
+      "width": 71,
+      "height": 61,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_open_location"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_open_location.png b/needles/gnome/apps/keyring/keyring_open_location.png
new file mode 100644
index 00000000..b68689a7
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_open_location.png differ
diff --git a/needles/gnome/apps/keyring/keyring_open_network.json b/needles/gnome/apps/keyring/keyring_open_network.json
new file mode 100644
index 00000000..8eb70fc5
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_open_network.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 6,
+      "ypos": 188,
+      "width": 82,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_open_network"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_open_network.png b/needles/gnome/apps/keyring/keyring_open_network.png
new file mode 100644
index 00000000..02f65e72
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_open_network.png differ
diff --git a/needles/gnome/apps/keyring/keyring_other_location.json b/needles/gnome/apps/keyring/keyring_other_location.json
new file mode 100644
index 00000000..f55ab04d
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_other_location.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 40,
+      "ypos": 498,
+      "width": 112,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_other_location"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_other_location.png b/needles/gnome/apps/keyring/keyring_other_location.png
new file mode 100644
index 00000000..03ec3bc4
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_other_location.png differ
diff --git a/needles/gnome/apps/keyring/keyring_passwords_unfold.json b/needles/gnome/apps/keyring/keyring_passwords_unfold.json
new file mode 100644
index 00000000..6fbba1e5
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_passwords_unfold.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 43,
+      "ypos": 258,
+      "width": 69,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_passwords_unfold"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_passwords_unfold.png b/needles/gnome/apps/keyring/keyring_passwords_unfold.png
new file mode 100644
index 00000000..a74f6598
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_passwords_unfold.png differ
diff --git a/needles/gnome/apps/keyring/keyring_remember_forever.json b/needles/gnome/apps/keyring/keyring_remember_forever.json
new file mode 100644
index 00000000..14035d6d
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_remember_forever.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 428,
+      "ypos": 565,
+      "width": 125,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_remember_forever"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_remember_forever.png b/needles/gnome/apps/keyring/keyring_remember_forever.png
new file mode 100644
index 00000000..46f04464
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_remember_forever.png differ
diff --git a/needles/gnome/apps/keyring/keyring_remember_password.json b/needles/gnome/apps/keyring/keyring_remember_password.json
new file mode 100644
index 00000000..176b4ce7
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_remember_password.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 404,
+      "ypos": 468,
+      "width": 132,
+      "height": 15,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_remember_password"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_remember_password.png b/needles/gnome/apps/keyring/keyring_remember_password.png
new file mode 100644
index 00000000..ea90d2d5
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_remember_password.png differ
diff --git a/needles/gnome/apps/keyring/keyring_reveal_password.json b/needles/gnome/apps/keyring/keyring_reveal_password.json
new file mode 100644
index 00000000..06ac36f9
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_reveal_password.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 689,
+      "ypos": 436,
+      "width": 21,
+      "height": 14,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_reveal_password"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_reveal_password.png b/needles/gnome/apps/keyring/keyring_reveal_password.png
new file mode 100644
index 00000000..4d90142e
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_reveal_password.png differ
diff --git a/needles/gnome/apps/keyring/keyring_save_next.json b/needles/gnome/apps/keyring/keyring_save_next.json
new file mode 100644
index 00000000..ed337eb0
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_save_next.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 668,
+      "ypos": 578,
+      "width": 100,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_save_connect",
+    "keyring_save_next"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_save_next.png b/needles/gnome/apps/keyring/keyring_save_next.png
new file mode 100644
index 00000000..21cd6bec
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_save_next.png differ
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_details.json b/needles/gnome/apps/keyring/keyring_seahorse_details.json
new file mode 100644
index 00000000..842c1266
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_seahorse_details.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 384,
+      "ypos": 122,
+      "width": 130,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_seahorse_details"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_details.png b/needles/gnome/apps/keyring/keyring_seahorse_details.png
new file mode 100644
index 00000000..f3653521
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_seahorse_details.png differ
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_details_shown.json b/needles/gnome/apps/keyring/keyring_seahorse_details_shown.json
new file mode 100644
index 00000000..64c63a6a
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_seahorse_details_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 648,
+      "ypos": 424,
+      "width": 65,
+      "height": 79,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_seahorse_details_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_details_shown.png b/needles/gnome/apps/keyring/keyring_seahorse_details_shown.png
new file mode 100644
index 00000000..3e54134c
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_seahorse_details_shown.png differ
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_login-blue.json b/needles/gnome/apps/keyring/keyring_seahorse_login-blue.json
new file mode 100644
index 00000000..679544e6
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_seahorse_login-blue.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 35,
+      "ypos": 121,
+      "width": 38,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_seahorse_login"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_login-blue.png b/needles/gnome/apps/keyring/keyring_seahorse_login-blue.png
new file mode 100644
index 00000000..62dee487
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_seahorse_login-blue.png differ
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_login.json b/needles/gnome/apps/keyring/keyring_seahorse_login.json
new file mode 100644
index 00000000..9f46cc5c
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_seahorse_login.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 33,
+      "ypos": 121,
+      "width": 40,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_seahorse_login"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_login.png b/needles/gnome/apps/keyring/keyring_seahorse_login.png
new file mode 100644
index 00000000..953556c8
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_seahorse_login.png differ
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_password_shown.json b/needles/gnome/apps/keyring/keyring_seahorse_password_shown.json
new file mode 100644
index 00000000..2cea3059
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_seahorse_password_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 440,
+      "ypos": 262,
+      "width": 111,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_seahorse_password_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_password_shown.png b/needles/gnome/apps/keyring/keyring_seahorse_password_shown.png
new file mode 100644
index 00000000..650b445f
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_seahorse_password_shown.png differ
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_show_password.json b/needles/gnome/apps/keyring/keyring_seahorse_show_password.json
new file mode 100644
index 00000000..c57af6b1
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_seahorse_show_password.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 615,
+      "ypos": 260,
+      "width": 27,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_seahorse_show_password"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_seahorse_show_password.png b/needles/gnome/apps/keyring/keyring_seahorse_show_password.png
new file mode 100644
index 00000000..84932175
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_seahorse_show_password.png differ
diff --git a/needles/gnome/apps/keyring/keyring_select_ftp.json b/needles/gnome/apps/keyring/keyring_select_ftp.json
new file mode 100644
index 00000000..d6887b13
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_select_ftp.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 189,
+      "ypos": 261,
+      "width": 27,
+      "height": 15,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_select_ftp"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_select_ftp.png b/needles/gnome/apps/keyring/keyring_select_ftp.png
new file mode 100644
index 00000000..e061428f
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_select_ftp.png differ
diff --git a/needles/gnome/apps/keyring/keyring_select_registered.json b/needles/gnome/apps/keyring/keyring_select_registered.json
new file mode 100644
index 00000000..03625369
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_select_registered.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 508,
+      "ypos": 356,
+      "width": 76,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_select_registered"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_select_registered.png b/needles/gnome/apps/keyring/keyring_select_registered.png
new file mode 100644
index 00000000..74b5b300
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_select_registered.png differ
diff --git a/needles/gnome/apps/keyring/keyring_show_values.json b/needles/gnome/apps/keyring/keyring_show_values.json
new file mode 100644
index 00000000..f5e498b0
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_show_values.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 446,
+      "ypos": 236,
+      "width": 105,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_show_values"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_show_values.png b/needles/gnome/apps/keyring/keyring_show_values.png
new file mode 100644
index 00000000..794e3f0d
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_show_values.png differ
diff --git a/needles/gnome/apps/keyring/keyring_test_file.json b/needles/gnome/apps/keyring/keyring_test_file.json
new file mode 100644
index 00000000..58056ee5
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_test_file.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 286,
+      "ypos": 117,
+      "width": 77,
+      "height": 50,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_test_file"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_test_file.png b/needles/gnome/apps/keyring/keyring_test_file.png
new file mode 100644
index 00000000..f9334771
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_test_file.png differ
diff --git a/needles/kde/apps/kwalletmanager_runs.json b/needles/kde/apps/kwalletmanager_runs.json
new file mode 100644
index 00000000..816c9ff3
--- /dev/null
+++ b/needles/kde/apps/kwalletmanager_runs.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 459,
+      "ypos": 96,
+      "width": 104,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "kwalletmanager_runs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/kwalletmanager_runs.png b/needles/kde/apps/kwalletmanager_runs.png
new file mode 100644
index 00000000..f36ff905
Binary files /dev/null and b/needles/kde/apps/kwalletmanager_runs.png differ
diff --git a/needles/kde/kde_button_next.json b/needles/kde/kde_button_next.json
new file mode 100644
index 00000000..918f04f9
--- /dev/null
+++ b/needles/kde/kde_button_next.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 707,
+      "ypos": 577,
+      "width": 46,
+      "height": 16,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "kde_button_next"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/kde_button_next.png b/needles/kde/kde_button_next.png
new file mode 100644
index 00000000..37643237
Binary files /dev/null and b/needles/kde/kde_button_next.png differ
diff --git a/needles/kde/kde_button_ok.json b/needles/kde/kde_button_ok.json
new file mode 100644
index 00000000..05bf7983
--- /dev/null
+++ b/needles/kde/kde_button_ok.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 563,
+      "ypos": 502,
+      "width": 42,
+      "height": 16,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "kde_button_ok"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/kde_button_ok.png b/needles/kde/kde_button_ok.png
new file mode 100644
index 00000000..e4416989
Binary files /dev/null and b/needles/kde/kde_button_ok.png differ
diff --git a/templates.fif.json b/templates.fif.json
index b9a51d61..ac8496f7 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -1336,6 +1336,20 @@
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },
+        "desktop_keyring": {
+            "profiles": {
+                "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-KDE-live-iso-x86_64-*-64bit": 30,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "POSTINSTALL_PATH": "tests/applications/keyring",
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
+            }
+        },
         "desktop_update_graphical": {
             "profiles": {
                 "fedora-KDE-live-iso-x86_64-*-64bit": 32,
diff --git a/tests/applications/keyring/aaa_setup.pm b/tests/applications/keyring/aaa_setup.pm
new file mode 100644
index 00000000..68690252
--- /dev/null
+++ b/tests/applications/keyring/aaa_setup.pm
@@ -0,0 +1,95 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This script will install the necessary things to test the Desktop Keyring on Gnome
+# and KDE, i.e.:
+# - we will install an FTP server.
+# - we will set it up so that logins can be made.
+# - we will log into the FTP server and make the system to remember the credentials.
+# - we will restart the machine and check that the credentials are still remembered.
+# - we will open SeaHorse or KDE Wallet to check that the credentials are stored.
+
+sub run {
+    my $self = shift;
+    my $desktop = get_var("DESKTOP");
+    # Switch to console
+    $self->root_console(tty => 3);
+
+    # We install the necessary packages.
+    assert_script_run("dnf -y install pure-ftpd");
+    if ($desktop eq "gnome") {
+        assert_script_run("dnf -y install seahorse");
+    }
+
+    # Download the configuration file for FTP and unpack it.
+    download_testdata("configuration");
+    assert_script_run("mv -f /home/test/configuration/pure-ftpd.conf /etc/pure-ftpd/");
+    assert_script_run("chown root:root /etc/pure-ftpd/pure-ftpd.conf");
+    assert_script_run("chmod 644 /etc/pure-ftpd/pure-ftpd.conf");
+
+    # Set up the system.
+    # Add a group for the FTP and the user that will own the FTP stuff
+    assert_script_run("groupadd ftpusers");
+    assert_script_run("useradd -g ftpusers -d /dev/null -s /sbin/nologin ftpuser");
+    # Create a directory to hold the FTP content, set rights and create the content.
+    assert_script_run("mkdir /ftpdata");
+    assert_script_run("chown -R ftpuser:ftpusers /ftpdata");
+    assert_script_run("echo 'This is a test file' > /ftpdata/testfile.txt");
+    # Enable the FTP service in the firewall.
+    assert_script_run("firewall-cmd --add-service=ftp --permanent");
+    assert_script_run("firewall-cmd --reload");
+
+    # Set up the FTP server.
+    # Create a virtual FTP user called tucnak.
+    enter_cmd("pure-pw useradd tucnak -u ftpuser -g ftpusers -d /ftpdata");
+    sleep(2);
+    # Set its password, wait between attempts so that the system has time
+    # to react to the input.
+    type_string("weakpassword\n");    # To pass the password entry.
+    sleep(2);
+    type_string("weakpassword\n");
+    sleep(2);
+    # Create PureFTP database to the settings.
+    assert_script_run("pure-pw mkdb");
+    # Check that the settings are done correctly
+    assert_script_run("pure-pw list | egrep 'tucnak\\s+/ftpdata'");
+    assert_script_run("pure-pw show tucnak");
+
+    # Enable and start the server.
+    assert_script_run("systemctl enable pure-ftpd.service --now");
+
+    # Check that it is running (the assertion will fail if not)
+    assert_script_run("systemctl status pure-ftpd.service --no-pager");
+
+    # Return to desktop
+    desktop_vt();
+
+    # Start the file explorer application based on what system we are
+    # running, Gnome or KDE.
+    my $app = "nautilus";
+    my $key = "up";
+    if (get_var("DESKTOP") eq "kde") {
+        $app = "dolphin";
+        $key = "pgup";
+    }
+    menu_launch_type($app);
+    send_key("super-$key");
+    wait_still_screen(3);
+    # Check that it has started
+    if (get_var("DESKTOP") eq "kde") {
+        assert_screen("dolphin_runs");
+    }
+    else {
+        assert_screen("apps_run_files");
+    }
+}
+
+sub test_flags {
+    return {fatal => 1, milestone => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/applications/keyring/keyring_initiate.pm b/tests/applications/keyring/keyring_initiate.pm
new file mode 100644
index 00000000..833982d4
--- /dev/null
+++ b/tests/applications/keyring/keyring_initiate.pm
@@ -0,0 +1,89 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This script will
+# - use the file application to log onto the localhost's
+#   ftp server while we will ask the system to remember the login credentials.
+# - check that the credentials have been stored in the system
+# - reboot the computer and check that the system still remembers them
+#   and that we can do the FTP again without credentials.
+
+
+sub run {
+    my $self = shift;
+    my $desktop = get_var("DESKTOP");
+    if ($desktop eq "kde") {
+        # The Dolphin application is already started, so we begin
+        # with clicking on Network to open the network folders.
+        # We want to add a new connection and go through the
+        # password addition process.
+        assert_and_click("keyring_open_network");
+        assert_and_click("keyring_add_network_folder");
+        assert_and_click("keyring_select_ftp");
+        assert_and_click("kde_button_next");
+        # We will set up the connection.
+        type_very_safely("FTPConnect");
+        send_key("tab");
+        type_very_safely("tucnak");
+        send_key("tab");
+        type_very_safely("127.0.0.1");
+        assert_and_click("keyring_save_connect");
+        # Type password to connect
+        type_very_safely("weakpassword");
+        # Reveal it so that we can check it is correctly
+        # written, when there are failures because of that
+        # (I have seen a couple of mistypes during development).
+        assert_and_click("keyring_reveal_password");
+        assert_and_click("keyring_remember_password");
+        assert_and_click("kde_button_ok");
+        # We have added the network location and an icon
+        # has been created to access it. Click on that icon.
+        assert_and_click("keyring_open_location");
+        # While double click would sometimes fail here, we
+        # want to confirm opening the icon using the
+        # Enter key.
+        send_key("ret");
+        # Check that we have opened the location and that
+        # we can see the FTP content.
+        assert_screen("keyring_test_file");
+        # Close the application.
+        send_key("alt-f4");
+    }
+    else {
+        # The Nautilus application is already started, so we begin
+        # with clicking on Other locations.
+        # We want to add a new connection and go through the
+        # password addition process.
+        assert_and_click("keyring_other_location");
+        assert_and_click("keyring_location_line");
+        type_very_safely("ftp://127.0.0.1");
+        assert_and_click("keyring_button_connect");
+        # We will set up the connection.
+        assert_and_click("keyring_select_registered");
+        send_key("tab");
+        type_very_safely("tucnak");
+        send_key("tab");
+        type_very_safely("weakpassword");
+        # Reveal it so that we can check it is correctly
+        # written, when there are failures because of that
+        # (I have seen a couple of mistypes during development).
+        assert_and_click("keyring_remember_forever");
+        assert_and_click("keyring_button_connect");
+        # Check that we have opened the location and that
+        # we can see the FTP content.
+        assert_screen("keyring_test_file");
+        # Close the application.
+        send_key("alt-f4");
+
+    }
+}
+
+sub test_flags {
+    return {fatal => 1, milestone => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/applications/keyring/keyring_kontrol.pm b/tests/applications/keyring/keyring_kontrol.pm
new file mode 100644
index 00000000..c173fc77
--- /dev/null
+++ b/tests/applications/keyring/keyring_kontrol.pm
@@ -0,0 +1,54 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This script will check that the password has been added
+# to the system keyring. We will start a wallet application
+# and check that the password is listed in that application.
+
+
+sub run {
+    my $self = shift;
+    my $desktop = get_var("DESKTOP");
+    if ($desktop eq "kde") {
+        # Start the KDE wallet application and maximize it.
+        menu_launch_type("kwalletmanager");
+        assert_screen("kwalletmanager_runs");
+        send_key("super-pgup");
+
+        # Navigate to the stored entry and check that
+        # the credentials are stored there.
+        assert_and_dclick("keyring_passwords_unfold");
+        assert_and_dclick("keyring_maps_unfold");
+        assert_and_click("keyring_ftp_localhost");
+        assert_and_click("keyring_show_values");
+        assert_screen("keyring_keys_values");
+    }
+    else {
+        # Start the Seahorse application and maximize it.
+        menu_launch_type("seahorse");
+        assert_screen("apps_run_seahorse");
+        send_key("super-up");
+
+        # Navigate to the stored entry and check
+        # that the credentials are stored there.
+        assert_and_click("keyring_seahorse_login");
+        assert_and_dclick("keyring_seahorse_details");
+        assert_screen("keyring_seahorse_details_shown");
+        assert_and_click("keyring_seahorse_show_password");
+        assert_screen("keyring_seahorse_password_shown");
+    }
+
+    # Reboot the machine.
+    $self->root_console(tty => 3);
+    enter_cmd("reboot");
+}
+
+sub test_flags {
+    return {fatal => 1, milestone => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/applications/keyring/keyring_reuse.pm b/tests/applications/keyring/keyring_reuse.pm
new file mode 100644
index 00000000..26983139
--- /dev/null
+++ b/tests/applications/keyring/keyring_reuse.pm
@@ -0,0 +1,59 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This script will open the File application and attempt
+# to reconnect to the FTP server, this time without
+# having to put credentials into the process.
+
+
+sub run {
+    my $self = shift;
+    my $pw = get_var("USER_PASSWORD") // "weakpassword";
+    my $desktop = get_var("DESKTOP");
+    # Check that the machine has been rebooted
+    # and log in.
+    boot_to_login_screen();
+    send_key("ret") if (get_var("DESKTOP") eq "gnome");
+    type_very_safely("$pw\n");
+    wait_still_screen(5);
+
+    if ($desktop eq "kde") {
+        # Start the file exploring application
+        menu_launch_type("dolphin");
+        send_key("super-pgup");
+
+        # Open the network location and check
+        # that the FTP content is accessible.
+        assert_and_click("keyring_open_network");
+        assert_and_click("keyring_open_location");
+        send_key("ret");
+        assert_screen("keyring_test_file");
+    }
+    else {
+        # Start the file exploring application
+        send_key("esc");
+        menu_launch_type("nautilus");
+        send_key("super-up");
+
+        # Open the network location and check
+        # that the FTP content is accessible.
+        assert_and_click("keyring_other_location");
+        assert_and_click("keyring_location_line");
+        type_very_safely("ftp://127.0.0.1");
+        assert_and_click("keyring_button_connect");
+        # Check that we have opened the location and that
+        # we can see the FTP content.
+        assert_screen("keyring_test_file");
+
+    }
+}
+
+sub test_flags {
+    return {fatal => 1, milestone => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/applications/okular/night_mode.pm b/tests/applications/okular/night_mode.pm
new file mode 100644
index 00000000..5a69d5b5
--- /dev/null
+++ b/tests/applications/okular/night_mode.pm
@@ -0,0 +1,30 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This part of the suite tests that Evince can be switched into night mode.
+
+sub run {
+    my $self = shift;
+
+    # Click on the Menu button.
+    assert_and_click("gnome_burger_menu", timeout => 30, button => "left");
+
+    # Click on the Night mode to select it.
+    assert_and_click("evince_toggle_night_mode", button => "left", timeout => 30);
+
+    # The menu stays opened, so hit Esc to dismiss it.
+    send_key("esc");
+    wait_still_screen 2;
+
+    # Check that night mode has been activated.
+    assert_screen("evince_night_mode", timeout => 30);
+
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;