diff --git a/src/apps.json b/src/apps.json
index 4ce9d9b80..2dcff4fba 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -86,6 +86,19 @@
       "icon": "3ware.png",
       "website": "http://www.3ware.com"
     },
+    "A-Frame": {
+      "cats": [
+        25
+      ],
+      "html": "<a-scene[^<>]*>",
+      "icon": "A-Frame.svg",
+      "implies": "three.js",
+      "js": {
+        "AFRAME.version": "(.*)\\;version:\\1"
+      },
+      "scripts": "/?([\\d.]+)?/aframe(?:\\.min)?\\.js\\;version:\\1",
+      "website": "https://aframe.io"
+    },
     "AD EBiS": {
       "cats": [
         10
@@ -606,7 +619,7 @@
       "js": {
         "ngMaterial": ""
       },
-      "icon": "Angular.svg",
+      "icon": "AngularJS.svg",
       "implies": "AngularJS",
       "script": [
         "/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular-material(?:\\.min)?\\.js\\;version:\\1",
@@ -618,7 +631,7 @@
       "cats": [
         12
       ],
-      "html": "<app[^>]+ng-version=\"([\\d.]+)\">\\;version:\\1",
+      "html": "<[^>]+ ng-version=\"([\\d.]+)\">\\;version:\\1",
       "icon": "Angular.svg",
       "website": "https://angular.io"
     },
@@ -631,7 +644,7 @@
         "angular.version.full": "(.*)\\;version:\\1"
       },
       "html": "<[^>]+ ng-version=\"([\\d.]+)\">\\;version:\\1",
-      "icon": "Angular.svg",
+      "icon": "AngularJS.svg",
       "script": [
         "angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
@@ -4769,6 +4782,19 @@
       "implies": "Canon",
       "website": "http://www.canon.com"
     },
+    "Kajabi": {
+      "cats": [
+        6
+      ],
+      "js": {
+        "Kajabi": ""
+      },
+      "headers": {
+        "Set-Cookie": "_kjb_session"
+      },
+      "icon": "Kajabi.svg",
+      "website": "https://newkajabi.com"
+    },
     "Kampyle": {
       "cats": [
         10,
@@ -8983,6 +9009,7 @@
       "js": {
         "Squarespace": ""
       },
+      "html": "<!-- This is Squarespace\\. -->",
       "headers": {
         "X-ServedBy": "squarespace"
       },
diff --git a/src/drivers/webextension/_locales/ro/messages.json b/src/drivers/webextension/_locales/ro/messages.json
index f68eb6ab2..01060610f 100644
--- a/src/drivers/webextension/_locales/ro/messages.json
+++ b/src/drivers/webextension/_locales/ro/messages.json
@@ -10,7 +10,7 @@
 	"optionTracking":           { "message": "Trimite rapoarte anonime despre aplicațiile detectate către wappalyzer.com pentru cercetare" },
 	"nothingToDo":              { "message": "Nimic de făcut pe pagina curentă." },
 	"noAppsDetected":           { "message": "Nici o aplicație detectată." },
-  "categoryPin":              { "message": "Always show icon" },
+  "categoryPin":              { "message": "Afișează icon tot timpul" },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Forum de discuții" },
 	"categoryName3":            { "message": "Manager baze de date" },
diff --git a/src/icons/A-Frame.svg b/src/icons/A-Frame.svg
new file mode 100644
index 000000000..7ff8039aa
--- /dev/null
+++ b/src/icons/A-Frame.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1" viewBox="0 0 64 480"><g fill="#EE295F"><path d="M-192 240v240h480V0h-480v240zm312.7-1.5c32.6 97.9 59.3 178.3 59.3 178.8 0 .4-7.5.6-16.7.5l-16.8-.3-15.5-48.3-15.5-48.2-75 .2-74.9.3-15.6 48.2-15.5 48.3h-16.3c-12.7 0-16.3-.3-16-1.3.3-.6 27.2-81.2 59.9-179L21.5 60l19.9.2 19.9.3 59.4 178z"/><path d="M40.4 89.5c-.4 1.1-15.5 47.4-33.4 103l-32.7 101 66 .3c36.3.1 66.1.1 66.3-.1.2-.2-62.9-199.6-64.9-204.8-.3-1-.7-.8-1.3.6z"/></g></svg>
\ No newline at end of file
diff --git a/src/icons/AngularJS.svg b/src/icons/AngularJS.svg
new file mode 100644
index 000000000..db879ab4f
--- /dev/null
+++ b/src/icons/AngularJS.svg
@@ -0,0 +1,74 @@
+<?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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   width="335.88126"
+   height="355.80875"
+   xml:space="preserve"
+   sodipodi:docname="AngularJS-Shield.svg"
+   inkscape:export-filename="/usr/local/google/home/stephenfluin/AngularJS-Shield.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+     id="metadata8"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1393"
+     inkscape:window-height="697"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="0.25757162"
+     inkscape:cx="171.15375"
+     inkscape:cy="177.21499"
+     inkscape:window-x="2290"
+     inkscape:window-y="312"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><g
+     id="g10"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,-188.84625,636.71875)"><g
+       id="g12"
+       transform="scale(0.1,0.1)"><path
+         d="M 2850,5093.75 1510.77,4622.45 1722.39,2867.82 2851.42,2247.28 3986.27,2876.23 4197.82,4630.79 2850,5093.75 z"
+         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path14"
+         inkscape:connector-curvature="0" /><path
+         d="m 4064.25,4529.39 -1217.38,415.13 0,-2548.98 1020.22,564.62 197.16,1569.23 z"
+         style="fill:#af2b2d;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path16"
+         inkscape:connector-curvature="0" /><path
+         d="m 1661.05,4521.89 181.34,-1569.22 1004.47,-557.13 0,2549.03 -1185.81,-422.68 z"
+         style="fill:#df2e31;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path18"
+         inkscape:connector-curvature="0" /><path
+         d="m 3129.05,3676.7 -279.96,584.64 -246.46,-584.64 526.42,0 z m 106.74,-245.83 -742.11,0 -166.02,-415.26 -308.82,-5.71 828.04,1842.06 856.9,-1842.06 -286.23,0 -181.76,420.97 z"
+         style="fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path20"
+         inkscape:connector-curvature="0" /><path
+         d="m 2846.87,4851.96 2.21,-590.62 279.67,-585.09 -281.25,0 -0.63,-245 388.9,-0.38 181.77,-421.04 295.49,-5.48 -866.16,1847.61 z"
+         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path22"
+         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/Kajabi.svg b/src/icons/Kajabi.svg
new file mode 100644
index 000000000..dd6f7cd66
--- /dev/null
+++ b/src/icons/Kajabi.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg"><title>Kajabi</title><desc>Kajabi Logo</desc><g fill="#2E91FC" fill-rule="nonzero"><path d="M0 26v-26h26zM5.2 26l10.4-10.4 10.4 10.4z"/></g></svg>