diff --git a/needles/gnome/apps/system-settings/.png b/needles/gnome/apps/system-settings/.png
deleted file mode 100644
index ca8a9eb4..00000000
Binary files a/needles/gnome/apps/system-settings/.png and /dev/null differ
diff --git a/needles/gnome/apps/system-settings/settings_about_shown.json b/needles/gnome/apps/system-settings/settings_about_shown.json
new file mode 100644
index 00000000..e1b8bc01
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_about_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 515,
+      "ypos": 111,
+      "width": 294,
+      "height": 68,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_about_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_about_shown.png b/needles/gnome/apps/system-settings/settings_about_shown.png
new file mode 100644
index 00000000..ef83c57b
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_about_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_alternate_background_set.json b/needles/gnome/apps/system-settings/settings_alternate_background_set.json
new file mode 100644
index 00000000..7bdaf17f
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_alternate_background_set.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 258,
+      "ypos": 224,
+      "width": 525,
+      "height": 236,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_alternate_background_set"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_bluetooth_no_bluetooth.json b/needles/gnome/apps/system-settings/settings_bluetooth_no_bluetooth.json
new file mode 100644
index 00000000..8656a650
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_bluetooth_no_bluetooth.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 529,
+      "ypos": 472,
+      "width": 177,
+      "height": 39,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_bluetooth_no_bluetooth"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_bluetooth_no_bluetooth.png b/needles/gnome/apps/system-settings/settings_bluetooth_no_bluetooth.png
new file mode 100644
index 00000000..6625abbf
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_bluetooth_no_bluetooth.png differ
diff --git a/needles/gnome/apps/system-settings/settings_color_shown.json b/needles/gnome/apps/system-settings/settings_color_shown.json
new file mode 100644
index 00000000..8cb006ff
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_color_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 394,
+      "ypos": 176,
+      "width": 105,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_color_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_color_shown.png b/needles/gnome/apps/system-settings/settings_color_shown.png
new file mode 100644
index 00000000..d098ba26
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_color_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_defaults_shown.json b/needles/gnome/apps/system-settings/settings_defaults_shown.json
new file mode 100644
index 00000000..08a5c31a
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_defaults_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 537,
+      "ypos": 104,
+      "width": 235,
+      "height": 285,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_defaults_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_defaults_shown.png b/needles/gnome/apps/system-settings/settings_defaults_shown.png
new file mode 100644
index 00000000..09665bfc
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_defaults_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_displays_shown.json b/needles/gnome/apps/system-settings/settings_displays_shown.json
new file mode 100644
index 00000000..8c6eb83b
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_displays_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 792,
+      "ypos": 119,
+      "width": 141,
+      "height": 81,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_displays_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_displays_shown.png b/needles/gnome/apps/system-settings/settings_displays_shown.png
new file mode 100644
index 00000000..0cb81a34
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_displays_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_keyboard_shown.json b/needles/gnome/apps/system-settings/settings_keyboard_shown.json
new file mode 100644
index 00000000..e0d15033
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_keyboard_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 394,
+      "ypos": 173,
+      "width": 113,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_keyboard_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_keyboard_shown.png b/needles/gnome/apps/system-settings/settings_keyboard_shown.png
new file mode 100644
index 00000000..0589a159
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_keyboard_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_about.json b/needles/gnome/apps/system-settings/settings_menu_about.json
new file mode 100644
index 00000000..8ef4ce13
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_about.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 17,
+      "ypos": 142,
+      "width": 78,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_about"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_about.png b/needles/gnome/apps/system-settings/settings_menu_about.png
new file mode 100644
index 00000000..f2bc5844
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_about.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_bluetooth.json b/needles/gnome/apps/system-settings/settings_menu_bluetooth.json
new file mode 100644
index 00000000..46f8c30f
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_bluetooth.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 21,
+      "ypos": 144,
+      "width": 94,
+      "height": 15,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_bluetooth"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_bluetooth.png b/needles/gnome/apps/system-settings/settings_menu_bluetooth.png
new file mode 100644
index 00000000..2d39f4f7
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_bluetooth.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_color.json b/needles/gnome/apps/system-settings/settings_menu_color.json
new file mode 100644
index 00000000..25433c57
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_color.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 18,
+      "ypos": 140,
+      "width": 72,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_color"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_color.png b/needles/gnome/apps/system-settings/settings_menu_color.png
new file mode 100644
index 00000000..5bfe2c3c
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_color.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_defaults.json b/needles/gnome/apps/system-settings/settings_menu_defaults.json
new file mode 100644
index 00000000..92144fe9
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_defaults.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 21,
+      "ypos": 143,
+      "width": 163,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_defaults"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_defaults.png b/needles/gnome/apps/system-settings/settings_menu_defaults.png
new file mode 100644
index 00000000..b81bb98a
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_defaults.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_displays.json b/needles/gnome/apps/system-settings/settings_menu_displays.json
new file mode 100644
index 00000000..a472b3b6
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_displays.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 17,
+      "ypos": 660,
+      "width": 88,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_displays"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_displays.png b/needles/gnome/apps/system-settings/settings_menu_displays.png
new file mode 100644
index 00000000..e612d218
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_displays.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_keyboard.json b/needles/gnome/apps/system-settings/settings_menu_keyboard.json
new file mode 100644
index 00000000..f734648f
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_keyboard.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 16,
+      "ypos": 749,
+      "width": 97,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_keyboard"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_keyboard.png b/needles/gnome/apps/system-settings/settings_menu_keyboard.png
new file mode 100644
index 00000000..a2eb495b
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_keyboard.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_mouse.json b/needles/gnome/apps/system-settings/settings_menu_mouse.json
new file mode 100644
index 00000000..18d64ef9
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_mouse.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 21,
+      "ypos": 709,
+      "width": 158,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_mouse"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_mouse.png b/needles/gnome/apps/system-settings/settings_menu_mouse.png
new file mode 100644
index 00000000..7cdd77c8
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_mouse.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_online.json b/needles/gnome/apps/system-settings/settings_menu_online.json
new file mode 100644
index 00000000..8334c553
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_online.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 16,
+      "ypos": 475,
+      "width": 76,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_online"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_online.png b/needles/gnome/apps/system-settings/settings_menu_online.png
new file mode 100644
index 00000000..55728c2c
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_online.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_power.json b/needles/gnome/apps/system-settings/settings_menu_power.json
new file mode 100644
index 00000000..f4ec6a33
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_power.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 18,
+      "ypos": 620,
+      "width": 75,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_power"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_power.png b/needles/gnome/apps/system-settings/settings_menu_power.png
new file mode 100644
index 00000000..c857ecf0
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_power.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_printers.json b/needles/gnome/apps/system-settings/settings_menu_printers.json
new file mode 100644
index 00000000..1d1ec124
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_printers.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 14,
+      "ypos": 142,
+      "width": 92,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_printers"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_printers.png b/needles/gnome/apps/system-settings/settings_menu_printers.png
new file mode 100644
index 00000000..6e703665
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_printers.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_region.json b/needles/gnome/apps/system-settings/settings_menu_region.json
new file mode 100644
index 00000000..eb11a40f
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_region.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 18,
+      "ypos": 140,
+      "width": 160,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_region"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_region.png b/needles/gnome/apps/system-settings/settings_menu_region.png
new file mode 100644
index 00000000..437fcf09
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_region.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_removables.json b/needles/gnome/apps/system-settings/settings_menu_removables.json
new file mode 100644
index 00000000..4c9dc2e1
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_removables.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 20,
+      "ypos": 144,
+      "width": 145,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_removables"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_removables.png b/needles/gnome/apps/system-settings/settings_menu_removables.png
new file mode 100644
index 00000000..145713c3
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_removables.png differ
diff --git a/needles/gnome/apps/system-settings/settings_menu_sharing.json b/needles/gnome/apps/system-settings/settings_menu_sharing.json
new file mode 100644
index 00000000..994fc1d8
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_menu_sharing.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 15,
+      "ypos": 517,
+      "width": 87,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_menu_sharing"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_menu_sharing.png b/needles/gnome/apps/system-settings/settings_menu_sharing.png
new file mode 100644
index 00000000..06655f8e
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_menu_sharing.png differ
diff --git a/needles/gnome/apps/system-settings/settings_mouse_shown.json b/needles/gnome/apps/system-settings/settings_mouse_shown.json
new file mode 100644
index 00000000..efbe72ab
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_mouse_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 769,
+      "ypos": 166,
+      "width": 141,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_mouse_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_mouse_shown.png b/needles/gnome/apps/system-settings/settings_mouse_shown.png
new file mode 100644
index 00000000..2575dab6
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_mouse_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_multitask_apps_to_switch.json b/needles/gnome/apps/system-settings/settings_multitask_apps_to_switch.json
new file mode 100644
index 00000000..ca6275c5
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_multitask_apps_to_switch.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 314,
+      "ypos": 392,
+      "width": 384,
+      "height": 59,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_multitask_apps_to_switch"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_multitask_apps_to_switch.png b/needles/gnome/apps/system-settings/settings_multitask_apps_to_switch.png
new file mode 100644
index 00000000..0b88f053
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_multitask_apps_to_switch.png differ
diff --git a/needles/gnome/apps/system-settings/settings_online_shown.json b/needles/gnome/apps/system-settings/settings_online_shown.json
new file mode 100644
index 00000000..835a7535
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_online_shown.json
@@ -0,0 +1,36 @@
+{
+  "area": [
+    {
+      "xpos": 441,
+      "ypos": 219,
+      "width": 53,
+      "height": 17,
+      "type": "match"
+    },
+    {
+      "xpos": 442,
+      "ypos": 547,
+      "width": 49,
+      "height": 23,
+      "type": "match"
+    },
+    {
+      "xpos": 552,
+      "ypos": 660,
+      "width": 70,
+      "height": 18,
+      "type": "match"
+    },
+    {
+      "xpos": 441,
+      "ypos": 329,
+      "width": 64,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_online_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_online_shown.png b/needles/gnome/apps/system-settings/settings_online_shown.png
new file mode 100644
index 00000000..39051b94
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_online_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_power_shown.json b/needles/gnome/apps/system-settings/settings_power_shown.json
new file mode 100644
index 00000000..a6dff560
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_power_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 396,
+      "ypos": 165,
+      "width": 117,
+      "height": 39,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_power_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_power_shown.png b/needles/gnome/apps/system-settings/settings_power_shown.png
new file mode 100644
index 00000000..39fe0e35
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_power_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_printers_shown.json b/needles/gnome/apps/system-settings/settings_printers_shown.json
new file mode 100644
index 00000000..a26ad769
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_printers_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 606,
+      "ypos": 411,
+      "width": 108,
+      "height": 75,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_printers_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_printers_shown.png b/needles/gnome/apps/system-settings/settings_printers_shown.png
new file mode 100644
index 00000000..11b17dd1
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_printers_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_region_shown.json b/needles/gnome/apps/system-settings/settings_region_shown.json
new file mode 100644
index 00000000..6becbe65
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_region_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 391,
+      "ypos": 224,
+      "width": 133,
+      "height": 95,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_region_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_region_shown.png b/needles/gnome/apps/system-settings/settings_region_shown.png
new file mode 100644
index 00000000..213b8710
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_region_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_removables_shown.json b/needles/gnome/apps/system-settings/settings_removables_shown.json
new file mode 100644
index 00000000..c8f27a0e
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_removables_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 426,
+      "ypos": 157,
+      "width": 182,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_removables_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_removables_shown.png b/needles/gnome/apps/system-settings/settings_removables_shown.png
new file mode 100644
index 00000000..801bb57f
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_removables_shown.png differ
diff --git a/needles/gnome/apps/system-settings/settings_sharing_on.json b/needles/gnome/apps/system-settings/settings_sharing_on.json
new file mode 100644
index 00000000..6d2bddce
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_sharing_on.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 384,
+      "ypos": 226,
+      "width": 104,
+      "height": 76,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_sharing_on"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_sharing_on.png b/needles/gnome/apps/system-settings/settings_sharing_on.png
new file mode 100644
index 00000000..2bfbeea4
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_sharing_on.png differ
diff --git a/needles/gnome/apps/system-settings/settings_sharing_shown_off.json b/needles/gnome/apps/system-settings/settings_sharing_shown_off.json
new file mode 100644
index 00000000..5e7a2c16
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_sharing_shown_off.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 386,
+      "ypos": 224,
+      "width": 107,
+      "height": 79,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_sharing_shown_off"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_sharing_shown_off.png b/needles/gnome/apps/system-settings/settings_sharing_shown_off.png
new file mode 100644
index 00000000..b949a593
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_sharing_shown_off.png differ
diff --git a/needles/gnome/apps/system-settings/settings_sharing_switch_on.json b/needles/gnome/apps/system-settings/settings_sharing_switch_on.json
new file mode 100644
index 00000000..36022467
--- /dev/null
+++ b/needles/gnome/apps/system-settings/settings_sharing_switch_on.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 931,
+      "ypos": 43,
+      "width": 45,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "settings_sharing_switch_on"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/system-settings/settings_sharing_switch_on.png b/needles/gnome/apps/system-settings/settings_sharing_switch_on.png
new file mode 100644
index 00000000..b949a593
Binary files /dev/null and b/needles/gnome/apps/system-settings/settings_sharing_switch_on.png differ
diff --git a/needles/gnome/apps_run_nautilus.json b/needles/gnome/apps_run_nautilus.json
new file mode 100644
index 00000000..5ea69633
--- /dev/null
+++ b/needles/gnome/apps_run_nautilus.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 113,
+      "ypos": 4,
+      "width": 66,
+      "height": 64,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "apps_run_nautilus"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps_run_nautilus.png b/needles/gnome/apps_run_nautilus.png
new file mode 100644
index 00000000..d0cb8e10
Binary files /dev/null and b/needles/gnome/apps_run_nautilus.png differ
diff --git a/needles/gnome/apps_run_settings.json b/needles/gnome/apps_run_settings.json
new file mode 100644
index 00000000..ca03328b
--- /dev/null
+++ b/needles/gnome/apps_run_settings.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 110,
+      "ypos": 8,
+      "width": 95,
+      "height": 59,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "apps_run_settings"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps_run_settings.png b/needles/gnome/apps_run_settings.png
new file mode 100644
index 00000000..9eaf522a
Binary files /dev/null and b/needles/gnome/apps_run_settings.png differ
diff --git a/needles/gnome/gnome_search_button.json b/needles/gnome/gnome_search_button.json
new file mode 100644
index 00000000..3853b55e
--- /dev/null
+++ b/needles/gnome/gnome_search_button.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 9,
+      "ypos": 46,
+      "width": 29,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_search_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/gnome_search_button.png b/needles/gnome/gnome_search_button.png
new file mode 100644
index 00000000..7e7580ca
Binary files /dev/null and b/needles/gnome/gnome_search_button.png differ