diff --git a/templates/cyberchef.xml b/templates/cyberchef.xml
index a874d05..8517316 100644
--- a/templates/cyberchef.xml
+++ b/templates/cyberchef.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>cyberchef</Name>
-  <Repository>mpepping/cyberchef</Repository>
+  <Repository>mpepping/cyberchef:latest</Repository>
   <Registry>https://hub.docker.com/r/mpepping/cyberchef/</Registry>
   <Network>bridge</Network>
   <MyIP/>
   <Shell>sh</Shell>
   <Privileged>false</Privileged>
-  <Support>https://hub.docker.com/r/mpepping/cyberchef/</Support>
-  <Project/>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://gchq.github.io/CyberChef/</Project>
   <Overview>The Cyber Swiss Army Knife - a web app for encryption, encoding, compression and data analysis.</Overview>
-  <Category/>
+  <Category>Productivity: Tools: Status:Stable</Category>
   <WebUI>http://[IP]:[PORT:8000]</WebUI>
-  <TemplateURL/>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/cyberchef.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/cyberchef.png</Icon>
   <ExtraParams/>
   <PostArgs/>
   <CPUset/>
-  <DateInstalled>1581355422</DateInstalled>
+  <DateInstalled>1583615667</DateInstalled>
   <DonateText/>
   <DonateLink/>
   <Description>The Cyber Swiss Army Knife - a web app for encryption, encoding, compression and data analysis.</Description>
@@ -35,4 +35,4 @@
   <Environment/>
   <Labels/>
   <Config Name="Host Port 1" Target="8000" Default="8000" Mode="tcp" Description="Container Port: 8000" Type="Port" Display="always" Required="false" Mask="false">8000</Config>
-</Container>
\ No newline at end of file
+</Container>
diff --git a/templates/dashmachine.xml b/templates/dashmachine.xml
index 7803fec..d2b635d 100644
--- a/templates/dashmachine.xml
+++ b/templates/dashmachine.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>dashmachine</Name>
-  <Repository>rmountjoy/dashmachine</Repository>
+  <Repository>rmountjoy/dashmachine:latest</Repository>
   <Registry>https://hub.docker.com/r/rmountjoy/dashmachine/</Registry>
   <Network>bridge</Network>
   <MyIP/>
   <Shell>sh</Shell>
   <Privileged>false</Privileged>
-  <Support>https://hub.docker.com/r/rmountjoy/dashmachine/</Support>
-  <Project/>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://hub.docker.com/r/rmountjoy/dashmachine/</Project>
   <Overview>Another web application bookmark dashboard, with fun features.[br][br][b][u][span style='color: #ff9900;']Default user/password[/span][/u][/b][br]User: [B][u]admin[/B][/u][br]Password: [B][u]adminadmin[/B][/u][/b]</Overview>
-  <Category/>
+  <Category>Productivity: Network:Web Status:Stable</Category>
   <WebUI>http://[IP]:[PORT:5000]</WebUI>
-  <TemplateURL/>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/dashmachine.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/dashmachine.png</Icon>
   <ExtraParams/>
   <PostArgs/>
   <CPUset/>
-  <DateInstalled>1581287327</DateInstalled>
+  <DateInstalled>1583615569</DateInstalled>
   <DonateText/>
   <DonateLink/>
   <Description>Another web application bookmark dashboard, with fun features.[br][br][b][u][span style='color: #ff9900;']Default user/password[/span][/u][/b][br]User: [B][u]admin[/B][/u][br]Password: [B][u]adminadmin[/B][/u][/b]</Description>
diff --git a/templates/db-backup.xml b/templates/db-backup.xml
index b2e941c..2044e24 100644
--- a/templates/db-backup.xml
+++ b/templates/db-backup.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>db-backup</Name>
-  <Repository>tiredofit/db-backup</Repository>
+  <Repository>tiredofit/db-backup:latest</Repository>
   <Registry>https://hub.docker.com/r/tiredofit/db-backup/</Registry>
   <Network>bridge</Network>
   <MyIP/>
   <Shell>sh</Shell>
   <Privileged>false</Privileged>
