diff --git a/needles/kde/apps/abrt_launch-20190530.json b/needles/kde/apps/abrt_launch-20190530.json
deleted file mode 100644
index b9804ac7..00000000
--- a/needles/kde/apps/abrt_launch-20190530.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 25,
-      "xpos": 35,
-      "ypos": 479,
-      "type": "match",
-      "width": 25
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "abrt_launch"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/abrt_launch-20190530.png b/needles/kde/apps/abrt_launch-20190530.png
deleted file mode 100644
index ad215123..00000000
Binary files a/needles/kde/apps/abrt_launch-20190530.png and /dev/null differ
diff --git a/needles/kde/apps/abrt_launch.png b/needles/kde/apps/abrt_launch.png
deleted file mode 100644
index c89386e0..00000000
Binary files a/needles/kde/apps/abrt_launch.png and /dev/null differ
diff --git a/needles/kde/apps/akregator_launch.json b/needles/kde/apps/akregator_launch.json
deleted file mode 100644
index 5c22ecf8..00000000
--- a/needles/kde/apps/akregator_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "akregator_launch"
-  ],
-  "area": [
-    {
-      "xpos": 54,
-      "ypos": 443,
-      "width": 29,
-      "height": 21,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/akregator_launch.png b/needles/kde/apps/akregator_launch.png
deleted file mode 100644
index c3bb4b0e..00000000
Binary files a/needles/kde/apps/akregator_launch.png and /dev/null differ
diff --git a/needles/kde/apps/ark_launch.json b/needles/kde/apps/ark_launch.json
deleted file mode 100644
index 564564c7..00000000
--- a/needles/kde/apps/ark_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "ark_launch"
-  ],
-  "area": [
-    {
-      "xpos": 53,
-      "ypos": 243,
-      "width": 30,
-      "height": 22,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/ark_launch.png b/needles/kde/apps/ark_launch.png
deleted file mode 100644
index f4b92d7e..00000000
Binary files a/needles/kde/apps/ark_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kmag_launch.json b/needles/kde/apps/auth_required.json
similarity index 58%
rename from needles/kde/apps/kmag_launch.json
rename to needles/kde/apps/auth_required.json
index a4c5c03d..b1168ad0 100644
--- a/needles/kde/apps/kmag_launch.json
+++ b/needles/kde/apps/auth_required.json
@@ -1,14 +1,14 @@
 {
   "properties": [],
   "tags": [
-    "kmag_launch"
+    "auth_required"
   ],
   "area": [
     {
-      "xpos": 51,
-      "ypos": 562,
+      "xpos": 273,
+      "ypos": 226,
       "width": 35,
-      "height": 20,
+      "height": 34,
       "type": "match"
     }
   ]
diff --git a/needles/kde/apps/auth_required.png b/needles/kde/apps/auth_required.png
new file mode 100644
index 00000000..471b67ef
Binary files /dev/null and b/needles/kde/apps/auth_required.png differ
diff --git a/needles/kde/apps/csheets_launch.json b/needles/kde/apps/auth_required_language.json
similarity index 58%
rename from needles/kde/apps/csheets_launch.json
rename to needles/kde/apps/auth_required_language.json
index 1ebc3465..2267a861 100644
--- a/needles/kde/apps/csheets_launch.json
+++ b/needles/kde/apps/auth_required_language.json
@@ -1,14 +1,14 @@
 {
   "properties": [],
   "tags": [
-    "csheets_launch"
+    "auth_required"
   ],
   "area": [
     {
-      "xpos": 52,
-      "ypos": 565,
+      "xpos": 275,
+      "ypos": 224,
       "width": 30,
-      "height": 20,
+      "height": 36,
       "type": "match"
     }
   ]
diff --git a/needles/kde/apps/auth_required_language.png b/needles/kde/apps/auth_required_language.png
new file mode 100644
index 00000000..c8d529bd
Binary files /dev/null and b/needles/kde/apps/auth_required_language.png differ
diff --git a/needles/kde/apps/cpteditor_launch.json b/needles/kde/apps/cpteditor_launch.json
deleted file mode 100644
index 1ba5650e..00000000
--- a/needles/kde/apps/cpteditor_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "cpteditor_launch"
-  ],
-  "area": [
-    {
-      "xpos": 49,
-      "ypos": 280,
-      "width": 111,
-      "height": 15,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/cpteditor_launch.png b/needles/kde/apps/cpteditor_launch.png
deleted file mode 100644
index 5aafe24a..00000000
Binary files a/needles/kde/apps/cpteditor_launch.png and /dev/null differ
diff --git a/needles/kde/apps/csheets_launch.png b/needles/kde/apps/csheets_launch.png
deleted file mode 100644
index a5667a07..00000000
Binary files a/needles/kde/apps/csheets_launch.png and /dev/null differ
diff --git a/needles/kde/apps/cstage_launch.json b/needles/kde/apps/cstage_launch.json
deleted file mode 100644
index ce5bdb7e..00000000
--- a/needles/kde/apps/cstage_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "cstage_launch"
-  ],
-  "area": [
-    {
-      "xpos": 49,
-      "ypos": 485,
-      "width": 38,
-      "height": 20,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/cstage_launch.png b/needles/kde/apps/cstage_launch.png
deleted file mode 100644
index d60e4848..00000000
Binary files a/needles/kde/apps/cstage_launch.png and /dev/null differ
diff --git a/needles/kde/apps/cteditor_launch.json b/needles/kde/apps/cteditor_launch.json
deleted file mode 100644
index 5693210b..00000000
--- a/needles/kde/apps/cteditor_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "cteditor_launch"
-  ],
-  "area": [
-    {
-      "xpos": 50,
-      "ypos": 320,
-      "width": 110,
-      "height": 15,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/cteditor_launch.png b/needles/kde/apps/cteditor_launch.png
deleted file mode 100644
index 1c82532d..00000000
Binary files a/needles/kde/apps/cteditor_launch.png and /dev/null differ
diff --git a/needles/kde/apps/cwords_launch.json b/needles/kde/apps/cwords_launch.json
deleted file mode 100644
index 9229d04e..00000000
--- a/needles/kde/apps/cwords_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "cwords_launch"
-  ],
-  "area": [
-    {
-      "xpos": 53,
-      "ypos": 606,
-      "width": 31,
-      "height": 21,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/cwords_launch.png b/needles/kde/apps/cwords_launch.png
deleted file mode 100644
index bf1e1243..00000000
Binary files a/needles/kde/apps/cwords_launch.png and /dev/null differ
diff --git a/needles/kde/apps/dbusviewer_launch.json b/needles/kde/apps/dbusviewer_launch.json
deleted file mode 100644
index 8308c24a..00000000
--- a/needles/kde/apps/dbusviewer_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "dbusviewer_launch"
-  ],
-  "area": [
-    {
-      "xpos": 52,
-      "ypos": 246,
-      "width": 31,
-      "height": 21,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/dbusviewer_launch.png b/needles/kde/apps/dbusviewer_launch.png
deleted file mode 100644
index 6ef28f18..00000000
Binary files a/needles/kde/apps/dbusviewer_launch.png and /dev/null differ
diff --git a/needles/kde/apps/discover_launch.json b/needles/kde/apps/discover_launch.json
deleted file mode 100644
index dff59746..00000000
--- a/needles/kde/apps/discover_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "discover_launch"
-  ],
-  "area": [
-    {
-      "xpos": 53,
-      "ypos": 569,
-      "width": 31,
-      "height": 18,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/discover_launch.png b/needles/kde/apps/discover_launch.png
deleted file mode 100644
index f6b4e406..00000000
Binary files a/needles/kde/apps/discover_launch.png and /dev/null differ
diff --git a/needles/kde/apps/dnfdragora_launch.json b/needles/kde/apps/dnfdragora_launch.json
deleted file mode 100644
index e6e22862..00000000
--- a/needles/kde/apps/dnfdragora_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "dnfdragora_launch"
-  ],
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 287,
-      "width": 35,
-      "height": 16,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/dnfdragora_launch.png b/needles/kde/apps/dnfdragora_launch.png
deleted file mode 100644
index ca452cac..00000000
Binary files a/needles/kde/apps/dnfdragora_launch.png and /dev/null differ
diff --git a/needles/kde/apps/docviewer_launch.json b/needles/kde/apps/docviewer_launch.json
deleted file mode 100644
index 81f89edb..00000000
--- a/needles/kde/apps/docviewer_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "docviewer_launch"
-  ],
-  "area": [
-    {
-      "xpos": 52,
-      "ypos": 241,
-      "width": 30,
-      "height": 25,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/docviewer_launch.png b/needles/kde/apps/docviewer_launch.png
deleted file mode 100644
index 10febc62..00000000
Binary files a/needles/kde/apps/docviewer_launch.png and /dev/null differ
diff --git a/needles/kde/apps/dragon_launch.json b/needles/kde/apps/dragon_launch.json
deleted file mode 100644
index cc53e9eb..00000000
--- a/needles/kde/apps/dragon_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "dragon_launch"
-  ],
-  "area": [
-    {
-      "xpos": 52,
-      "ypos": 364,
-      "width": 32,
-      "height": 21,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/dragon_launch.png b/needles/kde/apps/dragon_launch.png
deleted file mode 100644
index 1281f34b..00000000
Binary files a/needles/kde/apps/dragon_launch.png and /dev/null differ
diff --git a/needles/kde/apps/falkon_launch.json b/needles/kde/apps/falkon_launch.json
deleted file mode 100644
index cbfb2a1c..00000000
--- a/needles/kde/apps/falkon_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "falkon_launch"
-  ],
-  "area": [
-    {
-      "xpos": 53,
-      "ypos": 527,
-      "width": 34,
-      "height": 22,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/falkon_launch.png b/needles/kde/apps/falkon_launch.png
deleted file mode 100644
index 831ea8ae..00000000
Binary files a/needles/kde/apps/falkon_launch.png and /dev/null differ
diff --git a/needles/kde/apps/firefox_close_tabs-20190509.json b/needles/kde/apps/firefox_close_tabs-20190509.json
new file mode 100644
index 00000000..d9dd7ba6
--- /dev/null
+++ b/needles/kde/apps/firefox_close_tabs-20190509.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 416,
+      "xpos": 672,
+      "type": "match",
+      "height": 14,
+      "width": 70
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "firefox_close_tabs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/firefox_close_tabs-20190509.png b/needles/kde/apps/firefox_close_tabs-20190509.png
new file mode 100644
index 00000000..ec11e0b1
Binary files /dev/null and b/needles/kde/apps/firefox_close_tabs-20190509.png differ
diff --git a/needles/kde/apps/firefox_launch.json b/needles/kde/apps/firefox_launch.json
deleted file mode 100644
index afa0d46a..00000000
--- a/needles/kde/apps/firefox_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "firefox_launch"
-  ],
-  "area": [
-    {
-      "xpos": 55,
-      "ypos": 567,
-      "width": 29,
-      "height": 22,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/firefox_launch.png b/needles/kde/apps/firefox_launch.png
deleted file mode 100644
index 90190d57..00000000
Binary files a/needles/kde/apps/firefox_launch.png and /dev/null differ
diff --git a/needles/kde/apps/firewall_launch.json b/needles/kde/apps/firewall_launch.json
deleted file mode 100644
index 899a82b2..00000000
--- a/needles/kde/apps/firewall_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "firewall_launch"
-  ],
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 244,
-      "width": 32,
-      "height": 20,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/firewall_launch.png b/needles/kde/apps/firewall_launch.png
deleted file mode 100644
index 182b404e..00000000
Binary files a/needles/kde/apps/firewall_launch.png and /dev/null differ
diff --git a/needles/kde/apps/fmw_launch-20190503.json b/needles/kde/apps/fmw_launch-20190503.json
deleted file mode 100644
index f9fd097f..00000000
--- a/needles/kde/apps/fmw_launch-20190503.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 29,
-      "ypos": 319,
-      "height": 29,
-      "xpos": 50,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "fmw_launch"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/fmw_launch-20190503.png b/needles/kde/apps/fmw_launch-20190503.png
deleted file mode 100644
index 16a5e818..00000000
Binary files a/needles/kde/apps/fmw_launch-20190503.png and /dev/null differ
diff --git a/needles/kde/apps/fmw_launch.json b/needles/kde/apps/fmw_launch.json
deleted file mode 100644
index 27219fe0..00000000
--- a/needles/kde/apps/fmw_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 56,
-      "ypos": 323,
-      "width": 27,
-      "height": 24,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "fmw_launch"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/fmw_launch.png b/needles/kde/apps/fmw_launch.png
deleted file mode 100644
index 280c6f83..00000000
Binary files a/needles/kde/apps/fmw_launch.png and /dev/null differ
diff --git a/needles/kde/apps/gwenview_launch.json b/needles/kde/apps/gwenview_launch.json
deleted file mode 100644
index 41b47f3b..00000000
--- a/needles/kde/apps/gwenview_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "gwenview_launch"
-  ],
-  "area": [
-    {
-      "xpos": 48,
-      "ypos": 283,
-      "width": 39,
-      "height": 23,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/gwenview_launch.png b/needles/kde/apps/gwenview_launch.png
deleted file mode 100644
index 29c0e0cb..00000000
Binary files a/needles/kde/apps/gwenview_launch.png and /dev/null differ
diff --git a/needles/kde/apps/help_launch.json b/needles/kde/apps/help_launch.json
deleted file mode 100644
index 9c0c6f60..00000000
--- a/needles/kde/apps/help_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "help_launch"
-  ],
-  "area": [
-    {
-      "xpos": 50,
-      "ypos": 607,
-      "width": 33,
-      "height": 22,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/help_launch.png b/needles/kde/apps/help_launch.png
deleted file mode 100644
index 43789340..00000000
Binary files a/needles/kde/apps/help_launch.png and /dev/null differ
diff --git a/needles/kde/apps/infocenter_launch.json b/needles/kde/apps/infocenter_launch.json
deleted file mode 100644
index 2b279d9b..00000000
--- a/needles/kde/apps/infocenter_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 402,
-      "width": 34,
-      "height": 26,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "infocenter_launch"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/infocenter_launch.png b/needles/kde/apps/infocenter_launch.png
deleted file mode 100644
index 56acd21d..00000000
Binary files a/needles/kde/apps/infocenter_launch.png and /dev/null differ
diff --git a/needles/kde/apps/juk_launch.json b/needles/kde/apps/juk_launch.json
deleted file mode 100644
index a0a97f02..00000000
--- a/needles/kde/apps/juk_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "juk_launch"
-  ],
-  "area": [
-    {
-      "xpos": 54,
-      "ypos": 326,
-      "width": 31,
-      "height": 16,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/juk_launch.png b/needles/kde/apps/juk_launch.png
deleted file mode 100644
index b2ec9fb1..00000000
Binary files a/needles/kde/apps/juk_launch.png and /dev/null differ
diff --git a/needles/kde/apps/k3b_launch.json b/needles/kde/apps/k3b_launch.json
deleted file mode 100644
index 82c396dd..00000000
--- a/needles/kde/apps/k3b_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "k3b_launch"
-  ],
-  "area": [
-    {
-      "xpos": 54,
-      "ypos": 285,
-      "width": 30,
-      "height": 18,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/k3b_launch.png b/needles/kde/apps/k3b_launch.png
deleted file mode 100644
index 5495ef14..00000000
Binary files a/needles/kde/apps/k3b_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kaddressbook_launch-20190530.json b/needles/kde/apps/kaddressbook_launch-20190530.json
deleted file mode 100644
index 4a90e1e9..00000000
--- a/needles/kde/apps/kaddressbook_launch-20190530.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 25,
-      "xpos": 36,
-      "type": "match",
-      "width": 53,
-      "ypos": 242
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "kaddressbook_launch"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kaddressbook_launch-20190530.png b/needles/kde/apps/kaddressbook_launch-20190530.png
deleted file mode 100644
index 6cf592f2..00000000
Binary files a/needles/kde/apps/kaddressbook_launch-20190530.png and /dev/null differ
diff --git a/needles/kde/apps/kaddressbook_launch.json b/needles/kde/apps/kaddressbook_launch.json
deleted file mode 100644
index f54a3d70..00000000
--- a/needles/kde/apps/kaddressbook_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kaddressbook_launch"
-  ],
-  "area": [
-    {
-      "xpos": 54,
-      "ypos": 244,
-      "width": 53,
-      "height": 22,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kaddressbook_launch.png b/needles/kde/apps/kaddressbook_launch.png
deleted file mode 100644
index 3613b1df..00000000
Binary files a/needles/kde/apps/kaddressbook_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kamoso_launch.json b/needles/kde/apps/kamoso_launch.json
deleted file mode 100644
index 9b79c57a..00000000
--- a/needles/kde/apps/kamoso_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kamoso_launch"
-  ],
-  "area": [
-    {
-      "xpos": 49,
-      "ypos": 242,
-      "width": 36,
-      "height": 23,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kamoso_launch.png b/needles/kde/apps/kamoso_launch.png
deleted file mode 100644
index d39372cb..00000000
Binary files a/needles/kde/apps/kamoso_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kcalc_launch.json b/needles/kde/apps/kcalc_launch.json
deleted file mode 100644
index fe5af6c0..00000000
--- a/needles/kde/apps/kcalc_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kcalc_launch"
-  ],
-  "area": [
-    {
-      "xpos": 53,
-      "ypos": 522,
-      "width": 32,
-      "height": 23,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kcalc_launch.png b/needles/kde/apps/kcalc_launch.png
deleted file mode 100644
index 8a878eee..00000000
Binary files a/needles/kde/apps/kcalc_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kcharselect_launch.json b/needles/kde/apps/kcharselect_launch.json
deleted file mode 100644
index 754654d0..00000000
--- a/needles/kde/apps/kcharselect_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kcharselect_launch"
-  ],
-  "area": [
-    {
-      "xpos": 53,
-      "ypos": 324,
-      "width": 30,
-      "height": 21,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kcharselect_launch.png b/needles/kde/apps/kcharselect_launch.png
deleted file mode 100644
index f0c6d97f..00000000
Binary files a/needles/kde/apps/kcharselect_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kcolorchooser_launch.json b/needles/kde/apps/kcolorchooser_launch.json
deleted file mode 100644
index 8a30d204..00000000
--- a/needles/kde/apps/kcolorchooser_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kcolorchooser_launch"
-  ],
-  "area": [
-    {
-      "xpos": 54,
-      "ypos": 244,
-      "width": 30,
-      "height": 21,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kcolorchooser_launch.png b/needles/kde/apps/kcolorchooser_launch.png
deleted file mode 100644
index 0b78f20a..00000000
Binary files a/needles/kde/apps/kcolorchooser_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kde-menu-launcher.json b/needles/kde/apps/kde-menu-launcher.json
deleted file mode 100644
index ad267697..00000000
--- a/needles/kde/apps/kde-menu-launcher.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kde_menu_launcher"
-  ],
-  "area": [
-    {
-      "xpos": 6,
-      "ypos": 739,
-      "width": 26,
-      "height": 25,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kde-menu-launcher.png b/needles/kde/apps/kde-menu-launcher.png
deleted file mode 100644
index a7669154..00000000
Binary files a/needles/kde/apps/kde-menu-launcher.png and /dev/null differ
diff --git a/needles/kde/apps/abrt_launch.json b/needles/kde/apps/kde_ok-20190619.json
similarity index 59%
rename from needles/kde/apps/abrt_launch.json
rename to needles/kde/apps/kde_ok-20190619.json
index d1f62ea4..28b5ba98 100644
--- a/needles/kde/apps/abrt_launch.json
+++ b/needles/kde/apps/kde_ok-20190619.json
@@ -1,13 +1,13 @@
 {
   "properties": [],
   "tags": [
-    "abrt_launch"
+    "kde_ok"
   ],
   "area": [
     {
-      "xpos": 56,
-      "ypos": 485,
-      "width": 25,
+      "xpos": 798,
+      "ypos": 556,
+      "width": 42,
       "height": 20,
       "type": "match"
     }
diff --git a/needles/kde/apps/kde_ok-20190619.png b/needles/kde/apps/kde_ok-20190619.png
new file mode 100644
index 00000000..3dc268a1
Binary files /dev/null and b/needles/kde/apps/kde_ok-20190619.png differ
diff --git a/needles/kde/apps/kfind_launch.json b/needles/kde/apps/kfind_launch.json
deleted file mode 100644
index b575364c..00000000
--- a/needles/kde/apps/kfind_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kfind_launch"
-  ],
-  "area": [
-    {
-      "xpos": 55,
-      "ypos": 444,
-      "width": 26,
-      "height": 21,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kfind_launch.png b/needles/kde/apps/kfind_launch.png
deleted file mode 100644
index c2da10c4..00000000
Binary files a/needles/kde/apps/kfind_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kget_launch.png b/needles/kde/apps/kget_launch.png
deleted file mode 100644
index 1870d8ab..00000000
Binary files a/needles/kde/apps/kget_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kgpg_launch.json b/needles/kde/apps/kgpg_launch.json
deleted file mode 100644
index a5bbb140..00000000
--- a/needles/kde/apps/kgpg_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kgpg_launch"
-  ],
-  "area": [
-    {
-      "xpos": 55,
-      "ypos": 362,
-      "width": 23,
-      "height": 23,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kgpg_launch.png b/needles/kde/apps/kgpg_launch.png
deleted file mode 100644
index 36b6a50c..00000000
Binary files a/needles/kde/apps/kgpg_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kimport_launch.json b/needles/kde/apps/kimport_launch.json
deleted file mode 100644
index 46ce2589..00000000
--- a/needles/kde/apps/kimport_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kimport_launch"
-  ],
-  "area": [
-    {
-      "xpos": 53,
-      "ypos": 487,
-      "width": 28,
-      "height": 19,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kimport_launch.png b/needles/kde/apps/kimport_launch.png
deleted file mode 100644
index 80530891..00000000
Binary files a/needles/kde/apps/kimport_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kmag_launch.png b/needles/kde/apps/kmag_launch.png
deleted file mode 100644
index 2aad5793..00000000
Binary files a/needles/kde/apps/kmag_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kmail_hedit_launch.json b/needles/kde/apps/kmail_hedit_launch.json
deleted file mode 100644
index a33b3173..00000000
--- a/needles/kde/apps/kmail_hedit_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kmail_hedit_launch"
-  ],
-  "area": [
-    {
-      "xpos": 94,
-      "ypos": 560,
-      "width": 45,
-      "height": 30,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kmail_hedit_launch.png b/needles/kde/apps/kmail_hedit_launch.png
deleted file mode 100644
index 0d865edb..00000000
Binary files a/needles/kde/apps/kmail_hedit_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kmail_launch.json b/needles/kde/apps/kmail_launch.json
deleted file mode 100644
index 31aaac14..00000000
--- a/needles/kde/apps/kmail_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kmail_launch"
-  ],
-  "area": [
-    {
-      "xpos": 96,
-      "ypos": 521,
-      "width": 42,
-      "height": 28,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kmail_launch.png b/needles/kde/apps/kmail_launch.png
deleted file mode 100644
index 4ba68fc9..00000000
Binary files a/needles/kde/apps/kmail_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kmousetool_launch.json b/needles/kde/apps/kmousetool_launch.json
deleted file mode 100644
index 6767f06e..00000000
--- a/needles/kde/apps/kmousetool_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kmousetool_launch"
-  ],
-  "area": [
-    {
-      "xpos": 57,
-      "ypos": 285,
-      "width": 22,
-      "height": 19,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kmousetool_launch.png b/needles/kde/apps/kmousetool_launch.png
deleted file mode 100644
index 94e65804..00000000
Binary files a/needles/kde/apps/kmousetool_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kmouth_launch.json b/needles/kde/apps/kmouth_launch.json
deleted file mode 100644
index ca0c1add..00000000
--- a/needles/kde/apps/kmouth_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kmouth_launch"
-  ],
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 525,
-      "width": 32,
-      "height": 16,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kmouth_launch.png b/needles/kde/apps/kmouth_launch.png
deleted file mode 100644
index c010d578..00000000
Binary files a/needles/kde/apps/kmouth_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kolourpaint_launch.json b/needles/kde/apps/kolourpaint_launch.json
deleted file mode 100644
index 86b5226e..00000000
--- a/needles/kde/apps/kolourpaint_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kolourpaint_launch"
-  ],
-  "area": [
-    {
-      "xpos": 49,
-      "ypos": 321,
-      "width": 33,
-      "height": 27,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kolourpaint_launch.png b/needles/kde/apps/kolourpaint_launch.png
deleted file mode 100644
index 645b2d35..00000000
Binary files a/needles/kde/apps/kolourpaint_launch.png and /dev/null differ
diff --git a/needles/kde/apps/konqueror_launch.json b/needles/kde/apps/konqueror_launch.json
deleted file mode 100644
index 3fd51db3..00000000
--- a/needles/kde/apps/konqueror_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "konqueror_launch"
-  ],
-  "area": [
-    {
-      "xpos": 56,
-      "ypos": 608,
-      "width": 25,
-      "height": 20,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/konqueror_launch.png b/needles/kde/apps/konqueror_launch.png
deleted file mode 100644
index 1b770ff8..00000000
Binary files a/needles/kde/apps/konqueror_launch.png and /dev/null differ
diff --git a/needles/kde/apps/konsole_launch.json b/needles/kde/apps/konsole_launch.json
deleted file mode 100644
index 5bb1773b..00000000
--- a/needles/kde/apps/konsole_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "konsole_launch"
-  ],
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 566,
-      "width": 33,
-      "height": 23,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/konsole_launch.png b/needles/kde/apps/konsole_launch.png
deleted file mode 100644
index 638fa246..00000000
Binary files a/needles/kde/apps/konsole_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kontact_launch.json b/needles/kde/apps/kontact_launch.json
deleted file mode 100644
index 18eba1a8..00000000
--- a/needles/kde/apps/kontact_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kontact_launch"
-  ],
-  "area": [
-    {
-      "xpos": 52,
-      "ypos": 323,
-      "width": 33,
-      "height": 28,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kontact_launch.png b/needles/kde/apps/kontact_launch.png
deleted file mode 100644
index 3013a893..00000000
Binary files a/needles/kde/apps/kontact_launch.png and /dev/null differ
diff --git a/needles/kde/apps/konversation_launch.json b/needles/kde/apps/konversation_launch.json
deleted file mode 100644
index 2a495e3b..00000000
--- a/needles/kde/apps/konversation_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "konversation_launch"
-  ],
-  "area": [
-    {
-      "xpos": 52,
-      "ypos": 481,
-      "width": 33,
-      "height": 19,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/konversation_launch.png b/needles/kde/apps/konversation_launch.png
deleted file mode 100644
index 0a3da2d5..00000000
Binary files a/needles/kde/apps/konversation_launch.png and /dev/null differ
diff --git a/needles/kde/apps/korganizer_launch.json b/needles/kde/apps/korganizer_launch.json
deleted file mode 100644
index 8a438cce..00000000
--- a/needles/kde/apps/korganizer_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "korganizer_launch"
-  ],
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 524,
-      "width": 33,
-      "height": 19,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/korganizer_launch.png b/needles/kde/apps/korganizer_launch.png
deleted file mode 100644
index 01934103..00000000
Binary files a/needles/kde/apps/korganizer_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kparted_launch.json b/needles/kde/apps/kparted_launch.json
deleted file mode 100644
index 147df4da..00000000
--- a/needles/kde/apps/kparted_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kparted_launch"
-  ],
-  "area": [
-    {
-      "xpos": 48,
-      "ypos": 441,
-      "width": 31,
-      "height": 26,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kparted_launch.png b/needles/kde/apps/kparted_launch.png
deleted file mode 100644
index e5197115..00000000
Binary files a/needles/kde/apps/kparted_launch.png and /dev/null differ
diff --git a/needles/kde/apps/krdc_launch.json b/needles/kde/apps/krdc_launch.json
deleted file mode 100644
index c7109310..00000000
--- a/needles/kde/apps/krdc_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "krdc_launch"
-  ],
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 404,
-      "width": 35,
-      "height": 23,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/krdc_launch.png b/needles/kde/apps/krdc_launch.png
deleted file mode 100644
index c3d3f000..00000000
Binary files a/needles/kde/apps/krdc_launch.png and /dev/null differ
diff --git a/needles/kde/apps/krfb_launch.json b/needles/kde/apps/krfb_launch.json
deleted file mode 100644
index 0b8513d2..00000000
--- a/needles/kde/apps/krfb_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "krfb_launch"
-  ],
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 363,
-      "width": 35,
-      "height": 19,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/krfb_launch.png b/needles/kde/apps/krfb_launch.png
deleted file mode 100644
index ce66157d..00000000
Binary files a/needles/kde/apps/krfb_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kruler_launch.json b/needles/kde/apps/kruler_launch.json
deleted file mode 100644
index 97dbed04..00000000
--- a/needles/kde/apps/kruler_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kruler_launch"
-  ],
-  "area": [
-    {
-      "xpos": 50,
-      "ypos": 286,
-      "width": 34,
-      "height": 17,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kruler_launch.png b/needles/kde/apps/kruler_launch.png
deleted file mode 100644
index 0779f34c..00000000
Binary files a/needles/kde/apps/kruler_launch.png and /dev/null differ
diff --git a/needles/kde/apps/krusader_launch.json b/needles/kde/apps/krusader_launch.json
deleted file mode 100644
index 45f49c41..00000000
--- a/needles/kde/apps/krusader_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "krusader_launch"
-  ],
-  "area": [
-    {
-      "xpos": 52,
-      "ypos": 401,
-      "width": 32,
-      "height": 26,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/krusader_launch.png b/needles/kde/apps/krusader_launch.png
deleted file mode 100644
index ac0a5dc8..00000000
Binary files a/needles/kde/apps/krusader_launch.png and /dev/null differ
diff --git a/needles/kde/apps/ksysguard_launch.json b/needles/kde/apps/ksysguard_launch.json
deleted file mode 100644
index 9584d28b..00000000
--- a/needles/kde/apps/ksysguard_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "ksysguard_launch"
-  ],
-  "area": [
-    {
-      "xpos": 50,
-      "ypos": 600,
-      "width": 34,
-      "height": 27,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/ksysguard_launch.png b/needles/kde/apps/ksysguard_launch.png
deleted file mode 100644
index b4064d33..00000000
Binary files a/needles/kde/apps/ksysguard_launch.png and /dev/null differ
diff --git a/needles/kde/apps/ktnef_launch.json b/needles/kde/apps/ktnef_launch.json
deleted file mode 100644
index 40cc1c3f..00000000
--- a/needles/kde/apps/ktnef_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "ktnef_launch"
-  ],
-  "area": [
-    {
-      "xpos": 54,
-      "ypos": 485,
-      "width": 31,
-      "height": 21,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/ktnef_launch.png b/needles/kde/apps/ktnef_launch.png
deleted file mode 100644
index aa61f8f8..00000000
Binary files a/needles/kde/apps/ktnef_launch.png and /dev/null differ
diff --git a/needles/kde/apps/ktorrent_launch.json b/needles/kde/apps/ktorrent_launch.json
deleted file mode 100644
index 3820783a..00000000
--- a/needles/kde/apps/ktorrent_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "ktorrent_launch"
-  ],
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 243,
-      "width": 31,
-      "height": 25,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/ktorrent_launch.png b/needles/kde/apps/ktorrent_launch.png
deleted file mode 100644
index 90d815b6..00000000
Binary files a/needles/kde/apps/ktorrent_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kwallet_launch.json b/needles/kde/apps/kwallet_launch.json
deleted file mode 100644
index 913bf688..00000000
--- a/needles/kde/apps/kwallet_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kwallet_launch"
-  ],
-  "area": [
-    {
-      "xpos": 55,
-      "ypos": 606,
-      "width": 30,
-      "height": 23,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kwallet_launch.png b/needles/kde/apps/kwallet_launch.png
deleted file mode 100644
index 2831d396..00000000
Binary files a/needles/kde/apps/kwallet_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kwrite_launch.json b/needles/kde/apps/kwrite_launch.json
deleted file mode 100644
index 4a9b3dfb..00000000
--- a/needles/kde/apps/kwrite_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kwrite_launch"
-  ],
-  "area": [
-    {
-      "xpos": 55,
-      "ypos": 564,
-      "width": 26,
-      "height": 25,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kwrite_launch.png b/needles/kde/apps/kwrite_launch.png
deleted file mode 100644
index 235f1141..00000000
Binary files a/needles/kde/apps/kwrite_launch.png and /dev/null differ
diff --git a/needles/kde/apps/language_launch.json b/needles/kde/apps/language_launch.json
deleted file mode 100644
index c2a9f144..00000000
--- a/needles/kde/apps/language_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "language_launch"
-  ],
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 322,
-      "width": 34,
-      "height": 17,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/language_launch.png b/needles/kde/apps/language_launch.png
deleted file mode 100644
index 97d6fdc1..00000000
Binary files a/needles/kde/apps/language_launch.png and /dev/null differ
diff --git a/needles/kde/apps/mahjong_launch.json b/needles/kde/apps/mahjong_launch.json
deleted file mode 100644
index 7ddb1c44..00000000
--- a/needles/kde/apps/mahjong_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 52,
-      "ypos": 241,
-      "width": 30,
-      "height": 25,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "mahjong_launch"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/mahjong_launch.png b/needles/kde/apps/mahjong_launch.png
deleted file mode 100644
index 352ed054..00000000
Binary files a/needles/kde/apps/mahjong_launch.png and /dev/null differ
diff --git a/needles/kde/apps/menu_administration-20190530.json b/needles/kde/apps/menu_administration-20190530.json
deleted file mode 100644
index ee6fd7fe..00000000
--- a/needles/kde/apps/menu_administration-20190530.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 37,
-      "height": 22,
-      "type": "match",
-      "width": 54,
-      "ypos": 243
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "menu_administration"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/menu_administration-20190530.png b/needles/kde/apps/menu_administration-20190530.png
deleted file mode 100644
index f6e1c054..00000000
Binary files a/needles/kde/apps/menu_administration-20190530.png and /dev/null differ
diff --git a/needles/kde/apps/menu_settings-20190530.json b/needles/kde/apps/menu_settings-20190530.json
deleted file mode 100644
index a196746c..00000000
--- a/needles/kde/apps/menu_settings-20190530.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 22,
-      "xpos": 35,
-      "ypos": 523,
-      "width": 55,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "menu_settings"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/menu_settings-20190530.png b/needles/kde/apps/menu_settings-20190530.png
deleted file mode 100644
index dd041a8f..00000000
Binary files a/needles/kde/apps/menu_settings-20190530.png and /dev/null differ
diff --git a/needles/kde/apps/minesweeper_launch.json b/needles/kde/apps/minesweeper_launch.json
deleted file mode 100644
index 7737dce8..00000000
--- a/needles/kde/apps/minesweeper_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 245,
-      "width": 32,
-      "height": 17,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "minesweeper_launch"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/minesweeper_launch.png b/needles/kde/apps/minesweeper_launch.png
deleted file mode 100644
index f4b38dd4..00000000
Binary files a/needles/kde/apps/minesweeper_launch.png and /dev/null differ
diff --git a/needles/kde/apps/netcon_launch.json b/needles/kde/apps/netcon_launch.json
deleted file mode 100644
index 9db1f16e..00000000
--- a/needles/kde/apps/netcon_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "netcon_launch"
-  ],
-  "area": [
-    {
-      "xpos": 54,
-      "ypos": 245,
-      "width": 31,
-      "height": 20,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/netcon_launch.png b/needles/kde/apps/netcon_launch.png
deleted file mode 100644
index 7b7716b6..00000000
Binary files a/needles/kde/apps/netcon_launch.png and /dev/null differ
diff --git a/needles/kde/apps/patience_launch.json b/needles/kde/apps/patience_launch.json
deleted file mode 100644
index 86617a1a..00000000
--- a/needles/kde/apps/patience_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 243,
-      "width": 32,
-      "height": 22,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "patience_launch"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/patience_launch.png b/needles/kde/apps/patience_launch.png
deleted file mode 100644
index 588f9f1b..00000000
Binary files a/needles/kde/apps/patience_launch.png and /dev/null differ
diff --git a/needles/kde/apps/pimexporter_launch.json b/needles/kde/apps/pimexporter_launch.json
deleted file mode 100644
index c8da85a8..00000000
--- a/needles/kde/apps/pimexporter_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "pimexporter_launch"
-  ],
-  "area": [
-    {
-      "xpos": 52,
-      "ypos": 609,
-      "width": 33,
-      "height": 20,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/pimexporter_launch.png b/needles/kde/apps/pimexporter_launch.png
deleted file mode 100644
index b046e100..00000000
Binary files a/needles/kde/apps/pimexporter_launch.png and /dev/null differ
diff --git a/needles/kde/apps/relnotes_launch.json b/needles/kde/apps/relnotes_launch.json
deleted file mode 100644
index aaa940ce..00000000
--- a/needles/kde/apps/relnotes_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "relnotes_launch"
-  ],
-  "area": [
-    {
-      "xpos": 52,
-      "ypos": 526,
-      "width": 31,
-      "height": 19,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/relnotes_launch.png b/needles/kde/apps/relnotes_launch.png
deleted file mode 100644
index ac6dcb55..00000000
Binary files a/needles/kde/apps/relnotes_launch.png and /dev/null differ
diff --git a/needles/kde/apps/spectacle_launch.json b/needles/kde/apps/spectacle_launch.json
deleted file mode 100644
index f407d1c7..00000000
--- a/needles/kde/apps/spectacle_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "spectacle_launch"
-  ],
-  "area": [
-    {
-      "xpos": 50,
-      "ypos": 484,
-      "width": 37,
-      "height": 23,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/spectacle_launch.png b/needles/kde/apps/spectacle_launch.png
deleted file mode 100644
index ba0a3904..00000000
Binary files a/needles/kde/apps/spectacle_launch.png and /dev/null differ
diff --git a/needles/kde/apps/system_settings_launch.json b/needles/kde/apps/system_settings_launch.json
deleted file mode 100644
index a666644b..00000000
--- a/needles/kde/apps/system_settings_launch.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 51,
-      "ypos": 283,
-      "width": 33,
-      "height": 23,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "system_settings_launch"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/system_settings_launch.png b/needles/kde/apps/system_settings_launch.png
deleted file mode 100644
index 3d3000d1..00000000
Binary files a/needles/kde/apps/system_settings_launch.png and /dev/null differ
diff --git a/needles/kde/apps/kget_launch.json b/needles/kde/apps/users_runs.json
similarity index 59%
rename from needles/kde/apps/kget_launch.json
rename to needles/kde/apps/users_runs.json
index 137fd0fb..f4b1dae3 100644
--- a/needles/kde/apps/kget_launch.json
+++ b/needles/kde/apps/users_runs.json
@@ -1,13 +1,13 @@
 {
   "properties": [],
   "tags": [
-    "kget_launch"
+    "users_runs"
   ],
   "area": [
     {
-      "xpos": 55,
-      "ypos": 405,
-      "width": 29,
+      "xpos": 468,
+      "ypos": 116,
+      "width": 96,
       "height": 19,
       "type": "match"
     }
diff --git a/needles/kde/apps/users_runs.png b/needles/kde/apps/users_runs.png
new file mode 100644
index 00000000..13a0f9d8
Binary files /dev/null and b/needles/kde/apps/users_runs.png differ
diff --git a/tests/apps_startstop/kde/abrt.pm b/tests/apps_startstop/kde/abrt.pm
index 4640959a..0d1c765a 100644
--- a/tests/apps_startstop/kde/abrt.pm
+++ b/tests/apps_startstop/kde/abrt.pm
@@ -7,9 +7,8 @@ use utils;
 
 sub run {
     my $self = shift;
-    
     # Start the application
-    start_with_launcher('abrt_launch', 'menu_applications','menu_system');
+    menu_launch_type('abrt');
     # Check that it is started
     assert_screen 'abrt_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/akregator.pm b/tests/apps_startstop/kde/akregator.pm
index 62d61595..a2fc3850 100644
--- a/tests/apps_startstop/kde/akregator.pm
+++ b/tests/apps_startstop/kde/akregator.pm
@@ -7,9 +7,8 @@ use utils;
 
 sub run {
     my $self = shift;
-    
     # Start the application
-    start_with_launcher('akregator_launch','menu_applications','menu_internet');
+    menu_launch_type('akregator');
     # Check that it is started
     assert_screen 'akregator_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/ark.pm b/tests/apps_startstop/kde/ark.pm
index bdc8c2a4..8ed2220c 100644
--- a/tests/apps_startstop/kde/ark.pm
+++ b/tests/apps_startstop/kde/ark.pm
@@ -7,9 +7,8 @@ use utils;
 
 sub run {
     my $self = shift;
-    
-    # Start the application
-    start_with_launcher('ark_launch','menu_applications','menu_utilities');
+    # Start the application with command
+    menu_launch_type 'ark';
     # Check that it is started
     assert_screen 'ark_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/cpteditor.pm b/tests/apps_startstop/kde/cpteditor.pm
index 5666f767..ee09557f 100644
--- a/tests/apps_startstop/kde/cpteditor.pm
+++ b/tests/apps_startstop/kde/cpteditor.pm
@@ -7,9 +7,7 @@ use utils;
 
 sub run {
     my $self = shift;
-    
-    # Start the application
-    start_with_launcher('cpteditor_launch','menu_applications','menu_internet');
+    menu_launch_type 'printthemeeditor';
     # Check that it is started
     assert_screen 'cpteditor_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/csheets.pm b/tests/apps_startstop/kde/csheets.pm
index f4923285..68b38a89 100644
--- a/tests/apps_startstop/kde/csheets.pm
+++ b/tests/apps_startstop/kde/csheets.pm
@@ -7,9 +7,7 @@ use utils;
 
 sub run {
     my $self = shift;
-    
-    # Start the application
-    start_with_launcher('csheets_launch','menu_applications','menu_office');
+    menu_launch_type 'calligra sheets';
     # Check that it is started
     assert_screen 'csheets_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/cstage.pm b/tests/apps_startstop/kde/cstage.pm
index 3c4f5d07..4b596707 100644
--- a/tests/apps_startstop/kde/cstage.pm
+++ b/tests/apps_startstop/kde/cstage.pm
@@ -7,9 +7,7 @@ use utils;
 
 sub run {
     my $self = shift;
-    
-    # Start the application
-    start_with_launcher('cstage_launch','menu_applications','menu_office');
+    menu_launch_type 'calligra stage';
     # Check that it is started
     assert_screen 'cstage_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/cteditor.pm b/tests/apps_startstop/kde/cteditor.pm
index 95088bd8..a6b0c7af 100644
--- a/tests/apps_startstop/kde/cteditor.pm
+++ b/tests/apps_startstop/kde/cteditor.pm
@@ -8,8 +8,7 @@ use utils;
 sub run {
     my $self = shift;
     
-    # Start the application
-    start_with_launcher('cteditor_launch','menu_applications','menu_internet');
+    menu_launch_type 'contactthemeeditor';
     # Check that it is started
     assert_screen 'cteditor_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/cwords.pm b/tests/apps_startstop/kde/cwords.pm
index 72bca294..9402fb1b 100644
--- a/tests/apps_startstop/kde/cwords.pm
+++ b/tests/apps_startstop/kde/cwords.pm
@@ -8,8 +8,7 @@ use utils;
 sub run {
     my $self = shift;
     
-    # Start the application
-    start_with_launcher('cwords_launch','menu_applications','menu_office');
+    menu_launch_type 'calligra words';
     # Check that it is started
     assert_screen 'cwords_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/dbusviewer.pm b/tests/apps_startstop/kde/dbusviewer.pm
index d2d81a7c..f67be00b 100644
--- a/tests/apps_startstop/kde/dbusviewer.pm
+++ b/tests/apps_startstop/kde/dbusviewer.pm
@@ -7,9 +7,8 @@ use utils;
 
 sub run {
     my $self = shift;
-    
-    # Start the application
-    start_with_launcher('dbusviewer_launch', 'menu_applications','menu_development');
+   
+    menu_launch_type 'dbusviewer';
     # Check that it is started
     assert_screen 'dbusviewer_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/discover.pm b/tests/apps_startstop/kde/discover.pm
index bf708404..581fd687 100644
--- a/tests/apps_startstop/kde/discover.pm
+++ b/tests/apps_startstop/kde/discover.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('discover_launch','menu_applications','menu_system');
+    menu_launch_type 'discover';
     # Check that it is started
     assert_screen 'discover_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/dnfdragora.pm b/tests/apps_startstop/kde/dnfdragora.pm
index 3c317730..13c6bb38 100644
--- a/tests/apps_startstop/kde/dnfdragora.pm
+++ b/tests/apps_startstop/kde/dnfdragora.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('dnfdragora_launch', 'menu_applications','menu_administration');
+    menu_launch_type 'dnfdragora';
     # Check that it is started
     assert_screen 'dnfdragora_runs';
     sleep 60;
diff --git a/tests/apps_startstop/kde/docviewer.pm b/tests/apps_startstop/kde/docviewer.pm
index 1690802a..6c27d97a 100644
--- a/tests/apps_startstop/kde/docviewer.pm
+++ b/tests/apps_startstop/kde/docviewer.pm
@@ -7,9 +7,9 @@ use utils;
 
 sub run {
     my $self = shift;
-    
+
     # Start the application
-    start_with_launcher('docviewer_launch', 'menu_applications','menu_graphics');
+    menu_launch_type 'okular';
     # Check that it is started
     assert_screen 'docviewer_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/dolphin.pm b/tests/apps_startstop/kde/dolphin.pm
index 0c955b53..9c792931 100644
--- a/tests/apps_startstop/kde/dolphin.pm
+++ b/tests/apps_startstop/kde/dolphin.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('dolphin_launch','menu_applications','menu_system');
+    menu_launch_type 'dolphin';
     # Check that it is started
     assert_screen 'dolphin_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/falkon.pm b/tests/apps_startstop/kde/falkon.pm
index 3584bb29..3d8135ad 100644
--- a/tests/apps_startstop/kde/falkon.pm
+++ b/tests/apps_startstop/kde/falkon.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('falkon_launch','menu_applications','menu_internet');
+    menu_launch_type 'falkon';
     # Check that it is started
     assert_screen 'falkon_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/firefox.pm b/tests/apps_startstop/kde/firefox.pm
index 0c4569f5..a4099605 100644
--- a/tests/apps_startstop/kde/firefox.pm
+++ b/tests/apps_startstop/kde/firefox.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('firefox_launch','menu_applications','menu_internet');
+    menu_launch_type 'firefox';
     # Check that it is started; this needle is from
     # needles/firefox, it already existed before the 'apps' tests
     # were created
diff --git a/tests/apps_startstop/kde/firewall.pm b/tests/apps_startstop/kde/firewall.pm
index d54b9a54..53a50b42 100644
--- a/tests/apps_startstop/kde/firewall.pm
+++ b/tests/apps_startstop/kde/firewall.pm
@@ -9,10 +9,16 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('firewall_launch', 'menu_applications','menu_administration');
+    menu_launch_type 'firewall';
+    sleep 5;
     # Firewall requires password to be entered and confirmed to start.
-    type_very_safely(get_var('ROOT_PASSWORD','weakpassword'));
+    # View password
+    assert_screen "auth_required";
+    my $password = get_var('ROOT_PASSWORD','weakpassword');
+    type_very_safely $password;
     send_key 'ret';
+    sleep 5;
+
     # Check that it is started
     assert_screen 'firewall_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/gwenview.pm b/tests/apps_startstop/kde/gwenview.pm
index 08d2b50b..eb1cb88c 100644
--- a/tests/apps_startstop/kde/gwenview.pm
+++ b/tests/apps_startstop/kde/gwenview.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('gwenview_launch','menu_applications','menu_graphics');
+    menu_launch_type 'gwenview';
     # Check that it is started
     assert_screen 'gwenview_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/help.pm b/tests/apps_startstop/kde/help.pm
index 680fa4b3..5f337c6e 100644
--- a/tests/apps_startstop/kde/help.pm
+++ b/tests/apps_startstop/kde/help.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('help_launch','menu_applications');
+    menu_launch_type 'help';
     # Check that it is started
     assert_screen 'help_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/infocenter.pm b/tests/apps_startstop/kde/infocenter.pm
index e351c5c6..ae9cc961 100644
--- a/tests/apps_startstop/kde/infocenter.pm
+++ b/tests/apps_startstop/kde/infocenter.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('infocenter_launch','menu_applications','menu_system');
+    menu_launch_type 'info';
     # Check that it is started
     assert_screen 'infocenter_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/juk.pm b/tests/apps_startstop/kde/juk.pm
index 4d568c5d..73535e2b 100644
--- a/tests/apps_startstop/kde/juk.pm
+++ b/tests/apps_startstop/kde/juk.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('juk_launch','menu_applications','menu_multimedia');
+    menu_launch_type 'juk';
     # Dismiss a setting window
     assert_and_click 'juk_cancel';
     wait_still_screen 2;
diff --git a/tests/apps_startstop/kde/k3b.pm b/tests/apps_startstop/kde/k3b.pm
index abf7012d..b9acd5aa 100644
--- a/tests/apps_startstop/kde/k3b.pm
+++ b/tests/apps_startstop/kde/k3b.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('k3b_launch','menu_applications','menu_multimedia');
+    menu_launch_type 'k3b';
     # Get rid of no burner warning
     assert_and_click 'k3b_burner_warning';
     # Check that it is started
diff --git a/tests/apps_startstop/kde/kaddressbook.pm b/tests/apps_startstop/kde/kaddressbook.pm
index f7ff221d..5f5abc68 100644
--- a/tests/apps_startstop/kde/kaddressbook.pm
+++ b/tests/apps_startstop/kde/kaddressbook.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kaddressbook_launch','menu_applications','menu_office');
+    menu_launch_type 'kaddressbook';
     # Check that it is started
     assert_screen 'kaddressbook_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kcalc.pm b/tests/apps_startstop/kde/kcalc.pm
index ae62c749..1a8274b1 100644
--- a/tests/apps_startstop/kde/kcalc.pm
+++ b/tests/apps_startstop/kde/kcalc.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kcalc_launch','menu_applications','menu_utilities');
+    menu_launch_type 'kcalc';
     # Check that it is started
     assert_screen 'kcalc_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kcharselect.pm b/tests/apps_startstop/kde/kcharselect.pm
index 11bbbf77..69d6b390 100644
--- a/tests/apps_startstop/kde/kcharselect.pm
+++ b/tests/apps_startstop/kde/kcharselect.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kcharselect_launch','menu_applications','menu_utilities');
+    menu_launch_type 'kcharselect';
     # Check that it is started
     assert_screen 'kcharselect_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kcolorchooser.pm b/tests/apps_startstop/kde/kcolorchooser.pm
index c1f3d076..70269a07 100644
--- a/tests/apps_startstop/kde/kcolorchooser.pm
+++ b/tests/apps_startstop/kde/kcolorchooser.pm
@@ -9,10 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('menu_graphics_more_apps', 'menu_applications','menu_graphics');
-    # Games are hidden even deeper in menus, so let us fix that here.
-    assert_and_click 'kcolorchooser_launch';
-    wait_still_screen 2;
+    menu_launch_type 'kcolorchooser';
     # Check that it is started
     assert_screen 'kcolorchooser_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kfind.pm b/tests/apps_startstop/kde/kfind.pm
index e605d305..9a164c92 100644
--- a/tests/apps_startstop/kde/kfind.pm
+++ b/tests/apps_startstop/kde/kfind.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kfind_launch','menu_applications','menu_utilities');
+    menu_launch_type 'kfind';
     # Check that it is started
     assert_screen 'kfind_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kget.pm b/tests/apps_startstop/kde/kget.pm
index 50bda10e..4cfc268d 100644
--- a/tests/apps_startstop/kde/kget.pm
+++ b/tests/apps_startstop/kde/kget.pm
@@ -7,9 +7,9 @@ use utils;
 
 sub run {
     my $self = shift;
-    
+
     # Start the application
-    start_with_launcher('kget_launch','menu_applications','menu_internet');
+    menu_launch_type 'kget';
     # Enable as default application
     assert_and_click 'kget_enable';
     # Check that it is started
diff --git a/tests/apps_startstop/kde/kgpg.pm b/tests/apps_startstop/kde/kgpg.pm
index cd9a0110..26ad6d76 100644
--- a/tests/apps_startstop/kde/kgpg.pm
+++ b/tests/apps_startstop/kde/kgpg.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kgpg_launch','menu_applications','menu_utilities');
+    menu_launch_type 'kgpg';
     # Deal with the first wizard screen
     assert_and_click 'kgpg_next';
     wait_still_screen 2;
diff --git a/tests/apps_startstop/kde/kimport.pm b/tests/apps_startstop/kde/kimport.pm
index f6f2f8cf..f01a2bcc 100644
--- a/tests/apps_startstop/kde/kimport.pm
+++ b/tests/apps_startstop/kde/kimport.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kimport_launch','menu_applications','menu_utilities');
+    menu_launch_type 'akonadiimportwizard';
     # Click ok to go further
     assert_and_click 'kde_ok';
     wait_still_screen 2;
diff --git a/tests/apps_startstop/kde/kmag.pm b/tests/apps_startstop/kde/kmag.pm
index 5921c99e..53ed3d30 100644
--- a/tests/apps_startstop/kde/kmag.pm
+++ b/tests/apps_startstop/kde/kmag.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kmag_launch','menu_applications','menu_utilities');
+    menu_launch_type 'kmag';
     # Check that it is started
     assert_screen 'kmag_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kmail.pm b/tests/apps_startstop/kde/kmail.pm
index 1c05162c..103982a1 100644
--- a/tests/apps_startstop/kde/kmail.pm
+++ b/tests/apps_startstop/kde/kmail.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kmail_launch','menu_applications','menu_internet');
+    menu_launch_type 'kmail';
     # Enable unified mailboxes, if they appear
     if (check_screen("enable_unified_mailboxes", 1)) {
         assert_and_click "enable_unified_mailboxes";
diff --git a/tests/apps_startstop/kde/kmail_header.pm b/tests/apps_startstop/kde/kmail_header.pm
index e77f1003..fe3c72cb 100644
--- a/tests/apps_startstop/kde/kmail_header.pm
+++ b/tests/apps_startstop/kde/kmail_header.pm
@@ -9,8 +9,8 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kmail_hedit_launch','menu_applications','menu_internet');
-    # Check that it is started
+    menu_launch_type 'kmail header';
+    # Check that the application runs
     assert_screen 'kmail_hedit_runs';
     # Close the application
     quit_with_shortcut();
diff --git a/tests/apps_startstop/kde/kmousetool.pm b/tests/apps_startstop/kde/kmousetool.pm
index 3b45e3bc..2a224ea3 100644
--- a/tests/apps_startstop/kde/kmousetool.pm
+++ b/tests/apps_startstop/kde/kmousetool.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kmousetool_launch','menu_applications','menu_utilities');
+    menu_launch_type 'kmousetool';
     # Check that it is started
     assert_screen 'kmousetool_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kmouth.pm b/tests/apps_startstop/kde/kmouth.pm
index 6469cee8..7e922c7b 100644
--- a/tests/apps_startstop/kde/kmouth.pm
+++ b/tests/apps_startstop/kde/kmouth.pm
@@ -9,10 +9,14 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kmouth_launch','menu_applications','menu_utilities');
+    menu_launch_type 'kmouth';
+    sleep 2;
     # Deal with the welcome screens
-    while (check_screen('kde_next', '1')){
-        assert_and_click 'kde_next';
+    assert_screen ["kde_next", "kde_finish"];
+    while (match_has_tag "kde_next") {
+        assert_and_click "kde_next"; 
+        sleep 2;
+        assert_screen ["kde_next", "kde_finish"];
     }
     # Settings close
     assert_and_click 'kde_finish';
diff --git a/tests/apps_startstop/kde/kolourpaint.pm b/tests/apps_startstop/kde/kolourpaint.pm
index 272f36ef..46a1c31c 100644
--- a/tests/apps_startstop/kde/kolourpaint.pm
+++ b/tests/apps_startstop/kde/kolourpaint.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kolourpaint_launch','menu_applications','menu_graphics');
+    menu_launch_type 'kolourpaint';
     # Check that it is started
     assert_screen 'kolourpaint_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/konqueror.pm b/tests/apps_startstop/kde/konqueror.pm
index 58c86ae1..496c5736 100644
--- a/tests/apps_startstop/kde/konqueror.pm
+++ b/tests/apps_startstop/kde/konqueror.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('konqueror_launch','menu_applications','menu_internet');
+    menu_launch_type 'konqueror';
     # Check that it is started
     assert_screen 'konqueror_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/konsole.pm b/tests/apps_startstop/kde/konsole.pm
index 5224f950..66217333 100644
--- a/tests/apps_startstop/kde/konsole.pm
+++ b/tests/apps_startstop/kde/konsole.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('konsole_launch','menu_applications','menu_system');
+    menu_launch_type 'konsole';
     # Check that it is started
     assert_screen 'konsole_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kontakt.pm b/tests/apps_startstop/kde/kontakt.pm
index e46e4141..4b43e4f8 100644
--- a/tests/apps_startstop/kde/kontakt.pm
+++ b/tests/apps_startstop/kde/kontakt.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kontact_launch','menu_applications','menu_office');
+    menu_launch_type 'kontact';
     # Enable unified mailboxes, if they appear
     if (check_screen("enable_unified_mailboxes", 1)) {
         assert_and_click "enable_unified_mailboxes";
diff --git a/tests/apps_startstop/kde/konversation.pm b/tests/apps_startstop/kde/konversation.pm
index e66e6af8..6c792b7c 100644
--- a/tests/apps_startstop/kde/konversation.pm
+++ b/tests/apps_startstop/kde/konversation.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('konversation_launch','menu_applications','menu_internet');
+    menu_launch_type 'konversation';
     # Connect to Freenode
     assert_and_click 'konversation_connect';
     # Check that it is started
diff --git a/tests/apps_startstop/kde/korganizer.pm b/tests/apps_startstop/kde/korganizer.pm
index 36ce96b3..4b28a94a 100644
--- a/tests/apps_startstop/kde/korganizer.pm
+++ b/tests/apps_startstop/kde/korganizer.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('korganizer_launch','menu_applications','menu_office');
+    menu_launch_type 'korganizer';
     # Check that it is started
     assert_screen 'korganizer_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kparted.pm b/tests/apps_startstop/kde/kparted.pm
index 3e0df72d..d9f4530a 100644
--- a/tests/apps_startstop/kde/kparted.pm
+++ b/tests/apps_startstop/kde/kparted.pm
@@ -9,7 +9,8 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kparted_launch','menu_applications','menu_system');
+    menu_launch_type 'partition editor';
+    wait_still_screen 2;
     # Provide root password to run the application
     type_very_safely(get_var("ROOT_PASSWORD", "weakpassword"));
     send_key 'ret';
diff --git a/tests/apps_startstop/kde/krdc.pm b/tests/apps_startstop/kde/krdc.pm
index 67e59a57..384e9744 100644
--- a/tests/apps_startstop/kde/krdc.pm
+++ b/tests/apps_startstop/kde/krdc.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('krdc_launch','menu_applications','menu_internet');
+    menu_launch_type 'krdc';
     # Check that it is started
     assert_screen 'krdc_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/krfb.pm b/tests/apps_startstop/kde/krfb.pm
index 98afd842..53be8dfb 100644
--- a/tests/apps_startstop/kde/krfb.pm
+++ b/tests/apps_startstop/kde/krfb.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('krfb_launch','menu_applications','menu_internet');
+    menu_launch_type 'krfb';
     # Check that it is started
     assert_screen 'krfb_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kruler.pm b/tests/apps_startstop/kde/kruler.pm
index 63539bc0..6fc79fa8 100644
--- a/tests/apps_startstop/kde/kruler.pm
+++ b/tests/apps_startstop/kde/kruler.pm
@@ -9,11 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('menu_graphics_more_apps', 'menu_applications','menu_graphics');
-    # Games are hidden even deeper in menus, so let us fix that here.
-    send_key_until_needlematch('kruler_launch', 'down', 6, 2);
-    assert_and_click 'kruler_launch';
-    wait_still_screen 2;
+    menu_launch_type 'kruler';
     # Check that it is started
     assert_screen 'kruler_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/krusader.pm b/tests/apps_startstop/kde/krusader.pm
index 98b3717c..3a3a2fc7 100644
--- a/tests/apps_startstop/kde/krusader.pm
+++ b/tests/apps_startstop/kde/krusader.pm
@@ -9,14 +9,22 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('krusader_launch','menu_applications','menu_utilities');
+    menu_launch_type "krusader";
     # Deal with the welcome screens
-    while (check_screen('krusader_welcome', '1')){
-        assert_and_click 'krusader_welcome';
-        wait_still_screen 3;
+    assert_screen ["krusader_welcome", "krusader_settings_close"];
+    while (match_has_tag "krusader_welcome") {
+        assert_and_click "krusader_welcome";
+        assert_screen ["krusader_welcome", "krusader_settings_close"];
     }
     # Settings close
-    assert_and_click 'krusader_settings_close';
+    assert_screen ["krusader_settings_close", "kde_ok"];
+    while (match_has_tag "kde_ok") {
+        assert_and_click "kde_ok";
+        assert_screen ["krusader_settings_close", "kde_ok"]
+    }
+    
+    assert_and_click "krusader_settings_close";
+    
     wait_still_screen 2;
     # Check that it is started
     assert_screen 'krusader_runs';
@@ -28,7 +36,6 @@ sub test_flags {
     return {always_rollback => 1};
 }
 
-
 1;
 
 # vim: set sw=4 et:
diff --git a/tests/apps_startstop/kde/ksysguard.pm b/tests/apps_startstop/kde/ksysguard.pm
index 86bfb475..fd25ee00 100644
--- a/tests/apps_startstop/kde/ksysguard.pm
+++ b/tests/apps_startstop/kde/ksysguard.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('ksysguard_launch','menu_applications','menu_system');
+    menu_launch_type 'ksysguard';
     # Check that it is started
     assert_screen 'ksysguard_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/ktnef.pm b/tests/apps_startstop/kde/ktnef.pm
index b54069b1..1a4d515e 100644
--- a/tests/apps_startstop/kde/ktnef.pm
+++ b/tests/apps_startstop/kde/ktnef.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('ktnef_launch','menu_applications','menu_internet');
+    menu_launch_type 'ktnef';
     # Check that it is started
     assert_screen 'ktnef_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/ktorrent.pm b/tests/apps_startstop/kde/ktorrent.pm
index f1e4c428..8c576b19 100644
--- a/tests/apps_startstop/kde/ktorrent.pm
+++ b/tests/apps_startstop/kde/ktorrent.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('ktorrent_launch','menu_applications','menu_internet');
+    menu_launch_type 'ktorrent';
     # Check that it is started
     assert_screen 'ktorrent_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kwallet.pm b/tests/apps_startstop/kde/kwallet.pm
index bddf00b9..077c0e2b 100644
--- a/tests/apps_startstop/kde/kwallet.pm
+++ b/tests/apps_startstop/kde/kwallet.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kwallet_launch','menu_applications','menu_system');
+    menu_launch_type 'kwallet';
     # Check that it is started
     assert_screen 'kwallet_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kwrite.pm b/tests/apps_startstop/kde/kwrite.pm
index df640825..b3dae688 100644
--- a/tests/apps_startstop/kde/kwrite.pm
+++ b/tests/apps_startstop/kde/kwrite.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('kwrite_launch','menu_applications','menu_utilities');
+    menu_launch_type 'kwrite';
     # Check that it is started
     assert_screen 'kwrite_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/language.pm b/tests/apps_startstop/kde/language.pm
index 672531e2..945e6a07 100644
--- a/tests/apps_startstop/kde/language.pm
+++ b/tests/apps_startstop/kde/language.pm
@@ -9,10 +9,13 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('language_launch', 'menu_applications','menu_administration');
+    menu_launch_type 'language';
     # Deal with confirmation window
-    type_very_safely(get_var('USER_PASSWORD', 'weakpassword'));
+    assert_screen "auth_required";
+    my $password = get_var('USER_PASSWORD', 'weakpassword');
+    type_very_safely $password;
     send_key 'ret';
+
     # Check that it is started
     assert_screen 'language_runs';
     wait_still_screen 2;
diff --git a/tests/apps_startstop/kde/mahjong.pm b/tests/apps_startstop/kde/mahjong.pm
index 49b378b5..0911f9fb 100644
--- a/tests/apps_startstop/kde/mahjong.pm
+++ b/tests/apps_startstop/kde/mahjong.pm
@@ -9,10 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('menu_boardgames', 'menu_applications','menu_games');
-    # Games are hidden even deeper in menus, so let us fix that here.
-    assert_and_click 'mahjong_launch';
-    wait_still_screen 2;
+    menu_launch_type 'kmahjong';
     # Check that it is started
     assert_screen 'mahjong_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/mediawriter.pm b/tests/apps_startstop/kde/mediawriter.pm
index 9b566dbf..d00021d5 100644
--- a/tests/apps_startstop/kde/mediawriter.pm
+++ b/tests/apps_startstop/kde/mediawriter.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('fmw_launch','menu_applications','menu_system');
+    menu_launch_type 'mediawriter';
     # Check that it is started
     assert_screen 'fmw_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/minesweeper.pm b/tests/apps_startstop/kde/minesweeper.pm
index 9d853795..3c4e6b77 100644
--- a/tests/apps_startstop/kde/minesweeper.pm
+++ b/tests/apps_startstop/kde/minesweeper.pm
@@ -9,10 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('menu_tacticsgames', 'menu_applications','menu_games');
-    # Games are hidden even deeper in menus, so let us fix that here.
-    assert_and_click 'minesweeper_launch';
-    wait_still_screen 2;
+    menu_launch_type 'kmines';
     # Check that it is started
     assert_screen 'minesweeper_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/netcon.pm b/tests/apps_startstop/kde/netcon.pm
index 75d314b2..b7e30a1a 100644
--- a/tests/apps_startstop/kde/netcon.pm
+++ b/tests/apps_startstop/kde/netcon.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('netcon_launch','menu_applications','menu_settings');
+    menu_launch_type 'network configuration';
     # Check that it is started
     assert_screen 'netcon_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/patience.pm b/tests/apps_startstop/kde/patience.pm
index 192710a9..baa397c7 100644
--- a/tests/apps_startstop/kde/patience.pm
+++ b/tests/apps_startstop/kde/patience.pm
@@ -9,10 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('menu_cardgames', 'menu_applications','menu_games');
-    # Games are hidden even deeper in menus, so let us fix that here.
-    assert_and_click 'patience_launch';
-    wait_still_screen 2;
+    menu_launch_type 'kpatience';
     # Check that it is started
     assert_screen 'patience_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/pimexporter.pm b/tests/apps_startstop/kde/pimexporter.pm
index 6b56b31e..46d62682 100644
--- a/tests/apps_startstop/kde/pimexporter.pm
+++ b/tests/apps_startstop/kde/pimexporter.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('pimexporter_launch','menu_applications','menu_internet');
+    menu_launch_type 'pim';
     # Check that it is started
     assert_screen 'pimexporter_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/relnotes.pm b/tests/apps_startstop/kde/relnotes.pm
index 2c1b1bc6..2e6d93df 100644
--- a/tests/apps_startstop/kde/relnotes.pm
+++ b/tests/apps_startstop/kde/relnotes.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('relnotes_launch','menu_applications','menu_system');
+    menu_launch_type 'release notes';
     # Check that it is started
     assert_screen 'relnotes_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/spectacle.pm b/tests/apps_startstop/kde/spectacle.pm
index 72141004..bbd71c6f 100644
--- a/tests/apps_startstop/kde/spectacle.pm
+++ b/tests/apps_startstop/kde/spectacle.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('spectacle_launch','menu_applications','menu_utilities');
+    menu_launch_type 'spectacle';
     # Check that it is started
     assert_screen 'spectacle_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/system_settings.pm b/tests/apps_startstop/kde/system_settings.pm
index 4ee01883..3382a556 100644
--- a/tests/apps_startstop/kde/system_settings.pm
+++ b/tests/apps_startstop/kde/system_settings.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     # Start the application
-    start_with_launcher('system_settings_launch','menu_applications','menu_settings');
+    menu_launch_type 'system settings';
     # Check that it is started
     assert_screen 'system_settings_runs';
     # Close the application