diff --git a/needles/coreapps/nautilus/desktop_nautilus-check_for_undo-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-check_for_undo-20180517.json
new file mode 100644
index 00000000..44fa3fd9
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-check_for_undo-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "check_for_undo"
+  ],
+  "area": [
+    {
+      "xpos": 528,
+      "ypos": 426,
+      "width": 155,
+      "height": 28,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-check_for_undo-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-check_for_undo-20180517.png
new file mode 100644
index 00000000..991c7c43
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-check_for_undo-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_choosen-20180516.json b/needles/coreapps/nautilus/desktop_nautilus-directory_choosen-20180516.json
new file mode 100644
index 00000000..7f6fe564
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-directory_choosen-20180516.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 320,
+      "ypos": 308,
+      "width": 47,
+      "height": 36,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "directory_choosen"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_choosen-20180516.png b/needles/coreapps/nautilus/desktop_nautilus-directory_choosen-20180516.png
new file mode 100644
index 00000000..8f63fdc9
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-directory_choosen-20180516.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_chosen-20180516.json b/needles/coreapps/nautilus/desktop_nautilus-directory_chosen-20180516.json
new file mode 100644
index 00000000..bc23a3b2
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-directory_chosen-20180516.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "directory_chosen"
+  ],
+  "area": [
+    {
+      "xpos": 320,
+      "ypos": 310,
+      "width": 46,
+      "height": 33,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_chosen-20180516.png b/needles/coreapps/nautilus/desktop_nautilus-directory_chosen-20180516.png
new file mode 100644
index 00000000..2c96d155
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-directory_chosen-20180516.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_created-20180516.json b/needles/coreapps/nautilus/desktop_nautilus-directory_created-20180516.json
new file mode 100644
index 00000000..9289e598
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-directory_created-20180516.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "directory_created"
+  ],
+  "area": [
+    {
+      "xpos": 298,
+      "ypos": 201,
+      "width": 85,
+      "height": 51,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_created-20180516.png b/needles/coreapps/nautilus/desktop_nautilus-directory_created-20180516.png
new file mode 100644
index 00000000..0c45f2fc
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-directory_created-20180516.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_line-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-directory_line-20180517.json
new file mode 100644
index 00000000..187a666f
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-directory_line-20180517.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 270,
+      "ypos": 160,
+      "width": 108,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "directory_line"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_line-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-directory_line-20180517.png
new file mode 100644
index 00000000..29586086
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-directory_line-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_renamed-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-directory_renamed-20180517.json
new file mode 100644
index 00000000..82c94292
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-directory_renamed-20180517.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "directory_renamed"
+  ],
+  "area": [
+    {
+      "xpos": 300,
+      "ypos": 210,
+      "width": 83,
+      "height": 42,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-directory_renamed-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-directory_renamed-20180517.png
new file mode 100644
index 00000000..93976a05
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-directory_renamed-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-exit_button-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-exit_button-20180517.json
new file mode 100644
index 00000000..cd66efff
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-exit_button-20180517.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 921,
+      "ypos": 68,
+      "width": 43,
+      "height": 39,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "exit_button"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-exit_button-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-exit_button-20180517.png
new file mode 100644
index 00000000..c199d472
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-exit_button-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-folder_empty-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-folder_empty-20180517.json
new file mode 100644
index 00000000..7202edd5
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-folder_empty-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 528,
+      "ypos": 426,
+      "width": 156,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "folder_empty"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-folder_empty-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-folder_empty-20180517.png
new file mode 100644
index 00000000..c199d472
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-folder_empty-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-gone_from_starred-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-gone_from_starred-20180517.json
new file mode 100644
index 00000000..acdbe54f
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-gone_from_starred-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 570,
+      "ypos": 341,
+      "width": 69,
+      "height": 67,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "gone_from_starred"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-gone_from_starred-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-gone_from_starred-20180517.png
new file mode 100644
index 00000000..71ab1b44
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-gone_from_starred-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-home_button-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-home_button-20180517.json
new file mode 100644
index 00000000..b11ae8e7
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-home_button-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 78,
+      "ypos": 209,
+      "width": 24,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "home_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-home_button-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-home_button-20180517.png
new file mode 100644
index 00000000..71ab1b44
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-home_button-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-homedir-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-homedir-20180517.json
new file mode 100644
index 00000000..e4a4eec7
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-homedir-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 177,
+      "ypos": 86,
+      "width": 67,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "homedir"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-homedir-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-homedir-20180517.png
new file mode 100644
index 00000000..41974e60
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-homedir-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-is_starred-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-is_starred-20180517.json
new file mode 100644
index 00000000..164a9c9a
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-is_starred-20180517.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "is_starred"
+  ],
+  "area": [
+    {
+      "xpos": 916,
+      "ypos": 159,
+      "width": 22,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-is_starred-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-is_starred-20180517.png
new file mode 100644
index 00000000..4bc90ef5
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-is_starred-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-is_starred_dir-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-is_starred_dir-20180517.json
new file mode 100644
index 00000000..570a1d75
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-is_starred_dir-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 164,
+      "ypos": 88,
+      "width": 90,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "is_starred_dir"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-is_starred_dir-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-is_starred_dir-20180517.png
new file mode 100644
index 00000000..daff5b50
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-is_starred_dir-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-nautilus_launcher-20180516.json b/needles/coreapps/nautilus/desktop_nautilus-nautilus_launcher-20180516.json
new file mode 100644
index 00000000..45f60e7c
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-nautilus_launcher-20180516.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 31,
+      "ypos": 447,
+      "width": 32,
+      "height": 40,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "nautilus_launcher"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-nautilus_launcher-20180516.png b/needles/coreapps/nautilus/desktop_nautilus-nautilus_launcher-20180516.png
new file mode 100644
index 00000000..7b834e81
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-nautilus_launcher-20180516.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-nautilus_quit-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-nautilus_quit-20180517.json
new file mode 100644
index 00000000..8c5a85e3
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-nautilus_quit-20180517.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "nautilus_quit"
+  ],
+  "area": [
+    {
+      "xpos": 397,
+      "ypos": 274,
+      "width": 75,
+      "height": 53,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-nautilus_quit-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-nautilus_quit-20180517.png
new file mode 100644
index 00000000..33baa1e3
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-nautilus_quit-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-new_directory_chosen-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-new_directory_chosen-20180517.json
new file mode 100644
index 00000000..3a7ca461
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-new_directory_chosen-20180517.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "new_directory_chosen"
+  ],
+  "area": [
+    {
+      "xpos": 265,
+      "ypos": 167,
+      "width": 36,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-new_directory_chosen-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-new_directory_chosen-20180517.png
new file mode 100644
index 00000000..62506150
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-new_directory_chosen-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-new_folder_dialogue-20180516.json b/needles/coreapps/nautilus/desktop_nautilus-new_folder_dialogue-20180516.json
new file mode 100644
index 00000000..a9a48f07
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-new_folder_dialogue-20180516.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "new_folder_dialogue"
+  ],
+  "area": [
+    {
+      "xpos": 472,
+      "ypos": 314,
+      "width": 80,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-new_folder_dialogue-20180516.png b/needles/coreapps/nautilus/desktop_nautilus-new_folder_dialogue-20180516.png
new file mode 100644
index 00000000..83a93811
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-new_folder_dialogue-20180516.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-open_menu-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-open_menu-20180517.json
new file mode 100644
index 00000000..383459cf
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-open_menu-20180517.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 874,
+      "ypos": 85,
+      "width": 26,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "open_menu"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-open_menu-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-open_menu-20180517.png
new file mode 100644
index 00000000..bbdc013c
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-open_menu-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-rename_button-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-rename_button-20180517.json
new file mode 100644
index 00000000..278f58cd
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-rename_button-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 401,
+      "ypos": 313,
+      "width": 59,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "rename_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-rename_button-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-rename_button-20180517.png
new file mode 100644
index 00000000..a980065e
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-rename_button-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-rename_dialogue-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-rename_dialogue-20180517.json
new file mode 100644
index 00000000..6283667a
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-rename_dialogue-20180517.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "rename_dialogue"
+  ],
+  "area": [
+    {
+      "xpos": 407,
+      "ypos": 315,
+      "width": 52,
+      "height": 15,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-rename_dialogue-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-rename_dialogue-20180517.png
new file mode 100644
index 00000000..79af8c10
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-rename_dialogue-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-search_button-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-search_button-20180517.json
new file mode 100644
index 00000000..58e4fe75
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-search_button-20180517.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "search_button"
+  ],
+  "area": [
+    {
+      "xpos": 794,
+      "ypos": 85,
+      "width": 24,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-search_button-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-search_button-20180517.png
new file mode 100644
index 00000000..b1d3b617
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-search_button-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-search_field-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-search_field-20180517.json
new file mode 100644
index 00000000..ae9788d8
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-search_field-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 387,
+      "ypos": 132,
+      "width": 31,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "search_field"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-search_field-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-search_field-20180517.png
new file mode 100644
index 00000000..a1b54b9d
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-search_field-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-star-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-star-20180517.json
new file mode 100644
index 00000000..f43c5364
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-star-20180517.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 351,
+      "ypos": 521,
+      "width": 36,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "star"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-star-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-star-20180517.png
new file mode 100644
index 00000000..a136382d
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-star-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-starred_button-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-starred_button-20180517.json
new file mode 100644
index 00000000..4a9fba2a
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-starred_button-20180517.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "starred_button"
+  ],
+  "area": [
+    {
+      "xpos": 79,
+      "ypos": 171,
+      "width": 74,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-starred_button-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-starred_button-20180517.png
new file mode 100644
index 00000000..4bc90ef5
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-starred_button-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-starred_directory_line-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-starred_directory_line-20180517.json
new file mode 100644
index 00000000..c578027e
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-starred_directory_line-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "starred_directory_line"
+  ],
+  "area": [
+    {
+      "xpos": 268,
+      "ypos": 158,
+      "width": 102,
+      "height": 24,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-starred_directory_line-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-starred_directory_line-20180517.png
new file mode 100644
index 00000000..daff5b50
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-starred_directory_line-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-toggle_view_button-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-toggle_view_button-20180517.json
new file mode 100644
index 00000000..0391c319
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-toggle_view_button-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 835,
+      "ypos": 84,
+      "width": 23,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "toggle_view_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-toggle_view_button-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-toggle_view_button-20180517.png
new file mode 100644
index 00000000..90619bef
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-toggle_view_button-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-toggled_view-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-toggled_view-20180517.json
new file mode 100644
index 00000000..94544725
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-toggled_view-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 244,
+      "ypos": 160,
+      "width": 126,
+      "height": 37,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "toggled_view"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-toggled_view-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-toggled_view-20180517.png
new file mode 100644
index 00000000..e62429a3
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-toggled_view-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-undo_trash-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-undo_trash-20180517.json
new file mode 100644
index 00000000..a45134b8
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-undo_trash-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 763,
+      "ypos": 245,
+      "width": 81,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "undo_trash"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-undo_trash-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-undo_trash-20180517.png
new file mode 100644
index 00000000..618035d1
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-undo_trash-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-undone_trash-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-undone_trash-20180517.json
new file mode 100644
index 00000000..d0ea12dd
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-undone_trash-20180517.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 247,
+      "ypos": 160,
+      "width": 122,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "undone_trash"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-undone_trash-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-undone_trash-20180517.png
new file mode 100644
index 00000000..ee83060f
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-undone_trash-20180517.png differ
diff --git a/needles/coreapps/nautilus/desktop_nautilus-unstar-20180517.json b/needles/coreapps/nautilus/desktop_nautilus-unstar-20180517.json
new file mode 100644
index 00000000..612f5797
--- /dev/null
+++ b/needles/coreapps/nautilus/desktop_nautilus-unstar-20180517.json
@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 346,
+      "ypos": 522,
+      "width": 53,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "unstar"
+  ]
+}
\ No newline at end of file
diff --git a/needles/coreapps/nautilus/desktop_nautilus-unstar-20180517.png b/needles/coreapps/nautilus/desktop_nautilus-unstar-20180517.png
new file mode 100644
index 00000000..a25ef809
Binary files /dev/null and b/needles/coreapps/nautilus/desktop_nautilus-unstar-20180517.png differ
diff --git a/tests/desktop_nautilus.pm b/tests/desktop_nautilus.pm
new file mode 100644
index 00000000..d9db4edb
--- /dev/null
+++ b/tests/desktop_nautilus.pm
@@ -0,0 +1,88 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This test will test the basic functionality of Nautilus. 
+# Nautilus is one of the core applications. Preferably this test should
+# be one of several that will be chained in order to test
+# the core applications in Fedora Workstation.
+ 
+sub run {
+    my $self = shift;
+    check_desktop_clean;
+    # switch on the activity screen
+    send_key 'alt-f1';
+    # wait out animations
+    wait_still_screen 2;
+    # run the application and check that the window appears
+    assert_and_click 'nautilus_launcher';
+    wait_still_screen 2;
+    # enter one of thhe directories 
+    assert_and_click 'directory_chosen';
+    send_key 'ret';
+    # create a new directory using the keyboard shortcut
+    send_key 'ctrl-shift-n';
+    wait_still_screen 2;
+    # check that the new folder dialogue box appears,
+    # type the folder name and press enter
+    assert_screen 'new_folder_dialogue';
+    type_very_safely "testing";
+    send_key 'ret';
+    wait_still_screen 2;
+    # check that the directory has been created
+    assert_screen 'directory_created';
+    # rename the folder, check for the rename window,
+    # type the new folder name and press the button,
+    # check that it has been renamed
+    send_key 'f2';
+    assert_screen 'rename_dialogue';
+    type_very_safely "renamed";
+    assert_and_click 'rename_button';
+    assert_screen 'directory_renamed';
+    # test the search button
+    assert_and_click 'search_button';
+    assert_screen 'search_field';
+    assert_and_click 'search_button';
+    # check the toggle view
+    assert_and_click 'toggle_view_button';
+    assert_screen 'toggled_view';
+    # choose the directory and delete it
+    assert_and_click 'new_directory_chosen';
+    send_key 'delete';
+    assert_screen 'folder_empty';
+    # undo the deletion and check that the directory
+    # appears again at the same place
+    assert_and_click 'open_menu';
+    assert_and_click 'undo_trash';
+    assert_screen 'undone_trash';
+    # rightclick on the directory to open the menu
+    # and star the directory. check that it appears
+    # in the Starred folder.
+    assert_and_click 'directory_line','right';
+    assert_and_click 'star';
+    assert_screen 'is_starred';
+    assert_and_click 'starred_button';
+    assert_screen 'is_starred_dir';
+    # unstar the directory and check that it disappears
+    # from the Starred directory again
+    assert_and_click 'starred_directory_line','right';
+    assert_and_click 'unstar';
+    assert_screen 'gone_from_starred';
+    # Check the left menu functions by
+    # clicking on Home to navigate to the Home directory
+    assert_and_click 'home_button';
+    assert_screen 'homedir';
+    # Close the application via the Exit icon 
+    # and check that it finished.
+    assert_and_click 'exit_button';
+    assert_screen 'nautilus_quit'
+}
+
+sub test_flags {
+    return { fatal => 1 };
+}
+
+1;
+
+# vim: set sw=4 et: