diff --git a/src/apps.json b/src/apps.json
index c061eb03c..8394e25bf 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -3062,7 +3062,8 @@
         "24"
       ],
       "js": {
-        "FTB_": ""
+        "FTB_API": "",
+		"FTB_AddEvent": ""
       },
       "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:.|\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
       "icon": "FreeTextBox.png",
@@ -3129,18 +3130,22 @@
         "7"
       ],
       "js": {
-        "galleryAuthToken": ""
+        "galleryAuthToken": "",
+		"$.fn.gallery_valign": ""
       },
-      "html": "<div id=\"gsNavBar\" class=\"gcBorder1\">",
+      "html": [
+		"<div id=\"gsNavBar\" class=\"gcBorder1\">",
+		"Powered by <a href=\"[^\"]+\">([^<]+)</a>\\;version:\\1"
+		],
       "icon": "Gallery.png",
-      "website": "http://gallery.menalto.com"
+      "website": "http://galleryproject.org/"
     },
     "Gambio": {
       "cats": [
         "6"
       ],
       "js": {
-        "gm_session_id": ""
+        "gambio": ""
       },
       "html": "(?:<link[^>]* href=\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->|<!--[\\s=]+Shopsoftware by Gambio GmbH \\(c\\))",
       "icon": "Gambio.png",
@@ -3174,7 +3179,7 @@
         "Set-Cookie": "_gauges_[^;]+="
       },
       "icon": "Gauges.png",
-      "website": "http://get.gaug.es"
+      "website": "https://get.gaug.es"
     },
     "Gentoo": {
       "cats": [
@@ -3191,7 +3196,8 @@
         "47"
       ],
       "js": {
-        "gerrit_": ""
+		"gerrit_ui": "",
+        "Gerrit": ""
       },
       "html": [
         ">Gerrit Code Review</a>\\s*\"\\s*\\(([0-9.]+)\\)\\;version:\\1",
@@ -3216,7 +3222,7 @@
         "GSFN": ""
       },
       "icon": "Get Satisfaction.png",
-      "website": "http://getsatisfaction.com"
+      "website": "https://getsatisfaction.com/corp/"
     },
     "GetSimple CMS": {
       "cats": [
@@ -3288,7 +3294,7 @@
         "description": "^GitLab",
         "og:site_name": "^GitLab$"
       },
-      "website": "http://about.gitlab.com"
+      "website": "https://about.gitlab.com"
     },
     "GitLab CI": {
       "cats": [
@@ -3367,11 +3373,12 @@
         "10"
       ],
       "js": {
-        "_gostats": "",
-        "_go_track": ""
+        "_goStatsRun": "",
+        "_go_track_src": "",
+		"go_msie": ""
       },
       "icon": "GoStats.png",
-      "website": "http://gostats.com"
+      "website": "	
     },
     "Gogs": {
       "cats": [
@@ -3397,7 +3404,7 @@
       ],
       "js": {
         "google_ad_": "",
-        "__google_ad_": "",
+        "__google_ad_urls": "",
         "Goog_AdSense_": ""
       },
       "icon": "Google AdSense.svg",
@@ -3407,14 +3414,15 @@
         "2mdn\\.net",
         "ad\\.ca\\.doubleclick\\.net"
       ],
-      "website": "http://google.com/adsense"
+      "website": "https://www.google.fr/adsense/start/"
     },
     "Google Analytics": {
       "cats": [
         "10"
       ],
       "js": {
-        "gaGlobal": ""
+        "gaGlobal": "",
+		"GoogleAnalyticsObject": ""
       },
       "headers": {
         "Set-Cookie": "__utma"
@@ -3631,7 +3639,7 @@
         "10"
       ],
       "js": {
-        "GravityInsights": ""
+        "gravityInsightsParams": ""
       },
       "icon": "Gravity Insights.png",
       "website": "http://insights.gravity.com"
@@ -3766,18 +3774,21 @@
         "12"
       ],
       "js": {
-        "Hammer": ""
+        "Hammer": "",
+		"Hammer.VERSION": "(.*)\\;version:\\1",
+		"Ha.VERSION": "(.*)\\;version:\\1"		
       },
       "icon": "Hammer.js.png",
       "script": "hammer(?:\\.min)?\\.js",
