Merge branch 'master' into httparchive

4 years ago · e75032d0dd
parent 1404130a1d cef330d871
commit e75032d0dd
27 changed files with 374 additions and 98 deletions
--- a/bin/validate.js
+++ b/bin/validate.js
@ -66,11 +66,6 @@ try {
                throw new Error(`${error.message} (${id})`)
              }

-              //
-              if (/\.[+*]/.test(regex)) {
-                console.log(regex)
-              }
-
              // Count capture groups
              const groups = new RegExp(`${regex}|`).exec('').length - 1

--- a/package.json
+++ b/package.json
@ -2,7 +2,8 @@
  "dependencies": {
    "@prantlf/jsonlint": "^10.2.0",
    "adm-zip": "^0.4.14",
-    "convert-svg-to-png": "^0.5.0"
+    "convert-svg-to-png": "^0.5.0",
+    "languagedetect": "^2.0.0"
  },
  "devDependencies": {
    "@nuxtjs/eslint-config": "^1.0.1",
--- a/src/apps.json
+++ b/src/apps.json
@ -39,6 +39,16 @@
      "script": "https\\:\\/\\/track\\.91app\\.io\\/track\\.js\\?",
      "website": "https://www.91app.com/"
    },
+    "@sulu/web": {
+      "cats": [
+        59
+      ],
+      "icon": "Sulu.svg",
+      "js": {
+        "web.startComponents": ""
+      },
+      "website": "https://github.com/sulu/web-js"
+    },
    "A-Frame": {
      "cats": [
        25
@ -368,6 +378,17 @@
      "script": "(?:wh(?:utils|ver|proxy|lang|topic|msg)|ehlpdhtm)\\.js",
      "website": "http://adobe.com/products/robohelp.html"
    },
+    "AdonisJS": {
+      "cats": [
+        18
+      ],
+      "cookies": {
+        "cookie_name": "adonis-session"
+      },
+      "icon": "AdonisJS.png",
+      "implies": "Node.js",
+      "website": "https://adonisjs.com"
+    },
    "Advanced Web Stats": {
      "cats": [
        10
@ -705,6 +726,14 @@
      "icon": "amber.png",
      "website": "https://amberframework.org"
    },
+    "American Express": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-american_express",
+      "icon": "Amex.svg",
+      "website": "https://www.americanexpress.com"
+    },
    "Ametys": {
      "cats": [
        1
@ -957,6 +986,17 @@
      "script": "adnxs\\.(?:net|com)",
      "website": "http://appnexus.com"
    },
+    "Apple Pay": {
+      "cats": [
+        41
+      ],
+      "html": [
+        "<[^>]+aria-labelledby=\"pi-apple_pay",
+        "<script id=\"apple-pay"
+      ],
+      "icon": "Apple.svg",
+      "website": "https://www.apple.com/apple-pay"
+    },
    "Arastta": {
      "cats": [
        6
@ -2028,6 +2068,21 @@
      "icon": "CentOS.png",
      "website": "http://centos.org"
    },
+    "Centminmod": {
+      "cats": [
+        22
+      ],
+      "headers": {
+        "X-Powered-By": "centminmod"
+      },
+      "icon": "centminmod.png",
+      "implies": [
+        "CentOS",
+        "Nginx",
+        "PHP"
+      ],
+      "website": "https://centminmod.com"
+    },
    "Ceres": {
      "cats": [
        6
@ -2511,8 +2566,8 @@
      "cats": [
        67
      ],
-      "script": "consent\\.cookiebot\\.com",    
      "icon": "Cookiebot.svg",
+      "script": "consent\\.cookiebot\\.com",
      "website": "http://www.cookiebot.com"
    },      
    "CookieHub": {
@ -2691,8 +2746,8 @@
      "cats": [
        67
      ],
-      "script": "c\\.evidon\\.com",    
      "icon": "Crownpeak.png",
+      "script": "c\\.evidon\\.com",
      "website": "http://www.crownpeak.com"
    },
    "Crypto-Loot": {
@ -3768,6 +3823,7 @@
      ],
      "html": "<!-- Powered by FaraPy.",
      "icon": "FaraPy.png",
+      "implies": "Python",
      "website": "https://faral.tech"
    },
    "Fastcommerce": {
@ -4004,6 +4060,20 @@
      },
      "website": "http://www.fork-cms.com/"
    },
+    "ForoshGostar": {
+      "cats": [
+        6
+      ],
+      "cookies": {
+        "Aws.customer": ""
+      },
+      "icon": "ForoshGostar.svg",
+      "implies": "Microsoft ASP.NET",
+      "meta": {
+        "generator": "^Forosh\\s?Gostar.*|Arsina Webshop.*$"
+      },
+      "website": "https://www.foroshgostar.com"
+    },
    "Fortune3": {
      "cats": [
        6
@ -4673,6 +4743,14 @@
      "icon": "Google PageSpeed.png",
      "website": "http://developers.google.com/speed/pagespeed/mod"
    },
+    "Google Pay": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-google_pay",
+      "icon": "Google.svg",
+      "website": "https://pay.google.com"
+    },
    "Google Plus": {
      "cats": [
        5
@ -5190,7 +5268,7 @@
        6
      ],
      "cpe": "cpe:/a:ibm:websphere_commerce_suite",
-      "html": "href=\"(?:\\/|[^>]+)webapp\\/wcs\\/",
+      "html": "<(?:a|link|script)[^>]*(?:href|src)=\".*(/wcsstore/|webapp\\/wcs)",
      "icon": "IBM.svg",
      "implies": "Java",
      "url": "/wcs/",
@ -5946,10 +6024,10 @@
      "js": {
        "CMS.Application": ""
      },
-      "script": "/CMSPages/GetResource\\.ashx",
      "meta": {
        "generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1"
      },
+      "script": "/CMSPages/GetResource\\.ashx",
      "website": "http://www.kentico.com"
    },
    "Kestrel": {
@ -6533,17 +6611,17 @@
      ],
      "website": "https://www.localfocus.nl/en/"
    },
-    "Locomotive": {
+    "LocomotiveCMS": {
      "cats": [
        1
      ],
      "html": "<link[^>]*/sites/[a-z\\d]{24}/theme/stylesheets",
-      "icon": "Locomotive.png",
+      "icon": "LocomotiveCMS.png",
      "implies": [
        "Ruby on Rails",
        "MongoDB"
      ],
-      "website": "http://www.locomotivecms.com"
+      "website": "https://www.locomotivecms.com"
    },
    "Lodash": {
      "cats": [
@ -6799,6 +6877,14 @@
      "script": "munchkin\\.marketo\\.net/munchkin\\.js",
      "website": "https://www.marketo.com"
    },
+    "Mastercard": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-mastercard",
+      "icon": "Mastercard.svg",
+      "website": "https://www.mastercard.com"
+    },
    "Material Design Lite": {
      "cats": [
        66
@ -8016,12 +8102,14 @@
      "cookies": {
        "OptanonConsent": ""
      },
+      "icon": "OneTrust.png",
      "script": [
        "cdn\\.cookielaw\\.org", 
        "optanon\\.blob\\.core\\.windows\\.net",
        "otSDKStub\\.js"
+        "cdn\\.cookielaw\\.org",
+        "optanon\\.blob\\.core\\.windows\\.net"
      ],
-      "icon": "OneTrust.png",
      "website": "http://www.onetrust.com"
    },
    "Onshop": {
@ -9792,7 +9880,10 @@
        "_hybris": ""
      },
      "cpe": "cpe:/a:sap:commerce_cloud",
-      "html": "<[^>]+/(?:sys_master|hybr|_ui/(?:responsive/)?(?:desktop|common(?:/images|/img)?))/",
+      "html": [
+        "<[^>]+/(?:sys_master|hybr|_ui/(?:.*responsive/)?(?:desktop|common(?:/images|/img|/css|ico)?))/",
+        "<script[^>].*hybris.*.js"
+      ],
      "icon": "SAP.png",
      "implies": "Java",
      "website": "https://www.sap.com/products/crm/e-commerce-platforms.html"
@ -9929,6 +10020,14 @@
      "implies": "Express",
      "website": "http://sailsjs.org"
    },
+    "SaleCycle": {
+      "cats": [
+        6
+      ],
+      "html": "<iframe[^>]+title=\"SaleCycle\"[^>]+src=\"[^>]+salecycle\\.com",
+      "icon": "salecycle.svg",
+      "website": "https://www.salecycle.com/"
+    },
    "Salesforce": {
      "cats": [
        53
@ -10242,6 +10341,16 @@
      "script": "^https?://codice(?:business|ssl|pro|isp)?\\.shinystat\\.com/cgi-bin/getcod\\.cgi",
      "website": "http://shinystat.com"
    },
+    "Shop Pay": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-shopify_pay",
+      "icon": "Shopify.svg",
+      "implies": "Shopify",
+      "url": "^https://pay.shopify.com",
+      "website": "https://pay.google.com"
+    },
    "Shopatron": {
      "cats": [
        6
@ -10671,7 +10780,7 @@
      "cats": [
        12
      ],
-      "icon": "Socket.io.png",
+      "icon": "Socket.IO.svg",
      "implies": "Node.js",
      "js": {
        "io.Socket": "",
@ -10690,6 +10799,22 @@
      },
      "website": "http://www.softtr.com"
    },
+    "SolidPixels": {
+      "cats": [
+        1,
+        6,
+        4
+      ],
+      "icon": "SolidPixels.png",
+      "implies": "React",
+      "meta": {
+        "web_author": "^solidpixels"
+      },
+      "script": [
+        "^https?://cdn\\.solidpixels\\.net/"
+      ],
+      "website": "https://www.solidpixels.net"
+    },
    "Solodev": {
      "cats": [
        1
@ -11009,11 +11134,11 @@
      "cats": [
        41
      ],
-      "html": "<input[^>]+data-stripe",
      "cookies": {
        "__stripe_mid": "",
        "__stripe_sid": ""
      },
+      "html": "<input[^>]+data-stripe",
      "icon": "Stripe.png",
      "js": {
        "Stripe.version": "^(.+)$\\;version:\\1"
@ -11310,6 +11435,15 @@
      "script": "\\.tagcommander\\.com",
      "website": "https://www.commandersact.com/en/solutions/tagcommander/"
    },
+    "Taggbox": {
+      "cats": [
+        5
+      ],
+      "icon": "Taggbox.svg",
+      "script": "web\\.taggbox\\.com",
+      "url": "web.taggbox.com",
+      "website": "https://taggbox.com/"
+    },
    "Taiga": {
      "cats": [
        13
@ -11700,8 +11834,8 @@
      "cats": [
        67
      ],
-      "script": "consent\\.trustarc\\.com",    
      "icon": "TrustArc.svg",
+      "script": "consent\\.trustarc\\.com",
      "website": "http://trustarc.com"
    },
    "Tumblr": {
@ -12094,6 +12228,14 @@
      "icon": "Varnish.svg",
      "website": "http://www.varnish-cache.org"
    },
+    "Venmo": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-venmo",
+      "icon": "Venmo.svg",
+      "website": "https://venmo.com"
+    },
    "Veoxa": {
      "cats": [
        36
@ -12211,6 +12353,14 @@
      "url": "/sparql",
      "website": "https://virtuoso.openlinksw.com/"
    },
+    "Visa": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-visa",
+      "icon": "Visa.svg",
+      "website": "https://www.visa.com"
+    },
    "Visual Website Optimizer": {
      "cats": [
        10
@ -12256,7 +12406,7 @@
        12
      ],
      "html": "<[^>]+\\sdata-v(?:ue)?-",
-      "icon": "Vue.js.png",
+      "icon": "vue.svg",
      "js": {
        "Vue.version": "^(.+)$\\;version:\\1"
      },
@ -14976,6 +15126,5 @@
      "name": "Cookie compliance",
      "priority": 9
    }
-      
  }
 }
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@ -137,7 +137,7 @@ class Driver {
  }

  open(url) {
-    return new Site(url, this)
+    return new Site(url.split('#')[0], this)
  }

  log(message, source = 'driver') {
--- a/src/drivers/webextension/html/popup.html
+++ b/src/drivers/webextension/html/popup.html
@ -69,7 +69,7 @@
          <path fill="currentColor" d="M12,8H4A2,2 0 0,0 2,10V14A2,2 0 0,0 4,16H5V20A1,1 0 0,0 6,21H8A1,1 0 0,0 9,20V16H12L17,20V4L12,8M21.5,12C21.5,13.71 20.54,15.26 19,16V8C20.53,8.75 21.5,10.3 21.5,12Z" />
        </svg>

-        <a class="alerts__link" href="https://www.wappalyzer.com/alerts/manage" data-i18n="createAlert"></a>
+        <a class="alerts__link" href="https://www.wappalyzer.com/alerts" data-i18n="createAlert"></a>
      </div>

      <svg class="footer__settings" viewBox="0 0 24 24">
--- a/src/drivers/webextension/images/icons/AdonisJS.png
+++ b/src/drivers/webextension/images/icons/AdonisJS.png
--- a/src/drivers/webextension/images/icons/Amex.svg
+++ b/src/drivers/webextension/images/icons/Amex.svg
@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="1000" height="997.51703" id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="American_Express_2018.svg">
+  <defs id="defs4"/>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.125" inkscape:cx="850.2929" inkscape:cy="357.59411" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1680" inkscape:window-height="931" inkscape:window-x="0" inkscape:window-y="1" inkscape:window-maximized="1">
+    <inkscape:grid type="xygrid" id="grid2996" empspacing="5" visible="true" enabled="true" snapvisiblegridlinesonly="true" originx="-55.5px" originy="947.50002px"/>
+  </sodipodi:namedview>
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-55.5,-1002.3452)">
+    <path sodipodi:nodetypes="ccccccccccc" inkscape:connector-curvature="0" id="path3078" d="m 55.5,1002.3454 997.5168,0 0,538.4893 -49.3744,77.1475 49.3744,68.6613 0,313.2187 -997.5168,0 0,-507.6304 L 86.358989,1456.744 55.5,1422.7991 Z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="cccccccccccccccccccc" inkscape:connector-curvature="0" id="path3082" d="m 249.14015,1697.4441 0,-156.6094 165.82027,0 17.79072,23.1924 18.37901,-23.1924 601.88665,0 0,145.8088 c 0,0 -15.7404,10.644 -33.9449,10.8006 l -333.27706,0 -20.05834,-24.6872 0,24.6872 -65.72965,0 0,-42.1418 c 0,0 -8.97877,5.8825 -28.39026,5.8825 l -22.37277,0 0,36.2593 -99.52024,0 -17.7653,-23.6898 -18.03807,23.6898 z" style="fill:#ffffff;stroke:none"/>
+    <path sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc" inkscape:connector-curvature="0" id="path3080" d="m 55.5,1422.7991 37.393125,-87.1766 64.667505,0 21.22103,48.8328 0,-48.8328 80.38767,0 12.63289,35.2949 12.24716,-35.2949 360.8573,0 0,17.7439 c 0,0 18.96995,-17.7439 50.14586,-17.7439 l 117.08499,0.4092 20.85469,48.1937 0,-48.6029 67.27259,0 18.5154,27.6834 0,-27.6834 67.88977,0 0,156.6093 -67.88977,0 -17.74392,-27.7731 0,27.7731 -98.83835,0 -9.93959,-24.6872 -26.57108,0 -9.77781,24.6872 -67.02872,0 c -26.82589,0 -43.97406,-17.3816 -43.97406,-17.3816 l 0,17.3816 -101.06318,0 -20.05835,-24.6872 0,24.6872 -375.80462,0 -9.93274,-24.6872 -26.48635,0 -9.86254,24.6872 -46.1989,0 z" style="fill:#ffffff;stroke:none"/>
+    <path id="path3046" d="m 106.12803,1354.9291 -50.435161,117.2641 32.835892,0 9.305914,-23.4816 54.099665,0 9.2577,23.4816 33.55915,0 -50.38695,-117.2641 -38.23621,0 z m 18.66004,27.2909 16.49028,41.0329 -33.02877,0 16.53849,-41.0329 z" style="fill:#016fd0;fill-opacity:1;stroke:none" inkscape:connector-curvature="0"/>
+    <path sodipodi:nodetypes="cccccccccccccc" inkscape:connector-curvature="0" id="path3048" d="m 198.22282,1472.1735 0,-117.2642 46.66163,0.1733 27.13999,75.6045 26.4901,-75.7778 46.28848,0 0,117.2642 -29.31604,0 0,-86.4052 -31.07562,86.4052 -25.71023,0 -31.16227,-86.4052 0,86.4052 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="ccccccccccccc" inkscape:connector-curvature="0" id="path3050" d="m 364.86136,1472.1735 0,-117.2642 95.66287,0 0,26.2302 -66.03824,0 0,20.0583 64.49529,0 0,24.6872 -64.49529,0 0,20.8298 66.03824,0 0,25.4587 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path id="path3052" d="m 477.49667,1354.9291 0,117.2641 29.31604,0 0,-41.6596 12.34359,0 35.15032,41.6596 35.82536,0 -38.57374,-43.2025 c 15.8309,-1.3359 32.16085,-14.9233 32.16085,-36.0182 0,-24.6765 -19.36827,-38.0434 -40.98459,-38.0434 l -65.23783,0 z m 29.31604,26.2301 33.51093,0 c 8.03881,0 13.88655,6.2882 13.88655,12.3436 0,7.7905 -7.57673,12.3436 -13.45259,12.3436 l -33.94489,0 0,-24.6872 z" style="fill:#016fd0;fill-opacity:1;stroke:none" inkscape:connector-curvature="0"/>
+    <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path3054" d="m 625.61982,1472.1735 -29.93322,0 0,-117.2642 29.93322,0 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="ccccccccccc" inkscape:connector-curvature="0" id="path3056" d="m 696.59549,1472.1735 -6.4611,0 c -31.26172,0 -50.24229,-24.6292 -50.24229,-58.1499 0,-34.3488 18.76806,-59.1143 58.24634,-59.1143 l 32.40194,0 0,27.7731 -33.58657,0 c -16.026,0 -27.35994,12.5067 -27.35994,31.6305 0,22.7096 12.95987,32.2476 31.63047,32.2476 l 7.71474,0 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path inkscape:connector-curvature="0" style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 760.3868,1354.9291 -50.43515,117.2641 32.83589,0 9.30591,-23.4816 54.09967,0 9.25769,23.4816 33.55915,0 -50.38694,-117.2641 -38.23622,0 z m 18.66005,27.2909 16.49027,41.0329 -33.02876,0 16.53849,-41.0329 z" id="path3058"/>
+    <path sodipodi:nodetypes="ccccccccccc" inkscape:connector-curvature="0" id="path3060" d="m 852.43338,1472.1735 0,-117.2642 37.27187,0 47.59035,73.6759 0,-73.6759 29.31604,0 0,117.2642 -36.06644,0 -48.79578,-75.6045 0,75.6045 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 269.1985,1677.3858 0,-117.2642 95.66286,0 0,26.2302 -66.03823,0 0,20.0583 64.49528,0 0,24.6872 -64.49528,0 0,20.8298 66.03823,0 0,25.4587 z" id="path3062" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc"/>
+    <path sodipodi:nodetypes="ccccccccccccc" inkscape:connector-curvature="0" id="path3064" d="m 737.94653,1677.3858 0,-117.2642 95.66287,0 0,26.2302 -66.03824,0 0,20.0583 64.1867,0 0,24.6872 -64.1867,0 0,20.8298 66.03824,0 0,25.4587 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="ccccccccccccc" inkscape:connector-curvature="0" id="path3066" d="m 368.57408,1677.3858 46.57779,-57.9089 -47.68678,-59.3553 36.93435,0 28.39991,36.6932 28.49635,-36.6932 35.48784,0 -47.05996,58.6321 46.66353,58.6321 -36.92851,0 -27.57537,-36.1148 -26.90518,36.1148 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 499.86944,1560.1414 0,117.2641 30.08751,0 0,-37.0308 30.85899,0 c 26.11107,0 45.90274,-13.8524 45.90274,-40.7917 0,-22.3164 -15.52271,-39.4416 -42.09358,-39.4416 l -64.75566,0 z m 30.08751,26.5194 32.49837,0 c 8.43546,0 14.46515,5.1701 14.46515,13.5008 0,7.8262 -5.99925,13.5008 -14.56158,13.5008 l -32.40194,0 0,-27.0016 z" id="path3068" inkscape:connector-curvature="0"/>
+    <path inkscape:connector-curvature="0" style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 619.44802,1560.1216 0,117.2642 29.31604,0 0,-41.6597 12.34359,0 35.15032,41.6597 35.82536,0 -38.57374,-43.2026 c 15.83089,-1.3361 32.16085,-14.9233 32.16085,-36.0183 0,-24.6764 -19.36827,-38.0433 -40.98459,-38.0433 l -65.23783,0 z m 29.31604,26.2302 33.51093,0 c 8.03881,0 13.88654,6.2881 13.88654,12.3435 0,7.7906 -7.57673,12.3436 -13.45259,12.3436 l -33.94488,0 0,-24.6871 z" id="path3072"/>
+    <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" id="path3074" d="m 847.18735,1677.3858 0,-25.4587 58.67066,0 c 8.68115,0 12.44003,-4.6912 12.44003,-9.8363 0,-4.9296 -3.74703,-9.9134 -12.44003,-9.9134 l -26.5126,0 c -23.04571,0 -35.88042,-14.0409 -35.88042,-35.1214 0,-18.8023 11.75348,-36.9344 45.99918,-36.9344 l 57.08913,0 -12.3436,26.3844 -49.37438,0 c -9.43821,0 -12.3436,4.9526 -12.3436,9.6821 0,4.8612 3.59036,10.222 10.80065,10.222 l 27.77309,0 c 25.69029,0 36.83792,14.5724 36.83792,33.6556 0,20.5163 -12.42212,37.3201 -38.23646,37.3201 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 954.78398,1677.3858 0,-25.4587 58.67062,0 c 8.6812,0 12.4401,-4.6912 12.4401,-9.8363 0,-4.9296 -3.7471,-9.9134 -12.4401,-9.9134 l -26.51256,0 c -23.04571,0 -35.88043,-14.0409 -35.88043,-35.1214 0,-18.8023 11.75348,-36.9344 45.99918,-36.9344 l 57.08911,0 -12.3436,26.3844 -49.37436,0 c -9.4382,0 -12.34359,4.9526 -12.34359,9.6821 0,4.8612 3.59035,10.222 10.80064,10.222 l 27.77311,0 c 25.6903,0 36.8379,14.5724 36.8379,33.6556 0,20.5163 -12.4221,37.3201 -38.2365,37.3201 z" id="path3076" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+  </g>
+</svg>
--- a/src/drivers/webextension/images/icons/Apple.svg
+++ b/src/drivers/webextension/images/icons/Apple.svg
@ -1,23 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="747.63776" height="909.28345" id="svg2811">
-  <defs id="defs2813">
-    <clipPath id="clp12">
-      <path d="M 45.315,71.927 L 58.235,71.927 L 58.235,87.794 L 45.315,87.794 L 45.315,71.927 z " id="path184"/>
-    </clipPath>
-    <clipPath id="clp21">
-      <path d="M 123.91,72.178 L 150.14,72.178 L 150.14,87.472 L 123.91,87.472 L 123.91,72.178 z " id="path592"/>
-    </clipPath>
-    <clipPath id="clp9">
-      <path d="M 413.96,49.857 L 445.72,49.857 L 445.72,58.576 L 413.96,58.576 L 413.96,49.857 z " id="path100"/>
+<svg width="1188" height="1188" viewBox="0 0 1188 1188" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M1073.04 925.187C1055.09 966.665 1033.84 1004.84 1009.21 1039.95C975.651 1087.8 948.17 1120.92 926.992 1139.32C894.162 1169.51 858.986 1184.97 821.32 1185.85C794.279 1185.85 761.668 1178.16 723.709 1162.55C685.624 1147.01 650.625 1139.32 618.623 1139.32C585.06 1139.32 549.064 1147.01 510.562 1162.55C472.001 1178.16 440.937 1186.29 417.186 1187.1C381.066 1188.63 345.063 1172.73 309.125 1139.32C286.188 1119.31 257.499 1085.01 223.129 1036.43C186.254 984.545 155.938 924.381 132.187 855.79C106.751 781.702 94 709.959 94 640.503C94 560.941 111.192 492.32 145.627 434.816C172.69 388.627 208.693 352.191 253.754 325.444C298.815 298.696 347.503 285.065 399.936 284.193C428.626 284.193 466.248 293.068 513.002 310.509C559.624 328.008 589.559 336.883 602.684 336.883C612.496 336.883 645.752 326.506 702.127 305.819C755.44 286.634 800.434 278.69 837.295 281.819C937.178 289.88 1012.22 329.254 1062.12 400.191C972.793 454.317 928.604 530.126 929.483 627.378C930.289 703.129 957.77 766.166 1011.78 816.218C1036.25 839.448 1063.59 857.402 1094 870.153C1087.41 889.279 1080.44 907.6 1073.04 925.187V925.187ZM843.964 23.7507C843.964 83.1241 822.272 138.561 779.036 189.873C726.86 250.872 663.75 286.121 595.312 280.559C594.44 273.436 593.934 265.939 593.934 258.061C593.934 201.063 618.747 140.063 662.812 90.1878C684.811 64.9349 712.79 43.9376 746.719 27.1876C780.575 10.6875 812.599 1.5626 842.718 0C843.597 7.9373 843.964 15.8751 843.964 23.7499V23.7507Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="1187.2" height="1187.2" fill="white"/>
 </clipPath>
 </defs>
-  <g transform="translate(-1074.235,-1639.219)" id="layer1">
-    <g transform="translate(19.48863,19.49672)" id="g25472">
-      <g transform="matrix(54.85033,0,0,-54.85033,-1411.313,6454.729)" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" clip-path="url(#clp12)" id="g186">
-        <path d="M 56.105,79.364 C 56.087,81.372 57.745,82.336 57.82,82.383 C 56.887,83.748 55.435,83.935 54.917,83.957 C 53.682,84.082 52.506,83.23 51.88,83.23 C 51.254,83.23 50.286,83.939 49.262,83.919 C 47.914,83.899 46.673,83.136 45.979,81.93 C 44.58,79.503 45.622,75.906 46.984,73.936 C 47.651,72.973 48.445,71.888 49.489,71.928 C 50.495,71.968 50.875,72.578 52.089,72.578 C 53.303,72.578 53.645,71.928 54.708,71.947 C 55.789,71.968 56.475,72.931 57.137,73.897 C 57.901,75.015 58.217,76.097 58.235,76.154 C 58.211,76.164 56.127,76.963 56.105,79.364" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path188"/>
-      </g>
-      <path d="M 1556.5087,1778.2074 C 1586.8952,1741.403 1607.4089,1690.2272 1601.7588,1639.2187 C 1557.9852,1640.9758 1505.0032,1668.3995 1473.5732,1705.2039 C 1445.4359,1737.7314 1420.7536,1789.8374 1427.4422,1839.8074 C 1476.2605,1843.5921 1526.1172,1814.9577 1556.5087,1778.2074" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path190"/>
-    </g>
-  </g>
 </svg>
--- a/src/drivers/webextension/images/icons/Drupal.svg
+++ b/src/drivers/webextension/images/icons/Drupal.svg
@ -1,34 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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 755 826" enable-background="new 0 0 755 826" xml:space="preserve">
-<path fill="#00598E" d="M539.2,167.8c-39.8-24.8-77.2-34.5-114.8-59.2c-23.2-15.8-55.5-53.2-82.5-85.5c-5.2,51.8-21,72.8-39,87.8
-	c-38.2,30-62.2,39-95.2,57C179.9,182.1,29.2,272.1,29.2,465.6s162.8,336,343.5,336s337.5-131.2,337.5-330S563.2,182.8,539.2,167.8z"
-	/>
-<path fill="#FFFFFF" d="M478.2,633.5c12,0,24.8,0.8,33.8,6.8s14.2,19.5,17.2,27s0,12-6,15c-5.2,3-6,1.5-11.2-8.2s-9.8-19.5-36-19.5
-	s-34.5,9-47.2,19.5s-17.2,14.2-21.8,8.2s-3-12,5.2-19.5s21.8-19.5,34.5-24.8S466.2,633.5,478.2,633.5L478.2,633.5z"/>
-<path fill="#FFFFFF" d="M353.8,719c15,12,37.5,21.8,85.5,21.8S521,727.2,536,716c6.8-5.2,9.8-0.8,10.5,2.2s2.2,7.5-3,12.8
-	c-3.8,3.8-38.2,27.8-78.8,31.5s-95.2,6-128.2-24c-5.2-5.2-3.8-12.8,0-15.8s6.8-5.2,11.2-5.2S351.5,717.5,353.8,719L353.8,719z"/>
-<path fill="#0073BA" d="M170,662c57-0.8,67.5-10.5,117.8-33c271.5-121.5,321.8-232.5,331.5-258s24-66.8,9-112.5
-	c-2.9-8.8-5-15.9-6.5-21.6c-36.1-40.3-71.9-62.4-82.7-69.1c-39-24.8-77.3-34.5-114.8-59.2c-23.2-15-55.5-53.2-82.5-85.5
-	c-5.2,51.8-20.2,73.5-39,87.8c-38.2,30-62.2,39-95.2,57C179.8,182.8,29,272,29,465.5c0,61.8,16.6,118.4,45.1,166.8l7.4-0.3
-	C97.2,646.2,122,662.8,170,662z"/>
-<path fill="#004975" d="M539,167.8c-39-24.8-77.2-34.5-114.8-59.2c-23.2-15-55.5-53.2-82.5-85.5c-5.2,51.8-20.2,73.5-39,87.8
-	c-38.2,30-62.2,39-95.2,57C179.8,182.8,29,272,29,465.5c0,61.8,16.6,118.4,45.1,166.8c60.7,103.2,175.4,169.2,298.4,169.2
-	c180.8,0,337.5-131.2,337.5-330c0-109.1-44.3-185.5-88.3-234.6C585.6,196.5,549.8,174.5,539,167.8z M630.2,255.5
-	c49.2,61.6,74.2,134.2,74.2,216c0,47.4-9,92.2-26.8,133.2c-16.9,38.8-41.2,73.2-72.3,102.3c-61.5,57.4-144.1,89-232.7,89
-	c-43.8,0-86.8-8.4-127.8-24.9c-40.3-16.2-76.5-39.4-107.8-69C70.9,639.7,34.6,555.7,34.6,465.5c0-80.3,26.1-151.7,77.5-212.2
-	c39.3-46.2,81.7-71.8,98-80.6c8-4.3,15.4-8.2,22.6-11.9c22.6-11.6,44-22.6,73.4-45.6c15.7-11.9,32.4-30.8,39.5-78.7
-	c24.8,29.5,53.5,62.6,75.5,76.8c19.5,12.9,39.5,21.9,58.8,30.6c18.3,8.2,37.2,16.8,55.9,28.7c0,0,0.7,0.4,0.7,0.4
-	C591.4,207.1,620.6,243.6,630.2,255.5z"/>
-<path fill="#93C5E4" d="M345.5,38c10.5,30.8,9,46.5,9,53.2s-3.8,24.8-15.8,33.8c-5.2,3.8-6.8,6.8-6.8,7.5c0,3,6.8,5.2,6.8,12
-	c0,8.2-3.8,24.8-43.5,64.5s-96.8,75-141,96.8S89,326,83,315.5s2.2-33.8,30-64.5s115.5-75,115.5-75L338,99.5l6-29.2"/>
-<path fill="#FFFFFF" d="M345.5,37.2c-6.8,49.5-21.8,64.5-42,80.2c-33.8,25.5-66.8,41.2-74.2,45c-19.5,9.8-90,48.8-126.8,105
-	c-11.2,17.2,0,24,2.2,25.5s27.8,4.5,82.5-28.5S266,212,296.8,179.8c16.5-17.2,18.8-27,18.8-31.5c0-5.2-3.8-7.5-9.8-9
-	c-3-0.8-3.8-2.2,0-4.5S325.2,125,329,122s21.8-15,22.5-34.5S350.8,54.5,345.5,37.2L345.5,37.2z"/>
-<path fill="#FFFFFF" d="M176.8,582.5c0.8-58.5,55.5-113.2,124.5-114c87.8-0.8,148.5,87,192.8,86.2c37.5-0.8,109.5-74.2,144.8-74.2
-	c37.5,0,48,39,48,62.2s-7.5,65.2-25.5,91.5s-29.2,36-50.2,34.5c-27-2.2-81-86.2-115.5-87.8c-43.5-1.5-138,90.8-212.2,90.8
-	c-45,0-58.5-6.8-73.5-16.5C187.2,639.5,176,615.5,176.8,582.5L176.8,582.5z"/>
-<path fill="none" d="M628.2,258.5c15,45.8,0.8,87-9,112.5s-60,136.5-331.5,258c-50.2,22.5-60.8,32.2-117.8,33
-	c-48,0.8-72.8-15.8-88.5-30l-7.4,0.3c60.7,103.2,175.4,169.2,298.4,169.2c180.8,0,337.5-131.2,337.5-330
-	c0-109.1-44.3-185.5-88.3-234.6C623.2,242.6,625.4,249.7,628.2,258.5z"/>
+<svg width="293" height="293" viewBox="0 0 293 293" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M190.297 60.055C170.457 40.2244 151.527 21.3203 145.894 0C140.26 21.3203 121.328 40.2244 101.491 60.055C71.7361 89.7913 38 123.493 38 174.039C38 202.656 49.3677 230.1 69.6023 250.334C89.8369 270.569 117.281 281.937 145.897 281.937C174.513 281.937 201.957 270.569 222.192 250.334C242.426 230.1 253.794 202.656 253.794 174.039C253.794 123.496 220.061 89.7913 190.297 60.055V60.055ZM83.8596 199.181C77.2438 198.957 52.8276 156.872 98.1236 112.062L128.098 144.804C128.355 145.058 128.556 145.364 128.686 145.701C128.817 146.038 128.875 146.399 128.856 146.76C128.837 147.122 128.742 147.475 128.577 147.796C128.412 148.118 128.18 148.401 127.898 148.627C120.745 155.963 90.259 186.534 86.4698 197.105C85.6877 199.287 84.5454 199.205 83.8596 199.181H83.8596ZM145.897 254.648C141.024 254.648 136.199 253.688 131.696 251.823C127.194 249.958 123.103 247.225 119.657 243.779C116.212 240.333 113.478 236.242 111.613 231.74C109.748 227.238 108.789 222.412 108.789 217.539C108.789 208.144 112.524 199.771 118.038 193.028C124.729 184.846 145.892 161.833 145.892 161.833C145.892 161.833 166.731 185.184 173.697 192.95C179.764 199.695 183.085 208.467 183.006 217.539C183.006 227.381 179.096 236.82 172.137 243.779C165.178 250.738 155.739 254.648 145.897 254.648V254.648ZM216.923 194.471C216.123 196.22 214.309 199.14 211.86 199.229C207.495 199.388 207.029 197.152 203.803 192.377C196.72 181.895 134.906 117.293 123.345 104.799C113.175 93.8103 121.913 86.063 125.966 82.0031C131.051 76.9091 145.893 62.0754 145.893 62.0754C145.893 62.0754 190.151 104.067 208.587 132.759C227.023 161.45 220.669 186.278 216.923 194.471" fill="#009CDE"/>
 </svg>
--- a/src/drivers/webextension/images/icons/ForoshGostar.svg
+++ b/src/drivers/webextension/images/icons/ForoshGostar.svg
@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.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 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#007BFF;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{display:none;fill:#1D96D3;}
+	.st5{opacity:0.6;fill:url(#SVGID_4_);}
+	.st6{opacity:0.58;fill:url(#SVGID_5_);}
+	.st7{fill:#1D96D3;}
+	.st8{opacity:0.61;fill:url(#SVGID_6_);}
+</style>
+<g>
+	<path class="st0" d="M396.5,307.5L396.5,307.5c0,0.6,0,1.2,0,1.8c0,19.8-18.2,35.9-40.6,35.9s-40.6-16.1-40.6-35.9
+		c0-0.6,0-1.2,0.1-1.8h-0.1v-37.9h81.2V307.5z"/>
+	<path class="st0" d="M290.2,307.5L290.2,307.5c0,0.6,0,1.2,0,1.8c0,19.8-18.2,35.9-40.6,35.9c-22.4,0-40.6-16.1-40.6-35.9
+		c0-0.6,0-1.2,0.1-1.8H209v-37.9h81.2V307.5z"/>
+	<path class="st0" d="M184.7,307.5L184.7,307.5c0,0.6,0,1.2,0,1.8c0,19.8-18.2,35.9-40.6,35.9s-40.6-16.1-40.6-35.9
+		c0-0.6,0-1.2,0.1-1.8h-0.1v-37.9h81.2V307.5z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="164.5571" y1="290.7507" x2="222.1396" y2="132.544">
+		<stop  offset="8.108108e-03" style="stop-color:#66B0FF"/>
+		<stop  offset="0.5189" style="stop-color:#007BFF"/>
+		<stop  offset="0.6023" style="stop-color:#067EFF"/>
+		<stop  offset="0.7133" style="stop-color:#1787FF"/>
+		<stop  offset="0.8399" style="stop-color:#3395FF"/>
+		<stop  offset="0.9772" style="stop-color:#59A9FF"/>
+		<stop  offset="1" style="stop-color:#60ADFF"/>
+	</linearGradient>
+	<polygon class="st1" points="238.5,154.8 103.5,268.5 184.7,268.5 283.2,154.8 	"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="262.5802" y1="277.9882" x2="285.9756" y2="145.3065">
+		<stop  offset="8.108108e-03" style="stop-color:#66B0FF"/>
+		<stop  offset="0.5189" style="stop-color:#007BFF"/>
+		<stop  offset="0.6023" style="stop-color:#067EFF"/>
+		<stop  offset="0.7133" style="stop-color:#1787FF"/>
+		<stop  offset="0.8399" style="stop-color:#3395FF"/>
+		<stop  offset="0.9772" style="stop-color:#59A9FF"/>
+		<stop  offset="1" style="stop-color:#60ADFF"/>
+	</linearGradient>
+	<polygon class="st2" points="294.9,154.8 209,268.5 290.2,268.5 339.6,154.8 	"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="355.8662" y1="268.5396" x2="355.8662" y2="154.7552">
+		<stop  offset="8.108108e-03" style="stop-color:#66B0FF"/>
+		<stop  offset="0.5189" style="stop-color:#007BFF"/>
+		<stop  offset="0.6023" style="stop-color:#067EFF"/>
+		<stop  offset="0.7133" style="stop-color:#1787FF"/>
+		<stop  offset="0.8399" style="stop-color:#3395FF"/>
+		<stop  offset="0.9772" style="stop-color:#59A9FF"/>
+		<stop  offset="1" style="stop-color:#60ADFF"/>
+	</linearGradient>
+	<polygon class="st3" points="395.7,154.8 351,154.8 315.3,268.5 396.5,268.5 	"/>
+</g>
+<g id="_x31_">
+	<path class="st0" d="M108.2,395.5c-71.9-70-82.6-184.5-21-267.1c35.6-47.7,88.3-75.3,143.3-80.6c-1.8-0.8-3.7-1.6-5.5-2.3
+		c-27.4-10.7-56.2-12.6-83.1-7.1c-32,16.3-60.1,39.9-82.2,69.5C21.7,158.8,5.9,221.3,15,284.1c3.4,23.2,10,45.4,19.6,66.1
+		c16,18.1,36.5,32.6,60.8,41.4C99.6,393.1,103.9,394.4,108.2,395.5z"/>
+	<g>
+		<path class="st4" d="M280.7,49.2c32,4.8,63.2,17.3,90.8,38c44.7,33.4,71.8,81.8,79.3,133.1c16,19.2,27.5,41.4,34,65.4
+			c3.4-22.8,3.5-46.3,0.1-69.8c-9.1-62.8-42.1-118.3-93-156.2S278.7,5.9,215.9,15c-1,0.1-2,0.3-3,0.5c7.1,1.8,14.2,4,21.2,6.7
+			C251.2,28.8,266.8,37.9,280.7,49.2z"/>
+		<path class="st0" d="M280.7,49.2c32,4.8,63.2,17.3,90.8,38c44.7,33.4,71.8,81.8,79.3,133.1c16,19.2,27.5,41.4,34,65.4
+			c3.4-22.8,3.5-46.3,0.1-69.8c-9.1-62.8-42.1-118.3-93-156.2S278.7,5.9,215.9,15c-1,0.1-2,0.3-3,0.5c7.1,1.8,14.2,4,21.2,6.7
+			C251.2,28.8,266.8,37.9,280.7,49.2z"/>
+		<path class="st0" d="M284.1,485c62.8-9.1,118.3-42.1,156.2-93c9.4-12.5,17.4-25.8,24-39.6c1.3-9.4,1.8-19,1.3-28.8
+			c-1-19.5-5.7-37.9-13.4-54.6c-3.3,35.9-16.3,71.4-39.4,102.4c-62.4,83.5-177.1,105.4-265.1,54c-20.5,0.2-41-3.3-60.9-10.4
+			c-4.2-1.5-8.2-3.2-12.2-4.9c10,10.9,21.2,21,33.3,30.1C158.8,478.3,221.3,494.1,284.1,485z"/>
+	</g>
+</g>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="280.7048" y1="167.2448" x2="484.9043" y2="167.2448">
+	<stop  offset="0" style="stop-color:#66B0FF"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path class="st5" d="M384,86.5c-48.9-36-102.1-40.4-103.3-37.4c0,0,0,0,0,0c87.6,13.4,157.2,83.3,170.2,171c0.1,0.1-0.1-0.1,0,0
+	c28.7,33.6,34,70.1,34,65.4C484.9,281,475.2,153.6,384,86.5z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="133.5635" y1="394.922" x2="133.5635" y2="35.4722">
+	<stop  offset="0" style="stop-color:#66B0FF"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path class="st6" d="M46.8,250.2c0-105.4,80.3-192,183-202c0.2-0.1,0.4-0.2,0.7-0.3c-11.3-4.9-28.7-10.8-50.5-12.1
+	c-15.2-0.9-28.2,0.7-38.1,2.7c-18.5,13-70.3,53.3-93.3,126.8c-6.6,21-24.4,81.1,2,148.7c16,40.9,41.5,67.4,56.9,81.1
+	C70,358.1,46.8,306.9,46.8,250.2z"/>
+<path class="st7" d="M284,471.9"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="117.6595" y1="483.7774" x2="459.1477" y2="286.6191">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#66B0FF"/>
+</linearGradient>
+<path class="st8" d="M250.7,453.5c-37.4,0-72.5-10.1-102.6-27.8c-0.1,0-0.2-0.1-0.4-0.1c-9.8,0.1-22.5-0.6-36.9-3.6
+	c-22.2-4.6-35-12-35.3-11.3c-0.7,1.4,55.2,47.1,134.5,57.9c26.4,3.6,81.6,10.4,138.7-20.7c49.9-27.1,73.6-68.2,80-80
+	c20.4-37.8,23.5-73.3,23.6-93.1C440.3,375.4,354.6,453.5,250.7,453.5z"/>
+</svg>
--- a/src/drivers/webextension/images/icons/Locomotive.png
+++ b/src/drivers/webextension/images/icons/Locomotive.png
--- a/src/drivers/webextension/images/icons/LocomotiveCMS.png
+++ b/src/drivers/webextension/images/icons/LocomotiveCMS.png
--- a/src/drivers/webextension/images/icons/Mastercard.svg
+++ b/src/drivers/webextension/images/icons/Mastercard.svg
@ -0,0 +1,12 @@
+<svg width="1001" height="1001" viewBox="0 0 1001 1001" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M635.199 257.095H364.81V742.936H635.199V257.095Z" fill="#FF5F00"/>
+<path d="M381.977 500.015C381.977 401.302 428.33 313.748 499.575 257.095C447.214 215.893 381.119 191 309.015 191C138.199 191 0 329.199 0 500.015C0 670.832 138.199 809.031 309.015 809.031C381.119 809.031 447.214 784.138 499.575 742.936C428.33 687.142 381.977 598.729 381.977 500.015Z" fill="#EB001B"/>
+<path d="M1000.01 500.015C1000.01 670.832 861.81 809.031 690.993 809.031C618.889 809.031 552.794 784.138 500.433 742.936C572.537 686.283 618.031 598.729 618.031 500.015C618.031 401.302 571.679 313.748 500.433 257.095C552.794 215.893 618.889 191 690.993 191C861.81 191 1000.01 330.057 1000.01 500.015Z" fill="#F79E1B"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="1000.01" height="1000.01" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/src/drivers/webextension/images/icons/Pushnami.svg
+++ b/src/drivers/webextension/images/icons/Pushnami.svg
@ -1,8 +1 @@
-<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>
+<svg width="256" height="256" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><g><polygon fill="#2f2674" points="128.23063370988174,128.23063810881195 128.23063370988174,0 256.4612608213682,0 "/><polygon fill="#2f2674" points="0,256.4612652202984 0,128.23063810881195 128.23063370988174,128.23063810881195 "/><polygon fill="#2f2674" points="0,128.23063810881195 0,0 128.23063370988174,0 "/></g></svg>
--- a/src/drivers/webextension/images/icons/Socket.IO.svg
+++ b/src/drivers/webextension/images/icons/Socket.IO.svg
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="43px" height="43px" viewBox="0 0 43 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.0.2 (7799) - http://www.bohemiancoding.com/sketch -->
+    <title>logo full</title>
+    <description>Created with Sketch.</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="logo" sketch:type="MSLayerGroup">
+            <path d="M0,0 L43,0 L43,43 L0,43 L0,0 L0,0 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M16.2,1.24 C21.62,-0.15 27.61,0.66 32.39,3.61 C38.41,7.21 42.34,14.02 42.44,21.03 C42.66,28.11 38.97,35.13 33.04,38.98 C26.44,43.42 17.31,43.59 10.57,39.37 C3.7,35.27 -0.31,27 0.72,19.06 C1.55,10.67 8.03,3.27 16.2,1.24 L16.2,1.24 Z" id="Shape" fill="#010101" sketch:type="MSShapeGroup"></path>
+            <path d="M15.37,4.67 C25.61,0.57 38.17,8.14 39.23,19.12 C40.88,29 32.68,39.04 22.67,39.33 C13.15,40.28 3.95,32.21 3.68,22.65 C2.97,14.91 8.07,7.23 15.37,4.67 L15.37,4.67 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M16.4,20.44 C20.99,16.69 25.48,12.81 30.17,9.17 C27.71,12.95 25.18,16.68 22.72,20.46 C20.61,20.47 18.5,20.47 16.4,20.44 L16.4,20.44 Z" id="Shape" fill="#010101" sketch:type="MSShapeGroup"></path>
+            <path d="M20.28,22.53 C22.4,22.53 24.51,22.53 26.62,22.56 C22,26.29 17.53,30.2 12.83,33.83 C15.29,30.05 17.82,26.31 20.28,22.53 L20.28,22.53 Z" id="Shape" fill="#010101" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
--- a/src/drivers/webextension/images/icons/Socket.io.png
+++ b/src/drivers/webextension/images/icons/Socket.io.png
--- a/src/drivers/webextension/images/icons/SolidPixels.png
+++ b/src/drivers/webextension/images/icons/SolidPixels.png
--- a/src/drivers/webextension/images/icons/Taggbox.svg
+++ b/src/drivers/webextension/images/icons/Taggbox.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="141.4" height="141.4" viewBox="0 0 141.4 141.4"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:url(#linear-gradient-2);}.cls-3{fill:#fff;}</style><linearGradient id="linear-gradient" x1="70.7" y1="-1716.47" x2="70.7" y2="-1575.07" gradientTransform="matrix(1, 0, 0, -1, 0, -1575.07)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#eb5c99"/><stop offset="0.77" stop-color="#613983"/></linearGradient><linearGradient id="linear-gradient-2" x1="70.6" y1="-1708.17" x2="70.6" y2="-1583.37" xlink:href="#linear-gradient"/></defs><title>Taggbox-T</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="Layer_2-2" data-name="Layer 2-2"><path class="cls-1" d="M70.7,141.4a70.7,70.7,0,1,1,70.7-70.7h0A70.888,70.888,0,0,1,70.7,141.4Zm0-135.7a65,65,0,1,0,65,65A65,65,0,0,0,70.7,5.7Z"/></g><g id="Layer_3" data-name="Layer 3"><path class="cls-2" d="M133,70.7A62.4,62.4,0,1,1,70.6,8.3h0A62.352,62.352,0,0,1,133,70.7Z"/></g><g id="Layer_4" data-name="Layer 4"><polygon class="cls-3" points="115.4 45.3 26 45.3 26 73.2 51.9 73.2 51.9 107.2 90.5 73.2 115.4 73.2 115.4 45.3"/></g></g></g></svg>
--- a/src/drivers/webextension/images/icons/Venmo.svg
+++ b/src/drivers/webextension/images/icons/Venmo.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1333.33 1333.33" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd"><g fill-rule="nonzero"><path d="M157.62 0h1018.09c87.04 0 157.62 70.58 157.62 157.62v1018.09c0 87.04-70.58 157.62-157.62 157.62H157.62C70.58 1333.33 0 1262.74 0 1175.7V157.62C0 70.58 70.59 0 157.63 0z" fill="#3396cd"/><path d="M995.24 271.32c28.68 47.29 41.55 96.05 41.55 157.62 0 196.38-167.62 451.42-303.67 630.49H422.45L297.88 314.34 570 288.5l66.17 530.15c61.5-100.31 137.55-257.93 137.55-365.32 0-58.84-10.08-98.84-25.84-131.78l247.36-50.23z" fill="#fff"/></g></svg>
--- a/src/drivers/webextension/images/icons/Visa.svg
+++ b/src/drivers/webextension/images/icons/Visa.svg
@ -0,0 +1,14 @@
+<svg width="750" height="750" viewBox="0 0 750 750" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M710 -108H40C17.9086 -108 0 -58.4947 0 2.57324V1083.43C0 1144.49 17.9086 1194 40 1194H710C732.091 1194 750 1144.49 750 1083.43V2.57324C750 -58.4947 732.091 -108 710 -108Z" fill="#0E4595"/>
+<path d="M278 473.763L311.36 278.003H364.72L331.33 473.763H278Z" fill="white"/>
+<path d="M524.11 282.223C508.779 276.674 492.584 273.891 476.28 274.003C423.56 274.003 386.42 300.553 386.1 338.603C385.81 366.733 412.62 382.423 432.86 391.783C453.63 401.383 460.61 407.503 460.51 416.073C460.38 429.193 443.93 435.183 428.59 435.183C407.23 435.183 395.89 432.183 378.36 424.913L371.49 421.803L364 465.623C376.46 471.083 399.51 475.823 423.44 476.063C479.52 476.063 515.94 449.823 516.35 409.183C516.55 386.913 502.35 369.973 471.55 355.993C452.9 346.943 441.48 340.903 441.6 331.733C441.6 323.593 451.27 314.893 472.16 314.893C485.847 314.587 499.447 317.141 512.09 322.393L516.87 324.653L524.11 282.223Z" fill="white"/>
+<path d="M661.41 278.003H620.18C607.41 278.003 597.85 281.483 592.24 294.233L513 473.633H569C569 473.633 578.16 449.513 580.23 444.213C586.36 444.213 640.79 444.303 648.57 444.303C650.16 451.153 655.06 473.633 655.06 473.633H704.6L661.41 278.003ZM596 404.403C600.41 393.123 617.26 349.683 617.26 349.683C616.94 350.203 621.64 338.353 624.33 331.003L627.94 347.873C627.94 347.873 638.16 394.603 640.29 404.403H596Z" fill="white"/>
+<path d="M45.68 277.993L45 282.073C64.7017 286.712 83.6819 294.005 101.42 303.753L148.8 473.453L205.26 473.383L289.26 277.993H232.7L180.46 411.533L174.9 384.403C174.64 383.573 174.36 382.743 174.07 381.913L155.91 294.533C152.68 282.143 143.31 278.443 131.72 278.003L45.68 277.993Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="750" height="750" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/src/drivers/webextension/images/icons/Vue.js.png
+++ b/src/drivers/webextension/images/icons/Vue.js.png
--- a/src/drivers/webextension/images/icons/centminmod.png
+++ b/src/drivers/webextension/images/icons/centminmod.png
--- a/src/drivers/webextension/images/icons/salecycle.svg
+++ b/src/drivers/webextension/images/icons/salecycle.svg
--- a/src/drivers/webextension/images/icons/vue.svg
+++ b/src/drivers/webextension/images/icons/vue.svg
@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 196.32 170.02">
+  <path fill="#42b883" d="M120.83 0L98.16 39.26 75.49 0H0l98.16 170.02L196.32 0h-75.49z"/>
+  <path fill="#35495e" d="M120.83 0L98.16 39.26 75.49 0H39.26l58.9 102.01L157.06 0h-36.23z"/>
+</svg>
--- a/src/drivers/webextension/js/content.js
+++ b/src/drivers/webextension/js/content.js
@ -111,7 +111,7 @@ const Content = {
        chrome.runtime.sendMessage({
          source: 'content.js',
          func: 'analyzeJs',
-          args: [location.href, data.wappalyzer.js]
+          args: [location.href.split('#')[0], data.wappalyzer.js]
        })

        script.remove()
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@ -73,7 +73,7 @@ const Popup = {

        document.querySelector(
          '.alerts__link'
-        ).href = `https://www.wappalyzer.com/alerts/manage?url=${encodeURIComponent(
+        ).href = `https://www.wappalyzer.com/alerts?url=${encodeURIComponent(
          `${url}`
        )}`
      } else {
--- a/yarn.lock
+++ b/yarn.lock
@ -1242,6 +1242,11 @@ jsonfile@^4.0.0:
  optionalDependencies:
    graceful-fs "^4.1.6"

+languagedetect@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/languagedetect/-/languagedetect-2.0.0.tgz#4b8fa2b7593b2a3a02fb1100891041c53238936c"
+  integrity sha512-AZb/liiQ+6ZoTj4f1J0aE6OkzhCo8fyH+tuSaPfSo8YHCWLFJrdSixhtO2TYdIkjcDQNaR4RmGaV2A5FJklDMQ==
+
 levn@^0.3.0, levn@~0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
				`@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="141.4" height="141.4" viewBox="0 0 141.4 141.4"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:url(#linear-gradient-2);}.cls-3{fill:#fff;}</style><linearGradient id="linear-gradient" x1="70.7" y1="-1716.47" x2="70.7" y2="-1575.07" gradientTransform="matrix(1, 0, 0, -1, 0, -1575.07)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#eb5c99"/><stop offset="0.77" stop-color="#613983"/></linearGradient><linearGradient id="linear-gradient-2" x1="70.6" y1="-1708.17" x2="70.6" y2="-1583.37" xlink:href="#linear-gradient"/></defs><title>Taggbox-T</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="Layer_2-2" data-name="Layer 2-2"><path class="cls-1" d="M70.7,141.4a70.7,70.7,0,1,1,70.7-70.7h0A70.888,70.888,0,0,1,70.7,141.4Zm0-135.7a65,65,0,1,0,65,65A65,65,0,0,0,70.7,5.7Z"/></g><g id="Layer_3" data-name="Layer 3"><path class="cls-2" d="M133,70.7A62.4,62.4,0,1,1,70.6,8.3h0A62.352,62.352,0,0,1,133,70.7Z"/></g><g id="Layer_4" data-name="Layer 4"><polygon class="cls-3" points="115.4 45.3 26 45.3 26 73.2 51.9 73.2 51.9 107.2 90.5 73.2 115.4 73.2 115.4 45.3"/></g></g></g></svg>