-  <Support>https://hub.docker.com/r/tiredofit/db-backup/</Support>
-  <Project/>
-  <Overview>Backup Multiple DB Servers (Influx, Maria/Mysql/Mongo/Postgres/Redis/Rethink) based on Alpine.[br][br]Manual Backups can be perforemd by entering the container and typing backup-now[/br][/br]</Overview>
-  <Category/>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://hub.docker.com/r/tiredofit/db-backup/</Project>
+  <Overview>Backup Multiple DB Servers (Influx, Maria/Mysql/Mongo/Postgres/Redis/Rethink) based on Alpine.Manual Backups can be performed by entering the container and typing backup-now</Overview>
+  <Category>Backup: Status:Stable</Category>
   <WebUI/>
-  <TemplateURL/>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/db-backup.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/db-backup.png</Icon>
   <ExtraParams/>
   <PostArgs/>
   <CPUset/>
-  <DateInstalled>1581292532</DateInstalled>
+  <DateInstalled>1583615401</DateInstalled>
   <DonateText/>
   <DonateLink/>
-  <Description>Backup Multiple DB Servers (Influx, Maria/Mysql/Mongo/Postgres/Redis/Rethink) based on Alpine.[br][br]Manual Backups can be perforemd by entering the container and typing backup-now[/br][/br]</Description>
+  <Description>Backup Multiple DB Servers (Influx, Maria/Mysql/Mongo/Postgres/Redis/Rethink) based on Alpine.Manual Backups can be performed by entering the container and typing backup-now</Description>
   <Networking>
     <Mode>bridge</Mode>
     <Publish/>
@@ -105,9 +105,9 @@
     </Variable>
   </Environment>
   <Labels/>
-  <Config Name="Backup Location" Target="/backup" Default="" Mode="rw" Description="Database Dump Location" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/backups/db/</Config>
+  <Config Name="Backup Location" Target="/backup" Default="" Mode="rw" Description="Database Dump Location" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/backups/db/</Config>
   <Config Name="Key 1" Target="COMPRESSION" Default="" Mode="" Description="Gzip " Type="Variable" Display="always" Required="false" Mask="false">GZ</Config>
-  <Config Name="Key 2" Target="DB_TYPE" Default="" Mode="" Description="couch influx mysql pgsql mongo redis rethink" Type="Variable" Display="always" Required="false" Mask="false">&lt;Database_Type&gt;</Config>
+  <Config Name="Key 2" Target="DB_TYPE" Default="" Mode="" Description="couch influx mysql pgsql mongo redis rethink" Type="Variable" Display="always" Required="true" Mask="false">&lt;Database_Type&gt;</Config>
   <Config Name="Key 3" Target="DB_HOST" Default="" Mode="" Description="Database Hostname" Type="Variable" Display="always" Required="false" Mask="false">&lt;DATABASE_IP&gt;</Config>
   <Config Name="Key 4" Target="DB_NAME" Default="" Mode="" Description="Database name." Type="Variable" Display="always" Required="false" Mask="false">database</Config>
   <Config Name="Key 5" Target="DB_USER" Default="" Mode="" Description="Database User - use root to backup all MySQL of them." Type="Variable" Display="always" Required="false" Mask="false">root</Config>
diff --git a/templates/gotify.xml b/templates/gotify.xml
index 8b8c7ce..08be85d 100644
--- a/templates/gotify.xml
+++ b/templates/gotify.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>gotify</Name>
-  <Repository>gotify/server</Repository>
+  <Repository>gotify/server:latest</Repository>
   <Registry>https://hub.docker.com/r/gotify/server/</Registry>
   <Network>bridge</Network>
   <MyIP/>
   <Shell>sh</Shell>
   <Privileged>false</Privileged>
