diff --git a/src/apps.json b/src/apps.json
index ac052dc09..24326e933 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -401,7 +401,7 @@
 			"headers": {
 				"X-Akamai-Transformed": ""
 			},
-			"icon": "Akamai.png",
+			"icon": "akamai.svg",
 			"website": "http://akamai.com"
 		},
 		"Akka HTTP": {
@@ -939,6 +939,14 @@
 			"script": "bittads\\.com/js/bitt\\.js$",
 			"website": "http://bittads.com"
 		},
+		"Bizweb":{
+			"cats": [
+				"6"
+			],
+			"env": "^Bizweb$",
+			"icon": "bizweb.png",
+			"website": "https://www.bizweb.vn"
+		},
 		"Blesta": {
 			"cats": [
 				"6"
@@ -5331,7 +5339,7 @@
 			"cats": [
 				"12"
 			],
-			"icon": "moon.png",
+			"icon": "moon.svg",
 			"script": "/moon(?:\\.min)?\\.js$",
 			"website": "http://moonjs.ga/"
 		},
@@ -5585,6 +5593,24 @@
 			"icon": "New Relic.png",
 			"website": "http://newrelic.com"
 		},
+		"Next.js": {
+			"cats": [
+				"18",
+				"22"
+			],
+			"headers": {
+				"x-powered-by": "^Next.js ?([0-9.]+)?\\;version:\\1"
+			},
+			"html": "<[^>]+__next",
+      "env": "^__NEXT_DATA__$",
+      "icon": "zeit.svg",
+			"implies": [
+				"React",
+				"webpack",
+				"Node.js"
+			],
+			"website": "https://zeit.co/next"
+		},
 		"Nginx": {
 			"cats": [
 				"22"
@@ -5614,6 +5640,16 @@
 			"script": "^/nodebb\\.min\\.js\\?",
 			"website": "https://nodebb.org"
 		},
+		"Now": {
+			"cats": [
+				"22"
+			],
+			"headers": {
+				"server": "now"
+			},
+			"icon": "zeit.svg",
+			"website": "https://zeit.co/now"
+		},
 		"OWL Carousel": {
 			"cats": [
 				"5"
@@ -8430,6 +8466,10 @@
 			],
 			"icon": "typecho.svg",
 			"implies": "PHP",
+			"env": "^TypechoComment$",
+			"meta": {
+				"generator": "Typecho( [\\d.]+)?\\;version:\\1"
+      },
 			"url": "/admin/login\\.php?referer=http%3A%2F%2F",
 			"website": "http://typecho.org/"
 		},
@@ -8521,7 +8561,7 @@
 		},
 		"UMI.CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Generated-By": "UMI.CMS"
