diff --git a/schema.json b/schema.json
index c5a875676..7181ac3ca 100644
--- a/schema.json
+++ b/schema.json
@@ -1,7 +1,7 @@
 {
 	"title": "Wappalyzer Schema",
 	"definitions": {
-		"non-empty-non-blank-sting": {
+		"non-empty-non-blank-string": {
 			"type": "string",
 			"pattern": "^(?!\\s*$).+"
 		}
@@ -45,7 +45,7 @@
 						"minItems": 1
 					},
 					"cpe": {
-						"$ref": "#/definitions/non-empty-non-blank-sting"
+						"$ref": "#/definitions/non-empty-non-blank-string"
 					},
 					"cookies": {
 						"type": "object",
@@ -85,11 +85,11 @@
 							{
 								"type": "array",
 								"items": {
-									"$ref": "#/definitions/non-empty-non-blank-sting"
+									"$ref": "#/definitions/non-empty-non-blank-string"
 								}
 							},
 							{
-								"$ref": "#/definitions/non-empty-non-blank-sting"
+								"$ref": "#/definitions/non-empty-non-blank-string"
 							}
 						]
 					},
@@ -98,11 +98,11 @@
 							{
 								"type": "array",
 								"items": {
-									"$ref": "#/definitions/non-empty-non-blank-sting"
+									"$ref": "#/definitions/non-empty-non-blank-string"
 								}
 							},
 							{
-								"$ref": "#/definitions/non-empty-non-blank-sting"
+								"$ref": "#/definitions/non-empty-non-blank-string"
 							}
 						]
 					},
@@ -111,11 +111,11 @@
 							{
 								"type": "array",
 								"items": {
-									"$ref": "#/definitions/non-empty-non-blank-sting"
+									"$ref": "#/definitions/non-empty-non-blank-string"
 								}
 							},
 							{
-								"$ref": "#/definitions/non-empty-non-blank-sting"
+								"$ref": "#/definitions/non-empty-non-blank-string"
 							}
 						]
 					},
@@ -135,22 +135,22 @@
 							{
 								"type": "array",
 								"items": {
-									"$ref": "#/definitions/non-empty-non-blank-sting"
+									"$ref": "#/definitions/non-empty-non-blank-string"
 								}
 							},
 							{
-								"$ref": "#/definitions/non-empty-non-blank-sting"
+								"$ref": "#/definitions/non-empty-non-blank-string"
 							}
 						]
 					},
 					"url": {
-						"$ref": "#/definitions/non-empty-non-blank-sting"
+						"$ref": "#/definitions/non-empty-non-blank-string"
 					},
 					"website": {
-						"$ref": "#/definitions/non-empty-non-blank-sting"
+						"$ref": "#/definitions/non-empty-non-blank-string"
 					},
 					"icon": {
-						"$ref": "#/definitions/non-empty-non-blank-sting"
+						"$ref": "#/definitions/non-empty-non-blank-string"
 					}
 				}
 			}
diff --git a/src/apps.json b/src/apps.json
index 204058f54..cdf02642f 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -991,7 +991,7 @@
         10
       ],
       "icon": "AppDynamics.png",
-      "script": "adrum\\.js|adrum.([0-9].*)\\.js\\;version:\\1",
+      "script": "adrum\\.js|adrum\\.([0-9].*)\\.js\\;version:\\1",
       "website": "https://appdynamics.com"
     },
     "AppNexus": {
@@ -2370,6 +2370,18 @@
       },
       "website": "http://contao.org"
     },
+    "experiencedCMS": {
+      "cats": [
+        1
+      ],
+      "cpe": "cpe:/a:experiencedcms:experiencedcms",
+      "icon": "experiencedCMS_Logo.png",
+      "implies": "PHP",
+      "meta": {
+        "generator": "^experiencedCMS$"
+      },
+      "website": "https://experiencedcms.berkearas.de"
+    },
     "Contenido": {
       "cats": [
         1
@@ -3670,6 +3682,14 @@
       "icon": "Fastly.svg",
       "website": "https://www.fastly.com"
     },
+    "FaraPy": {
+      "cats": [
+        1
+      ],
+      "html": "<!-- Powered by FaraPy.",
+      "icon": "FaraPy.png",
+      "website": "https://faral.tech"
+    },
     "Fat-Free Framework": {
       "cats": [
         18
@@ -3852,11 +3872,11 @@
       ],
       "html": [
         "<link[^>]* href=[^>]+(?:([\\d.]+)/)?(?:css/)?font-awesome(?:\\.min)?\\.css\\;version:\\1",
-        "<link[^>]* href=\"https://use\\.fontawesome\\.com/releases/v([^>]+)/css/\\;version:\\1",
-        "<script[^>]* src=[^>]+fontawesome(?:\\.js)?"
+        "<link[^>]* href=[^>]*?(?:F|f)o(?:n|r)t-?(?:A|a)wesome(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)\\;version:\\1"
       ],
-      "icon": "Font Awesome.png",
-      "website": "http://fontawesome.io"
+      "script": "(?:F|f)o(?:n|r)t-?(?:A|a)wesome(?:.*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)\\;version:\\1",
+      "icon": "font-awesome.svg",
+      "website": "https://fontawesome.com/"
     },
     "Fork CMS": {
       "cats": [
@@ -3921,7 +3941,7 @@
       "cats": [
         24
       ],
-      "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:.|\\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
+      "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:\\.|\\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
       "icon": "FreeTextBox.png",
       "implies": "Microsoft ASP.NET",
       "js": {
@@ -4109,8 +4129,8 @@
         "gx.gxVersion": "^(.+)-.*$\\;version:\\1"
       },
       "script": [
-        ".*/static/gxgral.js",
-        ".*/static/gxtimezone.js"
+        "/static/gxgral\\.js",
+        "/static/gxtimezone\\.js"
       ],
       "website": "https://www.genexus.com/"
     },
@@ -4190,7 +4210,7 @@
       ],
       "icon": "GitBook.png",
       "meta": {
-        "generator": "GitBook(?:.([\\d.]+))?\\;version:\\1"
+        "generator": "GitBook(?:\\.([\\d.]+))?\\;version:\\1"
       },
       "url": "^https?://[^/]+\\.gitbook\\.com/",
       "website": "https://www.gitbook.com"
@@ -4650,7 +4670,7 @@
         "gr_user_id": ""
       },
       "icon": "GrowingIO.png",
-      "script": "assets\\.growingio\\.com/([\\d.]+)/gio.js\\;version:\\1",
+      "script": "assets\\.growingio\\.com/([\\d.]+)/gio\\.js\\;version:\\1",
       "website": "https://www.growingio.com/"
     },
     "gRPC": {
@@ -4971,7 +4991,7 @@
       "cats": [
         57
       ],
-      "html": "powered by <a [^>]*href=\"http://hugo.spf13.com",
+      "html": "powered by <a [^>]*href=\"http://hugo\\.spf13\\.com",
       "icon": "Hugo.png",
       "meta": {
         "generator": "Hugo ([\\d.]+)?\\;version:\\1"
@@ -5488,7 +5508,7 @@
         18
       ],
       "headers": {
-        "X-Powered-By": "Servlet(?:.([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "Servlet(?:\\.([\\d.]+))?\\;version:\\1"
       },
       "icon": "Java.png",
       "implies": "Java",
@@ -5536,6 +5556,18 @@
       "implies": "Java",
       "website": "http://www.oracle.com/technetwork/java/javaee/jsp/index.html"
     },
+    "jComponent": {
+      "cats": [
+        12,
+        59
+      ],
+      "icon": "jComponent.png",
+      "js": {
+        "MAIN.version": ".*\\;version:\\1"
+      },
+      "implies": "jQuery",
+      "website": "https://componentator.com"
+    },
     "Jekyll": {
       "cats": [
         57
@@ -6414,7 +6446,7 @@
         6
       ],
       "icon": "miva.png",
-      "script": "mvga.js",
+      "script": "mvga\\.js",
       "js": {
         "MivaVM_API": "",
         "MivaVM_Version": "^(.+)$\\;version:\\1",
@@ -6426,7 +6458,7 @@
         "mivaJS.Screen": ""
       },
       "headers": {
-        "content-disposition": "filename=(?:mvga.js|MivaEvents.js)"
+        "content-disposition": "filename=(?:mvga\\.js|MivaEvents\\.js)"
       },
       "website": "http://www.miva.com"
     },