-      "website": "http://hammerjs.github.io"
+      "website": "https://hammerjs.github.io"
     },
     "Handlebars": {
       "cats": [
         "12"
       ],
       "js": {
-        "Handlebars": ""
+        "Handlebars": "",
+		"Handlebars.VERSION": "(.*)\\;version:\\1"
       },
       "html": "<[^>]*type=[^>]text\\/x-handlebars-template",
       "icon": "Handlebars.png",
@@ -3817,7 +3828,7 @@
         "12"
       ],
       "js": {
-        "head": "\\;confidence:20"
+        "head.browser.name": ""
       },
       "html": "<[^>]*data-headjs-load",
       "icon": "HeadJS.png",
@@ -3861,12 +3872,13 @@
         "25"
       ],
       "js": {
-        "Highcharts": ""
+        "Highcharts": "",
+		"Highcharts.version": "(.*)\\;version:\\1"
       },
       "html": "<svg[^>]*><desc>Created with Highcharts ([\\d.]*)\\;version:\\1",
       "icon": "Highcharts.png",
       "script": "highcharts.*\\.js",
-      "website": "http://highcharts.com"
+      "website": "https://www.highcharts.com"
     },
     "Highlight.js": {
       "cats": [
@@ -3905,7 +3917,7 @@
         "hogan-(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "([\\d.]+)/hogan(?:\\.min)?\\.js\\;version:\\1"
       ],
-      "website": "http://twitter.github.com/hogan.js"
+      "website": "https://twitter.github.io/hogan.js/"
     },
     "Homeland": {
       "cats": [
@@ -3939,7 +3951,8 @@
       ],
       "js": {
         "HotLeadfactory": "",
-        "HotleadController": ""
+        "HotleadController": "",
+		"hj.apiUrlBase": ""
       },
       "icon": "Hotjar.png",
       "script": "^//static\\.hotjar\\.com/c/hotjar-",
@@ -3955,7 +3968,7 @@
       },
       "html": "<!-- Start of Async HubSpot",
       "icon": "HubSpot.png",
