diff --git a/applicationFeed-lastUpdated.json b/applicationFeed-lastUpdated.json
index 256fd100a..f9c16f3ea 100755
--- a/applicationFeed-lastUpdated.json
+++ b/applicationFeed-lastUpdated.json
@@ -1,3 +1,3 @@
 {
-	"last_updated_timestamp": 1636099405
+	"last_updated_timestamp": 1636106597
 }
\ No newline at end of file
diff --git a/applicationFeed-raw.json b/applicationFeed-raw.json
index 863ef2289..c2a81458c 100755
--- a/applicationFeed-raw.json
+++ b/applicationFeed-raw.json
@@ -2898,11 +2898,10 @@
 			"Productivity",
 			"Tools-Utilities"
 		],
-		"downloads": 75087,
+		"downloads": 77942,
 		"stars": 4,
-		"trending": 3.6,
+		"trending": 3.663,
 		"trends": [
-			6.42,
 			3.975,
 			2.649,
 			2.698,
@@ -2914,10 +2913,10 @@
 			3.481,
 			3.299,
 			3.059,
-			3.6
+			3.6,
+			3.663
 		],
 		"trendsDate": [
-			1602324493,
 			1604920121,
 			1607519295,
 			1610118602,
@@ -2929,10 +2928,10 @@
 			1625709789,
 			1628308996,
 			1630908225,
-			1633507422
+			1633507422,
+			1636106594
 		],
 		"downloadtrend": [
-			48488,
 			50495,
 			51869,
 			53307,
@@ -2944,11 +2943,12 @@
 			67855,
 			70170,
 			72384,
-			75087
+			75087,
+			77942
 		],
-		"LastUpdateScan": 1633507422,
+		"LastUpdateScan": 1636106594,
 		"FirstSeen": 1,
-		"topTrending": -2.82
+		"topTrending": -0.3120000000000003
 	},
 	{
 		"TemplateURL": "https://raw.githubusercontent.com/binhex/docker-templates/master/binhex/jackett.xml",
@@ -3381,11 +3381,10 @@
 			"Productivity",
 			"Tools-Utilities"
 		],
-		"downloads": 23336718,
+		"downloads": 24144214,
 		"stars": 17,
-		"trending": 3.661,
+		"trending": 3.344,
 		"trends": [
-			4.703,
 			4.264,
 			2.581,
 			2.315,
@@ -3397,10 +3396,10 @@
 			3.416,
 			3.451,
 			3.5,
-			3.661
+			3.661,
+			3.344
 		],
 		"trendsDate": [
-			1602324493,
 			1604920122,
 			1607519295,
 			1610118602,
@@ -3412,10 +3411,10 @@
 			1625709789,
 			1628308996,
 			1630908225,
-			1633507422
+			1633507422,
+			1636106594
 		],
 		"downloadtrend": [
-			15384971,
 			16070174,
 			16495961,
 			16886885,
@@ -3427,12 +3426,13 @@
 			20946719,
 			21695385,
 			22482315,
-			23336718
+			23336718,
+			24144214
 		],
-		"LastUpdateScan": 1633507422,
+		"LastUpdateScan": 1636106594,
 		"FirstSeen": 1,
-		"topTrending": -1.0420000000000003,
-		"topPerforming": 3.661
+		"topTrending": -0.9200000000000004,
+		"topPerforming": 3.344
 	},
 	{
 		"TemplateURL": "https://raw.githubusercontent.com/binhex/docker-templates/master/binhex/libreoffice.xml",
@@ -9255,7 +9255,7 @@
 		"CategoryList": [
 			"Downloaders"
 		],
-		"LastUpdateScan": 1633507423,
+		"LastUpdateScan": 1636106595,
 		"FirstSeen": 1
 	},
 	{
@@ -10775,10 +10775,9 @@
 		"CategoryList": [
 			"Tools-Utilities"
 		],
-		"downloads": 45140,
-		"trending": 0.716,
+		"downloads": 45475,
+		"trending": 0.737,
 		"trends": [
-			0.631,
 			0.487,
 			0.508,
 			0.564,
@@ -10790,10 +10789,10 @@
 			0.595,
 			0.701,
 			0.701,
-			0.716
+			0.716,
+			0.737
 		],
 		"trendsDate": [
-			1602324494,
 			1604920122,
 			1607519295,
 			1610118603,
@@ -10805,10 +10804,10 @@
 			1625709790,
 			1628308997,
 			1630908225,
-			1633507423
+			1633507423,
+			1636106595
 		],
 		"downloadtrend": [
-			40703,
 			40902,
 			41111,
 			41344,
@@ -10820,11 +10819,12 @@
 			44191,
 			44503,
 			44817,
-			45140
+			45140,
+			45475
 		],
-		"LastUpdateScan": 1633507423,
+		"LastUpdateScan": 1636106595,
 		"FirstSeen": 1440734400,
-		"topTrending": 0.08499999999999996
+		"topTrending": 0.25
 	},
 	{
 		"Name": "Dolphin",
@@ -11497,11 +11497,10 @@
 		"CategoryList": [
 			"Other"
 		],
-		"downloads": 250914,
+		"downloads": 252060,
 		"stars": 1,
-		"trending": 0.479,
+		"trending": 0.455,
 		"trends": [
-			1.741,
 			1.402,
 			0.764,
 			0.846,
@@ -11513,10 +11512,10 @@
 			0.604,
 			0.542,
 			0.523,
-			0.479
+			0.479,
+			0.455
 		],
 		"trendsDate": [
-			1602324494,
 			1604920122,
 			1607519295,
 			1610118603,
@@ -11528,10 +11527,10 @@
 			1625709790,
 			1628308997,
 			1630908226,
-			1633507423
+			1633507423,
+			1636106595
 		],
 		"downloadtrend": [
-			227983,
 			231224,
 			233005,
 			234992,
@@ -11543,12 +11542,13 @@
 			247060,
 			248407,
 			249712,
-			250914
+			250914,
+			252060
 		],
-		"LastUpdateScan": 1633507423,
+		"LastUpdateScan": 1636106595,
 		"FirstSeen": 1,
-		"topTrending": -1.262,
-		"topPerforming": 0.479
+		"topTrending": -0.9469999999999998,
+		"topPerforming": 0.455
 	},
 	{
 		"Name": "RDP-Calibre",
@@ -17635,7 +17635,7 @@
 			"attributes construct error",
 			"Couldn't find end of Start Tag path line 115"
 		],
-		"LastUpdateScan": 1633507426,
+		"LastUpdateScan": 1636106595,
 		"FirstSeen": null
 	},
 	{
@@ -31767,31 +31767,34 @@
 		"CategoryList": [
 			"Network-Other"
 		],
-		"downloads": 251375,
+		"downloads": 251916,
 		"stars": 15,
-		"trending": 0.21,
+		"trending": 0.215,
 		"trends": [
 			0.222,
 			0.183,
 			0.208,
-			0.21
+			0.21,
+			0.215
 		],
 		"trendsDate": [
 			1625709792,
 			1628308999,
 			1630908227,
-			1633507424
+			1633507424,
+			1636106596
 		],
 		"downloadtrend": [
 			249314,
 			249868,
 			250326,
 			250847,
-			251375
+			251375,
+			251916
 		],
-		"LastUpdateScan": 1633507424,
+		"LastUpdateScan": 1636106596,
 		"FirstSeen": 1447131600,
-		"topTrending": -0.01200000000000001
+		"topTrending": -0.007000000000000006
 	},
 	{
 		"Name": "pipework-1.1.5",
@@ -41057,7 +41060,7 @@
 			"Network-Management",
 			"Tools-Utilities"
 		],
-		"LastUpdateScan": 1633507425,
+		"LastUpdateScan": 1636106596,
 		"FirstSeen": 1472788800
 	},
 	{
@@ -43018,11 +43021,10 @@
 			"Backup",
 			"Tools-Utilities"
 		],
-		"downloads": 1693572,
+		"downloads": 1693744,
 		"stars": 22,
-		"trending": 0.008,
+		"trending": 0.01,
 		"trends": [
-			0.446,
 			0.406,
 			0.325,
 			0.224,
@@ -43034,10 +43036,10 @@
 			0.009,
 			0.01,
 			0.007,
-			0.008
+			0.008,
+			0.01
 		],
 		"trendsDate": [
-			1602324495,
 			1604920124,
 			1607519297,
 			1610118604,
@@ -43049,10 +43051,10 @@
 			1625709793,
 			1628309000,
 			1630908227,
-			1633507426
+			1633507426,
+			1636106596
 		],
 		"downloadtrend": [
-			1675755,
 			1682578,
 			1688057,
 			1691855,
@@ -43064,12 +43066,13 @@
 			1693153,
 			1693314,
 			1693438,
-			1693572
+			1693572,
+			1693744
 		],
