From fa7587ba1cbc3c091b90c7b0566c684ad84d7c60 Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Wed, 27 Jul 2022 10:19:30 +1000
Subject: [PATCH] Update CPEs

---
 schema.json             |  3 +-
 src/technologies/a.json | 52 ++++++++++++++++----------------
 src/technologies/b.json | 12 ++++----
 src/technologies/c.json | 44 +++++++++++++--------------
 src/technologies/d.json | 34 ++++++++++-----------
 src/technologies/e.json | 30 +++++++++----------
 src/technologies/f.json | 22 +++++++-------
 src/technologies/g.json | 28 ++++++++---------
 src/technologies/h.json | 10 +++----
 src/technologies/i.json | 14 ++++-----
 src/technologies/j.json | 18 +++++------
 src/technologies/k.json | 14 ++++-----
 src/technologies/l.json | 22 +++++++-------
 src/technologies/m.json | 66 ++++++++++++++++++++---------------------
 src/technologies/n.json | 12 ++++----
 src/technologies/o.json | 32 ++++++++++----------
 src/technologies/p.json | 46 ++++++++++++++--------------
 src/technologies/q.json |  2 +-
 src/technologies/r.json | 20 ++++++-------
 src/technologies/s.json | 20 ++++++-------
 src/technologies/t.json |  8 ++---
 src/technologies/u.json |  4 +--
 src/technologies/v.json |  8 ++---
 src/technologies/w.json |  8 ++---
 src/technologies/y.json |  4 +--
 src/technologies/z.json |  8 ++---
 26 files changed, 271 insertions(+), 270 deletions(-)

diff --git a/schema.json b/schema.json
index 829864074..0ff6516c8 100644
--- a/schema.json
+++ b/schema.json
@@ -36,7 +36,8 @@
         "minItems": 1
       },
       "cpe": {
-        "$ref": "#/definitions/non-empty-non-blank-string"
+        "type": "string",
+        "pattern": "cpe:2.3:(a|h|o):[^*:]+:[^:]+:\\*:\\*:\\*:\\*:\\*:[^:]+:\\*:\\*"
       },
       "cookies": {
         "type": "object",
diff --git a/src/technologies/a.json b/src/technologies/a.json
index 3560c2d51..acd997ff7 100644
--- a/src/technologies/a.json
+++ b/src/technologies/a.json
@@ -160,7 +160,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:2.3:a:aol:aolserver:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:aol:aolserver:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "AOLserver/?([\\d.]+)?\\;version:\\1"
     },
@@ -298,7 +298,7 @@
     "cats": [
       10
     ],