-      "website": "http://hubspot.com"
+      "website": "https://www.hubspot.com"
     },
     "Hugo": {
       "cats": [
@@ -4072,7 +4085,7 @@
       },
       "icon": "INFOnline.png",
       "script": "^https?://(?:[^/]+\\.)?i(?:oam|v)wbox\\.de/",
-      "website": "http://infonline.de"
+      "website": "https://www.infonline.de"
     },
     "IPB": {
       "cats": [
@@ -4090,18 +4103,19 @@
         "MySQL"
       ],
       "script": "jscripts/ips_",
-      "website": "http://www.invisionpower.com"
+      "website": "https://invisioncommunity.com/"
     },
     "Immutable.js": {
       "cats": [
         "12"
       ],
       "js": {
-        "Immutable": ""
+        "Immutable": "",
+		"Immutable.version": "(.*)\\;version:\\1"
       },
       "icon": "Immutable.js.png",
       "script": "^immutable\\.(?:min\\.)?js$",
-      "website": "http://facebook.github.io/immutable-js/"
+      "website": "https://facebook.github.io/immutable-js/"
     },
     "imperia CMS": {
       "cats": [
@@ -4203,10 +4217,11 @@
         "12"
       ],
       "js": {
-        "Inferno": ""
+        "Inferno": "",
+		"Inferno.version": "(.*)\\;version:\\1"
       },
       "icon": "InfernoJS.png",
-      "website": "https://infernojs.org/"
+      "website": "https://infernojs.org"
     },
     "Infusionsoft": {
       "cats": [
@@ -4261,7 +4276,7 @@
       },
       "icon": "Intercom.png",
       "script": "(?:api\\.intercom\\.io/api|static\\.intercomcdn\\.com/intercom\\.v1)",
-      "website": "http://intercom.io"
+      "website": "https://www.intercom.com"
     },
     "Intershop": {
       "cats": [
@@ -4412,11 +4427,12 @@
         "25"
       ],
       "js": {
-        "$jit": ""
+        "$jit": "",
+		"$jit.version": "(.*)\\;version:\\1"
       },
       "icon": "JavaScript Infovis Toolkit.png",
-      "script": "jit.*\\.js",
-      "website": "http://thejit.org"
+      "script": "jit(?:-yc)?\\.js",
+      "website": "https://philogb.github.io/jit/"
     },
     "JavaServer Faces": {
       "cats": [
@@ -4482,14 +4498,15 @@
         "1"
       ],
       "js": {
-        "jimdo_Data": ""
+        "jimdo_Data": "",
+		"jimdoData": ""
       },
       "headers": {
         "X-Jimdo-Instance": "",
         "X-Jimdo-Wid": ""
       },
       "icon": "jimdo.png",
-      "website": "http://www.jimdo.com/"
+      "website": "https://www.jimdo.com"
     },
     "Jirafe": {
       "cats": [
@@ -4501,7 +4518,7 @@
       },
       "icon": "Jirafe.png",
       "script": "/jirafe\\.js",
-      "website": "http://jirafe.com"
+      "website": "https://docs.jirafe.com"
     },
     "Jive": {
       "cats": [
@@ -4517,19 +4534,6 @@
       "icon": "Jive.png",
       "website": "http://www.jivesoftware.com"
     },
-    "Jo": {
-      "cats": [
-        "26",
-        "12"
-      ],
-      "js": {
-        "joCache": "",
-        "joDOM": "",
-        "joEvent": ""
-      },
-      "icon": "Jo.png",
-      "website": "http://joapp.com"
-    },
     "JobberBase": {
       "cats": [
         "19"
@@ -4542,7 +4546,7 @@
       "meta": {
         "generator": "Jobberbase"
       },
-      "website": "http://jobberbase.com"
+      "website": "http://www.jobberbase.com"
     },
     "Joomla": {
       "cats": [
@@ -4562,7 +4566,7 @@
         "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1"
       },
       "url": "option=com_",
-      "website": "http://joomla.org"
+      "website": "https://www.joomla.org"
     },
     "JSEcoin": {
       "cats": [
@@ -4585,7 +4589,7 @@
       "html": "<!--(?: JoomlaWorks \"K2\"| Start K2)",
       "icon": "K2.png",
       "implies": "Joomla",
-      "website": "http://getk2.org"
+      "website": "https://getk2.org"
     },
     "KISSmetrics": {
       "cats": [
@@ -4595,7 +4599,7 @@
         "KM_COOKIE_DOMAIN": ""
       },
       "icon": "KISSmetrics.png",
-      "website": "http://www.kissmetrics.com"
+      "website": "https://www.kissmetrics.com"
     },
     "KS_HTTP": {
       "cats": [
@@ -4614,7 +4618,9 @@
         "13"
       ],
       "js": {
-        "k_track": ""
+		"kampyle": "",
+		"k_track": "",
+        "KAMPYLE_COMMON": ""
       },
       "headers": {
         "Set-Cookie": "k_visit"
@@ -4635,7 +4641,7 @@
         "generator": "[CK]amva"
       },
       "script": "cdn\\.mykamva\\.ir",
-      "website": "http://kamva.ir"
+      "website": "https://kamva.ir"
     },
     "Hinza Advanced CMS": {
       "cats": [
@@ -4654,12 +4660,13 @@
         "18"
       ],
       "js": {
-        "kendo": ""
+        "kendo": "",
+		"kendo.version": "(.*)\\;version:\\1"
       },
       "html": "<link[^>]*\\s+href=[^>]*styles/kendo\\.common(?:\\.min)?\\.css[^>]*/>",
       "icon": "Kendo UI.png",
       "implies": "jQuery",
-      "website": "http://www.kendoui.com"
+      "website": "https://www.telerik.com/kendo-ui"
     },
     "Kentico CMS": {
       "cats": [
@@ -4715,11 +4722,12 @@
         "25"
       ],
       "js": {
-        "Kinetic": ""
+        "Kinetic": "",
+		"Kinetic.version": "(.*)\\;version:\\1"
       },
       "icon": "KineticJS.png",
       "script": "kinetic(?:-v?([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
-      "website": "http://kineticjs.com"
+      "website": "https://github.com/ericdrowell/KineticJS/"
     },
     "Klarna Checkout": {
       "cats": [
@@ -4731,14 +4739,15 @@
         "_klarnaCheckout": ""
       },
       "icon": "Klarna.svg",
-      "website": "http://klarna.com"
+      "website": "https://www.klarna.com/international/"
     },
     "Knockout.js": {
       "cats": [
         "12"
       ],
       "js": {
-        "ko": "\\;confidence:20"
+        "ko": "\\;confidence:20",
+		"ko.version": "(.*)\\;version:\\1"
       },
       "icon": "Knockout.js.png",
       "website": "http://knockoutjs.com"
@@ -4778,18 +4787,7 @@
         "kmPageInfo": "",
         "kmGetSession": ""
       },
-      "website": "http://www.kobimaster.com.tr/"
-    },
-    "Koego": {
-      "cats": [
-        "10"
-      ],
-      "js": {
-        "ego_domains": ""
-      },
-      "icon": "Koego.png",
-      "script": "tracking\\.koego\\.com/end/ego\\.js",
-      "website": "http://www.koego.com/en"
+      "website": "https://www.kobimaster.com.tr"
     },
     "Kohana": {
       "cats": [
@@ -4956,7 +4954,7 @@
         "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1"
       },
       "icon": "Liferay.png",
-      "website": "http://www.liferay.com"
+      "website": "https://www.liferay.com"
     },
     "Lift": {
       "cats": [
@@ -5054,7 +5052,7 @@
       },
       "icon": "List.js.png",
       "script": "^list\\.(?:min\\.)?js$",
-      "website": "http://www.listjs.com"
+      "website": "http://listjs.com"
     },
     "LiteSpeed": {
       "cats": [
@@ -5079,7 +5077,7 @@
       "html": " <a [^>]+Powered by Lithium",
       "icon": "Lithium.png",
       "implies": "PHP",
-      "website": "http://www.lithium.com"
+      "website": "https://www.lithium.com"
     },
     "LiveAgent": {
       "cats": [
@@ -5089,7 +5087,7 @@
         "LiveAgent": ""
       },
       "icon": "LiveAgent.png",
-      "website": "http://www.ladesk.com"
+      "website": "https://www.ladesk.com"
     },
     "LiveChat": {
       "cats": [
@@ -5120,7 +5118,7 @@
         "1"
       ],
       "js": {
-        "LIVESTREET": ""
+        "LIVESTREET_SECURITY_KEY": ""
       },
       "headers": {
         "X-Powered-By": "LiveStreet CMS"
@@ -5135,7 +5133,9 @@
       ],
       "js": {
         "fyre": "",
-        "FyreLoader": ""
+        "FyreLoader": "",
+		"LF.CommentCount": "",
+		"L.version": "(.*)\\;confidence:0\\;version:1"
       },
       "html": "<[^>]+(?:id|class)=\"livefyre",
       "icon": "Livefyre.png",
@@ -5283,6 +5283,7 @@
         "1"
       ],
       "js": {
+		"MODX": "",
         "MODX_MEDIA_PATH": ""
       },
       "headers": {
@@ -5338,7 +5339,7 @@
         "static/_requirejs\\;confidence:50\\;version:2",
         "static/frontend\\;confidence:20\\;version:2"
       ],
-      "website": "http://www.magentocommerce.com"
+      "website": "https://magento.com"
     },
     "MailChimp": {
       "cats": [
@@ -5391,7 +5392,8 @@
         "12"
       ],
       "js": {
-        "Marionette": ""
+        "Marionette": "",
+		"Marionette.VERSION": "(.*)\\;version:\\1"
       },
       "icon": "Marionette.js.svg",
       "implies": [
@@ -5399,7 +5401,7 @@
         "Backbone.js"
       ],
       "script": "backbone\\.marionette.*\\.js",
-      "website": "http://marionettejs.com"
+      "website": "https://marionettejs.com"
     },
     "Marketo": {
       "cats": [
@@ -5410,7 +5412,7 @@
       },
       "icon": "Marketo.png",
       "script": "munchkin\\.marketo\\.net/munchkin\\.js",
-      "website": "http://www.marketo.com"
+      "website": "https://www.marketo.com"
     },
     "Material Design Lite": {
       "cats": [
@@ -5436,11 +5438,12 @@
         "25"
       ],
       "js": {
-        "MathJax": ""
+        "MathJax": "",
+		"MathJax.version": "(.*)\\;version:\\1"
       },
       "icon": "MathJax.png",
       "script": "mathjax\\.js",
-      "website": "http://mathjax.org"
+      "website": "https://www.mathjax.org"
     },
     "Mattermost": {
       "cats": [
@@ -5458,7 +5461,7 @@
         "Go",
         "React"
       ],
-      "website": "http://about.mattermost.com"
+      "website": "https://about.mattermost.com"
     },
     "MaxCDN": {
       "cats": [
@@ -5502,10 +5505,11 @@
         "14"
       ],
       "js": {
-        "mejs": ""
+        "mejs": "",
+		"mejs.version": "(.*)\\;version:\\1"
       },
       "icon": "MediaElement.js.png",
-      "website": "http://mediaelementjs.com"
+      "website": "http://www.mediaelementjs.com"
     },
     "MediaTomb": {
       "cats": [
diff --git a/src/icons/Jo.png b/src/icons/Jo.png
deleted file mode 100644
index 477faf75b..000000000
Binary files a/src/icons/Jo.png and /dev/null differ
diff --git a/src/icons/Koego.png b/src/icons/Koego.png
deleted file mode 100644
index 72e498be8..000000000
Binary files a/src/icons/Koego.png and /dev/null differ