-		"LastUpdateScan": 1633507426,
+		"LastUpdateScan": 1636106596,
 		"FirstSeen": 1,
-		"topTrending": -0.438,
-		"topPerforming": 0.008
+		"topTrending": -0.396,
+		"topPerforming": 0.01
 	},
 	{
 		"Privileged": "false",
@@ -50643,11 +50646,10 @@
 		"CategoryList": [
 			"MediaApp-Video"
 		],
-		"downloads": 389911,
+		"downloads": 396797,
 		"stars": 4,
-		"trending": 1.659,
+		"trending": 1.735,
 		"trends": [
-			2.618,
 			1.3,
 			1.036,
 			0.796,
@@ -50659,10 +50661,10 @@
 			1.959,
 			1.519,
 			1.734,
-			1.659
+			1.659,
+			1.735
 		],
 		"trendsDate": [
-			1602324496,
 			1604920124,
 			1607519297,
 			1610118604,
@@ -50674,10 +50676,10 @@
 			1625709793,
 			1628309000,
 			1630908227,
-			1633507426
+			1633507426,
+			1636106597
 		],
 		"downloadtrend": [
-			311852,
 			315961,
 			319269,
 			321832,
@@ -50689,12 +50691,13 @@
 			371067,
 			376792,
 			383442,
-			389911
+			389911,
+			396797
 		],
-		"LastUpdateScan": 1633507426,
+		"LastUpdateScan": 1636106597,
 		"FirstSeen": 1537243200,
-		"topTrending": -0.9589999999999999,
-		"topPerforming": 1.659
+		"topTrending": 0.43500000000000005,
+		"topPerforming": 1.735
 	},
 	{
 		"Name": "MKVToolNix",
@@ -58288,28 +58291,24 @@
 		"FirstSeen": 1636099404
 	},
 	{
-		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/Portainer.xml",
-		"Date": 1525579200,
+		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PortainerCE.xml",
+		"Date": 1636084800,
 		"Name": "Portainer",
 		"Project": "https://portainer.io",
-		"Overview": "\n    Portainer is a simple management solution for Docker. It consists of a web UI that allows you to easily manage your Docker containers, images, networks and volumes.\n  ",
-		"Registry": "https://registry.hub.docker.com/r/portainer/portainer/",
+		"Overview": "\n    Portainer hides the complexity of managing containers behind an easy-to-use UI.[br]\n    By removing the need to use the CLI, write YAML or understand manifests, Portainer makes deploying apps and troubleshooting problems so easy that anyone can do it.\n    [br][br]\n\n    [b][u][span style='color: #E80000;']Configuration[/span][/u][/b][br]\n    [b]/mnt/user/appdata/portainer[/b] This is where Portainer will store it's data.[br]\n    [b]/var/run/docker.sockr[/b] Portainer uses this to get Docker information from unRAID host.[br]\n    [b]Port 8000[/b] TCP tunnel server[br]\n    [b]Port 9443[/b] Secure (HTTPS) WebUI port, default uses self-signed certificate[br]\n  ",
+		"Registry": "https://registry.hub.docker.com/r/portainer/portainer-ce/",
 		"GitHub": "https://github.com/portainer/portainer",
-		"Repository": "portainer/portainer",
+		"Repository": "registry.hub.docker.com/portainer/portainer-ce",
 		"Support": "https://lime-technology.com/forums/topic/69491-support-jj9987-portainer/",
-		"BindTime": "true",
+		"WebUI": "https://[IP]:[PORT:9443]/",
+		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/Portainer-logo.png",
 		"Privileged": "false",
-		"Networking": {
-			"Mode": "bridge"
-		},
 		"Network": {
 			"@attributes": {
 				"Default": "bridge"
 			},
 			"value": "bridge"
 		},
-		"WebUI": "http://[IP]:[PORT:9000]/",
-		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/Portainer-logo.png",
 		"Config": [
 			{
 				"@attributes": {
@@ -58318,11 +58317,11 @@
 					"Target": "/data",
 					"Default": "/mnt/user/appdata/portainer",
 					"Mode": "rw",
-					"Display": "advanced-hide",
+					"Display": "always",
 					"Required": "true",
-					"Description": "This is where Portainer will store it's configuration."
+					"Description": "Portainer configuration location"
 				},
-				"value": "/mnt/user/appdata/portainer"
+				"value": ""
 			},
 			{
 				"@attributes": {
@@ -58331,77 +58330,48 @@
 					"Target": "/var/run/docker.sock",
 					"Default": "/var/run/docker.sock",
 					"Mode": "rw",
-					"Display": "advanced-hide",
+					"Display": "always",
 					"Required": "true",
-					"Description": "This is needed for Portainer to connect to Docker."
+					"Description": "Portainer connection to Docker Unix socket"
 				},
-				"value": "/var/run/docker.sock"
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Type": "Port",
+					"Name": "TCP tunnel server",
+					"Target": "8000",
+					"Default": "8000",
+					"Mode": "tcp",
+					"Display": "always",
+					"Required": "true",
+					"Description": "TCP tunnel server"
+				},
+				"value": ""
 			},
 			{
 				"@attributes": {
 					"Type": "Port",
 					"Name": "Web Interface Port",
-					"Target": "9000",
-					"Default": "9000",
+					"Target": "9443",
+					"Default": "9443",
 					"Mode": "tcp",
-					"Display": "always-hide",
+					"Display": "always",
 					"Required": "true",
-					"Description": "This is Portainer WebUI port."
+					"Description": "HTTPS WebUI port"
 				},
-				"value": "9000"
+				"value": ""
 			}
 		],
 		"Repo": "jj9987's Repository",
-		"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/Portainer.xml",
+		"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/PortainerCE.xml",
 		"CategoryList": [
 			"Network-Management",
 			"Productivity",
 			"Tools-Utilities"
 		],
-		"downloads": 2542543674,
-		"stars": 2136,
-		"trending": 1.281,
-		"trends": [
-			2.104,
-			2.334,
-			2.331,
-			1.763,
-			1.564,
-			1.469,
-			1.321,
-			1.284,
-			1.286,
-			1.281
-		],
-		"trendsDate": [
-			1612207038,
-			1614805360,
-			1617400966,
-			1620000163,
-			1622599399,
-			1625241797,
-			1627841001,
-			1630440243,
-			1633039427,
-			1635638601
-		],
-		"downloadtrend": [
-			2147483647,
-			2193634690,
-			2246047723,
-			2299644863,
-			2340922080,
-			2378116577,
-			2413573585,
-			2445876089,
-			2477693903,
-			2509969562,
-			2542543674
-		],
-		"LastUpdateScan": 1635638601,
-		"FirstSeen": 1525579200,
-		"topTrending": -0.8230000000000002,
-		"topPerforming": 1.281
+		"LastUpdateScan": 1636106597,
+		"FirstSeen": 1636106597
 	},
 	{
 		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PostgreSQL10.xml",
@@ -73355,7 +73325,7 @@
 		"errors": [
 			"Not an unRaid Application (no Repository or PluginURL entry)"
 		],
-		"LastUpdateScan": 1633507426,
+		"LastUpdateScan": 1636106595,
 		"FirstSeen": null
 	},
 	{
@@ -109313,7 +109283,7 @@
 			"Opening and ending tag mismatch: Container line 2 and Overview",
 			"Extra content at the end of the document"
 		],
