diff --git a/src/apps.json b/src/apps.json
index 085251734..8a692aa2e 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -254,12 +254,14 @@
 		"Adnegah": {
 			"cats": [
 				"36"
-			],
-			"env": "^ados(?:Results)?$",
+			],  
+			"headers": {
+				"X-Advertising-By": "adnegah.net"
+			},
 			"html": "<iframe [^>]*src=\"[^\"]+adnegah\\.net",
 			"icon": "adnegah.png",
-			"script": "[^a-z]adnegah.*\\.js",
-			"website": "http://Adnegah.net"
+			"script": "[^a-z]adnegah.*\\.js$", 
+			"website": "https://Adnegah.net"
 		},
 		"Adobe ColdFusion": {
 			"cats": [
@@ -3646,6 +3648,17 @@
 			"script": "^immutable\\.(?:min\\.)?js$",
 			"website": "http://facebook.github.io/immutable-js/"
 		},
+		"imperia CMS": {
+			"cats": "1",
+			"meta": {
+			  "X-Imperia-Live-Info": "",
+			  "GENERATOR": "^IMPERIA ([0-9.]{2,})+$\\;version:\\1"
+			},
+			"icon": "imperiaCMS.svg",
+			"implies": "Perl",
+		  	"url": "imperia/md/",
+			"website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/imperia-cms"
+		},
 		"ImpressCMS": {
 			"cats": [
 				"1"
@@ -6165,6 +6178,13 @@
 			"script": "//assets\\.pinterest\\.com/js/pinit\\.js",
 			"website": "http://pinterest.com"
 		},
+	    "pirobase CMS": {
+			"cats": "1",
+			"html": "<[^<]+=\"[^\"]*site/[a-z0-9/._-]*/resourceCached/[a-z0-9/._-]*\"[^>]*>|[^<]+cbi:///cms/[^>]+",
+			"icon": "pirobaseCMS.svg",
+			"implies": "Java",
+			"website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/pirobase-cms"
+		},
 		"Piwik": {
 			"cats": [
 				"10"
@@ -6417,7 +6437,7 @@
 			],
 			"headers": {
 				"Set-Cookie": "PUBLICCMS_USER",
-				"X-Powered-PublicCMS": ""
+				"X-Powered-PublicCMS": "(.*)\\;version:\\1"
 			},
 			"icon": "Public CMS.png",
 			"implies": "Java",
@@ -8312,8 +8332,9 @@
 				"18"
 			],
 			"icon": "UIKit.png",
+			"html": "<[^>]+class=\"[^\"]*(?:uk-container|uk-section)",
 			"script": "uikit.*\\.js",
-			"website": "http://getuikit.com"
+			"website": "https://getuikit.com"
 		},
 		"UNIX": {
 			"cats": [
@@ -9711,7 +9732,7 @@
 			"cats": [
 				"6"
 			],
-			"env": "^JetshopData$", 
+			"env": "^JetshopData$",
 			"html":	"<(?:div|aside) id=\"jetshop-branding\">",
 			"icon": "Jetshop.png",
 			"website": "http://jetshop.se"
diff --git a/src/icons/imperiaCMS.svg b/src/icons/imperiaCMS.svg
new file mode 100644
index 000000000..e6e5d558b
--- /dev/null
+++ b/src/icons/imperiaCMS.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="258px" height="258px" viewBox="0 0 258 258" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Rectangle-11" fill="#00B74F" x="-23" y="-17" width="307" height="306"></rect>
+        <path d="M66.181,129.179 C66.181,94.536 88.786,65.189 120.044,55.038 L110.403,25.366 C66.64,39.575 35,80.678 35,129.179 C35,177.68 66.64,218.783 110.403,232.993 L120.044,203.32 C88.786,193.17 66.181,163.821 66.181,129.179" id="Fill-13" fill="#FFFFFF"></path>
+        <path d="M181.967,101.692 C187.583,109.409 190.905,118.904 190.905,129.179 C190.905,155.011 169.966,175.951 144.133,175.951 C139.087,175.951 134.233,175.142 129.68,173.664 L120.039,203.336 C127.626,205.8 135.724,207.132 144.133,207.132 C187.188,207.132 222.086,172.231 222.086,129.179 C222.086,112.053 216.55,96.229 207.189,83.367 L181.967,101.692" id="Fill-14" fill="#FFFFFF"></path>
+        <path d="M128.544,129.179 L128.544,129.179 C128.544,120.569 135.523,113.589 144.134,113.589 C149.319,113.589 153.9,116.13 156.734,120.025 L181.967,101.692 C173.464,90.009 159.69,82.408 144.133,82.408 C118.303,82.408 97.362,103.347 97.362,129.179 L128.544,129.179" id="Fill-15" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/src/icons/pirobaseCMS.svg b/src/icons/pirobaseCMS.svg
new file mode 100644
index 000000000..57f1779c7
--- /dev/null
+++ b/src/icons/pirobaseCMS.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="258px" height="258px" viewBox="0 0 258 258" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Rectangle-11" fill="#4B9FE2" x="-23" y="-17" width="307" height="306"></rect>
+        <path d="M66.181,129.179 C66.181,94.536 88.786,65.189 120.044,55.038 L110.403,25.366 C66.64,39.575 35,80.678 35,129.179 C35,177.68 66.64,218.783 110.403,232.993 L120.044,203.32 C88.786,193.17 66.181,163.821 66.181,129.179" id="Fill-13" fill="#FFFFFF"></path>
+        <path d="M181.967,101.692 C187.583,109.409 190.905,118.904 190.905,129.179 C190.905,155.011 169.966,175.951 144.133,175.951 C139.087,175.951 134.233,175.142 129.68,173.664 L120.039,203.336 C127.626,205.8 135.724,207.132 144.133,207.132 C187.188,207.132 222.086,172.231 222.086,129.179 C222.086,112.053 216.55,96.229 207.189,83.367 L181.967,101.692" id="Fill-14" fill="#FFFFFF"></path>
+        <path d="M128.544,129.179 L128.544,129.179 C128.544,120.569 135.523,113.589 144.134,113.589 C149.319,113.589 153.9,116.13 156.734,120.025 L181.967,101.692 C173.464,90.009 159.69,82.408 144.133,82.408 C118.303,82.408 97.362,103.347 97.362,129.179 L128.544,129.179" id="Fill-15" fill="#FFFFFF"></path>
+    </g>
+</svg>