diff --git a/src/apps.json b/src/apps.json
index 883d3a5a7..9e57292f8 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -350,7 +350,9 @@
       "cats": [
         42
       ],
-      "script": "//assets.adobedtm.com/",
+      "js": {
+        "_satellite": ""
+      },
       "icon": "adobedmt.png",
       "website": "https://marketing.adobe.com/resources/help/en_US/dtm/c_overview.html"
     },
@@ -786,7 +788,7 @@
     },
     "Angular Material": {
       "cats": [
-        18
+        66
       ],
       "icon": "AngularJS.svg",
       "implies": "AngularJS",
@@ -1507,7 +1509,7 @@
     },
     "Bootstrap": {
       "cats": [
-        18
+        66
       ],
       "cpe": "cpe:/a:getbootstrap:bootstrap",
       "html": [
@@ -1597,14 +1599,20 @@
     "Bubble": {
       "cats": [
         1,
-        3,
-        18,
-        22
+        18
       ],
       "icon": "bubble.png",
       "implies": "Node.js",
-      "js": {
-        "appquery": ""
+      "headers": {
+        "x-bubble-capacity-limit": "",
+        "x-bubble-capacity-used": "",
+        "x-bubble-perf": ""
+      },
+      "js":{
+        "bubble_environment": "",
+        "bubble_hostname_modifier": "",
+        "bubble_version": "",
+        "_bubble_page_load_data": ""
       },
       "website": "http://bubble.is"
     },
@@ -1647,7 +1655,7 @@
     },
     "Bulma": {
       "cats": [
-        18
+        66
       ],
       "html": "<link[^>]+?href=\"[^\"]+bulma(?:\\.min)?\\.css",
       "icon": "Bulma.png",
@@ -2015,7 +2023,7 @@
     },
     "Clarity": {
       "cats": [
-        18
+        66
       ],
       "html": [
         "<clr-main-container",
@@ -3359,7 +3367,6 @@
     "Essential JS 2": {
       "cats": [
         12,
-        18,
         59
       ],
       "html": "<[^>]+ class ?= ?\"(?:e-control|[^\"]+ e-control)(?: )[^\"]* e-lib\\b",
@@ -3638,7 +3645,7 @@
     },
     "Flat UI": {
       "cats": [
-        18
+        66
       ],
       "html": "<link[^>]* href=[^>]+flat-ui(?:\\.min)?\\.css",
       "icon": "Flat UI.png",
@@ -5039,15 +5046,6 @@
       },
       "website": "http://impresspages.org"
     },
-    "InProces": {
-      "cats": [
-        1
-      ],
-      "html": "<!-- CSS InProces Portaal default -->",
-      "icon": "InProces.png",
-      "script": "brein/inproces/website/websitefuncties\\.js",
-      "website": "http://www.brein.nl/oplossing/product/website"
-    },
     "Incapsula": {
       "cats": [
         31
@@ -5626,7 +5624,7 @@
     },
     "Kendo UI": {
       "cats": [
-        18
+        66
       ],
       "html": "<link[^>]*\\s+href=[^>]*styles/kendo\\.common(?:\\.min)?\\.css[^>]*/>",
       "icon": "Kendo UI.png",
@@ -5763,7 +5761,7 @@
     },
     "Koha": {
       "cats": [
-        21
+        50
       ],
       "cpe": "cpe:/a:koha:koha",
       "html": [
@@ -6304,44 +6302,6 @@
       },
       "website": "https://www.luigisbox.com"
     },
-    "M.R. Inc BoxyOS": {
-      "cats": [
-        28
-      ],
-      "icon": "M.R. Inc.png",
-      "website": "http://mrincworld.com"
-    },
-    "M.R. Inc SiteFrame": {
-      "cats": [
-        18
-      ],
-      "headers": {
-        "Powered-By": "M\\.R\\. Inc SiteFrame"
-      },
-      "icon": "M.R. Inc.png",
-      "website": "http://mrincworld.com"
-    },
-    "M.R. Inc Webserver": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "M\\.R\\. Inc Webserver"
-      },
-      "icon": "M.R. Inc.png",
-      "implies": [
-        "M.R. Inc BoxyOS"
-      ],
-      "website": "http://mrincworld.com"
-    },
-    "MHonArc": {
-      "cats": [
-        50
-      ],
-      "html": "<!-- MHonArc v([0-9.]+) -->\\;version:\\1",
-      "icon": "mhonarc.png",
-      "website": "http://www.mhonarc.at"
-    },
     "MODX": {
       "cats": [
         1
@@ -6546,7 +6506,7 @@
     },
     "Material Design Lite": {
       "cats": [
-        18
+        66
       ],
       "html": "<link[^>]* href=\"[^\"]*material(?:\\.[\\w]+-[\\w]+)?(?:\\.min)?\\.css",
       "icon": "Material Design Lite.png",
@@ -6558,7 +6518,7 @@
     },
     "Materialize CSS": {
       "cats": [
-        18
+        66
       ],
       "html": "<link[^>]* href=\"[^\"]*materialize(?:\\.min)?\\.css",
       "icon": "Materialize CSS.png",
@@ -6771,7 +6731,8 @@
     },
     "Meteor": {
       "cats": [
-        12
+        12,
+        18
       ],
       "html": "<link[^>]+__meteor-css__",
       "icon": "Meteor.png",
@@ -6915,7 +6876,7 @@
     },
     "Milligram": {
       "cats": [
-        18
+        66
       ],
       "html": [
         "<link[^>]+?href=\"[^\"]+milligram(?:\\.min)?\\.css"
@@ -7886,23 +7847,6 @@
       ],
       "website": "http://openx.com"
     },
-    "Ophal": {
-      "cats": [
-        1,
-        11,
-        18
-      ],
-      "headers": {
-        "X-Powered-By": "Ophal(?: (.+))? \\(ophal\\.org\\)\\;version:\\1"
-      },
-      "icon": "Ophal.png",
-      "implies": "Lua",
-      "meta": {
-        "generator": "Ophal(?: (.+))? \\(ophal\\.org\\)\\;version:\\1"
-      },
-      "script": "ophal\\.js",
-      "website": "http://ophal.org"
-    },
     "Optimizely": {
       "cats": [
         10
@@ -8372,8 +8316,7 @@
     "Pimcore": {
       "cats": [
         1,
-        6,
-        18
+        6
       ],
       "cpe": "cpe:/a:pimcore:pimcore",
       "headers": {
@@ -8747,7 +8690,7 @@
     },
     "Pure CSS": {
       "cats": [
-        18
+        66
       ],
       "html": [
         "<link[^>]+(?:([\\d.])+/)?pure(?:-min)?\\.css\\;version:\\1",
@@ -9611,8 +9554,7 @@
     },
     "Phoenix": {
       "cats": [
-        18,
-        22
+        18
       ],
       "icon": "sazito-phoenix.png",
       "js": {
@@ -9691,7 +9633,7 @@
     },
     "Semantic-ui": {
       "cats": [
-        18
+        66
       ],
       "html": [
         "<link[^>]+semantic(?:\\.min)\\.css\""
@@ -9735,20 +9677,9 @@
       },
       "website": "http://s9y.org"
     },
-    "Shadow": {
-      "cats": [
-        18
-      ],
-      "headers": {
-        "X-Powered-By": "ShadowFramework"
-      },
-      "icon": "Shadow.png",
-      "implies": "PHP",
-      "website": "http://shadow-technologies.co.uk"
-    },
     "Shapecss": {
       "cats": [
-        18
+        66
       ],
       "html": "<link[^>]* href=\"[^\"]*shapecss(?:\\.min)?\\.css",
       "icon": "Shapecss.svg",
@@ -10719,7 +10650,7 @@
     },
     "tailwindcss": {
       "cats": [
-        18
+        66
       ],
       "html": "<link[^>]+?href=\"[^\"]+tailwindcss(?:\\.min)?\\.css",
       "icon": "tailwindcss.svg",
@@ -11221,7 +11152,7 @@
     },
     "UIKit": {
       "cats": [
-        18
+        66
       ],
       "html": "<[^>]+class=\"[^\"]*(?:uk-container|uk-section)",
       "icon": "UIKit.png",
@@ -11606,22 +11537,6 @@
       "url": "/sparql",
       "website": "https://virtuoso.openlinksw.com/"
     },
-    "Visual WebGUI": {
-      "cats": [
-        18
-      ],
-      "icon": "Visual WebGUI.png",
-      "implies": "Microsoft ASP.NET",
-      "js": {
-        "VWGEventArgs": ""
-      },
-      "meta": {
-        "generator": "^Visual WebGUI"
-      },
-      "script": "\\.js\\.wgx$",
-      "url": "\\.wgx$",
-      "website": "http://www.gizmox.com/products/visual-web-gui/"
-    },
     "Visual Website Optimizer": {
       "cats": [
         10
@@ -12130,7 +12045,7 @@
     },
     "Woltlab Community Framework": {
       "cats": [
-        18
+        1
       ],
       "html": "var WCF_PATH[^>]+",
       "icon": "Woltlab Community Framework.png",
@@ -12373,15 +12288,16 @@
     },
     "Xeora": {
       "cats": [
-        18,
-        22,
-        27
+        18
       ],
       "headers": {
         "Server": "XeoraEngine",
         "X-Powered-By": "XeoraCube"
       },
       "html": "<input type=\"hidden\" name=\"_sys_bind_\\d+\" id=\"_sys_bind_\\d+\" />",
+      "implies": [
+        "Microsoft ASP.NET"
+      ],
       "icon": "xeora.png",
       "script": "/_bi_sps_v.+\\.js",
       "website": "http://www.xeora.org"
@@ -12639,7 +12555,7 @@
     },
     "ZURB Foundation": {
       "cats": [
-        18
+        66
       ],
       "html": [
         "<link[^>]+foundation[^>\"]+css",
@@ -12813,7 +12729,6 @@
     },
     "actionhero.js": {
       "cats": [
-        1,
         18,
         22
       ],
@@ -12841,7 +12756,7 @@
     },
     "animate.css": {
       "cats": [
-        18
+        66
       ],
       "html": [
         "<link [^>]+(?:/([\\d.]+)/)?animate\\.(?:min\\.)?css\\;version:\\1"
@@ -12988,12 +12903,10 @@
     },
     "enduro.js": {
       "cats": [
-        1,
-        18,
-        47
+        1
       ],
       "headers": {
-        "X-Powered-By": "^enduro\\.js$"
+        "X-Powered-By": "^enduro\\.js"
       },
       "icon": "enduro.js.svg",
       "implies": "Node.js",
@@ -13062,18 +12975,6 @@
       "implies": "Python",
       "website": "http://gunicorn.org"
     },
-    "hapi.js": {
-      "cats": [
-        18,
-        22
-      ],
-      "cookies": {
-        "Fe26.2**": "\\;confidence:50"
-      },
-      "icon": "hapi.js.png",
-      "implies": "Node.js",
-      "website": "http://hapijs.com"
-    },
     "iCongo": {
       "cats": [
         6
@@ -13557,8 +13458,9 @@
       ],
       "html": [
         "<!--\\s+#+ Powered by the PhotoShelter Beam platform",
-        "<link rel=[\"']dns-prefetch[\"'] [^>]+photoshelter.com"
+        "<link[^>]+c\\.photoshelter\\.com"
       ],
+      "url": "photoshelter\\.com",
       "implies": [
         "PHP",
         "MySQL",
@@ -13876,21 +13778,6 @@
       "implies": "Node.js",
       "website": "https://totaljs.com"
     },
-    "uCore": {
-      "cats": [
-        1,
-        18
-      ],
-      "cookies": {
-        "ucore": ""
-      },
-      "icon": "uCore.png",
-      "implies": "PHP",
-      "meta": {
-        "generator": "uCore PHP Framework"
-      },
-      "website": "http://ucore.io"
-    },
     "uCoz": {
       "cats": [
         1
@@ -13905,7 +13792,6 @@
       "cats": [
         1,
         2,
-        18,
         50
       ],
       "headers": {
@@ -14084,23 +13970,6 @@
       "implies": "Java",
       "website": "https://halo.run"
     },
-    "Rocket": {
-      "cats": [
-        1,
-        6
-      ],
-      "headers": {
-        "x-powered-by": "^Rocket=https://rocketcms.io/"
-      },
-      "icon": "Rocket.svg",
-      "implies": [
-        "webpack",
-        "Node.js",
-        "MySQL",
-        "Less"
-      ],
-      "website": "https://rocketcms.io"
-    },
     "Zipkin": {
       "cats": [
         10
@@ -14262,7 +14131,7 @@
       "priority": 9
     },
     "18": {
-      "name": "Web Frameworks",
+      "name": "Web Application Frameworks",
       "priority": 7
     },
     "19": {
@@ -14444,6 +14313,10 @@
     "65": {
       "name": "Load Balancer",
       "priority": 7
+    },
+    "66": {
+      "name": "UI Frameworks",
+      "priority": 7
     }
   }
 }
diff --git a/src/icons/InProces.png b/src/icons/InProces.png
deleted file mode 100644
index 5b76fa14e..000000000
Binary files a/src/icons/InProces.png and /dev/null differ
diff --git a/src/icons/M.R. Inc.png b/src/icons/M.R. Inc.png
deleted file mode 100644
index 1e3e20e1b..000000000
Binary files a/src/icons/M.R. Inc.png and /dev/null differ
diff --git a/src/icons/Ophal.png b/src/icons/Ophal.png
deleted file mode 100644
index 22dc9c137..000000000
Binary files a/src/icons/Ophal.png and /dev/null differ
diff --git a/src/icons/Rocket.svg b/src/icons/Rocket.svg
deleted file mode 100644
index feadcf82b..000000000
--- a/src/icons/Rocket.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="52.2px" height="52.2px" viewBox="0 0 52.2 52.2" style="enable-background:new 0 0 52.2 52.2;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#EF7B24;}
-</style>
-<g>
-	<g>
-	</g>
-	<path class="st0" d="M44.6,7.6c-10.2-10.2-26.8-10.2-37,0s-10.2,26.8,0,37s26.8,10.2,37,0S54.8,17.8,44.6,7.6z M23.2,46.8
-		c-2.9-1.9-4.6-5.3-4.9-9.4c0-0.4,0-0.9,0-1.3c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0.3,0,0.7-0.1,1-0.1c0.1,0,0.2,0,0.3,0
-		c0.3,0,0.6-0.1,0.8-0.1c0.1,0,0.2,0,0.4-0.1c0.2,0,0.5-0.1,0.7-0.2c0.1,0,0.3-0.1,0.4-0.1c0.2,0,0.4-0.1,0.5-0.1
-		c0.4,1.7,1.1,3.3,2,4.8c0.2,0.3,0.7,0.4,1,0.2c0.6-0.5,1.2-1,1.8-1.6c2.1-2.2,3.4-4.9,4-7.7c0.1-0.1,0.2-0.2,0.3-0.2
-		c0.1-0.1,0.2-0.2,0.4-0.3c0.2-0.2,0.4-0.3,0.6-0.5c0.1-0.1,0.2-0.2,0.3-0.3c0.3-0.3,0.6-0.5,0.8-0.8c4.4-4.4,7-10.2,7.3-16.3
-		c0-0.4-0.1-0.8-0.4-1l0,0c-0.3-0.3-0.7-0.4-1-0.4c-6.2,0.3-11.9,2.9-16.3,7.3c-0.3,0.3-0.5,0.5-0.8,0.8c-0.1,0.1-0.3,0.3-0.4,0.4
-		c-0.1,0.1-0.2,0.3-0.3,0.4c-0.2,0.2-0.4,0.5-0.6,0.7l0,0c-2.8,0.6-5.5,1.9-7.7,4c-0.6,0.6-1.2,1.2-1.6,1.8c-0.2,0.3-0.2,0.7,0.2,1
-		c1.5,1,3.1,1.6,4.8,2c-0.1,0.4-0.2,0.7-0.3,1.1c0,0,0,0,0,0c-0.1,0.3-0.1,0.7-0.2,1c0,0,0,0.1,0,0.1c-0.1,0.3-0.1,0.6-0.1,0.9
-		c0,0.1,0,0.2,0,0.3c0,0.3-0.1,0.5-0.1,0.8c0,0,0,0,0,0c-0.7,0-1.3,0-2-0.1c-3.7-0.3-6.8-2-8.6-4.9c0,0,0,0,0,0
-		c-1-1.5-1.3-3.3-1.1-5c0.6-5.7,3.3-11.2,8.4-15.2c7.9-6.2,19.2-6.1,27,0.1c10.4,8.3,11,23.5,1.9,32.6c-3.9,3.9-8.9,6-14.1,6.3
-		C26,48,24.5,47.7,23.2,46.8C23.2,46.8,23.2,46.8,23.2,46.8z M18.4,33.8c0.5-5.2,2.8-10.1,6.6-13.9c3.7-3.7,8.6-6.1,13.9-6.6
-		c-0.5,5.2-2.8,10.1-6.6,13.9c-0.5,0.5-1,0.9-1.5,1.3c-0.2,0.1-0.3,0.2-0.5,0.4c-0.4,0.3-0.7,0.6-1.1,0.8c-0.2,0.1-0.4,0.3-0.6,0.4
-		c-0.3,0.2-0.7,0.4-1,0.6c-0.3,0.1-0.5,0.3-0.8,0.4c-0.3,0.2-0.6,0.3-1,0.5c-0.3,0.2-0.7,0.3-1.1,0.4c-0.2,0.1-0.5,0.2-0.7,0.3
-		c-0.6,0.2-1.2,0.4-1.8,0.6c0,0-0.1,0-0.1,0C21,33.4,19.7,33.7,18.4,33.8z M5,32c2.2,2.4,5.3,3.8,8.9,4.1c0.7,0.1,1.4,0.1,2.1,0.1
-		l0,0l0,0c0,0.4,0,0.9,0,1.3c0.2,3.9,1.6,7.3,4,9.6c0,0,0,0,0,0c-3.5-1-6.7-2.8-9.4-5.6C7.9,38.8,6,35.5,5,32z"/>
-</g>
-</svg>
diff --git a/src/icons/Shadow.png b/src/icons/Shadow.png
deleted file mode 100644
index 6410565aa..000000000
Binary files a/src/icons/Shadow.png and /dev/null differ
diff --git a/src/icons/Visual WebGUI.png b/src/icons/Visual WebGUI.png
deleted file mode 100644
index eee252976..000000000
Binary files a/src/icons/Visual WebGUI.png and /dev/null differ
diff --git a/src/icons/hapi.js.png b/src/icons/hapi.js.png
deleted file mode 100644
index 0308945de..000000000
Binary files a/src/icons/hapi.js.png and /dev/null differ
diff --git a/src/icons/mhonarc.png b/src/icons/mhonarc.png
deleted file mode 100644
index c808de423..000000000
Binary files a/src/icons/mhonarc.png and /dev/null differ
diff --git a/src/icons/uCore.png b/src/icons/uCore.png
deleted file mode 100644
index 5f5da3de3..000000000
Binary files a/src/icons/uCore.png and /dev/null differ