-		"LastUpdateScan": 1633507426,
+		"LastUpdateScan": 1636106595,
 		"FirstSeen": null
 	},
 	{
@@ -172166,15 +172136,15 @@
 		"Author": "Bergware, Niellles, ZekerPixels",
 		"Name": "Nederlands taalpakket",
 		"TemplateURL": "https://raw.githubusercontent.com/unraid/language-templates/master/limetech/lang-nl_NL.xml",
-		"Version": "2021.09.19",
+		"Version": "2021.11.05",
 		"Icon": "https://raw.githubusercontent.com/unraid/language-templates/master/limetech/Green-Earth-Transparent-File.png",
 		"Support": "https://forums.unraid.net/forum/80-dutch-nederlands/",
 		"Description": "Dit is een Nederlandse vertaling voor Unraid en ondersteunde plug-ins.\n\nThis is a Dutch translation for Unraid and supported plugins.",
 		"Repo": "Official Unraid Repository",
 		"RepoShort": "Unraid",
 		"RepoURL": "https://github.com/unraid/language-templates",
-		"Date": 1632024000,
-		"DateInstalled": 1632024000,
+		"Date": 1636084800,
+		"DateInstalled": 1636084800,
 		"SwitchLanguage": "Schakel over naar deze taal",
 		"InstallLanguage": "Taalpakket Installeren",
 		"InfoLanguage": "Druk voor meer informatie",
diff --git a/applicationFeed.json b/applicationFeed.json
index 7b4907eb8..0803905c3 100755
--- a/applicationFeed.json
+++ b/applicationFeed.json
@@ -1,7 +1,7 @@
 {
 	"apps": 1410,
-	"last_updated_timestamp": 1636099405,
-	"last_updated": "2021-11-05 04:03",
+	"last_updated_timestamp": 1636106597,
+	"last_updated": "2021-11-05 06:03",
 	"categories": [
 		{
 			"Cat": "Backup:",
@@ -3060,11 +3060,10 @@
 				"Productivity",
 				"Tools-Utilities"
 			],
-			"downloads": 75087,
+			"downloads": 77942,
 			"stars": 4,
-			"trending": 3.6,
+			"trending": 3.663,
 			"trends": [
-				6.42,
 				3.975,
 				2.649,
 				2.698,
@@ -3076,10 +3075,10 @@
 				3.481,
 				3.299,
 				3.059,
-				3.6
+				3.6,
+				3.663
 			],
 			"trendsDate": [
-				1602324493,
 				1604920121,
 				1607519295,
 				1610118602,
@@ -3091,10 +3090,10 @@
 				1625709789,
 				1628308996,
 				1630908225,
-				1633507422
+				1633507422,
+				1636106594
 			],
 			"downloadtrend": [
-				48488,
 				50495,
 				51869,
 				53307,
@@ -3106,11 +3105,12 @@
 				67855,
 				70170,
 				72384,
-				75087
+				75087,
+				77942
 			],
-			"LastUpdateScan": 1633507422,
+			"LastUpdateScan": 1636106594,
 			"FirstSeen": 1,
-			"topTrending": -2.82
+			"topTrending": -0.3120000000000003
 		},
 		{
 			"TemplateURL": "https://raw.githubusercontent.com/binhex/docker-templates/master/binhex/jackett.xml",
@@ -3543,11 +3543,10 @@
 				"Productivity",
 				"Tools-Utilities"
 			],
-			"downloads": 23336718,
+			"downloads": 24144214,
 			"stars": 17,
-			"trending": 3.661,
+			"trending": 3.344,
 			"trends": [
-				4.703,
 				4.264,
 				2.581,
 				2.315,
@@ -3559,10 +3558,10 @@
 				3.416,
 				3.451,
 				3.5,
-				3.661
+				3.661,
+				3.344
 			],
 			"trendsDate": [
-				1602324493,
 				1604920122,
 				1607519295,
 				1610118602,
@@ -3574,10 +3573,10 @@
 				1625709789,
 				1628308996,
 				1630908225,
-				1633507422
+				1633507422,
+				1636106594
 			],
 			"downloadtrend": [
-				15384971,
 				16070174,
 				16495961,
 				16886885,
@@ -3589,12 +3588,13 @@
 				20946719,
 				21695385,
 				22482315,
-				23336718
+				23336718,
+				24144214
 			],
-			"LastUpdateScan": 1633507422,
+			"LastUpdateScan": 1636106594,
 			"FirstSeen": 1,
-			"topTrending": -1.0420000000000003,
-			"topPerforming": 3.661
+			"topTrending": -0.9200000000000004,
+			"topPerforming": 3.344
 		},
 		{
 			"TemplateURL": "https://raw.githubusercontent.com/binhex/docker-templates/master/binhex/libreoffice.xml",
@@ -9417,7 +9417,7 @@
 			"CategoryList": [
 				"Downloaders"
 			],
-			"LastUpdateScan": 1633507423,
+			"LastUpdateScan": 1636106595,
 			"FirstSeen": 1
 		},
 		{
@@ -10937,10 +10937,9 @@
 			"CategoryList": [
 				"Tools-Utilities"
 			],
-			"downloads": 45140,
-			"trending": 0.716,
+			"downloads": 45475,
+			"trending": 0.737,
 			"trends": [
-				0.631,
 				0.487,
 				0.508,
 				0.564,
@@ -10952,10 +10951,10 @@
 				0.595,
 				0.701,
 				0.701,
-				0.716
+				0.716,
+				0.737
 			],
 			"trendsDate": [
-				1602324494,
 				1604920122,
 				1607519295,
 				1610118603,
@@ -10967,10 +10966,10 @@
 				1625709790,
 				1628308997,
 				1630908225,
-				1633507423
+				1633507423,
+				1636106595
 			],
 			"downloadtrend": [
-				40703,
 				40902,
 				41111,
 				41344,
@@ -10982,11 +10981,12 @@
 				44191,
 				44503,
 				44817,
-				45140
+				45140,
+				45475
 			],
-			"LastUpdateScan": 1633507423,
+			"LastUpdateScan": 1636106595,
 			"FirstSeen": 1440734400,
-			"topTrending": 0.08499999999999996
+			"topTrending": 0.25
 		},
 		{
 			"Name": "Dolphin",
@@ -11659,11 +11659,10 @@
 			"CategoryList": [
 				"Other"
 			],
-			"downloads": 250914,
+			"downloads": 252060,
 			"stars": 1,
-			"trending": 0.479,
+			"trending": 0.455,
 			"trends": [
-				1.741,
 				1.402,
 				0.764,
 				0.846,
@@ -11675,10 +11674,10 @@
 				0.604,
 				0.542,
 				0.523,
-				0.479
+				0.479,
+				0.455
 			],
 			"trendsDate": [
-				1602324494,
 				1604920122,
 				1607519295,
 				1610118603,
@@ -11690,10 +11689,10 @@
 				1625709790,
 				1628308997,
 				1630908226,
-				1633507423
+				1633507423,
+				1636106595
 			],
 			"downloadtrend": [
-				227983,
 				231224,
 				233005,
 				234992,
@@ -11705,12 +11704,13 @@
 				247060,
 				248407,
 				249712,
-				250914
+				250914,
+				252060
 			],
-			"LastUpdateScan": 1633507423,
+			"LastUpdateScan": 1636106595,
 			"FirstSeen": 1,
-			"topTrending": -1.262,
-			"topPerforming": 0.479
+			"topTrending": -0.9469999999999998,
+			"topPerforming": 0.455
 		},
 		{
 			"Name": "RDP-Calibre",
@@ -17797,7 +17797,7 @@
 				"attributes construct error",
 				"Couldn't find end of Start Tag path line 115"
 			],
-			"LastUpdateScan": 1633507426,
+			"LastUpdateScan": 1636106595,
 			"FirstSeen": null
 		},
 		{
@@ -31929,31 +31929,34 @@
 			"CategoryList": [
 				"Network-Other"
 			],
-			"downloads": 251375,
+			"downloads": 251916,
 			"stars": 15,
-			"trending": 0.21,
+			"trending": 0.215,
 			"trends": [
 				0.222,
 				0.183,
 				0.208,
-				0.21
+				0.21,
+				0.215
 			],
 			"trendsDate": [
 				1625709792,
 				1628308999,
 				1630908227,
-				1633507424
+				1633507424,
+				1636106596
 			],
 			"downloadtrend": [
 				249314,
 				249868,
 				250326,
 				250847,
-				251375
+				251375,
+				251916
 			],
-			"LastUpdateScan": 1633507424,
+			"LastUpdateScan": 1636106596,
 			"FirstSeen": 1447131600,
-			"topTrending": -0.01200000000000001
+			"topTrending": -0.007000000000000006
 		},
 		{
 			"Name": "pipework-1.1.5",
@@ -41219,7 +41222,7 @@
 				"Network-Management",
 				"Tools-Utilities"
 			],
-			"LastUpdateScan": 1633507425,
+			"LastUpdateScan": 1636106596,
 			"FirstSeen": 1472788800
 		},
 		{
@@ -43180,11 +43183,10 @@
 				"Backup",
 				"Tools-Utilities"
 			],
-			"downloads": 1693572,
+			"downloads": 1693744,
 			"stars": 22,