-    "cpe": "cpe:2.3:a:laurent_destailleur:awstats:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:laurent_destailleur:awstats:*:*:*:*:*:*:*:*",
     "icon": "AWStats.png",
     "implies": "Perl",
     "meta": {
@@ -1214,7 +1214,7 @@
     "cats": [
       3
     ],
-    "cpe": "cpe:2.3:a:adminer:adminer:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:adminer:adminer:*:*:*:*:*:*:*:*",
     "html": [
       "Adminer</a> <span class=\"version\">([\\d.]+)</span>\\;version:\\1",
       "onclick=\"bodyClick\\(event\\);\" onload=\"verifyVersion\\('([\\d.]+)'\\);\">\\;version:\\1"
@@ -1366,7 +1366,7 @@
     "cats": [
       18
     ],
-    "cpe": "cpe:2.3:a:adobe:coldfusion:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:adobe:coldfusion:*:*:*:*:*:*:*:*",
     "headers": {
       "Cookie": "CFTOKEN="
     },
@@ -1409,7 +1409,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:2.3:a:adobe:experience_manager:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:adobe:experience_manager:*:*:*:*:*:*:*:*",
     "description": "Adobe Experience Manager (AEM) is a content management solution for building websites, mobile apps and forms.",
     "html": [
       "<div class=\"[^\"]*parbase",
@@ -1461,7 +1461,7 @@
     "cats": [
       27
     ],
-    "cpe": "cpe:2.3:a:adobe:flash:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:adobe:flash:*:*:*:*:*:*:*:*",
     "description": "Adobe Flash is a multimedia software platform used for production of animations, rich web applications and embedded web browser video players.",
     "dom": [
       "object[type='application/x-shockwave-flash']",
@@ -1474,7 +1474,7 @@
     "cats": [
       20
     ],
-    "cpe": "cpe:2.3:a:adobe:golive:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:adobe:golive:*:*:*:*:*:*:*:*",
     "description": "Adobe GoLive is a WYSIWYG HTML editor and web site management application.",
     "icon": "Adobe GoLive.png",
     "meta": {
@@ -1486,7 +1486,7 @@
     "cats": [
       4
     ],
-    "cpe": "cpe:2.3:a:adobe:robohelp:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:adobe:robohelp:*:*:*:*:*:*:*:*",
     "description": "Adobe RoboHelp is a Help Authoring Tool (HAT) that allows you to create help systems, e-learning content and knowledge bases.",
     "icon": "Adobe RoboHelp.svg",
     "js": {
@@ -1778,7 +1778,7 @@
       41,
       91
     ],
-    "cpe": "cpe:2.3:a:afterpay:afterpay:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:afterpay:afterpay:*:*:*:*:*:*:*:*",
     "description": "Afterpay is a 'buy now, pay later' platform that makes it possible to pay off purchased goods in fortnightly instalments.",
     "dom": "#afterpay, .afterpay, .AfterpayMessage, [aria-label='Afterpay'], link[href*='/wp-content/plugins/afterpay-gateway-for-woocommerce/']",
     "icon": "afterpay.png",
@@ -2041,7 +2041,7 @@
       18,
       22
     ],
-    "cpe": "cpe:2.3:a:lightbend:akka_http:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:lightbend:akka_http:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "akka-http(?:/([\\d.]+))?\\;version:\\1"
     },
@@ -2160,7 +2160,7 @@
       54,
       87
     ],
-    "cpe": "cpe:2.3:a:semperfiwebdesign:all_in_one_seo_pack:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:semperfiwebdesign:all_in_one_seo_pack:*:*:*:*:*:*:*:*",
     "description": "All in One SEO plugin optimizes WordPress website and its content for search engines.",
     "html": "<!-- All in One SEO Pack ([\\d.]+) \\;version:\\1",
     "icon": "AIOSEO.svg",
@@ -2232,7 +2232,7 @@
     "cats": [
       28
     ],
-    "cpe": "cpe:/o:alpinelinux:alpine_linux",
+    "cpe": "cpe:2.3:o:alpinelinux:alpine_linux:*:*:*:*:*:*:*:*",
     "description": "Alpine Linux is a security-oriented, lightweight Linux distribution based on musl libc and busybox.",
     "headers": {
       "X-Powered-By": "Alpine"
@@ -2751,7 +2751,7 @@
     "cats": [
       12
     ],
-    "cpe": "cpe:2.3:a:angularjs:angular:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:angularjs:angular:*:*:*:*:*:*:*:*:*",
     "description": "Angular is a TypeScript-based open-source web application framework led by the Angular Team at Google.",
     "dom": {
       "[ng-version]": {
@@ -2805,7 +2805,7 @@
     "cats": [
       12
     ],
-    "cpe": "cpe:2.3:a:angularjs:angular.js:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:angularjs:angular.js:*:*:*:*:*:*:*:*",
     "description": "AngularJS is a JavaScript-based open-source web application framework led by the Angular Team at Google.",
     "excludes": [
       "Angular",
@@ -2934,7 +2934,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:2.3:a:apache:http_server:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:apache:http_server:*:*:*:*:*:*:*:*",
     "description": "Apache is a free and open-source cross-platform web server software.",
     "headers": {
       "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\\b)HTTPD)\\;version:\\1"
@@ -2946,7 +2946,7 @@
     "cats": [
       8
     ],
-    "cpe": "cpe:2.3:a:apache:jspwiki:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:apache:jspwiki:*:*:*:*:*:*:*:*",
     "description": "Apache JSPWiki is an open-source Wiki engine, built around standard JEE components (Java, servlets, JSP).",
     "html": "<html[^>]* xmlns:jspwiki=",
     "icon": "Apache JSPWiki.png",
@@ -2959,7 +2959,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:2.3:a:apache:tomcat:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:apache:tomcat:*:*:*:*:*:*:*:*",
     "description": "Apache Tomcat is an open-source implementation of the Java Servlet, JavaServer Pages, Java Expression Language and WebSocket technologies.",
     "headers": {
       "Server": "^Apache-Coyote",
@@ -2973,7 +2973,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:2.3:a:apache:traffic_server:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:apache:traffic_server:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "ATS/?([\\d.]+)?\\;version:\\1"
     },
@@ -2984,7 +2984,7 @@
     "cats": [
       18
     ],
-    "cpe": "cpe:2.3:a:apache:wicket:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:apache:wicket:*:*:*:*:*:*:*:*",
     "icon": "Apache Wicket.svg",
     "implies": "Java",
     "js": {
@@ -3335,7 +3335,7 @@
     "cats": [
       6
     ],
-    "cpe": "cpe:2.3:a:arastta:ecommerce:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:arastta:ecommerce:*:*:*:*:*:*:*:*",
     "description": "Arastta is a free and open-source project with contributors from all over the world.",
     "excludes": "OpenCart",
     "headers": {
@@ -3404,7 +3404,7 @@
     "cats": [
       47
     ],
-    "cpe": "cpe:2.3:a:jfrog:artifactory:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:jfrog:artifactory:*:*:*:*:*:*:*:*",
     "html": [
       "<span class=\"version\">Artifactory(?: Pro)?(?: Power Pack)?(?: ([\\d.]+))?\\;version:\\1"
     ],
@@ -3421,7 +3421,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:2.3:a:jfrog:artifactory:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:jfrog:artifactory:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "Artifactory(?:/([\\d.]+))?\\;version:\\1"
     },
@@ -3647,7 +3647,7 @@
     "cats": [
       47
     ],
-    "cpe": "cpe:2.3:a:atlassian:bitbucket:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:atlassian:bitbucket:*:*:*:*:*:*:*:*",
     "description": "Bitbucket is a web-based version control repository hosting service for source code and development projects that use either Mercurial or Git revision control systems.",
     "html": "<li>Atlassian Bitbucket <span title=\"[a-z0-9]+\" id=\"product-version\" data-commitid=\"[a-z0-9]+\" data-system-build-number=\"[a-z0-9]+\"> v([\\d.]+)<\\;version:\\1",
     "icon": "Atlassian Bitbucket.svg",
@@ -3664,7 +3664,7 @@
     "cats": [
       8
     ],
-    "cpe": "cpe:2.3:a:atlassian:confluence:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:atlassian:confluence:*:*:*:*:*:*:*:*",
     "description": "Atlassian Confluence is a web-based collaboration wiki tool.",
     "dom": {
       "li.print-only": {
@@ -3688,7 +3688,7 @@
     "cookies": {
       "FESESSIONID": ""
     },
-    "cpe": "cpe:2.3:a:atlassian:fisheye:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:atlassian:fisheye:*:*:*:*:*:*:*:*",
     "html": "<title>(?:Log in to )?FishEye (?:and Crucible )?([\\d.]+)?</title>\\;version:\\1",
     "icon": "Atlassian FishEye.svg",
     "website": "http://www.atlassian.com/software/fisheye/overview/"
@@ -3697,7 +3697,7 @@
     "cats": [
       13
     ],
-    "cpe": "cpe:2.3:a:atlassian:jira:*:*:*:*:*:*:*",
+    "cpe": "cpe:2.3:a:atlassian:jira:*:*:*:*:*:*:*:*",
     "dom": "#jira",
     "icon": "Atlassian Jira.svg",
     "implies": "Java",
diff --git a/src/technologies/b.json b/src/technologies/b.json
index a85797c8b..0f237bacf 100644
--- a/src/technologies/b.json
+++ b/src/technologies/b.json
@@ -147,7 +147,7 @@
     "cats": [
       12
     ],
-    "cpe": "cpe:/a:backbone_project:backbone",
+    "cpe": "cpe:2.3:a:backbone_project:backbone:*:*:*:*:*:*:*:*",
     "description": "BackboneJS is a JavaScript library that allows to develop and structure the client side applications that run in a web browser.",
     "icon": "Backbone.js.png",
     "implies": "Underscore.js",
@@ -571,7 +571,7 @@
       "bigWAdminID": "",
       "bigwareCsid": ""
     },
-    "cpe": "cpe:/a:bigware:bigware_shop",
+    "cpe": "cpe:2.3:a:bigware:bigware_shop:*:*:*:*:*:*:*:*",
     "html": "(?:Diese <a href=[^>]+bigware\\.de|<a href=[^>]+/main_bigware_\\d+\\.php)",
     "icon": "Bigware.png",
     "implies": "PHP",
@@ -1250,7 +1250,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:bolt:bolt",
+    "cpe": "cpe:2.3:a:bolt:bolt:*:*:*:*:*:*:*:*",
     "icon": "Bolt CMS.png",
     "implies": "PHP",
     "meta": {
@@ -1453,7 +1453,7 @@
     "cats": [
       66
     ],
-    "cpe": "cpe:/a:getbootstrap:bootstrap",
+    "cpe": "cpe:2.3:a:getbootstrap:bootstrap:*:*:*:*:*:*:*:*",
     "description": "Bootstrap is a free and open-source CSS framework directed at responsive, mobile-first front-end web development. It contains CSS and JavaScript-based design templates for typography, forms, buttons, navigation, and other interface components.",
     "html": [
       "<style>\\s+/\\*!\\s+\\* Bootstrap v(\\d\\.\\d\\.\\d)\\;version:\\1",
@@ -2077,7 +2077,7 @@
     "cookies": {
       "Bugzilla_login_request_cookie": ""
     },
-    "cpe": "cpe:/a:mozilla:bugzilla",
+    "cpe": "cpe:2.3:a:mozilla:bugzilla:*:*:*:*:*:*:*:*",
     "html": [
       "href=\"enter_bug\\.cgi\">",
       "<main id=\"bugzilla-body\"",
@@ -2293,4 +2293,4 @@
     },
     "website": "https://addyosmani.github.io/basket.js/"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/c.json b/src/technologies/c.json
index c30e9d928..086b1e653 100644
--- a/src/technologies/c.json
+++ b/src/technologies/c.json
@@ -61,7 +61,7 @@
     "cats": [
       24
     ],
-    "cpe": "cpe:/a:ckeditor:ckeditor",
+    "cpe": "cpe:2.3:a:ckeditor:ckeditor:*:*:*:*:*:*:*:*",
     "description": "CKEditor is a WYSIWYG rich text editor which enables writing content directly inside of web pages or online applications. Its core code is written in JavaScript and it is developed by CKSource. CKEditor is available under open-source and commercial licenses.",
     "icon": "CKEditor.png",
     "js": {
@@ -78,7 +78,7 @@
     "cookies": {
       "CMSSESSID": ""
     },
-    "cpe": "cpe:/a:cmsmadesimple:cms_made_simple",
+    "cpe": "cpe:2.3:a:cmsmadesimple:cms_made_simple:*:*:*:*:*:*:*:*",
     "icon": "CMS Made Simple.png",
     "implies": "PHP",
     "meta": {
@@ -90,7 +90,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:cmsimple:cmsimple",
+    "cpe": "cpe:2.3:a:cmsimple:cmsimple:*:*:*:*:*:*:*:*",
     "implies": "PHP",
     "meta": {
       "generator": "CMSimple( [\\d.]+)?\\;version:\\1"
@@ -205,7 +205,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:caddyserver:caddy",
+    "cpe": "cpe:2.3:a:caddyserver:caddy:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "^Caddy$"
     },
@@ -237,7 +237,7 @@
     "cookies": {
       "cakephp": ""
     },
-    "cpe": "cpe:/a:cakephp:cakephp",
+    "cpe": "cpe:2.3:a:cakephp:cakephp:*:*:*:*:*:*:*:*",
     "icon": "CakePHP.png",
     "implies": "PHP",
     "meta": {
@@ -714,7 +714,7 @@
     "cats": [
       28
     ],
-    "cpe": "cpe:/o:centos:centos",
+    "cpe": "cpe:2.3:o:centos:centos:*:*:*:*:*:*:*:*",
     "description": "CentOS is a Linux distribution that provides a free, community-supported computing platform functionally compatible with its upstream source, Red Hat Enterprise Linux (RHEL).",
     "headers": {
       "Server": "CentOS",
@@ -803,7 +803,7 @@
     "cats": [
       21
     ],
-    "cpe": "cpe:/a:chamilo:chamilo_lms",
+    "cpe": "cpe:2.3:a:chamilo:chamilo_lms:*:*:*:*:*:*:*:*",
     "description": "Chamilo is an open-source learning management and collaboration system.",
     "dom": "link[href*='chamilo.org/']",
     "headers": {
@@ -1030,7 +1030,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:cherokee-project:cherokee",
+    "cpe": "cpe:2.3:a:cherokee-project:cherokee:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "^Cherokee(?:/([\\d.]+))?\\;version:\\1"
     },
@@ -1738,7 +1738,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:web-feet:coaster_cms",
+    "cpe": "cpe:2.3:a:web-feet:coaster_cms:*:*:*:*:*:*:*:*",
     "icon": "coaster-cms.png",
     "implies": "Laravel",
     "meta": {
@@ -1798,7 +1798,7 @@
       "exp_last_activity": "",
       "exp_tracker": ""
     },
-    "cpe": "cpe:/a:codeigniter:codeigniter",
+    "cpe": "cpe:2.3:a:codeigniter:codeigniter:*:*:*:*:*:*:*:*",
     "html": "<input[^>]+name=\"ci_csrf_token\"\\;version:2+",
     "icon": "CodeIgniter.png",
     "implies": "PHP",
@@ -2125,7 +2125,7 @@
     "cats": [
       6
     ],
-    "cpe": "cpe:/a:microsoft:commerce_server",
+    "cpe": "cpe:2.3:a:microsoft:commerce_server:*:*:*:*:*:*:*:*",
     "headers": {
       "COMMERCE-SERVER-SOFTWARE": ""
     },
@@ -2195,7 +2195,7 @@
     "cookies": {
       "CONCRETE5": ""
     },
-    "cpe": "cpe:/a:concrete5:concrete5",
+    "cpe": "cpe:2.3:a:concrete5:concrete5:*:*:*:*:*:*:*:*",
     "icon": "Concrete CMS.svg",
     "implies": "PHP",
     "js": {
@@ -2327,7 +2327,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:contao:contao_cms",
+    "cpe": "cpe:2.3:a:contao:contao_cms:*:*:*:*:*:*:*:*",
     "description": "Contao is an open source CMS that allows you to create websites and scalable web applications.",
     "dom": "link[href*='/typolight.css'], link[href*='/contao.css']",
     "icon": "Contao.svg",
@@ -2342,7 +2342,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:contenido:contendio",
+    "cpe": "cpe:2.3:a:contenido:contendio:*:*:*:*:*:*:*:*",
     "icon": "Contenido.png",
     "implies": "PHP",
     "meta": {
@@ -2729,7 +2729,7 @@
     "cats": [
       7
     ],
-    "cpe": "cpe:/a:coppermine-gallery:coppermine_photo_gallery",
+    "cpe": "cpe:2.3:a:coppermine-gallery:coppermine_photo_gallery:*:*:*:*:*:*:*:*",
     "description": "Coppermine is an open-source image gallery application.",
     "html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
     "icon": "Coppermine.png",
@@ -2792,7 +2792,7 @@
     "cats": [
       6
     ],
-    "cpe": "cpe:/a:cosmoshop:cosmoshop",
+    "cpe": "cpe:2.3:a:cosmoshop:cosmoshop:*:*:*:*:*:*:*:*",
     "icon": "Cosmoshop.png",
     "scriptSrc": "cosmoshop_functions\\.js",
     "website": "http://cosmoshop.de"
@@ -2801,7 +2801,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:cotonti:cotonti_siena",
+    "cpe": "cpe:2.3:a:cotonti:cotonti_siena:*:*:*:*:*:*:*:*",
     "icon": "Cotonti.png",
     "implies": "PHP",
     "meta": {
@@ -2813,7 +2813,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:apache:couchdb",
+    "cpe": "cpe:2.3:a:apache:couchdb:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "CouchDB/([\\d.]+)\\;version:\\1"
     },
@@ -2930,7 +2930,7 @@
     "cookies": {
       "CraftSessionId": ""
     },
-    "cpe": "cpe:/a:craftcms:craft_cms",
+    "cpe": "cpe:2.3:a:craftcms:craft_cms:*:*:*:*:*:*:*:*",
     "description": "Craft CMS is a content management system for building bespoke websites.",
     "headers": {
       "X-Powered-By": "\\bCraft CMS\\b"
@@ -3224,7 +3224,7 @@
     "cats": [
       6
     ],
-    "cpe": "cpe:/a:cubecart:cubecart",
+    "cpe": "cpe:2.3:a:cubecart:cubecart:*:*:*:*:*:*:*:*",
     "description": "CubeCart is a free ecommerce platform that businesses can use to build, manage, and market their online stores.",
     "dom": "a[href*='.cubecart.com'][target='_blank']",
     "icon": "CubeCart.png",
@@ -3374,7 +3374,7 @@
       "cprelogin": "",
       "cpsession": ""
     },
-    "cpe": "cpe:/a:cpanel:cpanel",
+    "cpe": "cpe:2.3:a:cpanel:cpanel:*:*:*:*:*:*:*:*",
     "description": "cPanel is a web hosting control panel. The software provides a graphical interface and automation tools designed to simplify the process of hosting a website.",
     "headers": {
       "Server": "cpsrvd/([\\d.]+)\\;version:\\1"
@@ -3509,4 +3509,4 @@
     "scriptSrc": "(?:/([\\d\\.-]+))?/crypto-js(?:\\.min)?\\.js\\;version:\\1",
     "website": "https://github.com/brix/crypto-js"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/d.json b/src/technologies/d.json
index 4e06c3385..55f0a6943 100644
--- a/src/technologies/d.json
+++ b/src/technologies/d.json
@@ -3,7 +3,7 @@
     "cats": [
       25
     ],
-    "cpe": "cpe:/a:d3.js_project:d3.js",
+    "cpe": "cpe:2.3:a:d3.js_project:d3.js:*:*:*:*:*:*:*:*",
     "description": "D3.js is a JavaScript library for producing dynamic, interactive data visualisations in web browsers.",
     "icon": "D3.png",
     "js": {
@@ -72,7 +72,7 @@
     "cookies": {
       "DotNetNukeAnonymous": ""
     },
-    "cpe": "cpe:/a:dnnsoftware:dotnetnuke",
+    "cpe": "cpe:2.3:a:dnnsoftware:dotnetnuke:*:*:*:*:*:*:*:*",
     "headers": {
       "Cookie": "dnn_IsMobile=",
       "DNNOutputCache": "",
@@ -289,7 +289,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:dleviet:datalife_engine",
+    "cpe": "cpe:2.3:a:dleviet:datalife_engine:*:*:*:*:*:*:*:*",
     "icon": "DataLife Engine.svg",
     "implies": [
       "PHP",
@@ -307,7 +307,7 @@
     "cats": [
       59
     ],
-    "cpe": "cpe:/a:datatables:datatables.net",
+    "cpe": "cpe:2.3:a:datatables:datatables.net:*:*:*:*:*:*:*:*",
     "description": "DataTables is a plug-in for the jQuery Javascript library adding advanced features like pagination, instant search, themes, and more to any HTML table.",
     "icon": "DataTables.png",
     "implies": "jQuery",
@@ -405,7 +405,7 @@
     "cats": [
       28
     ],
-    "cpe": "cpe:/o:debian:debian_linux",
+    "cpe": "cpe:2.3:o:debian:debian_linux:*:*:*:*:*:*:*:*",
     "description": "Debian is a Linux software which is a free open-source software.",
     "headers": {
       "Server": "Debian",
@@ -436,7 +436,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:dedecms:dedecms",
+    "cpe": "cpe:2.3:a:dedecms:dedecms:*:*:*:*:*:*:*:*",
     "icon": "DedeCMS.png",
     "implies": "PHP",
     "js": {
@@ -664,7 +664,7 @@
     "cats": [
       9
     ],
-    "cpe": "cpe:/a:directadmin:directadmin",
+    "cpe": "cpe:2.3:a:directadmin:directadmin:*:*:*:*:*:*:*:*",
     "description": "DirectAdmin is a graphical web-based web hosting control panel designed to make administration of websites easier.",
     "headers": {
       "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1"
@@ -736,7 +736,7 @@
     "cats": [
       15
     ],
-    "cpe": "cpe:/a:disqus:disqus_comment_system",
+    "cpe": "cpe:2.3:a:disqus:disqus_comment_system:*:*:*:*:*:*:*:*",
     "description": "Disqus is a worldwide blog comment hosting service for web sites and online communities that use a networked platform.",
     "dom": "div#disqus_thread",
     "icon": "Disqus.svg",
@@ -850,7 +850,7 @@
     "cookies": {
       "django_language": ""
     },
-    "cpe": "cpe:/a:djangoproject:django",
+    "cpe": "cpe:2.3:a:djangoproject:django:*:*:*:*:*:*:*:*",
     "description": "Django is a Python-based free and open-source web application framework.",
     "html": "(?:powered by <a[^>]+>Django ?([\\d.]+)?<\\/a>|<input[^>]*name=[\"']csrfmiddlewaretoken[\"'][^>]*>)\\;version:\\1",
     "icon": "Django.png",
@@ -895,7 +895,7 @@
     "cats": [
       60
     ],
-    "cpe": "cpe:/a:docker:engine",
+    "cpe": "cpe:2.3:a:docker:engine:*:*:*:*:*:*:*:*",
     "description": "Docker is a tool designed to make it easier to create, deploy, and run applications by using containers.",
     "html": "<!-- This comment is expected by the docker HEALTHCHECK  -->",
     "icon": "Docker.svg",
@@ -943,7 +943,7 @@
     "cats": [
       59
     ],
-    "cpe": "cpe:/a:dojotoolkit:dojo",
+    "cpe": "cpe:2.3:a:dojotoolkit:dojo:*:*:*:*:*:*:*:*",
     "icon": "Dojo.png",
     "js": {
       "dojo": "",
@@ -992,7 +992,7 @@
     "cookies": {
       "DokuWiki": ""
     },
-    "cpe": "cpe:/a:dokuwiki:dokuwiki",
+    "cpe": "cpe:2.3:a:dokuwiki:dokuwiki:*:*:*:*:*:*:*:*",
     "description": "DokuWiki is a free open-source wiki software.",
     "icon": "DokuWiki.png",
     "implies": "PHP",
@@ -1060,7 +1060,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:dotclear:dotclear",
+    "cpe": "cpe:2.3:a:dotclear:dotclear:*:*:*:*:*:*:*:*",
     "headers": {
       "X-Dotclear-Static-Cache": ""
     },
@@ -1176,7 +1176,7 @@
     "cats": [
       4
     ],
-    "cpe": "cpe:/a:doxygen:doxygen",
+    "cpe": "cpe:2.3:a:doxygen:doxygen:*:*:*:*:*:*:*:*",
     "description": "Doxygen is a documentation generator, a tool for writing software reference documentation.",
     "html": "(?:<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen\\.css)\\;version:\\1",
     "icon": "Doxygen.png",
@@ -1243,7 +1243,7 @@
     "cats": [
       20
     ],
-    "cpe": "cpe:/a:adobe:dreamweaver",
+    "cpe": "cpe:2.3:a:adobe:dreamweaver:*:*:*:*:*:*:*:*",
     "description": "Dreamweaver is a development tool for creating, publishing, and managing websites and mobile content.",
     "html": "<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)\\;version:\\1",
     "icon": "DreamWeaver.png",
@@ -1384,7 +1384,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:drupal:drupal",
+    "cpe": "cpe:2.3:a:drupal:drupal:*:*:*:*:*:*:*:*",
     "description": "Drupal is a free and open-source web content management framework.",
     "headers": {
       "Expires": "19 Nov 1978",
@@ -1408,7 +1408,7 @@
     "cats": [
       6
     ],
-    "cpe": "cpe:/a:commerceguys:commerce",
+    "cpe": "cpe:2.3:a:commerceguys:commerce:*:*:*:*:*:*:*:*",
     "description": "Drupal Commerce is open-source ecommerce software that augments the content management system Drupal.",
     "dom": "aside#cart-offcanvas, form.commerce-order-item-add-to-cart-form,form.commerce-add-to-cart",
     "html": "<[^>]+(?:id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field)",
diff --git a/src/technologies/e.json b/src/technologies/e.json
index 4c7322c13..7421b0e58 100644
--- a/src/technologies/e.json
+++ b/src/technologies/e.json
@@ -3,7 +3,7 @@
     "cats": [
       6
     ],
-    "cpe": "cpe:/a:lockon:ec-cube",
+    "cpe": "cpe:2.3:a:lockon:ec-cube:*:*:*:*:*:*:*:*",
     "description": "EC-CUBE is an open source package used to build ecommerce sites.",
     "icon": "EC-CUBE.svg",
     "implies": "PHP",
@@ -75,7 +75,7 @@
       "EPiServer": "",
       "EPiTrace": ""
     },
-    "cpe": "cpe:/a:episerver:episerver",
+    "cpe": "cpe:2.3:a:episerver:episerver:*:*:*:*:*:*:*:*",
     "icon": "EPiServer.png",
     "implies": "Microsoft ASP.NET",
     "meta": {
@@ -433,7 +433,7 @@
     "cats": [
       29
     ],
-    "cpe": "cpe:/a:elastic:elasticsearch",
+    "cpe": "cpe:2.3:a:elastic:elasticsearch:*:*:*:*:*:*:*:*",
     "description": "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
     "icon": "Elasticsearch.svg",
     "website": "https://www.elastic.co"
@@ -456,7 +456,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:eleanor-cms:eleanor_cms",
+    "cpe": "cpe:2.3:a:eleanor-cms:eleanor_cms:*:*:*:*:*:*:*:*",
     "icon": "Eleanor CMS.png",
     "implies": "PHP",
     "meta": {
@@ -650,7 +650,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:embedthis:appweb",
+    "cpe": "cpe:2.3:a:embedthis:appweb:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "Mbedthis-Appweb(?:/([\\d.]+))?\\;version:\\1"
     },
@@ -678,7 +678,7 @@
     "cats": [
       12
     ],
-    "cpe": "cpe:/a:emberjs:ember.js",
+    "cpe": "cpe:2.3:a:emberjs:ember.js:*:*:*:*:*:*:*:*",
     "icon": "Ember.js.png",
     "js": {
       "Ember": "",
@@ -904,7 +904,7 @@
     "cats": [
       64
     ],
-    "cpe": "cpe:/a:envoyproxy:envoy",
+    "cpe": "cpe:2.3:a:envoyproxy:envoy:*:*:*:*:*:*:*:*",
     "description": "Envoy is an open-source edge and service proxy, designed for cloud-native applications.",
     "headers": {
       "Server": "^envoy$",
@@ -1025,7 +1025,7 @@
     "cats": [
       27
     ],
-    "cpe": "cpe:/a:erlang:erlang%2fotp",
+    "cpe": "cpe:2.3:a:erlang:erlang%2fotp:*:*:*:*:*:*:*:*",
     "description": "Erlang is a general-purpose, concurrent, functional programming language, and a garbage-collected runtime system.",
     "headers": {
       "Server": "Erlang( OTP/(?:[\\d.ABR-]+))?\\;version:\\1"
@@ -1119,7 +1119,7 @@
     "cats": [
       24
     ],
-    "cpe": "cpe:/a:etherpad:etherpad",
+    "cpe": "cpe:2.3:a:etherpad:etherpad:*:*:*:*:*:*:*:*",
     "description": "Etherpad is an open-source, web-based collaborative real-time editor, allowing authors to simultaneously edit a text document, and see all of the participants' edits in real-time, with the ability to display each author's text in their own colour.",
     "headers": {
       "Server": "^Etherpad"
@@ -1367,7 +1367,7 @@
       18,
       22
     ],
-    "cpe": "cpe:/a:expressjs:express",
+    "cpe": "cpe:2.3:a:expressjs:express:*:*:*:*:*:*:*:*",
     "description": "Express is a web application framework for Node.js, released as free and open-source software under the MIT License. It is designed for building web applications and APIs.",
     "headers": {
       "X-Powered-By": "^Express(?:$|,)"
@@ -1385,7 +1385,7 @@
       "exp_last_activity": "",
       "exp_tracker": ""
     },
-    "cpe": "cpe:/a:ellislab:expressionengine",
+    "cpe": "cpe:2.3:a:ellislab:expressionengine:*:*:*:*:*:*:*:*",
     "description": "ExpressionEngine is a free and open-source CMS.",
     "icon": "ExpressionEngine.svg",
     "implies": "PHP",
@@ -1396,7 +1396,7 @@
     "cats": [
       12
     ],
-    "cpe": "cpe:/a:sencha:ext_js",
+    "cpe": "cpe:2.3:a:sencha:ext_js:*:*:*:*:*:*:*:*",
     "icon": "ExtJS.png",
     "js": {
       "Ext": "",
@@ -1768,7 +1768,7 @@
     "cookies": {
       "eZSESSID": ""
     },
-    "cpe": "cpe:/a:ez:ez_publish",
+    "cpe": "cpe:2.3:a:ez:ez_publish:*:*:*:*:*:*:*:*",
     "headers": {
       "X-Powered-By": "^eZ Publish"
     },
@@ -1850,7 +1850,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:experiencedcms:experiencedcms",
+    "cpe": "cpe:2.3:a:experiencedcms:experiencedcms:*:*:*:*:*:*:*:*",
     "icon": "experiencedCMS_Logo.png",
     "implies": "PHP",
     "meta": {
@@ -1858,4 +1858,4 @@
     },
     "website": "https://experiencedcms.berkearas.de"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/f.json b/src/technologies/f.json
index ce3b0cba8..bbfebf44e 100644
--- a/src/technologies/f.json
+++ b/src/technologies/f.json
@@ -13,7 +13,7 @@
       "MRHSession": "",
       "TIN": ""
     },
-    "cpe": "cpe:/a:f5:big-ip",
+    "cpe": "cpe:2.3:a:f5:big-ip:*:*:*:*:*:*:*:*",
     "description": "F5's BIG-IP is a family of products covering software and hardware designed around application availability, access control, and security solutions.",
     "headers": {
       "server": "^big-?ip$"
@@ -456,7 +456,7 @@
     "cats": [
       28
     ],
-    "cpe": "cpe:/o:fedoraproject:fedora",
+    "cpe": "cpe:2.3:o:fedoraproject:fedora:*:*:*:*:*:*:*:*",
     "description": "Fedora is a free open-source Linux-based operating system.",
     "headers": {
       "Server": "Fedora"
@@ -649,7 +649,7 @@
     "cats": [
       34
     ],
-    "cpe": "cpe:/a:google:firebase_cloud_messaging",
+    "cpe": "cpe:2.3:a:google:firebase_cloud_messaging:*:*:*:*:*:*:*:*",
     "description": "Firebase is a Backend-as-a-Service (Baas) for creating mobile and web applications.",
     "icon": "Firebase.png",
     "js": {
@@ -760,7 +760,7 @@
     "cats": [
       2
     ],
-    "cpe": "cpe:/a:flarum:flarum",
+    "cpe": "cpe:2.3:a:flarum:flarum:*:*:*:*:*:*:*:*",
     "description": "Flarum is a discussion platform.",
     "html": "<div id=\"flarum-loading\"",
     "icon": "flarum.png",
@@ -779,7 +779,7 @@
       18,
       22
     ],
-    "cpe": "cpe:/a:palletsprojects:flask",
+    "cpe": "cpe:2.3:a:palletsprojects:flask:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "Werkzeug/?([\\d\\.]+)?\\;version:\\1"
     },
@@ -958,7 +958,7 @@
     "cats": [
       2
     ],
-    "cpe": "cpe:/a:fluxbb:fluxbb",
+    "cpe": "cpe:2.3:a:fluxbb:fluxbb:*:*:*:*:*:*:*:*",
     "html": "<p id=\"poweredby\">[^<]+<a href=\"https?://fluxbb\\.org/\">",
     "icon": "FluxBB.png",
     "implies": "PHP",
@@ -1163,7 +1163,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:fork-cms:fork_cms",
+    "cpe": "cpe:2.3:a:fork-cms:fork_cms:*:*:*:*:*:*:*:*",
     "icon": "ForkCMS.png",
     "implies": "Symfony",
     "meta": {
@@ -1267,7 +1267,7 @@
       "FOSWIKISTRIKEONE": "",
       "SFOSWIKISID": ""
     },
-    "cpe": "cpe:/a:foswiki:foswiki",
+    "cpe": "cpe:2.3:a:foswiki:foswiki:*:*:*:*:*:*:*:*",
     "description": "Foswiki is a free open-source collaboration platform.",
     "headers": {
       "X-Foswikiaction": "",
@@ -1410,7 +1410,7 @@
     "cats": [
       28
     ],
-    "cpe": "cpe:/o:freebsd:freebsd",
+    "cpe": "cpe:2.3:o:freebsd:freebsd:*:*:*:*:*:*:*:*",
     "description": "FreeBSD is a free and open-source Unix-like operating system.",
     "headers": {
       "Server": "FreeBSD(?: ([\\d.]+))?\\;version:\\1"
@@ -1643,7 +1643,7 @@
     "cats": [
       20
     ],
-    "cpe": "cpe:/a:microsoft:frontpage",
+    "cpe": "cpe:2.3:a:microsoft:frontpage:*:*:*:*:*:*:*:*",
     "description": "FrontPage is a program for developing and maintaining websites.",
     "icon": "FrontPage.png",
     "meta": {
@@ -1828,4 +1828,4 @@
     "scriptSrc": "/fullPage\\.js(?:/([\\d\\.]+)/)?\\;version:\\1",
     "website": "https://github.com/alvarotrigo/fullpage.js"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/g.json b/src/technologies/g.json
index e03de4758..1cd90cbfb 100644
--- a/src/technologies/g.json
+++ b/src/technologies/g.json
@@ -393,7 +393,7 @@
     "cats": [
       28
     ],
-    "cpe": "cpe:/o:gentoo:linux",
+    "cpe": "cpe:2.3:o:gentoo:linux:*:*:*:*:*:*:*:*",
     "description": "Gentoo is a free operating system based on Linux.",
     "headers": {
       "X-Powered-By": "gentoo"
@@ -517,7 +517,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:get-simple:getsimple_cms",
+    "cpe": "cpe:2.3:a:get-simple:getsimple_cms:*:*:*:*:*:*:*:*",
     "icon": "GetSimple CMS.png",
     "implies": "PHP",
     "meta": {
@@ -673,7 +673,7 @@
     "cookies": {
       "_gitlab_session": ""
     },
-    "cpe": "cpe:/a:gitlab:gitlab",
+    "cpe": "cpe:2.3:a:gitlab:gitlab:*:*:*:*:*:*:*:*",
     "description": "GitLab is a web-based DevOps lifecycle tool that provides a Git-repository manager providing wiki, issue-tracking and continuous integration and deployment pipeline features, using an open-source license.",
     "html": [
       "<meta content=\"https?://[^/]+/assets/gitlab_logo-",
@@ -712,7 +712,7 @@
     "cookies": {
       "i_like_gitea": ""
     },
-    "cpe": "cpe:/a:gitea:gitea",
+    "cpe": "cpe:2.3:a:gitea:gitea:*:*:*:*:*:*:*:*",
     "description": "Gitea is an open-source forge software package for hosting software development version control using Git as well as other collaborative features like bug tracking, wikis and code review. It supports self-hosting but also provides a free public first-party instance hosted on DiDi's cloud.",
     "html": [
       "<div class=\"ui left\">\\n\\s+© Gitea Version: ([\\d.]+)\\;version:\\1"
@@ -772,7 +772,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:oracle:glassfish_server",
+    "cpe": "cpe:2.3:a:oracle:glassfish_server:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "GlassFish(?: Server)?(?: Open Source Edition)?(?: ?/?([\\d.]+))?\\;version:\\1"
     },
@@ -999,7 +999,7 @@
     "cats": [
       27
     ],
-    "cpe": "cpe:/a:golang:go",
+    "cpe": "cpe:2.3:a:golang:go:*:*:*:*:*:*:*:*",
     "icon": "Go.svg",
     "website": "https://golang.org"
   },
@@ -1044,7 +1044,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:embedthis:goahead",
+    "cpe": "cpe:2.3:a:embedthis:goahead:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "GoAhead"
     },
@@ -1290,7 +1290,7 @@
     "cookies": {
       "i_like_gogits": ""
     },
-    "cpe": "cpe:/a:gogs:gogs",
+    "cpe": "cpe:2.3:a:gogs:gogs:*:*:*:*:*:*:*:*",
     "description": "Gogs is a self-hosted Git service written in Go.",
     "html": [
       "<div class=\"ui left\">\\n\\s+© \\d{4} Gogs Version: ([\\d.]+) Page:\\;version:\\1",
@@ -1439,7 +1439,7 @@
     "cats": [
       63
     ],
-    "cpe": "cpe:/a:google:cloud_platform",
+    "cpe": "cpe:2.3:a:google:cloud_platform:*:*:*:*:*:*:*:*",
     "description": "Google Cloud is a suite of cloud computing services.",
     "icon": "google_cloud.svg",
     "website": "https://cloud.google.com"
@@ -1665,7 +1665,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:google:web_server",
+    "cpe": "cpe:2.3:a:google:web_server:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "gws"
     },
@@ -1676,7 +1676,7 @@
     "cats": [
       18
     ],
-    "cpe": "cpe:/a:google:web_toolkit",
+    "cpe": "cpe:2.3:a:google:web_toolkit:*:*:*:*:*:*:*:*",
     "description": "Google Web Toolkit (GWT) is an open-source Java software development framework that makes writing AJAX applications.",
     "icon": "Google Web Toolkit.png",
     "implies": "Java",
@@ -2175,7 +2175,7 @@
     "cats": [
       47
     ],
-    "cpe": "cpe:/a:git-scm:git",
+    "cpe": "cpe:2.3:a:git-scm:git:*:*:*:*:*:*:*:*",
     "icon": "git.svg",
     "meta": {
       "generator": "\\bgit/([\\d.]+\\d)\\;version:\\1"
@@ -2186,7 +2186,7 @@
     "cats": [
       47
     ],
-    "cpe": "cpe:/a:gitlist:gitlist",
+    "cpe": "cpe:2.3:a:gitlist:gitlist:*:*:*:*:*:*:*:*",
     "html": "<p>Powered by <a[^>]+>GitList ([\\d.]+)\\;version:\\1",
     "implies": [
       "PHP",
@@ -2232,4 +2232,4 @@
     "implies": "Python",
     "website": "http://gunicorn.org"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/h.json b/src/technologies/h.json
index d86f10f1d..768d6531d 100644
--- a/src/technologies/h.json
+++ b/src/technologies/h.json
@@ -19,7 +19,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:ibm:websphere_portal",
+    "cpe": "cpe:2.3:a:ibm:websphere_portal:*:*:*:*:*:*:*:*",
     "headers": {
       "IBM-Web2-Location": "",
       "Itx-Generated-Timestamp": ""
@@ -33,7 +33,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:facebook:hhvm",
+    "cpe": "cpe:2.3:a:facebook:hhvm:*:*:*:*:*:*:*:*",
     "headers": {
       "X-Powered-By": "HHVM/?([\\d.]+)?\\;version:\\1"
     },
@@ -56,7 +56,7 @@
       22,
       46
     ],
-    "cpe": "cpe:/h:hp:integrated_lights-out",
+    "cpe": "cpe:2.3:h:hp:integrated_lights-out:*:*:*:*:*:*:*:*",
     "description": "HP iLO is a tool that provides multiple ways to configure, update, monitor, and run servers remotely.",
     "headers": {
       "Server": "HP-iLO-Server(?:/([\\d.]+))?\\;version:\\1"
@@ -127,7 +127,7 @@
     "cats": [
       12
     ],
-    "cpe": "cpe:/a:handlebars.js_project:handlebars.js",
+    "cpe": "cpe:2.3:a:handlebars.js_project:handlebars.js:*:*:*:*:*:*:*:*",
     "description": "Handlebars is a JavaScript library used to create reusable webpage templates.",
     "html": "<[^>]*type=[^>]text\\/x-handlebars-template",
     "icon": "Handlebars.png",
@@ -1440,4 +1440,4 @@
     ],
     "website": "https://hyva.io/"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/i.json b/src/technologies/i.json
index 4d79024e4..421ed7056 100644
--- a/src/technologies/i.json
+++ b/src/technologies/i.json
@@ -11,7 +11,7 @@
     "cats": [
       64
     ],
-    "cpe": "cpe:/a:ibm:datapower_gateway",
+    "cpe": "cpe:2.3:a:ibm:datapower_gateway:*:*:*:*:*:*:*:*",
     "description": "IBM DataPower Gateway is a single multi-channel gateway designed to help provide security, control, integration and optimized access to a full range of mobile, web, application programming interface (API), service-oriented architecture (SOA), B2B and cloud workloads.",
     "headers": {
       "X-Backside-Transport": "",
@@ -24,7 +24,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:ibm:http_server",
+    "cpe": "cpe:2.3:a:ibm:http_server:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "IBM_HTTP_Server(?:/([\\d.]+))?\\;version:\\1"
     },
@@ -322,7 +322,7 @@
       "ICMSSession": "",
       "ImpressCMS": ""
     },
-    "cpe": "cpe:/a:impresscms:impresscms",
+    "cpe": "cpe:2.3:a:impresscms:impresscms:*:*:*:*:*:*:*:*",
     "icon": "ImpressCMS.png",
     "implies": "PHP",
     "meta": {
@@ -335,7 +335,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:impresspages:impresspages_cms",
+    "cpe": "cpe:2.3:a:impresspages:impresspages_cms:*:*:*:*:*:*:*:*",
     "icon": "ImpressPages.png",
     "implies": "PHP",
     "meta": {
@@ -441,7 +441,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:indexhibit:indexhibit",
+    "cpe": "cpe:2.3:a:indexhibit:indexhibit:*:*:*:*:*:*:*:*",
     "html": "<(?:link|a href) [^>]+ndxz-studio",
     "implies": [
       "PHP",
@@ -651,7 +651,7 @@
     "cookies": {
       "InstantCMS[logdate]": ""
     },
-    "cpe": "cpe:/a:instantcms:instantcms",
+    "cpe": "cpe:2.3:a:instantcms:instantcms:*:*:*:*:*:*:*:*",
     "icon": "InstantCMS.png",
     "implies": "PHP",
     "meta": {
@@ -753,7 +753,7 @@
       22,
       46
     ],
-    "cpe": "cpe:/a:intel:active_management_technology",
+    "cpe": "cpe:2.3:a:intel:active_management_technology:*:*:*:*:*:*:*:*",
     "description": "Intel Active Management Technology (AMT) is a proprietary remote management and control system for personal computers with Intel CPUs.",
     "headers": {
       "Server": "Intel\\(R\\) Active Management Technology(?: ([\\d.]+))?\\;version:\\1"
diff --git a/src/technologies/j.json b/src/technologies/j.json
index fc4482e43..54ac817f7 100644
--- a/src/technologies/j.json
+++ b/src/technologies/j.json
@@ -36,7 +36,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:redhat:jboss_application_server",
+    "cpe": "cpe:2.3:a:redhat:jboss_application_server:*:*:*:*:*:*:*:*",
     "headers": {
       "X-Powered-By": "JBoss(?:-([\\d.]+))?\\;version:\\1"
     },
@@ -47,7 +47,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:redhat:jbossweb",
+    "cpe": "cpe:2.3:a:redhat:jbossweb:*:*:*:*:*:*:*:*",
     "excludes": "Apache Tomcat",
     "headers": {
       "X-Powered-By": "JBossWeb(?:-([\\d.]+))?\\;version:\\1"
@@ -177,7 +177,7 @@
     "cookies": {
       "JSESSIONID": ""
     },
-    "cpe": "cpe:/a:oracle:jre",
+    "cpe": "cpe:2.3:a:oracle:jre:*:*:*:*:*:*:*:*",
     "description": "Java is a class-based, object-oriented programming language that is designed to have as few implementation dependencies as possible.",
     "icon": "Java.png",
     "website": "http://java.com"
@@ -241,7 +241,7 @@
     "cats": [
       57
     ],
-    "cpe": "cpe:/a:jekyllrb:jekyll",
+    "cpe": "cpe:2.3:a:jekyllrb:jekyll:*:*:*:*:*:*:*:*",
     "description": "Jekyll is a blog-aware, static site generator for personal, project, or organisation sites.",
     "html": [
       "Powered by <a href=\"https?://jekyllrb\\.com\"[^>]*>Jekyll</",
@@ -258,7 +258,7 @@
     "cats": [
       44
     ],
-    "cpe": "cpe:/a:jenkins:jenkins",
+    "cpe": "cpe:2.3:a:jenkins:jenkins:*:*:*:*:*:*:*:*",
     "description": "Jenkins is an open-source automation tool written in Java with plugins built for Continuous Integration (CI) purposes.",
     "headers": {
       "X-Jenkins": "([\\d.]+)\\;version:\\1"
@@ -493,7 +493,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:joomla:joomla",
+    "cpe": "cpe:2.3:a:joomla:joomla:*:*:*:*:*:*:*:*",
     "description": "Joomla is a free and open-source content management system for publishing web content.",
     "headers": {
       "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1"
@@ -741,7 +741,7 @@
     "cats": [
       59
     ],
-    "cpe": "cpe:/a:jquery:jquery",
+    "cpe": "cpe:2.3:a:jquery:jquery:*:*:*:*:*:*:*:*",
     "description": "jQuery is a JavaScript library which is a free, open-source software designed to simplify HTML DOM tree traversal and manipulation, as well as event handling, CSS animation, and Ajax.",
     "icon": "jQuery.svg",
     "js": {
@@ -835,7 +835,7 @@
     "cats": [
       59
     ],
-    "cpe": "cpe:/a:jquery:jquery_ui",
+    "cpe": "cpe:2.3:a:jquery:jquery_ui:*:*:*:*:*:*:*:*",
     "description": "jQuery UI is a collection of GUI widgets, animated visual effects, and themes implemented with jQuery, Cascading Style Sheets, and HTML.",
     "icon": "jQuery UI.svg",
     "implies": "jQuery",
@@ -887,4 +887,4 @@
     "website": "https://www.jsdelivr.com/",
     "xhr": "cdn\\.jsdelivr\\.net"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/k.json b/src/technologies/k.json
index 7b45244a0..437f23751 100644
--- a/src/technologies/k.json
+++ b/src/technologies/k.json
@@ -336,7 +336,7 @@
     "cookies": {
       "CMSPreferredCulture": ""
     },
-    "cpe": "cpe:/a:kentico:kentico_cms",
+    "cpe": "cpe:2.3:a:kentico:kentico_cms:*:*:*:*:*:*:*:*",
     "description": "Kentico CMS is a web content management system for building websites, online stores, intranets, and Web 2.0 community sites.",
     "icon": "Kentico CMS.png",
     "js": {
@@ -424,7 +424,7 @@
       29,
       25
     ],
-    "cpe": "cpe:/a:elasticsearch:kibana",
+    "cpe": "cpe:2.3:a:elasticsearch:kibana:*:*:*:*:*:*:*:*",
     "description": "Kibana is an open-source data visualisation dashboard for Elasticsearch. It provides visualisation capabilities on top of the content indexed on an Elasticsearch cluster. Users can create bar, line and scatter plots, or pie charts and maps on top of large volumes of data.",
     "headers": {
       "kbn-name": "kibana",
@@ -728,7 +728,7 @@
     "cats": [
       50
     ],
-    "cpe": "cpe:/a:koha:koha",
+    "cpe": "cpe:2.3:a:koha:koha:*:*:*:*:*:*:*:*",
     "description": "Koha is an open-source Integrated Library System (ILS).",
     "html": [
       "<input name=\"koha_login_context\" value=\"intranet\" type=\"hidden\">",
@@ -751,7 +751,7 @@
     "cookies": {
       "kohanasession": ""
     },
-    "cpe": "cpe:/a:kohanaframework:kohana",
+    "cpe": "cpe:2.3:a:kohanaframework:kohana:*:*:*:*:*:*:*:*",
     "headers": {
       "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1"
     },
@@ -887,8 +887,8 @@
     "cats": [
       47
     ],
-    "cpe": "cpe:/a:kubernetes:kubernetes",
-    "html": "<html ng-app=\"kubernetesDashboard\">",
+    "cpe": "cpe:2.3:a:kubernetes:kubernetes:*:*:*:*:*:*:*:*",
+    "dom": "[ng-app='kubernetesDashboard']",
     "icon": "Kubernetes.svg",
     "website": "https://kubernetes.io/"
   },
@@ -957,4 +957,4 @@
     ],
     "website": "https://www.keep.pt/en/produts/archeevo-archival-management-software"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/l.json b/src/technologies/l.json
index 6b637f611..ba2bc9b9a 100644
--- a/src/technologies/l.json
+++ b/src/technologies/l.json
@@ -3,7 +3,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:lepton-cms:lepton",
+    "cpe": "cpe:2.3:a:lepton-cms:lepton:*:*:*:*:*:*:*:*",
     "icon": "LEPTON.png",
     "implies": "PHP",
     "meta": {
@@ -89,7 +89,7 @@
     "cookies": {
       "laravel_session": ""
     },
-    "cpe": "cpe:/a:laravel:laravel",
+    "cpe": "cpe:2.3:a:laravel:laravel:*:*:*:*:*:*:*:*",
     "description": "Laravel is a free, open-source PHP web framework.",
     "icon": "Laravel.svg",
     "implies": "PHP",
@@ -491,7 +491,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:liferay:liferay_portal",
+    "cpe": "cpe:2.3:a:liferay:liferay_portal:*:*:*:*:*:*:*:*",
     "description": "Liferay is an open-source company that provides free documentation and paid professional service to users of its software.",
     "headers": {
       "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1"
@@ -510,7 +510,7 @@
     "cats": [
       18
     ],
-    "cpe": "cpe:/a:liftweb:lift",
+    "cpe": "cpe:2.3:a:liftweb:lift:*:*:*:*:*:*:*:*",
     "headers": {
       "X-Lift-Version": "(.+)\\;version:\\1"
     },
@@ -537,7 +537,7 @@
     "cats": [
       59
     ],
-    "cpe": "cpe:/a:lightbox_photo_gallery_project:lightbox_photo_gallery",
+    "cpe": "cpe:2.3:a:lightbox_photo_gallery_project:lightbox_photo_gallery:*:*:*:*:*:*:*:*",
     "html": "<link [^>]*href=\"[^\"]+lightbox(?:\\.min)?\\.css",
     "icon": "Lightbox.png",
     "scriptSrc": "lightbox(?:-plus-jquery)?.{0,32}\\.js",
@@ -778,7 +778,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:litespeedtech:litespeed_web_server",
+    "cpe": "cpe:2.3:a:litespeedtech:litespeed_web_server:*:*:*:*:*:*:*:*",
     "description": "LiteSpeed is a high-scalability web server.",
     "headers": {
       "Server": "^LiteSpeed$"
@@ -1162,7 +1162,7 @@
     "cats": [
       59
     ],
-    "cpe": "cpe:/a:lodash:lodash",
+    "cpe": "cpe:2.3:a:lodash:lodash:*:*:*:*:*:*:*:*",
     "description": "Lodash is a JavaScript library which provides utility functions for common programming tasks using the functional programming paradigm.",
     "excludes": "Underscore.js",
     "icon": "Lo-dash.png",
@@ -1446,7 +1446,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:ibm:lotus_domino",
+    "cpe": "cpe:2.3:a:ibm:lotus_domino:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "Lotus-Domino"
     },
@@ -1489,7 +1489,7 @@
     "cats": [
       27
     ],
-    "cpe": "cpe:/a:lua:lua",
+    "cpe": "cpe:2.3:a:lua:lua:*:*:*:*:*:*:*:*",
     "description": "Lua is a multi-paradigm programming language designed primarily for embedded use in applications.",
     "headers": {
       "X-Powered-By": "\\bLua(?: ([\\d.]+))?\\;version:\\1"
@@ -1501,7 +1501,7 @@
     "cats": [
       34
     ],
-    "cpe": "cpe:/a:apache:lucene",
+    "cpe": "cpe:2.3:a:apache:lucene:*:*:*:*:*:*:*:*",
     "description": "Lucene is a free and open-source search engine software library.",
     "icon": "Lucene.png",
     "implies": "Java",
@@ -1685,4 +1685,4 @@
     "oss": true,
     "website": "https://github.com/paulirish/lite-youtube-embed"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/m.json b/src/technologies/m.json
index 59ebfd2ba..37166b354 100644
--- a/src/technologies/m.json
+++ b/src/technologies/m.json
@@ -105,7 +105,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:modx:modx_revolution",
+    "cpe": "cpe:2.3:a:modx:modx_revolution:*:*:*:*:*:*:*:*",
     "description": "MODX is an open source content management system and web application framework for publishing content on the world wide web and intranets.",
     "headers": {
       "X-Powered-By": "^MODX"
@@ -251,7 +251,7 @@
       "X-Magento-Vary": "",
       "frontend": "\\;confidence:50"
     },
-    "cpe": "cpe:/a:magento:magento",
+    "cpe": "cpe:2.3:a:magento:magento:*:*:*:*:*:*:*:*",
     "description": "Magento is an open-source ecommerce platform written in PHP.",
     "dom": {
       "script[data-requiremodule*='mage/'], script[data-requiremodule*='Magento_'], html[data-image-optimizing-origin]": {
@@ -301,7 +301,7 @@
       32,
       75
     ],
-    "cpe": "cpe:/a:thinkshout:mailchimp",
+    "cpe": "cpe:2.3:a:thinkshout:mailchimp:*:*:*:*:*:*:*:*",
     "description": "Mailchimp is a marketing automation platform and email marketing service.",
     "dns": {
       "TXT": [
@@ -569,7 +569,7 @@
     "cats": [
       13
     ],
-    "cpe": "cpe:/a:mantisbt:mantisbt",
+    "cpe": "cpe:2.3:a:mantisbt:mantisbt:*:*:*:*:*:*:*:*",
     "html": "<img[^>]+ alt=\"Powered by Mantis Bugtracker",
     "icon": "MantisBT.png",
     "implies": "PHP",
@@ -713,7 +713,7 @@
     "cats": [
       34
     ],
-    "cpe": "cpe:/a:mariadb_project:mariadb",
+    "cpe": "cpe:2.3:a:mariadb_project:mariadb:*:*:*:*:*:*:*:*",
     "description": "MariaDB is an open-source relational database management system compatible with MySQL.",
     "icon": "mariadb.svg",
     "website": "https://mariadb.org"
@@ -739,7 +739,7 @@
     "cats": [
       59
     ],
-    "cpe": "cpe:/a:marked_project:marked",
+    "cpe": "cpe:2.3:a:marked_project:marked:*:*:*:*:*:*:*:*",
     "icon": "marked.svg",
     "js": {
       "marked": ""
@@ -897,7 +897,7 @@
     "cookies": {
       "PIWIK_SESSID": ""
     },
-    "cpe": "cpe:/a:matomo:matomo",
+    "cpe": "cpe:2.3:a:matomo:matomo:*:*:*:*:*:*:*:*",
     "description": "Matomo Analytics is a free and open-source web analytics applicatio, that runs on a PHP/MySQL web-server.",
     "icon": "Matomo.png",
     "js": {
@@ -928,7 +928,7 @@
     "cats": [
       2
     ],
-    "cpe": "cpe:/a:jenkins:mattermost",
+    "cpe": "cpe:2.3:a:jenkins:mattermost:*:*:*:*:*:*:*:*",
     "html": "<noscript> To use Mattermost, please enable JavaScript\\. </noscript>",
     "icon": "mattermost.png",
     "implies": [
@@ -947,7 +947,7 @@
     "cats": [
       32
     ],
-    "cpe": "cpe:/a:mautic:mautic",
+    "cpe": "cpe:2.3:a:mautic:mautic:*:*:*:*:*:*:*:*",
     "description": "Mautic is a free and open-source marketing automation tool for Content Management, Social Media, Email Marketing, and can be used for the integration of social networks, campaign management, forms, questionnaires, reports, etc.",
     "icon": "mautic.svg",
     "js": {
@@ -1086,7 +1086,7 @@
     "cats": [
       8
     ],
-    "cpe": "cpe:/a:mediawiki:mediawiki",
+    "cpe": "cpe:2.3:a:mediawiki:mediawiki:*:*:*:*:*:*:*:*",
     "description": "MediaWiki is a free and open-source wiki engine.",
     "html": [
       "<body[^>]+class=\"mediawiki\"",
@@ -1176,7 +1176,7 @@
       11,
       32
     ],
-    "cpe": "cpe:/a:melisplatform:melisplatform",
+    "cpe": "cpe:2.3:a:melisplatform:melisplatform:*:*:*:*:*:*:*:*",
     "html": [
       "<!-- Rendered with Melis CMS V2",
       "<!-- Rendered with Melis Platform"
@@ -1408,7 +1408,7 @@
       "ASP.NET_SessionId": "",
       "ASPSESSION": ""
     },
-    "cpe": "cpe:/a:microsoft:asp.net",
+    "cpe": "cpe:2.3:a:microsoft:asp.net:*:*:*:*:*:*:*:*",
     "description": "ASP.NET is an open-source, server-side web-application framework designed for web development to produce dynamic web pages.",
     "headers": {
       "X-AspNet-Version": "(.+)\\;version:\\1",
@@ -1503,7 +1503,7 @@
     "cats": [
       20
     ],
-    "cpe": "cpe:/a:microsoft:excel",
+    "cpe": "cpe:2.3:a:microsoft:excel:*:*:*:*:*:*:*:*",
     "description": "Microsoft Excel is an electronic spreadsheet program used for storing, organizing, and manipulating data.",
     "html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:excel\"|<!--\\s*(?:START|END) OF OUTPUT FROM EXCEL PUBLISH AS WEB PAGE WIZARD\\s*-->|<div [^>]*x:publishsource=\"?Excel\"?)",
     "icon": "Microsoft Excel.svg",
@@ -1527,7 +1527,7 @@
     "cats": [
       20
     ],
-    "cpe": "cpe:/a:microsoft:powerpoint",
+    "cpe": "cpe:2.3:a:microsoft:powerpoint:*:*:*:*:*:*:*:*",
     "description": "Microsoft PowerPoint is a tool to create presentations using simple drag and drop tools.",
     "html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:powerpoint\"|<link rel=\"?Presentation-XML\"? href=\"?[^\"]+\\.xml\"?>|<o:PresentationFormat>[^<]+</o:PresentationFormat>[^!]+<o:Slides>\\d+</o:Slides>(?:[^!]+<o:Version>([\\d.]+)</o:Version>)?)\\;version:\\1",
     "icon": "Microsoft PowerPoint.svg",
@@ -1541,7 +1541,7 @@
     "cats": [
       20
     ],
-    "cpe": "cpe:/a:microsoft:publisher",
+    "cpe": "cpe:2.3:a:microsoft:publisher:*:*:*:*:*:*:*:*",
     "description": "Microsoft Publisher is an application that allows you to create professional documents such as newsletters, postcards, flyers, invitations, brochures.",
     "html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:publisher\"|<!--[if pub]><xml>)",
     "icon": "Microsoft Publisher.svg",
@@ -1555,7 +1555,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:microsoft:sharepoint_server",
+    "cpe": "cpe:2.3:a:microsoft:sharepoint_server:*:*:*:*:*:*:*:*",
     "description": "SharePoint is a cloud-based collaborative platform to manage and share content.",
     "headers": {
       "MicrosoftSharePointTeamServices": "^(.+)$\\;version:\\1",
@@ -1581,7 +1581,7 @@
     "cats": [
       20
     ],
-    "cpe": "cpe:/a:microsoft:word",
+    "cpe": "cpe:2.3:a:microsoft:word:*:*:*:*:*:*:*:*",
     "description": "MS Word is a word-processing program used primarily for creating documents.",
     "html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:word\"|<w:WordDocument>|<div [^>]*class=\"?WordSection1[\" >]|<style[^>]*>[^>]*@page WordSection1)",
     "icon": "Microsoft Word.svg",
@@ -1923,7 +1923,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:mochiweb_project:mochiweb",
+    "cpe": "cpe:2.3:a:mochiweb_project:mochiweb:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "MochiWeb(?:/([\\d.]+))?\\;version:\\1"
     },
@@ -2008,7 +2008,7 @@
     "cookies": {
       "MOIN_SESSION": ""
     },
-    "cpe": "cpe:/a:moinmo:moinmoin",
+    "cpe": "cpe:2.3:a:moinmo:moinmoin:*:*:*:*:*:*:*:*",
     "description": "MoinMoin is a wiki engine implemented in Python.",
     "icon": "MoinMoin.png",
     "implies": "Python",
@@ -2045,7 +2045,7 @@
     "cats": [
       16
     ],
-    "cpe": "cpe:/a:acquia:mollom",
+    "cpe": "cpe:2.3:a:acquia:mollom:*:*:*:*:*:*:*:*",
     "html": "<img[^>]+\\.mollom\\.com",
     "icon": "Mollom.png",
     "scriptSrc": "mollom(?:\\.min)?\\.js",
@@ -2064,7 +2064,7 @@
     "cats": [
       59
     ],
-    "cpe": "cpe:/a:momentjs:moment",
+    "cpe": "cpe:2.3:a:momentjs:moment:*:*:*:*:*:*:*:*",
     "description": "Moment.js is a free and open-source JavaScript library that removes the need to use the native JavaScript Date object directly.",
     "icon": "Moment.js.svg",
     "js": {
@@ -2149,7 +2149,7 @@
     "cats": [
       34
     ],
-    "cpe": "cpe:/a:mongodb:mongodb",
+    "cpe": "cpe:2.3:a:mongodb:mongodb:*:*:*:*:*:*:*:*",
     "description": "MongoDB is a document-oriented NoSQL database used for high volume data storage.",
     "icon": "MongoDB.png",
     "website": "http://www.mongodb.org"
@@ -2158,7 +2158,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:zed_shaw:mongrel",
+    "cpe": "cpe:2.3:a:zed_shaw:mongrel:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "Mongrel"
     },
@@ -2180,7 +2180,7 @@
     "cats": [
       18
     ],
-    "cpe": "cpe:/a:mono:mono",
+    "cpe": "cpe:2.3:a:mono:mono:*:*:*:*:*:*:*:*",
     "headers": {
       "X-Powered-By": "Mono"
     },
@@ -2239,7 +2239,7 @@
       "MOODLEID_": "",
       "MoodleSession": ""
     },
-    "cpe": "cpe:/a:moodle:moodle",
+    "cpe": "cpe:2.3:a:moodle:moodle:*:*:*:*:*:*:*:*",
     "description": "Moodle is a free and open-source Learning Management System (LMS) written in PHP and distributed under the GNU General Public License.",
     "html": "<img[^>]+moodlelogo",
     "icon": "Moodle.png",
@@ -2342,7 +2342,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:sixapart:movable_type",
+    "cpe": "cpe:2.3:a:sixapart:movable_type:*:*:*:*:*:*:*:*",
     "icon": "Movable Type.svg",
     "meta": {
       "generator": "Movable Type"
@@ -2450,7 +2450,7 @@
       "mybb[lastactive]": "",
       "mybb[lastvisit]": ""
     },
-    "cpe": "cpe:/a:mybb:mybb",
+    "cpe": "cpe:2.3:a:mybb:mybb:*:*:*:*:*:*:*:*",
     "description": "MyBB is a free and open-source forum software written in PHP.",
     "icon": "MyBB.png",
     "implies": [
@@ -2514,7 +2514,7 @@
     "cats": [
       34
     ],
-    "cpe": "cpe:/a:mysql:mysql",
+    "cpe": "cpe:2.3:a:mysql:mysql:*:*:*:*:*:*:*:*",
     "description": "MySQL is an open-source relational database management system.",
     "icon": "MySQL.svg",
     "website": "http://mysql.com"
@@ -2793,7 +2793,7 @@
     "cats": [
       33
     ],
-    "cpe": "cpe:/a:apache:mod_perl",
+    "cpe": "cpe:2.3:a:apache:mod_perl:*:*:*:*:*:*:*:*",
     "description": "Mod_perl is an optional module for the Apache HTTP server. It embeds a Perl interpreter into the Apache server. In addition to allowing Apache modules to be written in the Perl programming language, it allows the Apache web server to be dynamically configured by Perl programs.",
     "headers": {
       "Server": "mod_perl(?:/([\\d\\.]+))?\\;version:\\1"
@@ -2809,7 +2809,7 @@
     "cats": [
       33
     ],
-    "cpe": "cpe:/a:apache:mod_python",
+    "cpe": "cpe:2.3:a:apache:mod_python:*:*:*:*:*:*:*:*",
     "description": "Mod_python is an Apache HTTP Server module that integrates the Python programming language with the server. It is intended to provide a Python language binding for the Apache HTTP Server. ",
     "headers": {
       "Server": "mod_python(?:/([\\d.]+))?\\;version:\\1"
@@ -2857,7 +2857,7 @@
     "cats": [
       33
     ],
-    "cpe": "cpe:/a:modssl:mod_ssl",
+    "cpe": "cpe:2.3:a:modssl:mod_ssl:*:*:*:*:*:*:*:*",
     "description": "mod_ssl is an optional module for the Apache HTTP Server. It provides strong cryptography for the Apache web server via the Secure Sockets Layer (SSL) and Transport Layer Security (TLS) cryptographic protocols by the help of the open-source SSL/TLS toolkit OpenSSL.",
     "headers": {
       "Server": "mod_ssl(?:/([\\d.]+))?\\;version:\\1"
@@ -2870,7 +2870,7 @@
     "cats": [
       33
     ],
-    "cpe": "cpe:/a:modwsgi:mod_wsgi",
+    "cpe": "cpe:2.3:a:modwsgi:mod_wsgi:*:*:*:*:*:*:*:*",
     "description": "mod_wsgi is an Apache HTTP Server module that provides a WSGI compliant interface for hosting Python based web applications under Apache.",
     "headers": {
       "Server": "mod_wsgi(?:/([\\d.]+))?\\;version:\\1",
@@ -2883,4 +2883,4 @@
     ],
     "website": "https://code.google.com/p/modwsgi"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/n.json b/src/technologies/n.json
index 1a3bec4a9..7976c8355 100644
--- a/src/technologies/n.json
+++ b/src/technologies/n.json
@@ -509,7 +509,7 @@
       18,
       22
     ],
-    "cpe": "cpe:/a:zeit:next.js",
+    "cpe": "cpe:2.3:a:zeit:next.js:*:*:*:*:*:*:*:*",
     "description": "Next.js is a React framework for developing single page Javascript applications.",
     "headers": {
       "x-powered-by": "^Next\\.js ?([0-9.]+)?\\;version:\\1"
@@ -531,7 +531,7 @@
       7,
       87
     ],
-    "cpe": "cpe:/a:imagely:nextgen_gallery",
+    "cpe": "cpe:2.3:a:imagely:nextgen_gallery:*:*:*:*:*:*:*:*",
     "description": "NextGEN Gallery is a free open-source image management plugin for the WordPress content management system.",
     "html": [
       "<!-- <meta name=\"NextGEN\" version=\"([\\d.]+)\" /> -->\\;version:\\1"
@@ -565,7 +565,7 @@
       22,
       64
     ],
-    "cpe": "cpe:/a:nginx:nginx",
+    "cpe": "cpe:2.3:a:nginx:nginx:*:*:*:*:*:*:*:*",
     "description": "Nginx is a web server that can also be used as a reverse proxy, load balancer, mail proxy and HTTP cache.",
     "headers": {
       "Server": "nginx(?:/([\\d.]+))?\\;version:\\1",
@@ -690,7 +690,7 @@
     "cats": [
       27
     ],
-    "cpe": "cpe:/a:nodejs:node.js",
+    "cpe": "cpe:2.3:a:nodejs:node.js:*:*:*:*:*:*:*:*",
     "description": "Node.js is an open-source, cross-platform, JavaScript runtime environment that executes JavaScript code outside a web browser.",
     "icon": "node.js.png",
     "website": "http://nodejs.org"
@@ -699,7 +699,7 @@
     "cats": [
       2
     ],
-    "cpe": "cpe:/a:nodebb:nodebb",
+    "cpe": "cpe:2.3:a:nodebb:nodebb:*:*:*:*:*:*:*:*",
     "headers": {
       "X-Powered-By": "^NodeBB$"
     },
@@ -936,4 +936,4 @@
     "saas": true,
     "website": "https://www.novomind.com/en/shopsystem/novomind-ishop-software"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/o.json b/src/technologies/o.json
index 6e417769d..a7c9169ba 100644
--- a/src/technologies/o.json
+++ b/src/technologies/o.json
@@ -258,7 +258,7 @@
       1,
       6
     ],
-    "cpe": "cpe:/a:odoo:odoo",
+    "cpe": "cpe:2.3:a:odoo:odoo:*:*:*:*:*:*:*:*",
     "description": "Odoo is business management software which includes CRM, ecommerce, billing, accounting, manufacturing, warehouse, project management, and inventory management.",
     "html": "<link[^>]* href=[^>]+/web/css/(?:web\\.assets_common/|website\\.assets_frontend/)\\;confidence:25",
     "icon": "Odoo.png",
@@ -323,8 +323,8 @@
     "cats": [
       69
     ],
-    "cpe": "cpe:/a:okta",
     "description": "Okta is a platform in the Identity-as-a-Service (IDaaS) category. Okta features include Provisioning, Single Sign-On (SSO), Active Directory (AD) and LDAP integration, the centralized de-provisioning of users, multi-factor authentication (MFA), mobile identity management.",
+    "cpe": "cpe:2.3:a:okta:*:*:*:*:*:*:*:*:*",
     "icon": "Okta.svg",
     "js": {
       "OktaAuth": "",
@@ -717,7 +717,7 @@
     "cats": [
       6
     ],
-    "cpe": "cpe:/a:open-classifieds:open_classifieds",
+    "cpe": "cpe:2.3:a:open-classifieds:open_classifieds:*:*:*:*:*:*:*:*",
     "icon": "Open Classifieds.png",
     "meta": {
       "author": "open-classifieds\\.com",
@@ -732,7 +732,7 @@
     "cookies": {
       "OJSSID": ""
     },
-    "cpe": "cpe:/a:public_knowledge_project:open_journal_systems",
+    "cpe": "cpe:2.3:a:public_knowledge_project:open_journal_systems:*:*:*:*:*:*:*:*",
     "description": "Open Journal Systems (OJS) is an open-source software application for managing and publishing scholarly journals.",
     "icon": "Open Journal Systems.png",
     "implies": "PHP",
@@ -745,7 +745,7 @@
     "cats": [
       10
     ],
-    "cpe": "cpe:/a:openwebanalytics:open_web_analytics",
+    "cpe": "cpe:2.3:a:openwebanalytics:open_web_analytics:*:*:*:*:*:*:*:*",
     "html": "<!-- (?:Start|End) Open Web Analytics Tracker -->",
     "icon": "Open Web Analytics.png",
     "js": {
@@ -771,7 +771,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:openbsd:openbsd",
+    "cpe": "cpe:2.3:a:openbsd:openbsd:*:*:*:*:*:*:*:*",
     "excludes": "Apache",
     "headers": {
       "Server": "^OpenBSD httpd"
@@ -787,7 +787,7 @@
     "cookies": {
       "OCSESSID": ""
     },
-    "cpe": "cpe:/a:opencart:opencart",
+    "cpe": "cpe:2.3:a:opencart:opencart:*:*:*:*:*:*:*:*",
     "icon": "OpenCart.png",
     "implies": "PHP",
     "website": "http://www.opencart.com"
@@ -796,7 +796,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:alkacon:opencms",
+    "cpe": "cpe:2.3:a:alkacon:opencms:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "OpenCms"
     },
@@ -903,7 +903,7 @@
     "cats": [
       33
     ],
-    "cpe": "cpe:/a:openssl:openssl",
+    "cpe": "cpe:2.3:a:openssl:openssl:*:*:*:*:*:*:*:*",
     "description": "OpenSSL is a software library for applications that secure communications over computer networks against eavesdropping or need to identify the party at the other end.",
     "headers": {
       "Server": "OpenSSL(?:/([\\d.]+[a-z]?))?\\;version:\\1"
@@ -978,7 +978,7 @@
     "cats": [
       36
     ],
-    "cpe": "cpe:/a:openx:openx",
+    "cpe": "cpe:2.3:a:openx:openx:*:*:*:*:*:*:*:*",
     "description": "OpenX is a programmatic advertising technology company.",
     "dom": "iframe[src*='.openx.net'], img[src*='.openx.net'], link[href*='.openx.net']",
     "icon": "OpenX.png",
@@ -1113,7 +1113,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:oracle:application_server",
+    "cpe": "cpe:2.3:a:oracle:application_server:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "Oracle[- ]Application[- ]Server(?: Containers for J2EE)?(?:[- ](\\d[\\da-z./]+))?\\;version:\\1"
     },
@@ -1141,7 +1141,7 @@
     "cats": [
       6
     ],
-    "cpe": "cpe:/a:oracle:commerce_platform",
+    "cpe": "cpe:2.3:a:oracle:commerce_platform:*:*:*:*:*:*:*:*",
     "description": "Oracle Commerce is a unified B2B and B2C ecommerce platform.",
     "dom": "input[name*='/atg/commerce/'], .atgShoppingBagContent",
     "headers": {
@@ -1177,7 +1177,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:oracle:http_server",
+    "cpe": "cpe:2.3:a:oracle:http_server:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "Oracle-HTTP-Server(?:/([\\d.]+))?\\;version:\\1"
     },
@@ -1227,7 +1227,7 @@
     "cats": [
       23
     ],
-    "cpe": "cpe:/a:oracle:web_cache",
+    "cpe": "cpe:2.3:a:oracle:web_cache:*:*:*:*:*:*:*:*",
     "description": "Oracle Web Cache is a browser and content management server, which improves the performance of web sites.",
     "headers": {
       "Server": "Oracle(?:AS)?[- ]Web[- ]Cache(?:[- /]([\\da-z./]+))?\\;version:\\1"
@@ -1485,7 +1485,7 @@
     "cats": [
       30
     ],
-    "cpe": "cpe:/a:microsoft:outlook_web_access",
+    "cpe": "cpe:2.3:a:microsoft:outlook_web_access:*:*:*:*:*:*:*:*",
     "description": "Outlook on the web is an information manager web app. It includes a web-based email client, a calendar tool, a contact manager, and a task manager.",
     "headers": {
       "X-OWA-Version": "([\\d\\.]+)?\\;version:\\1"
@@ -1602,4 +1602,4 @@
     },
     "website": "https://owncloud.org"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/p.json b/src/technologies/p.json
index c7ec8292d..2cd19f2e1 100644
--- a/src/technologies/p.json
+++ b/src/technologies/p.json
@@ -41,7 +41,7 @@
     "cookies": {
       "PHPSESSID": ""
     },
-    "cpe": "cpe:/a:php:php",
+    "cpe": "cpe:2.3:a:php:php:*:*:*:*:*:*:*:*",
     "description": "PHP is a general-purpose scripting language used for web development.",
     "headers": {
       "Server": "php/?([\\d.]+)?\\;version:\\1",
@@ -55,7 +55,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:phpnuke:php-nuke",
+    "cpe": "cpe:2.3:a:phpnuke:php-nuke:*:*:*:*:*:*:*:*",
     "html": "<[^>]+Powered by PHP-Nuke",
     "icon": "PHP-Nuke.png",
     "implies": "PHP",
@@ -82,7 +82,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:phpfusion:phpfusion",
+    "cpe": "cpe:2.3:a:phpfusion:phpfusion:*:*:*:*:*:*:*:*",
     "headers": {
       "X-PHPFusion": "(.+)$\\;version:\\1",
       "X-Powered-By": "PHPFusion (.+)$\\;version:\\1"
@@ -287,7 +287,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:pagekit:pagekit",
+    "cpe": "cpe:2.3:a:pagekit:pagekit:*:*:*:*:*:*:*:*",
     "icon": "Pagekit.png",
     "meta": {
       "generator": "Pagekit"
@@ -630,7 +630,7 @@
     "cats": [
       41
     ],
-    "cpe": "cpe:/a:paypal:paypal",
+    "cpe": "cpe:2.3:a:paypal:paypal:*:*:*:*:*:*:*:*",
     "description": "PayPal is an online payments system that supports online money transfers and serves as an electronic alternative to traditional paper methods like checks and money orders.",
     "dom": {
       "button": {
@@ -979,7 +979,7 @@
     "cats": [
       27
     ],
-    "cpe": "cpe:/a:perl:perl",
+    "cpe": "cpe:2.3:a:perl:perl:*:*:*:*:*:*:*:*",
     "description": "Perl is a family of two high-level, general-purpose, interpreted, dynamic programming languages.",
     "headers": {
       "Server": "\\bPerl\\b(?: ?/?v?([\\d.]+))?\\;version:\\1"
@@ -1222,7 +1222,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:phusionpassenger:phusion_passenger",
+    "cpe": "cpe:2.3:a:phusionpassenger:phusion_passenger:*:*:*:*:*:*:*:*",
     "description": "Phusion Passenger is a free web server and application server with support for Ruby, Python and Node.js.",
     "headers": {
       "Server": "Phusion Passenger ([\\d.]+)\\;version:\\1",
@@ -1327,7 +1327,7 @@
       1,
       6
     ],
-    "cpe": "cpe:/a:pimcore:pimcore",
+    "cpe": "cpe:2.3:a:pimcore:pimcore:*:*:*:*:*:*:*:*",
     "description": "Pimcore is an open-source digital platform that aggregates, enriches, and manages enterprise data and provides up-to-date, consistent, and personalised experiences to customers.",
     "dom": ".pimcore_area_content",
     "headers": {
@@ -1622,7 +1622,7 @@
     "cookies": {
       "PLAY_SESSION": ""
     },
-    "cpe": "cpe:/a:playframework:play_framework",
+    "cpe": "cpe:2.3:a:playframework:play_framework:*:*:*:*:*:*:*:*",
     "icon": "Play.svg",
     "implies": "Scala",
     "website": "https://www.playframework.com"
@@ -1662,7 +1662,7 @@
     "cats": [
       9
     ],
-    "cpe": "cpe:/a:parallels:parallels_plesk_panel",
+    "cpe": "cpe:2.3:a:parallels:parallels_plesk_panel:*:*:*:*:*:*:*:*",
     "description": "Plesk is a web hosting and server data centre automation software with a control panel developed for Linux and Windows-based retail hosting service providers.",
     "headers": {
       "X-Powered-By": "^Plesk(?:L|W)in",
@@ -1676,7 +1676,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:pligg:pligg_cms",
+    "cpe": "cpe:2.3:a:pligg:pligg_cms:*:*:*:*:*:*:*:*",
     "html": "<span[^>]+id=\"xvotes-0",
     "icon": "Pligg.svg",
     "js": {
@@ -1691,7 +1691,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:plone:plone",
+    "cpe": "cpe:2.3:a:plone:plone:*:*:*:*:*:*:*:*",
     "icon": "Plone.svg",
     "implies": "Python",
     "meta": {
@@ -2001,7 +2001,7 @@
     "cats": [
       34
     ],
-    "cpe": "cpe:/a:postgresql:postgresql",
+    "cpe": "cpe:2.3:a:postgresql:postgresql:*:*:*:*:*:*:*:*",
     "description": "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.",
     "icon": "PostgreSQL.png",
     "website": "http://www.postgresql.org/"
@@ -2228,7 +2228,7 @@
     "cookies": {
       "PrestaShop": ""
     },
-    "cpe": "cpe:/a:prestashop:prestashop",
+    "cpe": "cpe:2.3:a:prestashop:prestashop:*:*:*:*:*:*:*:*",
     "description": "PrestaShop is a freemium, open-source ecommerce solution, written in the PHP programming language with support for the MySQL database management system.",
     "dom": "img[src*='/modules/prestablog/themes/'], img[data-src*='/modules/prestablog/themes/']",
     "headers": {
@@ -2499,7 +2499,7 @@
     "cats": [
       12
     ],
-    "cpe": "cpe:/a:prototypejs:prototype",
+    "cpe": "cpe:2.3:a:prototypejs:prototype:*:*:*:*:*:*:*:*",
     "description": "Prototype is a JavaScript Framework that aims to ease development of web applications.",
     "icon": "Prototype.png",
     "js": {
@@ -2642,7 +2642,7 @@
     "cookies": {
       "DSSIGNIN": ""
     },
-    "cpe": "cpe:/a:pulsesecure:pulse_connect_secure",
+    "cpe": "cpe:2.3:a:pulsesecure:pulse_connect_secure:*:*:*:*:*:*:*:*",
     "description": "Pulse Secure allows to deploy VPNs to securely to your internal resources.",
     "icon": "PulseSecure.png",
     "url": "/dana-na/auth/",
@@ -2788,7 +2788,7 @@
     "cats": [
       19
     ],
-    "cpe": "cpe:/a:pygments:pygments",
+    "cpe": "cpe:2.3:a:pygments:pygments:*:*:*:*:*:*:*:*",
     "html": "<link[^>]+pygments\\.css[\"']",
     "icon": "pygments.png",
     "website": "http://pygments.org"
@@ -2811,7 +2811,7 @@
     "cats": [
       27
     ],
-    "cpe": "cpe:/a:python:python",
+    "cpe": "cpe:2.3:a:python:python:*:*:*:*:*:*:*:*",
     "description": "Python is an interpreted and general-purpose programming language.",
     "headers": {
       "Server": "(?:^|\\s)Python(?:/([\\d.]+))?\\;version:\\1"
@@ -2867,7 +2867,7 @@
     "cookies": {
       "phpbb": ""
     },
-    "cpe": "cpe:/a:phpbb:phpbb",
+    "cpe": "cpe:2.3:a:phpbb:phpbb:*:*:*:*:*:*:*:*",
     "description": "phpBB is a free open-source Internet forum package in the PHP scripting language.",
     "html": [
       "Powered by <a[^>]+phpBB",
@@ -2891,7 +2891,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:phpcms:phpcms",
+    "cpe": "cpe:2.3:a:phpcms:phpcms:*:*:*:*:*:*:*:*",
     "icon": "PHP.svg",
     "implies": "PHP",
     "js": {
@@ -2913,7 +2913,7 @@
     "cats": [
       3
     ],
-    "cpe": "cpe:/a:phpmyadmin:phpmyadmin",
+    "cpe": "cpe:2.3:a:phpmyadmin:phpmyadmin:*:*:*:*:*:*:*:*",
     "description": "PhpMyAdmin is a free and open-source administration tool for MySQL and MariaDB.",
     "html": [
       "!\\[CDATA\\[[^<]*PMA_VERSION:\\\"([\\d.]+)\\;version:\\1",
@@ -2933,7 +2933,7 @@
     "cats": [
       3
     ],
-    "cpe": "cpe:/a:phppgadmin_project:phppgadmin",
+    "cpe": "cpe:2.3:a:phppgadmin_project:phppgadmin:*:*:*:*:*:*:*:*",
     "html": "(?:<title>phpPgAdmin</title>|<span class=\"appname\">phpPgAdmin)",
     "icon": "phpPgAdmin.png",
     "implies": "PHP",
@@ -3049,4 +3049,4 @@
     },
     "website": "http://punbb.informer.com"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/q.json b/src/technologies/q.json
index 175d9286f..300914401 100644
--- a/src/technologies/q.json
+++ b/src/technologies/q.json
@@ -231,7 +231,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:opensolution:quick.cms",
+    "cpe": "cpe:2.3:a:opensolution:quick.cms:*:*:*:*:*:*:*:*",
     "html": "<a href=\"[^>]+opensolution\\.org/\">CMS by",
     "icon": "Quick.CMS.png",
     "meta": {
diff --git a/src/technologies/r.json b/src/technologies/r.json
index a88b00bf3..7641a37c0 100644
--- a/src/technologies/r.json
+++ b/src/technologies/r.json
@@ -38,7 +38,7 @@
     "cats": [
       4
     ],
-    "cpe": "cpe:/a:dave_thomas:rdoc",
+    "cpe": "cpe:2.3:a:dave_thomas:rdoc:*:*:*:*:*:*:*:*",
     "description": "RDoc produces HTML and command-line documentation for Ruby projects.",
     "html": [
       "<link[^>]+href=\"[^\"]*rdoc-style\\.css",
@@ -413,7 +413,7 @@
     "cats": [
       12
     ],
-    "cpe": "cpe:/a:facebook:react",
+    "cpe": "cpe:2.3:a:facebook:react:*:*:*:*:*:*:*:*",
     "description": "React is an open-source JavaScript library for building user interfaces or UI components.",
     "dom": {
       "body > div": {
@@ -700,7 +700,7 @@
     "cats": [
       28
     ],
-    "cpe": "cpe:/o:redhat:linux",
+    "cpe": "cpe:2.3:o:redhat:linux:*:*:*:*:*:*:*:*",
     "description": "Red Hat is an open-source Linux operating system.",
     "headers": {
       "Server": "Red Hat",
@@ -775,7 +775,7 @@
     "cats": [
       34
     ],
-    "cpe": "cpe:/a:redislabs:redis",
+    "cpe": "cpe:2.3:a:redislabs:redis:*:*:*:*:*:*:*:*",
     "description": "Redis is an in-memory data structure project implementing a distributed, in-memory key–value database with optional durability. Redis supports different kinds of abstract data structures, such as strings, lists, maps, sets, sorted sets, HyperLogLogs, bitmaps, streams, and spatial indexes.",
     "icon": "Redis.svg",
     "website": "https://redis.io"
@@ -799,7 +799,7 @@
     "cookies": {
       "_redmine_session": ""
     },
-    "cpe": "cpe:/a:redmine:redmine",
+    "cpe": "cpe:2.3:a:redmine:redmine:*:*:*:*:*:*:*:*",
     "description": "Redmine is a free and open-source, web-based project management and issue tracking tool.",
     "html": "Powered by <a href=\"[^>]+Redmine",
     "icon": "Redmine.png",
@@ -1104,7 +1104,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:caucho:resin",
+    "cpe": "cpe:2.3:a:caucho:resin:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "^Resin(?:/(\\S*))?\\;version:\\1"
     },
@@ -1715,7 +1715,7 @@
     "cats": [
       30
     ],
-    "cpe": "cpe:/a:roundcube:webmail",
+    "cpe": "cpe:2.3:a:roundcube:webmail:*:*:*:*:*:*:*:*",
     "description": "RoundCube is free and open-source web-based IMAP email client.",
     "html": "<title>RoundCube",
     "icon": "RoundCube.png",
@@ -1777,7 +1777,7 @@
     "cats": [
       27
     ],
-    "cpe": "cpe:/a:ruby-lang:ruby",
+    "cpe": "cpe:2.3:a:ruby-lang:ruby:*:*:*:*:*:*:*:*",
     "description": "Ruby is an open-source object-oriented programming language.",
     "headers": {
       "Server": "(?:Mongrel|WEBrick|Ruby)"
@@ -1809,7 +1809,7 @@
     "cookies": {
       "_session_id": "\\;confidence:75"
     },
-    "cpe": "cpe:/a:rubyonrails:rails",
+    "cpe": "cpe:2.3:a:rubyonrails:rails:*:*:*:*:*:*:*:*",
     "description": "Ruby on Rails is a server-side web application framework written in Ruby under the MIT License.",
     "headers": {
       "Server": "mod_(?:rails|rack)",
@@ -1908,4 +1908,4 @@
     "scripts": "/recaptcha/api\\.js",
     "website": "https://www.google.com/recaptcha/"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/s.json b/src/technologies/s.json
index f1b70e206..117315338 100644
--- a/src/technologies/s.json
+++ b/src/technologies/s.json
@@ -20,7 +20,7 @@
     "cats": [
       53
     ],
-    "cpe": "cpe:/a:sap:netweaver_application_server",
+    "cpe": "cpe:2.3:a:sap:netweaver_application_server:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "SAP NetWeaver Application Server"
     },
@@ -34,7 +34,7 @@
     "cookies": {
       "_hybris": ""
     },
-    "cpe": "cpe:/a:sap:commerce_cloud",
+    "cpe": "cpe:2.3:a:sap:commerce_cloud:*:*:*:*:*:*:*:*",
     "description": "SAP Commerce Cloud is a cloud-native omnichannel commerce solution for B2B, B2C, and B2B2C companies.",
     "html": [
       "<[^>]+/(?:sys_master|hybr|_ui/(?:.*responsive/)?(?:desktop|common(?:/images|/img|/css|ico)?))/",
@@ -195,7 +195,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:spip:spip",
+    "cpe": "cpe:2.3:a:spip:spip:*:*:*:*:*:*:*:*",
     "headers": {
       "Composed-By": "SPIP ([\\d.]+) @\\;version:\\1",
       "X-Spip-Cache": ""
@@ -231,7 +231,7 @@
     "cats": [
       34
     ],
-    "cpe": "cpe:/a:sqlite:sqlite",
+    "cpe": "cpe:2.3:a:sqlite:sqlite:*:*:*:*:*:*:*:*",
     "icon": "SQLite.png",
     "website": "http://www.sqlite.org"
   },
@@ -534,7 +534,7 @@
     "cookies": {
       "com.salesforce": ""
     },
-    "cpe": "cpe:/a:salesforce",
+    "cpe": "cpe:2.3:a:salesforce:*:*:*:*:*:*:*:*:*",
     "description": "Salesforce is a cloud computing service software (SaaS) that specializes in customer relationship management (CRM).",
     "dns": {
       "TXT": [
@@ -2951,7 +2951,7 @@
       "SC_OS_SessionId": "",
       "sc_expview": ""
     },
-    "cpe": "cpe:/a:sitecore",
+    "cpe": "cpe:2.3:a:sitecore:*:*:*:*:*:*:*:*:*",
     "description": "Sitecore provides web content management, and multichannel marketing automation software.",
     "html": "<img[^>]+src=\"[^>]*/~/media/[^>]+\\.ashx",
     "icon": "Sitecore.svg",
@@ -3730,7 +3730,7 @@
     "cats": [
       34
     ],
-    "cpe": "cpe:/a:apache:solr",
+    "cpe": "cpe:2.3:a:apache:solr:*:*:*:*:*:*:*:*",
     "description": "Solr is an open-source enterprise-search platform, written in Java.",
     "icon": "Solr.png",
     "implies": "Lucene",
@@ -4559,7 +4559,7 @@
     "cats": [
       30
     ],
-    "cpe": "cpe:/a:squirrelmail:squirrelmail",
+    "cpe": "cpe:2.3:a:squirrelmail:squirrelmail:*:*:*:*:*:*:*:*",
     "description": "SquirrelMail is an open-source web-mail package that is based on PHP language. It provides a web-based-email client and a proxy server for IMAP protocol.",
     "html": "<small>SquirrelMail version ([.\\d]+)[^<]*<br \\;version:\\1",
     "icon": "SquirrelMail.png",
@@ -5218,7 +5218,7 @@
     "cats": [
       28
     ],
-    "cpe": "cpe:/o:oracle:sunos",
+    "cpe": "cpe:2.3:o:oracle:sunos:*:*:*:*:*:*:*:*",
     "description": "SunOS is a Unix-branded operating system developed by Sun Microsystems for their workstation and server computer systems.",
     "headers": {
       "Server": "SunOS( [\\d\\.]+)?\\;version:\\1",
@@ -5540,7 +5540,7 @@
     "cookies": {
       "sf_redirect": ""
     },
-    "cpe": "cpe:/a:sensiolabs:symfony",
+    "cpe": "cpe:2.3:a:sensiolabs:symfony:*:*:*:*:*:*:*:*",
     "description": "Symfony is a PHP web application framework and a set of reusable PHP components/libraries.",
     "dom": "div.sf-toolbar-block, div.sf-toolbar",
     "icon": "Symfony.svg",
diff --git a/src/technologies/t.json b/src/technologies/t.json
index 5784964d8..5c411f3a7 100644
--- a/src/technologies/t.json
+++ b/src/technologies/t.json
@@ -179,7 +179,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:typo3:typo3",
+    "cpe": "cpe:2.3:a:typo3:typo3:*:*:*:*:*:*:*:*",
     "description": "TYPO3 is a free and open-source Web content management system written in PHP.",
     "html": [
       "<link[^>]+ href=\"/?typo3(?:conf|temp)/",
@@ -1764,7 +1764,7 @@
     "cats": [
       24
     ],
-    "cpe": "cpe:/a:tiny:tinymce",
+    "cpe": "cpe:2.3:a:tiny:tinymce:*:*:*:*:*:*:*:*",
     "description": "TinyMCE is an online rich-text editor released as open-source software. TinyMCE is designed to integrate with JavaScript libraries, Vue.js, and AngularJS as well as content management systems such as Joomla!, and WordPress.",
     "icon": "TinyMCE.png",
     "js": {
@@ -2926,7 +2926,7 @@
     "cats": [
       22
     ],
-    "cpe": "cpe:/a:acme:thttpd",
+    "cpe": "cpe:2.3:a:acme:thttpd:*:*:*:*:*:*:*:*",
     "headers": {
       "Server": "\\bthttpd(?:/([\\d.]+))?\\;version:\\1"
     },
@@ -2956,4 +2956,4 @@
     "implies": "Node.js",
     "website": "https://totaljs.com"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/u.json b/src/technologies/u.json
index 9c0408e6f..8b0da834a 100644
--- a/src/technologies/u.json
+++ b/src/technologies/u.json
@@ -140,7 +140,7 @@
     "cats": [
       28
     ],
-    "cpe": "cpe:/o:canonical:ubuntu_linux",
+    "cpe": "cpe:2.3:o:canonical:ubuntu_linux:*:*:*:*:*:*:*:*",
     "description": "Ubuntu is a free and open-source operating system on Linux for the enterprise server, desktop, cloud, and IoT.",
     "headers": {
       "Server": "Ubuntu",
@@ -820,4 +820,4 @@
     "website": "https://github.com/utterance/utterances",
     "xhr": "\\.utteranc\\.es"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/v.json b/src/technologies/v.json
index 2e7f01139..3e495b9e8 100644
--- a/src/technologies/v.json
+++ b/src/technologies/v.json
@@ -180,7 +180,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:vardot:varbase",
+    "cpe": "cpe:2.3:a:vardot:varbase:*:*:*:*:*:*:*:*",
     "dom": "meta[content='Varbase'],div[class*='varbase_'],div[class*='_varbase'],div[class*='varbase-'],div[class*='block-varbase'],div[class*='blockvarbase']",
     "icon": "varbase.png",
     "implies": "Drupal",
@@ -194,7 +194,7 @@
     "cats": [
       23
     ],
-    "cpe": "cpe:/a:varnish-software:varnich_cache",
+    "cpe": "cpe:2.3:a:varnish-software:varnich_cache:*:*:*:*:*:*:*:*",
     "description": "Varnish is a reverse caching proxy.",
     "headers": {
       "Via": "varnish(?: \\(Varnish/([\\d.]+)\\))?\\;version:\\1",
@@ -895,7 +895,7 @@
       "bblastvisit": "",
       "bbsessionhash": ""
     },
-    "cpe": "cpe:/a:vbulletin:vbulletin",
+    "cpe": "cpe:2.3:a:vbulletin:vbulletin:*:*:*:*:*:*:*:*",
     "description": "vBulletin is tool that is used to create and manage online forums or discussion boards. It is written in PHP and uses a MySQL database server.",
     "html": "<div id=\"copyright\">Powered by vBulletin",
     "icon": "vBulletin.png",
@@ -944,4 +944,4 @@
     },
     "website": "http://vibecommerce.com.br"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/w.json b/src/technologies/w.json
index 0b1d8417a..4aaa7299f 100644
--- a/src/technologies/w.json
+++ b/src/technologies/w.json
@@ -975,7 +975,7 @@
     "cookies": {
       "usces_cookie": ""
     },
-    "cpe": "cpe:/a:welcart:welcart",
+    "cpe": "cpe:2.3:a:welcart:welcart:*:*:*:*:*:*:*:*",
     "description": "Welcart is a free ecommerce plugin for WordPress with top market share in Japan.",
     "html": [
       "<link[^>]+?href=\"[^\"]+usces_default(?:\\.min)?\\.css",
@@ -1578,7 +1578,7 @@
       1,
       11
     ],
-    "cpe": "cpe:/a:wordpress:wordpress",
+    "cpe": "cpe:2.3:a:wordpress:wordpress:*:*:*:*:*:*:*:*",
     "description": "WordPress is a free and open-source content management system written in PHP and paired with a MySQL or MariaDB database. Features include a plugin architecture and a template system.",
     "headers": {
       "X-Pingback": "/xmlrpc\\.php$",
@@ -1888,7 +1888,7 @@
     "cats": [
       1
     ],
-    "cpe": "cpe:/a:webedition:webedition_cms",
+    "cpe": "cpe:2.3:a:webedition:webedition_cms:*:*:*:*:*:*:*:*",
     "icon": "webEdition.png",
     "meta": {
       "DC.title": "webEdition",
@@ -1956,4 +1956,4 @@
     "url": "^https?://[^/]+\\.wpcache\\.co",
     "website": "https://wpcache.co"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/y.json b/src/technologies/y.json
index cfed9ef66..d82de7a4c 100644
--- a/src/technologies/y.json
+++ b/src/technologies/y.json
@@ -36,7 +36,7 @@
     "cats": [
       59
     ],
-    "cpe": "cpe:/a:yahoo:yui",
+    "cpe": "cpe:2.3:a:yahoo:yui:*:*:*:*:*:*:*:*",
     "description": "YUI is a JavaScript and CSS library with more than 30 unique components including low-level DOM utilities and high-level user-interface widgets.",
     "icon": "YUI.png",
     "js": {
@@ -621,4 +621,4 @@
     "scriptSrc": "cdn\\.yellowmessenger\\.com",
     "website": "https://yellow.ai/"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/z.json b/src/technologies/z.json
index 1115613bd..a1859ea3f 100644
--- a/src/technologies/z.json
+++ b/src/technologies/z.json
@@ -28,7 +28,7 @@
     "cats": [
       19
     ],
-    "cpe": "cpe:/a:zabbix:zabbix",
+    "cpe": "cpe:2.3:a:zabbix:zabbix:*:*:*:*:*:*:*:*",
     "html": "<body[^>]+zbxCallPostScripts",
     "icon": "Zabbix.png",
     "implies": "PHP",
@@ -171,7 +171,7 @@
     "cookies": {
       "ZENDSERVERSESSID": ""
     },
-    "cpe": "cpe:/a:zend:zend_server",
+    "cpe": "cpe:2.3:a:zend:zend_server:*:*:*:*:*:*:*:*",
     "headers": {
       "X-Powered-By": "Zend(?:Server)?(?:[\\s/]?([0-9.]+))?\\;version:\\1"
     },
@@ -319,7 +319,7 @@
     "cookies": {
       "ZM_TEST": "true"
     },
-    "cpe": "cpe:/a:zimbra:zimbra",
+    "cpe": "cpe:2.3:a:zimbra:zimbra:*:*:*:*:*:*:*:*",
     "icon": "Zimbra.png",
     "implies": "Java",
     "website": "https://www.zimbra.com/"
@@ -684,4 +684,4 @@
     "scriptSrc": "userapp\\.zyrosite\\.com/",
     "website": "https://zyro.com"
   }
-}
\ No newline at end of file
+}