@@ -7104,7 +7136,7 @@
         "Modernizr._version": "^(.+)$\\;version:\\1"
       },
       "script": [
-        "([\\d.]+)?/modernizr(?:.([\\d.]+))?.*\\.js\\;version:\\1?\\1:\\2"
+        "([\\d.]+)?/modernizr(?:\\.([\\d.]+))?.*\\.js\\;version:\\1?\\1:\\2"
       ],
       "website": "https://modernizr.com"
     },
@@ -7427,7 +7459,7 @@
         "SystemID": "^.*1AND1.*$\\;confidence:100",
         "version": "^(.*)$\\;version:\\1\\;confidence:0"
       },
-      "script": "\\/\\/integration.mywebsite-editor.com.*\\.js\\;confidence:100\\;version:9",
+      "script": "\\/\\/integration\\.mywebsite-editor\\.com.*\\.js\\;confidence:100\\;version:9",
       "icon": "Ionos-by-1and1-logo.svg",
       "website": "https://www.ionos.com"
     },
@@ -7833,7 +7865,7 @@
       "cats": [
         6
       ],
-      "script": "https://server.tebex.io/tebexAccounts/tebexaccounts\\.js",
+      "script": "https://server\\.tebex\\.io/tebexAccounts/tebexaccounts\\.js",
       "icon": "Tebex.png",
       "website": "https://www.tebex.io/"
     },
@@ -7841,7 +7873,7 @@
       "cats": [
         6
       ],
-      "html": "<a href=\"http://www.tsoft.com.tr\" target=\"_blank\" title=\"T-Soft E-ticaret Sistemleri\">",
+      "html": "<a href=\"http://www\\.tsoft\\.com\\.tr\" target=\"_blank\" title=\"T-Soft E-ticaret Sistemleri\">",
       "icon": "Tsoft.png",
       "website": "https://www.tsoft.com.tr/"
     },
@@ -8492,15 +8524,31 @@
       "implies": "Scala",
       "website": "https://www.playframework.com"
     },