-			"trending": 0.008,
+			"trending": 0.01,
 			"trends": [
-				0.446,
 				0.406,
 				0.325,
 				0.224,
@@ -43196,10 +43198,10 @@
 				0.009,
 				0.01,
 				0.007,
-				0.008
+				0.008,
+				0.01
 			],
 			"trendsDate": [
-				1602324495,
 				1604920124,
 				1607519297,
 				1610118604,
@@ -43211,10 +43213,10 @@
 				1625709793,
 				1628309000,
 				1630908227,
-				1633507426
+				1633507426,
+				1636106596
 			],
 			"downloadtrend": [
-				1675755,
 				1682578,
 				1688057,
 				1691855,
@@ -43226,12 +43228,13 @@
 				1693153,
 				1693314,
 				1693438,
-				1693572
+				1693572,
+				1693744
 			],
-			"LastUpdateScan": 1633507426,
+			"LastUpdateScan": 1636106596,
 			"FirstSeen": 1,
-			"topTrending": -0.438,
-			"topPerforming": 0.008
+			"topTrending": -0.396,
+			"topPerforming": 0.01
 		},
 		{
 			"Privileged": "false",
@@ -50805,11 +50808,10 @@
 			"CategoryList": [
 				"MediaApp-Video"
 			],
-			"downloads": 389911,
+			"downloads": 396797,
 			"stars": 4,
-			"trending": 1.659,
+			"trending": 1.735,
 			"trends": [
-				2.618,
 				1.3,
 				1.036,
 				0.796,
@@ -50821,10 +50823,10 @@
 				1.959,
 				1.519,
 				1.734,
-				1.659
+				1.659,
+				1.735
 			],
 			"trendsDate": [
-				1602324496,
 				1604920124,
 				1607519297,
 				1610118604,
@@ -50836,10 +50838,10 @@
 				1625709793,
 				1628309000,
 				1630908227,
-				1633507426
+				1633507426,
+				1636106597
 			],
 			"downloadtrend": [
-				311852,
 				315961,
 				319269,
 				321832,
@@ -50851,12 +50853,13 @@
 				371067,
 				376792,
 				383442,
-				389911
+				389911,
+				396797
 			],
-			"LastUpdateScan": 1633507426,
+			"LastUpdateScan": 1636106597,
 			"FirstSeen": 1537243200,
-			"topTrending": -0.9589999999999999,
-			"topPerforming": 1.659
+			"topTrending": 0.43500000000000005,
+			"topPerforming": 1.735
 		},
 		{
 			"Name": "MKVToolNix",
@@ -58450,28 +58453,24 @@
 			"FirstSeen": 1636099404
 		},
 		{
-			"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/Portainer.xml",
-			"Date": 1525579200,
+			"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PortainerCE.xml",
+			"Date": 1636084800,
 			"Name": "Portainer",
 			"Project": "https://portainer.io",
-			"Overview": "\n    Portainer is a simple management solution for Docker. It consists of a web UI that allows you to easily manage your Docker containers, images, networks and volumes.\n  ",
-			"Registry": "https://registry.hub.docker.com/r/portainer/portainer/",
+			"Overview": "\n    Portainer hides the complexity of managing containers behind an easy-to-use UI.[br]\n    By removing the need to use the CLI, write YAML or understand manifests, Portainer makes deploying apps and troubleshooting problems so easy that anyone can do it.\n    [br][br]\n\n    [b][u][span style='color: #E80000;']Configuration[/span][/u][/b][br]\n    [b]/mnt/user/appdata/portainer[/b] This is where Portainer will store it's data.[br]\n    [b]/var/run/docker.sockr[/b] Portainer uses this to get Docker information from unRAID host.[br]\n    [b]Port 8000[/b] TCP tunnel server[br]\n    [b]Port 9443[/b] Secure (HTTPS) WebUI port, default uses self-signed certificate[br]\n  ",
+			"Registry": "https://registry.hub.docker.com/r/portainer/portainer-ce/",
 			"GitHub": "https://github.com/portainer/portainer",
-			"Repository": "portainer/portainer",
+			"Repository": "registry.hub.docker.com/portainer/portainer-ce",
 			"Support": "https://lime-technology.com/forums/topic/69491-support-jj9987-portainer/",
-			"BindTime": "true",
+			"WebUI": "https://[IP]:[PORT:9443]/",
+			"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/Portainer-logo.png",
 			"Privileged": "false",
-			"Networking": {
-				"Mode": "bridge"
-			},
 			"Network": {
 				"@attributes": {
 					"Default": "bridge"
 				},
 				"value": "bridge"
 			},
-			"WebUI": "http://[IP]:[PORT:9000]/",
-			"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/Portainer-logo.png",
 			"Config": [
 				{
 					"@attributes": {
@@ -58480,11 +58479,11 @@
 						"Target": "/data",
 						"Default": "/mnt/user/appdata/portainer",
 						"Mode": "rw",
-						"Display": "advanced-hide",
+						"Display": "always",
 						"Required": "true",
-						"Description": "This is where Portainer will store it's configuration."
+						"Description": "Portainer configuration location"
 					},
-					"value": "/mnt/user/appdata/portainer"
+					"value": ""
 				},
 				{
 					"@attributes": {
@@ -58493,77 +58492,48 @@
 						"Target": "/var/run/docker.sock",
 						"Default": "/var/run/docker.sock",
 						"Mode": "rw",
-						"Display": "advanced-hide",
+						"Display": "always",
 						"Required": "true",
-						"Description": "This is needed for Portainer to connect to Docker."
+						"Description": "Portainer connection to Docker Unix socket"
 					},
-					"value": "/var/run/docker.sock"
+					"value": ""
+				},
+				{
+					"@attributes": {
+						"Type": "Port",
+						"Name": "TCP tunnel server",
+						"Target": "8000",
+						"Default": "8000",
+						"Mode": "tcp",
+						"Display": "always",
+						"Required": "true",
+						"Description": "TCP tunnel server"
+					},
+					"value": ""
 				},
 				{
 					"@attributes": {
 						"Type": "Port",
 						"Name": "Web Interface Port",
-						"Target": "9000",
-						"Default": "9000",
+						"Target": "9443",
+						"Default": "9443",
 						"Mode": "tcp",
-						"Display": "always-hide",
+						"Display": "always",
 						"Required": "true",
-						"Description": "This is Portainer WebUI port."
+						"Description": "HTTPS WebUI port"
 					},
-					"value": "9000"
+					"value": ""
 				}
 			],
 			"Repo": "jj9987's Repository",
-			"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/Portainer.xml",
+			"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/PortainerCE.xml",
 			"CategoryList": [
 				"Network-Management",
 				"Productivity",
 				"Tools-Utilities"
 			],
-			"downloads": 2542543674,
-			"stars": 2136,
-			"trending": 1.281,
-			"trends": [
-				2.104,
-				2.334,
-				2.331,
-				1.763,
-				1.564,
-				1.469,
-				1.321,
-				1.284,
-				1.286,
-				1.281
-			],
-			"trendsDate": [
-				1612207038,
-				1614805360,
-				1617400966,
-				1620000163,
-				1622599399,
-				1625241797,
-				1627841001,
-				1630440243,
-				1633039427,
-				1635638601
-			],
-			"downloadtrend": [
-				2147483647,
-				2193634690,
-				2246047723,
-				2299644863,
-				2340922080,
-				2378116577,
-				2413573585,
-				2445876089,
-				2477693903,
-				2509969562,
-				2542543674
-			],
-			"LastUpdateScan": 1635638601,
-			"FirstSeen": 1525579200,
-			"topTrending": -0.8230000000000002,
-			"topPerforming": 1.281
+			"LastUpdateScan": 1636106597,
+			"FirstSeen": 1636106597
 		},
 		{
 			"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PostgreSQL10.xml",
@@ -73517,7 +73487,7 @@
 			"errors": [
 				"Not an unRaid Application (no Repository or PluginURL entry)"
 			],
-			"LastUpdateScan": 1633507426,
+			"LastUpdateScan": 1636106595,
 			"FirstSeen": null
 		},
 		{
@@ -109475,7 +109445,7 @@
 				"Opening and ending tag mismatch: Container line 2 and Overview",
 				"Extra content at the end of the document"
 			],
