diff --git a/old-applicationFeed-raw.json b/old-applicationFeed-raw.json
index 655522095..fa3bb3fbb 100644
--- a/old-applicationFeed-raw.json
+++ b/old-applicationFeed-raw.json
@@ -76379,9 +76379,9 @@
                     "Default": "",
                     "Mode": "rw",
                     "Description": "Required path of your optical drive",
-                    "Type": "Path",
+                    "Type": "Device",
                     "Display": "always",
-                    "Required": "false",
+                    "Required": "true",
                     "Mask": "false"
                 },
                 "value": "/dev/sr0"
@@ -79066,7 +79066,7 @@
         "CPUset": "",
         "DonateText": "Buy me a coffee if you like.",
         "DonateLink": "https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2",
-        "Date": 1595736000,
+        "Date": 1610600400,
         "Networking": {
             "Mode": "host",
             "Publish": {
@@ -79226,7 +79226,7 @@
         "CPUset": "",
         "DonateText": "Buy me a coffee if you like.",
         "DonateLink": "https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2",
-        "Date": 1594872000,
+        "Date": 1610600400,
         "Networking": {
             "Mode": "host",
             "Publish": {
@@ -79407,7 +79407,7 @@
         "CPUset": "",
         "DonateText": "Buy me a coffee if you like.",
         "DonateLink": "https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2",
-        "Date": 1592971200,
+        "Date": 1610600400,
         "Networking": {
             "Mode": "host",
             "Publish": {
@@ -79588,7 +79588,7 @@
         "CPUset": "",
         "DonateText": "Buy me a coffee if you like.",
         "DonateLink": "https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2",
-        "Date": 1594612800,
+        "Date": 1610600400,
         "Networking": {
             "Mode": "host",
             "Publish": {
@@ -129674,6 +129674,143 @@
         "LastUpdateScan": 1609938464,
         "FirstSeen": 1563138407
     },
+    {
+        "Name": "navidrome",
+        "Repository": "deluan/navidrome",
+        "Registry": "https://hub.docker.com/r/deluan/navidrome/",
+        "Network": "bridge",
+        "Support": "https://forums.unraid.net/topic/87798-support-selfhostersnets-template-repository/",
+        "Project": "https://github.com/deluan/navidrome",
+        "Overview": "Modern Music Server and Streamer compatible with Subsonic/Airsonic",
+        "WebUI": "http://[IP]:[PORT:4533]/",
+        "Icon": "https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/navidrome.png",
+        "Config": [
+            {
+                "@attributes": {
+                    "Name": "WebUI",
+                    "Target": "4533",
+                    "Default": "",
+                    "Mode": "tcp",
+                    "Description": "Container Port: 4533",
+                    "Type": "Port",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": "4533"
+            },
+            {
+                "@attributes": {
+                    "Name": "Appdata",
+                    "Target": "/data",
+                    "Default": "",
+                    "Mode": "rw",
+                    "Description": "Container Path: /data",
+                    "Type": "Path",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": "/mnt/user/appdata/navidrome"
+            },
+            {
+                "@attributes": {
+                    "Name": "Music",
+                    "Target": "/music",
+                    "Default": "",
+                    "Mode": "rw",
+                    "Description": "Container Path: /music",
+                    "Type": "Path",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": ""
+            },
+            {
+                "@attributes": {
+                    "Name": "Scan Interval",
+                    "Target": "ND_SCANINTERVAL",
+                    "Default": "",
+                    "Mode": "",
+                    "Description": "Container Variable: ND_SCANINTERVAL",
+                    "Type": "Variable",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": "1m"
+            },
+            {
+                "@attributes": {
+                    "Name": "Log Level",
+                    "Target": "ND_LOGLEVEL",
+                    "Default": "",
+                    "Mode": "",
+                    "Description": "Container Variable: ND_LOGLEVEL",
+                    "Type": "Variable",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": "info"
+            },
+            {
+                "@attributes": {
+                    "Name": "Timeout",
+                    "Target": "ND_SESSIONTIMEOUT",
+                    "Default": "",
+                    "Mode": "",
+                    "Description": "Container Variable: ND_SESSIONTIMEOUT",
+                    "Type": "Variable",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": "24h"
+            },
+            {
+                "@attributes": {
+                    "Name": "BaseURL",
+                    "Target": "ND_BASEURL",
+                    "Default": "",
+                    "Mode": "",
+                    "Description": "Container Variable: ND_BASEURL",
+                    "Type": "Variable",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": ""
+            },
+            {
+                "@attributes": {
+                    "Name": "Image Caching",
+                    "Target": "ND_IMAGECACHESIZE",
+                    "Default": "",
+                    "Mode": "",
+                    "Description": "Container Variable: ND_IMAGECACHESIZE",
+                    "Type": "Variable",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": "200MB"
+            }
+        ],
+        "Repo": "Selfhosters Unraid Discord Repository",
+        "TemplateURL": "https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/navidrome.xml",
+        "Category": "MediaServer:Music",
+        "Description": "Modern Music Server and Streamer compatible with Subsonic/Airsonic",
+        "templatePath": "/tmp/GitHub/AppFeed/templates/SelfhostersUnraidDiscordRepository/templates/navidrome.xml",
+        "CategoryList": [
+            "MediaServer-Music"
+        ],
+        "downloads": 3665991,
+        "stars": 11,
+        "LastUpdateScan": 1610651376,
+        "FirstSeen": 1610651376
+    },
     {
         "Name": "NoSQLClient",
         "Repository": "mongoclient/mongoclient",
@@ -132846,12 +132983,12 @@
         "FirstSeen": 1610125666
     },
     {
-        "Name": "Shinobi-Pro-CCTV",
+        "Name": "shinobi-pro-cctv",
         "Repository": "shinobicctv/shinobi:latest",
         "Registry": "https://hub.docker.com/r/shinobicctv/shinobi",
         "Network": "bridge",
         "Support": "https://forums.unraid.net/topic/87798-support-selfhostersnets-template-repository/",
-        "Project": "https://github.com/OpenZWave/Zwave2Mqtt",
+        "Project": "https://gitlab.com/Shinobi-Systems/Shinobi",
         "Overview": "Shinobi Docker from official Dockerhub repo. Note to use GPU for hardware encoding or Object detection: 1. add `--runtime=nvidia` in Extra Parameters.  2. Add Nvidia GPU Devices variables ID & Driver capabilities in advanced",
         "WebUI": "http://[IP]:[PORT:8080]/",
         "Icon": "https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/shinobi.png",
@@ -134840,6 +134977,88 @@
         "LastUpdateScan": 1609434478,
         "FirstSeen": 1580850651
     },
+    {
+        "TemplatePath": "/tmp/appFeed/templates/SelfhostersUnraidDiscordRepository/templates/tuyagateway.xml",
+        "errors": [
+            "Opening and ending tag mismatch: Registry line 5 and Container",
+            "EndTag: '</' not found",
+            "XML declaration allowed only at the start of the document",
+            "XML declaration allowed only at the start of the document"
+        ],
+        "LastUpdateScan": 1610118604,
+        "FirstSeen": 1538604219
+    },
+    {
+        "Name": "twonky-server",
+        "Repository": "dtjs48jkt/twonkyserver",
+        "Registry": "https://hub.docker.com/r/dtjs48jkt/twonkyserver/",
+        "Network": "bridge",
+        "Support": "https://forums.unraid.net/topic/87798-support-selfhostersnets-template-repository/",
+        "Project": "https://github.com/H2CK/twonkyserver",
+        "Overview": "TwonkyMedia server (TMS) is DLNA-compliant UPnP AV server software from PacketVideo. TwonkyMedia server can be used to share and stream media to most UPnP AV or DLNA-compliant clients, in addition to non-UPnP devices through the HTML, RSS, and JSON supported front ends.",
+        "License": "License is required for this app. See https://twonky.com for more info",
+        "WebUI": "http://[IP]:[PORT:9000]/",
+        "Icon": "https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/twonky-server.png",
+        "Config": [
+            {
+                "@attributes": {
+                    "Name": "WebUI",
+                    "Target": "9000",
+                    "Default": "",
+                    "Mode": "tcp",
+                    "Description": "Container Port: 9000",
+                    "Type": "Port",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": "9000"
+            },
+            {
+                "@attributes": {
+                    "Name": "Appdata",
+                    "Target": "/config",
+                    "Default": "",
+                    "Mode": "rw",
+                    "Description": "Container Path: /config",
+                    "Type": "Path",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": ""
+            },
+            {
+                "@attributes": {
+                    "Name": "Media",
+                    "Target": "/data",
+                    "Default": "",
+                    "Mode": "rw",
+                    "Description": "Container Path: /data",
+                    "Type": "Path",
+                    "Display": "always",
+                    "Required": "false",
+                    "Mask": "false"
+                },
+                "value": ""
+            }
+        ],
+        "Repo": "Selfhosters Unraid Discord Repository",
+        "TemplateURL": "https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/twonky-server.xml",
+        "Licence": "License is required for this app. See https://twonky.com for more info",
+        "Category": "MediaServer:Video MediaServer:Music MediaServer:Other",
+        "Description": "TwonkyMedia server (TMS) is DLNA-compliant UPnP AV server software from PacketVideo. TwonkyMedia server can be used to share and stream media to most UPnP AV or DLNA-compliant clients, in addition to non-UPnP devices through the HTML, RSS, and JSON supported front ends.",
+        "templatePath": "/tmp/GitHub/AppFeed/templates/SelfhostersUnraidDiscordRepository/templates/twonky-server.xml",
+        "CategoryList": [
+            "MediaServer-Video",
+            "MediaServer-Music",
+            "MediaServer-Other"
+        ],
+        "downloads": 618693,
+        "stars": 2,
+        "LastUpdateScan": 1610651376,
+        "FirstSeen": 1610651376
+    },
     {
         "Name": "UniFi-Poller",
         "Repository": "golift/unifi-poller",
@@ -176704,8 +176923,8 @@
         "CategoryList": [
             "Productivity"
         ],
-        "downloads": 571,
-        "LastUpdateScan": 1608052126,
+        "downloads": 1058,
+        "LastUpdateScan": 1610651377,
         "FirstSeen": 1605454081
     },
     {