diff --git a/check-needles.py b/check-needles.py
index b4f8b9b7..ae0b14ba 100755
--- a/check-needles.py
+++ b/check-needles.py
@@ -185,6 +185,23 @@ for location in ("vilnius", "denali", "wellington", "poysdorf", "pune"):
 for percentage in ("zero", "fifty", "hundred"):
     testtags.append(f"panel_volume_bar_{percentage}")
     testtags.append(f"panel_volume_indicator_{percentage}")
+# Needles for Disks
+for number in ("one", "two", "three"):
+    testtags.append(f"disks_partition_{number}_formatted")
+    testtags.append(f"disks_partition_{number}_selected")
+    testtags.append(f"disks_partition_mounted_{number}")
+    testtags.append(f"disks_partition_identifier_{number}")
+    testtags.append(f"disks_partition_select_{number}")
+    testtags.append(f"disks_select_partition_{number}")
+    testtags.append(f"disks_partition_formatted_{number}")
+    testtags.append(f"disks_partition_identifier_{number}")
+for name in ("primavolta",  "secondavolta",  "terciavolta",  "boot",  "root",  "home", "renamed"):
+    testtags.append(f"disks_partition_created_{name}")
+    testtags.append(f"disks_fstype_changed_{name}")
+for typus in ("swap",  "ext4",  "xfs", "linuxroot"):
+    testtags.append(f"disks_select_{typus}")
+    testtags.append(f"disks_select_filesystem_{typus}")
+    testtags.append(f"disks_parttype_changed_{typus}")
 # variable-y in custom_change_device but we only have one value
 testtags.append("anaconda_part_device_sda")
 # for Anaconda help related needles.