-			"LastUpdateScan": 1633507426,
+			"LastUpdateScan": 1636106595,
 			"FirstSeen": null
 		},
 		{
@@ -172328,15 +172298,15 @@
 			"Author": "Bergware, Niellles, ZekerPixels",
 			"Name": "Nederlands taalpakket",
 			"TemplateURL": "https://raw.githubusercontent.com/unraid/language-templates/master/limetech/lang-nl_NL.xml",
-			"Version": "2021.09.19",
+			"Version": "2021.11.05",
 			"Icon": "https://raw.githubusercontent.com/unraid/language-templates/master/limetech/Green-Earth-Transparent-File.png",
 			"Support": "https://forums.unraid.net/forum/80-dutch-nederlands/",
 			"Description": "Dit is een Nederlandse vertaling voor Unraid en ondersteunde plug-ins.\n\nThis is a Dutch translation for Unraid and supported plugins.",
 			"Repo": "Official Unraid Repository",
 			"RepoShort": "Unraid",
 			"RepoURL": "https://github.com/unraid/language-templates",
-			"Date": 1632024000,
-			"DateInstalled": 1632024000,
+			"Date": 1636084800,
+			"DateInstalled": 1636084800,
 			"SwitchLanguage": "Schakel over naar deze taal",
 			"InstallLanguage": "Taalpakket Installeren",
 			"InfoLanguage": "Druk voor meer informatie",
diff --git a/firstSeen.json b/firstSeen.json
index e3d3fe124..779282965 100755
--- a/firstSeen.json
+++ b/firstSeen.json
@@ -1844,5 +1844,6 @@
 	"registry.hub.docker.com/library/postgres:11": 1636099404,
 	"registry.hub.docker.com/library/postgres:12": 1636099405,
 	"registry.hub.docker.com/library/postgres:13": 1636099405,
-	"registry.hub.docker.com/library/postgres:14": 1636099405
+	"registry.hub.docker.com/library/postgres:14": 1636099405,
+	"registry.hub.docker.com/portainer/portainer-ce": 1636106597
 }
\ No newline at end of file
diff --git a/languages/nl_NL b/languages/nl_NL
index d5ec9da25..1232a703b 100755
--- a/languages/nl_NL
+++ b/languages/nl_NL
@@ -987,8 +987,8 @@ Extend Trial=Proefperiode verlengen
 Extending Trial=Proefperiode verlengen
 Failed to connect to Unraid API=Kan geen verbinding maken met de Unraid-API
 Fix Error=Fout oplossen
-Forgot Password=Vergeet wachtwoord
-Forgot what Unraidnet account you used=Ben je vergeten welk Unraid.net-account je hebt gebruikt
+Forgot Password=Wachtwoord vergeten
+Forgot what Unraidnet account you used=Vergeten welk Unraid.net-account je hebt gebruikt
 Form not valid=Formulier niet geldig
 Get started by signing in to Unraidnet=Ga aan de slag door in te loggen op Unraid.net
 Get Started=Begin
diff --git a/old-applicationFeed-raw.json b/old-applicationFeed-raw.json
index 7a086e6c5..863ef2289 100755
--- a/old-applicationFeed-raw.json
+++ b/old-applicationFeed-raw.json
@@ -58231,27 +58231,23 @@
 	},
 	{
 		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/DockerRegistry.xml",
-		"Date": 1525579200,
+		"Date": 1636084800,
 		"Name": "DockerRegistry",
-		"Project": "https://github.com/docker/distribution",
-		"Overview": "\n    Docker Registry is used to store and distribute Docker images using HTTP API. This allows you host your own private Registry and store your images.\n  ",
+		"Project": "https://github.com/distribution/distribution",
+		"Overview": "\n    Docker Registry is used to store and distribute Docker images using HTTP API. This allows you host your own private Registry and store your images. Uses official Docker Registry image @ https://hub.docker.com/_/registry/\n    [br][br]\n\n    [b][u][span style='color: #E80000;']Configuration[/span][/u][/b][br]\n    [b]/mnt/user/appdata/registry[/b] This is where Registry will store it's data.[br]\n    [b]Port 5000[/b] Default connection port[br]\n  ",
 		"Registry": "https://registry.hub.docker.com/_/registry/",
 		"GitHub": "https://github.com/docker/distribution-library-image",
-		"Repository": "registry",
+		"Repository": "registry:2",
 		"Support": "https://lime-technology.com/forums/topic/69492-support-jj9987-docker-registry/",
-		"BindTime": "true",
+		"WebUI": "",
+		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/DockerRegistry-logo.png",
 		"Privileged": "false",
-		"Networking": {
-			"Mode": "bridge"
-		},
 		"Network": {
 			"@attributes": {
 				"Default": "bridge"
 			},
 			"value": "bridge"
 		},
-		"WebUI": "",
-		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/DockerRegistry-logo.png",
 		"Config": [
 			{
 				"@attributes": {
@@ -58264,7 +58260,7 @@
 					"Required": "true",
 					"Description": "This is where Docker Registry will store it's data."
 				},
-				"value": "/mnt/user/appdata/registry"
+				"value": ""
 			},
 			{
 				"@attributes": {
@@ -58277,7 +58273,7 @@
 					"Required": "true",
 					"Description": "This is Docker Registry TCP port."
 				},
-				"value": "5000"
+				"value": ""
 			}
 		],
 		"Repo": "jj9987's Repository",
@@ -58288,8 +58284,8 @@
 			"Productivity",
 			"Tools-Utilities"
 		],
-		"LastUpdateScan": 1633723423,
-		"FirstSeen": 1525579200
+		"LastUpdateScan": 1636099404,
+		"FirstSeen": 1636099404
 	},
 	{
 		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/Portainer.xml",
@@ -58408,20 +58404,18 @@
 		"topPerforming": 1.281
 	},
 	{
-		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PostgreSQL.xml",
-		"Date": 1525579200,
+		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PostgreSQL10.xml",
+		"Date": 1636084800,
 		"Name": "Postgres10",
 		"Project": "https://www.postgresql.org/",
-		"Overview": "\n    PostgreSQL is a powerful, open source object-relational database system. Based on official Postgres Docker image.\n  ",
+		"Overview": "\n    PostgreSQL 10 is a powerful, open source object-relational database system. Uses official Postgres Docker image @ https://hub.docker.com/_/postgres/\n    [br][br]\n\n    [b][u][span style='color: #E80000;']Configuration[/span][/u][/b][br]\n    [b]/mnt/cache/appdata/postgresql14[/b] This is where Postgres will store it's data. For best performance, keep the files on cache drive.[br]\n    [b]Port 5432[/b] Default connection port[br]\n    [b]POSTGRES_PASSWORD[/b] Superuser password. [b]REQUIRED TO SET[/b], otherwise connecting outside container will not be possible.[br]\n    [b]POSTGRES_USER[/b] Username for the superuser. Defaults to postgres if not set.[br]\n    [b]POSTGRES_DB[/b] Used to define different name for default database. Defaults to user if not set.[br]\n  ",
 		"Registry": "https://registry.hub.docker.com/_/postgres/",
 		"GitHub": "https://github.com/docker-library/postgres",
-		"Repository": "postgres:10",
+		"Repository": "registry.hub.docker.com/library/postgres:10",
 		"Support": "https://lime-technology.com/forums/topic/69483-support-jj9987-postgresql/",
-		"BindTime": "true",
+		"WebUI": "",
+		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/PostgreSQL-logo.png",
 		"Privileged": "false",
-		"Networking": {
-			"Mode": "bridge"
-		},
 		"Network": {
 			"@attributes": {
 				"Default": "bridge"
@@ -58435,11 +58429,11 @@
 					"Target": "POSTGRES_PASSWORD",
 					"Default": "",
 					"Mode": "",
-					"Description": "Container Variable: POSTGRES_PASSWORD",
+					"Description": "Initial superuser password (required)",
 					"Type": "Variable",
 					"Display": "always",
 					"Required": "true",
-					"Mask": "false"
+					"Mask": "true"
 				},
 				"value": ""
 			},
@@ -58449,13 +58443,13 @@
 					"Target": "POSTGRES_USER",
 					"Default": "",
 					"Mode": "",
-					"Description": "Container Variable: POSTGRES_USER",
+					"Description": "Initial superuser name (default: postgres)",
 					"Type": "Variable",
 					"Display": "always",
-					"Required": "true",
+					"Required": "false",
 					"Mask": "false"
 				},