-  <Support>https://hub.docker.com/r/gotify/server/</Support>
-  <Project/>
-  <Overview>A simple server for sending and receiving messages.[br][br][b][u][span style='color: #ff9900;']Default user/password[/span][/u][/b][br]User: [B][u]admin[/B][/u][br]Password: [B][u]admin[/B][/u][/b][br][br]Download config.yml[/br][/br]wget -O /mnt/user/appdata/gotify/config/config.yml https://raw.githubusercontent.com/gotify/server/master/config.example.yml</Overview>
-  <Category/>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/?do=edit</Support>
+  <Project>https://gotify.net/</Project>
+  <Overview>A simple server for sending and receiving messages.[br][br][b][u][span style='color: #ff9900;']Default user/password[/span][/u][/b][br]User: [B][u]admin[/B][/u][br]Password: [B][u]admin[/B][/u][/b][br][br]Download config.yml[/br]mkdir -p /mnt/user/appdata/gotify/config/[/br]wget -O /mnt/user/appdata/gotify/config/config.yml https://raw.githubusercontent.com/gotify/server/master/config.example.yml</Overview>
+  <Category>Productivity: Tools: Network:Management Network:Messenger Status:Stable</Category>
   <WebUI>http://[IP]:[PORT:80]</WebUI>
-  <TemplateURL/>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/gotify.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/gotify.png</Icon>
   <ExtraParams/>
   <PostArgs/>
   <CPUset/>
-  <DateInstalled>1581339177</DateInstalled>
+  <DateInstalled>1583615201</DateInstalled>
   <DonateText/>
   <DonateLink/>
-  <Description>A simple server for sending and receiving messages.[br][br][b][u][span style='color: #ff9900;']Default user/password[/span][/u][/b][br]User: [B][u]admin[/B][/u][br]Password: [B][u]admin[/B][/u][/b][br][br]Download config.yml[/br][/br]wget -O /mnt/user/appdata/gotify/config/config.yml https://raw.githubusercontent.com/gotify/server/master/config.example.yml</Description>
+  <Description>A simple server for sending and receiving messages.[br][br][b][u][span style='color: #ff9900;']Default user/password[/span][/u][/b][br]User: [B][u]admin[/B][/u][br]Password: [B][u]admin[/B][/u][/b][br][br]Download config.yml[/br]mkdir -p /mnt/user/appdata/gotify/config/[/br]wget -O /mnt/user/appdata/gotify/config/config.yml https://raw.githubusercontent.com/gotify/server/master/config.example.yml</Description>
   <Networking>
     <Mode>bridge</Mode>
     <Publish>
diff --git a/templates/icons/cyberchef.png b/templates/icons/cyberchef.png
index eb18228..7201307 100644
Binary files a/templates/icons/cyberchef.png and b/templates/icons/cyberchef.png differ
diff --git a/templates/icons/dashmachine.png b/templates/icons/dashmachine.png
index 699ca3e..5dd489b 100644
Binary files a/templates/icons/dashmachine.png and b/templates/icons/dashmachine.png differ
diff --git a/templates/icons/db-backup.png b/templates/icons/db-backup.png
index 5de1f1d..a98aa41 100644
Binary files a/templates/icons/db-backup.png and b/templates/icons/db-backup.png differ
diff --git a/templates/icons/gotify.png b/templates/icons/gotify.png
index 9984859..7b6aed8 100644
Binary files a/templates/icons/gotify.png and b/templates/icons/gotify.png differ
diff --git a/templates/icons/mailpile.png b/templates/icons/mailpile.png
index 7652677..4c88b78 100644
Binary files a/templates/icons/mailpile.png and b/templates/icons/mailpile.png differ
diff --git a/templates/icons/riot-web.png b/templates/icons/riot-web.png
index 64a4662..78a3b7d 100644
Binary files a/templates/icons/riot-web.png and b/templates/icons/riot-web.png differ
diff --git a/templates/mailpile.xml b/templates/mailpile.xml
index 1107f6e..57d522f 100644
--- a/templates/mailpile.xml
+++ b/templates/mailpile.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>mailpile</Name>
-  <Repository>rroemhild/mailpile</Repository>
+  <Repository>rroemhild/mailpile:latest</Repository>
   <Registry>https://hub.docker.com/r/rroemhild/mailpile/</Registry>
   <Network>bridge</Network>
   <MyIP/>
   <Shell>sh</Shell>
   <Privileged>false</Privileged>
-  <Support>https://hub.docker.com/r/rroemhild/mailpile/</Support>
-  <Project/>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://www.mailpile.is/</Project>
   <Overview>Mailpile is software, an e-mail client. It runs on your desktop or laptop computer and you interact with it by using your web browser. The goal of Mailpile is to allow people to send e-mail in a more secure and private manner than before.</Overview>