diff --git a/lib/disks.pm b/lib/disks.pm
new file mode 100644
index 00000000..dd1f2a3c
--- /dev/null
+++ b/lib/disks.pm
@@ -0,0 +1,241 @@
+package disks;
+
+use strict;
+
+use base 'Exporter';
+use Exporter;
+use lockapi;
+use testapi;
+use utils;
+
+our @EXPORT = qw(add_partitions delete_partition create_partition format_partition edit_partition edit_filesystem authenticate mount_partition resize_partition wipe_disk);
+
+# This routine handles the authentication dialogue when it
+# pops out. It provides the admin user (not root) password
+# so that system change could be performed on regular
+# Workstation.
+sub authenticate {
+    if (check_screen("auth_required", 2)) {
+        my $password = get_var("USER_PASSWORD") // "weakpassword";
+        type_very_safely($password);
+        send_key("ret");
+    }
+}
+
+# This routine adds two partitions. This layout is used in
+# several testing scripts.
+sub add_partitions {
+    # The correct disk should be already selected,
+    # but click on it anyway to make sure it is.
+    assert_and_click("disks_loopdisk_listed");
+    # Create the first partition.
+    create_partition("primavolta", "256");
+    # Select the empty space
+    assert_and_click("disks_free_space");
+    # Create the second partition.
+    create_partition("secondavolta", "full");
+    # Create the second partition.
+}
+
+
+# This routine deletes a partition that is defined by its number.
+# In GUI it is defined as "Partition $number" which is used
+# to assert. If the partition is not found, it will fail.
+# The number should be passed as "one", "two" to get use
+# of the precreated needles.
+sub delete_partition {
+    my $number = shift;
+    # Select the partition.
+    assert_and_click("disks_select_partition_$number");
+    # Confirm that it has been selected by checking the
+    # identifier.
+    assert_screen("disks_partition_identifier_$number");
+    # Click on the Minus symbol to delete the partition
+    assert_and_click("disks_partition_delete");
+    # Confirm the deletion using the Delete button.
+    assert_and_click("gnome_button_delete");
+    # Authenticate (if asked)
+    authenticate();
+    # Check that the partition has been deleted.
+    # That means that the identifier disappears and the program
+    # falls back to another partition and shows its identifier,
+    # or it shows no identifier, if there are no partitions
+    # whatsoever.
+    if (check_screen("disks_partition_identifier_$number", timeout => 10)) {
+        die("The partition seems not to have been deleted.");
+    }
+}
+
+# This routine creates a partition in the empty space.
+# You can define a name and a size. If the size is "full",
+# the partition will take up the rest of the free space.
+sub create_partition {
+    my ($name, $size) = @_;
+    # Click on the Plus button to add partition.
+    assert_and_click("gnome_add_button_plus");
+    # Hit Tab to arrive in the size field
+    send_key("tab");
+    # Type in the size
+    if ($size ne "full") {
+        type_very_safely("$size");
+    }
+    # Click on Next
+    assert_and_click("next_button");
+    # Hit Tab to arrive in Name field
+    send_key("tab");
+    # Type in the name
+    type_very_safely("$name");
+    # Click on Create button
+    assert_and_click("gnome_button_create");
+    # Authenticate if needed.
+    authenticate();
+    # Check that the partition has been created.
+    assert_screen("disks_partition_created_$name");
+}
+
+# This routine formats the existing partition. You can
+# define the number of the partition and the filesystem
+# type.
+sub format_partition {
+    my ($number, $type, $name) = @_;
+    # Select the partition
+    assert_and_click("disks_select_partition_$number");
+    # Open the partition menu
+    assert_and_click("disks_partition_menu");
+    # Select to format partition
+    assert_and_click("disks_menu_format");
+    # Name the filesystem
+    type_very_safely($name);
+    # Select the filesystem if it is visible.
+    if (check_screen("disks_select_$type")) {
+        diag("INFO: The required filesystem type was located on the first screen.");
+        click_lastmatch();
+    }
+    else {
+        diag("INFO: The required filesystem type was not seen on the first screen");
+        assert_and_click("disks_select_other");
+        assert_and_click("next_button");
+        assert_and_click("disks_select_$type");
+    }
+    # Click on the Next button
+    assert_and_click("next_button");
+    # Check that there is a warning
+    assert_screen("disks_warning_shown");
+    # Click on the Format button to continue
+    assert_and_click("gnome_button_format");
+    # Authenticate if needed
+    authenticate();
+    # Check that the partition has been formatted.
+    assert_screen("disks_partition_formatted_$number");
+}
+
+# This routine edits the type of partition and its name.
+# You can select the type, the name, or both. When changed,
+# the changes will be reflected on the partition overview.
+sub edit_partition {
+    my ($number, $type, $name) = @_;
+    # Select the partition
+    assert_and_click("disks_select_partition_$number");
+    # Open the partition menu
+    assert_and_click("disks_partition_menu");
+    # Click on Edit partition
+    assert_and_click("disks_menu_edit_partition");
+    # Click on Selector
+    assert_and_click("disks_type_selector");
+    # Select the new partition type
+    # The partition type might be visible right ahead,
+    # if not, press the "Down" key until it has been found.
+    if (check_screen("disks_select_$type")) {
+        click_lastmatch();
+    }
+    else {
+        send_key_until_needlematch("disks_select_$type", "down", 50, 1);
+        click_lastmatch();
+    }
+    if ($name) {
+        # Hit Tab to arrive on the name line
+        send_key("tab");
+        # Type the name of the partition
+        type_very_safely($name);
+    }
+    # Click on the Change button
+    assert_and_click("gnome_button_change");
+    # Authenticate if needed
+    authenticate();
+    # Check that the partition has been changed
+    assert_screen("disks_parttype_changed_$type");
+}
+
+# This routine edits the name of the filesystem. You need
+# to set the number of the partition and the name that you
+# want to set to the filesystem.
+sub edit_filesystem {
+    my ($number, $name) = @_;
+    # Select the partition.
+    assert_and_click("disks_select_partition_$number");
+    # Open the partition menu
+    assert_and_click("disks_partition_menu");
+    # Click on Edit filesystem
+    assert_and_click("disks_menu_edit_filesystem");
+    # Type the name
+    type_very_safely($name);
+    # Click on Change
+    assert_and_click("gnome_button_change");
+    # Authenticate
+    authenticate();
+    # Check that the type has changed.
+    assert_screen("disks_fstype_changed_$name");
+}
+
+# This mounts a partition with a filesystem. The partition
+# can be chosen by using the $number.
+sub mount_partition {
+    my $number = shift;
+    # Select the first partition if not selected.
+    assert_and_click("disks_select_partition_$number");
+    # Click on the Play symbout to mount the partition.
+    assert_and_click("disks_button_mount");
+    # Authenticate if necessary.
+    authenticate();
+    # Check that it has been mounted
+    assert_screen("disks_partition_mounted_$number");
+}
+
+# This routine resizes a partition. It takes the number of
+# the partition to resize and the target size of the partition.
+sub resize_partition {
+    my ($number, $size) = @_;
+    # Select the partition
+    assert_and_click("disks_select_partition_$number");
+    # Open the partition menu
+    assert_and_click("disks_partition_menu");
+    # Select Resize partition
+    assert_and_click("disks_menu_resize");
+    # Authenticate
+    authenticate();
+    # Click into the Size field and delete
+    # its content.
+    assert_and_click("disks_partition_size");
+    send_key("ctrl-a");
+    send_key("delete");
+    # Type in the new size
+    type_very_safely($size);
+    # Click on the Resize button
+    assert_and_click("gnome_button_resize");
+    # Check that it has been resized.
+    assert_screen("disks_partition_resized");
+}
+
+# This routine wipes the entire disk and formats it using
+# the GPT partitions layout.
+sub wipe_disk {
+    # Format the entire disk with a GPT.
+    assert_and_click("disks_dotted_menu");
+    assert_and_click("disks_menu_format_disk");
+    assert_and_click("gnome_button_format_disk");
+    assert_and_click("gnome_button_format_confirm");
+    # Do authentication
+    authenticate();
+    # Check that the disk has been correctly formatted.
+    assert_screen("disks_disk_formatted");
+}
diff --git a/needles/gnome/apps/disks/disks_about_shown.json b/needles/gnome/apps/disks/disks_about_shown.json
new file mode 100644
index 00000000..6857c88c
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_about_shown.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "disks_about_shown"
+  ],
+  "area": [
+    {
+      "xpos": 590,
+      "ypos": 311,
+      "width": 104,
+      "height": 102,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_about_shown.png b/needles/gnome/apps/disks/disks_about_shown.png
new file mode 100644
index 00000000..79c28b37
Binary files /dev/null and b/needles/gnome/apps/disks/disks_about_shown.png differ
diff --git a/needles/gnome/apps/disks/disks_button_mount.json b/needles/gnome/apps/disks/disks_button_mount.json
new file mode 100644
index 00000000..41291e0d
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_button_mount.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 224,
+      "ypos": 340,
+      "width": 28,
+      "height": 27,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_button_mount"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_button_mount.png b/needles/gnome/apps/disks/disks_button_mount.png
new file mode 100644
index 00000000..e6e6b461
Binary files /dev/null and b/needles/gnome/apps/disks/disks_button_mount.png differ
diff --git a/needles/gnome/apps/disks/disks_credits_shown.json b/needles/gnome/apps/disks/disks_credits_shown.json
new file mode 100644
index 00000000..ed8e9754
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_credits_shown.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "disks_credits_shown"
+  ],
+  "area": [
+    {
+      "xpos": 564,
+      "ypos": 388,
+      "width": 156,
+      "height": 64,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_credits_shown.png b/needles/gnome/apps/disks/disks_credits_shown.png
new file mode 100644
index 00000000..54166e51
Binary files /dev/null and b/needles/gnome/apps/disks/disks_credits_shown.png differ
diff --git a/needles/gnome/apps/disks/disks_disk_formatted.json b/needles/gnome/apps/disks/disks_disk_formatted.json
new file mode 100644
index 00000000..0d8b7ece
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_disk_formatted.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 589,
+      "ypos": 264,
+      "width": 57,
+      "height": 28,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_disk_formatted"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_disk_formatted.png b/needles/gnome/apps/disks/disks_disk_formatted.png
new file mode 100644
index 00000000..ca57f399
Binary files /dev/null and b/needles/gnome/apps/disks/disks_disk_formatted.png differ
diff --git a/needles/gnome/apps/disks/disks_diskloop_listed-20230117.json b/needles/gnome/apps/disks/disks_diskloop_listed-20230117.json
new file mode 100644
index 00000000..96908a8e
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_diskloop_listed-20230117.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 4,
+      "ypos": 166,
+      "width": 154,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_diskloop_listed"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_diskloop_listed-20230117.png b/needles/gnome/apps/disks/disks_diskloop_listed-20230117.png
new file mode 100644
index 00000000..e2aab351
Binary files /dev/null and b/needles/gnome/apps/disks/disks_diskloop_listed-20230117.png differ
diff --git a/needles/gnome/apps/disks/disks_diskloop_listed-20230411.json b/needles/gnome/apps/disks/disks_diskloop_listed-20230411.json
new file mode 100644
index 00000000..8ab653fd
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_diskloop_listed-20230411.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 166,
+      "xpos": 4,
+      "width": 154,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_diskloop_listed"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_diskloop_listed-20230411.png b/needles/gnome/apps/disks/disks_diskloop_listed-20230411.png
new file mode 100644
index 00000000..21293a43
Binary files /dev/null and b/needles/gnome/apps/disks/disks_diskloop_listed-20230411.png differ
diff --git a/needles/gnome/apps/disks/disks_diskloop_listed.json b/needles/gnome/apps/disks/disks_diskloop_listed.json
new file mode 100644
index 00000000..073d9fe9
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_diskloop_listed.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 0,
+      "ypos": 164,
+      "width": 156,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_diskloop_listed"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_diskloop_listed.png b/needles/gnome/apps/disks/disks_diskloop_listed.png
new file mode 100644
index 00000000..dbdda7e3
Binary files /dev/null and b/needles/gnome/apps/disks/disks_diskloop_listed.png differ
diff --git a/needles/gnome/apps/disks/disks_diskloop_status-20230117.json b/needles/gnome/apps/disks/disks_diskloop_status-20230117.json
new file mode 100644
index 00000000..7a53d7ae
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_diskloop_status-20230117.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 232,
+      "width": 133,
+      "ypos": 394,
+      "height": 28
+    },
+    {
+      "height": 33,
+      "xpos": 553,
+      "ypos": 241,
+      "width": 123,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_diskloop_status"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_diskloop_status-20230117.png b/needles/gnome/apps/disks/disks_diskloop_status-20230117.png
new file mode 100644
index 00000000..290a1952
Binary files /dev/null and b/needles/gnome/apps/disks/disks_diskloop_status-20230117.png differ
diff --git a/needles/gnome/apps/disks/disks_diskloop_status.json b/needles/gnome/apps/disks/disks_diskloop_status.json
new file mode 100644
index 00000000..1f47b7f4
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_diskloop_status.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "xpos": 247,
+      "ypos": 359,
+      "width": 224,
+      "height": 21,
+      "type": "match"
+    },
+    {
+      "xpos": 232,
+      "ypos": 397,
+      "width": 128,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_diskloop_status"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_diskloop_status.png b/needles/gnome/apps/disks/disks_diskloop_status.png
new file mode 100644
index 00000000..ee6a1f45
Binary files /dev/null and b/needles/gnome/apps/disks/disks_diskloop_status.png differ
diff --git a/needles/gnome/apps/disks/disks_dotted_menu.json b/needles/gnome/apps/disks/disks_dotted_menu.json
new file mode 100644
index 00000000..10718c9a
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_dotted_menu.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 941,
+      "ypos": 43,
+      "width": 25,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_dotted_menu"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_dotted_menu.png b/needles/gnome/apps/disks/disks_dotted_menu.png
new file mode 100644
index 00000000..405bce7f
Binary files /dev/null and b/needles/gnome/apps/disks/disks_dotted_menu.png differ
diff --git a/needles/gnome/apps/disks/disks_free_space.json b/needles/gnome/apps/disks/disks_free_space.json
new file mode 100644
index 00000000..b2cf658a
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_free_space.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 696,
+      "ypos": 259,
+      "width": 60,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_free_space"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_free_space.png b/needles/gnome/apps/disks/disks_free_space.png
new file mode 100644
index 00000000..36d6f423
Binary files /dev/null and b/needles/gnome/apps/disks/disks_free_space.png differ
diff --git a/needles/gnome/apps/disks/disks_fstype_changed_renamed.json b/needles/gnome/apps/disks/disks_fstype_changed_renamed.json
new file mode 100644
index 00000000..57748908
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_fstype_changed_renamed.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 303,
+      "ypos": 260,
+      "width": 57,
+      "height": 38,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_fstype_changed_renamed"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_fstype_changed_renamed.png b/needles/gnome/apps/disks/disks_fstype_changed_renamed.png
new file mode 100644
index 00000000..8ddadc28
Binary files /dev/null and b/needles/gnome/apps/disks/disks_fstype_changed_renamed.png differ
diff --git a/needles/gnome/apps/disks/disks_loopdisk_listed-active-20230411.json b/needles/gnome/apps/disks/disks_loopdisk_listed-active-20230411.json
new file mode 100644
index 00000000..d569b0e7
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_loopdisk_listed-active-20230411.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 164,
+      "width": 154,
+      "xpos": 0,
+      "height": 35,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_loopdisk_listed"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_loopdisk_listed-active-20230411.png b/needles/gnome/apps/disks/disks_loopdisk_listed-active-20230411.png
new file mode 100644
index 00000000..1a283c98
Binary files /dev/null and b/needles/gnome/apps/disks/disks_loopdisk_listed-active-20230411.png differ
diff --git a/needles/gnome/apps/disks/disks_loopdisk_listed-active-silverblue-20230411.json b/needles/gnome/apps/disks/disks_loopdisk_listed-active-silverblue-20230411.json
new file mode 100644
index 00000000..d62cbc83
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_loopdisk_listed-active-silverblue-20230411.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 164,
+      "xpos": 0,
+      "width": 154,
+      "height": 35,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_loopdisk_listed"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_loopdisk_listed-active-silverblue-20230411.png b/needles/gnome/apps/disks/disks_loopdisk_listed-active-silverblue-20230411.png
new file mode 100644
index 00000000..cf471c5b
Binary files /dev/null and b/needles/gnome/apps/disks/disks_loopdisk_listed-active-silverblue-20230411.png differ
diff --git a/needles/gnome/apps/disks/disks_loopdisk_listed-active.json b/needles/gnome/apps/disks/disks_loopdisk_listed-active.json
new file mode 100644
index 00000000..7960d1a8
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_loopdisk_listed-active.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 164,
+      "height": 35,
+      "width": 154,
+      "type": "match",
+      "xpos": 0
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_loopdisk_listed"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_loopdisk_listed-active.png b/needles/gnome/apps/disks/disks_loopdisk_listed-active.png
new file mode 100644
index 00000000..88e9cee5
Binary files /dev/null and b/needles/gnome/apps/disks/disks_loopdisk_listed-active.png differ
diff --git a/needles/gnome/apps/disks/disks_loopdisk_listed.json b/needles/gnome/apps/disks/disks_loopdisk_listed.json
new file mode 100644
index 00000000..222f7c3d
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_loopdisk_listed.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 3,
+      "ypos": 166,
+      "width": 154,
+      "height": 35,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_loopdisk_listed"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_loopdisk_listed.png b/needles/gnome/apps/disks/disks_loopdisk_listed.png
new file mode 100644
index 00000000..0fc90162
Binary files /dev/null and b/needles/gnome/apps/disks/disks_loopdisk_listed.png differ
diff --git a/needles/gnome/apps/disks/disks_menu_edit_filesystem.json b/needles/gnome/apps/disks/disks_menu_edit_filesystem.json
new file mode 100644
index 00000000..991893e7
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_menu_edit_filesystem.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 315,
+      "ypos": 233,
+      "width": 123,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_menu_edit_filesystem"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_menu_edit_filesystem.png b/needles/gnome/apps/disks/disks_menu_edit_filesystem.png
new file mode 100644
index 00000000..0a5005a4
Binary files /dev/null and b/needles/gnome/apps/disks/disks_menu_edit_filesystem.png differ
diff --git a/needles/gnome/apps/disks/disks_menu_edit_partition.json b/needles/gnome/apps/disks/disks_menu_edit_partition.json
new file mode 100644
index 00000000..eb73b6f1
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_menu_edit_partition.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 318,
+      "ypos": 209,
+      "width": 103,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_menu_edit_partition"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_menu_edit_partition.png b/needles/gnome/apps/disks/disks_menu_edit_partition.png
new file mode 100644
index 00000000..da1680f3
Binary files /dev/null and b/needles/gnome/apps/disks/disks_menu_edit_partition.png differ
diff --git a/needles/gnome/apps/disks/disks_menu_format.json b/needles/gnome/apps/disks/disks_menu_format.json
new file mode 100644
index 00000000..d24610e8
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_menu_format.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "disks_menu_format"
+  ],
+  "area": [
+    {
+      "xpos": 284,
+      "ypos": 177,
+      "width": 127,
+      "height": 15,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_menu_format.png b/needles/gnome/apps/disks/disks_menu_format.png
new file mode 100644
index 00000000..6f33f9a9
Binary files /dev/null and b/needles/gnome/apps/disks/disks_menu_format.png differ
diff --git a/needles/gnome/apps/disks/disks_menu_format_disk.json b/needles/gnome/apps/disks/disks_menu_format_disk.json
new file mode 100644
index 00000000..205ddd9e
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_menu_format_disk.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 813,
+      "ypos": 107,
+      "width": 100,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_menu_format_disk"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_menu_format_disk.png b/needles/gnome/apps/disks/disks_menu_format_disk.png
new file mode 100644
index 00000000..3a64d18f
Binary files /dev/null and b/needles/gnome/apps/disks/disks_menu_format_disk.png differ
diff --git a/needles/gnome/apps/disks/disks_menu_resize.json b/needles/gnome/apps/disks/disks_menu_resize.json
new file mode 100644
index 00000000..a9591888
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_menu_resize.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 318,
+      "ypos": 294,
+      "width": 63,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_menu_resize"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_menu_resize.png b/needles/gnome/apps/disks/disks_menu_resize.png
new file mode 100644
index 00000000..26667612
Binary files /dev/null and b/needles/gnome/apps/disks/disks_menu_resize.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_created_boot.json b/needles/gnome/apps/disks/disks_partition_created_boot.json
new file mode 100644
index 00000000..98bbd311
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_created_boot.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 284,
+      "ypos": 260,
+      "width": 60,
+      "height": 38,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_created_boot"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_created_boot.png b/needles/gnome/apps/disks/disks_partition_created_boot.png
new file mode 100644
index 00000000..d0a82d2d
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_created_boot.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_created_home.json b/needles/gnome/apps/disks/disks_partition_created_home.json
new file mode 100644
index 00000000..99753349
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_created_home.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 786,
+      "ypos": 260,
+      "width": 64,
+      "height": 40,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_created_home"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_created_home.png b/needles/gnome/apps/disks/disks_partition_created_home.png
new file mode 100644
index 00000000..1ecf3749
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_created_home.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_created_primavolta.json b/needles/gnome/apps/disks/disks_partition_created_primavolta.json
new file mode 100644
index 00000000..89bbd4b5
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_created_primavolta.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 301,
+      "ypos": 259,
+      "width": 59,
+      "height": 43,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_created_primavolta"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_created_primavolta.png b/needles/gnome/apps/disks/disks_partition_created_primavolta.png
new file mode 100644
index 00000000..2eeee8b7
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_created_primavolta.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_created_root.json b/needles/gnome/apps/disks/disks_partition_created_root.json
new file mode 100644
index 00000000..08495f0f
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_created_root.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 480,
+      "ypos": 258,
+      "width": 59,
+      "height": 44,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_created_root"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_created_root.png b/needles/gnome/apps/disks/disks_partition_created_root.png
new file mode 100644
index 00000000..ba4c4419
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_created_root.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_created_secondavolta.json b/needles/gnome/apps/disks/disks_partition_created_secondavolta.json
new file mode 100644
index 00000000..04a1b006
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_created_secondavolta.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 694,
+      "ypos": 260,
+      "width": 67,
+      "height": 38,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_created_secondavolta"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_created_secondavolta.png b/needles/gnome/apps/disks/disks_partition_created_secondavolta.png
new file mode 100644
index 00000000..71665d6c
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_created_secondavolta.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_created_terciavolta.json b/needles/gnome/apps/disks/disks_partition_created_terciavolta.json
new file mode 100644
index 00000000..bbb9c369
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_created_terciavolta.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 808,
+      "ypos": 262,
+      "width": 61,
+      "height": 36,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_created_terciavolta"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_created_terciavolta.png b/needles/gnome/apps/disks/disks_partition_created_terciavolta.png
new file mode 100644
index 00000000..28954207
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_created_terciavolta.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_delete.json b/needles/gnome/apps/disks/disks_partition_delete.json
new file mode 100644
index 00000000..e59f87af
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_delete.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 981,
+      "ypos": 345,
+      "width": 25,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_delete"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_delete.png b/needles/gnome/apps/disks/disks_partition_delete.png
new file mode 100644
index 00000000..5e34b42d
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_delete.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_formatted_one.json b/needles/gnome/apps/disks/disks_partition_formatted_one.json
new file mode 100644
index 00000000..0283bd28
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_formatted_one.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 301,
+      "ypos": 261,
+      "width": 59,
+      "height": 39,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_formatted_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_formatted_one.png b/needles/gnome/apps/disks/disks_partition_formatted_one.png
new file mode 100644
index 00000000..9f8263fa
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_formatted_one.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_identifier_one.json b/needles/gnome/apps/disks/disks_partition_identifier_one.json
new file mode 100644
index 00000000..37b97581
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_identifier_one.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 262,
+      "ypos": 415,
+      "width": 148,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_identifier_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_identifier_one.png b/needles/gnome/apps/disks/disks_partition_identifier_one.png
new file mode 100644
index 00000000..00906ac2
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_identifier_one.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_identifier_two.json b/needles/gnome/apps/disks/disks_partition_identifier_two.json
new file mode 100644
index 00000000..66ccd0c6
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_identifier_two.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 262,
+      "ypos": 416,
+      "width": 152,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_identifier_two"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_identifier_two.png b/needles/gnome/apps/disks/disks_partition_identifier_two.png
new file mode 100644
index 00000000..96633f41
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_identifier_two.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_menu.json b/needles/gnome/apps/disks/disks_partition_menu.json
new file mode 100644
index 00000000..43e7c142
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_menu.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "disks_partition_menu"
+  ],
+  "area": [
+    {
+      "xpos": 225,
+      "ypos": 343,
+      "width": 26,
+      "height": 23,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_menu.png b/needles/gnome/apps/disks/disks_partition_menu.png
new file mode 100644
index 00000000..6bbd2d32
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_menu.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_one-20230411.json b/needles/gnome/apps/disks/disks_partition_mounted_one-20230411.json
new file mode 100644
index 00000000..eafc2efe
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_one-20230411.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 394,
+      "width": 220,
+      "xpos": 450,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_one-20230411.png b/needles/gnome/apps/disks/disks_partition_mounted_one-20230411.png
new file mode 100644
index 00000000..dae56b0b
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_one-20230411.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta-20230411.json b/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta-20230411.json
new file mode 100644
index 00000000..a91eda3e
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta-20230411.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 23,
+      "xpos": 450,
+      "ypos": 394,
+      "width": 220,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta-20230411.png b/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta-20230411.png
new file mode 100644
index 00000000..5e1e10c1
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta-20230411.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta.json b/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta.json
new file mode 100644
index 00000000..3fd906a5
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 23,
+      "xpos": 450,
+      "width": 220,
+      "ypos": 394
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta.png b/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta.png
new file mode 100644
index 00000000..de0c5ab6
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_one-primavolta.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_one.json b/needles/gnome/apps/disks/disks_partition_mounted_one.json
new file mode 100644
index 00000000..b5d22ac5
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_one.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 450,
+      "ypos": 394,
+      "width": 220,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_one.png b/needles/gnome/apps/disks/disks_partition_mounted_one.png
new file mode 100644
index 00000000..fe03a06b
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_one.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_three-20230411.json b/needles/gnome/apps/disks/disks_partition_mounted_three-20230411.json
new file mode 100644
index 00000000..a2367a82
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_three-20230411.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "height": 18,
+      "ypos": 398,
+      "width": 220,
+      "xpos": 456,
+      "type": "match"
+    },
+    {
+      "ypos": 415,
+      "xpos": 265,
+      "width": 148,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_three"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_three-20230411.png b/needles/gnome/apps/disks/disks_partition_mounted_three-20230411.png
new file mode 100644
index 00000000..513c2821
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_three-20230411.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_three.json b/needles/gnome/apps/disks/disks_partition_mounted_three.json
new file mode 100644
index 00000000..1dc1ebe4
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_three.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "xpos": 456,
+      "ypos": 398,
+      "width": 220,
+      "height": 18,
+      "type": "match"
+    },
+    {
+      "xpos": 265,
+      "ypos": 415,
+      "width": 148,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_three"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_three.png b/needles/gnome/apps/disks/disks_partition_mounted_three.png
new file mode 100644
index 00000000..8f6d149f
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_three.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_two-20230411.json b/needles/gnome/apps/disks/disks_partition_mounted_two-20230411.json
new file mode 100644
index 00000000..e67c386d
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_two-20230411.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "width": 146,
+      "ypos": 417,
+      "xpos": 264,
+      "height": 18
+    },
+    {
+      "type": "match",
+      "ypos": 395,
+      "width": 272,
+      "xpos": 454,
+      "height": 20
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_two"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_two-20230411.png b/needles/gnome/apps/disks/disks_partition_mounted_two-20230411.png
new file mode 100644
index 00000000..e095dca9
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_two-20230411.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta-20230411.json b/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta-20230411.json
new file mode 100644
index 00000000..78dc23db
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta-20230411.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "width": 146,
+      "ypos": 417,
+      "xpos": 264,
+      "height": 18,
+      "type": "match"
+    },
+    {
+      "type": "match",
+      "height": 20,
+      "ypos": 395,
+      "width": 272,
+      "xpos": 454
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_two"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta-20230411.png b/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta-20230411.png
new file mode 100644
index 00000000..00b9327f
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta-20230411.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta.json b/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta.json
new file mode 100644
index 00000000..3962018d
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "xpos": 264,
+      "ypos": 417,
+      "width": 146,
+      "height": 18,
+      "type": "match"
+    },
+    {
+      "xpos": 454,
+      "ypos": 395,
+      "width": 272,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_two"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta.png b/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta.png
new file mode 100644
index 00000000..34ee2bc9
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_two-secondavolta.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_two.json b/needles/gnome/apps/disks/disks_partition_mounted_two.json
new file mode 100644
index 00000000..e67c386d
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_mounted_two.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "width": 146,
+      "ypos": 417,
+      "xpos": 264,
+      "height": 18
+    },
+    {
+      "type": "match",
+      "ypos": 395,
+      "width": 272,
+      "xpos": 454,
+      "height": 20
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_mounted_two"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_mounted_two.png b/needles/gnome/apps/disks/disks_partition_mounted_two.png
new file mode 100644
index 00000000..9765ce78
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_mounted_two.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_one_formatted.json b/needles/gnome/apps/disks/disks_partition_one_formatted.json
new file mode 100644
index 00000000..465cb3d6
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_one_formatted.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 125,
+      "type": "match",
+      "ypos": 254,
+      "height": 29,
+      "xpos": 272
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_one_formatted"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_one_formatted.png b/needles/gnome/apps/disks/disks_partition_one_formatted.png
new file mode 100644
index 00000000..c51e7d6e
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_one_formatted.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_one_selected.json b/needles/gnome/apps/disks/disks_partition_one_selected.json
new file mode 100644
index 00000000..b45cc907
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_one_selected.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "disks_partition_one_selected"
+  ],
+  "area": [
+    {
+      "xpos": 390,
+      "ypos": 263,
+      "width": 54,
+      "height": 16,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_one_selected.png b/needles/gnome/apps/disks/disks_partition_one_selected.png
new file mode 100644
index 00000000..28eb21ad
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_one_selected.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_resized-20230113.json b/needles/gnome/apps/disks/disks_partition_resized-20230113.json
new file mode 100644
index 00000000..04f26dc5
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_resized-20230113.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 36,
+      "width": 71,
+      "ypos": 260,
+      "type": "match",
+      "xpos": 513
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_resized"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_resized-20230113.png b/needles/gnome/apps/disks/disks_partition_resized-20230113.png
new file mode 100644
index 00000000..ff95ce09
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_resized-20230113.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_resized.json b/needles/gnome/apps/disks/disks_partition_resized.json
new file mode 100644
index 00000000..223ccf0b
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_resized.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 512,
+      "ypos": 261,
+      "width": 71,
+      "height": 36,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_resized"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_resized.png b/needles/gnome/apps/disks/disks_partition_resized.png
new file mode 100644
index 00000000..f564e4f9
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_resized.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_select_one.json b/needles/gnome/apps/disks/disks_partition_select_one.json
new file mode 100644
index 00000000..b7085d49
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_select_one.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 304,
+      "ypos": 270,
+      "width": 52,
+      "height": 14,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_select_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_select_one.png b/needles/gnome/apps/disks/disks_partition_select_one.png
new file mode 100644
index 00000000..cf95a8da
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_select_one.png differ
diff --git a/needles/gnome/apps/disks/disks_partition_size.json b/needles/gnome/apps/disks/disks_partition_size.json
new file mode 100644
index 00000000..a209dc26
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_partition_size.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 442,
+      "ypos": 458,
+      "width": 112,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_partition_size"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_partition_size.png b/needles/gnome/apps/disks/disks_partition_size.png
new file mode 100644
index 00000000..b8d5828d
Binary files /dev/null and b/needles/gnome/apps/disks/disks_partition_size.png differ
diff --git a/needles/gnome/apps/disks/disks_parttype_changed_linuxroot.json b/needles/gnome/apps/disks/disks_parttype_changed_linuxroot.json
new file mode 100644
index 00000000..cde3d923
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_parttype_changed_linuxroot.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "xpos": 217,
+      "ypos": 451,
+      "width": 301,
+      "height": 23,
+      "type": "match"
+    },
+    {
+      "xpos": 283,
+      "ypos": 273,
+      "width": 93,
+      "height": 11,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_parttype_changed_linuxroot"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_parttype_changed_linuxroot.png b/needles/gnome/apps/disks/disks_parttype_changed_linuxroot.png
new file mode 100644
index 00000000..b37d92b4
Binary files /dev/null and b/needles/gnome/apps/disks/disks_parttype_changed_linuxroot.png differ
diff --git a/needles/gnome/apps/disks/disks_select_filesystem_xfs.json b/needles/gnome/apps/disks/disks_select_filesystem_xfs.json
new file mode 100644
index 00000000..a321828b
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_filesystem_xfs.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 302,
+      "ypos": 352,
+      "width": 158,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_filesystem_xfs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_filesystem_xfs.png b/needles/gnome/apps/disks/disks_select_filesystem_xfs.png
new file mode 100644
index 00000000..8de01257
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_filesystem_xfs.png differ
diff --git a/needles/gnome/apps/disks/disks_select_linuxroot.json b/needles/gnome/apps/disks/disks_select_linuxroot.json
new file mode 100644
index 00000000..2fb6ba7c
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_linuxroot.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 270,
+      "ypos": 202,
+      "width": 191,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_linuxroot"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_linuxroot.png b/needles/gnome/apps/disks/disks_select_linuxroot.png
new file mode 100644
index 00000000..5be56cf2
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_linuxroot.png differ
diff --git a/needles/gnome/apps/disks/disks_select_other.json b/needles/gnome/apps/disks/disks_select_other.json
new file mode 100644
index 00000000..01606647
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_other.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 392,
+      "ypos": 559,
+      "width": 42,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_other"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_other.png b/needles/gnome/apps/disks/disks_select_other.png
new file mode 100644
index 00000000..9d66411e
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_other.png differ
diff --git a/needles/gnome/apps/disks/disks_select_partition_one-filled.json b/needles/gnome/apps/disks/disks_select_partition_one-filled.json
new file mode 100644
index 00000000..b0000f39
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_partition_one-filled.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 305,
+      "ypos": 272,
+      "height": 13,
+      "width": 55,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_partition_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_partition_one-filled.png b/needles/gnome/apps/disks/disks_select_partition_one-filled.png
new file mode 100644
index 00000000..cf4b4e91
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_partition_one-filled.png differ
diff --git a/needles/gnome/apps/disks/disks_select_partition_one.json b/needles/gnome/apps/disks/disks_select_partition_one.json
new file mode 100644
index 00000000..4fecc206
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_partition_one.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 301,
+      "ypos": 269,
+      "width": 55,
+      "height": 16,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_partition_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_partition_one.png b/needles/gnome/apps/disks/disks_select_partition_one.png
new file mode 100644
index 00000000..73a7ad17
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_partition_one.png differ
diff --git a/needles/gnome/apps/disks/disks_select_partition_three.json b/needles/gnome/apps/disks/disks_select_partition_three.json
new file mode 100644
index 00000000..1a8ed54c
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_partition_three.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 793,
+      "ypos": 271,
+      "width": 49,
+      "height": 13,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_partition_three"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_partition_three.png b/needles/gnome/apps/disks/disks_select_partition_three.png
new file mode 100644
index 00000000..068f56e5
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_partition_three.png differ
diff --git a/needles/gnome/apps/disks/disks_select_partition_two-20230116.json b/needles/gnome/apps/disks/disks_select_partition_two-20230116.json
new file mode 100644
index 00000000..5f2b9f90
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_partition_two-20230116.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 695,
+      "height": 16,
+      "ypos": 270,
+      "width": 63,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_partition_two"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_partition_two-20230116.png b/needles/gnome/apps/disks/disks_select_partition_two-20230116.png
new file mode 100644
index 00000000..6e309c30
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_partition_two-20230116.png differ
diff --git a/needles/gnome/apps/disks/disks_select_partition_two.json b/needles/gnome/apps/disks/disks_select_partition_two.json
new file mode 100644
index 00000000..3b928db7
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_partition_two.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 695,
+      "height": 11,
+      "width": 59,
+      "ypos": 272
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_partition_two"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_partition_two.png b/needles/gnome/apps/disks/disks_select_partition_two.png
new file mode 100644
index 00000000..a132a042
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_partition_two.png differ
diff --git a/needles/gnome/apps/disks/disks_select_swap.json b/needles/gnome/apps/disks/disks_select_swap.json
new file mode 100644
index 00000000..971e8eef
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_swap.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 300,
+      "ypos": 380,
+      "width": 138,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_swap"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_swap.png b/needles/gnome/apps/disks/disks_select_swap.png
new file mode 100644
index 00000000..cf2c780f
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_swap.png differ
diff --git a/needles/gnome/apps/disks/disks_select_xfs.json b/needles/gnome/apps/disks/disks_select_xfs.json
new file mode 100644
index 00000000..42c84f14
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_select_xfs.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 302,
+      "ypos": 353,
+      "width": 156,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_select_xfs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_select_xfs.png b/needles/gnome/apps/disks/disks_select_xfs.png
new file mode 100644
index 00000000..dbb30c69
Binary files /dev/null and b/needles/gnome/apps/disks/disks_select_xfs.png differ
diff --git a/needles/gnome/apps/disks/disks_type_selector.json b/needles/gnome/apps/disks/disks_type_selector.json
new file mode 100644
index 00000000..b77e66a9
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_type_selector.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 274,
+      "ypos": 321,
+      "width": 111,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "disks_type_selector"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_type_selector.png b/needles/gnome/apps/disks/disks_type_selector.png
new file mode 100644
index 00000000..9af23a3d
Binary files /dev/null and b/needles/gnome/apps/disks/disks_type_selector.png differ
diff --git a/needles/gnome/apps/disks/disks_warning_shown.json b/needles/gnome/apps/disks/disks_warning_shown.json
new file mode 100644
index 00000000..290dc95d
--- /dev/null
+++ b/needles/gnome/apps/disks/disks_warning_shown.json
@@ -0,0 +1,22 @@
+{
+  "properties": [],
+  "tags": [
+    "disks_warning_shown"
+  ],
+  "area": [
+    {
+      "xpos": 303,
+      "ypos": 270,
+      "width": 83,
+      "height": 28,
+      "type": "match"
+    },
+    {
+      "xpos": 615,
+      "ypos": 269,
+      "width": 109,
+      "height": 27,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/disks_warning_shown.png b/needles/gnome/apps/disks/disks_warning_shown.png
new file mode 100644
index 00000000..667bc308
Binary files /dev/null and b/needles/gnome/apps/disks/disks_warning_shown.png differ
diff --git a/needles/gnome/apps/disks/gnome_button_change.json b/needles/gnome/apps/disks/gnome_button_change.json
new file mode 100644
index 00000000..5dbb5349
--- /dev/null
+++ b/needles/gnome/apps/disks/gnome_button_change.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 747,
+      "ypos": 496,
+      "width": 61,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_change"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/gnome_button_change.png b/needles/gnome/apps/disks/gnome_button_change.png
new file mode 100644
index 00000000..3b04727d
Binary files /dev/null and b/needles/gnome/apps/disks/gnome_button_change.png differ
diff --git a/needles/gnome/apps/disks/gnome_button_format.json b/needles/gnome/apps/disks/gnome_button_format.json
new file mode 100644
index 00000000..80e3c4f9
--- /dev/null
+++ b/needles/gnome/apps/disks/gnome_button_format.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "gnome_button_format"
+  ],
+  "area": [
+    {
+      "xpos": 726,
+      "ypos": 194,
+      "width": 59,
+      "height": 23,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/gnome_button_format.png b/needles/gnome/apps/disks/gnome_button_format.png
new file mode 100644
index 00000000..f8176352
Binary files /dev/null and b/needles/gnome/apps/disks/gnome_button_format.png differ
diff --git a/needles/gnome/apps/disks/gnome_button_format_confirm.json b/needles/gnome/apps/disks/gnome_button_format_confirm.json
new file mode 100644
index 00000000..49c664ed
--- /dev/null
+++ b/needles/gnome/apps/disks/gnome_button_format_confirm.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 633,
+      "ypos": 571,
+      "width": 57,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_format_confirm"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/gnome_button_format_confirm.png b/needles/gnome/apps/disks/gnome_button_format_confirm.png
new file mode 100644
index 00000000..fdc4cd91
Binary files /dev/null and b/needles/gnome/apps/disks/gnome_button_format_confirm.png differ
diff --git a/needles/gnome/apps/disks/gnome_button_format_disk.json b/needles/gnome/apps/disks/gnome_button_format_disk.json
new file mode 100644
index 00000000..1b594d68
--- /dev/null
+++ b/needles/gnome/apps/disks/gnome_button_format_disk.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 683,
+      "ypos": 453,
+      "width": 66,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_format_disk"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/gnome_button_format_disk.png b/needles/gnome/apps/disks/gnome_button_format_disk.png
new file mode 100644
index 00000000..2f8308c2
Binary files /dev/null and b/needles/gnome/apps/disks/gnome_button_format_disk.png differ
diff --git a/needles/gnome/apps/disks/gnome_button_resize.json b/needles/gnome/apps/disks/gnome_button_resize.json
new file mode 100644
index 00000000..e770c444
--- /dev/null
+++ b/needles/gnome/apps/disks/gnome_button_resize.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 731,
+      "ypos": 186,
+      "width": 53,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_resize"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/disks/gnome_button_resize.png b/needles/gnome/apps/disks/gnome_button_resize.png
new file mode 100644
index 00000000..8a881fac
Binary files /dev/null and b/needles/gnome/apps/disks/gnome_button_resize.png differ
diff --git a/needles/gnome/gnome_add_button_plus-20230110.json b/needles/gnome/gnome_add_button_plus-20230110.json
new file mode 100644
index 00000000..7b987c7c
--- /dev/null
+++ b/needles/gnome/gnome_add_button_plus-20230110.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 22,
+      "type": "match",
+      "xpos": 226,
+      "width": 23,
+      "ypos": 344
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_add_button_plus"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/gnome_add_button_plus-20230110.png b/needles/gnome/gnome_add_button_plus-20230110.png
new file mode 100644
index 00000000..7bc6fa3a
Binary files /dev/null and b/needles/gnome/gnome_add_button_plus-20230110.png differ
diff --git a/needles/gnome/gnome_button_create.json b/needles/gnome/gnome_button_create.json
new file mode 100644
index 00000000..ddbfdd7f
--- /dev/null
+++ b/needles/gnome/gnome_button_create.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 728,
+      "ypos": 197,
+      "width": 51,
+      "height": 16,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_create"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/gnome_button_create.png b/needles/gnome/gnome_button_create.png
new file mode 100644
index 00000000..13eaf696
Binary files /dev/null and b/needles/gnome/gnome_button_create.png differ
diff --git a/needles/gnome/gnome_button_delete.json b/needles/gnome/gnome_button_delete.json
index 7804ea5b..1802b3f3 100644
--- a/needles/gnome/gnome_button_delete.json
+++ b/needles/gnome/gnome_button_delete.json
@@ -1,9 +1,9 @@
 {
   "area": [
     {
-      "xpos": 567,
-      "ypos": 246,
-      "width": 20,
+      "xpos": 590,
+      "ypos": 525,
+      "width": 59,
       "height": 21,
       "type": "match"
     }
diff --git a/needles/gnome/gnome_button_delete.png b/needles/gnome/gnome_button_delete.png
index 66ce6d70..0431527a 100644
Binary files a/needles/gnome/gnome_button_delete.png and b/needles/gnome/gnome_button_delete.png differ
diff --git a/needles/gnome/gnome_menu_about-20230104.json b/needles/gnome/gnome_menu_about-20230104.json
new file mode 100644
index 00000000..b35ea186
--- /dev/null
+++ b/needles/gnome/gnome_menu_about-20230104.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 72,
+      "ypos": 218,
+      "width": 44,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_about"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/gnome_menu_about-20230104.png b/needles/gnome/gnome_menu_about-20230104.png
new file mode 100644
index 00000000..81b67e63
Binary files /dev/null and b/needles/gnome/gnome_menu_about-20230104.png differ
diff --git a/needles/gnome/next_button-20230110.json b/needles/gnome/next_button-20230110.json
new file mode 100644
index 00000000..8fc57bf4
--- /dev/null
+++ b/needles/gnome/next_button-20230110.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "width": 55,
+      "xpos": 734,
+      "ypos": 191,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "next_button",
+    "LANGUAGE-english"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/next_button-20230110.png b/needles/gnome/next_button-20230110.png
new file mode 100644
index 00000000..876ab9da
Binary files /dev/null and b/needles/gnome/next_button-20230110.png differ
diff --git a/templates.fif.json b/templates.fif.json
index fbb3c445..bb81ccca 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -1021,6 +1021,7 @@
                 "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
                 "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
                 "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
             },
@@ -1037,6 +1038,7 @@
                 "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
                 "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
                 "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
             },
@@ -1053,6 +1055,7 @@
                 "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
                 "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
                 "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
             },
@@ -1069,6 +1072,7 @@
                 "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
                 "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
                 "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
             },
@@ -1079,12 +1083,30 @@
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },
+        "disks": {
+            "profiles": {
+                "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
+                "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "POSTINSTALL_PATH": "tests/applications/disks",
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
+            }
+        },
         "eog": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
                 "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
                 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
                 "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
                 "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
             },
diff --git a/tests/applications/disks/aaa_setup.pm b/tests/applications/disks/aaa_setup.pm
new file mode 100644
index 00000000..8112fb08
--- /dev/null
+++ b/tests/applications/disks/aaa_setup.pm
@@ -0,0 +1,62 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+use disks;
+
+# This script will prepare a disk image with the size of
+# 1 GB and will add two partitions to it. This will serve as
+# a milestone for other follow-up tests.
+#
+
+# This script will test if Disks can create new partitions
+# in an empty disk.
+
+sub run {
+    my $self = shift;
+
+    # Switch to the console and perform some pre-settings.
+    # Switch to the console
+    $self->root_console(tty => 3);
+    # Create a disk image in the home folder. We have decided
+    # to use truncate to be able to create bigger partitions
+    # that would not require as much space on the disk when
+    # empty.
+    script_run("truncate -s 1G /root/disk.img");
+    # Connect the created partition to the system as a loop device
+    # using losetup which will make it accessible to the Disks application
+    # later.
+    script_run("losetup -P -f --show /root/disk.img");
+
+    # Go back to graphics.
+    desktop_vt();
+    menu_launch_type("disks");
+    wait_still_screen(3);
+
+    # Make it fill the entire window.
+    send_key("super-up");
+    wait_still_screen(2);
+    assert_screen("apps_run_disks");
+
+    # Click on the listed icon of the new loop device.
+    assert_and_click("disks_diskloop_listed");
+    # Check that the file has been correctly attached.
+    assert_screen("disks_diskloop_status");
+
+    # Format the entire disk with a GPT.
+    wipe_disk();
+
+    # Add partitions.
+    add_partitions();
+}
+
+sub test_flags {
+    # If this test fails, there is no need to continue.
+    return {fatal => 1, milestone => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
+
+
diff --git a/tests/applications/disks/about.pm b/tests/applications/disks/about.pm
new file mode 100644
index 00000000..29bd0ac6
--- /dev/null
+++ b/tests/applications/disks/about.pm
@@ -0,0 +1,33 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This script will open the About dialogue and check
+# that it works.
+
+sub run {
+    # Open the menu
+    assert_and_click("gnome_burger_menu");
+
+    # Click on the About item
+    assert_and_click("gnome_menu_about");
+
+    # Check that the dialogue is shown.
+    assert_screen("disks_about_shown");
+
+    # Click on the Credits button.
+    assert_and_click("gnome_button_credits");
+
+    # Check that Credits are shown.
+    assert_screen("disks_credits_shown");
+
+    # Dismiss the About window using the Esc key.
+    send_key("esc");
+}
+
+sub test_flags {
+    return {fatal => 0};
+}
+
+1;
diff --git a/tests/applications/disks/delete_partition.pm b/tests/applications/disks/delete_partition.pm
new file mode 100644
index 00000000..cb393ee9
--- /dev/null
+++ b/tests/applications/disks/delete_partition.pm
@@ -0,0 +1,22 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+use disks;
+
+# This script will test if Disks can delete a partition
+# and add a new partition instead.
+
+sub run {
+    # Select the test disk.
+    assert_and_click("disks_loopdisk_listed");
+    # Delete the second partition.
+    delete_partition("two");
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
diff --git a/tests/applications/disks/edit_filesystem.pm b/tests/applications/disks/edit_filesystem.pm
new file mode 100644
index 00000000..bd618565
--- /dev/null
+++ b/tests/applications/disks/edit_filesystem.pm
@@ -0,0 +1,21 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+use disks;
+
+# This script will test if Disks can edit the filesystem name.
+
+sub run {
+    # Click on the test disk to select it.
+    assert_and_click("disks_loopdisk_listed");
+    # Edit the filesystem name.
+    edit_filesystem("one", "renamed");
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
diff --git a/tests/applications/disks/edit_partition.pm b/tests/applications/disks/edit_partition.pm
new file mode 100644
index 00000000..ca5772ec
--- /dev/null
+++ b/tests/applications/disks/edit_partition.pm
@@ -0,0 +1,21 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+use disks;
+
+# This script will test if Disks can edit the partition name.
+
+sub run {
+    # Open the menu
+    assert_and_click("disks_loopdisk_listed");
+    # Change the type of the partition.
+    edit_partition("one", "linuxroot", "partroot");
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
diff --git a/tests/applications/disks/format_partition.pm b/tests/applications/disks/format_partition.pm
new file mode 100644
index 00000000..1b613638
--- /dev/null
+++ b/tests/applications/disks/format_partition.pm
@@ -0,0 +1,23 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+use disks;
+
+# This script will test if Disks can format an empty
+# partition.
+
+sub run {
+    # Select the test loop disk.
+    assert_and_click("disks_loopdisk_listed");
+
+    # Format partition
+    format_partition("one", "swap", "backup");
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
diff --git a/tests/applications/disks/mount_partitions.pm b/tests/applications/disks/mount_partitions.pm
new file mode 100644
index 00000000..46c21452
--- /dev/null
+++ b/tests/applications/disks/mount_partitions.pm
@@ -0,0 +1,38 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+use disks;
+
+# This script will test if current partitions can be mounted
+# via the Disks application.
+
+
+sub run {
+    my $self = shift;
+
+    # Wipe the entire disk, recreate partitions
+    wipe_disk();
+    add_partitions();
+
+
+    # Mount the first partition.
+    mount_partition("one");
+
+    # Mount the second partition.
+    mount_partition("two");
+
+    # Check in the system that the partitions have been mounted.
+    $self->root_console(tty => 3);
+    # First partition
+    assert_script_run("findmnt /dev/loop0p1");
+    # Second partition
+    assert_script_run("findmnt /dev/loop0p2");
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
diff --git a/tests/applications/disks/resize_partition.pm b/tests/applications/disks/resize_partition.pm
new file mode 100644
index 00000000..845b8d83
--- /dev/null
+++ b/tests/applications/disks/resize_partition.pm
@@ -0,0 +1,28 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+use disks;
+
+# This script will test if Disks can resize a partition and
+# put a new partition after the resized one.
+
+sub run {
+    # Select the test loop disk.
+    assert_and_click("disks_loopdisk_listed");
+    # Resize the second partition
+    resize_partition("two", "320");
+
+    # Add a new partition to the remainaing space
+    assert_and_click("disks_free_space");
+
+    # Create another partition in the remaining space.
+    create_partition("terciavolta", "full");
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
diff --git a/tests/applications/disks/standard_partitioning.pm b/tests/applications/disks/standard_partitioning.pm
new file mode 100644
index 00000000..3026b2c3
--- /dev/null
+++ b/tests/applications/disks/standard_partitioning.pm
@@ -0,0 +1,38 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+use disks;
+
+# This script will test if Disks can delete all partitions and
+# create three partitions for Standard partitioning, a small boot
+# partition, a bigger root partition, and a home partition that
+# takes the rest of the space. All partitions will be formatted
+# as ext4.
+
+sub run {
+    # Select the test loop disk.
+    assert_and_click("disks_loopdisk_listed");
+
+    # Remove partitions
+    wipe_disk();
+
+    # Create the partitions (they are formatted as ext4)
+    create_partition("boot", "200");
+    assert_and_click("disks_free_space");
+    create_partition("root", "300");
+    assert_and_click("disks_free_space");
+    create_partition("home", "full");
+
+    # Mount the partitions
+    mount_partition("one");
+    mount_partition("two");
+    mount_partition("three");
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+