-				"value": "postgres"
+				"value": ""
 			},
 			{
 				"@attributes": {
@@ -58463,68 +58457,64 @@
 					"Target": "POSTGRES_DB",
 					"Default": "",
 					"Mode": "",
-					"Description": "Container Variable: POSTGRES_DB",
+					"Description": "Initial database name (default: postgres)",
 					"Type": "Variable",
 					"Display": "always",
-					"Required": "true",
+					"Required": "false",
 					"Mask": "false"
 				},
-				"value": "postgres"
+				"value": ""
 			},
 			{
 				"@attributes": {
 					"Type": "Path",
 					"Name": "Database Storage Path",
 					"Target": "/var/lib/postgresql/data",
-					"Default": "/mnt/cache/appdata/postgres",
+					"Default": "/mnt/cache/appdata/postgresql10",
 					"Mode": "rw",
 					"Display": "always",
 					"Required": "true",
-					"Description": "This is where Postgres will store it's data."
+					"Description": "PostgreSQL data storage location"
 				},
-				"value": "/mnt/cache/appdata/postgres"
+				"value": ""
 			},
 			{
 				"@attributes": {
 					"Type": "Port",
-					"Name": "Web Interface Port",
+					"Name": "PostgreSQL access port",
 					"Target": "5432",
 					"Default": "5432",
 					"Mode": "tcp",
 					"Display": "always-hide",
 					"Required": "true",
-					"Description": "This is Postgres TCP connection port."
+					"Description": "PostgreSQL TCP connection port"
 				},
-				"value": "5432"
+				"value": ""
 			}
 		],
-		"WebUI": "",
-		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/PostgreSQL-logo.png",
 		"Repo": "jj9987's Repository",
-		"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/PostgreSQL.xml",
+		"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/PostgreSQL10.xml",
 		"CategoryList": [
 			"Network-Management",
 			"Productivity",
 			"Tools-Utilities"
 		],
-		"LastUpdateScan": 1634227449,
-		"FirstSeen": 1540652474
+		"LastUpdateScan": 1636099404,
+		"FirstSeen": 1636099404
 	},
 	{
 		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PostgreSQL11.xml",
-		"Date": 1525579200,
+		"Date": 1636084800,
 		"Name": "Postgres11",
 		"Project": "https://www.postgresql.org/",
-		"Overview": "\n    PostgreSQL is a powerful, open source object-relational database system. Based on official Postgres Docker image.\n  ",
+		"Overview": "\n    PostgreSQL 11 is a powerful, open source object-relational database system. Uses official Postgres Docker image @ https://hub.docker.com/_/postgres/\n    [br][br]\n\n    [b][u][span style='color: #E80000;']Configuration[/span][/u][/b][br]\n    [b]/mnt/cache/appdata/postgresql12[/b] This is where Postgres will store it's data. For best performance, keep the files on cache drive.[br]\n    [b]Port 5432[/b] Default connection port[br]\n    [b]POSTGRES_PASSWORD[/b] Superuser password. [b]REQUIRED TO SET[/b], otherwise connecting outside container will not be possible.[br]\n    [b]POSTGRES_USER[/b] Username for the superuser. Defaults to postgres if not set.[br]\n    [b]POSTGRES_DB[/b] Used to define different name for default database. Defaults to user if not set.[br]\n  ",
 		"Registry": "https://registry.hub.docker.com/_/postgres/",
 		"GitHub": "https://github.com/docker-library/postgres",
-		"Repository": "postgres:11",
+		"Repository": "registry.hub.docker.com/library/postgres:11",
 		"Support": "https://lime-technology.com/forums/topic/69483-support-jj9987-postgresql/",
-		"BindTime": "true",
+		"WebUI": "",
+		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/PostgreSQL-logo.png",
 		"Privileged": "false",
-		"Networking": {
-			"Mode": "bridge"
-		},
 		"Network": {
 			"@attributes": {
 				"Default": "bridge"
@@ -58538,11 +58528,11 @@
 					"Target": "POSTGRES_PASSWORD",
 					"Default": "",
 					"Mode": "",
-					"Description": "Container Variable: POSTGRES_PASSWORD",
+					"Description": "Initial superuser password (required)",
 					"Type": "Variable",
 					"Display": "always",
 					"Required": "true",
-					"Mask": "false"
+					"Mask": "true"
 				},
 				"value": ""
 			},
@@ -58552,13 +58542,13 @@
 					"Target": "POSTGRES_USER",
 					"Default": "",
 					"Mode": "",
-					"Description": "Container Variable: POSTGRES_USER",
+					"Description": "Initial superuser name (default: postgres)",
 					"Type": "Variable",
 					"Display": "always",
-					"Required": "true",
+					"Required": "false",
 					"Mask": "false"
 				},
-				"value": "postgres"
+				"value": ""
 			},
 			{
 				"@attributes": {
@@ -58566,43 +58556,41 @@
 					"Target": "POSTGRES_DB",
 					"Default": "",
 					"Mode": "",
-					"Description": "Container Variable: POSTGRES_DB",
+					"Description": "Initial database name (default: postgres)",
 					"Type": "Variable",
 					"Display": "always",
-					"Required": "true",
+					"Required": "false",
 					"Mask": "false"
 				},
-				"value": "postgres"
+				"value": ""
 			},
 			{
 				"@attributes": {
 					"Type": "Path",
 					"Name": "Database Storage Path",
 					"Target": "/var/lib/postgresql/data",
-					"Default": "/mnt/cache/appdata/postgres",
+					"Default": "/mnt/cache/appdata/postgresql11",
 					"Mode": "rw",
 					"Display": "always",
 					"Required": "true",
-					"Description": "This is where Postgres will store it's data."
+					"Description": "PostgreSQL data storage location"
 				},
-				"value": "/mnt/cache/appdata/postgres"
+				"value": ""
 			},
 			{
 				"@attributes": {
 					"Type": "Port",
-					"Name": "Web Interface Port",
+					"Name": "PostgreSQL access port",
 					"Target": "5432",
 					"Default": "5432",
 					"Mode": "tcp",
 					"Display": "always-hide",
 					"Required": "true",
-					"Description": "This is Postgres TCP connection port."
+					"Description": "PostgreSQL TCP connection port"
 				},
-				"value": "5432"
+				"value": ""
 			}
 		],
-		"WebUI": "",
-		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/PostgreSQL-logo.png",
 		"Repo": "jj9987's Repository",
 		"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/PostgreSQL11.xml",
 		"CategoryList": [
@@ -58610,8 +58598,305 @@
 			"Productivity",
 			"Tools-Utilities"
 		],