diff --git a/src/icons/Akamai.png b/src/icons/Akamai.png
deleted file mode 100644
index fa2be98a2..000000000
Binary files a/src/icons/Akamai.png and /dev/null differ
diff --git a/src/icons/RockRMS.svg b/src/icons/RockRMS.svg
index 6b352f6ca..b66f8e881 100644
--- a/src/icons/RockRMS.svg
+++ b/src/icons/RockRMS.svg
@@ -1 +1,4 @@
-<svg width="59" height="61" viewBox="0 0 59 61" xmlns="http://www.w3.org/2000/svg"><title>rock-logo</title><path d="M57.705 60.063L41.387 40.936s11.83-.026 11.928-.028a5.456 5.456 0 0 0 3.736-1.259 5.504 5.504 0 0 0 .693-7.752L32.396 2.151a5.562 5.562 0 0 0-.836-.891c-.039-.029-.084-.051-.121-.082-.012-.01-.027-.018-.039-.025a5.887 5.887 0 0 0-.867-.563c-.018-.009-.039-.014-.059-.021a5.377 5.377 0 0 0-.922-.366c-.057-.013-.119-.025-.178-.039-.277-.063-.557-.129-.84-.15-.172-.021-.346-.008-.516-.008-.172 0-.34-.014-.514.008-.281.021-.559.087-.84.15l-.174.039a5.18 5.18 0 0 0-.924.366c-.021.009-.039.014-.057.021a5.204 5.204 0 0 0-.869.563c-.018.009-.025.017-.037.025-.039.031-.084.053-.123.082-.32.271-.594.57-.84.885L0 29.86h14.461l13.557-15.891 13.604 15.967-12.104.008c-.045 0-.088.013-.133.017-.287 0-.578.026-.865.071a7.39 7.39 0 0 0-.244.054 5 5 0 0 0-.775.229 2 2 0 0 0-.266.117 4.44 4.44 0 0 0-.957.549c-.117.081-.238.143-.346.229-.076.067-.137.147-.211.221a4.613 4.613 0 0 0-.258.264 5.523 5.523 0 0 0-.453.531c-.068.105-.131.205-.195.308a5.154 5.154 0 0 0-.332.601c-.059.126-.107.255-.156.384-.072.199-.145.398-.191.605a4.218 4.218 0 0 0-.084.451 5.182 5.182 0 0 0-.07.606c-.006.074-.023.137-.023.209 0 .101.023.189.027.294.012.188.023.368.051.557a5.735 5.735 0 0 0 .246 1.012c.072.199.154.397.248.588.061.119.119.234.188.35.123.215.26.414.408.605.045.057.068.115.115.168l18.004 21.104h14.459v-.005z" fill="#EE7624" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400"><style type="text/css">  
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#ED7726;}
+</style><circle class="st0" cx="203" cy="208.1" r="184.8"/><path class="st1" d="M200 0C89.5 0 0 89.5 0 200s89.5 200 200 200 200-89.5 200-200S310.5 0 200 0zM327 338.3h-72.6l-90.3-105.9c-0.2-0.3-0.4-0.6-0.6-0.8 -0.7-1-1.4-2-2-3 -0.3-0.6-0.6-1.2-0.9-1.8 -0.5-0.9-0.9-2-1.2-2.9 -0.3-0.8-0.5-1.5-0.7-2.3 -0.2-0.9-0.4-1.8-0.6-2.8 -0.1-0.9-0.2-1.9-0.3-2.8 0-0.5-0.1-1-0.1-1.5 0-0.4 0.1-0.7 0.1-1.1 0.1-1 0.2-2 0.4-3 0.1-0.8 0.2-1.5 0.4-2.3 0.2-1 0.6-2 1-3 0.2-0.6 0.5-1.3 0.8-1.9 0.5-1 1-2 1.7-3 0.3-0.5 0.6-1 1-1.5 0.7-0.9 1.4-1.8 2.3-2.7 0.4-0.5 0.9-0.9 1.3-1.3 0.4-0.4 0.7-0.8 1.1-1.1 0.5-0.4 1.1-0.7 1.7-1.1 0.5-0.3 1-0.7 1.4-1 1.1-0.7 2.2-1.3 3.4-1.8 0.4-0.2 0.9-0.4 1.3-0.6 1.3-0.5 2.6-0.9 3.9-1.1 0.4-0.1 0.8-0.2 1.2-0.3 1.4-0.2 2.9-0.4 4.3-0.4 0.2 0 0.4-0.1 0.7-0.1l60.7 0L178 107.1l-68 79.7H37.5l118.6-139c1.2-1.6 2.6-3.1 4.2-4.4 0.2-0.1 0.4-0.3 0.6-0.4 0.1-0.1 0.1-0.1 0.2-0.1 1.4-1.1 2.8-2 4.4-2.8 0.1 0 0.2-0.1 0.3-0.1 1.5-0.8 3-1.4 4.6-1.8 0.3-0.1 0.6-0.1 0.9-0.2 1.4-0.3 2.8-0.6 4.2-0.8 0.9-0.1 1.7 0 2.6 0 0.9 0 1.7-0.1 2.6 0 1.4 0.1 2.8 0.4 4.2 0.8 0.3 0.1 0.6 0.1 0.9 0.2 1.6 0.5 3.1 1.1 4.6 1.8 0.1 0 0.2 0.1 0.3 0.1 1.5 0.8 2.9 1.7 4.4 2.8 0.1 0 0.1 0.1 0.2 0.1 0.2 0.2 0.4 0.3 0.6 0.4 1.6 1.4 3 2.9 4.2 4.5L327.2 197c9.8 11.7 8.2 29.1-3.5 38.9 -5.4 4.6-12.2 6.6-18.7 6.3 -0.5 0-59.8 0.1-59.8 0.1L327 338.3z"/></svg>
diff --git a/src/icons/akamai.svg b/src/icons/akamai.svg
new file mode 100644
index 000000000..ab4168ba7
--- /dev/null
+++ b/src/icons/akamai.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><g fill="#008cdb"><path d="M273.971 437.617c-78.241-23.9-135.099-96.163-135.099-181.622 0-86.376 58.091-159.287 137.634-182.373 8.13-2.355 5.994-7.622-3.799-7.622C166.942 66 81.22 151.063 81.22 255.995 81.22 360.937 166.942 446 272.708 446c9.797 0 10.192-5.652 1.263-8.383z"/><path d="M175.135 300.485c-5.643-54.204 20.877-162.662 150.07-166.31 78.744-2.224 102.435 35.2 105.355 32.898 3.214-2.531-28.582-72.253-121.088-72.253-83.323 0-150.859 67.547-150.859 150.869 0 19.243 3.613 37.629 10.192 54.551 2.77 7.112 7.042 7.136 6.33.245z"/><path d="M238.342 191.77c39.194-17.083 88.473-17.561 136.878-.668 32.503 11.348 51.371 27.538 52.902 26.895 2.565-1.111-18.921-35.132-57.686-49.83-46.943-17.814-97.543-8.495-134.376 20.385-4.073 3.178-2.527 5.319 2.282 3.218z"/></g></svg>
\ No newline at end of file
diff --git a/src/icons/bizweb.png b/src/icons/bizweb.png
new file mode 100644
index 000000000..fbe062bb2
Binary files /dev/null and b/src/icons/bizweb.png differ
diff --git a/src/icons/moon.png b/src/icons/moon.png
deleted file mode 100644
index eb8ff3afd..000000000
Binary files a/src/icons/moon.png and /dev/null differ
diff --git a/src/icons/moon.svg b/src/icons/moon.svg
new file mode 100644
index 000000000..1a7e75325
--- /dev/null
+++ b/src/icons/moon.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="145.61mm" height="168.42mm" version="1.1" viewBox="0 0 550.32981 636.55663" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink"><metadata><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>Moon Logo</dc:title></cc:Work></rdf:RDF></metadata><title>Moon Logo</title><g transform="matrix(1.1168 0 0 1.0609 -223.35 -212.19)"><g transform="translate(-3102,-6459)"><clipPath id="f" clip-rule="evenodd"><path d="m3102 6459h1e3v1e3h-1e3z" fill="#fff"/></clipPath><g clip-path="url(#f)"><use transform="translate(3302,6659)" width="100%" height="100%" fill="url(#d)" xlink:href="#e"/></g></g></g><defs><linearGradient id="d" x2="1" gradientTransform="matrix(348 600 -195.66 352.44 97.83 -176.22)" gradientUnits="userSpaceOnUse"><stop stop-color="#007EFF" offset="0"/><stop stop-color="#B22BFF" offset=".97238"/></linearGradient><path id="e" d="m491.47 530.96c6.198-5.145 3.529-15.01-4.221-17.208-125.37-35.561-217.25-151.37-217.25-288.75 0-79.162 30.508-151.16 80.353-204.78 5.473-5.886 2.646-15.667-5.301-16.864-14.695-2.2131-29.74-3.3603-45.052-3.3603-165.69 0-300 134.31-300 300s134.31 300 300 300c72.788 0 139.52-25.923 191.47-69.039z" fill-rule="evenodd"/></defs></svg>
diff --git a/src/icons/zeit.svg b/src/icons/zeit.svg
new file mode 100644
index 000000000..8ce0bfb63
--- /dev/null
+++ b/src/icons/zeit.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><title>Zeit</title><desc>Created with Sketch.</desc><defs><linearGradient x1="100.686%" y1="181.283%" x2="41.808%" y2="100%" id="a"><stop stop-color="#fff" offset="0%"/><stop offset="100%"/></linearGradient></defs><path d="M15.766 3l14.766 26.134h-29.531z" fill-rule="nonzero" fill="url(#a)"/></svg>
\ No newline at end of file