-    "Plentymarkets": {
+    "plentymarkets": {
       "cats": [
         6
       ],
-      "icon": "Plentymarkets.png",
+      "icon": "plentymarkets.svg",
+      "headers": {
+        "X-Plenty-Shop": ""
+      },
       "meta": {
         "generator": "plentymarkets"
       },
-      "website": "http://plentymarkets.eu"
+      "script": [
+        "plenty\\.shop\\.(?:min\\.)?js"
+      ],
+      "website": "https://www.plentymarkets.com/"
+    },
+    "Ceres": {
+      "cats": [
+        6
+      ],
+      "icon": "Ceres.svg",
+      "headers": {
+        "X-Plenty-Shop": "Ceres"
+      },
+      "website": "https://www.plentymarkets.com/"
     },
     "Plesk": {
       "cats": [
@@ -9059,6 +9107,26 @@
       },
       "website": "https://redaxscript.com"
     },
+    "Redis": {
+      "cats": [
+        34
+      ],
+      "cpe": "cpe:/a:redislabs:redis",
+      "icon": "Redis.svg",
+      "website": "https://redis.io"
+    },
+    "Redis Object Cache": {
+      "cats": [
+        23
+      ],
+      "icon": "RedisObjectCache.svg",
+      "implies": [
+        "Redis",
+        "WordPress"
+      ],
+      "html": "<!--\\s+Performance optimized by Redis Object Cache",
+      "website": "https://wprediscache.com"
+    },
     "ReDoc": {
       "cats": [
         4
@@ -9476,7 +9544,7 @@
       "cats": [
         13
       ],
-      "html": "<script[^>]*>\\s*Raven\\.config\\('[^']*', {\\s+release: '([0-9\\.]+)'\\;version:\\1",
+      "html": "<script[^>]*>\\s*Raven\\.config\\('[^']*', \\{\\s+release: '([0-9\\.]+)'\\;version:\\1",
       "js": {
         "__SENTRY__": "",
         "Sentry": "",
@@ -10438,6 +10506,17 @@
       "implies": "Ruby on Rails",
       "website": "https://spreecommerce.org"
     },
+    "Spring": {
+      "cats": [
+        18
+      ],
+      "headers": {
+        "X-Application-Context": ""
+      },
+      "implies": "Java",
+      "icon": "Spring.png",
+      "website": "https://spring.io/"
+    },
     "Sqreen": {
       "cats": [
         19
@@ -10599,7 +10678,7 @@
       "cats": [
         1
       ],
-      "html": "<!-- Powered by Strikingly.com",
+      "html": "<!-- Powered by Strikingly\\.com",
       "icon": "Strikingly.png",
       "website": "https://strikingly.com"
     },
@@ -12112,6 +12191,26 @@
       "script": "cdn\\.6th\\.ir",
       "website": "https://webzi.ir"
     },
+    "Welcart": {
+      "cats": [
+        6
+      ],
+      "cookies": {
+        "usces_cookie": ""
+      },
+      "cpe": "cpe:/a:welcart:welcart",
+      "icon": "welcart.png",
+      "implies": [
+        "PHP",
+        "WordPress"
+      ],
+      "script": "uscesL10n",
+      "html": [
+        "<link[^>]+?href=\"[^\"]+usces_default(?:\\.min)?\\.css",
+        "<!-- Welcart version : v([\\d.]+)\\;version:\\1"
+      ],
+      "website": "https://www.welcart.com"
+    },
     "Whooshkaa": {
       "cats": [
         5
@@ -12179,7 +12278,7 @@
       ],
       "headers": {
         "Server": "Winstone Servlet (?:Container|Engine) v?([\\d.]+)?\\;version:\\1",
-        "X-Powered-By": "Winstone(?:.([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "Winstone(?:\\.([\\d.]+))?\\;version:\\1"
       },
       "website": "http://winstone.sourceforge.net"
     },
@@ -12856,7 +12955,7 @@
       "cookies": {
         "ZM_TEST": "true"
       },
-      "html": "<script>(?:.|\\n)*\"refresh\":{\"version\":\"([\\w\\.]+)\\s\\;version:\\1",
+      "html": "<script>(?:\\.|\\n)*\"refresh\":\\{\"version\":\"([\\w\\.]+)\\s\\;version:\\1",
       "implies": "Java",
       "website": "https://www.zimbra.com/"
     },
@@ -13160,6 +13259,15 @@
       "implies": "Python",
       "website": "http://gunicorn.org"
     },
+    "hCaptcha": {
+      "cats": [
+        16
+      ],
+      "html": "<style[^>]+[^<]+#cf-hcaptcha-container[^<]+</style>",
+      "icon": "hcaptcha-symbol-256.png",
+      "script": "https://hcaptcha.com/([\\d]+?)/api.js\\;version:\\1",
+      "website": "https://www.hcaptcha.com/"
+    },
     "iPresta": {
       "cats": [
         6
@@ -13334,6 +13442,15 @@
       "script": "jqplot.*\\.js",
       "website": "http://www.jqplot.com"
     },
+    "jsDelivr": {
+      "cats": [
+        31
+      ],
+      "html": "<[^>]+?//cdn\\.jsdelivr\\.net/",
+      "script": "//cdn\\.jsdelivr\\.net/",
+      "icon": "jsdelivr-icon.svg",
+      "website": "https://www.jsdelivr.com/"
+    },
     "Kinsta": {
       "cats": [
         62
@@ -13776,6 +13893,14 @@
       "implies": "PHP",
       "website": "http://punbb.informer.com"
     },
+    "Pushnami": {
+      "cats": [
+        32
+      ],
+      "icon": "Pushnami.svg",
+      "script": "api\\.pushnami\\.com",
+      "website": "https://pushnami.com"
+    },
     "reCAPTCHA": {
       "cats": [
         16
@@ -14136,12 +14261,24 @@
       "icon": "RXWeb.svg",
       "website": "http://developers.rokitax.co.uk/projects/rxweb"
     },
+    "Tencent Analytics (腾讯分析)": {
+      "cats": [
+        10
+      ],
+      "icon": "tajs.png",
+      "script": "tajs\\.qq\\.com/stats",
+      "website": "https://ta.qq.com/"
+    },
     "Tencent Waterproof Wall": {
       "cats": [
-        9
+        9,
+        16
       ],
       "icon": "TencentWaterproofWall.png",
-      "script": "/TCaptcha\\.js",
+      "script": [
+        "/TCaptcha\\.js",
+        "captcha\\.qq\\.com/.*"
+      ],
       "website": "https://007.qq.com/"
     },
     "Saber": {
@@ -14288,8 +14425,18 @@
         1
       ],
       "icon": "RebelMouse.svg",
-      "html": "<!-- Powered by RebelMouse.",
+      "html": "<!-- Powered by RebelMouse\\.",
       "website": "https://www.rebelmouse.com/"
+    },
+    "Nepso": {
+      "cats": [
+        1
+      ],
+      "headers": {
+        "X-Powered-CMS": "Nepso"
+      },
+      "icon": "nepso.svg",
+      "website": "https://www.nepso.com"
     }
   },
   "categories": {
diff --git a/src/drivers/webextension/_locales/ru/messages.json b/src/drivers/webextension/_locales/ru/messages.json
index 1c73c5907..0947f8895 100644
--- a/src/drivers/webextension/_locales/ru/messages.json
+++ b/src/drivers/webextension/_locales/ru/messages.json
@@ -1,85 +1,83 @@
 {
-  "categoryName1":            { "message": "CMS" },
-  "categoryName2":            { "message": "Форум" },
-  "categoryName3":            { "message": "Менеджер БД" },
-  "categoryName4":            { "message": "Документация" },
-  "categoryName5":            { "message": "Виджет" },
-  "categoryName6":            { "message": "Электронная коммерция" },
-  "categoryName7":            { "message": "Фотогалерея" },
-  "categoryName8":            { "message": "Вики" },
-  "categoryName9":            { "message": "Панель управления хостингом" },
-  "categoryName10":           { "message": "Аналитика" },
-  "categoryName11":           { "message": "Блог" },
-  "categoryName12":           { "message": "JS фреймворк" },
-  "categoryName13":           { "message": "Баг трекер" },
-  "categoryName14":           { "message": "Видео плеер" },
-  "categoryName15":           { "message": "Система комментариев" },
-  "categoryName16":           { "message": "Капча" },
-  "categoryName17":           { "message": "Шрифт" },
-  "categoryName18":           { "message": "Веб фреймворк" },
-  "categoryName19":           { "message": "Прочее" },
-  "categoryName20":           { "message": "HTML редактор" },
-  "categoryName21":           { "message": "LMS" },
-  "categoryName22":           { "message": "Веб сервер" },
-  "categoryName23":           { "message": "Кеширование" },
-  "categoryName24":           { "message": "WYSIWYG редактор" },
-  "categoryName25":           { "message": "JS графика" },
-  "categoryName26":           { "message": "Мобильный фреймворк" },
-  "categoryName27":           { "message": "Язык программирования" },
-  "categoryName28":           { "message": "Операционная система" },
-  "categoryName29":           { "message": "Поисковый движок" },
-  "categoryName30":           { "message": "Веб почта" },
-  "categoryName31":           { "message": "CDN" },
-  "categoryName32":           { "message": "Управление маркетингом" },
-  "categoryName33":           { "message": "Расширение Веб сервера" },
-  "categoryName34":           { "message": "База данных" },
-  "categoryName35":           { "message": "Карта" },
-  "categoryName36":           { "message": "Рекламная сеть" },
-  "categoryName37":           { "message": "Сетевая служба" },
-  "categoryName38":           { "message": "Медиа сервер" },
-  "categoryName39":           { "message": "Вебкамера" },
-  "categoryName40":           { "message": "Принтер" },
-  "categoryName41":           { "message": "Платёжная система" },
-  "categoryName42":           { "message": "Менеджер тэгов" },
-  "categoryName43":           { "message": "Paywall" },
-  "categoryName44":           { "message": "Система непрерывной интеграции" },
-  "categoryName45":           { "message": "Система SCADA" },
-  "categoryName46":           { "message": "Удаленное управление" },
-  "categoryName47":           { "message": "Утилита для разработчиков" },
-  "categoryName48":           { "message": "Сетевое хранилище" },
-  "categoryName49":           { "message": "Граббер контента" },
-  "categoryName50":           { "message": "Управление документами" },
-  "categoryName51":           { "message": "Генератор лендингов" },
-  "categoryName52":           { "message": "Live Chat" },
-  "categoryName53":           { "message": "CRM" },
-  "github":                   { "message": "Форкнуть на GitHub!" },
-  "noAppsDetected":           { "message": "Нет данных о сайте" },
-  "nothingToDo":              { "message": "Тут нечего искать" },
-  "optionTracking":           { "message": "Анонимно отправлять статистику распознанных данных на сервер (для исследований)" },
-  "optionThemeMode":          { "message": "Совместимость с темным режимом" },
-  "optionDynamicIcon":        { "message": "Использовать значок приложения вместо логотипа Wappalyzer" },
-  "optionUpgradeMessage":     { "message": "Оповещать меня об обновлениях" },
-  "options":                  { "message": "Настройки" },
-  "optionsSave":              { "message": "Сохранить" },
-  "optionsSaved":             { "message": "Успешно сохранено!" },
-  "twitter":                  { "message": "Следите за новостями в Твиттере" },
-  "website":                  { "message": "Перейти на Wappalyzer.com" },
-  "categoryPin":              { "message": "Always show icon" },
-  "termsAccept":              { "message": "Accept" },
-  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
-  "privacyPolicy":            { "message": "Privacy policy" },
+	"github":                   { "message": "Форкнуть на GitHub!" },
+	"twitter":                  { "message": "Следите за новостями в Твиттере" },
+	"website":                  { "message": "Перейти на wappalyzer.com" },
+	"options":                  { "message": "Настройки" },
+	"optionsSave":              { "message": "Сохранить" },
+	"optionsSaved":             { "message": "Успешно сохранено!" },
+	"optionUpgradeMessage":     { "message": "Оповещать меня об обновлениях" },
+	"optionDynamicIcon":        { "message": "Использовать значок технологии вместо логотипа Wappalyzer" },
+	"optionTracking":           { "message": "Анонимно отправлять статистику распознанных данных на wappalyzer.com" },
+	"optionThemeMode":          { "message": "Совместимость с темным режимом" },
+	"nothingToDo":              { "message": "Nothing to do here" },
+	"noAppsDetected":           { "message": "Не удалось определить ни одну технологию" },
+	"categoryPin":              { "message": "Всегда отображать эту категорию иконкой"},
+	"termsAccept":              { "message": "Принять" },
+	"termsContent":             { "message": "Расширение отправляет обезличенную статистику посещенных сайтов, включая доменное имя и распознанные технологии на <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. Это можно отключить в настройках." },
+	"privacyPolicy":            { "message": "Политика конфиденциальности" },
   "createAlert":              { "message": "Create an alert for this website" },
-  "categoryName54":           { "message": "SEO" },
-  "categoryName55":           { "message": "Бухгалтерский учёт" },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Форум" },
+	"categoryName3":            { "message": "Менеджер БД" },
+	"categoryName4":            { "message": "Документация" },
+	"categoryName5":            { "message": "Виджет" },
+	"categoryName6":            { "message": "Электронная коммерция" },
+	"categoryName7":            { "message": "Фотогалерея" },
+	"categoryName8":            { "message": "Вики" },
+	"categoryName9":            { "message": "Панель управления хостингом" },
+	"categoryName10":           { "message": "Аналитика" },
+	"categoryName11":           { "message": "Блог" },
+	"categoryName12":           { "message": "JS-фреймворк" },
+	"categoryName13":           { "message": "Баг-трекер" },
+	"categoryName14":           { "message": "Видео-плеер" },
+	"categoryName15":           { "message": "Система комментариев" },
+	"categoryName16":           { "message": "Капча" },
+	"categoryName17":           { "message": "Шрифт" },
+	"categoryName18":           { "message": "Веб-фреймворк" },
+	"categoryName19":           { "message": "Прочее" },
+	"categoryName20":           { "message": "HTML редактор" },
+	"categoryName21":           { "message": "Система управления обучением" },
+	"categoryName22":           { "message": "Веб-сервер" },
+	"categoryName23":           { "message": "Кеширование" },
+	"categoryName24":           { "message": "WYSIWYG-редактор" },
+	"categoryName25":           { "message": "JS графика" },
+	"categoryName26":           { "message": "Мобильный фреймворк" },
+	"categoryName27":           { "message": "Язык программирования" },
+	"categoryName28":           { "message": "Операционная система" },
+	"categoryName29":           { "message": "Поисковый движок" },
+	"categoryName30":           { "message": "Веб-почта" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Управление маркетингом" },
+	"categoryName33":           { "message": "Расширение веб-сервера" },
+	"categoryName34":           { "message": "База данных" },
+	"categoryName35":           { "message": "Карта" },
+	"categoryName36":           { "message": "Рекламная сеть" },
+	"categoryName37":           { "message": "Сетевая служба" },
+	"categoryName38":           { "message": "Медиа-сервер" },
+	"categoryName39":           { "message": "Веб-камера" },
+	"categoryName40":           { "message": "Принтер" },
+	"categoryName41":           { "message": "Платёжная система" },
+	"categoryName42":           { "message": "Менеджер тегов" },
+	"categoryName44":           { "message": "Система непрерывной интеграции" },
+	"categoryName46":           { "message": "Удаленное управление" },
+	"categoryName47":           { "message": "Утилита для разработчиков" },
+	"categoryName48":           { "message": "Сетевое хранилище" },
+	"categoryName49":           { "message": "RSS-агрегатор" },
+	"categoryName50":           { "message": "Управление документами" },
+	"categoryName51":           { "message": "Генератор лендингов" },
+	"categoryName52":           { "message": "Онлайн-консультант" },
+	"categoryName53":           { "message": "CRM" },
+	"categoryName54":           { "message": "SEO" },
+	"categoryName55":           { "message": "Бухгалтерский учёт" },
 	"categoryName56":           { "message": "Криптомайнер" },
 	"categoryName57":           { "message": "Генератор статических сайтов" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" },
-	"categoryName60":           { "message": "Containers" },
+	"categoryName59":           { "message": "JS-библиотека" },
+	"categoryName60":           { "message": "Контейнеризация" },
 	"categoryName61":           { "message": "SaaS" },
 	"categoryName62":           { "message": "PaaS" },
 	"categoryName63":           { "message": "IaaS" },
-	"categoryName64":           { "message": "Reverse Proxy" },
-	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
-}
+	"categoryName64":           { "message": "Обратный прокси" },
+	"categoryName65":           { "message": "Балансировка нагрузки" },
+	"categoryName66":           { "message": "UI фреймворк" }
+}
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/Ceres.svg b/src/drivers/webextension/images/icons/Ceres.svg
new file mode 100644
index 000000000..62b4af872
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Ceres.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M508.22,199.548c-0.467,-2.032 -0.992,-4.055 -1.78,-5.97c-0.107,-0.244 -0.195,-0.487 -0.301,-0.72c-0.487,-1.06 -0.876,-2.159 -1.459,-3.151l-1.76,-2.976c-2.577,-3.783 -5.689,-7.021 -9.064,-9.734c-0.486,-0.379 -0.992,-0.739 -1.488,-1.099c-0.379,-0.263 -0.758,-0.525 -1.128,-0.797l-1.303,-0.924l-0.836,-0.486l-0.535,-0.321l-2.733,-1.585l-2.8,-1.381c-7.488,-3.608 -15.336,-5.728 -23.164,-7.206c-7.868,-1.381 -15.735,-2.198 -23.612,-2.402c7.663,1.799 15.248,3.763 22.522,6.437c7.265,2.597 14.305,5.777 20.471,9.89l2.295,1.556l2.13,1.702l1.069,0.836l0.973,0.915c0.651,0.612 1.322,1.196 1.945,1.828c0.496,0.525 0.972,1.07 1.439,1.614c1.566,1.838 2.908,3.783 4.007,5.796c0.155,0.282 0.32,0.554 0.466,0.836l0.953,2.237c0.321,0.739 0.477,1.536 0.72,2.285c0.525,1.508 0.69,3.112 0.875,4.668c0.224,3.151 -0.097,6.35 -0.914,9.53c-1.653,6.36 -5.028,12.574 -9.258,18.331c-4.24,5.757 -9.18,11.203 -14.596,16.27c-10.814,10.152 -23.009,19.167 -35.748,27.413c-25.537,16.455 -53.087,30.157 -81.318,42.157c-14.149,5.951 -28.454,11.592 -42.963,16.668c-14.481,5.154 -29.106,9.948 -43.878,14.227c-14.743,4.376 -29.612,8.324 -44.578,11.777c-14.937,3.559 -30.001,6.525 -45.103,9.063c-30.185,4.969 -60.789,8.032 -90.828,6.739c-7.488,-0.389 -14.937,-1.031 -22.221,-2.168c-7.274,-1.129 -14.383,-2.782 -21.093,-5.057c-6.681,-2.295 -12.895,-5.427 -17.757,-9.53c-4.911,-4.075 -8.149,-9.268 -9.19,-15.365c-0.554,-3.044 -0.496,-6.312 0,-9.638c0.088,-0.583 0.214,-1.176 0.331,-1.76c0.564,-2.762 1.439,-5.543 2.509,-8.305c2.635,-6.719 6.583,-13.186 11.008,-19.371c4.493,-6.156 9.501,-12.078 14.859,-17.709c5.291,-5.727 11.018,-11.066 16.805,-16.405c-13.43,8.178 -26.345,17.514 -37.606,29.125c-3.199,3.326 -6.262,6.866 -9.063,10.668c-2.101,2.849 -4.075,5.835 -5.835,9.015c-2.052,3.724 -3.802,7.721 -5.008,12.039c-0.574,2.11 -1.031,4.298 -1.323,6.545c-0.301,2.334 -0.408,4.726 -0.282,7.157c0.263,4.746 1.44,9.559 3.521,13.935c2.032,4.406 4.881,8.344 8.11,11.699c6.496,6.739 14.276,11.3 22.085,14.85c7.857,3.54 15.929,5.99 24.01,7.906c8.091,1.896 16.211,3.267 24.331,4.152c8.12,0.934 16.23,1.459 24.331,1.751c5.203,0.165 10.386,0.185 15.56,0.107c2.898,-0.039 5.786,-0.097 8.664,-0.185c16.114,-0.476 32.111,-2.032 47.991,-4.114c15.881,-2.12 31.615,-5.017 47.243,-8.353c15.598,-3.452 31.06,-7.449 46.377,-11.903c15.287,-4.571 30.438,-9.569 45.404,-15.122c14.937,-5.64 29.738,-11.65 44.247,-18.379c14.5,-6.74 28.805,-13.946 42.692,-21.998c12.33,-7.069 24.369,-14.703 35.971,-23.076c1.498,-1.08 2.985,-2.169 4.464,-3.277c6.505,-4.795 12.807,-9.929 18.904,-15.326c6.107,-5.407 12.01,-11.106 17.476,-17.32c5.475,-6.185 10.638,-12.807 14.956,-20.179c4.269,-7.352 7.877,-15.511 9.17,-24.584c0.613,-4.522 0.545,-9.248 -0.359,-13.848Z" style="fill:#008ebd;fill-rule:nonzero;"/><path d="M364.946,354.316c-14.509,6.74 -29.31,12.749 -44.237,18.38c-14.976,5.553 -30.127,10.551 -45.414,15.122c-15.317,4.473 -30.779,8.45 -46.377,11.903c-15.618,3.335 -31.372,6.233 -47.243,8.353c-12.875,1.692 -25.819,3.034 -38.84,3.725c31.605,22.853 70.446,36.321 112.437,36.321c86.413,0 159.503,-57.054 183.65,-135.552c-10.153,7.099 -20.617,13.644 -31.284,19.761c-13.887,8.042 -28.202,15.258 -42.692,21.987Zm-201.057,-4.502l0,-24.448l107.321,0c7.936,-2.383 15.832,-4.892 23.69,-7.537c0.204,-0.223 0.408,-0.447 0.602,-0.68c4.532,-5.475 6.798,-12.847 6.798,-22.124c0,-8.422 -2.373,-15.219 -7.109,-20.383c-4.745,-5.154 -13.332,-7.741 -25.76,-7.741l-88.796,0c-11.806,0 -17.699,-5.796 -17.699,-17.378l0,-82.795c0,-11.582 5.893,-17.378 17.699,-17.378l234.452,0c-34.465,-51.531 -93.172,-85.47 -159.815,-85.47c-106.106,0 -192.121,86.014 -192.121,192.12c0,36.195 10.017,70.047 27.424,98.939c24.282,0.603 48.895,-1.537 73.314,-5.125Zm270.589,-163.18c7.04,18.195 11.397,37.732 12.573,58.115c-4.463,3.238 -9.043,6.35 -13.702,9.364c-25.536,16.455 -53.096,30.157 -81.327,42.157c-4.181,1.77 -8.392,3.491 -12.603,5.193c0.107,-1.906 0.165,-3.841 0.165,-5.806c0,-8.421 -1.05,-16.434 -3.16,-24.01c-2.101,-7.585 -5.845,-14.227 -11.213,-19.916c-5.377,-5.689 -12.749,-10.211 -22.123,-13.585c-9.375,-3.365 -21.229,-5.057 -35.554,-5.057l-63.2,0c-2.743,-0.001 -4.104,-1.265 -4.104,-3.793l0,-38.869c0,-2.529 1.361,-3.793 4.104,-3.793l230.144,0Z" style="fill:#008ebd;fill-rule:nonzero;"/></g></svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/FaraPy.png b/src/drivers/webextension/images/icons/FaraPy.png
new file mode 100644
index 000000000..62d38b1f1
Binary files /dev/null and b/src/drivers/webextension/images/icons/FaraPy.png differ
diff --git a/src/drivers/webextension/images/icons/Plentymarkets.png b/src/drivers/webextension/images/icons/Plentymarkets.png
deleted file mode 100644
index 2c047fdef..000000000
Binary files a/src/drivers/webextension/images/icons/Plentymarkets.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Pushnami.svg b/src/drivers/webextension/images/icons/Pushnami.svg
new file mode 100755
index 000000000..7d6abbf54
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Pushnami.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="111" height="111" enable-background="new 0 0 592.7 128" xml:space="preserve">
+	<g class="currentLayer">
+		<title>Pushnami-Logo</title>
+		<polygon id="svg_9" fill="#2f2674" points="55.60000133514404,55.600003242492676 55.60000133514404,0 111.19999980926514,0 "/>
+		<polygon id="svg_10" fill="#2f2674" points="0,111.20000171661377 0,55.600003242492676 55.60000133514404,55.600003242492676 "/>
+		<polygon id="svg_11" fill="#2f2674" points="0,55.600003242492676 0,0 55.60000133514404,0 "/>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/Redis.svg b/src/drivers/webextension/images/icons/Redis.svg
new file mode 100644
index 000000000..b7019d617
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Redis.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="373" height="320">
+  <path d="M.25 201.995s-.658 34.043.036 38.645c.694 4.603 7.804 9.065 19.401 13.899 23.196 9.666 128.438 53.125 144.688 60.294 16.25 7.167 25.788 6.373 38.75.61 12.96-5.765 109.062-49.063 146.875-65.315 15.72-6.758 22.016-11.615 22.397-15.607.539-5.607-.124-36.81-.124-36.81L.251 201.994z" fill="#9d1f08" />
+  <path d="M156.875 135.75c-38.281 14.66-109.375 41.875-137.5 52.656-28.125 10.781-22.884 18.968.313 28.633 23.196 9.666 128.437 53.125 144.687 60.294 16.25 7.167 25.789 6.373 38.75.61 12.961-5.764 109.063-49.063 146.875-65.315 37.813-16.253 21.089-21.518-1.25-30.16-22.339-8.64-104.034-40.618-136.25-52.655-18.75-7.005-17.344-8.723-55.625 5.937" fill="#d03017" />
+  <path d="M.25 140.746s-.658 34.042.036 38.645c.694 4.601 7.804 9.064 19.401 13.899 23.196 9.665 128.438 53.125 144.688 60.292 16.25 7.168 25.788 6.375 38.75.61 12.96-5.764 109.062-49.063 146.875-65.315 15.72-6.757 22.016-11.615 22.397-15.605.539-5.607-.124-36.811-.124-36.811L.251 140.746z" fill="#9d1f08" />
+  <path d="M156.875 74.5c-38.281 14.66-109.375 41.875-137.5 52.656-28.125 10.781-22.884 18.966.313 28.633 23.196 9.666 128.437 53.125 144.687 60.294 16.25 7.167 25.789 6.373 38.75.61 12.961-5.764 109.063-49.063 146.875-65.316 37.813-16.252 21.089-21.517-1.25-30.158-22.339-8.64-104.034-40.619-136.25-52.656-18.75-7.006-17.344-8.723-55.625 5.937" fill="#d03017" />
+  <path d="M.25 78.246s-.658 34.042.036 38.645c.694 4.602 7.804 9.065 19.401 13.898 23.196 9.667 128.438 53.126 144.688 60.293 16.25 7.168 25.788 6.375 38.75.61 12.96-5.764 109.062-49.063 146.875-65.315 15.72-6.756 22.016-11.615 22.397-15.605.539-5.607-.124-36.811-.124-36.811L.251 78.246z" fill="#9d1f08" />
+  <path d="M156.875 12C118.594 26.66 47.5 53.875 19.375 64.656-8.75 75.437-3.509 83.622 19.688 93.29c23.196 9.666 128.437 53.125 144.687 60.293 16.25 7.168 25.789 6.374 38.75.61C216.086 148.43 312.188 105.13 350 88.877c37.813-16.252 21.089-21.517-1.25-30.158C326.411 50.079 244.716 18.1 212.5 6.062 193.75-.941 195.156-2.66 156.875 12" fill="#d03017" />
+  <path d="M156.25 76.375c0 9.838-20.706 17.813-46.25 17.813s-46.25-7.976-46.25-17.813c0-9.838 20.706-17.813 46.25-17.813s46.25 7.976 46.25 17.813M133.438 108.563l59.687 24.687 27.188-39.063-86.875 14.376zM174.063 36.375L146.25 46.688l37.188 2.812 11.875 20.313 7.5-18.126 31.875-3.124-25-9.376 7.187-16.25-24.688 8.125-26.25-10 8.125 15.313z" fill="#ffffff" />
+  <path d="M272.723 94.51l51.652-20.323-51.563-20" fill="#751200" />
+  <path d="M272.813 54.188l-55.625 22.187 50 20.313 5.536-2.178" fill="#9d1f08" />
+</svg>
diff --git a/src/drivers/webextension/images/icons/RedisObjectCache.svg b/src/drivers/webextension/images/icons/RedisObjectCache.svg
new file mode 100644
index 000000000..b7019d617
--- /dev/null
+++ b/src/drivers/webextension/images/icons/RedisObjectCache.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="373" height="320">
+  <path d="M.25 201.995s-.658 34.043.036 38.645c.694 4.603 7.804 9.065 19.401 13.899 23.196 9.666 128.438 53.125 144.688 60.294 16.25 7.167 25.788 6.373 38.75.61 12.96-5.765 109.062-49.063 146.875-65.315 15.72-6.758 22.016-11.615 22.397-15.607.539-5.607-.124-36.81-.124-36.81L.251 201.994z" fill="#9d1f08" />
+  <path d="M156.875 135.75c-38.281 14.66-109.375 41.875-137.5 52.656-28.125 10.781-22.884 18.968.313 28.633 23.196 9.666 128.437 53.125 144.687 60.294 16.25 7.167 25.789 6.373 38.75.61 12.961-5.764 109.063-49.063 146.875-65.315 37.813-16.253 21.089-21.518-1.25-30.16-22.339-8.64-104.034-40.618-136.25-52.655-18.75-7.005-17.344-8.723-55.625 5.937" fill="#d03017" />
+  <path d="M.25 140.746s-.658 34.042.036 38.645c.694 4.601 7.804 9.064 19.401 13.899 23.196 9.665 128.438 53.125 144.688 60.292 16.25 7.168 25.788 6.375 38.75.61 12.96-5.764 109.062-49.063 146.875-65.315 15.72-6.757 22.016-11.615 22.397-15.605.539-5.607-.124-36.811-.124-36.811L.251 140.746z" fill="#9d1f08" />
+  <path d="M156.875 74.5c-38.281 14.66-109.375 41.875-137.5 52.656-28.125 10.781-22.884 18.966.313 28.633 23.196 9.666 128.437 53.125 144.687 60.294 16.25 7.167 25.789 6.373 38.75.61 12.961-5.764 109.063-49.063 146.875-65.316 37.813-16.252 21.089-21.517-1.25-30.158-22.339-8.64-104.034-40.619-136.25-52.656-18.75-7.006-17.344-8.723-55.625 5.937" fill="#d03017" />
+  <path d="M.25 78.246s-.658 34.042.036 38.645c.694 4.602 7.804 9.065 19.401 13.898 23.196 9.667 128.438 53.126 144.688 60.293 16.25 7.168 25.788 6.375 38.75.61 12.96-5.764 109.062-49.063 146.875-65.315 15.72-6.756 22.016-11.615 22.397-15.605.539-5.607-.124-36.811-.124-36.811L.251 78.246z" fill="#9d1f08" />
+  <path d="M156.875 12C118.594 26.66 47.5 53.875 19.375 64.656-8.75 75.437-3.509 83.622 19.688 93.29c23.196 9.666 128.437 53.125 144.687 60.293 16.25 7.168 25.789 6.374 38.75.61C216.086 148.43 312.188 105.13 350 88.877c37.813-16.252 21.089-21.517-1.25-30.158C326.411 50.079 244.716 18.1 212.5 6.062 193.75-.941 195.156-2.66 156.875 12" fill="#d03017" />
+  <path d="M156.25 76.375c0 9.838-20.706 17.813-46.25 17.813s-46.25-7.976-46.25-17.813c0-9.838 20.706-17.813 46.25-17.813s46.25 7.976 46.25 17.813M133.438 108.563l59.687 24.687 27.188-39.063-86.875 14.376zM174.063 36.375L146.25 46.688l37.188 2.812 11.875 20.313 7.5-18.126 31.875-3.124-25-9.376 7.187-16.25-24.688 8.125-26.25-10 8.125 15.313z" fill="#ffffff" />
+  <path d="M272.723 94.51l51.652-20.323-51.563-20" fill="#751200" />
+  <path d="M272.813 54.188l-55.625 22.187 50 20.313 5.536-2.178" fill="#9d1f08" />
+</svg>
diff --git a/src/drivers/webextension/images/icons/Spring.png b/src/drivers/webextension/images/icons/Spring.png
new file mode 100644
index 000000000..2681e19e4
Binary files /dev/null and b/src/drivers/webextension/images/icons/Spring.png differ
diff --git a/src/drivers/webextension/images/icons/Swell.svg b/src/drivers/webextension/images/icons/Swell.svg
index ae3cfb497..a118ee64b 100644
--- a/src/drivers/webextension/images/icons/Swell.svg
+++ b/src/drivers/webextension/images/icons/Swell.svg
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Primary_Art" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 240 280" style="enable-background:new 0 0 240 280;" xml:space="preserve">
+<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Primary_Art" 
+	xmlns="http://www.w3.org/2000/svg" 
+	xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 438.7 512" style="enable-background:new 0 0 438.7 512;" xml:space="preserve">
 	<style type="text/css">
-		.st0{fill:#550088;}
+	.st0{fill:url(#SVGID_1_);}
 	</style>
-	<path class="st0" d="M146.4,18.7c45.3,0,69.4,21,69.4,36.2c0,1.1-0.4,1.7-0.7,2l-0.3,0.3l-0.3,0.3l-29.9,30.1l-19.9,20l26.1,10.5
-    c22.1,8.9,30.7,20.8,30.7,42.4c0,9.3-3.6,17.6-10.8,24.7l-54.4,54.6l-0.2,0.2l-0.2,0.2c-12.7,13.5-36.1,21.2-64,21.2
-    c-47.2,0-73.3-20.4-73.3-34.4c0-1.8,0.4-2.9,0.7-3.2l0.4-0.3L20,223l32.1-32.2l0.4-0.4l0.1-0.1L70,172.1l-22.8-11.3
-    c-17.3-8.5-24.3-20.1-24.3-39.9c0-10.3,4-19.5,12-27.4l54.4-54.6l0.1-0.1l0.1-0.1C101.7,26,122.5,18.7,146.4,18.7 M146.4,0
-    c-30,0-55,9.8-70.3,25.7L21.7,80.3C10.7,91.2,4.3,105.2,4.3,120.9c0,31.2,15.1,47,34.7,56.7c0,0,0,0,0,0L6.9,209.8
-    c-4.4,4-6.9,9.8-6.9,17.1C0,253,34.4,280,91.9,280c34,0,61.6-10.2,77.5-27.1l54.4-54.6c10.4-10.3,16.2-23.2,16.2-37.9
-    c0-34.8-19.1-50.3-42.3-59.7l29.9-30.1c4.3-3.9,6.9-9.4,6.9-15.8C234.5,27.9,201.5,0,146.4,0L146.4,0z" />
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="219.3559" y1="514" x2="219.3559" y2="2" gradientTransform="matrix(1 0 0 -1 0 514)">
+		<stop offset="0" style="stop-color:#550088"/>
+		<stop offset="1" style="stop-color:#FF7782"/>
+	</linearGradient>
+	<path class="st0" d="M267.5,34.2c82.8,0,127,38.4,127,66.2c0,2-0.8,3.1-1.4,3.6l-0.6,0.5l-0.6,0.6l-54.7,55l-36.3,36.5l47.7,19.2
+	c40.3,16.3,56.1,38,56.1,77.5c0,17-6.6,32.2-19.7,45.2l-99.6,99.9l-0.4,0.4l-0.3,0.4c-23.3,24.7-65.9,38.8-116.9,38.8
+	c-86.3,0-134-37.2-134-63c0-3.2,0.6-5.3,1.3-5.9l0.6-0.6l0.6-0.6l58.7-58.9l0.8-0.8l0.3-0.3l31.7-33.2L86,294.2
+	c-31.6-15.5-44.4-36.6-44.4-73c0-18.8,7.3-35.6,22-50l99.5-99.9l0.3-0.3l0.3-0.3C185.8,47.5,223.6,34.2,267.5,34.2 M267.5,0
+	c-54.7,0-100.5,17.9-128.4,47.1L39.6,147c-20.2,19.8-31.9,45.4-31.9,74.2c0,57.1,27.5,86,63.5,103.7l0,0l-58.7,58.9
+	C4.5,391,0,401.7,0,414.9C0,462.6,62.9,512,168,512c62.2,0,112.6-18.7,141.6-49.5l99.5-99.9c19-18.8,29.6-42.5,29.6-69.3
+	c0-63.6-35-92-77.4-109.2l54.7-55c7.8-7.1,12.5-17.2,12.5-28.9C428.3,51,368.1,0,267.5,0L267.5,0z"/>
 </svg>
diff --git a/src/drivers/webextension/images/icons/experiencedCMS_Logo.png b/src/drivers/webextension/images/icons/experiencedCMS_Logo.png
new file mode 100644
index 000000000..d6ee8d6bc
Binary files /dev/null and b/src/drivers/webextension/images/icons/experiencedCMS_Logo.png differ
diff --git a/src/drivers/webextension/images/icons/plentymarkets.svg b/src/drivers/webextension/images/icons/plentymarkets.svg
new file mode 100644
index 000000000..c16da38ff
--- /dev/null
+++ b/src/drivers/webextension/images/icons/plentymarkets.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M472.351,86.544c0,-8.33 -0.536,-16.47 -1.495,-24.437c-1.002,-1.149 -1.936,-2.35 -2.981,-3.473c-38.642,-44.509 -104.2,-64.288 -194.998,-53.245c-51.206,7.846 -98.825,21.818 -138.979,40.154c-2.895,18.569 -5.937,36.689 -8.874,52.208l-56.192,297.711c25.473,29.422 56.986,54.17 92.967,73.318l29.707,-153.66l1.486,0c12.702,7.457 38.106,14.931 67.978,14.931c126.986,0 211.381,-116.521 211.381,-243.507Zm-112.789,8.217c0,71.702 -44.812,153.868 -102.334,153.868c-20.91,0 -37.345,-6.723 -49.287,-17.93l13.445,-78.424c13.437,-71.711 50.791,-117.274 91.118,-117.274c35.108,0 47.058,30.632 47.058,59.76Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M471.763,62.997c-1.261,-1.477 -0.907,-0.898 -0.907,-0.898c0.959,7.975 1.495,16.124 1.495,24.436c0,126.986 -84.395,243.508 -211.381,243.508c-29.872,0 -55.276,-7.466 -67.978,-14.923l-1.486,0l-29.698,153.643l1.062,0.838c32.879,17.325 69.404,29.975 108.331,37.207c68.807,9.782 116.409,-5.703 155.241,-51.257c39.16,-43.956 67.424,-115.865 81.086,-202.585c10.351,-83.963 1.166,-146.877 -35.765,-189.969Zm-112.201,31.764c0,-29.137 -11.95,-59.76 -47.058,-59.76c-40.327,0 -77.681,45.563 -91.126,117.274l-13.446,78.424c11.951,11.207 28.386,17.93 49.296,17.93c57.522,0 102.334,-82.166 102.334,-153.868Zm-225.535,-49.296c-30.917,14.111 -57.418,30.813 -77.724,49.305c-48.173,42.686 -62.275,94.6 -53.228,160.719c8.425,53.228 31.444,100.537 65.17,139.662c0,0 0.725,0.467 0.587,0.303l56.192,-297.703c2.937,-15.519 9.003,-52.286 9.003,-52.286Z" style="fill:#da2128;fill-rule:nonzero;"/></g></svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/total.js.png b/src/drivers/webextension/images/icons/total.js.png
index e7d137915..a792fdf0f 100644
Binary files a/src/drivers/webextension/images/icons/total.js.png and b/src/drivers/webextension/images/icons/total.js.png differ
diff --git a/src/drivers/webextension/images/icons/welcart.png b/src/drivers/webextension/images/icons/welcart.png
new file mode 100644
index 000000000..79eac7a12
Binary files /dev/null and b/src/drivers/webextension/images/icons/welcart.png differ
diff --git a/src/icons/font-awesome.svg b/src/icons/font-awesome.svg
new file mode 100644
index 000000000..8c1d44528
--- /dev/null
+++ b/src/icons/font-awesome.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M397.8 32H50.2C22.7 32 0 54.7 0 82.2v347.6C0 457.3 22.7 480 50.2 480h347.6c27.5 0 50.2-22.7 50.2-50.2V82.2c0-27.5-22.7-50.2-50.2-50.2zm-45.4 284.3c0 4.2-3.6 6-7.8 7.8-16.7 7.2-34.6 13.7-53.8 13.7-26.9 0-39.4-16.7-71.7-16.7-23.3 0-47.8 8.4-67.5 17.3-1.2.6-2.4.6-3.6 1.2V385c0 1.8 0 3.6-.6 4.8v1.2c-2.4 8.4-10.2 14.3-19.1 14.3-11.3 0-20.3-9-20.3-20.3V166.4c-7.8-6-13.1-15.5-13.1-26.3 0-18.5 14.9-33.5 33.5-33.5 18.5 0 33.5 14.9 33.5 33.5 0 10.8-4.8 20.3-13.1 26.3v18.5c1.8-.6 3.6-1.2 5.4-2.4 18.5-7.8 40.6-14.3 61.5-14.3 22.7 0 40.6 6 60.9 13.7 4.2 1.8 8.4 2.4 13.1 2.4 22.7 0 47.8-16.1 53.8-16.1 4.8 0 9 3.6 9 7.8v140.3z"/></svg>
\ No newline at end of file
diff --git a/src/icons/hcaptcha-symbol-256.png b/src/icons/hcaptcha-symbol-256.png
new file mode 100644
index 000000000..7c753545b
Binary files /dev/null and b/src/icons/hcaptcha-symbol-256.png differ
diff --git a/src/icons/jComponent.png b/src/icons/jComponent.png
new file mode 100644
index 000000000..55d31bbbb
Binary files /dev/null and b/src/icons/jComponent.png differ
diff --git a/src/icons/jsdelivr-icon.svg b/src/icons/jsdelivr-icon.svg
new file mode 100644
index 000000000..b44681bf3
--- /dev/null
+++ b/src/icons/jsdelivr-icon.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 32 34" width="32" height="34" xmlns="http://www.w3.org/2000/svg">
+	<style type="text/css">
+		.st0{fill:#BD483B;}
+		.st1{fill:#E64E3D;}
+		.st2{fill:#FEC82F;}
+		.st3{fill:#DF9C26;}
+	</style>
+	<g>
+		<polygon class="st0" points="15.817,0.338 12.711,11.376 12.711,11.48 12.711,22.519 15.817,33.662 15.817,33.662 19.012,22.519  19.012,11.48 19.012,11.376 15.817,0.338"/>
+		<g>
+			<g>
+				<polyline class="st1" points="15.817,0.338 0.432,5.88 2.618,26.372 15.817,33.662"/>
+				<polyline class="st0" points="15.817,33.662 29.086,26.297 31.568,5.807 15.817,0.338"/>
+			</g>
+			<g>
+				<path class="st2" d="M13.025,25.088c-1.514-0.473-2.864-1.317-3.94-2.431l-0.003-0.002c-0.131-0.137-0.257-0.274-0.381-0.418 c-0.838-0.979-1.478-2.13-1.857-3.396c0.251,0.233,0.518,0.447,0.796,0.647l0,0c0.003,0.008,0.008,0.016,0.011,0.027 c-0.003-0.012-0.008-0.02-0.011-0.027c0.398,0.279,0.822,0.526,1.269,0.737c0.141,0.064,0.282,0.125,0.427,0.186 c0.177,0.07,0.36,0.135,0.542,0.195c0.011,0.006,0.024,0.006,0.035,0.01c0.032,0.012,0.065,0.023,0.097,0.033 c0.074,0.756,0.649,1.372,1.39,1.504C11.688,23.31,12.234,24.299,13.025,25.088z"/>
+				<path class="st2" d="M13.605,11.794c0,0.324,0.088,0.627,0.243,0.883c-1.25,1.753-2.108,3.656-2.479,5.539 c-0.041,0.209-0.077,0.416-0.105,0.619c-0.429,0.113-0.79,0.393-1.016,0.762c-0.013,0-0.024-0.004-0.035-0.01 c-0.023-0.006-0.04-0.014-0.061-0.021c-0.142-0.045-0.281-0.098-0.417-0.152c-0.204-0.08-0.403-0.174-0.598-0.272 c-0.663-0.338-1.26-0.772-1.781-1.291c-0.11-0.111-0.213-0.219-0.311-0.332L7.004,17.47c-0.038-0.045-0.078-0.092-0.115-0.137 c-0.017-0.021-0.032-0.039-0.047-0.059c-0.014-0.018-0.024-0.031-0.037-0.045c-0.005-0.01-0.013-0.016-0.017-0.023 c-0.02-0.022-0.037-0.047-0.053-0.068c-0.008-0.012-0.017-0.022-0.023-0.029c-0.001-0.004-0.002-0.004-0.004-0.008 c-0.013-0.014-0.024-0.033-0.037-0.049c-0.055-0.072-0.107-0.149-0.157-0.225c-0.009-0.012-0.019-0.024-0.025-0.039 c-0.006-0.006-0.015-0.018-0.02-0.027c-0.014-0.203-0.02-0.408-0.02-0.617c0-1.882,0.557-3.636,1.512-5.105 c0.113-0.176,0.235-0.348,0.361-0.514c0.12-0.16,0.245-0.319,0.374-0.467c1.126-1.317,2.61-2.315,4.299-2.847 c0.026,0.182,0.059,0.367,0.095,0.553c0.192,0.967,0.513,1.942,0.949,2.898C13.769,10.962,13.605,11.36,13.605,11.794z"/>
+				<path class="st2" d="M12.608,20.479c0,0.221-0.079,0.424-0.212,0.58c-0.029,0.037-0.061,0.068-0.096,0.1 c-0.161,0.141-0.368,0.225-0.596,0.225c-0.173,0-0.335-0.049-0.472-0.135c-0.147-0.09-0.265-0.219-0.342-0.375 c-0.058-0.121-0.089-0.252-0.089-0.395c0-0.26,0.11-0.494,0.286-0.658c0.029-0.027,0.06-0.051,0.091-0.074 c0.148-0.107,0.331-0.17,0.526-0.17c0.206,0,0.395,0.068,0.546,0.186c0.085,0.063,0.155,0.139,0.213,0.229 C12.556,20.129,12.608,20.299,12.608,20.479z"/>
+				<path class="st2" d="M16.209,11.794c0,0.147-0.032,0.281-0.094,0.403c-0.148,0.299-0.456,0.502-0.808,0.502 c-0.044,0-0.087-0.002-0.128-0.006c-0.008-0.004-0.016-0.004-0.025-0.006c-0.383-0.066-0.684-0.369-0.741-0.756 c-0.007-0.043-0.01-0.09-0.01-0.137c0-0.102,0.017-0.201,0.05-0.295c0.123-0.354,0.46-0.606,0.854-0.606h0.002 c0.012,0,0.024,0,0.036,0c0.392,0.018,0.72,0.285,0.827,0.645C16.196,11.62,16.209,11.706,16.209,11.794z"/>
+				<path class="st3" d="M25.183,16.143c0,0.907-0.129,1.782-0.368,2.61c-0.799-0.211-1.606-0.52-2.4-0.914 c0.022-0.109,0.033-0.221,0.033-0.336c0-0.225-0.044-0.442-0.125-0.639c0.031-0.029,0.064-0.061,0.095-0.094 c0.957-0.977,1.763-2.055,2.404-3.212C25.057,14.379,25.183,15.248,25.183,16.143z"/>
+				<path class="st3" d="M24.313,12.196c-0.063,0.139-0.131,0.277-0.201,0.416c-0.627,1.235-1.455,2.382-2.459,3.407 c-0.009,0.01-0.02,0.02-0.028,0.027c-0.255-0.156-0.557-0.244-0.879-0.244c-0.375,0-0.722,0.123-1.004,0.328 c-0.514-0.404-1.011-0.848-1.49-1.327c-0.608-0.604-1.157-1.247-1.647-1.909c0.252-0.297,0.405-0.68,0.405-1.102 c0-0.313-0.087-0.61-0.237-0.862c1.21-1.163,2.547-2.106,3.917-2.788C22.262,9.103,23.53,10.514,24.313,12.196z"/>
+				<path class="st3" d="M21.649,17.503c0,0.379-0.23,0.701-0.556,0.836c-0.108,0.045-0.225,0.07-0.348,0.07 c-0.063,0-0.125-0.008-0.185-0.02c-0.385-0.082-0.681-0.408-0.715-0.805c0.011-0.01,0.021-0.016,0.028-0.022 c-0.01-0.008-0.021-0.014-0.03-0.023c-0.001-0.012-0.001-0.022-0.001-0.037c0-0.389,0.25-0.723,0.601-0.85 c0.095-0.033,0.196-0.053,0.302-0.053c0.09,0,0.179,0.014,0.262,0.039c0.346,0.105,0.606,0.412,0.64,0.785 C21.649,17.45,21.649,17.478,21.649,17.503z"/>
+				<path class="st3" d="M21.884,18.767c-0.301,0.274-0.7,0.44-1.139,0.44c-0.351,0-0.677-0.107-0.949-0.289 c-0.039,0.025-0.078,0.051-0.115,0.072c-1.233,0.781-2.538,1.352-3.864,1.698v4.824c3.887,0,7.222-2.37,8.64-5.744 C23.598,19.531,22.734,19.195,21.884,18.767z"/>
+				<path class="st2" d="M15.817,20.688c-0.793,0.205-1.592,0.33-2.385,0.367c-0.042,0.002-0.086,0.006-0.128,0.008 c-0.151,0.41-0.454,0.744-0.839,0.94c0.245,0.909,0.688,1.698,1.319,2.327c0.524,0.524,1.162,0.92,1.891,1.18 c0.046,0,0.093,0.002,0.142,0.002V20.688z"/>
+				<path class="st3" d="M19.043,17.503c0-0.172,0.026-0.34,0.074-0.498c-0.562-0.44-1.106-0.92-1.625-1.442 c-0.614-0.614-1.172-1.262-1.675-1.934v5.946c1.124-0.324,2.235-0.823,3.291-1.489c0.009-0.006,0.02-0.014,0.03-0.022 C19.077,17.89,19.043,17.7,19.043,17.503z"/>
+				<path class="st2" d="M15.817,13.629c-0.045-0.059-0.091-0.113-0.132-0.174c-0.123,0.029-0.249,0.043-0.378,0.043 c-0.227,0-0.441-0.045-0.637-0.123c-1.134,1.606-1.912,3.341-2.25,5.049c-0.032,0.162-0.059,0.32-0.083,0.475 c0.477,0.195,0.848,0.596,0.996,1.092c0.016-0.004,0.029-0.004,0.046-0.004c0.809-0.039,1.627-0.18,2.438-0.412V13.629z"/>
+				<path class="st3" d="M15.817,6.778v3.394c0.048,0.016,0.098,0.033,0.145,0.055c1.106-1.073,2.316-1.979,3.573-2.681 C18.395,7.05,17.137,6.778,15.817,6.778z"/>
+				<path class="st2" d="M15.817,6.778c-0.608,0-1.201,0.055-1.773,0.168c0.025,0.197,0.06,0.404,0.101,0.606 c0.168,0.86,0.449,1.725,0.829,2.575c0.106-0.02,0.219-0.033,0.333-0.033c0.178,0,0.347,0.027,0.51,0.078V6.778z"/>
+			</g>
+		</g>
+	</g>
+</svg>
diff --git a/src/icons/nepso.svg b/src/icons/nepso.svg
new file mode 100644
index 000000000..6cd91400a
--- /dev/null
+++ b/src/icons/nepso.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, 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"
+	 viewBox="0 0 204.6 204.8" style="enable-background:new 0 0 204.6 204.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#XMLID_4_);}
+	.st1{fill:url(#XMLID_5_);}
+	.st2{fill:url(#XMLID_7_);}
+	.st3{fill:#27BDBE;}
+</style>
+<g id="XMLID_1_">
+	<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="86.2854" y1="70.1839" x2="137.8969" y2="70.1839">
+		<stop  offset="0" style="stop-color:#47C2C5"/>
+		<stop  offset="1" style="stop-color:#2BB673"/>
+	</linearGradient>
+	<path id="XMLID_49_" class="st0" d="M112.1,44.6c-14.2,0-25.8,11.5-25.8,25.6c0,14.1,11.6,25.6,25.8,25.6s25.8-11.5,25.8-25.6
+		C137.9,56.1,126.3,44.6,112.1,44.6z"/>
+	<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="13" y1="102.3852" x2="191.6464" y2="102.3852">
+		<stop  offset="0" style="stop-color:#47C2C5"/>
+		<stop  offset="1" style="stop-color:#2BB673"/>
+	</linearGradient>
+	<path id="XMLID_2_" class="st1" d="M52.8,151.1c0.9,26.7,25.2,40.7,48.7,40.7c49.7,0,90.1-40.1,90.1-89.4
+		c0-49.8-41.5-90.3-91.7-89.4c40.4,2.6,72.4,32,72.4,67.8c0,18.6-17.6,53.9-51.1,55.2C94,137,80.4,118.8,68.4,102.8
+		c-9.2-12.3-17.1-22.8-29.3-22.8c-8.6,0-15.1,2.9-19.5,8.5c-9,11.7-6.5,31.7-5.4,36.1c2.8,11,7.9,21.3,15,30.5
+		c-9-17.5-9.4-34.6-3.1-43.9c2.8-4.1,6.6-6.3,11-6.3c1.6,0,3.3,0.3,5.1,0.9c12.6,4.5,11.9,17.6,11.1,31.5
+		C52.9,141.8,52.7,146.4,52.8,151.1z"/>
+	<linearGradient id="XMLID_7_" gradientUnits="userSpaceOnUse" x1="51.9417" y1="74.4209" x2="163.1464" y2="74.4209">
+		<stop  offset="0" style="stop-color:#47C2C5"/>
+		<stop  offset="1" style="stop-color:#2BB673"/>
+	</linearGradient>
+	<path id="XMLID_21_" class="st2" d="M55.2,77.6c-1.1-0.1-2.2-0.2-3.3-0.2c0,0,0,0,0,0c9,2.9,15.6,11.7,22.6,20.9
+		c10.5,13.9,22.2,29.8,45.3,28.8c30.4-1.2,43.3-34,43.3-46.9c0-32.2-30.4-58.5-67.8-58.5c-3.8,0-7.2,0.1-10.7,0.6c0.4,0,0.8,0,1.3,0
+		c6.1,0,12.1,0.7,17.9,2.1c16.7,4,31.1,13.7,38.5,26.2c3.9,6.5,6,13.4,6,20.1c0,20-16.4,36.4-36.6,36.4c-13.1,0-22.8-8-32.3-15.7
+		c-3.7-3-7.3-5.9-11-8.4C63.7,79.9,59.4,78.1,55.2,77.6z"/>
+	<path id="XMLID_6_" class="st3" d="M47.4,148.8c0.8,3,1.7,6.5,3,10.1c-0.5-2.5-0.8-5.1-0.9-7.7c-0.2-4.8,0.1-9.5,0.4-14.1
+		c0.8-13.7,1.4-24.5-8.9-28.1c-5.9-2.1-9.6,0.8-11.7,3.5c-6.5,8.7-5.9,27.5,5.2,46.1c-3-7.1-4.4-14.1-2.8-18.5
+		c0.9-2.6,2.8-4.1,5.5-4.5c0.4,0,0.8-0.1,1.1-0.1C43.9,135.6,45.6,141.7,47.4,148.8z"/>
+</g>
+</svg>
diff --git a/src/icons/tajs.png b/src/icons/tajs.png
new file mode 100644
index 000000000..7b71d803b
Binary files /dev/null and b/src/icons/tajs.png differ