-  <Category/>
+  <Category>Productivity: Network:Web Network:Messenger Status:Stable</Category>
   <WebUI>http://[IP]:[PORT:33411]</WebUI>
-  <TemplateURL/>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/mailpile.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/mailpile.png</Icon>
   <ExtraParams/>
   <PostArgs/>
   <CPUset/>
-  <DateInstalled>1581354570</DateInstalled>
+  <DateInstalled>1583614982</DateInstalled>
   <DonateText/>
   <DonateLink/>
   <Description>Mailpile is software, an e-mail client. It runs on your desktop or laptop computer and you interact with it by using your web browser. The goal of Mailpile is to allow people to send e-mail in a more secure and private manner than before.</Description>
@@ -48,4 +48,4 @@
   <Config Name="Port 1" Target="33411" Default="" Mode="tcp" Description="Container Port: 33411" Type="Port" Display="always" Required="true" Mask="false">33411</Config>
   <Config Name="Path 1" Target="/root/.local/share/Mailpile" Default="" Mode="rw" Description="Container Path: /root/.local/share/Mailpile" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/Mailpile/</Config>
   <Config Name="Path 2" Target="/root/.gnupg" Default="" Mode="rw" Description="Container Path: /root/.gnupg" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/Mailpile/gnupg/</Config>
-</Container>
\ No newline at end of file
+</Container>
diff --git a/templates/riot-web.xml b/templates/riot-web.xml
index 23e19a9..5168806 100644
--- a/templates/riot-web.xml
+++ b/templates/riot-web.xml
@@ -1,29 +1,26 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>riot-web</Name>
-  <Repository>vectorim/riot-web</Repository>
+  <Repository>vectorim/riot-web:latest</Repository>
   <Registry>https://hub.docker.com/r/vectorim/riot-web/</Registry>
   <Network>bridge</Network>
   <MyIP/>
   <Shell>sh</Shell>
   <Privileged>false</Privileged>
-  <Support>https://hub.docker.com/r/vectorim/riot-web/</Support>
-  <Project/>
-  <Overview>[br]Open, secure and interoperable communication for work and home.[/br] [br]wget -O /mnt/user/appdata/riot-web/config/config.json https://riot.im/develop/config.json[/br]&#xD;
-</Overview>
-  <Category/>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project> https://riot.im/</Project>
+  <Overview>Open, secure and interoperable communication for work and home. before the running the docker run [br]mkdir -p /mnt/user/appdata/riot-web/config [/br]wget -O /mnt/user/appdata/riot-web/config/config.json https://riot.im/develop/config.json </Overview>
+  <Category>Cloud: Productivity: Network:Messenger Status:Stable</Category>
   <WebUI>http://[IP]:[PORT:80]</WebUI>
-  <TemplateURL/>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/riot-web.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/riot-web.png</Icon>
   <ExtraParams/>
   <PostArgs/>
   <CPUset/>
-  <DateInstalled>1581761819</DateInstalled>
+  <DateInstalled>1583614638</DateInstalled>
   <DonateText/>
   <DonateLink/>
-  <Description>[br]Open, secure and interoperable communication for work and home.[/br] [br]mkdir -p /mnt/user/appdata/riot-web/config/[/br]&#xD;
-wget -O /mnt/user/appdata/riot-web/config/config.json https://riot.im/develop/config.json&#xD;
-</Description>
+  <Description>Open, secure and interoperable communication for work and home. before the running the docker run [br]mkdir -p /mnt/user/appdata/riot-web/config [/br]wget -O /mnt/user/appdata/riot-web/config/config.json https://riot.im/develop/config.json </Description>
   <Networking>
     <Mode>bridge</Mode>
     <Publish>
@@ -45,4 +42,4 @@ wget -O /mnt/user/appdata/riot-web/config/config.json https://riot.im/develop/co
   <Labels/>
   <Config Name="Host Port 1" Target="80" Default="" Mode="tcp" Description="Container Port: 80" Type="Port" Display="always" Required="true" Mask="false">8075</Config>
   <Config Name="Host Path 1" Target="/app/config.json" Default="" Mode="rw" Description="Container Path: /app/config.json" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/riot-web/config/config.json</Config>
-</Container>
\ No newline at end of file
+</Container>