-		"LastUpdateScan": 1634227449,
-		"FirstSeen": 1540652475
+		"LastUpdateScan": 1636099404,
+		"FirstSeen": 1636099404
+	},
+	{
+		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PostgreSQL12.xml",
+		"Date": 1636084800,
+		"Name": "postgresql12",
+		"Project": "https://www.postgresql.org/",
+		"Overview": "\n    PostgreSQL 12 is a powerful, open source object-relational database system. Uses official Postgres Docker image @ https://hub.docker.com/_/postgres/\n    [br][br]\n\n    [b][u][span style='color: #E80000;']Configuration[/span][/u][/b][br]\n    [b]/mnt/cache/appdata/postgresql12[/b] This is where Postgres will store it's data. For best performance, keep the files on cache drive.[br]\n    [b]Port 5432[/b] Default connection port[br]\n    [b]POSTGRES_PASSWORD[/b] Superuser password. [b]REQUIRED TO SET[/b], otherwise connecting outside container will not be possible.[br]\n    [b]POSTGRES_USER[/b] Username for the superuser. Defaults to postgres if not set.[br]\n    [b]POSTGRES_DB[/b] Used to define different name for default database. Defaults to user if not set.[br]\n  ",
+		"Registry": "https://registry.hub.docker.com/_/postgres/",
+		"GitHub": "https://github.com/docker-library/postgres",
+		"Repository": "registry.hub.docker.com/library/postgres:12",
+		"Support": "https://lime-technology.com/forums/topic/69483-support-jj9987-postgresql/",
+		"WebUI": "",
+		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/PostgreSQL-logo.png",
+		"Privileged": "false",
+		"Network": {
+			"@attributes": {
+				"Default": "bridge"
+			},
+			"value": "bridge"
+		},
+		"Config": [
+			{
+				"@attributes": {
+					"Name": "POSTGRES_PASSWORD",
+					"Target": "POSTGRES_PASSWORD",
+					"Default": "",
+					"Mode": "",
+					"Description": "Initial superuser password (required)",
+					"Type": "Variable",
+					"Display": "always",
+					"Required": "true",
+					"Mask": "true"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Name": "POSTGRES_USER",
+					"Target": "POSTGRES_USER",
+					"Default": "",
+					"Mode": "",
+					"Description": "Initial superuser name (default: postgres)",
+					"Type": "Variable",
+					"Display": "always",
+					"Required": "false",
+					"Mask": "false"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Name": "POSTGRES_DB",
+					"Target": "POSTGRES_DB",
+					"Default": "",
+					"Mode": "",
+					"Description": "Initial database name (default: postgres)",
+					"Type": "Variable",
+					"Display": "always",
+					"Required": "false",
+					"Mask": "false"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Type": "Path",
+					"Name": "Database Storage Path",
+					"Target": "/var/lib/postgresql/data",
+					"Default": "/mnt/cache/appdata/postgresql12",
+					"Mode": "rw",
+					"Display": "always",
+					"Required": "true",
+					"Description": "PostgreSQL data storage location"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Type": "Port",
+					"Name": "PostgreSQL access port",
+					"Target": "5432",
+					"Default": "5432",
+					"Mode": "tcp",
+					"Display": "always-hide",
+					"Required": "true",
+					"Description": "PostgreSQL TCP connection port"
+				},
+				"value": ""
+			}
+		],
+		"Repo": "jj9987's Repository",
+		"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/PostgreSQL12.xml",
+		"CategoryList": [
+			"Network-Management",
+			"Productivity",
+			"Tools-Utilities"
+		],
+		"LastUpdateScan": 1636099405,
+		"FirstSeen": 1636099405
+	},
+	{
+		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PostgreSQL13.xml",
+		"Date": 1636084800,
+		"Name": "postgresql13",
+		"Project": "https://www.postgresql.org/",
+		"Overview": "\n    PostgreSQL 13 is a powerful, open source object-relational database system. Uses official Postgres Docker image @ https://hub.docker.com/_/postgres/\n    [br][br]\n\n    [b][u][span style='color: #E80000;']Configuration[/span][/u][/b][br]\n    [b]/mnt/cache/appdata/postgresql13[/b] This is where Postgres will store it's data. For best performance, keep the files on cache drive.[br]\n    [b]Port 5432[/b] Default connection port[br]\n    [b]POSTGRES_PASSWORD[/b] Superuser password. [b]REQUIRED TO SET[/b], otherwise connecting outside container will not be possible.[br]\n    [b]POSTGRES_USER[/b] Username for the superuser. Defaults to postgres if not set.[br]\n    [b]POSTGRES_DB[/b] Used to define different name for default database. Defaults to user if not set.[br]\n  ",
+		"Registry": "https://registry.hub.docker.com/_/postgres/",
+		"GitHub": "https://github.com/docker-library/postgres",
+		"Repository": "registry.hub.docker.com/library/postgres:13",
+		"Support": "https://lime-technology.com/forums/topic/69483-support-jj9987-postgresql/",
+		"WebUI": "",
+		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/PostgreSQL-logo.png",
+		"Privileged": "false",
+		"Network": {
+			"@attributes": {
+				"Default": "bridge"
+			},
+			"value": "bridge"
+		},
+		"Config": [
+			{
+				"@attributes": {
+					"Name": "POSTGRES_PASSWORD",
+					"Target": "POSTGRES_PASSWORD",
+					"Default": "",
+					"Mode": "",
+					"Description": "Initial superuser password (required)",
+					"Type": "Variable",
+					"Display": "always",
+					"Required": "true",
+					"Mask": "true"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Name": "POSTGRES_USER",
+					"Target": "POSTGRES_USER",
+					"Default": "",
+					"Mode": "",
+					"Description": "Initial superuser name (default: postgres)",
+					"Type": "Variable",
+					"Display": "always",
+					"Required": "false",
+					"Mask": "false"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Name": "POSTGRES_DB",
+					"Target": "POSTGRES_DB",
+					"Default": "",
+					"Mode": "",
+					"Description": "Initial database name (default: postgres)",
+					"Type": "Variable",
+					"Display": "always",
+					"Required": "false",
+					"Mask": "false"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Type": "Path",
+					"Name": "Database Storage Path",
+					"Target": "/var/lib/postgresql/data",
+					"Default": "/mnt/cache/appdata/postgresql13",
+					"Mode": "rw",
+					"Display": "always",
+					"Required": "true",
+					"Description": "PostgreSQL data storage location"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Type": "Port",
+					"Name": "PostgreSQL access port",
+					"Target": "5432",
+					"Default": "5432",
+					"Mode": "tcp",
+					"Display": "always-hide",
+					"Required": "true",
+					"Description": "PostgreSQL TCP connection port"
+				},
+				"value": ""
+			}
+		],
+		"Repo": "jj9987's Repository",
+		"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/PostgreSQL13.xml",
+		"CategoryList": [
+			"Network-Management",
+			"Productivity",
+			"Tools-Utilities"
+		],
+		"LastUpdateScan": 1636099405,
+		"FirstSeen": 1636099405
+	},
+	{
+		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/PostgreSQL14.xml",
+		"Date": 1636084800,
+		"Name": "postgresql14",
+		"Project": "https://www.postgresql.org/",
+		"Overview": "\n    PostgreSQL 14 is a powerful, open source object-relational database system. Uses official Postgres Docker image @ https://hub.docker.com/_/postgres/\n    [br][br]\n\n    [b][u][span style='color: #E80000;']Configuration[/span][/u][/b][br]\n    [b]/mnt/cache/appdata/postgresql14[/b] This is where Postgres will store it's data. For best performance, keep the files on cache drive.[br]\n    [b]Port 5432[/b] Default connection port[br]\n    [b]POSTGRES_PASSWORD[/b] Superuser password. [b]REQUIRED TO SET[/b], otherwise connecting outside container will not be possible.[br]\n    [b]POSTGRES_USER[/b] Username for the superuser. Defaults to postgres if not set.[br]\n    [b]POSTGRES_DB[/b] Used to define different name for default database. Defaults to user if not set.[br]\n  ",
+		"Registry": "https://registry.hub.docker.com/_/postgres/",
+		"GitHub": "https://github.com/docker-library/postgres",
+		"Repository": "registry.hub.docker.com/library/postgres:14",
+		"Support": "https://lime-technology.com/forums/topic/69483-support-jj9987-postgresql/",
+		"WebUI": "",
+		"Icon": "https://github.com/juusujanar/unraid-templates/raw/master/img/PostgreSQL-logo.png",
+		"Privileged": "false",
+		"Network": {
+			"@attributes": {
+				"Default": "bridge"
+			},
+			"value": "bridge"
+		},
+		"Config": [
+			{
+				"@attributes": {
+					"Name": "POSTGRES_PASSWORD",
+					"Target": "POSTGRES_PASSWORD",
+					"Default": "",
+					"Mode": "",
+					"Description": "Initial superuser password (required)",
+					"Type": "Variable",
+					"Display": "always",
+					"Required": "true",
+					"Mask": "true"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Name": "POSTGRES_USER",
+					"Target": "POSTGRES_USER",
+					"Default": "",
+					"Mode": "",
+					"Description": "Initial superuser name (default: postgres)",
+					"Type": "Variable",
+					"Display": "always",
+					"Required": "false",
+					"Mask": "false"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Name": "POSTGRES_DB",
+					"Target": "POSTGRES_DB",
+					"Default": "",
+					"Mode": "",
+					"Description": "Initial database name (default: postgres)",
+					"Type": "Variable",
+					"Display": "always",
+					"Required": "false",
+					"Mask": "false"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Type": "Path",
+					"Name": "Database Storage Path",
+					"Target": "/var/lib/postgresql/data",
+					"Default": "/mnt/cache/appdata/postgresql14",
+					"Mode": "rw",
+					"Display": "always",
+					"Required": "true",
+					"Description": "PostgreSQL data storage location"
+				},
+				"value": ""
+			},
+			{
+				"@attributes": {
+					"Type": "Port",
+					"Name": "PostgreSQL access port",
+					"Target": "5432",
+					"Default": "5432",
+					"Mode": "tcp",
+					"Display": "always-hide",
+					"Required": "true",
+					"Description": "PostgreSQL TCP connection port"
+				},
+				"value": ""
+			}
+		],
+		"Repo": "jj9987's Repository",
+		"templatePath": "/tmp/GitHub/AppFeed/templates/jj9987sRepository/PostgreSQL14.xml",
+		"CategoryList": [
+			"Network-Management",
+			"Productivity",
+			"Tools-Utilities"
+		],
+		"LastUpdateScan": 1636099405,
+		"FirstSeen": 1636099405
 	},
 	{
 		"TemplateURL": "https://raw.githubusercontent.com/juusujanar/unraid-templates/master/Redis.xml",
diff --git a/repoInfo.json b/repoInfo.json
index 890a23cc6..b474c5a75 100755
--- a/repoInfo.json
+++ b/repoInfo.json
@@ -3111,12 +3111,11 @@
 	},
 	"binhex/arch-intellij": {
 		"Base": null,
-		"Downloads": 75087,
+		"Downloads": 77942,
 		"Stars": 4,
-		"Time": 1633507422,
-		"trending": 3.6,
+		"Time": 1636106594,
+		"trending": 3.663,
 		"trends": [
-			6.42,
 			3.975,
 			2.649,
 			2.698,
@@ -3128,10 +3127,10 @@
 			3.481,
 			3.299,
 			3.059,
-			3.6
+			3.6,
+			3.663
 		],
 		"downloadtrend": [
-			48488,
 			50495,
 			51869,
 			53307,
@@ -3143,10 +3142,10 @@
 			67855,
 			70170,
 			72384,
-			75087
+			75087,
+			77942
 		],
 		"trendsDate": [
-			1602324493,
 			1604920121,
 			1607519295,
 			1610118602,
@@ -3158,7 +3157,8 @@
 			1625709789,
 			1628308996,
 			1630908225,
-			1633507422
+			1633507422,
+			1636106594
 		]
 	},
 	"binhex/arch-jackett": {
@@ -3319,12 +3319,11 @@
 	},
 	"binhex/arch-krusader": {
 		"Base": null,
-		"Downloads": 23336718,
+		"Downloads": 24144214,
 		"Stars": 17,
-		"Time": 1633507422,
-		"trending": 3.661,
+		"Time": 1636106594,
+		"trending": 3.344,
 		"trends": [
-			4.703,
 			4.264,
 			2.581,
 			2.315,
@@ -3336,10 +3335,10 @@
 			3.416,
 			3.451,
 			3.5,
-			3.661
+			3.661,
+			3.344
 		],
 		"downloadtrend": [
-			15384971,
 			16070174,
 			16495961,
 			16886885,
@@ -3351,10 +3350,10 @@
 			20946719,
 			21695385,
 			22482315,
-			23336718
+			23336718,
+			24144214
 		],
 		"trendsDate": [
-			1602324493,
 			1604920122,
 			1607519295,
 			1610118602,
@@ -3366,7 +3365,8 @@
 			1625709789,
 			1628308996,
 			1630908225,
-			1633507422
+			1633507422,
+			1636106594
 		]
 	},
 	"binhex/arch-libreoffice": {
@@ -5268,7 +5268,7 @@
 		"Base": null,
 		"Downloads": null,
 		"Stars": null,
-		"Time": 1633507423,
+		"Time": 1636106595,
 		"trending": null,
 		"trends": null,
 		"downloadtrend": null,
@@ -5992,12 +5992,11 @@
 	},
 	"aptalca/docker-rdp-dev": {
 		"Base": null,
-		"Downloads": 45140,
+		"Downloads": 45475,
 		"Stars": null,
-		"Time": 1633507423,
-		"trending": 0.716,
+		"Time": 1636106595,
+		"trending": 0.737,
 		"trends": [
-			0.631,
 			0.487,
 			0.508,
 			0.564,
@@ -6009,10 +6008,10 @@
 			0.595,
 			0.701,
 			0.701,
-			0.716
+			0.716,
+			0.737
 		],
 		"downloadtrend": [
-			40703,
 			40902,
 			41111,
 			41344,
@@ -6024,10 +6023,10 @@
 			44191,
 			44503,
 			44817,
-			45140
+			45140,
+			45475
 		],
 		"trendsDate": [
-			1602324494,
 			1604920122,
 			1607519295,
 			1610118603,
@@ -6039,7 +6038,8 @@
 			1625709790,
 			1628308997,
 			1630908225,
-			1633507423
+			1633507423,
+			1636106595
 		]
 	},
 	"aptalca/docker-dolphin": {
@@ -6408,12 +6408,11 @@
 	},
 	"aptalca/docker-rdp-boinc": {
 		"Base": null,
-		"Downloads": 250914,
+		"Downloads": 252060,
 		"Stars": 1,
-		"Time": 1633507423,
-		"trending": 0.479,
+		"Time": 1636106595,
+		"trending": 0.455,
 		"trends": [
-			1.741,
 			1.402,
 			0.764,
 			0.846,
@@ -6425,10 +6424,10 @@
 			0.604,
 			0.542,
 			0.523,
-			0.479
+			0.479,
+			0.455
 		],
 		"downloadtrend": [
-			227983,
 			231224,
 			233005,
 			234992,
@@ -6440,10 +6439,10 @@
 			247060,
 			248407,
 			249712,
-			250914
+			250914,
+			252060
 		],
 		"trendsDate": [
-			1602324494,
 			1604920122,
 			1607519295,
 			1610118603,
@@ -6455,7 +6454,8 @@
 			1625709790,
 			1628308997,
 			1630908226,
-			1633507423
+			1633507423,
+			1636106595
 		]
 	},
 	"aptalca/docker-rdp-calibre": {
@@ -11630,28 +11630,31 @@
 	},
 	"dreamcat4/pipework:1.1.3": {
 		"Base": null,
-		"Downloads": 251375,
+		"Downloads": 251916,
 		"Stars": 15,
-		"Time": 1633507424,
-		"trending": 0.21,
+		"Time": 1636106596,
+		"trending": 0.215,
 		"trends": [
 			0.222,
 			0.183,
 			0.208,
-			0.21
+			0.21,
+			0.215
 		],
 		"downloadtrend": [
 			249314,
 			249868,
 			250326,
 			250847,
-			251375
+			251375,
+			251916
 		],
 		"trendsDate": [
 			1625709792,
 			1628308999,
 			1630908227,
-			1633507424
+			1633507424,
+			1636106596
 		]
 	},
 	"dreamcat4/pipework:1.1.5": {
@@ -14880,7 +14883,7 @@
 		"Base": null,
 		"Downloads": null,
 		"Stars": null,
-		"Time": 1633507425,
+		"Time": 1636106596,
 		"trending": null,
 		"trends": null,
 		"downloadtrend": null,
@@ -15534,12 +15537,11 @@
 	},
 	"steamcache/generic:latest": {
 		"Base": null,
-		"Downloads": 1693572,
+		"Downloads": 1693744,
 		"Stars": 22,
-		"Time": 1633507426,
-		"trending": 0.008,
+		"Time": 1636106596,
+		"trending": 0.01,
 		"trends": [
-			0.446,
 			0.406,
 			0.325,
 			0.224,
@@ -15551,10 +15553,10 @@
 			0.009,
 			0.01,
 			0.007,
-			0.008
+			0.008,
+			0.01
 		],
 		"downloadtrend": [
-			1675755,
 			1682578,
 			1688057,
 			1691855,
@@ -15566,10 +15568,10 @@
 			1693153,
 			1693314,
 			1693438,
-			1693572
+			1693572,
+			1693744
 		],
 		"trendsDate": [
-			1602324495,
 			1604920124,
 			1607519297,
 			1610118604,
@@ -15581,7 +15583,8 @@
 			1625709793,
 			1628309000,
 			1630908227,
-			1633507426
+			1633507426,
+			1636106596
 		]
 	},
 	"ghost": {
@@ -16927,12 +16930,11 @@
 	},
 	"jlesage/mkvcleaver": {
 		"Base": null,
-		"Downloads": 389911,
+		"Downloads": 396797,
 		"Stars": 4,
-		"Time": 1633507426,
-		"trending": 1.659,
+		"Time": 1636106597,
+		"trending": 1.735,
 		"trends": [
-			2.618,
 			1.3,
 			1.036,
 			0.796,
@@ -16944,10 +16946,10 @@
 			1.959,
 			1.519,
 			1.734,
-			1.659
+			1.659,
+			1.735
 		],
 		"downloadtrend": [
-			311852,
 			315961,
 			319269,
 			321832,
@@ -16959,10 +16961,10 @@
 			371067,
 			376792,
 			383442,
-			389911
+			389911,
+			396797
 		],
 		"trendsDate": [
-			1602324496,
 			1604920124,
 			1607519297,
 			1610118604,
@@ -16974,7 +16976,8 @@
 			1625709793,
 			1628309000,
 			1630908227,
-			1633507426
+			1633507426,
+			1636106597
 		]
 	},
 	"jlesage/mkvtoolnix": {
@@ -21068,7 +21071,7 @@
 		"Base": null,
 		"Downloads": null,
 		"Stars": null,
-		"Time": 1633507426,
+		"Time": 1636106595,
 		"trending": null,
 		"trends": null,
 		"downloadtrend": null,
@@ -57118,5 +57121,15 @@
 		"trends": null,
 		"downloadtrend": null,
 		"trendsDate": null
+	},
+	"registry.hub.docker.com/portainer/portainer-ce": {
+		"Base": null,
+		"Downloads": null,
+		"Stars": null,
+		"Time": 1636106597,
+		"trending": null,
+		"trends": null,
+		"downloadtrend": null,
+		"trendsDate": null
 	}
 }
\ No newline at end of file