diff --git a/needles/gnome/apps/archiver/archiver_button_create-20220915.json b/needles/gnome/apps/archiver/archiver_button_create-20220915.json
deleted file mode 100644
index 1780a274..00000000
--- a/needles/gnome/apps/archiver/archiver_button_create-20220915.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 48,
-      "xpos": 694,
-      "height": 19,
-      "type": "match",
-      "ypos": 285
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "archiver_button_create"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/archiver/archiver_button_create-20220915.png b/needles/gnome/apps/archiver/archiver_button_create-20220915.png
deleted file mode 100644
index dd76b085..00000000
Binary files a/needles/gnome/apps/archiver/archiver_button_create-20220915.png and /dev/null differ
diff --git a/needles/gnome/apps/archiver/archiver_context_extract-20220915.json b/needles/gnome/apps/archiver/archiver_context_extract-20220915.json
deleted file mode 100644
index d9c1c1b4..00000000
--- a/needles/gnome/apps/archiver/archiver_context_extract-20220915.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 184,
-      "type": "match",
-      "height": 21,
-      "width": 93,
-      "xpos": 343
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "archiver_context_extract"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/archiver/archiver_context_extract-20220915.png b/needles/gnome/apps/archiver/archiver_context_extract-20220915.png
deleted file mode 100644
index d8a0586a..00000000
Binary files a/needles/gnome/apps/archiver/archiver_context_extract-20220915.png and /dev/null differ
diff --git a/needles/gnome/apps/archiver/archiver_context_extract-highlighted-20221116.json b/needles/gnome/apps/archiver/archiver_context_extract-highlighted-20221116.json
deleted file mode 100644
index c96b8297..00000000
--- a/needles/gnome/apps/archiver/archiver_context_extract-highlighted-20221116.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 346,
-      "height": 21,
-      "type": "match",
-      "ypos": 204,
-      "width": 58
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "archiver_context_extract"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/archiver/archiver_context_extract-highlighted-20221116.png b/needles/gnome/apps/archiver/archiver_context_extract-highlighted-20221116.png
deleted file mode 100644
index f65ecd33..00000000
Binary files a/needles/gnome/apps/archiver/archiver_context_extract-highlighted-20221116.png and /dev/null differ
diff --git a/needles/gnome/apps/archiver/archiver_format_selector-20220915.json b/needles/gnome/apps/archiver/archiver_format_selector-20220915.json
deleted file mode 100644
index 81d032ea..00000000
--- a/needles/gnome/apps/archiver/archiver_format_selector-20220915.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "ypos": 382,
-      "xpos": 656,
-      "width": 46,
-      "height": 22
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "archiver_format_selector"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/archiver/archiver_format_selector-20220915.png b/needles/gnome/apps/archiver/archiver_format_selector-20220915.png
deleted file mode 100644
index f1e011d5..00000000
Binary files a/needles/gnome/apps/archiver/archiver_format_selector-20220915.png and /dev/null differ
diff --git a/needles/gnome/apps/calculator/calc_menu_about-20220818.png b/needles/gnome/apps/calculator/calc_menu_about-20220818.png
deleted file mode 100644
index 6644c6ae..00000000
Binary files a/needles/gnome/apps/calculator/calc_menu_about-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/calculator/calc_menu_about.json b/needles/gnome/apps/calculator/calc_menu_about.json
deleted file mode 100644
index 473e982c..00000000
--- a/needles/gnome/apps/calculator/calc_menu_about.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 363,
-      "ypos": 487,
-      "width": 121,
-      "height": 23,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "calc_menu_about"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_menu_about.png b/needles/gnome/apps/calculator/calc_menu_about.png
deleted file mode 100644
index e7fb0e7d..00000000
Binary files a/needles/gnome/apps/calculator/calc_menu_about.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm_snooze-20220818.json b/needles/gnome/apps/clocks/clocks_button_alarm_snooze-20220818.json
deleted file mode 100644
index d7482828..00000000
--- a/needles/gnome/apps/clocks/clocks_button_alarm_snooze-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "xpos": 485,
-      "width": 55,
-      "height": 20,
-      "ypos": 629
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_button_alarm_snooze"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm_snooze-20220818.png b/needles/gnome/apps/clocks/clocks_button_alarm_snooze-20220818.png
deleted file mode 100644
index 2897086e..00000000
Binary files a/needles/gnome/apps/clocks/clocks_button_alarm_snooze-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm_snooze.png b/needles/gnome/apps/clocks/clocks_button_alarm_snooze.png
deleted file mode 100644
index 8ad5b7bf..00000000
Binary files a/needles/gnome/apps/clocks/clocks_button_alarm_snooze.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm_stop-20220818.json b/needles/gnome/apps/clocks/clocks_button_alarm_stop-20220818.json
deleted file mode 100644
index 55d6def0..00000000
--- a/needles/gnome/apps/clocks/clocks_button_alarm_stop-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 569,
-      "height": 22,
-      "width": 51,
-      "type": "match",
-      "xpos": 488
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_button_alarm_stop"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm_stop-20220818.png b/needles/gnome/apps/clocks/clocks_button_alarm_stop-20220818.png
deleted file mode 100644
index 11d90776..00000000
Binary files a/needles/gnome/apps/clocks/clocks_button_alarm_stop-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm_stop.png b/needles/gnome/apps/clocks/clocks_button_alarm_stop.png
deleted file mode 100644
index 274e95b4..00000000
Binary files a/needles/gnome/apps/clocks/clocks_button_alarm_stop.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_menu_about-20220818.png b/needles/gnome/apps/clocks/clocks_menu_about-20220818.png
deleted file mode 100644
index 5d1f9e41..00000000
Binary files a/needles/gnome/apps/clocks/clocks_menu_about-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_menu_about.png b/needles/gnome/apps/clocks/clocks_menu_about.png
deleted file mode 100644
index c418b038..00000000
Binary files a/needles/gnome/apps/clocks/clocks_menu_about.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_menu_help-20220818.png b/needles/gnome/apps/clocks/clocks_menu_help-20220818.png
deleted file mode 100644
index 5d1f9e41..00000000
Binary files a/needles/gnome/apps/clocks/clocks_menu_help-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_menu_shortcuts-20220818.json b/needles/gnome/apps/clocks/clocks_menu_shortcuts-20220818.json
deleted file mode 100644
index 0fcc3c61..00000000
--- a/needles/gnome/apps/clocks/clocks_menu_shortcuts-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 138,
-      "xpos": 822,
-      "type": "match",
-      "height": 21,
-      "ypos": 97
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_menu_shortcuts"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_menu_shortcuts-20220818.png b/needles/gnome/apps/clocks/clocks_menu_shortcuts-20220818.png
deleted file mode 100644
index 5d1f9e41..00000000
Binary files a/needles/gnome/apps/clocks/clocks_menu_shortcuts-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_clear-20220818.json b/needles/gnome/apps/clocks/clocks_stopwatch_button_clear-20220818.json
deleted file mode 100644
index 387082bb..00000000
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_clear-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 21,
-      "ypos": 449,
-      "width": 48,
-      "type": "match",
-      "xpos": 601
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_stopwatch_button_clear"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_clear-20220818.png b/needles/gnome/apps/clocks/clocks_stopwatch_button_clear-20220818.png
deleted file mode 100644
index ff183b83..00000000
Binary files a/needles/gnome/apps/clocks/clocks_stopwatch_button_clear-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_lap-20220818.png b/needles/gnome/apps/clocks/clocks_stopwatch_button_lap-20220818.png
deleted file mode 100644
index 89c428ec..00000000
Binary files a/needles/gnome/apps/clocks/clocks_stopwatch_button_lap-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_pause-20220818.png b/needles/gnome/apps/clocks/clocks_stopwatch_button_pause-20220818.png
deleted file mode 100644
index e61597f2..00000000
Binary files a/needles/gnome/apps/clocks/clocks_stopwatch_button_pause-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_resume-20220818.png b/needles/gnome/apps/clocks/clocks_stopwatch_button_resume-20220818.png
deleted file mode 100644
index 5a886491..00000000
Binary files a/needles/gnome/apps/clocks/clocks_stopwatch_button_resume-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_start-20220818.json b/needles/gnome/apps/clocks/clocks_stopwatch_button_start-20220818.json
deleted file mode 100644
index 0db1c727..00000000
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_start-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "xpos": 374,
-      "width": 49,
-      "height": 17,
-      "ypos": 450
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_stopwatch_button_start"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_start-20220818.png b/needles/gnome/apps/clocks/clocks_stopwatch_button_start-20220818.png
deleted file mode 100644
index 4e2f261e..00000000
Binary files a/needles/gnome/apps/clocks/clocks_stopwatch_button_start-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_start.json b/needles/gnome/apps/clocks/clocks_stopwatch_button_start.json
deleted file mode 100644
index 5f86b88a..00000000
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_start.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 374,
-      "ypos": 449,
-      "width": 49,
-      "height": 17,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_stopwatch_button_start"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/contacts/contacts_menu_about-20220923.png b/needles/gnome/apps/contacts/contacts_menu_about-20220923.png
deleted file mode 100644
index e283ab60..00000000
Binary files a/needles/gnome/apps/contacts/contacts_menu_about-20220923.png and /dev/null differ
diff --git a/needles/gnome/apps/contacts/contacts_menu_about.png b/needles/gnome/apps/contacts/contacts_menu_about.png
deleted file mode 100644
index 6178e08b..00000000
Binary files a/needles/gnome/apps/contacts/contacts_menu_about.png and /dev/null differ
diff --git a/needles/gnome/apps/contacts/contacts_menu_shortcuts-20220923.json b/needles/gnome/apps/contacts/contacts_menu_shortcuts-20220923.json
deleted file mode 100644
index 70e7414c..00000000
--- a/needles/gnome/apps/contacts/contacts_menu_shortcuts-20220923.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "xpos": 211,
-      "width": 137,
-      "ypos": 279,
-      "height": 22
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "contacts_menu_shortcuts"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/contacts/contacts_menu_shortcuts-20220923.png b/needles/gnome/apps/contacts/contacts_menu_shortcuts-20220923.png
deleted file mode 100644
index bc4370e6..00000000
Binary files a/needles/gnome/apps/contacts/contacts_menu_shortcuts-20220923.png and /dev/null differ
diff --git a/needles/gnome/apps/contacts/contacts_menu_shortcuts.png b/needles/gnome/apps/contacts/contacts_menu_shortcuts.png
deleted file mode 100644
index 6912b380..00000000
Binary files a/needles/gnome/apps/contacts/contacts_menu_shortcuts.png and /dev/null differ
diff --git a/needles/gnome/apps/eog/eog_gallery_show.png b/needles/gnome/apps/eog/eog_gallery_show.png
deleted file mode 100644
index dd7ddd0a..00000000
Binary files a/needles/gnome/apps/eog/eog_gallery_show.png and /dev/null differ
diff --git a/needles/gnome/apps/eog/eog_menu_about.json b/needles/gnome/apps/eog/eog_menu_about.json
deleted file mode 100644
index dbb3f394..00000000
--- a/needles/gnome/apps/eog/eog_menu_about.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 863,
-      "ypos": 464,
-      "width": 82,
-      "height": 14,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "eog_menu_about"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/eog/eog_menu_about.png b/needles/gnome/apps/eog/eog_menu_about.png
deleted file mode 100644
index d4db6673..00000000
Binary files a/needles/gnome/apps/eog/eog_menu_about.png and /dev/null differ
diff --git a/needles/gnome/apps/eog/eog_set_wallpaper.json b/needles/gnome/apps/eog/eog_set_wallpaper.json
deleted file mode 100644
index f186c026..00000000
--- a/needles/gnome/apps/eog/eog_set_wallpaper.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 862,
-      "ypos": 253,
-      "width": 114,
-      "height": 17,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "eog_set_wallpaper"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/eog/eog_set_wallpaper.png b/needles/gnome/apps/eog/eog_set_wallpaper.png
deleted file mode 100644
index 02782b1c..00000000
Binary files a/needles/gnome/apps/eog/eog_set_wallpaper.png and /dev/null differ
diff --git a/needles/gnome/apps/eog/eog_submenu_show.json b/needles/gnome/apps/eog/eog_submenu_show.json
deleted file mode 100644
index ece21d24..00000000
--- a/needles/gnome/apps/eog/eog_submenu_show.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 860,
-      "ypos": 350,
-      "width": 43,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "eog_submenu_show"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/eog/eog_submenu_show.png b/needles/gnome/apps/eog/eog_submenu_show.png
deleted file mode 100644
index 43101d25..00000000
Binary files a/needles/gnome/apps/eog/eog_submenu_show.png and /dev/null differ
diff --git a/needles/gnome/apps/evince/evince_menu_about.png b/needles/gnome/apps/evince/evince_menu_about.png
deleted file mode 100644
index f74e9544..00000000
Binary files a/needles/gnome/apps/evince/evince_menu_about.png and /dev/null differ
diff --git a/needles/gnome/apps/evince/evince_menu_dual.png b/needles/gnome/apps/evince/evince_menu_dual.png
deleted file mode 100644
index 0d0a2e0e..00000000
Binary files a/needles/gnome/apps/evince/evince_menu_dual.png and /dev/null differ
diff --git a/needles/gnome/apps/evince/evince_menu_help.png b/needles/gnome/apps/evince/evince_menu_help.png
deleted file mode 100644
index c2f7f281..00000000
Binary files a/needles/gnome/apps/evince/evince_menu_help.png and /dev/null differ
diff --git a/needles/gnome/apps/evince/evince_menu_properties.json b/needles/gnome/apps/evince/evince_menu_properties.json
deleted file mode 100644
index 8125196f..00000000
--- a/needles/gnome/apps/evince/evince_menu_properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 784,
-      "ypos": 486,
-      "width": 73,
-      "height": 22,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "evince_menu_properties"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/evince/evince_menu_properties.png b/needles/gnome/apps/evince/evince_menu_properties.png
deleted file mode 100644
index 3482e8fa..00000000
Binary files a/needles/gnome/apps/evince/evince_menu_properties.png and /dev/null differ
diff --git a/needles/gnome/apps/evince/evince_menu_saveas.json b/needles/gnome/apps/evince/evince_menu_saveas.json
deleted file mode 100644
index d330115f..00000000
--- a/needles/gnome/apps/evince/evince_menu_saveas.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 243,
-      "type": "match",
-      "xpos": 784,
-      "width": 68,
-      "height": 20
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "evince_menu_saveas"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/evince/evince_menu_saveas.png b/needles/gnome/apps/evince/evince_menu_saveas.png
deleted file mode 100644
index cb9597b2..00000000
Binary files a/needles/gnome/apps/evince/evince_menu_saveas.png and /dev/null differ
diff --git a/needles/gnome/apps/evince/evince_menu_shortcuts.png b/needles/gnome/apps/evince/evince_menu_shortcuts.png
deleted file mode 100644
index e9a67c0c..00000000
Binary files a/needles/gnome/apps/evince/evince_menu_shortcuts.png and /dev/null differ
diff --git a/needles/gnome/apps/evince/evince_open_file_dialog.json b/needles/gnome/apps/evince/evince_open_file_dialog.json
deleted file mode 100644
index c57b8812..00000000
--- a/needles/gnome/apps/evince/evince_open_file_dialog.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "area": [
-        {
-            "height": 20,
-            "type": "match",
-            "width": 33,
-            "xpos": 397,
-            "ypos": 91
-        }
-    ],
-    "properties": [],
-    "tags": [
-        "evince_open_file_dialog"
-    ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/evince/evince_toggle_night_mode.json b/needles/gnome/apps/evince/evince_toggle_night_mode.json
deleted file mode 100644
index fdf4a2c6..00000000
--- a/needles/gnome/apps/evince/evince_toggle_night_mode.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 781,
-      "ypos": 450,
-      "width": 88,
-      "height": 25,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "evince_toggle_night_mode"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/evince/evince_toggle_night_mode.png b/needles/gnome/apps/evince/evince_toggle_night_mode.png
deleted file mode 100644
index 1582552e..00000000
Binary files a/needles/gnome/apps/evince/evince_toggle_night_mode.png and /dev/null differ
diff --git a/needles/gnome/apps/evince/evince_menu_help.json b/needles/gnome/apps/evince/gnome_button_open.json
similarity index 57%
rename from needles/gnome/apps/evince/evince_menu_help.json
rename to needles/gnome/apps/evince/gnome_button_open.json
index bab28d40..5af803c9 100644
--- a/needles/gnome/apps/evince/evince_menu_help.json
+++ b/needles/gnome/apps/evince/gnome_button_open.json
@@ -1,15 +1,15 @@
 {
   "area": [
     {
-      "xpos": 783,
-      "ypos": 571,
-      "width": 40,
+      "xpos": 397,
+      "ypos": 91,
+      "width": 37,
       "height": 20,
       "type": "match"
     }
   ],
   "properties": [],
   "tags": [
-    "evince_menu_help"
+    "gnome_button_open"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/evince/evince_open_file_dialog.png b/needles/gnome/apps/evince/gnome_button_open.png
similarity index 100%
rename from needles/gnome/apps/evince/evince_open_file_dialog.png
rename to needles/gnome/apps/evince/gnome_button_open.png
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about-20220304.json b/needles/gnome/apps/gnome-text-editor/gte_about-20220304.json
deleted file mode 100644
index 8d6abfaa..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_about-20220304.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 24,
-      "ypos": 577,
-      "type": "match",
-      "width": 127,
-      "xpos": 818
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_about"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about-20220304.png b/needles/gnome/apps/gnome-text-editor/gte_about-20220304.png
deleted file mode 100644
index 2e94db80..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_about-20220304.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about-20220818.json b/needles/gnome/apps/gnome-text-editor/gte_about-20220818.json
deleted file mode 100644
index 6eb57c08..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_about-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 24,
-      "ypos": 577,
-      "width": 127,
-      "type": "match",
-      "xpos": 819
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_about"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about-20220818.png b/needles/gnome/apps/gnome-text-editor/gte_about-20220818.png
deleted file mode 100644
index df17a154..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_about-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about.json b/needles/gnome/apps/gnome-text-editor/gte_about.json
deleted file mode 100644
index eb9b8dbd..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_about.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 818,
-      "ypos": 577,
-      "width": 127,
-      "height": 24,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_about"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about.png b/needles/gnome/apps/gnome-text-editor/gte_about.png
deleted file mode 100644
index 1c539f03..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_about.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220204.json b/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220204.json
deleted file mode 100644
index 3c2763f2..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220204.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "width": 63,
-      "height": 40,
-      "ypos": 103,
-      "xpos": 948
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_change_to_dark"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220204.png b/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220204.png
deleted file mode 100644
index b207b0b7..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220204.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220316.json b/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220316.json
deleted file mode 100644
index de688514..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220316.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 948,
-      "height": 40,
-      "ypos": 103,
-      "width": 63,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_change_to_dark"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220316.png b/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220316.png
deleted file mode 100644
index 7050ab36..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-20220316.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-flatpak-20220307.json b/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-flatpak-20220307.json
deleted file mode 100644
index b4dba273..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-flatpak-20220307.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 915,
-      "width": 83,
-      "ypos": 92,
-      "height": 60,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_change_to_dark"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-flatpak-20220307.png b/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-flatpak-20220307.png
deleted file mode 100644
index 5230d1c5..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_change_to_dark-flatpak-20220307.png and /dev/null differ
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm_stop.json b/needles/gnome/apps/gnome-text-editor/gte_preferences_grid.json
similarity index 52%
rename from needles/gnome/apps/clocks/clocks_button_alarm_stop.json
rename to needles/gnome/apps/gnome-text-editor/gte_preferences_grid.json
index 25e2da4c..7ed236b3 100644
--- a/needles/gnome/apps/clocks/clocks_button_alarm_stop.json
+++ b/needles/gnome/apps/gnome-text-editor/gte_preferences_grid.json
@@ -1,15 +1,15 @@
-{
-  "properties": [],
-  "tags": [
-    "clocks_button_alarm_stop"
-  ],
-  "area": [
-    {
-      "xpos": 488,
-      "ypos": 569,
-      "width": 51,
-      "height": 22,
-      "type": "match"
-    }
-  ]
+{
+  "area": [
+    {
+      "xpos": 256,
+      "ypos": 600,
+      "width": 136,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gte_preferences_grid"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_grid.png b/needles/gnome/apps/gnome-text-editor/gte_preferences_grid.png
new file mode 100644
index 00000000..07735bb3
Binary files /dev/null and b/needles/gnome/apps/gnome-text-editor/gte_preferences_grid.png differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_line_highlight.json b/needles/gnome/apps/gnome-text-editor/gte_preferences_line_highlight.json
new file mode 100644
index 00000000..9baa6d03
--- /dev/null
+++ b/needles/gnome/apps/gnome-text-editor/gte_preferences_line_highlight.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 259,
+      "ypos": 659,
+      "width": 150,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gte_preferences_line_highlight"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_line_highlight.png b/needles/gnome/apps/gnome-text-editor/gte_preferences_line_highlight.png
new file mode 100644
index 00000000..f95372c9
Binary files /dev/null and b/needles/gnome/apps/gnome-text-editor/gte_preferences_line_highlight.png differ
diff --git a/needles/gnome/apps/clocks/clocks_menu_about.json b/needles/gnome/apps/gnome-text-editor/gte_preferences_overview.json
similarity index 51%
rename from needles/gnome/apps/clocks/clocks_menu_about.json
rename to needles/gnome/apps/gnome-text-editor/gte_preferences_overview.json
index ac32b887..96827419 100644
--- a/needles/gnome/apps/clocks/clocks_menu_about.json
+++ b/needles/gnome/apps/gnome-text-editor/gte_preferences_overview.json
@@ -1,15 +1,15 @@
 {
   "area": [
     {
-      "xpos": 824,
-      "ypos": 160,
-      "width": 89,
+      "xpos": 258,
+      "ypos": 714,
+      "width": 150,
       "height": 21,
       "type": "match"
     }
   ],
   "properties": [],
   "tags": [
-    "clocks_menu_about"
+    "gte_preferences_overview"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_overview.png b/needles/gnome/apps/gnome-text-editor/gte_preferences_overview.png
new file mode 100644
index 00000000..cd5d87b7
Binary files /dev/null and b/needles/gnome/apps/gnome-text-editor/gte_preferences_overview.png differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220204.json b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220204.json
deleted file mode 100644
index f6993d8f..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220204.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 26,
-      "ypos": 483,
-      "xpos": 822,
-      "type": "match",
-      "width": 87
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_preferences_submenu"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220204.png b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220204.png
deleted file mode 100644
index adad62a9..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220204.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220304.json b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220304.json
deleted file mode 100644
index 98cf91fd..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220304.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 822,
-      "width": 87,
-      "type": "match",
-      "height": 26,
-      "ypos": 484
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_preferences_submenu"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220304.png b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220304.png
deleted file mode 100644
index c19388c7..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220304.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220818.png b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220818.png
deleted file mode 100644
index 58e5d9cb..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220204.json b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220204.json
deleted file mode 100644
index a61b0d6d..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220204.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 823,
-      "ypos": 487,
-      "width": 84,
-      "height": 17,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_preferences_submenu"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220204.png b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220204.png
deleted file mode 100644
index 18db9d8a..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220204.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220304.json b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220304.json
deleted file mode 100644
index 57bba740..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220304.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 488,
-      "height": 17,
-      "type": "match",
-      "width": 84,
-      "xpos": 823
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_preferences_submenu"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220304.png b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220304.png
deleted file mode 100644
index 652e47f7..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220304.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220818.json b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220818.json
deleted file mode 100644
index 4b5ce731..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 487,
-      "height": 17,
-      "width": 84,
-      "xpos": 826,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_preferences_submenu"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220818.png b/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220818.png
deleted file mode 100644
index e7badf75..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu_light-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220204.json b/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220204.json
deleted file mode 100644
index ab00a1f7..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220204.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 257,
-      "ypos": 596,
-      "width": 138,
-      "height": 25,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_toggle_grid"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220204.png b/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220204.png
deleted file mode 100644
index a788731c..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220204.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220304.json b/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220304.json
deleted file mode 100644
index 53147f72..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220304.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "ypos": 607,
-      "height": 25,
-      "xpos": 257,
-      "width": 138
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_toggle_grid"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220304.png b/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220304.png
deleted file mode 100644
index 8d078550..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220304.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220818.json b/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220818.json
deleted file mode 100644
index 72d516b7..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 602,
-      "height": 25,
-      "xpos": 257,
-      "type": "match",
-      "width": 138
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_toggle_grid"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220818.png b/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220818.png
deleted file mode 100644
index a5fd1668..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_toggle_grid-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220204.json b/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220204.json
deleted file mode 100644
index 5f0464ff..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220204.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 259,
-      "ypos": 653,
-      "width": 148,
-      "height": 19,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_toggle_line_highlight"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220204.png b/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220204.png
deleted file mode 100644
index 1092cd7e..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220204.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220304.json b/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220304.json
deleted file mode 100644
index 91f8c7a9..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220304.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 148,
-      "xpos": 259,
-      "type": "match",
-      "height": 19,
-      "ypos": 663
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_toggle_line_highlight"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220304.png b/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220304.png
deleted file mode 100644
index ddc7e5be..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220304.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220818.json b/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220818.json
deleted file mode 100644
index 6c63acc2..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 659,
-      "height": 19,
-      "width": 148,
-      "type": "match",
-      "xpos": 259
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_toggle_line_highlight"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220818.png b/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220818.png
deleted file mode 100644
index 3b01b888..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_toggle_line_highlight-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220204.json b/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220204.json
deleted file mode 100644
index c0761a7c..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220204.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 258,
-      "ypos": 707,
-      "width": 151,
-      "height": 19,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_toggle_side_panel"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220204.png b/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220204.png
deleted file mode 100644
index 86de6067..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220204.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220304.json b/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220304.json
deleted file mode 100644
index f55652aa..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220304.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "height": 19,
-      "ypos": 718,
-      "width": 151,
-      "xpos": 258
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_toggle_side_panel"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220304.png b/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220304.png
deleted file mode 100644
index f8df454c..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220304.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220818.json b/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220818.json
deleted file mode 100644
index b4234000..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 713,
-      "height": 19,
-      "type": "match",
-      "xpos": 259,
-      "width": 151
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_toggle_side_panel"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220818.png b/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220818.png
deleted file mode 100644
index f79770a6..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_toggle_side_panel-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_button_credits.json b/needles/gnome/apps/maps/maps_button_credits.json
deleted file mode 100644
index 645aed3e..00000000
--- a/needles/gnome/apps/maps/maps_button_credits.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 355,
-      "ypos": 582,
-      "width": 54,
-      "height": 24,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_button_credits"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_button_credits.png b/needles/gnome/apps/maps/maps_button_credits.png
deleted file mode 100644
index 3061355f..00000000
Binary files a/needles/gnome/apps/maps/maps_button_credits.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_button_export.json b/needles/gnome/apps/maps/maps_button_export.json
deleted file mode 100644
index dbb5388f..00000000
--- a/needles/gnome/apps/maps/maps_button_export.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 677,
-      "ypos": 334,
-      "width": 54,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_button_export"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_button_export.png b/needles/gnome/apps/maps/maps_button_export.png
deleted file mode 100644
index 703238f5..00000000
Binary files a/needles/gnome/apps/maps/maps_button_export.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_button_legal.json b/needles/gnome/apps/maps/maps_button_legal.json
deleted file mode 100644
index fa7df9da..00000000
--- a/needles/gnome/apps/maps/maps_button_legal.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 352,
-      "ypos": 636,
-      "width": 46,
-      "height": 24,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_button_legal"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_button_legal.png b/needles/gnome/apps/maps/maps_button_legal.png
deleted file mode 100644
index 99fbb294..00000000
Binary files a/needles/gnome/apps/maps/maps_button_legal.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_menu_about.json b/needles/gnome/apps/maps/maps_menu_about.json
deleted file mode 100644
index fc963649..00000000
--- a/needles/gnome/apps/maps/maps_menu_about.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 799,
-      "ypos": 207,
-      "width": 84,
-      "height": 23,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_menu_about"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_menu_about.png b/needles/gnome/apps/maps/maps_menu_about.png
deleted file mode 100644
index 9b98288e..00000000
Binary files a/needles/gnome/apps/maps/maps_menu_about.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_menu_export.json b/needles/gnome/apps/maps/maps_menu_export.json
deleted file mode 100644
index b13d77b5..00000000
--- a/needles/gnome/apps/maps/maps_menu_export.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 798,
-      "ypos": 129,
-      "width": 116,
-      "height": 25,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_menu_export"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_menu_export.png b/needles/gnome/apps/maps/maps_menu_export.png
deleted file mode 100644
index 035379f0..00000000
Binary files a/needles/gnome/apps/maps/maps_menu_export.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_menu_shortcuts.json b/needles/gnome/apps/maps/maps_menu_shortcuts.json
deleted file mode 100644
index 1580ba65..00000000
--- a/needles/gnome/apps/maps/maps_menu_shortcuts.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 799,
-      "ypos": 173,
-      "width": 132,
-      "height": 23,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_menu_shortcuts"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_menu_shortcuts.png b/needles/gnome/apps/maps/maps_menu_shortcuts.png
deleted file mode 100644
index 0865f30b..00000000
Binary files a/needles/gnome/apps/maps/maps_menu_shortcuts.png and /dev/null differ
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220722.json b/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220722.json
deleted file mode 100644
index 23c8959b..00000000
--- a/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220722.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 827,
-      "width": 91,
-      "type": "match",
-      "ypos": 98,
-      "height": 21
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "nautilus_menu_new_instance"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220722.png b/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220722.png
deleted file mode 100644
index b145ad88..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220722.png and /dev/null differ
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220818.json b/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220818.json
deleted file mode 100644
index 55e106dd..00000000
--- a/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 98,
-      "height": 21,
-      "width": 91,
-      "type": "match",
-      "xpos": 829
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "nautilus_menu_new_instance"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220818.png b/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220818.png
deleted file mode 100644
index be4e77b1..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_menu_new_instance-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_new_instance.json b/needles/gnome/apps/nautilus/nautilus_menu_new_instance.json
deleted file mode 100644
index 7d5f3fc3..00000000
--- a/needles/gnome/apps/nautilus/nautilus_menu_new_instance.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 857,
-      "ypos": 108,
-      "width": 22,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "nautilus_menu_new_instance"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_new_instance.png b/needles/gnome/apps/nautilus/nautilus_menu_new_instance.png
deleted file mode 100644
index bd172abe..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_menu_new_instance.png and /dev/null differ
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220722.json b/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220722.json
deleted file mode 100644
index ca535ecf..00000000
--- a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220722.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 130,
-      "xpos": 828,
-      "type": "match",
-      "height": 22,
-      "ypos": 407
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "nautilus_menu_shortcuts"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220722.png b/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220722.png
deleted file mode 100644
index 68b56490..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220722.png and /dev/null differ
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220818.json b/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220818.json
deleted file mode 100644
index 08be8baf..00000000
--- a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 22,
-      "ypos": 375,
-      "type": "match",
-      "xpos": 830,
-      "width": 130
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "nautilus_menu_shortcuts"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220818.png b/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220818.png
deleted file mode 100644
index 357fd616..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts.json b/needles/gnome/apps/nautilus/nautilus_menu_shortcuts.json
deleted file mode 100644
index f9323f52..00000000
--- a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "nautilus_menu_shortcuts"
-  ],
-  "area": [
-    {
-      "xpos": 847,
-      "ypos": 294,
-      "width": 130,
-      "height": 22,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts.png b/needles/gnome/apps/nautilus/nautilus_menu_shortcuts.png
deleted file mode 100644
index c0489f82..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_menu_shortcuts.png and /dev/null differ
diff --git a/needles/gnome/apps/sysmon/sysmon_menu_about.json b/needles/gnome/apps/sysmon/sysmon_menu_about.json
deleted file mode 100644
index ce59f529..00000000
--- a/needles/gnome/apps/sysmon/sysmon_menu_about.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "sysmon_menu_about"
-  ],
-  "area": [
-    {
-      "xpos": 833,
-      "ypos": 369,
-      "width": 150,
-      "height": 20,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/sysmon/sysmon_menu_about.png b/needles/gnome/apps/sysmon/sysmon_menu_about.png
deleted file mode 100644
index 40640258..00000000
Binary files a/needles/gnome/apps/sysmon/sysmon_menu_about.png and /dev/null differ
diff --git a/needles/gnome/apps/sysmon/sysmon_menu_help.json b/needles/gnome/apps/sysmon/sysmon_menu_help.json
deleted file mode 100644
index 6b6de91e..00000000
--- a/needles/gnome/apps/sysmon/sysmon_menu_help.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 830,
-      "ypos": 311,
-      "width": 47,
-      "height": 30,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "sysmon_menu_help"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/sysmon/sysmon_menu_help.png b/needles/gnome/apps/sysmon/sysmon_menu_help.png
deleted file mode 100644
index 261609a7..00000000
Binary files a/needles/gnome/apps/sysmon/sysmon_menu_help.png and /dev/null differ
diff --git a/needles/gnome/apps/sysmon/sysmon_menu_preferences.json b/needles/gnome/apps/sysmon/sysmon_menu_preferences.json
deleted file mode 100644
index 1b11e1b1..00000000
--- a/needles/gnome/apps/sysmon/sysmon_menu_preferences.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 830,
-      "ypos": 289,
-      "width": 89,
-      "height": 24,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "sysmon_menu_preferences"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/sysmon/sysmon_menu_preferences.png b/needles/gnome/apps/sysmon/sysmon_menu_preferences.png
deleted file mode 100644
index c95db835..00000000
Binary files a/needles/gnome/apps/sysmon/sysmon_menu_preferences.png and /dev/null differ
diff --git a/needles/gnome/apps/sysmon/sysmon_menu_shortcuts.json b/needles/gnome/apps/sysmon/sysmon_menu_shortcuts.json
deleted file mode 100644
index ad477920..00000000
--- a/needles/gnome/apps/sysmon/sysmon_menu_shortcuts.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "sysmon_menu_shortcuts"
-  ],
-  "area": [
-    {
-      "xpos": 835,
-      "ypos": 341,
-      "width": 132,
-      "height": 23,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/sysmon/sysmon_menu_shortcuts.png b/needles/gnome/apps/sysmon/sysmon_menu_shortcuts.png
deleted file mode 100644
index ced9bc94..00000000
Binary files a/needles/gnome/apps/sysmon/sysmon_menu_shortcuts.png and /dev/null differ
diff --git a/needles/gnome/apps/weather/weather_menu_about-20220818.json b/needles/gnome/apps/weather/weather_menu_about-20220818.json
deleted file mode 100644
index e7a5c339..00000000
--- a/needles/gnome/apps/weather/weather_menu_about-20220818.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 200,
-      "height": 21,
-      "width": 104,
-      "type": "match",
-      "xpos": 863
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "weather_menu_about"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/weather/weather_menu_about-20220818.png b/needles/gnome/apps/weather/weather_menu_about-20220818.png
deleted file mode 100644
index 3aeb0306..00000000
Binary files a/needles/gnome/apps/weather/weather_menu_about-20220818.png and /dev/null differ
diff --git a/needles/gnome/apps/weather/weather_menu_about.json b/needles/gnome/apps/weather/weather_menu_about.json
deleted file mode 100644
index 373bac9d..00000000
--- a/needles/gnome/apps/weather/weather_menu_about.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 847,
-      "ypos": 141,
-      "width": 104,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "weather_menu_about"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/weather/weather_menu_about.png b/needles/gnome/apps/weather/weather_menu_about.png
deleted file mode 100644
index 6433418f..00000000
Binary files a/needles/gnome/apps/weather/weather_menu_about.png and /dev/null differ
diff --git a/needles/gnome/apps_menu_button-20210316.json b/needles/gnome/buttons/apps_menu_button-20210316.json
similarity index 100%
rename from needles/gnome/apps_menu_button-20210316.json
rename to needles/gnome/buttons/apps_menu_button-20210316.json
diff --git a/needles/gnome/apps_menu_button-20210316.png b/needles/gnome/buttons/apps_menu_button-20210316.png
similarity index 100%
rename from needles/gnome/apps_menu_button-20210316.png
rename to needles/gnome/buttons/apps_menu_button-20210316.png
diff --git a/needles/gnome/apps_menu_button-20211109.json b/needles/gnome/buttons/apps_menu_button-20211109.json
similarity index 100%
rename from needles/gnome/apps_menu_button-20211109.json
rename to needles/gnome/buttons/apps_menu_button-20211109.json
diff --git a/needles/gnome/apps_menu_button-20211109.png b/needles/gnome/buttons/apps_menu_button-20211109.png
similarity index 100%
rename from needles/gnome/apps_menu_button-20211109.png
rename to needles/gnome/buttons/apps_menu_button-20211109.png
diff --git a/needles/gnome/apps_menu_button-20220218.json b/needles/gnome/buttons/apps_menu_button-20220218.json
similarity index 100%
rename from needles/gnome/apps_menu_button-20220218.json
rename to needles/gnome/buttons/apps_menu_button-20220218.json
diff --git a/needles/gnome/apps_menu_button-20220218.png b/needles/gnome/buttons/apps_menu_button-20220218.png
similarity index 100%
rename from needles/gnome/apps_menu_button-20220218.png
rename to needles/gnome/buttons/apps_menu_button-20220218.png
diff --git a/needles/gnome/apps_menu_button-f33-20210715.json b/needles/gnome/buttons/apps_menu_button-f33-20210715.json
similarity index 100%
rename from needles/gnome/apps_menu_button-f33-20210715.json
rename to needles/gnome/buttons/apps_menu_button-f33-20210715.json
diff --git a/needles/gnome/apps_menu_button-f33-20210715.png b/needles/gnome/buttons/apps_menu_button-f33-20210715.png
similarity index 100%
rename from needles/gnome/apps_menu_button-f33-20210715.png
rename to needles/gnome/buttons/apps_menu_button-f33-20210715.png
diff --git a/needles/gnome/apps_menu_button_active-20210316.json b/needles/gnome/buttons/apps_menu_button_active-20210316.json
similarity index 100%
rename from needles/gnome/apps_menu_button_active-20210316.json
rename to needles/gnome/buttons/apps_menu_button_active-20210316.json
diff --git a/needles/gnome/apps_menu_button_active-20210316.png b/needles/gnome/buttons/apps_menu_button_active-20210316.png
similarity index 100%
rename from needles/gnome/apps_menu_button_active-20210316.png
rename to needles/gnome/buttons/apps_menu_button_active-20210316.png
diff --git a/needles/gnome/apps_menu_button_active-20211109.json b/needles/gnome/buttons/apps_menu_button_active-20211109.json
similarity index 100%
rename from needles/gnome/apps_menu_button_active-20211109.json
rename to needles/gnome/buttons/apps_menu_button_active-20211109.json
diff --git a/needles/gnome/apps_menu_button_active-20211109.png b/needles/gnome/buttons/apps_menu_button_active-20211109.png
similarity index 100%
rename from needles/gnome/apps_menu_button_active-20211109.png
rename to needles/gnome/buttons/apps_menu_button_active-20211109.png
diff --git a/needles/gnome/apps_menu_button_active-20220218.json b/needles/gnome/buttons/apps_menu_button_active-20220218.json
similarity index 100%
rename from needles/gnome/apps_menu_button_active-20220218.json
rename to needles/gnome/buttons/apps_menu_button_active-20220218.json
diff --git a/needles/gnome/apps_menu_button_active-20220218.png b/needles/gnome/buttons/apps_menu_button_active-20220218.png
similarity index 100%
rename from needles/gnome/apps_menu_button_active-20220218.png
rename to needles/gnome/buttons/apps_menu_button_active-20220218.png
diff --git a/needles/gnome/gnome_add_button-20220818.json b/needles/gnome/buttons/gnome_add_button-20220818.json
similarity index 100%
rename from needles/gnome/gnome_add_button-20220818.json
rename to needles/gnome/buttons/gnome_add_button-20220818.json
diff --git a/needles/gnome/gnome_add_button-20220818.png b/needles/gnome/buttons/gnome_add_button-20220818.png
similarity index 100%
rename from needles/gnome/gnome_add_button-20220818.png
rename to needles/gnome/buttons/gnome_add_button-20220818.png
diff --git a/needles/gnome/gnome_add_button.json b/needles/gnome/buttons/gnome_add_button.json
similarity index 100%
rename from needles/gnome/gnome_add_button.json
rename to needles/gnome/buttons/gnome_add_button.json
diff --git a/needles/gnome/gnome_add_button.png b/needles/gnome/buttons/gnome_add_button.png
similarity index 100%
rename from needles/gnome/gnome_add_button.png
rename to needles/gnome/buttons/gnome_add_button.png
diff --git a/needles/gnome/gnome_add_button_blue-20220818.json b/needles/gnome/buttons/gnome_add_button_blue-20220818.json
similarity index 100%
rename from needles/gnome/gnome_add_button_blue-20220818.json
rename to needles/gnome/buttons/gnome_add_button_blue-20220818.json
diff --git a/needles/gnome/gnome_add_button_blue-20220818.png b/needles/gnome/buttons/gnome_add_button_blue-20220818.png
similarity index 100%
rename from needles/gnome/gnome_add_button_blue-20220818.png
rename to needles/gnome/buttons/gnome_add_button_blue-20220818.png
diff --git a/needles/gnome/gnome_add_button_blue.json b/needles/gnome/buttons/gnome_add_button_blue.json
similarity index 100%
rename from needles/gnome/gnome_add_button_blue.json
rename to needles/gnome/buttons/gnome_add_button_blue.json
diff --git a/needles/gnome/gnome_add_button_blue.png b/needles/gnome/buttons/gnome_add_button_blue.png
similarity index 100%
rename from needles/gnome/gnome_add_button_blue.png
rename to needles/gnome/buttons/gnome_add_button_blue.png
diff --git a/needles/gnome/gnome_add_button_plus.json b/needles/gnome/buttons/gnome_add_button_plus.json
similarity index 100%
rename from needles/gnome/gnome_add_button_plus.json
rename to needles/gnome/buttons/gnome_add_button_plus.json
diff --git a/needles/gnome/gnome_add_button_plus.png b/needles/gnome/buttons/gnome_add_button_plus.png
similarity index 100%
rename from needles/gnome/gnome_add_button_plus.png
rename to needles/gnome/buttons/gnome_add_button_plus.png
diff --git a/needles/gnome/buttons/gnome_button_clear-20221125.json b/needles/gnome/buttons/gnome_button_clear-20221125.json
new file mode 100644
index 00000000..d474577e
--- /dev/null
+++ b/needles/gnome/buttons/gnome_button_clear-20221125.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 600,
+      "width": 50,
+      "ypos": 445,
+      "height": 25
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_clear"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_clear-20221125.png b/needles/gnome/buttons/gnome_button_clear-20221125.png
new file mode 100644
index 00000000..6ea17824
Binary files /dev/null and b/needles/gnome/buttons/gnome_button_clear-20221125.png differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_clear.json b/needles/gnome/buttons/gnome_button_clear.json
similarity index 76%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_clear.json
rename to needles/gnome/buttons/gnome_button_clear.json
index 6ff6df79..05531bb5 100644
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_clear.json
+++ b/needles/gnome/buttons/gnome_button_clear.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 601,
-      "ypos": 448,
-      "width": 48,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_stopwatch_button_clear"
-  ]
+{
+  "area": [
+    {
+      "xpos": 601,
+      "ypos": 448,
+      "width": 48,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_clear"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_clear.png b/needles/gnome/buttons/gnome_button_clear.png
similarity index 100%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_clear.png
rename to needles/gnome/buttons/gnome_button_clear.png
diff --git a/needles/gnome/apps/archiver/archiver_button_create.json b/needles/gnome/buttons/gnome_button_create.json
similarity index 79%
rename from needles/gnome/apps/archiver/archiver_button_create.json
rename to needles/gnome/buttons/gnome_button_create.json
index 237bfe2b..0e52674e 100644
--- a/needles/gnome/apps/archiver/archiver_button_create.json
+++ b/needles/gnome/buttons/gnome_button_create.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 693,
-      "ypos": 308,
-      "width": 48,
-      "height": 19,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "archiver_button_create"
-  ]
+{
+  "area": [
+    {
+      "xpos": 693,
+      "ypos": 308,
+      "width": 48,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_create"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/archiver/archiver_button_create.png b/needles/gnome/buttons/gnome_button_create.png
similarity index 100%
rename from needles/gnome/apps/archiver/archiver_button_create.png
rename to needles/gnome/buttons/gnome_button_create.png
diff --git a/needles/gnome/gnome_button_credits-bold-20220818.json b/needles/gnome/buttons/gnome_button_credits-bold-20220818.json
similarity index 100%
rename from needles/gnome/gnome_button_credits-bold-20220818.json
rename to needles/gnome/buttons/gnome_button_credits-bold-20220818.json
diff --git a/needles/gnome/gnome_button_credits-bold-20220818.png b/needles/gnome/buttons/gnome_button_credits-bold-20220818.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-bold-20220818.png
rename to needles/gnome/buttons/gnome_button_credits-bold-20220818.png
diff --git a/needles/gnome/gnome_button_credits-bold.json b/needles/gnome/buttons/gnome_button_credits-bold.json
similarity index 100%
rename from needles/gnome/gnome_button_credits-bold.json
rename to needles/gnome/buttons/gnome_button_credits-bold.json
diff --git a/needles/gnome/gnome_button_credits-bold.png b/needles/gnome/buttons/gnome_button_credits-bold.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-bold.png
rename to needles/gnome/buttons/gnome_button_credits-bold.png
diff --git a/needles/gnome/gnome_button_credits-eog-dark.json b/needles/gnome/buttons/gnome_button_credits-eog-dark.json
similarity index 100%
rename from needles/gnome/gnome_button_credits-eog-dark.json
rename to needles/gnome/buttons/gnome_button_credits-eog-dark.json
diff --git a/needles/gnome/gnome_button_credits-eog-dark.png b/needles/gnome/buttons/gnome_button_credits-eog-dark.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-eog-dark.png
rename to needles/gnome/buttons/gnome_button_credits-eog-dark.png
diff --git a/needles/gnome/gnome_button_credits-libadwaita-20220722.json b/needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.json
similarity index 100%
rename from needles/gnome/gnome_button_credits-libadwaita-20220722.json
rename to needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.json
diff --git a/needles/gnome/gnome_button_credits-libadwaita-20220722.png b/needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-libadwaita-20220722.png
rename to needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.png
diff --git a/needles/gnome/gnome_button_credits-libadwaita-20220818.json b/needles/gnome/buttons/gnome_button_credits-libadwaita-20220818.json
similarity index 100%
rename from needles/gnome/gnome_button_credits-libadwaita-20220818.json
rename to needles/gnome/buttons/gnome_button_credits-libadwaita-20220818.json
diff --git a/needles/gnome/gnome_button_credits-libadwaita-20220818.png b/needles/gnome/buttons/gnome_button_credits-libadwaita-20220818.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-libadwaita-20220818.png
rename to needles/gnome/buttons/gnome_button_credits-libadwaita-20220818.png
diff --git a/needles/gnome/gnome_button_credits-regular.json b/needles/gnome/buttons/gnome_button_credits-regular.json
similarity index 100%
rename from needles/gnome/gnome_button_credits-regular.json
rename to needles/gnome/buttons/gnome_button_credits-regular.json
diff --git a/needles/gnome/gnome_button_credits-regular.png b/needles/gnome/buttons/gnome_button_credits-regular.png
similarity index 100%
rename from needles/gnome/gnome_button_credits-regular.png
rename to needles/gnome/buttons/gnome_button_credits-regular.png
diff --git a/needles/gnome/gnome_button_cross_remove-20220627.json b/needles/gnome/buttons/gnome_button_cross_remove-20220627.json
similarity index 100%
rename from needles/gnome/gnome_button_cross_remove-20220627.json
rename to needles/gnome/buttons/gnome_button_cross_remove-20220627.json
diff --git a/needles/gnome/gnome_button_cross_remove-20220627.png b/needles/gnome/buttons/gnome_button_cross_remove-20220627.png
similarity index 100%
rename from needles/gnome/gnome_button_cross_remove-20220627.png
rename to needles/gnome/buttons/gnome_button_cross_remove-20220627.png
diff --git a/needles/gnome/gnome_button_cross_remove-20220811.json b/needles/gnome/buttons/gnome_button_cross_remove-20220811.json
similarity index 100%
rename from needles/gnome/gnome_button_cross_remove-20220811.json
rename to needles/gnome/buttons/gnome_button_cross_remove-20220811.json
diff --git a/needles/gnome/gnome_button_cross_remove-20220811.png b/needles/gnome/buttons/gnome_button_cross_remove-20220811.png
similarity index 100%
rename from needles/gnome/gnome_button_cross_remove-20220811.png
rename to needles/gnome/buttons/gnome_button_cross_remove-20220811.png
diff --git a/needles/gnome/gnome_button_cross_remove.json b/needles/gnome/buttons/gnome_button_cross_remove.json
similarity index 100%
rename from needles/gnome/gnome_button_cross_remove.json
rename to needles/gnome/buttons/gnome_button_cross_remove.json
diff --git a/needles/gnome/gnome_button_cross_remove.png b/needles/gnome/buttons/gnome_button_cross_remove.png
similarity index 100%
rename from needles/gnome/gnome_button_cross_remove.png
rename to needles/gnome/buttons/gnome_button_cross_remove.png
diff --git a/needles/gnome/gnome_button_delete-20220811.json b/needles/gnome/buttons/gnome_button_delete-20220811.json
similarity index 100%
rename from needles/gnome/gnome_button_delete-20220811.json
rename to needles/gnome/buttons/gnome_button_delete-20220811.json
diff --git a/needles/gnome/gnome_button_delete-20220811.png b/needles/gnome/buttons/gnome_button_delete-20220811.png
similarity index 100%
rename from needles/gnome/gnome_button_delete-20220811.png
rename to needles/gnome/buttons/gnome_button_delete-20220811.png
diff --git a/needles/gnome/gnome_button_delete.json b/needles/gnome/buttons/gnome_button_delete.json
similarity index 100%
rename from needles/gnome/gnome_button_delete.json
rename to needles/gnome/buttons/gnome_button_delete.json
diff --git a/needles/gnome/gnome_button_delete.png b/needles/gnome/buttons/gnome_button_delete.png
similarity index 100%
rename from needles/gnome/gnome_button_delete.png
rename to needles/gnome/buttons/gnome_button_delete.png
diff --git a/needles/gnome/gnome_button_done_blue-20220923.json b/needles/gnome/buttons/gnome_button_done_blue-20220923.json
similarity index 100%
rename from needles/gnome/gnome_button_done_blue-20220923.json
rename to needles/gnome/buttons/gnome_button_done_blue-20220923.json
diff --git a/needles/gnome/gnome_button_done_blue-20220923.png b/needles/gnome/buttons/gnome_button_done_blue-20220923.png
similarity index 100%
rename from needles/gnome/gnome_button_done_blue-20220923.png
rename to needles/gnome/buttons/gnome_button_done_blue-20220923.png
diff --git a/needles/gnome/gnome_button_done_blue.json b/needles/gnome/buttons/gnome_button_done_blue.json
similarity index 100%
rename from needles/gnome/gnome_button_done_blue.json
rename to needles/gnome/buttons/gnome_button_done_blue.json
diff --git a/needles/gnome/gnome_button_done_blue.png b/needles/gnome/buttons/gnome_button_done_blue.png
similarity index 100%
rename from needles/gnome/gnome_button_done_blue.png
rename to needles/gnome/buttons/gnome_button_done_blue.png
diff --git a/needles/gnome/gnome_button_edit.json b/needles/gnome/buttons/gnome_button_edit.json
similarity index 100%
rename from needles/gnome/gnome_button_edit.json
rename to needles/gnome/buttons/gnome_button_edit.json
diff --git a/needles/gnome/gnome_button_edit.png b/needles/gnome/buttons/gnome_button_edit.png
similarity index 100%
rename from needles/gnome/gnome_button_edit.png
rename to needles/gnome/buttons/gnome_button_edit.png
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_lap-20220818.json b/needles/gnome/buttons/gnome_button_lap-20221125.json
similarity index 60%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_lap-20220818.json
rename to needles/gnome/buttons/gnome_button_lap-20221125.json
index bc987041..2124b64c 100644
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_lap-20220818.json
+++ b/needles/gnome/buttons/gnome_button_lap-20221125.json
@@ -1,15 +1,15 @@
 {
   "area": [
     {
-      "ypos": 444,
       "height": 24,
       "type": "match",
-      "xpos": 603,
-      "width": 38
+      "ypos": 444,
+      "width": 38,
+      "xpos": 603
     }
   ],
   "properties": [],
   "tags": [
-    "clocks_stopwatch_button_lap"
+    "gnome_button_lap"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_lap-20221125.png b/needles/gnome/buttons/gnome_button_lap-20221125.png
new file mode 100644
index 00000000..beae101e
Binary files /dev/null and b/needles/gnome/buttons/gnome_button_lap-20221125.png differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_lap.json b/needles/gnome/buttons/gnome_button_lap.json
similarity index 77%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_lap.json
rename to needles/gnome/buttons/gnome_button_lap.json
index da91817f..df9db007 100644
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_lap.json
+++ b/needles/gnome/buttons/gnome_button_lap.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 603,
-      "ypos": 444,
-      "width": 38,
-      "height": 24,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_stopwatch_button_lap"
-  ]
+{
+  "area": [
+    {
+      "xpos": 603,
+      "ypos": 444,
+      "width": 38,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_lap"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_lap.png b/needles/gnome/buttons/gnome_button_lap.png
similarity index 100%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_lap.png
rename to needles/gnome/buttons/gnome_button_lap.png
diff --git a/needles/gnome/gnome_button_open-boldblue-20220316.json b/needles/gnome/buttons/gnome_button_open-boldblue-20220316.json
similarity index 100%
rename from needles/gnome/gnome_button_open-boldblue-20220316.json
rename to needles/gnome/buttons/gnome_button_open-boldblue-20220316.json
diff --git a/needles/gnome/gnome_button_open-boldblue-20220316.png b/needles/gnome/buttons/gnome_button_open-boldblue-20220316.png
similarity index 100%
rename from needles/gnome/gnome_button_open-boldblue-20220316.png
rename to needles/gnome/buttons/gnome_button_open-boldblue-20220316.png
diff --git a/needles/gnome/gnome_button_open-boldblue-20220818.json b/needles/gnome/buttons/gnome_button_open-boldblue-20220818.json
similarity index 100%
rename from needles/gnome/gnome_button_open-boldblue-20220818.json
rename to needles/gnome/buttons/gnome_button_open-boldblue-20220818.json
diff --git a/needles/gnome/gnome_button_open-boldblue-20220818.png b/needles/gnome/buttons/gnome_button_open-boldblue-20220818.png
similarity index 100%
rename from needles/gnome/gnome_button_open-boldblue-20220818.png
rename to needles/gnome/buttons/gnome_button_open-boldblue-20220818.png
diff --git a/needles/gnome/gnome_button_open.json b/needles/gnome/buttons/gnome_button_open.json
similarity index 100%
rename from needles/gnome/gnome_button_open.json
rename to needles/gnome/buttons/gnome_button_open.json
diff --git a/needles/gnome/gnome_button_open.png b/needles/gnome/buttons/gnome_button_open.png
similarity index 100%
rename from needles/gnome/gnome_button_open.png
rename to needles/gnome/buttons/gnome_button_open.png
diff --git a/needles/gnome/gnome_button_open_blue.json b/needles/gnome/buttons/gnome_button_open_blue.json
similarity index 100%
rename from needles/gnome/gnome_button_open_blue.json
rename to needles/gnome/buttons/gnome_button_open_blue.json
diff --git a/needles/gnome/gnome_button_open_blue.png b/needles/gnome/buttons/gnome_button_open_blue.png
similarity index 100%
rename from needles/gnome/gnome_button_open_blue.png
rename to needles/gnome/buttons/gnome_button_open_blue.png
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_pause-20220818.json b/needles/gnome/buttons/gnome_button_pause-20221125.json
similarity index 59%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_pause-20220818.json
rename to needles/gnome/buttons/gnome_button_pause-20221125.json
index 59d7adf4..b1f81d5f 100644
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_pause-20220818.json
+++ b/needles/gnome/buttons/gnome_button_pause-20221125.json
@@ -1,15 +1,15 @@
 {
   "area": [
     {
-      "ypos": 448,
-      "height": 20,
       "type": "match",
       "xpos": 372,
-      "width": 55
+      "ypos": 448,
+      "width": 55,
+      "height": 20
     }
   ],
   "properties": [],
   "tags": [
-    "clocks_stopwatch_button_pause"
+    "gnome_button_pause"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_pause-20221125.png b/needles/gnome/buttons/gnome_button_pause-20221125.png
new file mode 100644
index 00000000..7e0f1023
Binary files /dev/null and b/needles/gnome/buttons/gnome_button_pause-20221125.png differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_pause.json b/needles/gnome/buttons/gnome_button_pause.json
similarity index 76%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_pause.json
rename to needles/gnome/buttons/gnome_button_pause.json
index a1d2bfc4..120bf858 100644
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_pause.json
+++ b/needles/gnome/buttons/gnome_button_pause.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 372,
-      "ypos": 447,
-      "width": 55,
-      "height": 20,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_stopwatch_button_pause"
-  ]
+{
+  "area": [
+    {
+      "xpos": 372,
+      "ypos": 447,
+      "width": 55,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_pause"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_pause.png b/needles/gnome/buttons/gnome_button_pause.png
similarity index 100%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_pause.png
rename to needles/gnome/buttons/gnome_button_pause.png
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_resume-20220818.json b/needles/gnome/buttons/gnome_button_resume-20221125.json
similarity index 59%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_resume-20220818.json
rename to needles/gnome/buttons/gnome_button_resume-20221125.json
index 5784c6dc..965f4ccb 100644
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_resume-20220818.json
+++ b/needles/gnome/buttons/gnome_button_resume-20221125.json
@@ -1,15 +1,15 @@
 {
   "area": [
     {
-      "height": 25,
-      "ypos": 445,
-      "xpos": 365,
       "type": "match",
-      "width": 69
+      "xpos": 365,
+      "width": 69,
+      "ypos": 445,
+      "height": 25
     }
   ],
   "properties": [],
   "tags": [
-    "clocks_stopwatch_button_resume"
+    "gnome_button_resume"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_resume-20221125.png b/needles/gnome/buttons/gnome_button_resume-20221125.png
new file mode 100644
index 00000000..6ea17824
Binary files /dev/null and b/needles/gnome/buttons/gnome_button_resume-20221125.png differ
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_resume.json b/needles/gnome/buttons/gnome_button_resume.json
similarity index 76%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_resume.json
rename to needles/gnome/buttons/gnome_button_resume.json
index 1d8d7d45..7450b9ec 100644
--- a/needles/gnome/apps/clocks/clocks_stopwatch_button_resume.json
+++ b/needles/gnome/buttons/gnome_button_resume.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 365,
-      "ypos": 444,
-      "width": 69,
-      "height": 25,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_stopwatch_button_resume"
-  ]
+{
+  "area": [
+    {
+      "xpos": 365,
+      "ypos": 444,
+      "width": 69,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_resume"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_resume.png b/needles/gnome/buttons/gnome_button_resume.png
similarity index 100%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_resume.png
rename to needles/gnome/buttons/gnome_button_resume.png
diff --git a/needles/gnome/gnome_button_save-boldblue-20220316.json b/needles/gnome/buttons/gnome_button_save-boldblue-20220316.json
similarity index 100%
rename from needles/gnome/gnome_button_save-boldblue-20220316.json
rename to needles/gnome/buttons/gnome_button_save-boldblue-20220316.json
diff --git a/needles/gnome/gnome_button_save-boldblue-20220316.png b/needles/gnome/buttons/gnome_button_save-boldblue-20220316.png
similarity index 100%
rename from needles/gnome/gnome_button_save-boldblue-20220316.png
rename to needles/gnome/buttons/gnome_button_save-boldblue-20220316.png
diff --git a/needles/gnome/gnome_button_save-boldblue-20220818.json b/needles/gnome/buttons/gnome_button_save-boldblue-20220818.json
similarity index 100%
rename from needles/gnome/gnome_button_save-boldblue-20220818.json
rename to needles/gnome/buttons/gnome_button_save-boldblue-20220818.json
diff --git a/needles/gnome/gnome_button_save-boldblue-20220818.png b/needles/gnome/buttons/gnome_button_save-boldblue-20220818.png
similarity index 100%
rename from needles/gnome/gnome_button_save-boldblue-20220818.png
rename to needles/gnome/buttons/gnome_button_save-boldblue-20220818.png
diff --git a/needles/gnome/gnome_button_save_blue.json b/needles/gnome/buttons/gnome_button_save_blue.json
similarity index 100%
rename from needles/gnome/gnome_button_save_blue.json
rename to needles/gnome/buttons/gnome_button_save_blue.json
diff --git a/needles/gnome/gnome_button_save_blue.png b/needles/gnome/buttons/gnome_button_save_blue.png
similarity index 100%
rename from needles/gnome/gnome_button_save_blue.png
rename to needles/gnome/buttons/gnome_button_save_blue.png
diff --git a/needles/gnome/apps/evince/evince_menu_about.json b/needles/gnome/buttons/gnome_button_snooze.json
similarity index 53%
rename from needles/gnome/apps/evince/evince_menu_about.json
rename to needles/gnome/buttons/gnome_button_snooze.json
index bcb4a473..6ff32c63 100644
--- a/needles/gnome/apps/evince/evince_menu_about.json
+++ b/needles/gnome/buttons/gnome_button_snooze.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 783,
-      "ypos": 596,
-      "width": 163,
-      "height": 23,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "evince_menu_about"
-  ]
+{
+  "area": [
+    {
+      "xpos": 483,
+      "ypos": 627,
+      "width": 59,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_snooze"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_snooze.png b/needles/gnome/buttons/gnome_button_snooze.png
new file mode 100644
index 00000000..6776ad4e
Binary files /dev/null and b/needles/gnome/buttons/gnome_button_snooze.png differ
diff --git a/needles/gnome/apps/contacts/contacts_menu_about-20220923.json b/needles/gnome/buttons/gnome_button_start-20221125.json
similarity index 53%
rename from needles/gnome/apps/contacts/contacts_menu_about-20220923.json
rename to needles/gnome/buttons/gnome_button_start-20221125.json
index 98096eec..38914eee 100644
--- a/needles/gnome/apps/contacts/contacts_menu_about-20220923.json
+++ b/needles/gnome/buttons/gnome_button_start-20221125.json
@@ -1,15 +1,15 @@
 {
   "area": [
     {
-      "xpos": 210,
-      "type": "match",
       "height": 22,
-      "ypos": 342,
-      "width": 109
+      "type": "match",
+      "xpos": 379,
+      "width": 41,
+      "ypos": 447
     }
   ],
   "properties": [],
   "tags": [
-    "contacts_menu_about"
+    "gnome_button_start"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_start-20221125.png b/needles/gnome/buttons/gnome_button_start-20221125.png
new file mode 100644
index 00000000..f6792e72
Binary files /dev/null and b/needles/gnome/buttons/gnome_button_start-20221125.png differ
diff --git a/needles/gnome/apps/contacts/contacts_menu_about.json b/needles/gnome/buttons/gnome_button_start.json
similarity index 56%
rename from needles/gnome/apps/contacts/contacts_menu_about.json
rename to needles/gnome/buttons/gnome_button_start.json
index 5d009d16..2d8205ea 100644
--- a/needles/gnome/apps/contacts/contacts_menu_about.json
+++ b/needles/gnome/buttons/gnome_button_start.json
@@ -1,15 +1,15 @@
 {
-  "properties": [],
-  "tags": [
-    "contacts_menu_about"
-  ],
   "area": [
     {
-      "xpos": 194,
-      "ypos": 341,
-      "width": 109,
+      "xpos": 381,
+      "ypos": 446,
+      "width": 41,
       "height": 22,
       "type": "match"
     }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_start"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_stopwatch_button_start.png b/needles/gnome/buttons/gnome_button_start.png
similarity index 100%
rename from needles/gnome/apps/clocks/clocks_stopwatch_button_start.png
rename to needles/gnome/buttons/gnome_button_start.png
diff --git a/needles/gnome/apps/contacts/contacts_menu_shortcuts.json b/needles/gnome/buttons/gnome_button_stop.json
similarity index 53%
rename from needles/gnome/apps/contacts/contacts_menu_shortcuts.json
rename to needles/gnome/buttons/gnome_button_stop.json
index e96f2bf4..0e6135fe 100644
--- a/needles/gnome/apps/contacts/contacts_menu_shortcuts.json
+++ b/needles/gnome/buttons/gnome_button_stop.json
@@ -1,15 +1,15 @@
-{
-  "properties": [],
-  "tags": [
-    "contacts_menu_shortcuts"
-  ],
-  "area": [
-    {
-      "xpos": 194,
-      "ypos": 278,
-      "width": 137,
-      "height": 22,
-      "type": "match"
-    }
-  ]
+{
+  "area": [
+    {
+      "xpos": 490,
+      "ypos": 568,
+      "width": 44,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_stop"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_stop.png b/needles/gnome/buttons/gnome_button_stop.png
new file mode 100644
index 00000000..6776ad4e
Binary files /dev/null and b/needles/gnome/buttons/gnome_button_stop.png differ
diff --git a/needles/gnome/gnome_button_toggle.json b/needles/gnome/buttons/gnome_button_toggle.json
similarity index 100%
rename from needles/gnome/gnome_button_toggle.json
rename to needles/gnome/buttons/gnome_button_toggle.json
diff --git a/needles/gnome/gnome_button_toggle.png b/needles/gnome/buttons/gnome_button_toggle.png
similarity index 100%
rename from needles/gnome/gnome_button_toggle.png
rename to needles/gnome/buttons/gnome_button_toggle.png
diff --git a/needles/gnome/apps/clocks/gnome_city_button_bratislava-20220818.json b/needles/gnome/buttons/gnome_city_button_bratislava-20220818.json
similarity index 100%
rename from needles/gnome/apps/clocks/gnome_city_button_bratislava-20220818.json
rename to needles/gnome/buttons/gnome_city_button_bratislava-20220818.json
diff --git a/needles/gnome/apps/clocks/gnome_city_button_bratislava-20220818.png b/needles/gnome/buttons/gnome_city_button_bratislava-20220818.png
similarity index 100%
rename from needles/gnome/apps/clocks/gnome_city_button_bratislava-20220818.png
rename to needles/gnome/buttons/gnome_city_button_bratislava-20220818.png
diff --git a/needles/gnome/apps/clocks/gnome_city_button_bratislava.json b/needles/gnome/buttons/gnome_city_button_bratislava.json
similarity index 100%
rename from needles/gnome/apps/clocks/gnome_city_button_bratislava.json
rename to needles/gnome/buttons/gnome_city_button_bratislava.json
diff --git a/needles/gnome/apps/clocks/gnome_city_button_bratislava.png b/needles/gnome/buttons/gnome_city_button_bratislava.png
similarity index 100%
rename from needles/gnome/apps/clocks/gnome_city_button_bratislava.png
rename to needles/gnome/buttons/gnome_city_button_bratislava.png
diff --git a/needles/gnome/apps/clocks/gnome_city_button_reykjavik-20220818.json b/needles/gnome/buttons/gnome_city_button_reykjavik-20220818.json
similarity index 100%
rename from needles/gnome/apps/clocks/gnome_city_button_reykjavik-20220818.json
rename to needles/gnome/buttons/gnome_city_button_reykjavik-20220818.json
diff --git a/needles/gnome/apps/clocks/gnome_city_button_reykjavik-20220818.png b/needles/gnome/buttons/gnome_city_button_reykjavik-20220818.png
similarity index 100%
rename from needles/gnome/apps/clocks/gnome_city_button_reykjavik-20220818.png
rename to needles/gnome/buttons/gnome_city_button_reykjavik-20220818.png
diff --git a/needles/gnome/apps/clocks/gnome_city_button_reykjavik.json b/needles/gnome/buttons/gnome_city_button_reykjavik.json
similarity index 100%
rename from needles/gnome/apps/clocks/gnome_city_button_reykjavik.json
rename to needles/gnome/buttons/gnome_city_button_reykjavik.json
diff --git a/needles/gnome/apps/clocks/gnome_city_button_reykjavik.png b/needles/gnome/buttons/gnome_city_button_reykjavik.png
similarity index 100%
rename from needles/gnome/apps/clocks/gnome_city_button_reykjavik.png
rename to needles/gnome/buttons/gnome_city_button_reykjavik.png
diff --git a/needles/gnome/apps/clocks/clocks_menu_shortcuts.json b/needles/gnome/buttons/gnome_menu_shortcuts.json
similarity index 61%
rename from needles/gnome/apps/clocks/clocks_menu_shortcuts.json
rename to needles/gnome/buttons/gnome_menu_shortcuts.json
index 4281726a..3a0aa231 100644
--- a/needles/gnome/apps/clocks/clocks_menu_shortcuts.json
+++ b/needles/gnome/buttons/gnome_menu_shortcuts.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 820,
-      "ypos": 97,
-      "width": 138,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_menu_shortcuts"
-  ]
+{
+  "area": [
+    {
+      "xpos": 825,
+      "ypos": 97,
+      "width": 133,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_shortcuts"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_menu_shortcuts.png b/needles/gnome/buttons/gnome_menu_shortcuts.png
similarity index 100%
rename from needles/gnome/apps/clocks/clocks_menu_shortcuts.png
rename to needles/gnome/buttons/gnome_menu_shortcuts.png
diff --git a/needles/gnome/apps/archiver/archiver_format_selector.json b/needles/gnome/buttons/gnome_pull_down_selector.json
similarity index 60%
rename from needles/gnome/apps/archiver/archiver_format_selector.json
rename to needles/gnome/buttons/gnome_pull_down_selector.json
index 99936ccc..db742074 100644
--- a/needles/gnome/apps/archiver/archiver_format_selector.json
+++ b/needles/gnome/buttons/gnome_pull_down_selector.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 657,
-      "ypos": 403,
-      "width": 46,
-      "height": 22,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "archiver_format_selector"
-  ]
+{
+  "area": [
+    {
+      "xpos": 672,
+      "ypos": 403,
+      "width": 33,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_pull_down_selector"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/archiver/archiver_format_selector.png b/needles/gnome/buttons/gnome_pull_down_selector.png
similarity index 100%
rename from needles/gnome/apps/archiver/archiver_format_selector.png
rename to needles/gnome/buttons/gnome_pull_down_selector.png
diff --git a/needles/gnome/gnome_select_button-20220722.json b/needles/gnome/buttons/gnome_select_button-20220722.json
similarity index 100%
rename from needles/gnome/gnome_select_button-20220722.json
rename to needles/gnome/buttons/gnome_select_button-20220722.json
diff --git a/needles/gnome/gnome_select_button-20220722.png b/needles/gnome/buttons/gnome_select_button-20220722.png
similarity index 100%
rename from needles/gnome/gnome_select_button-20220722.png
rename to needles/gnome/buttons/gnome_select_button-20220722.png
diff --git a/needles/gnome/gnome_select_button-20220818.json b/needles/gnome/buttons/gnome_select_button-20220818.json
similarity index 100%
rename from needles/gnome/gnome_select_button-20220818.json
rename to needles/gnome/buttons/gnome_select_button-20220818.json
diff --git a/needles/gnome/gnome_select_button-20220818.png b/needles/gnome/buttons/gnome_select_button-20220818.png
similarity index 100%
rename from needles/gnome/gnome_select_button-20220818.png
rename to needles/gnome/buttons/gnome_select_button-20220818.png
diff --git a/needles/gnome/gnome_select_button.json b/needles/gnome/buttons/gnome_select_button.json
similarity index 100%
rename from needles/gnome/gnome_select_button.json
rename to needles/gnome/buttons/gnome_select_button.json
diff --git a/needles/gnome/gnome_select_button.png b/needles/gnome/buttons/gnome_select_button.png
similarity index 100%
rename from needles/gnome/gnome_select_button.png
rename to needles/gnome/buttons/gnome_select_button.png
diff --git a/needles/gnome/lock_button-20220219.json b/needles/gnome/buttons/lock_button-20220219.json
similarity index 100%
rename from needles/gnome/lock_button-20220219.json
rename to needles/gnome/buttons/lock_button-20220219.json
diff --git a/needles/gnome/lock_button-20220219.png b/needles/gnome/buttons/lock_button-20220219.png
similarity index 100%
rename from needles/gnome/lock_button-20220219.png
rename to needles/gnome/buttons/lock_button-20220219.png
diff --git a/needles/gnome/lock_button-20220315.json b/needles/gnome/buttons/lock_button-20220315.json
similarity index 100%
rename from needles/gnome/lock_button-20220315.json
rename to needles/gnome/buttons/lock_button-20220315.json
diff --git a/needles/gnome/lock_button-20220315.png b/needles/gnome/buttons/lock_button-20220315.png
similarity index 100%
rename from needles/gnome/lock_button-20220315.png
rename to needles/gnome/buttons/lock_button-20220315.png
diff --git a/needles/gnome/lock_button-20220816.json b/needles/gnome/buttons/lock_button-20220816.json
similarity index 100%
rename from needles/gnome/lock_button-20220816.json
rename to needles/gnome/buttons/lock_button-20220816.json
diff --git a/needles/gnome/lock_button-20220816.png b/needles/gnome/buttons/lock_button-20220816.png
similarity index 100%
rename from needles/gnome/lock_button-20220816.png
rename to needles/gnome/buttons/lock_button-20220816.png
diff --git a/needles/gnome/lock_button.json b/needles/gnome/buttons/lock_button.json
similarity index 100%
rename from needles/gnome/lock_button.json
rename to needles/gnome/buttons/lock_button.json
diff --git a/needles/gnome/lock_button.png b/needles/gnome/buttons/lock_button.png
similarity index 100%
rename from needles/gnome/lock_button.png
rename to needles/gnome/buttons/lock_button.png
diff --git a/needles/gnome/next_button-20160823.json b/needles/gnome/buttons/next_button-20160823.json
similarity index 100%
rename from needles/gnome/next_button-20160823.json
rename to needles/gnome/buttons/next_button-20160823.json
diff --git a/needles/gnome/next_button-20160823.png b/needles/gnome/buttons/next_button-20160823.png
similarity index 100%
rename from needles/gnome/next_button-20160823.png
rename to needles/gnome/buttons/next_button-20160823.png
diff --git a/needles/gnome/next_button-20210714.json b/needles/gnome/buttons/next_button-20210714.json
similarity index 100%
rename from needles/gnome/next_button-20210714.json
rename to needles/gnome/buttons/next_button-20210714.json
diff --git a/needles/gnome/next_button-20210714.png b/needles/gnome/buttons/next_button-20210714.png
similarity index 100%
rename from needles/gnome/next_button-20210714.png
rename to needles/gnome/buttons/next_button-20210714.png
diff --git a/needles/gnome/next_button-bold-20220813.json b/needles/gnome/buttons/next_button-bold-20220813.json
similarity index 100%
rename from needles/gnome/next_button-bold-20220813.json
rename to needles/gnome/buttons/next_button-bold-20220813.json
diff --git a/needles/gnome/next_button-bold-20220813.png b/needles/gnome/buttons/next_button-bold-20220813.png
similarity index 100%
rename from needles/gnome/next_button-bold-20220813.png
rename to needles/gnome/buttons/next_button-bold-20220813.png
diff --git a/needles/gnome/next_button-bold-20220817.json b/needles/gnome/buttons/next_button-bold-20220817.json
similarity index 100%
rename from needles/gnome/next_button-bold-20220817.json
rename to needles/gnome/buttons/next_button-bold-20220817.json
diff --git a/needles/gnome/next_button-bold-20220817.png b/needles/gnome/buttons/next_button-bold-20220817.png
similarity index 100%
rename from needles/gnome/next_button-bold-20220817.png
rename to needles/gnome/buttons/next_button-bold-20220817.png
diff --git a/needles/gnome/next_button-startsetup-20200818.json b/needles/gnome/buttons/next_button-startsetup-20200818.json
similarity index 100%
rename from needles/gnome/next_button-startsetup-20200818.json
rename to needles/gnome/buttons/next_button-startsetup-20200818.json
diff --git a/needles/gnome/next_button-startsetup-20200818.png b/needles/gnome/buttons/next_button-startsetup-20200818.png
similarity index 100%
rename from needles/gnome/next_button-startsetup-20200818.png
rename to needles/gnome/buttons/next_button-startsetup-20200818.png
diff --git a/needles/gnome/next_button-startsetup-20220813.json b/needles/gnome/buttons/next_button-startsetup-20220813.json
similarity index 100%
rename from needles/gnome/next_button-startsetup-20220813.json
rename to needles/gnome/buttons/next_button-startsetup-20220813.json
diff --git a/needles/gnome/next_button-startsetup-20220813.png b/needles/gnome/buttons/next_button-startsetup-20220813.png
similarity index 100%
rename from needles/gnome/next_button-startsetup-20220813.png
rename to needles/gnome/buttons/next_button-startsetup-20220813.png
diff --git a/needles/gnome/next_button-startsetup-20220817.json b/needles/gnome/buttons/next_button-startsetup-20220817.json
similarity index 100%
rename from needles/gnome/next_button-startsetup-20220817.json
rename to needles/gnome/buttons/next_button-startsetup-20220817.json
diff --git a/needles/gnome/next_button-startsetup-20220817.png b/needles/gnome/buttons/next_button-startsetup-20220817.png
similarity index 100%
rename from needles/gnome/next_button-startsetup-20220817.png
rename to needles/gnome/buttons/next_button-startsetup-20220817.png
diff --git a/needles/gnome/skip_button-20200116.json b/needles/gnome/buttons/skip_button-20200116.json
similarity index 100%
rename from needles/gnome/skip_button-20200116.json
rename to needles/gnome/buttons/skip_button-20200116.json
diff --git a/needles/gnome/skip_button-20200116.png b/needles/gnome/buttons/skip_button-20200116.png
similarity index 100%
rename from needles/gnome/skip_button-20200116.png
rename to needles/gnome/buttons/skip_button-20200116.png
diff --git a/needles/gnome/skip_button-bold-20220813.json b/needles/gnome/buttons/skip_button-bold-20220813.json
similarity index 100%
rename from needles/gnome/skip_button-bold-20220813.json
rename to needles/gnome/buttons/skip_button-bold-20220813.json
diff --git a/needles/gnome/skip_button-bold-20220813.png b/needles/gnome/buttons/skip_button-bold-20220813.png
similarity index 100%
rename from needles/gnome/skip_button-bold-20220813.png
rename to needles/gnome/buttons/skip_button-bold-20220813.png
diff --git a/needles/gnome/skip_button-bold-20220817.json b/needles/gnome/buttons/skip_button-bold-20220817.json
similarity index 100%
rename from needles/gnome/skip_button-bold-20220817.json
rename to needles/gnome/buttons/skip_button-bold-20220817.json
diff --git a/needles/gnome/skip_button-bold-20220817.png b/needles/gnome/buttons/skip_button-bold-20220817.png
similarity index 100%
rename from needles/gnome/skip_button-bold-20220817.png
rename to needles/gnome/buttons/skip_button-bold-20220817.png
diff --git a/needles/gnome/system_menu_button-20210204.json b/needles/gnome/buttons/system_menu_button-20210204.json
similarity index 100%
rename from needles/gnome/system_menu_button-20210204.json
rename to needles/gnome/buttons/system_menu_button-20210204.json
diff --git a/needles/gnome/system_menu_button-20210204.png b/needles/gnome/buttons/system_menu_button-20210204.png
similarity index 100%
rename from needles/gnome/system_menu_button-20210204.png
rename to needles/gnome/buttons/system_menu_button-20210204.png
diff --git a/needles/gnome/system_menu_button-20210715.json b/needles/gnome/buttons/system_menu_button-20210715.json
similarity index 100%
rename from needles/gnome/system_menu_button-20210715.json
rename to needles/gnome/buttons/system_menu_button-20210715.json
diff --git a/needles/gnome/system_menu_button-20210715.png b/needles/gnome/buttons/system_menu_button-20210715.png
similarity index 100%
rename from needles/gnome/system_menu_button-20210715.png
rename to needles/gnome/buttons/system_menu_button-20210715.png
diff --git a/needles/gnome/system_menu_button-20220219.json b/needles/gnome/buttons/system_menu_button-20220219.json
similarity index 100%
rename from needles/gnome/system_menu_button-20220219.json
rename to needles/gnome/buttons/system_menu_button-20220219.json
diff --git a/needles/gnome/system_menu_button-20220219.png b/needles/gnome/buttons/system_menu_button-20220219.png
similarity index 100%
rename from needles/gnome/system_menu_button-20220219.png
rename to needles/gnome/buttons/system_menu_button-20220219.png
diff --git a/needles/gnome/apps/archiver/gnome_open_location_pictures-20220915.json b/needles/gnome/gnome_open_location_pictures-20220915.json
similarity index 100%
rename from needles/gnome/apps/archiver/gnome_open_location_pictures-20220915.json
rename to needles/gnome/gnome_open_location_pictures-20220915.json
diff --git a/needles/gnome/apps/archiver/gnome_open_location_pictures-20220915.png b/needles/gnome/gnome_open_location_pictures-20220915.png
similarity index 100%
rename from needles/gnome/apps/archiver/gnome_open_location_pictures-20220915.png
rename to needles/gnome/gnome_open_location_pictures-20220915.png
diff --git a/needles/gnome/apps/archiver/gnome_open_location_pictures-f36-20221101.json b/needles/gnome/gnome_open_location_pictures-f36-20221101.json
similarity index 100%
rename from needles/gnome/apps/archiver/gnome_open_location_pictures-f36-20221101.json
rename to needles/gnome/gnome_open_location_pictures-f36-20221101.json
diff --git a/needles/gnome/apps/archiver/gnome_open_location_pictures-f36-20221101.png b/needles/gnome/gnome_open_location_pictures-f36-20221101.png
similarity index 100%
rename from needles/gnome/apps/archiver/gnome_open_location_pictures-f36-20221101.png
rename to needles/gnome/gnome_open_location_pictures-f36-20221101.png
diff --git a/needles/gnome/gnome_burger_menu-20210915.json b/needles/gnome/menus/gnome_burger_menu-20210915.json
similarity index 100%
rename from needles/gnome/gnome_burger_menu-20210915.json
rename to needles/gnome/menus/gnome_burger_menu-20210915.json
diff --git a/needles/gnome/gnome_burger_menu-20210915.png b/needles/gnome/menus/gnome_burger_menu-20210915.png
similarity index 100%
rename from needles/gnome/gnome_burger_menu-20210915.png
rename to needles/gnome/menus/gnome_burger_menu-20210915.png
diff --git a/needles/gnome/gnome_burger_menu.json b/needles/gnome/menus/gnome_burger_menu.json
similarity index 100%
rename from needles/gnome/gnome_burger_menu.json
rename to needles/gnome/menus/gnome_burger_menu.json
diff --git a/needles/gnome/gnome_burger_menu.png b/needles/gnome/menus/gnome_burger_menu.png
similarity index 100%
rename from needles/gnome/gnome_burger_menu.png
rename to needles/gnome/menus/gnome_burger_menu.png
diff --git a/needles/gnome/gnome_burger_menu_dark-20220124.json b/needles/gnome/menus/gnome_burger_menu_dark-20220124.json
similarity index 100%
rename from needles/gnome/gnome_burger_menu_dark-20220124.json
rename to needles/gnome/menus/gnome_burger_menu_dark-20220124.json
diff --git a/needles/gnome/gnome_burger_menu_dark-20220124.png b/needles/gnome/menus/gnome_burger_menu_dark-20220124.png
similarity index 100%
rename from needles/gnome/gnome_burger_menu_dark-20220124.png
rename to needles/gnome/menus/gnome_burger_menu_dark-20220124.png
diff --git a/needles/gnome/gnome_burger_menu_dark-20220204.json b/needles/gnome/menus/gnome_burger_menu_dark-20220204.json
similarity index 100%
rename from needles/gnome/gnome_burger_menu_dark-20220204.json
rename to needles/gnome/menus/gnome_burger_menu_dark-20220204.json
diff --git a/needles/gnome/gnome_burger_menu_dark-20220204.png b/needles/gnome/menus/gnome_burger_menu_dark-20220204.png
similarity index 100%
rename from needles/gnome/gnome_burger_menu_dark-20220204.png
rename to needles/gnome/menus/gnome_burger_menu_dark-20220204.png
diff --git a/needles/gnome/gnome_burger_menu_dark.json b/needles/gnome/menus/gnome_burger_menu_dark.json
similarity index 100%
rename from needles/gnome/gnome_burger_menu_dark.json
rename to needles/gnome/menus/gnome_burger_menu_dark.json
diff --git a/needles/gnome/gnome_burger_menu_dark.png b/needles/gnome/menus/gnome_burger_menu_dark.png
similarity index 100%
rename from needles/gnome/gnome_burger_menu_dark.png
rename to needles/gnome/menus/gnome_burger_menu_dark.png
diff --git a/needles/gnome/gnome_burger_menu_gte.json b/needles/gnome/menus/gnome_burger_menu_gte.json
similarity index 100%
rename from needles/gnome/gnome_burger_menu_gte.json
rename to needles/gnome/menus/gnome_burger_menu_gte.json
diff --git a/needles/gnome/gnome_burger_menu_gte.png b/needles/gnome/menus/gnome_burger_menu_gte.png
similarity index 100%
rename from needles/gnome/gnome_burger_menu_gte.png
rename to needles/gnome/menus/gnome_burger_menu_gte.png
diff --git a/needles/gnome/menus/gnome_menu_about-20221125.json b/needles/gnome/menus/gnome_menu_about-20221125.json
new file mode 100644
index 00000000..146ff8ae
--- /dev/null
+++ b/needles/gnome/menus/gnome_menu_about-20221125.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "ypos": 594,
+      "width": 42,
+      "xpos": 782,
+      "height": 23
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_about"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_about-20221125.png b/needles/gnome/menus/gnome_menu_about-20221125.png
new file mode 100644
index 00000000..2642eaf7
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_about-20221125.png differ
diff --git a/needles/gnome/menus/gnome_menu_about-20221125a.json b/needles/gnome/menus/gnome_menu_about-20221125a.json
new file mode 100644
index 00000000..5b60c6ad
--- /dev/null
+++ b/needles/gnome/menus/gnome_menu_about-20221125a.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 23,
+      "type": "match",
+      "ypos": 578,
+      "width": 42,
+      "xpos": 824
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_about"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_about-20221125a.png b/needles/gnome/menus/gnome_menu_about-20221125a.png
new file mode 100644
index 00000000..80043582
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_about-20221125a.png differ
diff --git a/needles/gnome/apps/calculator/calc_menu_about-20220818.json b/needles/gnome/menus/gnome_menu_about.json
similarity index 58%
rename from needles/gnome/apps/calculator/calc_menu_about-20220818.json
rename to needles/gnome/menus/gnome_menu_about.json
index 86a1c59b..978c04c7 100644
--- a/needles/gnome/apps/calculator/calc_menu_about-20220818.json
+++ b/needles/gnome/menus/gnome_menu_about.json
@@ -1,15 +1,16 @@
 {
   "area": [
     {
-      "height": 23,
+      "width": 41,
       "ypos": 486,
       "type": "match",
-      "xpos": 363,
-      "width": 121
+      "height": 23,
+      "xpos": 861,
+      "match": 75
     }
   ],
   "properties": [],
   "tags": [
-    "calc_menu_about"
+    "gnome_menu_about"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_about.png b/needles/gnome/menus/gnome_menu_about.png
new file mode 100644
index 00000000..c04da9ca
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_about.png differ
diff --git a/needles/gnome/menus/gnome_menu_change_to_dark.json b/needles/gnome/menus/gnome_menu_change_to_dark.json
new file mode 100644
index 00000000..0efe7e5b
--- /dev/null
+++ b/needles/gnome/menus/gnome_menu_change_to_dark.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 959,
+      "ypos": 102,
+      "width": 45,
+      "height": 44,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_change_to_dark"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_change_to_dark.png b/needles/gnome/menus/gnome_menu_change_to_dark.png
new file mode 100644
index 00000000..bf9bc73c
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_change_to_dark.png differ
diff --git a/needles/gnome/apps/archiver/archiver_context_archive.json b/needles/gnome/menus/gnome_menu_compress.json
similarity index 78%
rename from needles/gnome/apps/archiver/archiver_context_archive.json
rename to needles/gnome/menus/gnome_menu_compress.json
index c13ff8d1..6f46c421 100644
--- a/needles/gnome/apps/archiver/archiver_context_archive.json
+++ b/needles/gnome/menus/gnome_menu_compress.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 347,
-      "ypos": 498,
-      "width": 90,
-      "height": 22,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "archiver_context_archive"
-  ]
+{
+  "area": [
+    {
+      "xpos": 347,
+      "ypos": 498,
+      "width": 90,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_compress"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/archiver/archiver_context_archive.png b/needles/gnome/menus/gnome_menu_compress.png
similarity index 100%
rename from needles/gnome/apps/archiver/archiver_context_archive.png
rename to needles/gnome/menus/gnome_menu_compress.png
diff --git a/needles/gnome/apps/evince/evince_menu_dual.json b/needles/gnome/menus/gnome_menu_dual.json
similarity index 53%
rename from needles/gnome/apps/evince/evince_menu_dual.json
rename to needles/gnome/menus/gnome_menu_dual.json
index 68d1e5b1..a2bbde61 100644
--- a/needles/gnome/apps/evince/evince_menu_dual.json
+++ b/needles/gnome/menus/gnome_menu_dual.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 785,
-      "ypos": 335,
-      "width": 40,
-      "height": 20,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "evince_menu_dual"
-  ]
+{
+  "area": [
+    {
+      "xpos": 782,
+      "ypos": 335,
+      "width": 37,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_dual"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_dual.png b/needles/gnome/menus/gnome_menu_dual.png
new file mode 100644
index 00000000..289af110
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_dual.png differ
diff --git a/needles/gnome/apps/archiver/archiver_context_extract.json b/needles/gnome/menus/gnome_menu_extract.json
similarity index 78%
rename from needles/gnome/apps/archiver/archiver_context_extract.json
rename to needles/gnome/menus/gnome_menu_extract.json
index e565ebef..d285122b 100644
--- a/needles/gnome/apps/archiver/archiver_context_extract.json
+++ b/needles/gnome/menus/gnome_menu_extract.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 346,
-      "ypos": 204,
-      "width": 58,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "archiver_context_extract"
-  ]
+{
+  "area": [
+    {
+      "xpos": 346,
+      "ypos": 204,
+      "width": 58,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_extract"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/archiver/archiver_context_extract.png b/needles/gnome/menus/gnome_menu_extract.png
similarity index 100%
rename from needles/gnome/apps/archiver/archiver_context_extract.png
rename to needles/gnome/menus/gnome_menu_extract.png
diff --git a/needles/gnome/apps/eog/eog_gallery_show.json b/needles/gnome/menus/gnome_menu_gallery_show-20221125.json
similarity index 51%
rename from needles/gnome/apps/eog/eog_gallery_show.json
rename to needles/gnome/menus/gnome_menu_gallery_show-20221125.json
index b047cb32..7535f058 100644
--- a/needles/gnome/apps/eog/eog_gallery_show.json
+++ b/needles/gnome/menus/gnome_menu_gallery_show-20221125.json
@@ -2,14 +2,14 @@
   "area": [
     {
       "xpos": 862,
-      "ypos": 165,
-      "width": 98,
-      "height": 19,
+      "ypos": 166,
+      "width": 93,
+      "height": 16,
       "type": "match"
     }
   ],
   "properties": [],
   "tags": [
-    "eog_gallery_show"
+    "gnome_menu_gallery_show"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_gallery_show-20221125.png b/needles/gnome/menus/gnome_menu_gallery_show-20221125.png
new file mode 100644
index 00000000..81dd140d
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_gallery_show-20221125.png differ
diff --git a/needles/gnome/apps/clocks/clocks_menu_help-20220818.json b/needles/gnome/menus/gnome_menu_help-20221125.json
similarity index 53%
rename from needles/gnome/apps/clocks/clocks_menu_help-20220818.json
rename to needles/gnome/menus/gnome_menu_help-20221125.json
index df439b22..5c1217bd 100644
--- a/needles/gnome/apps/clocks/clocks_menu_help-20220818.json
+++ b/needles/gnome/menus/gnome_menu_help-20221125.json
@@ -1,15 +1,15 @@
 {
   "area": [
     {
-      "type": "match",
       "xpos": 824,
-      "width": 47,
-      "height": 20,
-      "ypos": 129
+      "width": 38,
+      "ypos": 129,
+      "type": "match",
+      "height": 20
     }
   ],
   "properties": [],
   "tags": [
-    "clocks_menu_help"
+    "gnome_menu_help"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_help-20221125.png b/needles/gnome/menus/gnome_menu_help-20221125.png
new file mode 100644
index 00000000..582fc210
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_help-20221125.png differ
diff --git a/needles/gnome/apps/clocks/clocks_button_alarm_snooze.json b/needles/gnome/menus/gnome_menu_help-20221126.json
similarity index 54%
rename from needles/gnome/apps/clocks/clocks_button_alarm_snooze.json
rename to needles/gnome/menus/gnome_menu_help-20221126.json
index 60915a66..e759ab66 100644
--- a/needles/gnome/apps/clocks/clocks_button_alarm_snooze.json
+++ b/needles/gnome/menus/gnome_menu_help-20221126.json
@@ -1,15 +1,15 @@
-{
-  "properties": [],
-  "tags": [
-    "clocks_button_alarm_snooze"
-  ],
-  "area": [
-    {
-      "xpos": 485,
-      "ypos": 629,
-      "width": 55,
-      "height": 20,
-      "type": "match"
-    }
-  ]
+{
+  "area": [
+    {
+      "height": 20,
+      "width": 38,
+      "ypos": 570,
+      "xpos": 782,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_help"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_help-20221126.png b/needles/gnome/menus/gnome_menu_help-20221126.png
new file mode 100644
index 00000000..2642eaf7
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_help-20221126.png differ
diff --git a/needles/gnome/apps/clocks/clocks_menu_help.json b/needles/gnome/menus/gnome_menu_help.json
similarity index 81%
rename from needles/gnome/apps/clocks/clocks_menu_help.json
rename to needles/gnome/menus/gnome_menu_help.json
index ab3754e4..6e58484e 100644
--- a/needles/gnome/apps/clocks/clocks_menu_help.json
+++ b/needles/gnome/menus/gnome_menu_help.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 822,
-      "ypos": 130,
-      "width": 47,
-      "height": 20,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_menu_help"
-  ]
+{
+  "area": [
+    {
+      "xpos": 822,
+      "ypos": 130,
+      "width": 47,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_help"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/apps/clocks/clocks_menu_help.png b/needles/gnome/menus/gnome_menu_help.png
similarity index 100%
rename from needles/gnome/apps/clocks/clocks_menu_help.png
rename to needles/gnome/menus/gnome_menu_help.png
diff --git a/needles/gnome/menus/gnome_menu_new_instance.json b/needles/gnome/menus/gnome_menu_new_instance.json
new file mode 100644
index 00000000..c6103b77
--- /dev/null
+++ b/needles/gnome/menus/gnome_menu_new_instance.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 827,
+      "ypos": 97,
+      "width": 93,
+      "height": 20,
+      "type": "match",
+      "match": 70
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_new_instance"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_new_instance.png b/needles/gnome/menus/gnome_menu_new_instance.png
new file mode 100644
index 00000000..c42859ce
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_new_instance.png differ
diff --git a/needles/gnome/menus/gnome_menu_night_mode.json b/needles/gnome/menus/gnome_menu_night_mode.json
new file mode 100644
index 00000000..f04a7d89
--- /dev/null
+++ b/needles/gnome/menus/gnome_menu_night_mode.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 782,
+      "ypos": 450,
+      "width": 79,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_night_mode"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_night_mode.png b/needles/gnome/menus/gnome_menu_night_mode.png
new file mode 100644
index 00000000..2642eaf7
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_night_mode.png differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220818.json b/needles/gnome/menus/gnome_menu_preferences-20221128.json
similarity index 56%
rename from needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220818.json
rename to needles/gnome/menus/gnome_menu_preferences-20221128.json
index 9c815df8..df4a8ffc 100644
--- a/needles/gnome/apps/gnome-text-editor/gte_preferences_submenu-20220818.json
+++ b/needles/gnome/menus/gnome_menu_preferences-20221128.json
@@ -1,15 +1,16 @@
 {
   "area": [
     {
-      "width": 87,
-      "type": "match",
-      "xpos": 825,
       "ypos": 483,
-      "height": 26
+      "type": "match",
+      "width": 87,
+      "xpos": 826,
+      "height": 24,
+      "match": 75
     }
   ],
   "properties": [],
   "tags": [
-    "gte_preferences_submenu"
+    "gnome_menu_preferences"
   ]
 }
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_preferences-20221128.png b/needles/gnome/menus/gnome_menu_preferences-20221128.png
new file mode 100644
index 00000000..3ed5841e
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_preferences-20221128.png differ
diff --git a/needles/gnome/menus/gnome_menu_preferences.json b/needles/gnome/menus/gnome_menu_preferences.json
new file mode 100644
index 00000000..833f82dd
--- /dev/null
+++ b/needles/gnome/menus/gnome_menu_preferences.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 823,
+      "ypos": 482,
+      "width": 87,
+      "height": 24,
+      "type": "match",
+      "match": 70
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_preferences"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_preferences.png b/needles/gnome/menus/gnome_menu_preferences.png
new file mode 100644
index 00000000..0c7f4b22
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_preferences.png differ
diff --git a/needles/gnome/apps/evince/evince_menu_shortcuts.json b/needles/gnome/menus/gnome_menu_properties.json
similarity index 52%
rename from needles/gnome/apps/evince/evince_menu_shortcuts.json
rename to needles/gnome/menus/gnome_menu_properties.json
index 812937ae..3df3cda6 100644
--- a/needles/gnome/apps/evince/evince_menu_shortcuts.json
+++ b/needles/gnome/menus/gnome_menu_properties.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 784,
-      "ypos": 544,
-      "width": 132,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "evince_menu_shortcuts"
-  ]
+{
+  "area": [
+    {
+      "xpos": 782,
+      "ypos": 483,
+      "width": 72,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_properties"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_properties.png b/needles/gnome/menus/gnome_menu_properties.png
new file mode 100644
index 00000000..2642eaf7
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_properties.png differ
diff --git a/needles/gnome/menus/gnome_menu_saveas.json b/needles/gnome/menus/gnome_menu_saveas.json
new file mode 100644
index 00000000..35137f1d
--- /dev/null
+++ b/needles/gnome/menus/gnome_menu_saveas.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 782,
+      "ypos": 244,
+      "width": 53,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_saveas"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_saveas.png b/needles/gnome/menus/gnome_menu_saveas.png
new file mode 100644
index 00000000..2642eaf7
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_saveas.png differ
diff --git a/needles/gnome/menus/gnome_menu_set_wallpaper.json b/needles/gnome/menus/gnome_menu_set_wallpaper.json
new file mode 100644
index 00000000..c471be71
--- /dev/null
+++ b/needles/gnome/menus/gnome_menu_set_wallpaper.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 861,
+      "ypos": 251,
+      "width": 113,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_set_wallpaper"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_set_wallpaper.png b/needles/gnome/menus/gnome_menu_set_wallpaper.png
new file mode 100644
index 00000000..bc6c71af
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_set_wallpaper.png differ
diff --git a/needles/gnome/apps/clocks/clocks_menu_about-20220818.json b/needles/gnome/menus/gnome_menu_shortcuts-20221125.json
similarity index 51%
rename from needles/gnome/apps/clocks/clocks_menu_about-20220818.json
rename to needles/gnome/menus/gnome_menu_shortcuts-20221125.json
index 825eef27..e0635341 100644
--- a/needles/gnome/apps/clocks/clocks_menu_about-20220818.json
+++ b/needles/gnome/menus/gnome_menu_shortcuts-20221125.json
@@ -1,15 +1,16 @@
-{
-  "area": [
-    {
-      "height": 21,
-      "ypos": 160,
-      "xpos": 825,
-      "type": "match",
-      "width": 89
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "clocks_menu_about"
-  ]
+{
+  "area": [
+    {
+      "xpos": 781,
+      "ypos": 544,
+      "width": 133,
+      "height": 21,
+      "type": "match",
+      "match": "70"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_shortcuts"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_shortcuts-20221125.png b/needles/gnome/menus/gnome_menu_shortcuts-20221125.png
new file mode 100644
index 00000000..2642eaf7
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_shortcuts-20221125.png differ
diff --git a/needles/gnome/menus/gnome_menu_submenu_show-202211251.json b/needles/gnome/menus/gnome_menu_submenu_show-202211251.json
new file mode 100644
index 00000000..66967645
--- /dev/null
+++ b/needles/gnome/menus/gnome_menu_submenu_show-202211251.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 861,
+      "ypos": 378,
+      "width": 38,
+      "height": 16,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_menu_submenu_show"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/menus/gnome_menu_submenu_show-202211251.png b/needles/gnome/menus/gnome_menu_submenu_show-202211251.png
new file mode 100644
index 00000000..fd7adbd5
Binary files /dev/null and b/needles/gnome/menus/gnome_menu_submenu_show-202211251.png differ
diff --git a/tests/applications/archiver/archive.pm b/tests/applications/archiver/archive.pm
index fd251899..d8ed306d 100644
--- a/tests/applications/archiver/archive.pm
+++ b/tests/applications/archiver/archive.pm
@@ -15,15 +15,15 @@ sub run {
     # Right click on the first of them to open the context menu.
     assert_and_click("archiver_file_one", button => 'right');
     # Select to archive it.
-    assert_and_click("archiver_context_archive");
+    assert_and_click("gnome_menu_compress");
     # Type the name for the archive
     type_very_safely("archived_files");
     # Open the selection of formats.
-    assert_and_click("archiver_format_selector");
+    assert_and_click("gnome_pull_down_selector");
     # Select the tar.xz method
     assert_and_click("archiver_select_tarxz");
     # Confirm
-    assert_and_click("archiver_button_create");
+    assert_and_click("gnome_button_create");
     # Assert that a file has been created in that directory (it may take some time)
     assert_screen("archiver_archive_created");
 }
diff --git a/tests/applications/archiver/extract.pm b/tests/applications/archiver/extract.pm
index 0299a886..ece7d57a 100644
--- a/tests/applications/archiver/extract.pm
+++ b/tests/applications/archiver/extract.pm
@@ -23,7 +23,7 @@ sub run {
     # Right click onto it
     click_lastmatch(button => 'right');
     # Select to Extract the content
-    assert_and_click("archiver_context_extract");
+    assert_and_click("gnome_menu_extract");
     # Assert that the extracted folder appeared in that location.
     assert_screen("archiver_archive_extracted");
 
diff --git a/tests/applications/calculator/about.pm b/tests/applications/calculator/about.pm
index a08c7713..fed3e852 100644
--- a/tests/applications/calculator/about.pm
+++ b/tests/applications/calculator/about.pm
@@ -13,7 +13,7 @@ sub run {
     # Open the menu and click on the About item.
     assert_and_click("gnome_burger_menu");
     wait_still_screen(2);
-    assert_and_click("calc_menu_about");
+    assert_and_click("gnome_menu_about");
     # Check that it is shown.
     assert_screen("calc_about_shown");
     # Click on the Credits button and check that it shows.
diff --git a/tests/applications/clocks/about.pm b/tests/applications/clocks/about.pm
index 4bda6811..4eb328f7 100644
--- a/tests/applications/clocks/about.pm
+++ b/tests/applications/clocks/about.pm
@@ -12,7 +12,7 @@ sub run {
     assert_and_click("gnome_burger_menu");
 
     # Click on About Clocks to see the About info.
-    assert_and_click("clocks_menu_about");
+    assert_and_click("gnome_menu_about");
     assert_screen("clocks_about_displayed");
     assert_and_click("gnome_button_credits");
     assert_screen("clocks_credits_shown");
diff --git a/tests/applications/clocks/alarm.pm b/tests/applications/clocks/alarm.pm
index 0ad1c1a5..8b50dc38 100644
--- a/tests/applications/clocks/alarm.pm
+++ b/tests/applications/clocks/alarm.pm
@@ -25,11 +25,11 @@ sub run {
     # Wait until the alarm goes on, two buttons will be shown. This should not take
     # more than three minutes.
     # A snooze button should become visible, click it.
-    assert_and_click("clocks_button_alarm_snooze", timeout => 240);
+    assert_and_click("gnome_button_snooze", timeout => 240);
     assert_screen("clocks_alarm_snooze_confirmed");
     # After another minute or so, the alarm should ring again.
     # This time we will use the stop button to stop it.
-    assert_and_click("clocks_button_alarm_stop", timeout => 120);
+    assert_and_click("gnome_button_stop", timeout => 120);
     # The alarm should switch off but should stay listed active.
     assert_screen("clocks_alarm_active");
     # Now toggle the switch to inactivate it.
diff --git a/tests/applications/clocks/help.pm b/tests/applications/clocks/help.pm
index 8f29e35a..657c6997 100644
--- a/tests/applications/clocks/help.pm
+++ b/tests/applications/clocks/help.pm
@@ -10,7 +10,7 @@ sub run {
 
     # Click on the burger menu and display Help.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("clocks_menu_help");
+    assert_and_click("gnome_menu_help");
     assert_screen("clocks_help_shown");
 }
 
diff --git a/tests/applications/clocks/shortcuts.pm b/tests/applications/clocks/shortcuts.pm
index 29124cf5..e1fd16bd 100644
--- a/tests/applications/clocks/shortcuts.pm
+++ b/tests/applications/clocks/shortcuts.pm
@@ -10,7 +10,7 @@ sub run {
 
     # Use the menu to see the shortcuts
     assert_and_click("gnome_burger_menu");
-    assert_and_click("clocks_menu_shortcuts");
+    assert_and_click("gnome_menu_shortcuts");
     assert_screen("clocks_shortcuts_shown");
 }
 
diff --git a/tests/applications/clocks/stopwatch.pm b/tests/applications/clocks/stopwatch.pm
index 289ac161..8a6ab50c 100644
--- a/tests/applications/clocks/stopwatch.pm
+++ b/tests/applications/clocks/stopwatch.pm
@@ -12,31 +12,31 @@ sub run {
     assert_and_click("clocks_button_stopwatch");
 
     # Start the stopwatch, pause it, resume, and clear.
-    assert_and_click("clocks_stopwatch_button_start");
+    assert_and_click("gnome_button_start");
     # Wait some time and pause the stopwatch, read the
     # time.
     sleep(20);
-    assert_and_click("clocks_stopwatch_button_pause", timeout => 2);
+    assert_and_click("gnome_button_pause", timeout => 2);
     assert_screen("clocks_stopwatch_time_reached");
     # Resume the measurement.
-    assert_and_click("clocks_stopwatch_button_resume");
+    assert_and_click("gnome_button_resume");
     sleep(10);
     # Press pause and read the time.
-    assert_and_click("clocks_stopwatch_button_pause", timeout => 2);
+    assert_and_click("gnome_button_pause", timeout => 2);
     assert_screen("clocks_stopwatch_secondtime_reached");
     # Clear the stopwatch and check you can start it again.
-    assert_and_click("clocks_stopwatch_button_clear");
-    assert_screen("clocks_stopwatch_button_start");
+    assert_and_click("gnome_button_clear");
+    assert_screen("gnome_button_start");
 
     # Start the stopwatch, count several laps and assert.
-    assert_and_click("clocks_stopwatch_button_start");
+    assert_and_click("gnome_button_start");
     sleep(10);
-    assert_and_click("clocks_stopwatch_button_lap");
+    assert_and_click("gnome_button_lap");
     sleep(10);
-    assert_and_click("clocks_stopwatch_button_lap");
+    assert_and_click("gnome_button_lap");
     sleep(10);
-    assert_and_click("clocks_stopwatch_button_lap");
-    assert_and_click("clocks_stopwatch_button_pause");
+    assert_and_click("gnome_button_lap");
+    assert_and_click("gnome_button_pause");
     assert_screen("clocks_stopwatch_laps_count");
     assert_screen("clocks_stopwatch_laps_times");
     assert_screen("clocks_stopwatch_laps_deltas");
diff --git a/tests/applications/contacts/about.pm b/tests/applications/contacts/about.pm
index a0c36813..db140e14 100644
--- a/tests/applications/contacts/about.pm
+++ b/tests/applications/contacts/about.pm
@@ -13,7 +13,7 @@ sub run {
     sleep(5);
     # Open the menu and click on item.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("contacts_menu_about");
+    assert_and_click("gnome_menu_about");
     # Check that the About window has appeared.
     assert_screen("contacts_about_shown");
     # Click on Credits to move to credits and check we
diff --git a/tests/applications/contacts/edit_contacts.pm b/tests/applications/contacts/edit_contacts.pm
index 859ea7f1..677fc84c 100644
--- a/tests/applications/contacts/edit_contacts.pm
+++ b/tests/applications/contacts/edit_contacts.pm
@@ -68,7 +68,7 @@ sub run {
     # Wait to let everything settle.
     sleep 5;
 
-    # Edit contact for Mary Shelley
+    # Edit contacts
     edit_contact("Jane Austen", "789-456-1223", 'jane.austen@sensibility.org');
     edit_contact("Walter Scott", "111-222-3333", 'flying.scottsman@fedoraproject.org');
     edit_contact("John Keats", "333-222-1111", 'keats@romance.co.uk');
diff --git a/tests/applications/contacts/shortcuts.pm b/tests/applications/contacts/shortcuts.pm
index 31a7c344..842dfe36 100644
--- a/tests/applications/contacts/shortcuts.pm
+++ b/tests/applications/contacts/shortcuts.pm
@@ -12,7 +12,7 @@ sub run {
     sleep(5);
     # Go to the menu and click on shortcuts item
     assert_and_click("gnome_burger_menu");
-    assert_and_click("contacts_menu_shortcuts");
+    assert_and_click("gnome_menu_shortcuts");
     # Check that the the correct window has shown.
     assert_screen("contacts_shortcuts_shown");
 }
diff --git a/tests/applications/eog/about.pm b/tests/applications/eog/about.pm
index 447b9070..020ace46 100644
--- a/tests/applications/eog/about.pm
+++ b/tests/applications/eog/about.pm
@@ -12,7 +12,7 @@ sub run {
     assert_and_click("gnome_burger_menu");
     wait_still_screen(3);
     # Click on the About item
-    assert_and_click("eog_menu_about");
+    assert_and_click("gnome_menu_about");
     wait_still_screen(3);
     assert_screen("eog_about_shown");
     # Click on Credits
diff --git a/tests/applications/eog/pic_to_wallpaper.pm b/tests/applications/eog/pic_to_wallpaper.pm
index 0ce4b50e..abb140dc 100644
--- a/tests/applications/eog/pic_to_wallpaper.pm
+++ b/tests/applications/eog/pic_to_wallpaper.pm
@@ -12,7 +12,7 @@ sub run {
     # Go to the menu
     assert_and_click("gnome_burger_menu");
     # Set as background
-    assert_and_click("eog_set_wallpaper");
+    assert_and_click("gnome_menu_set_wallpaper");
     wait_still_screen(3);
     # Check that the dialogue has appeared
     assert_screen("eog_wallpaper_set_window");
diff --git a/tests/applications/eog/show_gallery.pm b/tests/applications/eog/show_gallery.pm
index 4b2cac85..14d90a92 100644
--- a/tests/applications/eog/show_gallery.pm
+++ b/tests/applications/eog/show_gallery.pm
@@ -17,10 +17,10 @@ sub run {
         assert_and_click("gnome_burger_menu");
         wait_still_screen(2);
         # Open Submenu Show
-        assert_and_click("eog_submenu_show");
+        assert_and_click("gnome_menu_submenu_show");
         wait_still_screen(2);
         # Toggle gallery
-        assert_and_click("eog_gallery_show");
+        assert_and_click("gnome_menu_gallery_show");
         wait_still_screen(2);
 
     }
diff --git a/tests/applications/evince/aaa_setup.pm b/tests/applications/evince/aaa_setup.pm
index 3d5419b5..35a01621 100644
--- a/tests/applications/evince/aaa_setup.pm
+++ b/tests/applications/evince/aaa_setup.pm
@@ -25,7 +25,7 @@ sub run {
 
     # Open the test file to create a starting point for the other Evince tests.
     # Click on Open button to open the File Open Dialog
-    assert_and_click("evince_open_file_dialog", button => "left", timeout => 30);
+    assert_and_click("gnome_button_open", button => "left", timeout => 30);
 
     if (get_var("CANNED")) {
         # open the Documents folder.
diff --git a/tests/applications/evince/about.pm b/tests/applications/evince/about.pm
index 85e2689e..8c6f6961 100644
--- a/tests/applications/evince/about.pm
+++ b/tests/applications/evince/about.pm
@@ -13,7 +13,7 @@ sub run {
     wait_still_screen 2;
 
     # In the menu, select the About item.
-    assert_and_click("evince_menu_about", button => "left", timeout => 30);
+    assert_and_click("gnome_menu_about", button => "left", timeout => 30);
 
     # Check that the About section has been displayed.
     assert_screen("evince_about_shown");
diff --git a/tests/applications/evince/dual_mode.pm b/tests/applications/evince/dual_mode.pm
index 3a8aa91e..061cbedc 100644
--- a/tests/applications/evince/dual_mode.pm
+++ b/tests/applications/evince/dual_mode.pm
@@ -21,7 +21,7 @@ sub run {
     assert_and_click("gnome_burger_menu", button => "left", timeout => 30);
 
     # Select the Dual mode
-    assert_and_click("evince_menu_dual", button => "left", timeout => 30);
+    assert_and_click("gnome_menu_dual", button => "left", timeout => 30);
 
     # Dismiss the menu
     send_key("esc");
diff --git a/tests/applications/evince/help.pm b/tests/applications/evince/help.pm
index 25e8df9b..9087d5d5 100644
--- a/tests/applications/evince/help.pm
+++ b/tests/applications/evince/help.pm
@@ -13,7 +13,7 @@ sub run {
     wait_still_screen 2;
 
     # Select the Help item in the menu.
-    assert_and_click("evince_menu_help", button => "left", timeout => 30);
+    assert_and_click("gnome_menu_help", button => "left", timeout => 30);
     wait_still_screen 2;
 
     # Check that Help has been shown.
diff --git a/tests/applications/evince/night_mode.pm b/tests/applications/evince/night_mode.pm
index 5a69d5b5..a94fdd80 100644
--- a/tests/applications/evince/night_mode.pm
+++ b/tests/applications/evince/night_mode.pm
@@ -12,7 +12,7 @@ sub run {
     assert_and_click("gnome_burger_menu", timeout => 30, button => "left");
 
     # Click on the Night mode to select it.
-    assert_and_click("evince_toggle_night_mode", button => "left", timeout => 30);
+    assert_and_click("gnome_menu_night_mode", button => "left", timeout => 30);
 
     # The menu stays opened, so hit Esc to dismiss it.
     send_key("esc");
diff --git a/tests/applications/evince/properties.pm b/tests/applications/evince/properties.pm
index ab16679b..005c64c8 100644
--- a/tests/applications/evince/properties.pm
+++ b/tests/applications/evince/properties.pm
@@ -13,7 +13,7 @@ sub run {
     wait_still_screen 2;
 
     # Select the Properties item.
-    assert_and_click("evince_menu_properties", button => "left", timeout => 30);
+    assert_and_click("gnome_menu_properties", button => "left", timeout => 30);
     wait_still_screen 2;
 
     # Check that Properties are shown.
diff --git a/tests/applications/evince/save_as.pm b/tests/applications/evince/save_as.pm
index 7cef4c83..e8b6907b 100644
--- a/tests/applications/evince/save_as.pm
+++ b/tests/applications/evince/save_as.pm
@@ -12,7 +12,7 @@ sub run {
     assert_and_click("gnome_burger_menu", button => "left", timeout => 30);
 
     # Select Save As
-    assert_and_click("evince_menu_saveas", button => "left", timeout => 30);
+    assert_and_click("gnome_menu_saveas", button => "left", timeout => 30);
 
     # Type a new name.
     type_very_safely("alternative");
diff --git a/tests/applications/evince/shortcuts.pm b/tests/applications/evince/shortcuts.pm
index b56c7825..d1a58c98 100644
--- a/tests/applications/evince/shortcuts.pm
+++ b/tests/applications/evince/shortcuts.pm
@@ -13,7 +13,7 @@ sub run {
     wait_still_screen 2;
 
     # Select the Keyboard Shortcuts item
-    assert_and_click("evince_menu_shortcuts", button => "left", timeout => 30);
+    assert_and_click("gnome_menu_shortcuts", button => "left", timeout => 30);
     wait_still_screen 2;
 
     # Check that Shortcuts has been shown
diff --git a/tests/applications/gnome-text-editor/about.pm b/tests/applications/gnome-text-editor/about.pm
index d7c0887e..c0fa8a9b 100644
--- a/tests/applications/gnome-text-editor/about.pm
+++ b/tests/applications/gnome-text-editor/about.pm
@@ -12,7 +12,7 @@ sub run {
     wait_still_screen(3);
 
     # Choose the About item.
-    assert_and_click "gte_about";
+    assert_and_click "gnome_menu_about";
     wait_still_screen(2);
 
     # Check that the About dialogue was opened.
diff --git a/tests/applications/gnome-text-editor/line_numbering.pm b/tests/applications/gnome-text-editor/line_numbering.pm
index 577de2d6..87fc7cc3 100644
--- a/tests/applications/gnome-text-editor/line_numbering.pm
+++ b/tests/applications/gnome-text-editor/line_numbering.pm
@@ -18,8 +18,8 @@ sub run {
     # Highlights the current line.
     # Use the menu to switch on highlighting.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("gte_preferences_submenu");
-    assert_and_click("gte_toggle_line_highlight");
+    assert_and_click("gnome_menu_preferences");
+    assert_and_click("gte_preferences_line_highlight");
     # Dismiss the menu
     assert_and_click("gte_preferences_off");
     # Assert that it worked.
@@ -30,17 +30,17 @@ sub run {
     assert_and_click "gte_display_margin";
     assert_screen "gte_margin_displayed";
 
-    # Display the side panel.
+    # Display the overview map.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("gte_preferences_submenu");
-    assert_and_click("gte_toggle_side_panel");
+    assert_and_click("gnome_menu_preferences");
+    assert_and_click("gte_preferences_overview");
     assert_and_click("gte_preferences_off");
     assert_screen "gte_side_panel_on";
 
     # Display the grid.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("gte_preferences_submenu");
-    assert_and_click("gte_toggle_grid");
+    assert_and_click("gnome_menu_preferences");
+    assert_and_click("gte_preferences_grid");
     assert_and_click("gte_preferences_off");
     assert_screen "gte_grid_on";
 }
diff --git a/tests/applications/gnome-text-editor/skins.pm b/tests/applications/gnome-text-editor/skins.pm
index 304cd6ca..cb894134 100644
--- a/tests/applications/gnome-text-editor/skins.pm
+++ b/tests/applications/gnome-text-editor/skins.pm
@@ -10,7 +10,7 @@ sub run {
 
     # Check that dark style can be used.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("gte_change_to_dark");
+    assert_and_click("gnome_menu_change_to_dark");
     wait_still_screen(2);
     send_key("esc");
     assert_screen("gte_dark_style_used");
@@ -19,7 +19,7 @@ sub run {
     # Check that color varieties can be used.
     # We will only test several of the varieties
     assert_and_click("gnome_burger_menu");
-    assert_and_click("gte_preferences_submenu");
+    assert_and_click("gnome_menu_preferences");
     wait_still_screen(2);
 
     my $relnum = get_release_number;
diff --git a/tests/applications/maps/about.pm b/tests/applications/maps/about.pm
index b907c8d5..bd68b38f 100644
--- a/tests/applications/maps/about.pm
+++ b/tests/applications/maps/about.pm
@@ -11,7 +11,7 @@ sub run {
 
     # Go to menu and click on About.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("maps_menu_about");
+    assert_and_click("gnome_menu_about");
     wait_still_screen(2);
 
     # Check that the About dialog is shown.
@@ -32,12 +32,12 @@ sub run {
     send_key("alt-f4");
 
     # Check that credits are shown.
-    assert_and_click("maps_button_credits");
+    assert_and_click("gnome_button_credits");
     assert_screen("maps_credits_shown");
     send_key("esc");
 
     # Check that legal info is shown.
-    assert_and_click("maps_button_legal");
+    assert_and_click("gnome_button_legal");
     assert_screen("maps_legal_shown");
     send_key("esc");
 }
diff --git a/tests/applications/maps/export.pm b/tests/applications/maps/export.pm
index 3c14c5b7..81a6c51d 100644
--- a/tests/applications/maps/export.pm
+++ b/tests/applications/maps/export.pm
@@ -11,7 +11,7 @@ sub run {
 
     # Go to menu and click on Export.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("maps_menu_export");
+    assert_and_click("gnome_menu_export");
     wait_still_screen(2);
 
     # Rename the file and export it.
@@ -19,7 +19,7 @@ sub run {
     # just going to rename the proposed file name.
     send_key("ctrl-a");
     type_very_safely("exported-map.png");
-    assert_and_click("maps_button_export");
+    assert_and_click("gnome_button_export");
 
     # After the map has been exported, we will open
     # it in an image viewer to see that it is correct.
diff --git a/tests/applications/maps/shortcuts.pm b/tests/applications/maps/shortcuts.pm
index 481b5a23..53f747de 100644
--- a/tests/applications/maps/shortcuts.pm
+++ b/tests/applications/maps/shortcuts.pm
@@ -10,7 +10,7 @@ sub run {
 
     # Go to menu and click on Shortcuts.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("maps_menu_shortcuts");
+    assert_and_click("gnome_menu_shortcuts");
     wait_still_screen(2);
 
     # Check that Shortcuts have been shown.
diff --git a/tests/applications/nautilus/keyboard_shortcuts.pm b/tests/applications/nautilus/keyboard_shortcuts.pm
index 1fae4a4c..916d23fe 100644
--- a/tests/applications/nautilus/keyboard_shortcuts.pm
+++ b/tests/applications/nautilus/keyboard_shortcuts.pm
@@ -11,7 +11,7 @@ sub run {
     assert_and_click("gnome_burger_menu");
     wait_still_screen(2);
 
-    assert_and_click("nautilus_menu_shortcuts");
+    assert_and_click("gnome_menu_shortcuts");
     wait_still_screen(2);
 
     assert_screen("nautilus_shortcuts_first");
diff --git a/tests/applications/nautilus/new_instance.pm b/tests/applications/nautilus/new_instance.pm
index 40dbc093..c0448030 100644
--- a/tests/applications/nautilus/new_instance.pm
+++ b/tests/applications/nautilus/new_instance.pm
@@ -16,7 +16,7 @@ sub run {
     wait_still_screen(2);
 
     # Click on the new instance icon to create a new instance of Nautilus.
-    assert_and_click("nautilus_menu_new_instance");
+    assert_and_click("gnome_menu_new_instance");
     wait_still_screen(2);
 
     # Hit the Meta key to switch to the activities mode for further check.
diff --git a/tests/applications/sysmon/about.pm b/tests/applications/sysmon/about.pm
index 27eb0077..870fc1f0 100644
--- a/tests/applications/sysmon/about.pm
+++ b/tests/applications/sysmon/about.pm
@@ -7,7 +7,7 @@ sub run {
 
     # Open the Menu and click on the About entry.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("sysmon_menu_about");
+    assert_and_click("gnome_menu_about");
 
     # Check that About dialogue has started.
     assert_screen("sysmon_about_shown");
diff --git a/tests/applications/sysmon/help.pm b/tests/applications/sysmon/help.pm
index 255ace1c..c178737f 100644
--- a/tests/applications/sysmon/help.pm
+++ b/tests/applications/sysmon/help.pm
@@ -7,7 +7,7 @@ sub run {
 
     # Open the Menu and click on Help entry.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("sysmon_menu_help");
+    assert_and_click("gnome_menu_help");
 
     # Check that Shortcuts dialogue is shown.
     assert_screen("sysmon_help_shown");
diff --git a/tests/applications/sysmon/preferences.pm b/tests/applications/sysmon/preferences.pm
index 239a43dd..2cc8ac68 100644
--- a/tests/applications/sysmon/preferences.pm
+++ b/tests/applications/sysmon/preferences.pm
@@ -7,7 +7,7 @@ sub run {
 
     # Open the Menu and click on Preferences entry.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("sysmon_menu_preferences");
+    assert_and_click("gnome_menu_preferences");
 
     # Check that Preferences dialogue is shown.
     assert_screen("sysmon_preferences_shown");
diff --git a/tests/applications/sysmon/shortcuts.pm b/tests/applications/sysmon/shortcuts.pm
index 98dc13ac..08d9fe60 100644
--- a/tests/applications/sysmon/shortcuts.pm
+++ b/tests/applications/sysmon/shortcuts.pm
@@ -7,7 +7,7 @@ sub run {
 
     # Open the Menu and click on Shortcuts entry.
     assert_and_click("gnome_burger_menu");
-    assert_and_click("sysmon_menu_shortcuts");
+    assert_and_click("gnome_menu_shortcuts");
 
     # Check that Shortcuts dialogue is shown.
     assert_screen("sysmon_shortcuts_shown");
diff --git a/tests/applications/weather/about.pm b/tests/applications/weather/about.pm
index 126a88a5..20e3d0d2 100644
--- a/tests/applications/weather/about.pm
+++ b/tests/applications/weather/about.pm
@@ -11,7 +11,7 @@ sub run {
 
     # Open the Menu
     assert_and_click("gnome_burger_menu");
-    assert_and_click("weather_menu_about");
+    assert_and_click("gnome_menu_about");
     assert_screen("weather_about_shown");
     # Change to Credits
     assert_and_click("gnome_button_credits");